diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2017-09-30 01:55:36 +0300 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2017-10-05 16:25:27 +0300 |
| commit | c50725fecfb776d56c95ef070940ca6c85786ecf (patch) | |
| tree | 86695f75d9f3ef3595ed1970ccb960898098cba7 /lib/gitlab/gpg | |
| parent | c2c35ae7971d19396078bdec6474fdd58f66000c (diff) | |
Address feedback from last code review
Diffstat (limited to 'lib/gitlab/gpg')
| -rw-r--r-- | lib/gitlab/gpg/commit.rb | 8 | ||||
| -rw-r--r-- | lib/gitlab/gpg/invalid_gpg_signature_updater.rb | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/lib/gitlab/gpg/commit.rb b/lib/gitlab/gpg/commit.rb index 5cbc836314f..961c57ec0e6 100644 --- a/lib/gitlab/gpg/commit.rb +++ b/lib/gitlab/gpg/commit.rb @@ -74,7 +74,7 @@ module Gitlab commit_sha: @commit.sha, project: @commit.project, gpg_key: gpg_key, - gpg_key_primary_keyid: gpg_keyid(gpg_key) || verified_signature.fingerprint, + gpg_key_primary_keyid: gpg_key&.keyid || verified_signature.fingerprint, gpg_key_user_name: user_infos[:name], gpg_key_user_email: user_infos[:email], verification_status: verification_status @@ -99,12 +99,6 @@ module Gitlab gpg_key&.verified_user_infos&.first || gpg_key&.user_infos&.first || {} end - def gpg_keyid(gpg_key) - return nil unless gpg_key - - gpg_key.is_a?(GpgKey) ? gpg_key.primary_keyid : gpg_key.keyid - end - def find_gpg_key(keyid) GpgKey.find_by(primary_keyid: keyid) || GpgKeySubkey.find_by(keyid: keyid) end diff --git a/lib/gitlab/gpg/invalid_gpg_signature_updater.rb b/lib/gitlab/gpg/invalid_gpg_signature_updater.rb index 9bad914848d..b7fb9dde2bc 100644 --- a/lib/gitlab/gpg/invalid_gpg_signature_updater.rb +++ b/lib/gitlab/gpg/invalid_gpg_signature_updater.rb @@ -3,14 +3,13 @@ module Gitlab class InvalidGpgSignatureUpdater def initialize(gpg_key) @gpg_key = gpg_key - @gpg_keyids = gpg_key.subkeys.map(&:keyid).push(gpg_key.primary_keyid) end def run GpgSignature .select(:id, :commit_sha, :project_id) .where('gpg_key_id IS NULL OR verification_status <> ?', GpgSignature.verification_statuses[:verified]) - .where(gpg_key_primary_keyid: @gpg_keyids) + .where(gpg_key_primary_keyid: @gpg_key.keyids) .find_each { |sig| sig.gpg_commit.update_signature!(sig) } end end |