kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

store gpg_key_primary_keyid for unknown gpg keys

Browse source 
we need to store the keyid to be able to update the signature later in
case the missing key is added later.
This commit is contained in:
Alexis Reigel 2017-06-15 12:43:04 +02:00
parent 34810acd6c
commit 5d5fd4babe
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/gpg_signature.rb
View file

@ -4,4 +4,5 @@ class GpgSignature < ActiveRecord::Base
validates :commit_sha, presence: true
validates :project, presence: true
validates :gpg_key_primary_keyid, presence: true
end

6
lib/gitlab/gpg/commit.rb
View file

@ -43,12 +43,14 @@ module Gitlab
end
def create_cached_signature!(gpg_key)
verified_signature_result = verified_signature
GpgSignature.create!(
commit_sha: commit.sha,
project: commit.project,
gpg_key: gpg_key,
gpg_key_primary_keyid: gpg_key&.primary_keyid,
valid_signature: !!(gpg_key && gpg_key.verified? && verified_signature.valid?)
gpg_key_primary_keyid: gpg_key&.primary_keyid || verified_signature_result.fingerprint,
valid_signature: !!(gpg_key && gpg_key.verified? && verified_signature_result.valid?)
)
end
end

2
spec/lib/gitlab/gpg/commit_spec.rb
View file

@ -100,7 +100,7 @@ RSpec.describe Gitlab::Gpg::Commit do
commit_sha: '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33',
project: project,
gpg_key: nil,
gpg_key_primary_keyid: nil,
gpg_key_primary_keyid: GpgHelpers::User1.primary_keyid,
valid_signature: false
)
end

1
spec/models/gpg_signature_spec.rb
View file

@ -10,5 +10,6 @@ RSpec.describe GpgSignature do
subject { described_class.new }
it { is_expected.to validate_presence_of(:commit_sha) }
it { is_expected.to validate_presence_of(:project) }
it { is_expected.to validate_presence_of(:gpg_key_primary_keyid) }
end
end