From 5e2210c9b19a48fd6ddedce56363d387e09644f7 Mon Sep 17 00:00:00 2001 From: Julian Scholle Date: Thu, 5 Oct 2017 21:12:11 +0200 Subject: [PATCH 1/2] GPG key email verification no longer case sensitive (#2661) Signed-off-by: Julian Scholle --- models/gpg_key.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/gpg_key.go b/models/gpg_key.go index 8823ad0c95c33..b12d5f88bf491 100644 --- a/models/gpg_key.go +++ b/models/gpg_key.go @@ -402,7 +402,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification { //Pre-check (& optimization) that emails attached to key can be attached to the commiter email and can validate canValidate := false for _, e := range k.Emails { - if e.IsActivated && e.Email == c.Committer.Email { + if e.IsActivated && strings.ToLower(e.Email) == strings.ToLower(c.Committer.Email) { canValidate = true break } From 57d939755c8c6c59feb5947d945927a80e85c2ea Mon Sep 17 00:00:00 2001 From: Julian Scholle Date: Fri, 6 Oct 2017 20:29:38 +0200 Subject: [PATCH 2/2] case insensitive GPG key email verification now cached (#2661) Signed-off-by: Julian Scholle --- models/gpg_key.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/gpg_key.go b/models/gpg_key.go index b12d5f88bf491..6959f373c93b5 100644 --- a/models/gpg_key.go +++ b/models/gpg_key.go @@ -401,8 +401,9 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification { for _, k := range keys { //Pre-check (& optimization) that emails attached to key can be attached to the commiter email and can validate canValidate := false + lowerCommiterEmail := strings.ToLower(c.Committer.Email) for _, e := range k.Emails { - if e.IsActivated && strings.ToLower(e.Email) == strings.ToLower(c.Committer.Email) { + if e.IsActivated && strings.ToLower(e.Email) == lowerCommiterEmail { canValidate = true break }