Repository: argoproj/argo-cd (go)

Issue:
Revision is not signed is misleading
**Describe the bug**

People are often confused that "Revision is not signed" is an error, but it's not. We should conditionally display this only if the project is enabled with signed commits.

**Screenshots**

![image](https://user-images.githubusercontent.com/12677113/97923680-3a9ec580-1d13-11eb-9a6d-213d45d2e76f.png)

**Version**

```shell
Paste the output from `argocd version` here.
```

**Logs**

```
Paste any relevant application logs here.
```


Pull request:
fix: Only verify GPG signatures on metadata requests when verification is enforced
Fixes #4731

Change revision metadata request behaviour to only run signature verification when it's enforced by the application's parent project.

I was first considering to make this a simple UI only change. Since we need access to the parent project for making an informed choice about this status, and there might be cases where a user has read access to the application, but not to its parent project, I decided that making this change in the repo-server instead makes more sense - also, it reduces amounts of forks required when fetching revision meta data.

The downside to this is that meta data for the same revision might be loaded twice, in case two or more applications are pinned to the same revision, and one or more are enforcing signature verification but other's don't.

Signed-off-by: jannfis <jann@mistrust.net>

Checklist:

* [ ] Either (a) I've created an [enhancement proposal](https://github.com/argoproj/argo-cd/issues/new/choose) and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
* [ ] The title of the PR states what changed and the related issues number (used for the release note).
* [ ] I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
* [ ] Does this PR require documentation updates?
* [ ] I've updated documentation as required by this PR.
* [ ] Optional. My organization is added to USERS.md.
* [ ] I've signed the CLA and my build is green ([troubleshooting builds](https://argoproj.github.io/argo-cd/developer-guide/ci/)). 


Patch:
diff --git a/assets/swagger.json b/assets/swagger.json
index eeb740e99..6c81f4694 100644
--- a/assets/swagger.json
+++ b/assets/swagger.json
@@ -188,7 +188,7 @@
           "ApplicationService"
         ],
         "summary": "List returns list of applications",
