Skip to content
Snippets Groups Projects
Commit a3a63b01 authored by Alexis Reigel's avatar Alexis Reigel :coffee:
Browse files

store gpg_key_primary_keyid for unknown gpg keys

we need to store the keyid to be able to update the signature later in
case the missing key is added later.
parent 691769ab
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !9546. Comments created here will be created in the context of that merge request.
......@@ -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
......@@ -43,12 +43,14 @@ def verified_signature
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
......
......@@ -100,7 +100,7 @@
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
......
......@@ -10,5 +10,6 @@
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment