admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
William Woodruff 2024-04-09 10:18:08 -04:00 committed by GitHub
parent a99100bb6d
commit ca6db49859
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/attestation.rb
View File

@ -38,7 +38,7 @@ module Homebrew
def self.check_attestation(bottle, signing_repo, signing_workflow = nil) def self.check_attestation(bottle, signing_repo, signing_workflow = nil)
cmd = [HOMEBREW_GH, "attestation", "verify", bottle.cached_download, "--repo", signing_repo, "--format", "json"] cmd = [HOMEBREW_GH, "attestation", "verify", bottle.cached_download, "--repo", signing_repo, "--format", "json"]
cmd += ["--cert-identity", signing_workflow] unless signing_workflow.nil? cmd += ["--cert-identity", signing_workflow] if signing_workflow.present?
begin begin
output = Utils.safe_popen_read(*cmd) output = Utils.safe_popen_read(*cmd)
@ -52,7 +52,7 @@ module Homebrew
raise InvalidAttestationError, "attestation verification returned malformed JSON" raise InvalidAttestationError, "attestation verification returned malformed JSON"
end end
raise InvalidAttestationError, "attestation output is empty" if data.empty? raise InvalidAttestationError, "attestation output is empty" if data.blank?
data data
end end
@ -71,7 +71,7 @@ module Homebrew
attestation = check_attestation bottle, HOMEBREW_CORE_REPO attestation = check_attestation bottle, HOMEBREW_CORE_REPO
return attestation return attestation
rescue InvalidAttestationError rescue InvalidAttestationError
odebug "falling back on backfilled attestation" odebug "falling back on backfilled attestation for #{bottle}"
backfill_attestation = check_attestation bottle, BACKFILL_REPO, BACKFILL_REPO_CI_URI backfill_attestation = check_attestation bottle, BACKFILL_REPO, BACKFILL_REPO_CI_URI
timestamp = backfill_attestation.dig(0, "verificationResult", "verifiedTimestamps", timestamp = backfill_attestation.dig(0, "verificationResult", "verifiedTimestamps",
0, "timestamp") 0, "timestamp")