-        "operationId": "ListMixin9",
+        "operationId": "List",
         "parameters": [
           {
             "type": "string",
@@ -239,7 +239,7 @@
           "ApplicationService"
         ],
         "summary": "Create creates an application",
-        "operationId": "CreateMixin9",
+        "operationId": "Create",
         "parameters": [
           {
             "name": "body",
@@ -266,7 +266,7 @@
           "ApplicationService"
         ],
         "summary": "Update updates an application",
-        "operationId": "UpdateMixin9",
+        "operationId": "Update",
         "parameters": [
           {
             "type": "string",
@@ -400,7 +400,7 @@
           "ApplicationService"
         ],
         "summary": "Get returns an application by name",
-        "operationId": "GetMixin9",
+        "operationId": "GetMixin1",
         "parameters": [
           {
             "type": "string",
@@ -452,7 +452,7 @@
           "ApplicationService"
         ],
         "summary": "Delete deletes an application",
-        "operationId": "DeleteMixin9",
+        "operationId": "Delete",
         "parameters": [
           {
             "type": "string",
@@ -1162,7 +1162,7 @@
           "ClusterService"
         ],
         "summary": "List returns list of clusters",
-        "operationId": "List",
+        "operationId": "ListMixin5",
         "parameters": [
           {
             "type": "string",
@@ -1189,7 +1189,7 @@
           "ClusterService"
         ],
         "summary": "Create creates a cluster",
-        "operationId": "Create",
+        "operationId": "CreateMixin5",
         "parameters": [
           {
             "name": "body",
@@ -1216,7 +1216,7 @@
           "ClusterService"
         ],
         "summary": "Update updates a cluster",
-        "operationId": "Update",
+        "operationId": "UpdateMixin5",
         "parameters": [
           {
             "type": "string",
@@ -1250,7 +1250,7 @@
           "ClusterService"
         ],
         "summary": "Get returns a cluster by server address",
-        "operationId": "GetMixin2",
+        "operationId": "GetMixin5",
         "parameters": [
           {
             "type": "string",
@@ -1278,7 +1278,7 @@
           "ClusterService"
         ],
         "summary": "Delete deletes a cluster",
-        "operationId": "Delete",
+        "operationId": "DeleteMixin5",
         "parameters": [
           {
             "type": "string",
@@ -1358,7 +1358,7 @@
           "GPGKeyService"
         ],
         "summary": "List all available repository certificates",
-        "operationId": "ListMixin7",
+        "operationId": "ListMixin2",
         "parameters": [
           {
             "type": "string",
@@ -1381,7 +1381,7 @@
           "GPGKeyService"
         ],
         "summary": "Create one or more GPG public keys in the server's configuration",
-        "operationId": "CreateMixin7",
+        "operationId": "CreateMixin2",
         "parameters": [
           {
             "description": "Raw key data of the GPG key(s) to create",
@@ -1407,7 +1407,7 @@
           "GPGKeyService"
         ],
         "summary": "Delete specified GPG public key from the server's configuration",
-        "operationId": "DeleteMixin7",
+        "operationId": "DeleteMixin2",
         "parameters": [
           {
             "type": "string",
@@ -1432,7 +1432,7 @@
           "GPGKeyService"
         ],
         "summary": "Get information about specified GPG public key from the server",
-        "operationId": "GetMixin7",
+        "operationId": "GetMixin2",
         "parameters": [
           {
             "type": "string",
@@ -1948,7 +1948,7 @@
           "RepositoryService"
         ],
         "summary": "Get returns a repository or its credentials",
-        "operationId": "GetMixin3",
+        "operationId": "Get",
         "parameters": [
           {
             "type": "string",
@@ -2011,7 +2011,7 @@
         "tags": [
           "RepositoryService"
         ],
-        "summary": "ListApps returns list of apps in the repo",
+        "summary": "ListApps returns list of apps in the repe",
         "operationId": "ListApps",
         "parameters": [
           {
@@ -2235,7 +2235,7 @@
           "SettingsService"
         ],
         "summary": "Get returns Argo CD settings",
-        "operationId": "Get",
+        "operationId": "GetMixin8",
         "responses": {
           "200": {
             "description": "A successful response.",
diff --git a/reposerver/apiclient/repository.pb.go b/reposerver/apiclient/repository.pb.go
index 210daf73f..804d7d39f 100644
--- a/reposerver/apiclient/repository.pb.go
+++ b/reposerver/apiclient/repository.pb.go
@@ -628,7 +628,9 @@ type RepoServerRevisionMetadataRequest struct {
 	// the repo
 	Repo *v1alpha1.Repository `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"`
 	// the revision within the repo
-	Revision             string   `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"`
+	Revision string `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"`
+	// whether to check signature on revision
+	CheckSignature       bool     `protobuf:"varint,3,opt,name=checkSignature,proto3" json:"checkSignature,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -681,6 +683,13 @@ func (m *RepoServerRevisionMetadataRequest) GetRevision() string {
 	return ""
 }
 
+func (m *RepoServerRevisionMetadataRequest) GetCheckSignature() bool {
+	if m != nil {
+		return m.CheckSignature
+	}
+	return false
+}
+
 // KsonnetAppSpec contains Ksonnet app response
 // This roughly reflects: ksonnet/ksonnet/metadata/app/schema.go
 type KsonnetAppSpec struct {
@@ -1218,87 +1227,88 @@ func init() {
 }
 
 var fileDescriptor_dd8723cfcc820480 = []byte{
-	// 1280 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x5b, 0x6f, 0x1b, 0xc5,
-	0x17, 0xcf, 0xda, 0xce, 0xc5, 0xc7, 0x6d, 0xe3, 0x4c, 0xfb, 0xef, 0x7f, 0x31, 0xa9, 0x15, 0x56,
-	0x80, 0x02, 0xa5, 0x36, 0x0d, 0x15, 0x54, 0xad, 0x54, 0x29, 0xf4, 0x8a, 0x92, 0xaa, 0xe9, 0x06,
-	0x2a, 0x71, 0x91, 0xaa, 0xc9, 0xfa, 0x64, 0x3d, 0x78, 0xbd, 0x3b, 0xec, 0x8c, 0x8d, 0xdc, 0x2f,
-	0x00, 0xef, 0x88, 0x17, 0xbe, 0x00, 0xef, 0x48, 0x3c, 0xf0, 0x8e, 0x10, 0x8f, 0x7c, 0x04, 0xd4,
-	0x4f, 0x82, 0x66, 0xf6, 0x36, 0x5e, 0x3b, 0x79, 0x71, 0x2f, 0x2f, 0xc9, 0xcc, 0x99, 0x73, 0x9b,
-	0x33, 0xbf, 0xf9, 0xcd, 0xf1, 0xc2, 0xbb, 0x31, 0xf2, 0x48, 0x60, 0x3c, 0xc6, 0xb8, 0xab, 0x87,
-	0x4c, 0x46, 0xf1, 0xc4, 0x18, 0x76, 0x78, 0x1c, 0xc9, 0x88, 0x40, 0x21, 0x69, 0x5d, 0xf0, 0x23,
-	0x3f, 0xd2, 0xe2, 0xae, 0x1a, 0x25, 0x1a, 0xad, 0x4d, 0x3f, 0x8a, 0xfc, 0x00, 0xbb, 0x94, 0xb3,
-	0x2e, 0x0d, 0xc3, 0x48, 0x52, 0xc9, 0xa2, 0x50, 0xa4, 0xab, 0xce, 0xe0, 0xba, 0xe8, 0xb0, 0x48,
-	0xaf, 0x7a, 0x51, 0x8c, 0xdd, 0xf1, 0xd5, 0xae, 0x8f, 0x21, 0xc6, 0x54, 0x62, 0x2f, 0xd5, 0xf9,
-	0xcc, 0x67, 0xb2, 0x3f, 0x3a, 0xea, 0x78, 0xd1, 0xb0, 0x4b, 0x63, 0x1d, 0xe2, 0x5b, 0x3d, 0xb8,
-	0xe2, 0xf5, 0xba, 0x7c, 0xe0, 0x2b, 0x63, 0xd1, 0xa5, 0x9c, 0x07, 0xcc, 0xd3, 0xce, 0xbb, 0xe3,
-	0xab, 0x34, 0xe0, 0x7d, 0x3a, 0xe3, 0xca, 0xf9, 0x7d, 0x05, 0xd6, 0x1f, 0xd2, 0x90, 0x1d, 0xa3,
-	0x90, 0x2e, 0x7e, 0x37, 0x42, 0x21, 0xc9, 0x97, 0x50, 0x53, 0x9b, 0xb0, 0xad, 0x2d, 0x6b, 0xbb,
-	0xb1, 0x73, 0xb7, 0x53, 0x44, 0xeb, 0x64, 0xd1, 0xf4, 0xe0, 0xa9, 0xd7, 0xeb, 0xf0, 0x81, 0xdf,
-	0x51, 0xd1, 0x3a, 0x46, 0xb4, 0x4e, 0x16, 0xad, 0xe3, 0xe6, 0xb5, 0x70, 0xb5, 0x4b, 0xd2, 0x82,
-	0xb5, 0x18, 0xc7, 0x4c, 0xb0, 0x28, 0xb4, 0x2b, 0x5b, 0xd6, 0x76, 0xdd, 0xcd, 0xe7, 0xc4, 0x86,
-	0xd5, 0x30, 0xba, 0x4d, 0xbd, 0x3e, 0xda, 0xd5, 0x2d, 0x6b, 0x7b, 0xcd, 0xcd, 0xa6, 0x64, 0x0b,
-	0x1a, 0x94, 0xf3, 0x7d, 0x7a, 0x84, 0xc1, 0x1e, 0x4e, 0xec, 0x9a, 0x36, 0x34, 0x45, 0xe4, 0x6d,
-	0x38, 0x9b, 0x4d, 0x9f, 0xd0, 0x60, 0x84, 0xf6, 0xb2, 0xd6, 0x99, 0x16, 0x92, 0x4d, 0xa8, 0x87,
-	0x74, 0x88, 0x82, 0x53, 0x0f, 0xed, 0x35, 0xad, 0x51, 0x08, 0xc8, 0x33, 0xd8, 0x30, 0x36, 0x71,
-	0x18, 0x8d, 0x62, 0x0f, 0x6d, 0xd0, 0x35, 0xd8, 0x5f, 0xa0, 0x06, 0xbb, 0x65, 0x9f, 0xee, 0x6c,
-	0x18, 0xf2, 0x35, 0x2c, 0x6b, 0xdc, 0xd8, 0x8d, 0xad, 0xea, 0x8b, 0xab, 0x79, 0xe2, 0x93, 0x0c,
-	0x60, 0x95, 0x07, 0x23, 0x9f, 0x85, 0xc2, 0x3e, 0xa3, 0xdd, 0x3f, 0x5e, 0xc0, 0xfd, 0xed, 0x28,
-	0x3c, 0x66, 0xfe, 0x43, 0x1a, 0x52, 0x1f, 0x87, 0x18, 0xca, 0x03, 0xed, 0xd9, 0xcd, 0x22, 0x90,
-	0xef, 0xa1, 0x39, 0x18, 0x09, 0x19, 0x0d, 0xd9, 0x33, 0x7c, 0xc4, 0x35, 0xb2, 0xed, 0xb3, 0xba,
-	0x88, 0x7b, 0x0b, 0x44, 0xdd, 0x2b, 0xb9, 0x74, 0x67, 0x82, 0x28, 0x90, 0x0c, 0x46, 0x47, 0xf8,
-	0x04, 0x63, 0x8d, 0xae, 0x73, 0x09, 0x48, 0x0c, 0x51, 0x02, 0x23, 0x96, 0xce, 0x84, 0xbd, 0xbe,
-	0x55, 0x4d, 0x60, 0x94, 0x8b, 0xc8, 0x36, 0xac, 0x8f, 0x31, 0x66, 0xc7, 0x93, 0x43, 0xe6, 0x87,
-	0x54, 0x8e, 0x62, 0xb4, 0x9b, 0x1a, 0x8a, 0x65, 0xb1, 0xf3, 0x97, 0x05, 0xcd, 0xe2, 0xde, 0x08,
-	0x1e, 0x85, 0x42, 0xe3, 0x6b, 0x98, 0xca, 0x84, 0x6d, 0x69, 0xf7, 0x85, 0x60, 0x1a, 0x7d, 0x95,
-	0x32, 0xfa, 0x2e, 0xc2, 0x4a, 0xc2, 0x2e, 0x1a, 0xfc, 0x75, 0x37, 0x9d, 0x4d, 0xdd, 0x98, 0x5a,
-	0xe9, 0xc6, 0xb4, 0x01, 0x84, 0xc6, 0xcf, 0xe7, 0x13, 0x8e, 0xf6, 0x8a, 0x5e, 0x35, 0x24, 0xc4,
-	0x81, 0x33, 0x49, 0xde, 0x2e, 0x8a, 0x51, 0x20, 0xed, 0x55, 0xad, 0x31, 0x25, 0x73, 0x02, 0x58,
-	0xdf, 0x67, 0x6a, 0x0f, 0xc7, 0xe2, 0xe5, 0xdf, 0x7f, 0xe7, 0x63, 0xa8, 0xa9, 0x48, 0x6a, 0x57,
-	0x47, 0x31, 0x0d, 0xbd, 0x3e, 0x66, 0x85, 0xca, 0xe7, 0x84, 0x40, 0x4d, 0x52, 0x5f, 0xd8, 0x15,
-	0x2d, 0xd7, 0x63, 0xe7, 0x47, 0x2b, 0x49, 0x73, 0x97, 0x73, 0xf1, 0x7a, 0x69, 0xca, 0x19, 0xc1,
-	0xea, 0x2e, 0xe7, 0x2a, 0x19, 0x72, 0x15, 0x6a, 0x94, 0xf3, 0x64, 0x07, 0x8d, 0x9d, 0x4b, 0x1d,
-	0xe3, 0x31, 0x48, 0x55, 0xd4, 0x7f, 0x71, 0x37, 0x94, 0xca, 0xb3, 0x52, 0x6d, 0x7d, 0x02, 0xf5,
-	0x5c, 0x44, 0x9a, 0x50, 0x1d, 0xe0, 0x44, 0x6f, 0xa0, 0xee, 0xaa, 0x21, 0xb9, 0x00, 0xcb, 0x63,
-	0xcd, 0x5f, 0x49, 0xd4, 0x64, 0x72, 0xa3, 0x72, 0xdd, 0x72, 0x7e, 0xab, 0xc2, 0x1b, 0x2a, 0xcf,
-	0x43, 0x0d, 0x8b, 0x5d, 0xce, 0xef, 0xa0, 0xa4, 0x2c, 0x10, 0x8f, 0x47, 0x18, 0x4f, 0x5e, 0x66,
-	0x2d, 0x7a, 0xb0, 0x92, 0x40, 0x4a, 0xe7, 0xf4, 0xa2, 0xb9, 0x30, 0xf5, 0x5d, 0x10, 0x60, 0xf5,
-	0x25, 0x10, 0xe0, 0x3c, 0x4e, 0xaa, 0xbd, 0x02, 0x4e, 0x72, 0x7e, 0xa8, 0xc0, 0x45, 0x95, 0x4e,
-	0x71, 0x5c, 0x39, 0x57, 0x28, 0x94, 0xab, 0x5b, 0x9b, 0x1c, 0xbe, 0x1e, 0x93, 0x6b, 0xb0, 0x3a,
-	0x10, 0x51, 0x18, 0xa2, 0x4c, 0x6b, 0xdd, 0x32, 0x21, 0xb5, 0x97, 0x2c, 0xed, 0x72, 0x7e, 0xc8,
-	0xd1, 0x73, 0x33, 0x55, 0x72, 0x19, 0x6a, 0x7d, 0x0c, 0x86, 0x9a, 0x37, 0x1a, 0x3b, 0xff, 0x37,
-	0x4d, 0x1e, 0x60, 0x30, 0xcc, 0xf4, 0xb5, 0x12, 0xb9, 0x01, 0xf5, 0x3c, 0xcb, 0xb4, 0x06, 0x9b,
-	0x53, 0x41, 0xb2, 0xc5, 0xcc, 0xac, 0x50, 0x57, 0xb6, 0x3d, 0x16, 0xa3, 0xa7, 0x14, 0xf5, 0x03,
-	0x5b, 0xb2, 0xbd, 0x93, 0x2d, 0xe6, 0xb6, 0xb9, 0xba, 0xf3, 0x8b, 0x05, 0x6f, 0x15, 0xf0, 0x75,
-	0xd3, 0xcb, 0xf4, 0x10, 0x25, 0xed, 0x51, 0x49, 0x5f, 0xf3, 0x95, 0xfe, 0xb3, 0x02, 0xe7, 0xa6,
-	0xab, 0xab, 0x8e, 0x47, 0x71, 0x73, 0x76, 0x3c, 0x6a, 0x4c, 0x0e, 0xe0, 0x0c, 0x86, 0x63, 0x16,
-	0x47, 0xa1, 0x7a, 0xf8, 0x32, 0xa8, 0x7e, 0x70, 0xf2, 0x19, 0x75, 0xee, 0x1a, 0xea, 0x09, 0x0b,
-	0x4c, 0x79, 0x20, 0x03, 0x00, 0x4e, 0x63, 0x3a, 0x44, 0x89, 0xb1, 0x82, 0x64, 0x75, 0x51, 0x48,
-	0x26, 0xe1, 0x0f, 0x32, 0x9f, 0xae, 0xe1, 0xbe, 0xf5, 0x14, 0x36, 0x66, 0xf2, 0x99, 0x43, 0x41,
-	0xd7, 0x4c, 0x0a, 0x6a, 0xec, 0xb4, 0xe7, 0x6c, 0xcf, 0x70, 0x63, 0x52, 0xd4, 0x1f, 0x15, 0x68,
-	0x18, 0x88, 0x9b, 0x5b, 0xc3, 0x36, 0x80, 0x36, 0xb8, 0xc7, 0x02, 0x4c, 0x2a, 0x58, 0x77, 0x0d,
-	0x09, 0xe9, 0xcf, 0xa9, 0xc8, 0x83, 0x05, 0x2a, 0xa2, 0xf2, 0x99, 0x5b, 0x0e, 0xf5, 0xe0, 0xea,
-	0xb8, 0x22, 0xed, 0x15, 0xd3, 0x19, 0x91, 0x70, 0xee, 0x98, 0x05, 0x78, 0x50, 0x64, 0xb1, 0xa2,
-	0xb3, 0xd8, 0x5f, 0x30, 0x8b, 0x7b, 0xa6, 0x53, 0xb7, 0x14, 0xc3, 0x79, 0x1f, 0x9a, 0xe5, 0xab,
-	0xa7, 0x32, 0x64, 0x43, 0xea, 0xe7, 0x75, 0x4a, 0x67, 0xce, 0xcf, 0x16, 0x90, 0xd9, 0x93, 0x38,
-	0xa9, 0xdc, 0x83, 0xeb, 0x22, 0xeb, 0x89, 0x12, 0xdc, 0x1b, 0x12, 0xb2, 0x07, 0x8d, 0x1e, 0x0a,
-	0xc9, 0x42, 0x9d, 0x70, 0x4a, 0x08, 0xef, 0x9d, 0x7e, 0xe4, 0x77, 0x0a, 0x03, 0xd7, 0xb4, 0x76,
-	0xbe, 0x80, 0x4b, 0xa7, 0x6a, 0x1b, 0x3d, 0x8e, 0x35, 0xd5, 0xe3, 0x9c, 0xda, 0x19, 0x39, 0x04,
-	0x9a, 0x65, 0x66, 0x71, 0x42, 0xd8, 0x50, 0x35, 0xbd, 0xdd, 0xa7, 0xb1, 0x7c, 0x15, 0x7d, 0xcb,
-	0x4d, 0xa8, 0xe7, 0xf1, 0xe6, 0x16, 0xba, 0x05, 0x6b, 0xe3, 0xac, 0xb1, 0x4c, 0x1a, 0x97, 0x7c,
-	0xee, 0xec, 0x02, 0x31, 0x93, 0x4d, 0x1f, 0x80, 0xcb, 0xb0, 0xcc, 0x24, 0x0e, 0xb3, 0xee, 0xe1,
-	0x7f, 0x65, 0xde, 0xd6, 0xea, 0x6e, 0xa2, 0xb3, 0xf3, 0x6b, 0x0d, 0x36, 0x0a, 0xfa, 0x54, 0x7f,
-	0x99, 0x87, 0xe4, 0x11, 0x34, 0xef, 0xa7, 0xbf, 0xe7, 0xb2, 0x5e, 0x94, 0xbc, 0x69, 0xfa, 0x29,
-	0xfd, 0xb2, 0x6b, 0x6d, 0xce, 0x5f, 0x4c, 0x32, 0x72, 0x96, 0xc8, 0x4d, 0x58, 0xcb, 0x9a, 0xc1,
-	0x69, 0x47, 0xa5, 0x16, 0xb1, 0xd5, 0x34, 0x17, 0xd5, 0x82, 0xb3, 0x44, 0x6e, 0x25, 0xc6, 0xaa,
-	0xbd, 0x99, 0x35, 0x36, 0x1a, 0xb7, 0xd6, 0xf9, 0x39, 0x8d, 0x92, 0xb3, 0x44, 0xbe, 0x81, 0xb3,
-	0xf7, 0x35, 0x75, 0xa6, 0x4f, 0x25, 0x79, 0x67, 0x3a, 0xc8, 0x09, 0xbd, 0x4f, 0xcb, 0x29, 0xab,
-	0xcd, 0xbe, 0xb6, 0xce, 0x12, 0xf9, 0xc9, 0x82, 0xf3, 0xf7, 0x51, 0x96, 0x5f, 0x1e, 0x72, 0x65,
-	0x7e, 0x90, 0x13, 0x5e, 0xa8, 0xd6, 0xde, 0x42, 0xa8, 0x9a, 0xf6, 0xe9, 0x2c, 0x91, 0x03, 0xbd,
-	0xe7, 0x02, 0x1d, 0xe4, 0xd2, 0x5c, 0x18, 0xe4, 0xa5, 0x6b, 0x9f, 0xb4, 0x9c, 0xed, 0xf3, 0xd3,
-	0x5b, 0x7f, 0x3f, 0x6f, 0x5b, 0xff, 0x3c, 0x6f, 0x5b, 0xff, 0x3e, 0x6f, 0x5b, 0x5f, 0x7d, 0x78,
-	0xda, 0x97, 0x02, 0xe3, 0x8b, 0x06, 0xe5, 0xcc, 0x0b, 0x18, 0x86, 0xf2, 0x68, 0x45, 0x7f, 0x17,
-	0xf8, 0xe8, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x61, 0xb4, 0xe7, 0xb1, 0xf0, 0x10, 0x00, 0x00,
+	// 1292 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x5b, 0x6f, 0x1b, 0x45,
+	0x14, 0xce, 0xda, 0xce, 0xc5, 0xc7, 0x6d, 0xe2, 0x4c, 0x4b, 0x59, 0x4c, 0x6a, 0x85, 0x15, 0x54,
+	0x81, 0x52, 0x9b, 0x86, 0x0a, 0xaa, 0x56, 0xaa, 0x14, 0x7a, 0x45, 0x49, 0xd5, 0x74, 0x03, 0x95,
+	0xb8, 0x48, 0xd5, 0x64, 0x7d, 0xb2, 0x1e, 0xbc, 0xde, 0x1d, 0x76, 0xc6, 0x46, 0xe9, 0x1f, 0x80,
+	0x77, 0xc4, 0x6f, 0xe0, 0x1d, 0x89, 0x07, 0x5e, 0x11, 0x42, 0x3c, 0xf2, 0x13, 0x50, 0x7f, 0x09,
+	0x9a, 0xd9, 0xdb, 0x78, 0xed, 0xe4, 0xc5, 0xbd, 0xbc, 0x24, 0x33, 0x67, 0xce, 0x6d, 0xce, 0x7c,
+	0xf3, 0xcd, 0xf1, 0xc2, 0xa5, 0x18, 0x79, 0x24, 0x30, 0x1e, 0x63, 0xdc, 0xd5, 0x43, 0x26, 0xa3,
+	0xf8, 0xd8, 0x18, 0x76, 0x78, 0x1c, 0xc9, 0x88, 0x40, 0x21, 0x69, 0x9d, 0xf7, 0x23, 0x3f, 0xd2,
+	0xe2, 0xae, 0x1a, 0x25, 0x1a, 0xad, 0x0d, 0x3f, 0x8a, 0xfc, 0x00, 0xbb, 0x94, 0xb3, 0x2e, 0x0d,
+	0xc3, 0x48, 0x52, 0xc9, 0xa2, 0x50, 0xa4, 0xab, 0xce, 0xe0, 0xba, 0xe8, 0xb0, 0x48, 0xaf, 0x7a,
+	0x51, 0x8c, 0xdd, 0xf1, 0xd5, 0xae, 0x8f, 0x21, 0xc6, 0x54, 0x62, 0x2f, 0xd5, 0xf9, 0xdc, 0x67,
+	0xb2, 0x3f, 0x3a, 0xec, 0x78, 0xd1, 0xb0, 0x4b, 0x63, 0x1d, 0xe2, 0x3b, 0x3d, 0xb8, 0xe2, 0xf5,
+	0xba, 0x7c, 0xe0, 0x2b, 0x63, 0xd1, 0xa5, 0x9c, 0x07, 0xcc, 0xd3, 0xce, 0xbb, 0xe3, 0xab, 0x34,
+	0xe0, 0x7d, 0x3a, 0xe5, 0xca, 0xf9, 0x7d, 0x09, 0xd6, 0x1e, 0xd2, 0x90, 0x1d, 0xa1, 0x90, 0x2e,
+	0x7e, 0x3f, 0x42, 0x21, 0xc9, 0x57, 0x50, 0x53, 0x9b, 0xb0, 0xad, 0x4d, 0x6b, 0xab, 0xb1, 0x7d,
+	0xb7, 0x53, 0x44, 0xeb, 0x64, 0xd1, 0xf4, 0xe0, 0xa9, 0xd7, 0xeb, 0xf0, 0x81, 0xdf, 0x51, 0xd1,
+	0x3a, 0x46, 0xb4, 0x4e, 0x16, 0xad, 0xe3, 0xe6, 0xb5, 0x70, 0xb5, 0x4b, 0xd2, 0x82, 0x95, 0x18,
+	0xc7, 0x4c, 0xb0, 0x28, 0xb4, 0x2b, 0x9b, 0xd6, 0x56, 0xdd, 0xcd, 0xe7, 0xc4, 0x86, 0xe5, 0x30,
+	0xba, 0x4d, 0xbd, 0x3e, 0xda, 0xd5, 0x4d, 0x6b, 0x6b, 0xc5, 0xcd, 0xa6, 0x64, 0x13, 0x1a, 0x94,
+	0xf3, 0x3d, 0x7a, 0x88, 0xc1, 0x2e, 0x1e, 0xdb, 0x35, 0x6d, 0x68, 0x8a, 0xc8, 0xbb, 0x70, 0x36,
+	0x9b, 0x3e, 0xa1, 0xc1, 0x08, 0xed, 0x45, 0xad, 0x33, 0x29, 0x24, 0x1b, 0x50, 0x0f, 0xe9, 0x10,
+	0x05, 0xa7, 0x1e, 0xda, 0x2b, 0x5a, 0xa3, 0x10, 0x90, 0x67, 0xb0, 0x6e, 0x6c, 0xe2, 0x20, 0x1a,
+	0xc5, 0x1e, 0xda, 0xa0, 0x6b, 0xb0, 0x37, 0x47, 0x0d, 0x76, 0xca, 0x3e, 0xdd, 0xe9, 0x30, 0xe4,
+	0x1b, 0x58, 0xd4, 0xb8, 0xb1, 0x1b, 0x9b, 0xd5, 0x17, 0x57, 0xf3, 0xc4, 0x27, 0x19, 0xc0, 0x32,
+	0x0f, 0x46, 0x3e, 0x0b, 0x85, 0x7d, 0x46, 0xbb, 0x7f, 0x3c, 0x87, 0xfb, 0xdb, 0x51, 0x78, 0xc4,
+	0xfc, 0x87, 0x34, 0xa4, 0x3e, 0x0e, 0x31, 0x94, 0xfb, 0xda, 0xb3, 0x9b, 0x45, 0x20, 0x3f, 0x40,
+	0x73, 0x30, 0x12, 0x32, 0x1a, 0xb2, 0x67, 0xf8, 0x88, 0x6b, 0x64, 0xdb, 0x67, 0x75, 0x11, 0x77,
+	0xe7, 0x88, 0xba, 0x5b, 0x72, 0xe9, 0x4e, 0x05, 0x51, 0x20, 0x19, 0x8c, 0x0e, 0xf1, 0x09, 0xc6,
+	0x1a, 0x5d, 0xab, 0x09, 0x48, 0x0c, 0x51, 0x02, 0x23, 0x96, 0xce, 0x84, 0xbd, 0xb6, 0x59, 0x4d,
+	0x60, 0x94, 0x8b, 0xc8, 0x16, 0xac, 0x8d, 0x31, 0x66, 0x47, 0xc7, 0x07, 0xcc, 0x0f, 0xa9, 0x1c,
+	0xc5, 0x68, 0x37, 0x35, 0x14, 0xcb, 0x62, 0xe7, 0x6f, 0x0b, 0x9a, 0xc5, 0xbd, 0x11, 0x3c, 0x0a,
+	0x85, 0xc6, 0xd7, 0x30, 0x95, 0x09, 0xdb, 0xd2, 0xee, 0x0b, 0xc1, 0x24, 0xfa, 0x2a, 0x65, 0xf4,
+	0x5d, 0x80, 0xa5, 0x84, 0x5d, 0x34, 0xf8, 0xeb, 0x6e, 0x3a, 0x9b, 0xb8, 0x31, 0xb5, 0xd2, 0x8d,
+	0x69, 0x03, 0x08, 0x8d, 0x9f, 0x2f, 0x8e, 0x39, 0xda, 0x4b, 0x7a, 0xd5, 0x90, 0x10, 0x07, 0xce,
+	0x24, 0x79, 0xbb, 0x28, 0x46, 0x81, 0xb4, 0x97, 0xb5, 0xc6, 0x84, 0xcc, 0x09, 0x60, 0x6d, 0x8f,
+	0xa9, 0x3d, 0x1c, 0x89, 0x97, 0x7f, 0xff, 0x9d, 0x4f, 0xa0, 0xa6, 0x22, 0xa9, 0x5d, 0x1d, 0xc6,
+	0x34, 0xf4, 0xfa, 0x98, 0x15, 0x2a, 0x9f, 0x13, 0x02, 0x35, 0x49, 0x7d, 0x61, 0x57, 0xb4, 0x5c,
+	0x8f, 0x9d, 0x9f, 0xac, 0x24, 0xcd, 0x1d, 0xce, 0xc5, 0xeb, 0xa5, 0x29, 0x67, 0x04, 0xcb, 0x3b,
+	0x9c, 0xab, 0x64, 0xc8, 0x55, 0xa8, 0x51, 0xce, 0x93, 0x1d, 0x34, 0xb6, 0x2f, 0x76, 0x8c, 0xc7,
+	0x20, 0x55, 0x51, 0xff, 0xc5, 0xdd, 0x50, 0x2a, 0xcf, 0x4a, 0xb5, 0xf5, 0x29, 0xd4, 0x73, 0x11,
+	0x69, 0x42, 0x75, 0x80, 0xc7, 0x7a, 0x03, 0x75, 0x57, 0x0d, 0xc9, 0x79, 0x58, 0x1c, 0x6b, 0xfe,
+	0x4a, 0xa2, 0x26, 0x93, 0x1b, 0x95, 0xeb, 0x96, 0xf3, 0x5b, 0x15, 0xde, 0x52, 0x79, 0x1e, 0x68,
+	0x58, 0xec, 0x70, 0x7e, 0x07, 0x25, 0x65, 0x81, 0x78, 0x3c, 0xc2, 0xf8, 0xf8, 0x65, 0xd6, 0xa2,
+	0x07, 0x4b, 0x09, 0xa4, 0x74, 0x4e, 0x2f, 0x9a, 0x0b, 0x53, 0xdf, 0x05, 0x01, 0x56, 0x5f, 0x02,
+	0x01, 0xce, 0xe2, 0xa4, 0xda, 0x2b, 0xe0, 0x24, 0xe7, 0xc7, 0x0a, 0x5c, 0x50, 0xe9, 0x14, 0xc7,
+	0x95, 0x73, 0x85, 0x42, 0xb9, 0xba, 0xb5, 0xc9, 0xe1, 0xeb, 0x31, 0xb9, 0x06, 0xcb, 0x03, 0x11,
+	0x85, 0x21, 0xca, 0xb4, 0xd6, 0x2d, 0x13, 0x52, 0xbb, 0xc9, 0xd2, 0x0e, 0xe7, 0x07, 0x1c, 0x3d,
+	0x37, 0x53, 0x25, 0x97, 0xa1, 0xd6, 0xc7, 0x60, 0xa8, 0x79, 0xa3, 0xb1, 0xfd, 0xa6, 0x69, 0xf2,
+	0x00, 0x83, 0x61, 0xa6, 0xaf, 0x95, 0xc8, 0x0d, 0xa8, 0xe7, 0x59, 0xa6, 0x35, 0xd8, 0x98, 0x08,
+	0x92, 0x2d, 0x66, 0x66, 0x85, 0xba, 0xb2, 0xed, 0xb1, 0x18, 0x3d, 0xa5, 0xa8, 0x1f, 0xd8, 0x92,
+	0xed, 0x9d, 0x6c, 0x31, 0xb7, 0xcd, 0xd5, 0x9d, 0x3f, 0x2d, 0x78, 0xa7, 0x80, 0xaf, 0x9b, 0x5e,
+	0xa6, 0x87, 0x28, 0x69, 0x8f, 0x4a, 0xfa, 0x9a, 0x3b, 0x8f, 0x4b, 0xb0, 0xea, 0xf5, 0xd1, 0x1b,
+	0x14, 0xac, 0x9f, 0x34, 0x20, 0x25, 0xa9, 0xf3, 0x57, 0x05, 0x56, 0x27, 0x4f, 0x41, 0x1d, 0xa3,
+	0xe2, 0xf0, 0xec, 0x18, 0xd5, 0x98, 0xec, 0xc3, 0x19, 0x0c, 0xc7, 0x2c, 0x8e, 0x42, 0xf5, 0x40,
+	0x66, 0x90, 0xfe, 0xf0, 0xe4, 0xb3, 0xec, 0xdc, 0x35, 0xd4, 0x13, 0xb6, 0x98, 0xf0, 0x40, 0x06,
+	0x00, 0x9c, 0xc6, 0x74, 0x88, 0x12, 0x63, 0x05, 0xdd, 0xea, 0xbc, 0xd0, 0x4d, 0xc2, 0xef, 0x67,
+	0x3e, 0x5d, 0xc3, 0x7d, 0xeb, 0x29, 0xac, 0x4f, 0xe5, 0x33, 0x83, 0xaa, 0xae, 0x99, 0x54, 0xd5,
+	0xd8, 0x6e, 0xcf, 0xd8, 0x9e, 0xe1, 0xc6, 0xa4, 0xb2, 0x3f, 0x2a, 0xd0, 0x30, 0x90, 0x39, 0xb3,
+	0x86, 0x6d, 0x00, 0x6d, 0x70, 0x8f, 0x05, 0x98, 0x54, 0xb0, 0xee, 0x1a, 0x12, 0xd2, 0x9f, 0x51,
+	0x91, 0x07, 0x73, 0x54, 0x44, 0xe5, 0x33, 0xb3, 0x1c, 0xea, 0x61, 0xd6, 0x71, 0x45, 0xda, 0x53,
+	0xa6, 0x33, 0x22, 0x61, 0xf5, 0x88, 0x05, 0xb8, 0x5f, 0x64, 0xb1, 0xa4, 0xb3, 0xd8, 0x9b, 0x33,
+	0x8b, 0x7b, 0xa6, 0x53, 0xb7, 0x14, 0xc3, 0xf9, 0x00, 0x9a, 0xe5, 0x2b, 0xaa, 0x32, 0x64, 0x43,
+	0xea, 0xe7, 0x75, 0x4a, 0x67, 0xce, 0x2f, 0x16, 0x90, 0xe9, 0x93, 0x38, 0xa9, 0xdc, 0x83, 0xeb,
+	0x22, 0xeb, 0x9d, 0x92, 0xfb, 0x61, 0x48, 0xc8, 0x2e, 0x34, 0x7a, 0x28, 0x24, 0x0b, 0x75, 0xc2,
+	0x29, 0x71, 0xbc, 0x7f, 0xfa, 0x91, 0xdf, 0x29, 0x0c, 0x5c, 0xd3, 0xda, 0xf9, 0x12, 0x2e, 0x9e,
+	0xaa, 0x6d, 0xf4, 0x42, 0xd6, 0x44, 0x2f, 0x74, 0x6a, 0x07, 0xe5, 0x10, 0x68, 0x96, 0x19, 0xc8,
+	0x09, 0x61, 0x5d, 0xd5, 0xf4, 0x76, 0x9f, 0xc6, 0xf2, 0x55, 0xf4, 0x37, 0x37, 0xa1, 0x9e, 0xc7,
+	0x9b, 0x59, 0xe8, 0x16, 0xac, 0x8c, 0xb3, 0x06, 0x34, 0x69, 0x70, 0xf2, 0xb9, 0xb3, 0x03, 0xc4,
+	0x4c, 0x36, 0x7d, 0x28, 0x2e, 0xc3, 0x22, 0x93, 0x38, 0xcc, 0xba, 0x8c, 0x37, 0xca, 0xfc, 0xae,
+	0xd5, 0xdd, 0x44, 0x67, 0xfb, 0xd7, 0x1a, 0xac, 0x17, 0x34, 0xab, 0xfe, 0x32, 0x0f, 0xc9, 0x23,
+	0x68, 0xde, 0x4f, 0x7f, 0xf7, 0x65, 0x3d, 0x2b, 0x79, 0xdb, 0xf4, 0x53, 0xfa, 0x05, 0xd8, 0xda,
+	0x98, 0xbd, 0x98, 0x64, 0xe4, 0x2c, 0x90, 0x9b, 0xb0, 0x92, 0x35, 0x8d, 0x93, 0x8e, 0x4a, 0xad,
+	0x64, 0xab, 0x69, 0x2e, 0xaa, 0x05, 0x67, 0x81, 0xdc, 0x4a, 0x8c, 0x55, 0x1b, 0x34, 0x6d, 0x6c,
+	0x34, 0x78, 0xad, 0x73, 0x33, 0x1a, 0x2a, 0x67, 0x81, 0x7c, 0x0b, 0x67, 0xef, 0x6b, 0xea, 0x4c,
+	0x9f, 0x54, 0xf2, 0xde, 0x64, 0x90, 0x13, 0x7a, 0xa4, 0x96, 0x53, 0x56, 0x9b, 0x7e, 0x95, 0x9d,
+	0x05, 0xf2, 0xb3, 0x05, 0xe7, 0xee, 0xa3, 0x2c, 0xbf, 0x50, 0xe4, 0xca, 0xec, 0x20, 0x27, 0xbc,
+	0x64, 0xad, 0xdd, 0xb9, 0x50, 0x35, 0xe9, 0xd3, 0x59, 0x20, 0xfb, 0x7a, 0xcf, 0x05, 0x3a, 0xc8,
+	0xc5, 0x99, 0x30, 0xc8, 0x4b, 0xd7, 0x3e, 0x69, 0x39, 0xdb, 0xe7, 0x67, 0xb7, 0xfe, 0x79, 0xde,
+	0xb6, 0xfe, 0x7d, 0xde, 0xb6, 0xfe, 0x7b, 0xde, 0xb6, 0xbe, 0xfe, 0xe8, 0xb4, 0x2f, 0x0a, 0xc6,
+	0x97, 0x0f, 0xca, 0x99, 0x17, 0x30, 0x0c, 0xe5, 0xe1, 0x92, 0xfe, 0x7e, 0xf0, 0xf1, 0xff, 0x01,
+	0x00, 0x00, 0xff, 0xff, 0xaa, 0x90, 0xca, 0xf2, 0x18, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2160,6 +2170,16 @@ func (m *RepoServerRevisionMetadataRequest) MarshalToSizedBuffer(dAtA []byte) (i
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
+	if m.CheckSignature {
+		i--
+		if m.CheckSignature {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x18
+	}
 	if len(m.Revision) > 0 {
 		i -= len(m.Revision)
 		copy(dAtA[i:], m.Revision)
@@ -2887,6 +2907,9 @@ func (m *RepoServerRevisionMetadataRequest) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovRepository(uint64(l))
 	}
+	if m.CheckSignature {
+		n += 2
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -4844,6 +4867,26 @@ func (m *RepoServerRevisionMetadataRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.Revision = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 3:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CheckSignature", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRepository
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.CheckSignature = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipRepository(dAtA[iNdEx:])
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
index 2c51afef0..10a08a773 100644
--- a/reposerver/repository/repository.go
+++ b/reposerver/repository/repository.go
@@ -1121,8 +1121,20 @@ func (s *Service) GetRevisionMetadata(ctx context.Context, q *apiclient.RepoServ
 	}
 	metadata, err := s.cache.GetRevisionMetadata(q.Repo.Repo, q.Revision)
 	if err == nil {
-		log.Infof("revision metadata cache hit: %s/%s", q.Repo.Repo, q.Revision)
-		return metadata, nil
+		// The logic here is that if a signature check on metadata is requested,
+		// but there is none in the cache, we handle as if we have a cache miss
+		// and re-generate the meta data. Otherwise, if there is signature info
+		// in the metadata, but none was requested, we remove it from the data
+		// that we return.
+		if q.CheckSignature && metadata.SignatureInfo == "" {
+			log.Infof("revision metadata cache hit, but need to regenerate due to missing signature info: %s/%s", q.Repo.Repo, q.Revision)
+		} else {
+			log.Infof("revision metadata cache hit: %s/%s", q.Repo.Repo, q.Revision)
+			if !q.CheckSignature {
+				metadata.SignatureInfo = ""
+			}
+			return metadata, nil
+		}
 	} else {
 		if err != reposervercache.ErrCacheMiss {
 			log.Warnf("revision metadata cache error %s/%s: %v", q.Repo.Repo, q.Revision, err)
@@ -1156,7 +1168,7 @@ func (s *Service) GetRevisionMetadata(ctx context.Context, q *apiclient.RepoServ
 
 	// Run gpg verify-commit on the revision
 	signatureInfo := ""
-	if gpg.IsGPGEnabled() {
+	if gpg.IsGPGEnabled() && q.CheckSignature {
 		cs, err := gitClient.VerifyCommitSignature(q.Revision)
 		if err != nil {
 			log.Debugf("Could not verify commit signature: %v", err)
diff --git a/reposerver/repository/repository.proto b/reposerver/repository/repository.proto
index 7802aab3d..986d14092 100644
--- a/reposerver/repository/repository.proto
+++ b/reposerver/repository/repository.proto
@@ -81,6 +81,8 @@ message RepoServerRevisionMetadataRequest {
     github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 1;
     // the revision within the repo
     string revision = 2;
+    // whether to check signature on revision
+    bool checkSignature = 3;
 }
 
 // KsonnetAppSpec contains Ksonnet app response
diff --git a/server/application/application.go b/server/application/application.go
index 1f5d22f80..b8ddab2db 100644
--- a/server/application/application.go
+++ b/server/application/application.go
@@ -982,12 +982,22 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe
 	if err != nil {
 		return nil, err
 	}
+	// We need to get some information with the project associated to the app,
+	// so we'll know whether GPG signatures are enforced.
+	proj, err := argo.GetAppProject(&a.Spec, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), a.Namespace, s.settingsMgr)
+	if err != nil {
+		return nil, err
+	}
 	conn, repoClient, err := s.repoClientset.NewRepoServerClient()
 	if err != nil {
 		return nil, err
 	}
 	defer io.Close(conn)
-	return repoClient.GetRevisionMetadata(ctx, &apiclient.RepoServerRevisionMetadataRequest{Repo: repo, Revision: q.GetRevision()})
+	return repoClient.GetRevisionMetadata(ctx, &apiclient.RepoServerRevisionMetadataRequest{
+		Repo:           repo,
+		Revision:       q.GetRevision(),
+		CheckSignature: len(proj.Spec.SignatureKeys) > 0,
+	})
 }
 
 func isMatchingResource(q *application.ResourcesQuery, key kube.ResourceKey) bool {


Test patch:
diff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go
index a2ac2ab0c..c74015b27 100644
--- a/reposerver/repository/repository_test.go
+++ b/reposerver/repository/repository_test.go
@@ -963,8 +963,9 @@ func TestGetRevisionMetadata(t *testing.T) {
 	}, nil)
 
 	res, err := service.GetRevisionMetadata(context.Background(), &apiclient.RepoServerRevisionMetadataRequest{
-		Repo:     &argoappv1.Repository{},
-		Revision: "c0b400fc458875d925171398f9ba9eabd5529923",
+		Repo:           &argoappv1.Repository{},
+		Revision:       "c0b400fc458875d925171398f9ba9eabd5529923",
+		CheckSignature: true,
 	})
 
 	assert.NoError(t, err)
@@ -972,7 +973,34 @@ func TestGetRevisionMetadata(t *testing.T) {
 	assert.Equal(t, now, res.Date.Time)
 	assert.Equal(t, "author", res.Author)
 	assert.EqualValues(t, []string{"tag1", "tag2"}, res.Tags)
+	assert.NotEmpty(t, res.SignatureInfo)
 
+	// Cache hit - signature info should not be in result
+	res, err = service.GetRevisionMetadata(context.Background(), &apiclient.RepoServerRevisionMetadataRequest{
+		Repo:           &argoappv1.Repository{},
+		Revision:       "c0b400fc458875d925171398f9ba9eabd5529923",
+		CheckSignature: false,
+	})
+	assert.NoError(t, err)
+	assert.Empty(t, res.SignatureInfo)
+
+	// Enforce cache miss - signature info should not be in result
+	res, err = service.GetRevisionMetadata(context.Background(), &apiclient.RepoServerRevisionMetadataRequest{
+		Repo:           &argoappv1.Repository{},
+		Revision:       "c0b400fc458875d925171398f9ba9eabd5529924",
+		CheckSignature: false,
+	})
+	assert.NoError(t, err)
+	assert.Empty(t, res.SignatureInfo)
+
+	// Cache hit on previous entry that did not have signature info
+	res, err = service.GetRevisionMetadata(context.Background(), &apiclient.RepoServerRevisionMetadataRequest{
+		Repo:           &argoappv1.Repository{},
+		Revision:       "c0b400fc458875d925171398f9ba9eabd5529924",
+		CheckSignature: true,
+	})
+	assert.NoError(t, err)
+	assert.NotEmpty(t, res.SignatureInfo)
 }
 
 func TestGetSignatureVerificationResult(t *testing.T) {