Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ jobs:
runs-on: macos-14
env:
HOMEBREW_TEST_BOT_ANALYTICS: 1
HOMEBREW_ENFORCE_SBOM: 1
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down
8 changes: 6 additions & 2 deletions Library/Homebrew/formula.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2579,9 +2579,13 @@ def to_hash_with_variations(hash_method: :to_hash)

# Returns the bottle information for a formula.
def bottle_hash(compact_for_api: false)
bottle_spec = T.must(stable).bottle_specification

hash = {}
stable_spec = stable
return hash unless stable_spec
return hash unless bottle_defined?

bottle_spec = stable_spec.bottle_specification

hash["rebuild"] = bottle_spec.rebuild if !compact_for_api || !bottle_spec.rebuild.zero?
hash["root_url"] = bottle_spec.root_url unless compact_for_api
hash["files"] = {}
Expand Down
41 changes: 27 additions & 14 deletions Library/Homebrew/sbom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ class SBOM
# Instantiates a {SBOM} for a new installation of a formula.
sig { params(formula: Formula, tab: Tab).returns(T.attached_class) }
def self.create(formula, tab)
active_spec = if formula.stable?
T.must(formula.stable)
else
T.must(formula.head)
end
active_spec_sym = formula.active_spec_sym

attributes = {
name: formula.name,
homebrew_version: HOMEBREW_VERSION,
Expand All @@ -32,13 +39,13 @@ def self.create(formula, tab)
path: formula.specified_path.to_s,
tap: formula.tap&.name,
tap_git_head: nil, # Filled in later if possible
spec: formula.active_spec_sym.to_s,
patches: formula.stable&.patches,
spec: active_spec_sym.to_s,
patches: active_spec.patches,
bottle: formula.bottle_hash,
stable: {
version: formula.stable&.version,
url: formula.stable&.url,
checksum: formula.stable&.checksum,
active_spec_sym => {
version: active_spec.version,
url: active_spec.url,
checksum: active_spec.checksum,
},
},
}
Expand Down Expand Up @@ -230,7 +237,8 @@ def generate_relations_json(runtime_dependency_declaration, compiler_declaration
}
def generate_packages_json(runtime_dependency_declaration, compiler_declaration, bottling:)
bottle = []
if !bottling && (bottle_info = get_bottle_info(source[:bottle]))
if !bottling && (bottle_info = get_bottle_info(source[:bottle])) &&
(stable_version = source.dig(:stable, :version))
bottle << {
SPDXID: "SPDXRef-Bottle-#{name}",
name: name.to_s,
Expand Down Expand Up @@ -267,18 +275,18 @@ def generate_packages_json(runtime_dependency_declaration, compiler_declaration,
{
SPDXID: "SPDXRef-Archive-#{name}-src",
name: name.to_s,
versionInfo: stable_version.to_s,
versionInfo: spec_version.to_s,
filesAnalyzed: false,
licenseDeclared: assert_value(nil),
builtDate: source_modified_time.to_s,
licenseConcluded: assert_value(license),
downloadLocation: source[:stable][:url],
downloadLocation: source[spec_symbol][:url],
copyrightText: assert_value(nil),
externalRefs: [],
checksums: [
{
algorithm: "SHA256",
checksumValue: source[:stable][:checksum].to_s,
checksumValue: source[spec_symbol][:checksum].to_s,
},
],
},
Expand Down Expand Up @@ -362,13 +370,13 @@ def to_spdx_sbom(bottling:)
{
SPDXID: "SPDXRef-DOCUMENT",
spdxVersion: "SPDX-2.3",
name: "SBOM-SPDX-#{name}-#{stable_version}",
name: "SBOM-SPDX-#{name}-#{spec_version}",
creationInfo: {
created: (Time.at(time).utc if time.present? && !bottling),
creators: ["Tool: https://github.com/homebrew/brew@#{homebrew_version}"],
},
dataLicense: "CC0-1.0",
documentNamespace: "https://formulae.brew.sh/spdx/#{name}-#{stable_version}.json",
documentNamespace: "https://formulae.brew.sh/spdx/#{name}-#{spec_version}.json",
documentDescribes: packages.map { |dependency| dependency[:SPDXID] },
files: [],
packages:,
Expand Down Expand Up @@ -397,9 +405,14 @@ def tap
Tap.fetch(tap_name) if tap_name
end

sig { returns(Symbol) }
def spec_symbol
source.fetch(:spec).to_sym
end

sig { returns(T.nilable(Version)) }
def stable_version
source[:stable][:version]
def spec_version
source.fetch(spec_symbol)[:version]
end

sig { returns(Time) }
Expand Down