mirror of
https://github.com/anchore/syft.git
synced 2025-11-17 08:23:15 +01:00
Add pacman (alpm) parser support (#943)
Co-authored-by: Christopher Phillips <christopher.phillips@anchore.com>
This commit is contained in:
parent
f15d4a9984
commit
e72d68b0c6
1
go.mod
1
go.mod
@ -61,6 +61,7 @@ require (
|
|||||||
github.com/sigstore/cosign v1.9.0
|
github.com/sigstore/cosign v1.9.0
|
||||||
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3
|
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3
|
||||||
github.com/sigstore/sigstore v1.2.1-0.20220424143412-3d41663116d5
|
github.com/sigstore/sigstore v1.2.1-0.20220424143412-3d41663116d5
|
||||||
|
github.com/vbatts/go-mtree v0.5.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
|||||||
3
go.sum
3
go.sum
@ -1871,6 +1871,7 @@ github.com/sigstore/sigstore v1.2.1-0.20220424143412-3d41663116d5/go.mod h1:OvpZ
|
|||||||
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
|
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
|
||||||
github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
|
github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
|
||||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||||
|
github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||||
github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||||
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
|
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
|
||||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||||
@ -2040,6 +2041,8 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC
|
|||||||
github.com/valyala/fasthttp v1.30.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus=
|
github.com/valyala/fasthttp v1.30.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus=
|
||||||
github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8=
|
github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8=
|
||||||
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
|
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
|
||||||
|
github.com/vbatts/go-mtree v0.5.0 h1:dM+5XZdqH0j9CSZeerhoN/tAySdwnmevaZHO1XGW2Vc=
|
||||||
|
github.com/vbatts/go-mtree v0.5.0/go.mod h1:7JbaNHyBMng+RP8C3Q4E+4Ca8JnGQA2R/MB+jb4tSOk=
|
||||||
github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME=
|
github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME=
|
||||||
github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI=
|
github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI=
|
||||||
github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
|
github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
|
||||||
|
|||||||
@ -6,5 +6,5 @@ const (
|
|||||||
|
|
||||||
// JSONSchemaVersion is the current schema version output by the JSON encoder
|
// JSONSchemaVersion is the current schema version output by the JSON encoder
|
||||||
// This is roughly following the "SchemaVer" guidelines for versioning the JSON schema. Please see schema/json/README.md for details on how to increment.
|
// This is roughly following the "SchemaVer" guidelines for versioning the JSON schema. Please see schema/json/README.md for details on how to increment.
|
||||||
JSONSchemaVersion = "3.2.4"
|
JSONSchemaVersion = "3.3.0"
|
||||||
)
|
)
|
||||||
|
|||||||
@ -9,6 +9,8 @@ import (
|
|||||||
func SourceInfo(p pkg.Package) string {
|
func SourceInfo(p pkg.Package) string {
|
||||||
answer := ""
|
answer := ""
|
||||||
switch p.Type {
|
switch p.Type {
|
||||||
|
case pkg.AlpmPkg:
|
||||||
|
answer = "acquired package info from ALPM DB"
|
||||||
case pkg.RpmPkg:
|
case pkg.RpmPkg:
|
||||||
answer = "acquired package info from RPM DB"
|
answer = "acquired package info from RPM DB"
|
||||||
case pkg.ApkPkg:
|
case pkg.ApkPkg:
|
||||||
|
|||||||
@ -142,6 +142,14 @@ func Test_SourceInfo(t *testing.T) {
|
|||||||
"from dotnet project assets file",
|
"from dotnet project assets file",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
input: pkg.Package{
|
||||||
|
Type: pkg.AlpmPkg,
|
||||||
|
},
|
||||||
|
expected: []string{
|
||||||
|
"from ALPM DB",
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
var pkgTypes []pkg.Type
|
var pkgTypes []pkg.Type
|
||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
|
|||||||
@ -61,7 +61,7 @@ func TestSPDXJSONSPDXIDs(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
true,
|
*updateSpdxTagValue,
|
||||||
spdxTagValueRedactor,
|
spdxTagValueRedactor,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,11 +2,11 @@ SPDXVersion: SPDX-2.2
|
|||||||
DataLicense: CC0-1.0
|
DataLicense: CC0-1.0
|
||||||
SPDXID: SPDXRef-DOCUMENT
|
SPDXID: SPDXRef-DOCUMENT
|
||||||
DocumentName: .
|
DocumentName: .
|
||||||
DocumentNamespace: https://anchore.com/syft/dir/422d92b9-57e8-44ee-8039-f75c1d19be87
|
DocumentNamespace: https://anchore.com/syft/dir/bdb67358-651c-4dd8-b5ee-5318936eb16a
|
||||||
LicenseListVersion: 3.17
|
LicenseListVersion: 3.17
|
||||||
Creator: Organization: Anchore, Inc
|
Creator: Organization: Anchore, Inc
|
||||||
Creator: Tool: syft-v0.42.0-bogus
|
Creator: Tool: syft-v0.42.0-bogus
|
||||||
Created: 2022-05-24T22:52:02Z
|
Created: 2022-06-07T19:33:39Z
|
||||||
|
|
||||||
##### Package: @at-sign
|
##### Package: @at-sign
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,10 @@ type LinuxRelease struct {
|
|||||||
IDLike IDLikes `json:"idLike,omitempty"`
|
IDLike IDLikes `json:"idLike,omitempty"`
|
||||||
Version string `json:"version,omitempty"`
|
Version string `json:"version,omitempty"`
|
||||||
VersionID string `json:"versionID,omitempty"`
|
VersionID string `json:"versionID,omitempty"`
|
||||||
|
VersionCodename string `json:"versionCodename,omitempty"`
|
||||||
|
BuildID string `json:"buildID,omitempty"`
|
||||||
|
ImageID string `json:"imageID,omitempty"`
|
||||||
|
ImageVersion string `json:"imageVersion,omitempty"`
|
||||||
Variant string `json:"variant,omitempty"`
|
Variant string `json:"variant,omitempty"`
|
||||||
VariantID string `json:"variantID,omitempty"`
|
VariantID string `json:"variantID,omitempty"`
|
||||||
HomeURL string `json:"homeURL,omitempty"`
|
HomeURL string `json:"homeURL,omitempty"`
|
||||||
|
|||||||
@ -47,7 +47,6 @@ func (p *packageMetadataUnpacker) String() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// UnmarshalJSON is a custom unmarshaller for handling basic values and values with ambiguous types.
|
// UnmarshalJSON is a custom unmarshaller for handling basic values and values with ambiguous types.
|
||||||
// nolint:funlen
|
|
||||||
func (p *Package) UnmarshalJSON(b []byte) error {
|
func (p *Package) UnmarshalJSON(b []byte) error {
|
||||||
var basic PackageBasicData
|
var basic PackageBasicData
|
||||||
if err := json.Unmarshal(b, &basic); err != nil {
|
if err := json.Unmarshal(b, &basic); err != nil {
|
||||||
@ -61,9 +60,19 @@ func (p *Package) UnmarshalJSON(b []byte) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
p.MetadataType = unpacker.MetadataType
|
return unpackMetadata(p, unpacker)
|
||||||
|
}
|
||||||
|
|
||||||
|
// nolint:funlen
|
||||||
|
func unpackMetadata(p *Package, unpacker packageMetadataUnpacker) error {
|
||||||
|
p.MetadataType = unpacker.MetadataType
|
||||||
switch p.MetadataType {
|
switch p.MetadataType {
|
||||||
|
case pkg.AlpmMetadataType:
|
||||||
|
var payload pkg.AlpmMetadata
|
||||||
|
if err := json.Unmarshal(unpacker.Metadata, &payload); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
p.Metadata = payload
|
||||||
case pkg.ApkMetadataType:
|
case pkg.ApkMetadataType:
|
||||||
var payload pkg.ApkMetadata
|
var payload pkg.ApkMetadata
|
||||||
if err := json.Unmarshal(unpacker.Metadata, &payload); err != nil {
|
if err := json.Unmarshal(unpacker.Metadata, &payload); err != nil {
|
||||||
|
|||||||
@ -88,7 +88,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"schema": {
|
"schema": {
|
||||||
"version": "3.2.4",
|
"version": "3.3.0",
|
||||||
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.4.json"
|
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.3.0.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -184,7 +184,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"schema": {
|
"schema": {
|
||||||
"version": "3.2.4",
|
"version": "3.3.0",
|
||||||
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.4.json"
|
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.3.0.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
"locations": [
|
"locations": [
|
||||||
{
|
{
|
||||||
"path": "/somefile-1.txt",
|
"path": "/somefile-1.txt",
|
||||||
"layerID": "sha256:fb6beecb75b39f4bb813dbf177e501edd5ddb3e69bb45cedeb78c676ee1b7a59"
|
"layerID": "sha256:7ef28e9c2d56471ee090b578a678bdf28c3b5a311ca7b2e28c2a4185e5bb34c0"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"licenses": [
|
"licenses": [
|
||||||
@ -40,7 +40,7 @@
|
|||||||
"locations": [
|
"locations": [
|
||||||
{
|
{
|
||||||
"path": "/somefile-2.txt",
|
"path": "/somefile-2.txt",
|
||||||
"layerID": "sha256:319b588ce64253a87b533c8ed01cf0025e0eac98e7b516e12532957e1244fdec"
|
"layerID": "sha256:86da8aee621161bea2efaf27a2709ddab5e7d44e30ecdfda728b02c03a28fd98"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"licenses": [],
|
"licenses": [],
|
||||||
@ -67,7 +67,7 @@
|
|||||||
"type": "image",
|
"type": "image",
|
||||||
"target": {
|
"target": {
|
||||||
"userInput": "user-image-input",
|
"userInput": "user-image-input",
|
||||||
"imageID": "sha256:2480160b55bec40c44d3b145c7b2c1c47160db8575c3dcae086d76b9370ae7ca",
|
"imageID": "sha256:5dd5f5f4247e4e946f555f0de7681a631a5240b614e52717d0aed04808e8c65f",
|
||||||
"manifestDigest": "sha256:2731251dc34951c0e50fcc643b4c5f74922dad1a5d98f302b504cf46cd5d9368",
|
"manifestDigest": "sha256:2731251dc34951c0e50fcc643b4c5f74922dad1a5d98f302b504cf46cd5d9368",
|
||||||
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
|
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
|
||||||
"tags": [
|
"tags": [
|
||||||
@ -77,17 +77,17 @@
|
|||||||
"layers": [
|
"layers": [
|
||||||
{
|
{
|
||||||
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
|
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
|
||||||
"digest": "sha256:fb6beecb75b39f4bb813dbf177e501edd5ddb3e69bb45cedeb78c676ee1b7a59",
|
"digest": "sha256:7ef28e9c2d56471ee090b578a678bdf28c3b5a311ca7b2e28c2a4185e5bb34c0",
|
||||||
"size": 22
|
"size": 22
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
|
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
|
||||||
"digest": "sha256:319b588ce64253a87b533c8ed01cf0025e0eac98e7b516e12532957e1244fdec",
|
"digest": "sha256:86da8aee621161bea2efaf27a2709ddab5e7d44e30ecdfda728b02c03a28fd98",
|
||||||
"size": 16
|
"size": 16
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"manifest": "eyJzY2hlbWFWZXJzaW9uIjoyLCJtZWRpYVR5cGUiOiJhcHBsaWNhdGlvbi92bmQuZG9ja2VyLmRpc3RyaWJ1dGlvbi5tYW5pZmVzdC52Mitqc29uIiwiY29uZmlnIjp7Im1lZGlhVHlwZSI6ImFwcGxpY2F0aW9uL3ZuZC5kb2NrZXIuY29udGFpbmVyLmltYWdlLnYxK2pzb24iLCJzaXplIjo2NjcsImRpZ2VzdCI6InNoYTI1NjoyNDgwMTYwYjU1YmVjNDBjNDRkM2IxNDVjN2IyYzFjNDcxNjBkYjg1NzVjM2RjYWUwODZkNzZiOTM3MGFlN2NhIn0sImxheWVycyI6W3sibWVkaWFUeXBlIjoiYXBwbGljYXRpb24vdm5kLmRvY2tlci5pbWFnZS5yb290ZnMuZGlmZi50YXIuZ3ppcCIsInNpemUiOjIwNDgsImRpZ2VzdCI6InNoYTI1NjpmYjZiZWVjYjc1YjM5ZjRiYjgxM2RiZjE3N2U1MDFlZGQ1ZGRiM2U2OWJiNDVjZWRlYjc4YzY3NmVlMWI3YTU5In0seyJtZWRpYVR5cGUiOiJhcHBsaWNhdGlvbi92bmQuZG9ja2VyLmltYWdlLnJvb3Rmcy5kaWZmLnRhci5nemlwIiwic2l6ZSI6MjA0OCwiZGlnZXN0Ijoic2hhMjU2OjMxOWI1ODhjZTY0MjUzYTg3YjUzM2M4ZWQwMWNmMDAyNWUwZWFjOThlN2I1MTZlMTI1MzI5NTdlMTI0NGZkZWMifV19",
|
"manifest": "eyJzY2hlbWFWZXJzaW9uIjoyLCJtZWRpYVR5cGUiOiJhcHBsaWNhdGlvbi92bmQuZG9ja2VyLmRpc3RyaWJ1dGlvbi5tYW5pZmVzdC52Mitqc29uIiwiY29uZmlnIjp7Im1lZGlhVHlwZSI6ImFwcGxpY2F0aW9uL3ZuZC5kb2NrZXIuY29udGFpbmVyLmltYWdlLnYxK2pzb24iLCJzaXplIjo2NzMsImRpZ2VzdCI6InNoYTI1Njo1ZGQ1ZjVmNDI0N2U0ZTk0NmY1NTVmMGRlNzY4MWE2MzFhNTI0MGI2MTRlNTI3MTdkMGFlZDA0ODA4ZThjNjVmIn0sImxheWVycyI6W3sibWVkaWFUeXBlIjoiYXBwbGljYXRpb24vdm5kLmRvY2tlci5pbWFnZS5yb290ZnMuZGlmZi50YXIuZ3ppcCIsInNpemUiOjIwNDgsImRpZ2VzdCI6InNoYTI1Njo3ZWYyOGU5YzJkNTY0NzFlZTA5MGI1NzhhNjc4YmRmMjhjM2I1YTMxMWNhN2IyZTI4YzJhNDE4NWU1YmIzNGMwIn0seyJtZWRpYVR5cGUiOiJhcHBsaWNhdGlvbi92bmQuZG9ja2VyLmltYWdlLnJvb3Rmcy5kaWZmLnRhci5nemlwIiwic2l6ZSI6MjA0OCwiZGlnZXN0Ijoic2hhMjU2Ojg2ZGE4YWVlNjIxMTYxYmVhMmVmYWYyN2EyNzA5ZGRhYjVlN2Q0NGUzMGVjZGZkYTcyOGIwMmMwM2EyOGZkOTgifV19",
|
||||||
"config": "eyJhcmNoaXRlY3R1cmUiOiJhbWQ2NCIsImNvbmZpZyI6eyJFbnYiOlsiUEFUSD0vdXNyL2xvY2FsL3NiaW46L3Vzci9sb2NhbC9iaW46L3Vzci9zYmluOi91c3IvYmluOi9zYmluOi9iaW4iXSwiV29ya2luZ0RpciI6Ii8iLCJPbkJ1aWxkIjpudWxsfSwiY3JlYXRlZCI6IjIwMjEtMTAtMDRUMTE6NDA6MDAuNjM4Mzk0NVoiLCJoaXN0b3J5IjpbeyJjcmVhdGVkIjoiMjAyMS0xMC0wNFQxMTo0MDowMC41OTA3MzE2WiIsImNyZWF0ZWRfYnkiOiJBREQgZmlsZS0xLnR4dCAvc29tZWZpbGUtMS50eHQgIyBidWlsZGtpdCIsImNvbW1lbnQiOiJidWlsZGtpdC5kb2NrZXJmaWxlLnYwIn0seyJjcmVhdGVkIjoiMjAyMS0xMC0wNFQxMTo0MDowMC42MzgzOTQ1WiIsImNyZWF0ZWRfYnkiOiJBREQgZmlsZS0yLnR4dCAvc29tZWZpbGUtMi50eHQgIyBidWlsZGtpdCIsImNvbW1lbnQiOiJidWlsZGtpdC5kb2NrZXJmaWxlLnYwIn1dLCJvcyI6ImxpbnV4Iiwicm9vdGZzIjp7InR5cGUiOiJsYXllcnMiLCJkaWZmX2lkcyI6WyJzaGEyNTY6ZmI2YmVlY2I3NWIzOWY0YmI4MTNkYmYxNzdlNTAxZWRkNWRkYjNlNjliYjQ1Y2VkZWI3OGM2NzZlZTFiN2E1OSIsInNoYTI1NjozMTliNTg4Y2U2NDI1M2E4N2I1MzNjOGVkMDFjZjAwMjVlMGVhYzk4ZTdiNTE2ZTEyNTMyOTU3ZTEyNDRmZGVjIl19fQ==",
|
"config": "eyJhcmNoaXRlY3R1cmUiOiJhbWQ2NCIsImNvbmZpZyI6eyJFbnYiOlsiUEFUSD0vdXNyL2xvY2FsL3NiaW46L3Vzci9sb2NhbC9iaW46L3Vzci9zYmluOi91c3IvYmluOi9zYmluOi9iaW4iXSwiV29ya2luZ0RpciI6Ii8iLCJPbkJ1aWxkIjpudWxsfSwiY3JlYXRlZCI6IjIwMjItMDYtMDJUMTQ6MzQ6MzQuNzE5MTM1MTc0WiIsImhpc3RvcnkiOlt7ImNyZWF0ZWQiOiIyMDIyLTA2LTAyVDE0OjM0OjM0LjY4NjkzMzI2M1oiLCJjcmVhdGVkX2J5IjoiQUREIGZpbGUtMS50eHQgL3NvbWVmaWxlLTEudHh0ICMgYnVpbGRraXQiLCJjb21tZW50IjoiYnVpbGRraXQuZG9ja2VyZmlsZS52MCJ9LHsiY3JlYXRlZCI6IjIwMjItMDYtMDJUMTQ6MzQ6MzQuNzE5MTM1MTc0WiIsImNyZWF0ZWRfYnkiOiJBREQgZmlsZS0yLnR4dCAvc29tZWZpbGUtMi50eHQgIyBidWlsZGtpdCIsImNvbW1lbnQiOiJidWlsZGtpdC5kb2NrZXJmaWxlLnYwIn1dLCJvcyI6ImxpbnV4Iiwicm9vdGZzIjp7InR5cGUiOiJsYXllcnMiLCJkaWZmX2lkcyI6WyJzaGEyNTY6N2VmMjhlOWMyZDU2NDcxZWUwOTBiNTc4YTY3OGJkZjI4YzNiNWEzMTFjYTdiMmUyOGMyYTQxODVlNWJiMzRjMCIsInNoYTI1Njo4NmRhOGFlZTYyMTE2MWJlYTJlZmFmMjdhMjcwOWRkYWI1ZTdkNDRlMzBlY2RmZGE3MjhiMDJjMDNhMjhmZDk4Il19fQ==",
|
||||||
"repoDigests": [],
|
"repoDigests": [],
|
||||||
"architecture": "",
|
"architecture": "",
|
||||||
"os": ""
|
"os": ""
|
||||||
@ -111,7 +111,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"schema": {
|
"schema": {
|
||||||
"version": "3.2.4",
|
"version": "3.3.0",
|
||||||
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.4.json"
|
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.3.0.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
@ -55,6 +55,10 @@ func toLinuxReleaser(d *linux.Release) model.LinuxRelease {
|
|||||||
IDLike: d.IDLike,
|
IDLike: d.IDLike,
|
||||||
Version: d.Version,
|
Version: d.Version,
|
||||||
VersionID: d.VersionID,
|
VersionID: d.VersionID,
|
||||||
|
VersionCodename: d.VersionCodename,
|
||||||
|
BuildID: d.BuildID,
|
||||||
|
ImageID: d.ImageID,
|
||||||
|
ImageVersion: d.ImageVersion,
|
||||||
Variant: d.Variant,
|
Variant: d.Variant,
|
||||||
VariantID: d.VariantID,
|
VariantID: d.VariantID,
|
||||||
HomeURL: d.HomeURL,
|
HomeURL: d.HomeURL,
|
||||||
|
|||||||
@ -38,6 +38,10 @@ func toSyftLinuxRelease(d model.LinuxRelease) *linux.Release {
|
|||||||
IDLike: d.IDLike,
|
IDLike: d.IDLike,
|
||||||
Version: d.Version,
|
Version: d.Version,
|
||||||
VersionID: d.VersionID,
|
VersionID: d.VersionID,
|
||||||
|
VersionCodename: d.VersionCodename,
|
||||||
|
BuildID: d.BuildID,
|
||||||
|
ImageID: d.ImageID,
|
||||||
|
ImageVersion: d.ImageVersion,
|
||||||
Variant: d.Variant,
|
Variant: d.Variant,
|
||||||
VariantID: d.VariantID,
|
VariantID: d.VariantID,
|
||||||
HomeURL: d.HomeURL,
|
HomeURL: d.HomeURL,
|
||||||
|
|||||||
@ -28,6 +28,7 @@ can be extended to include specific package metadata struct shapes in the future
|
|||||||
// not matter as long as it is exported.
|
// not matter as long as it is exported.
|
||||||
type artifactMetadataContainer struct {
|
type artifactMetadataContainer struct {
|
||||||
Apk pkg.ApkMetadata
|
Apk pkg.ApkMetadata
|
||||||
|
Alpm pkg.AlpmMetadata
|
||||||
Dpkg pkg.DpkgMetadata
|
Dpkg pkg.DpkgMetadata
|
||||||
Gem pkg.GemMetadata
|
Gem pkg.GemMetadata
|
||||||
Java pkg.JavaMetadata
|
Java pkg.JavaMetadata
|
||||||
|
|||||||
1417
schema/json/schema-3.3.0.json
Normal file
1417
schema/json/schema-3.3.0.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -111,6 +111,10 @@ func parseOsRelease(contents string) (*Release, error) {
|
|||||||
IDLike: idLike,
|
IDLike: idLike,
|
||||||
Version: values["VERSION"],
|
Version: values["VERSION"],
|
||||||
VersionID: values["VERSION_ID"],
|
VersionID: values["VERSION_ID"],
|
||||||
|
VersionCodename: values["VERSION_CODENAME"],
|
||||||
|
BuildID: values["BUILD_ID"],
|
||||||
|
ImageID: values["IMAGE_ID"],
|
||||||
|
ImageVersion: values["IMAGE_VERSION"],
|
||||||
Variant: values["VARIANT"],
|
Variant: values["VARIANT"],
|
||||||
VariantID: values["VARIANT_ID"],
|
VariantID: values["VARIANT_ID"],
|
||||||
HomeURL: values["HOME_URL"],
|
HomeURL: values["HOME_URL"],
|
||||||
|
|||||||
@ -125,6 +125,7 @@ func TestIdentifyRelease(t *testing.T) {
|
|||||||
ID: "ubuntu",
|
ID: "ubuntu",
|
||||||
IDLike: []string{"debian"},
|
IDLike: []string{"debian"},
|
||||||
Version: "20.04 LTS (Focal Fossa)",
|
Version: "20.04 LTS (Focal Fossa)",
|
||||||
|
VersionCodename: "focal",
|
||||||
VersionID: "20.04",
|
VersionID: "20.04",
|
||||||
HomeURL: "https://www.ubuntu.com/",
|
HomeURL: "https://www.ubuntu.com/",
|
||||||
SupportURL: "https://help.ubuntu.com/",
|
SupportURL: "https://help.ubuntu.com/",
|
||||||
@ -217,6 +218,7 @@ func TestIdentifyRelease(t *testing.T) {
|
|||||||
Name: "Arch Linux",
|
Name: "Arch Linux",
|
||||||
ID: "arch",
|
ID: "arch",
|
||||||
IDLike: nil,
|
IDLike: nil,
|
||||||
|
BuildID: "rolling",
|
||||||
HomeURL: "https://www.archlinux.org/",
|
HomeURL: "https://www.archlinux.org/",
|
||||||
SupportURL: "https://bbs.archlinux.org/",
|
SupportURL: "https://bbs.archlinux.org/",
|
||||||
BugReportURL: "https://bugs.archlinux.org/",
|
BugReportURL: "https://bugs.archlinux.org/",
|
||||||
@ -349,6 +351,7 @@ func TestParseOsRelease(t *testing.T) {
|
|||||||
IDLike: []string{"debian"},
|
IDLike: []string{"debian"},
|
||||||
Version: "20.04 LTS (Focal Fossa)",
|
Version: "20.04 LTS (Focal Fossa)",
|
||||||
VersionID: "20.04",
|
VersionID: "20.04",
|
||||||
|
VersionCodename: "focal",
|
||||||
HomeURL: "https://www.ubuntu.com/",
|
HomeURL: "https://www.ubuntu.com/",
|
||||||
SupportURL: "https://help.ubuntu.com/",
|
SupportURL: "https://help.ubuntu.com/",
|
||||||
BugReportURL: "https://bugs.launchpad.net/ubuntu/",
|
BugReportURL: "https://bugs.launchpad.net/ubuntu/",
|
||||||
|
|||||||
@ -8,6 +8,10 @@ type Release struct {
|
|||||||
IDLike []string `cyclonedx:"idLike"` // list of operating system identifiers in the same syntax as the ID= setting. It should list identifiers of operating systems that are closely related to the local operating system in regards to packaging and programming interfaces.
|
IDLike []string `cyclonedx:"idLike"` // list of operating system identifiers in the same syntax as the ID= setting. It should list identifiers of operating systems that are closely related to the local operating system in regards to packaging and programming interfaces.
|
||||||
Version string // identifies the operating system version, excluding any OS name information, possibly including a release code name, and suitable for presentation to the user.
|
Version string // identifies the operating system version, excluding any OS name information, possibly including a release code name, and suitable for presentation to the user.
|
||||||
VersionID string `cyclonedx:"versionID"` // identifies the operating system version, excluding any OS name information or release code name, and suitable for processing by scripts or usage in generated filenames.
|
VersionID string `cyclonedx:"versionID"` // identifies the operating system version, excluding any OS name information or release code name, and suitable for processing by scripts or usage in generated filenames.
|
||||||
|
VersionCodename string `cyclonedx:"versionCodename"`
|
||||||
|
BuildID string `cyclonedx:"buildID"` // A string uniquely identifying the system image originally used as the installation base.
|
||||||
|
ImageID string `cyclonedx:"imageID"`
|
||||||
|
ImageVersion string `cyclonedx:"imageVersion"`
|
||||||
Variant string `cyclonedx:"variant"` // identifies a specific variant or edition of the operating system suitable for presentation to the user.
|
Variant string `cyclonedx:"variant"` // identifies a specific variant or edition of the operating system suitable for presentation to the user.
|
||||||
VariantID string `cyclonedx:"variantID"` // identifies a specific variant or edition of the operating system. This may be interpreted by other packages in order to determine a divergent default configuration.
|
VariantID string `cyclonedx:"variantID"` // identifies a specific variant or edition of the operating system. This may be interpreted by other packages in order to determine a divergent default configuration.
|
||||||
HomeURL string
|
HomeURL string
|
||||||
@ -30,6 +34,9 @@ func (r *Release) String() string {
|
|||||||
if r.Version != "" {
|
if r.Version != "" {
|
||||||
return r.ID + " " + r.Version
|
return r.ID + " " + r.Version
|
||||||
}
|
}
|
||||||
|
if r.VersionID != "" {
|
||||||
return r.ID + " " + r.VersionID
|
return r.ID + " " + r.VersionID
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return r.ID + " " + r.BuildID
|
||||||
|
}
|
||||||
|
|||||||
80
syft/pkg/alpm_metadata.go
Normal file
80
syft/pkg/alpm_metadata.go
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
package pkg
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sort"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/anchore/packageurl-go"
|
||||||
|
"github.com/anchore/syft/syft/file"
|
||||||
|
"github.com/anchore/syft/syft/linux"
|
||||||
|
"github.com/scylladb/go-set/strset"
|
||||||
|
)
|
||||||
|
|
||||||
|
const AlpmDBGlob = "**/var/lib/pacman/local/**/desc"
|
||||||
|
|
||||||
|
type AlpmMetadata struct {
|
||||||
|
BasePackage string `mapstructure:"base" json:"basepackage"`
|
||||||
|
Package string `mapstructure:"name" json:"package"`
|
||||||
|
Version string `mapstructure:"version" json:"version"`
|
||||||
|
Description string `mapstructure:"desc" json:"description"`
|
||||||
|
Architecture string `mapstructure:"arch" json:"architecture"`
|
||||||
|
Size int `mapstructure:"size" json:"size" cyclonedx:"size"`
|
||||||
|
Packager string `mapstructure:"packager" json:"packager"`
|
||||||
|
License string `mapstructure:"license" json:"license"`
|
||||||
|
URL string `mapstructure:"url" json:"url"`
|
||||||
|
Validation string `mapstructure:"validation" json:"validation"`
|
||||||
|
Reason int `mapstructure:"reason" json:"reason"`
|
||||||
|
Files []AlpmFileRecord `mapstructure:"files" json:"files"`
|
||||||
|
Backup []AlpmFileRecord `mapstructure:"backup" json:"backup"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AlpmFileRecord struct {
|
||||||
|
Path string `mapstruture:"path" json:"path,omitempty"`
|
||||||
|
Type string `mapstructure:"type" json:"type,omitempty"`
|
||||||
|
UID string `mapstructure:"uid" json:"uid,omitempty"`
|
||||||
|
GID string `mapstructure:"gid" json:"gid,omitempty"`
|
||||||
|
Time time.Time `mapstructure:"time" json:"time,omitempty"`
|
||||||
|
Size string `mapstructure:"size" json:"size,omitempty"`
|
||||||
|
Link string `mapstructure:"link" json:"link,omitempty"`
|
||||||
|
Digests []file.Digest `mapstructure:"digests" json:"digest,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PackageURL returns the PURL for the specific Arch Linux package (see https://github.com/package-url/purl-spec)
|
||||||
|
func (m AlpmMetadata) PackageURL(distro *linux.Release) string {
|
||||||
|
qualifiers := map[string]string{
|
||||||
|
PURLQualifierArch: m.Architecture,
|
||||||
|
}
|
||||||
|
|
||||||
|
if m.BasePackage != "" {
|
||||||
|
qualifiers[PURLQualifierUpstream] = m.BasePackage
|
||||||
|
}
|
||||||
|
|
||||||
|
distroID := ""
|
||||||
|
if distro != nil {
|
||||||
|
distroID = distro.ID
|
||||||
|
}
|
||||||
|
|
||||||
|
return packageurl.NewPackageURL(
|
||||||
|
"alpm",
|
||||||
|
distroID,
|
||||||
|
m.Package,
|
||||||
|
m.Version,
|
||||||
|
purlQualifiers(
|
||||||
|
qualifiers,
|
||||||
|
distro,
|
||||||
|
),
|
||||||
|
"",
|
||||||
|
).ToString()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m AlpmMetadata) OwnedFiles() (result []string) {
|
||||||
|
s := strset.New()
|
||||||
|
for _, f := range m.Files {
|
||||||
|
if f.Path != "" {
|
||||||
|
s.Add(f.Path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result = s.List()
|
||||||
|
sort.Strings(result)
|
||||||
|
return result
|
||||||
|
}
|
||||||
112
syft/pkg/alpm_metadata_test.go
Normal file
112
syft/pkg/alpm_metadata_test.go
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
package pkg
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/anchore/packageurl-go"
|
||||||
|
"github.com/anchore/syft/syft/linux"
|
||||||
|
"github.com/sergi/go-diff/diffmatchpatch"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestAlpmMetadata_pURL(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
metadata AlpmMetadata
|
||||||
|
distro linux.Release
|
||||||
|
expected string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "gocase",
|
||||||
|
metadata: AlpmMetadata{
|
||||||
|
Package: "p",
|
||||||
|
Version: "v",
|
||||||
|
Architecture: "a",
|
||||||
|
},
|
||||||
|
distro: linux.Release{
|
||||||
|
ID: "arch",
|
||||||
|
BuildID: "rolling",
|
||||||
|
},
|
||||||
|
expected: "pkg:alpm/arch/p@v?arch=a&distro=arch-rolling",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "missing architecture",
|
||||||
|
metadata: AlpmMetadata{
|
||||||
|
Package: "p",
|
||||||
|
Version: "v",
|
||||||
|
},
|
||||||
|
distro: linux.Release{
|
||||||
|
ID: "arch",
|
||||||
|
},
|
||||||
|
expected: "pkg:alpm/arch/p@v?distro=arch",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
metadata: AlpmMetadata{
|
||||||
|
Package: "python",
|
||||||
|
Version: "3.10.0",
|
||||||
|
Architecture: "any",
|
||||||
|
},
|
||||||
|
distro: linux.Release{
|
||||||
|
ID: "arch",
|
||||||
|
BuildID: "rolling",
|
||||||
|
},
|
||||||
|
expected: "pkg:alpm/arch/python@3.10.0?arch=any&distro=arch-rolling",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
metadata: AlpmMetadata{
|
||||||
|
Package: "g plus plus",
|
||||||
|
Version: "v84",
|
||||||
|
Architecture: "x86_64",
|
||||||
|
},
|
||||||
|
distro: linux.Release{
|
||||||
|
ID: "arch",
|
||||||
|
BuildID: "rolling",
|
||||||
|
},
|
||||||
|
expected: "pkg:alpm/arch/g%20plus%20plus@v84?arch=x86_64&distro=arch-rolling",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "add source information as qualifier",
|
||||||
|
metadata: AlpmMetadata{
|
||||||
|
Package: "p",
|
||||||
|
Version: "v",
|
||||||
|
Architecture: "a",
|
||||||
|
BasePackage: "origin",
|
||||||
|
},
|
||||||
|
distro: linux.Release{
|
||||||
|
ID: "arch",
|
||||||
|
BuildID: "rolling",
|
||||||
|
},
|
||||||
|
expected: "pkg:alpm/arch/p@v?arch=a&upstream=origin&distro=arch-rolling",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
t.Run(test.name, func(t *testing.T) {
|
||||||
|
actual := test.metadata.PackageURL(&test.distro)
|
||||||
|
if actual != test.expected {
|
||||||
|
dmp := diffmatchpatch.New()
|
||||||
|
diffs := dmp.DiffMain(test.expected, actual, true)
|
||||||
|
t.Errorf("diff: %s", dmp.DiffPrettyText(diffs))
|
||||||
|
}
|
||||||
|
// verify packageurl can parse
|
||||||
|
purl, err := packageurl.FromString(actual)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("cannot re-parse purl: %s", actual)
|
||||||
|
}
|
||||||
|
if purl.Name != test.metadata.Package {
|
||||||
|
dmp := diffmatchpatch.New()
|
||||||
|
diffs := dmp.DiffMain(test.metadata.Package, purl.Name, true)
|
||||||
|
t.Errorf("invalid purl name: %s", dmp.DiffPrettyText(diffs))
|
||||||
|
}
|
||||||
|
if purl.Version != test.metadata.Version {
|
||||||
|
dmp := diffmatchpatch.New()
|
||||||
|
diffs := dmp.DiffMain(test.metadata.Version, purl.Version, true)
|
||||||
|
t.Errorf("invalid purl version: %s", dmp.DiffPrettyText(diffs))
|
||||||
|
}
|
||||||
|
if purl.Qualifiers.Map()["arch"] != test.metadata.Architecture {
|
||||||
|
dmp := diffmatchpatch.New()
|
||||||
|
diffs := dmp.DiffMain(test.metadata.Architecture, purl.Qualifiers.Map()["arch"], true)
|
||||||
|
t.Errorf("invalid purl architecture: %s", dmp.DiffPrettyText(diffs))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,10 +1,11 @@
|
|||||||
package pkg
|
package pkg
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/anchore/syft/syft/linux"
|
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/anchore/syft/syft/linux"
|
||||||
|
|
||||||
"github.com/anchore/packageurl-go"
|
"github.com/anchore/packageurl-go"
|
||||||
"github.com/go-test/deep"
|
"github.com/go-test/deep"
|
||||||
"github.com/sergi/go-diff/diffmatchpatch"
|
"github.com/sergi/go-diff/diffmatchpatch"
|
||||||
|
|||||||
48
syft/pkg/cataloger/alpm/cataloger.go
Normal file
48
syft/pkg/cataloger/alpm/cataloger.go
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
package alpm
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/anchore/syft/internal"
|
||||||
|
"github.com/anchore/syft/syft/artifact"
|
||||||
|
"github.com/anchore/syft/syft/pkg"
|
||||||
|
"github.com/anchore/syft/syft/source"
|
||||||
|
)
|
||||||
|
|
||||||
|
const catalogerName = "alpmdb-cataloger"
|
||||||
|
|
||||||
|
type Cataloger struct{}
|
||||||
|
|
||||||
|
// NewAlpmdbCataloger returns a new ALPM DB cataloger object.
|
||||||
|
func NewAlpmdbCataloger() *Cataloger {
|
||||||
|
return &Cataloger{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Name returns a string that uniquely describes a cataloger
|
||||||
|
func (c *Cataloger) Name() string {
|
||||||
|
return catalogerName
|
||||||
|
}
|
||||||
|
|
||||||
|
// Catalog is given an object to resolve file references and content, this function returns any discovered Packages after analyzing rpm db installation.
|
||||||
|
func (c *Cataloger) Catalog(resolver source.FileResolver) ([]pkg.Package, []artifact.Relationship, error) {
|
||||||
|
fileMatches, err := resolver.FilesByGlob(pkg.AlpmDBGlob)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, fmt.Errorf("failed to find rpmdb's by glob: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var pkgs []pkg.Package
|
||||||
|
for _, location := range fileMatches {
|
||||||
|
dbContentReader, err := resolver.FileContentsByLocation(location)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
discoveredPkgs, err := parseAlpmDB(resolver, location.RealPath, dbContentReader)
|
||||||
|
internal.CloseAndLogError(dbContentReader, location.VirtualPath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, fmt.Errorf("unable to catalog package=%+v: %w", location.RealPath, err)
|
||||||
|
}
|
||||||
|
pkgs = append(pkgs, discoveredPkgs...)
|
||||||
|
}
|
||||||
|
return pkgs, nil, nil
|
||||||
|
}
|
||||||
245
syft/pkg/cataloger/alpm/parse_alpm_db.go
Normal file
245
syft/pkg/cataloger/alpm/parse_alpm_db.go
Normal file
@ -0,0 +1,245 @@
|
|||||||
|
package alpm
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"compress/gzip"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/anchore/syft/syft/file"
|
||||||
|
"github.com/anchore/syft/syft/pkg"
|
||||||
|
"github.com/anchore/syft/syft/source"
|
||||||
|
"github.com/mitchellh/mapstructure"
|
||||||
|
"github.com/vbatts/go-mtree"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ignoredFiles = map[string]bool{
|
||||||
|
"/set": true,
|
||||||
|
".BUILDINFO": true,
|
||||||
|
".PKGINFO": true,
|
||||||
|
"": true,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
func newAlpmDBPackage(d *pkg.AlpmMetadata) *pkg.Package {
|
||||||
|
return &pkg.Package{
|
||||||
|
Name: d.Package,
|
||||||
|
Version: d.Version,
|
||||||
|
FoundBy: catalogerName,
|
||||||
|
Type: "alpm",
|
||||||
|
Licenses: strings.Split(d.License, " "),
|
||||||
|
MetadataType: pkg.AlpmMetadataType,
|
||||||
|
Metadata: *d,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func newScanner(reader io.Reader) *bufio.Scanner {
|
||||||
|
// This is taken from the apk parser
|
||||||
|
// https://github.com/anchore/syft/blob/v0.47.0/syft/pkg/cataloger/apkdb/parse_apk_db.go#L37
|
||||||
|
const maxScannerCapacity = 1024 * 1024
|
||||||
|
bufScan := make([]byte, maxScannerCapacity)
|
||||||
|
scanner := bufio.NewScanner(reader)
|
||||||
|
scanner.Buffer(bufScan, maxScannerCapacity)
|
||||||
|
onDoubleLF := func(data []byte, atEOF bool) (advance int, token []byte, err error) {
|
||||||
|
for i := 0; i < len(data); i++ {
|
||||||
|
if i > 0 && data[i-1] == '\n' && data[i] == '\n' {
|
||||||
|
return i + 1, data[:i-1], nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !atEOF {
|
||||||
|
return 0, nil, nil
|
||||||
|
}
|
||||||
|
// deliver the last token (which could be an empty string)
|
||||||
|
return 0, data, bufio.ErrFinalToken
|
||||||
|
}
|
||||||
|
|
||||||
|
scanner.Split(onDoubleLF)
|
||||||
|
return scanner
|
||||||
|
}
|
||||||
|
|
||||||
|
func getFileReader(path string, resolver source.FileResolver) (io.Reader, error) {
|
||||||
|
locs, err := resolver.FilesByPath(path)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// TODO: Should we maybe check if we found the file
|
||||||
|
dbContentReader, err := resolver.FileContentsByLocation(locs[0])
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return dbContentReader, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// nolint:funlen
|
||||||
|
func parseDatabase(b *bufio.Scanner) (*pkg.AlpmMetadata, error) {
|
||||||
|
var entry pkg.AlpmMetadata
|
||||||
|
var err error
|
||||||
|
pkgFields := make(map[string]interface{})
|
||||||
|
for b.Scan() {
|
||||||
|
fields := strings.SplitN(b.Text(), "\n", 2)
|
||||||
|
|
||||||
|
// End of File
|
||||||
|
if len(fields) == 1 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
// The alpm database surrounds the keys with %.
|
||||||
|
key := strings.ReplaceAll(fields[0], "%", "")
|
||||||
|
key = strings.ToLower(key)
|
||||||
|
value := strings.TrimSpace(fields[1])
|
||||||
|
|
||||||
|
switch key {
|
||||||
|
case "files":
|
||||||
|
var files []map[string]string
|
||||||
|
for _, f := range strings.Split(value, "\n") {
|
||||||
|
path := fmt.Sprintf("/%s", f)
|
||||||
|
if ok := ignoredFiles[path]; !ok {
|
||||||
|
files = append(files, map[string]string{"path": path})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pkgFields[key] = files
|
||||||
|
case "backup":
|
||||||
|
var backup []map[string]interface{}
|
||||||
|
for _, f := range strings.Split(value, "\n") {
|
||||||
|
fields := strings.SplitN(f, "\t", 2)
|
||||||
|
path := fmt.Sprintf("/%s", fields[0])
|
||||||
|
if ok := ignoredFiles[path]; !ok {
|
||||||
|
backup = append(backup, map[string]interface{}{
|
||||||
|
"path": path,
|
||||||
|
"digests": []file.Digest{{
|
||||||
|
Algorithm: "md5",
|
||||||
|
Value: fields[1],
|
||||||
|
}}})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pkgFields[key] = backup
|
||||||
|
case "reason":
|
||||||
|
fallthrough
|
||||||
|
case "size":
|
||||||
|
pkgFields[key], err = strconv.ParseInt(value, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to parse %s to integer", value)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
pkgFields[key] = value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := mapstructure.Decode(pkgFields, &entry); err != nil {
|
||||||
|
return nil, fmt.Errorf("unable to parse ALPM metadata: %w", err)
|
||||||
|
}
|
||||||
|
if entry.Package == "" && len(entry.Files) == 0 && len(entry.Backup) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if entry.Backup == nil {
|
||||||
|
entry.Backup = make([]pkg.AlpmFileRecord, 0)
|
||||||
|
}
|
||||||
|
return &entry, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseMtree(r io.Reader) ([]pkg.AlpmFileRecord, error) {
|
||||||
|
var err error
|
||||||
|
var entries []pkg.AlpmFileRecord
|
||||||
|
|
||||||
|
r, err = gzip.NewReader(r)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
specDh, err := mtree.ParseSpec(r)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, f := range specDh.Entries {
|
||||||
|
var entry pkg.AlpmFileRecord
|
||||||
|
entry.Digests = make([]file.Digest, 0)
|
||||||
|
fileFields := make(map[string]interface{})
|
||||||
|
if ok := ignoredFiles[f.Name]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
path := fmt.Sprintf("/%s", f.Name)
|
||||||
|
fileFields["path"] = path
|
||||||
|
for _, kv := range f.Keywords {
|
||||||
|
kw := string(kv.Keyword())
|
||||||
|
switch kw {
|
||||||
|
case "time":
|
||||||
|
// All unix timestamps have a .0 suffixs.
|
||||||
|
v := strings.Split(kv.Value(), ".")
|
||||||
|
i, _ := strconv.ParseInt(v[0], 10, 64)
|
||||||
|
tm := time.Unix(i, 0)
|
||||||
|
fileFields[kw] = tm
|
||||||
|
case "sha256digest":
|
||||||
|
entry.Digests = append(entry.Digests, file.Digest{
|
||||||
|
Algorithm: "sha256",
|
||||||
|
Value: kv.Value(),
|
||||||
|
})
|
||||||
|
case "md5digest":
|
||||||
|
entry.Digests = append(entry.Digests, file.Digest{
|
||||||
|
Algorithm: "md5digest",
|
||||||
|
Value: kv.Value(),
|
||||||
|
})
|
||||||
|
default:
|
||||||
|
fileFields[kw] = kv.Value()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := mapstructure.Decode(fileFields, &entry); err != nil {
|
||||||
|
return nil, fmt.Errorf("unable to parse ALPM mtree data: %w", err)
|
||||||
|
}
|
||||||
|
entries = append(entries, entry)
|
||||||
|
}
|
||||||
|
return entries, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseAlpmDBEntry(reader io.Reader) (*pkg.AlpmMetadata, error) {
|
||||||
|
scanner := newScanner(reader)
|
||||||
|
metadata, err := parseDatabase(scanner)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if metadata == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return metadata, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseAlpmDB(resolver source.FileResolver, desc string, reader io.Reader) ([]pkg.Package, error) {
|
||||||
|
metadata, err := parseAlpmDBEntry(reader)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
base := filepath.Dir(desc)
|
||||||
|
mtree := filepath.Join(base, "mtree")
|
||||||
|
r, err := getFileReader(mtree, resolver)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
pkgFiles, err := parseMtree(r)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// The replace the files found the the pacman database with the files from the mtree These contain more metadata and
|
||||||
|
// thus more useful.
|
||||||
|
metadata.Files = pkgFiles
|
||||||
|
|
||||||
|
// We only really do this to get any backup database entries from the files database
|
||||||
|
files := filepath.Join(base, "files")
|
||||||
|
_, err = getFileReader(files, resolver)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
filesMetadata, err := parseAlpmDBEntry(reader)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
} else if filesMetadata != nil {
|
||||||
|
metadata.Backup = filesMetadata.Backup
|
||||||
|
}
|
||||||
|
|
||||||
|
p := *newAlpmDBPackage(metadata)
|
||||||
|
p.SetID()
|
||||||
|
return []pkg.Package{p}, nil
|
||||||
|
}
|
||||||
195
syft/pkg/cataloger/alpm/parse_alpm_db_test.go
Normal file
195
syft/pkg/cataloger/alpm/parse_alpm_db_test.go
Normal file
@ -0,0 +1,195 @@
|
|||||||
|
package alpm
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/anchore/syft/syft/file"
|
||||||
|
"github.com/anchore/syft/syft/pkg"
|
||||||
|
"github.com/go-test/deep"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestDatabaseParser(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
expected pkg.AlpmMetadata
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "test alpm database parsing",
|
||||||
|
expected: pkg.AlpmMetadata{
|
||||||
|
Backup: []pkg.AlpmFileRecord{
|
||||||
|
{
|
||||||
|
Path: "/etc/pacman.conf",
|
||||||
|
Digests: []file.Digest{{
|
||||||
|
Algorithm: "md5",
|
||||||
|
Value: "de541390e52468165b96511c4665bff4",
|
||||||
|
}},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/etc/makepkg.conf",
|
||||||
|
Digests: []file.Digest{{
|
||||||
|
Algorithm: "md5",
|
||||||
|
Value: "79fce043df7dfc676ae5ecb903762d8b",
|
||||||
|
}},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Files: []pkg.AlpmFileRecord{
|
||||||
|
{
|
||||||
|
Path: "/etc/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/etc/makepkg.conf",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/etc/pacman.conf",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/usr/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/usr/bin/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/usr/bin/makepkg",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/usr/bin/makepkg-template",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/usr/bin/pacman",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/usr/bin/pacman-conf",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/var/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/var/cache/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/var/cache/pacman/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/var/cache/pacman/pkg/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/var/lib/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/var/lib/pacman/",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
t.Run(test.name, func(t *testing.T) {
|
||||||
|
file, err := os.Open("test-fixtures/files")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Unable to read test-fixtures/file: ", err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
err := file.Close()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("closing file failed:", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
reader := bufio.NewReader(file)
|
||||||
|
|
||||||
|
entry, err := parseAlpmDBEntry(reader)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Unable to read file contents: ", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if diff := deep.Equal(entry.Files, test.expected.Files); diff != nil {
|
||||||
|
for _, d := range diff {
|
||||||
|
t.Errorf("files diff: %+v", d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if diff := deep.Equal(entry.Backup, test.expected.Backup); diff != nil {
|
||||||
|
for _, d := range diff {
|
||||||
|
t.Errorf("backup diff: %+v", d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseTime(stime string) time.Time {
|
||||||
|
t, _ := time.Parse(time.RFC3339, stime)
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMtreeParse(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
expected []pkg.AlpmFileRecord
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "test mtree parsing",
|
||||||
|
expected: []pkg.AlpmFileRecord{
|
||||||
|
{
|
||||||
|
Path: "/etc",
|
||||||
|
Type: "dir",
|
||||||
|
Time: parseTime("2022-04-10T14:59:52+02:00"),
|
||||||
|
Digests: make([]file.Digest, 0),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/etc/pacman.d",
|
||||||
|
Type: "dir",
|
||||||
|
Time: parseTime("2022-04-10T14:59:52+02:00"),
|
||||||
|
Digests: make([]file.Digest, 0),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: "/etc/pacman.d/mirrorlist",
|
||||||
|
Size: "44683",
|
||||||
|
Time: parseTime("2022-04-10T14:59:52+02:00"),
|
||||||
|
Digests: []file.Digest{
|
||||||
|
{
|
||||||
|
Algorithm: "md5digest",
|
||||||
|
Value: "81c39827e38c759d7e847f05db62c233",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Algorithm: "sha256",
|
||||||
|
Value: "fc135ab26f2a227b9599b66a2f1ba325c445acb914d60e7ecf6e5997a87abe1e",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
t.Run(test.name, func(t *testing.T) {
|
||||||
|
file, err := os.Open("test-fixtures/mtree")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Unable to read test-fixtures/mtree: ", err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
err := file.Close()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("closing file failed:", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
reader := bufio.NewReader(file)
|
||||||
|
|
||||||
|
entry, err := parseMtree(reader)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Unable to read file contents: ", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if diff := deep.Equal(entry, test.expected); diff != nil {
|
||||||
|
for _, d := range diff {
|
||||||
|
t.Errorf("files diff: %+v", d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
20
syft/pkg/cataloger/alpm/test-fixtures/files
Normal file
20
syft/pkg/cataloger/alpm/test-fixtures/files
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
%FILES%
|
||||||
|
etc/
|
||||||
|
etc/makepkg.conf
|
||||||
|
etc/pacman.conf
|
||||||
|
usr/
|
||||||
|
usr/bin/
|
||||||
|
usr/bin/makepkg
|
||||||
|
usr/bin/makepkg-template
|
||||||
|
usr/bin/pacman
|
||||||
|
usr/bin/pacman-conf
|
||||||
|
var/
|
||||||
|
var/cache/
|
||||||
|
var/cache/pacman/
|
||||||
|
var/cache/pacman/pkg/
|
||||||
|
var/lib/
|
||||||
|
var/lib/pacman/
|
||||||
|
|
||||||
|
%BACKUP%
|
||||||
|
etc/pacman.conf de541390e52468165b96511c4665bff4
|
||||||
|
etc/makepkg.conf 79fce043df7dfc676ae5ecb903762d8b
|
||||||
BIN
syft/pkg/cataloger/alpm/test-fixtures/mtree
Normal file
BIN
syft/pkg/cataloger/alpm/test-fixtures/mtree
Normal file
Binary file not shown.
@ -8,6 +8,7 @@ package cataloger
|
|||||||
import (
|
import (
|
||||||
"github.com/anchore/syft/syft/artifact"
|
"github.com/anchore/syft/syft/artifact"
|
||||||
"github.com/anchore/syft/syft/pkg"
|
"github.com/anchore/syft/syft/pkg"
|
||||||
|
"github.com/anchore/syft/syft/pkg/cataloger/alpm"
|
||||||
"github.com/anchore/syft/syft/pkg/cataloger/apkdb"
|
"github.com/anchore/syft/syft/pkg/cataloger/apkdb"
|
||||||
"github.com/anchore/syft/syft/pkg/cataloger/dart"
|
"github.com/anchore/syft/syft/pkg/cataloger/dart"
|
||||||
"github.com/anchore/syft/syft/pkg/cataloger/deb"
|
"github.com/anchore/syft/syft/pkg/cataloger/deb"
|
||||||
@ -36,6 +37,7 @@ type Cataloger interface {
|
|||||||
// ImageCatalogers returns a slice of locally implemented catalogers that are fit for detecting installations of packages.
|
// ImageCatalogers returns a slice of locally implemented catalogers that are fit for detecting installations of packages.
|
||||||
func ImageCatalogers(cfg Config) []Cataloger {
|
func ImageCatalogers(cfg Config) []Cataloger {
|
||||||
return []Cataloger{
|
return []Cataloger{
|
||||||
|
alpm.NewAlpmdbCataloger(),
|
||||||
ruby.NewGemSpecCataloger(),
|
ruby.NewGemSpecCataloger(),
|
||||||
python.NewPythonPackageCataloger(),
|
python.NewPythonPackageCataloger(),
|
||||||
php.NewPHPComposerInstalledCataloger(),
|
php.NewPHPComposerInstalledCataloger(),
|
||||||
@ -52,6 +54,7 @@ func ImageCatalogers(cfg Config) []Cataloger {
|
|||||||
// DirectoryCatalogers returns a slice of locally implemented catalogers that are fit for detecting packages from index files (and select installations)
|
// DirectoryCatalogers returns a slice of locally implemented catalogers that are fit for detecting packages from index files (and select installations)
|
||||||
func DirectoryCatalogers(cfg Config) []Cataloger {
|
func DirectoryCatalogers(cfg Config) []Cataloger {
|
||||||
return []Cataloger{
|
return []Cataloger{
|
||||||
|
alpm.NewAlpmdbCataloger(),
|
||||||
ruby.NewGemFileLockCataloger(),
|
ruby.NewGemFileLockCataloger(),
|
||||||
python.NewPythonIndexCataloger(),
|
python.NewPythonIndexCataloger(),
|
||||||
python.NewPythonPackageCataloger(),
|
python.NewPythonPackageCataloger(),
|
||||||
@ -72,6 +75,7 @@ func DirectoryCatalogers(cfg Config) []Cataloger {
|
|||||||
// AllCatalogers returns all implemented catalogers
|
// AllCatalogers returns all implemented catalogers
|
||||||
func AllCatalogers(cfg Config) []Cataloger {
|
func AllCatalogers(cfg Config) []Cataloger {
|
||||||
return []Cataloger{
|
return []Cataloger{
|
||||||
|
alpm.NewAlpmdbCataloger(),
|
||||||
ruby.NewGemFileLockCataloger(),
|
ruby.NewGemFileLockCataloger(),
|
||||||
ruby.NewGemSpecCataloger(),
|
ruby.NewGemSpecCataloger(),
|
||||||
python.NewPythonIndexCataloger(),
|
python.NewPythonIndexCataloger(),
|
||||||
|
|||||||
@ -12,6 +12,7 @@ const (
|
|||||||
|
|
||||||
UnknownMetadataType MetadataType = "UnknownMetadata"
|
UnknownMetadataType MetadataType = "UnknownMetadata"
|
||||||
ApkMetadataType MetadataType = "ApkMetadata"
|
ApkMetadataType MetadataType = "ApkMetadata"
|
||||||
|
AlpmMetadataType MetadataType = "AlpmMetadata"
|
||||||
DpkgMetadataType MetadataType = "DpkgMetadata"
|
DpkgMetadataType MetadataType = "DpkgMetadata"
|
||||||
GemMetadataType MetadataType = "GemMetadata"
|
GemMetadataType MetadataType = "GemMetadata"
|
||||||
JavaMetadataType MetadataType = "JavaMetadata"
|
JavaMetadataType MetadataType = "JavaMetadata"
|
||||||
@ -28,6 +29,7 @@ const (
|
|||||||
|
|
||||||
var AllMetadataTypes = []MetadataType{
|
var AllMetadataTypes = []MetadataType{
|
||||||
ApkMetadataType,
|
ApkMetadataType,
|
||||||
|
AlpmMetadataType,
|
||||||
DpkgMetadataType,
|
DpkgMetadataType,
|
||||||
GemMetadataType,
|
GemMetadataType,
|
||||||
JavaMetadataType,
|
JavaMetadataType,
|
||||||
@ -44,6 +46,7 @@ var AllMetadataTypes = []MetadataType{
|
|||||||
|
|
||||||
var MetadataTypeByName = map[MetadataType]reflect.Type{
|
var MetadataTypeByName = map[MetadataType]reflect.Type{
|
||||||
ApkMetadataType: reflect.TypeOf(ApkMetadata{}),
|
ApkMetadataType: reflect.TypeOf(ApkMetadata{}),
|
||||||
|
AlpmMetadataType: reflect.TypeOf(AlpmMetadata{}),
|
||||||
DpkgMetadataType: reflect.TypeOf(DpkgMetadata{}),
|
DpkgMetadataType: reflect.TypeOf(DpkgMetadata{}),
|
||||||
GemMetadataType: reflect.TypeOf(GemMetadata{}),
|
GemMetadataType: reflect.TypeOf(GemMetadata{}),
|
||||||
JavaMetadataType: reflect.TypeOf(JavaMetadata{}),
|
JavaMetadataType: reflect.TypeOf(JavaMetadata{}),
|
||||||
|
|||||||
@ -9,6 +9,7 @@ const (
|
|||||||
// the full set of supported packages
|
// the full set of supported packages
|
||||||
UnknownPkg Type = "UnknownPackage"
|
UnknownPkg Type = "UnknownPackage"
|
||||||
ApkPkg Type = "apk"
|
ApkPkg Type = "apk"
|
||||||
|
AlpmPkg Type = "alpm"
|
||||||
GemPkg Type = "gem"
|
GemPkg Type = "gem"
|
||||||
DebPkg Type = "deb"
|
DebPkg Type = "deb"
|
||||||
RpmPkg Type = "rpm"
|
RpmPkg Type = "rpm"
|
||||||
@ -27,6 +28,7 @@ const (
|
|||||||
// AllPkgs represents all supported package types
|
// AllPkgs represents all supported package types
|
||||||
var AllPkgs = []Type{
|
var AllPkgs = []Type{
|
||||||
ApkPkg,
|
ApkPkg,
|
||||||
|
AlpmPkg,
|
||||||
GemPkg,
|
GemPkg,
|
||||||
DebPkg,
|
DebPkg,
|
||||||
RpmPkg,
|
RpmPkg,
|
||||||
@ -47,6 +49,8 @@ func (t Type) PackageURLType() string {
|
|||||||
switch t {
|
switch t {
|
||||||
case ApkPkg:
|
case ApkPkg:
|
||||||
return "alpine"
|
return "alpine"
|
||||||
|
case AlpmPkg:
|
||||||
|
return "alpm"
|
||||||
case GemPkg:
|
case GemPkg:
|
||||||
return packageurl.TypeGem
|
return packageurl.TypeGem
|
||||||
case DebPkg:
|
case DebPkg:
|
||||||
@ -90,6 +94,8 @@ func TypeByName(name string) Type {
|
|||||||
return DebPkg
|
return DebPkg
|
||||||
case packageurl.TypeRPM:
|
case packageurl.TypeRPM:
|
||||||
return RpmPkg
|
return RpmPkg
|
||||||
|
case "alpm":
|
||||||
|
return AlpmPkg
|
||||||
case "alpine":
|
case "alpine":
|
||||||
return ApkPkg
|
return ApkPkg
|
||||||
case packageurl.TypeMaven:
|
case packageurl.TypeMaven:
|
||||||
|
|||||||
@ -64,6 +64,10 @@ func TestTypeFromPURL(t *testing.T) {
|
|||||||
purl: "pkg:maven/org.apache.xmlgraphics/batik-anim@1.9.1?type=zip&classifier=dist",
|
purl: "pkg:maven/org.apache.xmlgraphics/batik-anim@1.9.1?type=zip&classifier=dist",
|
||||||
expected: JavaPkg,
|
expected: JavaPkg,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
purl: "pkg:alpm/arch/linux@5.10.0?arch=x86_64&distro=arch",
|
||||||
|
expected: AlpmPkg,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
var pkgTypes []string
|
var pkgTypes []string
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
package pkg
|
package pkg
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"regexp"
|
"regexp"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
@ -86,12 +85,26 @@ func purlQualifiers(vars map[string]string, release *linux.Release) (q packageur
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if release != nil && release.ID != "" && release.VersionID != "" {
|
distroQualifiers := []string{}
|
||||||
|
|
||||||
|
if release == nil {
|
||||||
|
return q
|
||||||
|
}
|
||||||
|
|
||||||
|
if release.ID != "" {
|
||||||
|
distroQualifiers = append(distroQualifiers, release.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
if release.VersionID != "" {
|
||||||
|
distroQualifiers = append(distroQualifiers, release.VersionID)
|
||||||
|
} else if release.BuildID != "" {
|
||||||
|
distroQualifiers = append(distroQualifiers, release.BuildID)
|
||||||
|
}
|
||||||
|
|
||||||
q = append(q, packageurl.Qualifier{
|
q = append(q, packageurl.Qualifier{
|
||||||
Key: PURLQualifierDistro,
|
Key: PURLQualifierDistro,
|
||||||
Value: fmt.Sprintf("%s-%s", release.ID, release.VersionID),
|
Value: strings.Join(distroQualifiers, "-"),
|
||||||
})
|
})
|
||||||
}
|
|
||||||
|
|
||||||
return q
|
return q
|
||||||
}
|
}
|
||||||
|
|||||||
@ -190,6 +190,24 @@ func TestPackageURL(t *testing.T) {
|
|||||||
|
|
||||||
expected: "pkg:maven/g.id/a@v",
|
expected: "pkg:maven/g.id/a@v",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "alpm",
|
||||||
|
distro: &linux.Release{
|
||||||
|
ID: "arch",
|
||||||
|
BuildID: "rolling",
|
||||||
|
},
|
||||||
|
pkg: Package{
|
||||||
|
Name: "linux",
|
||||||
|
Version: "5.10.0",
|
||||||
|
Type: AlpmPkg,
|
||||||
|
Metadata: AlpmMetadata{
|
||||||
|
Package: "linux",
|
||||||
|
Version: "5.10.0",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
expected: "pkg:alpm/arch/linux@5.10.0?distro=arch-rolling",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
var pkgTypes []string
|
var pkgTypes []string
|
||||||
|
|||||||
@ -96,7 +96,7 @@ func TestPackagesCmdFlags(t *testing.T) {
|
|||||||
name: "squashed-scope-flag",
|
name: "squashed-scope-flag",
|
||||||
args: []string{"packages", "-o", "json", "-s", "squashed", coverageImage},
|
args: []string{"packages", "-o", "json", "-s", "squashed", coverageImage},
|
||||||
assertions: []traitAssertion{
|
assertions: []traitAssertion{
|
||||||
assertPackageCount(32),
|
assertPackageCount(33),
|
||||||
assertSuccessfulReturnCode,
|
assertSuccessfulReturnCode,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@ -221,6 +221,13 @@ var dirOnlyTestCases = []testCase{
|
|||||||
}
|
}
|
||||||
|
|
||||||
var commonTestCases = []testCase{
|
var commonTestCases = []testCase{
|
||||||
|
{
|
||||||
|
name: "find alpm packages",
|
||||||
|
pkgType: pkg.AlpmPkg,
|
||||||
|
pkgInfo: map[string]string{
|
||||||
|
"pacman": "6.0.1-5",
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "find rpmdb packages",
|
name: "find rpmdb packages",
|
||||||
pkgType: pkg.RpmPkg,
|
pkgType: pkg.RpmPkg,
|
||||||
|
|||||||
@ -90,7 +90,6 @@ func TestPkgCoverageImage(t *testing.T) {
|
|||||||
pkgCount := 0
|
pkgCount := 0
|
||||||
|
|
||||||
for a := range sbom.Artifacts.PackageCatalog.Enumerate(c.pkgType) {
|
for a := range sbom.Artifacts.PackageCatalog.Enumerate(c.pkgType) {
|
||||||
|
|
||||||
if a.Language.String() != "" {
|
if a.Language.String() != "" {
|
||||||
observedLanguages.Add(a.Language.String())
|
observedLanguages.Add(a.Language.String())
|
||||||
}
|
}
|
||||||
@ -167,7 +166,6 @@ func TestPkgCoverageDirectory(t *testing.T) {
|
|||||||
actualPkgCount := 0
|
actualPkgCount := 0
|
||||||
|
|
||||||
for actualPkg := range sbom.Artifacts.PackageCatalog.Enumerate(test.pkgType) {
|
for actualPkg := range sbom.Artifacts.PackageCatalog.Enumerate(test.pkgType) {
|
||||||
|
|
||||||
observedLanguages.Add(actualPkg.Language.String())
|
observedLanguages.Add(actualPkg.Language.String())
|
||||||
observedPkgs.Add(string(actualPkg.Type))
|
observedPkgs.Add(string(actualPkg.Type))
|
||||||
|
|
||||||
|
|||||||
@ -42,32 +42,28 @@ func TestConvertCmd(t *testing.T) {
|
|||||||
f, err := ioutil.TempFile("", "test-convert-sbom-")
|
f, err := ioutil.TempFile("", "test-convert-sbom-")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer func() {
|
defer func() {
|
||||||
err := f.Close()
|
|
||||||
require.NoError(t, err)
|
|
||||||
os.Remove(f.Name())
|
os.Remove(f.Name())
|
||||||
}()
|
}()
|
||||||
|
|
||||||
err = format.Encode(f, sbom)
|
err = format.Encode(f, sbom)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
stdr, stdw, err := os.Pipe()
|
|
||||||
require.NoError(t, err)
|
|
||||||
originalStdout := os.Stdout
|
|
||||||
os.Stdout = stdw
|
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
app := &config.Application{Outputs: []string{format.ID().String()}}
|
app := &config.Application{Outputs: []string{format.ID().String()}}
|
||||||
|
|
||||||
|
// stdout reduction of test noise
|
||||||
|
rescue := os.Stdout // keep backup of the real stdout
|
||||||
|
os.Stdout, _ = os.OpenFile(os.DevNull, os.O_APPEND|os.O_WRONLY, os.ModeAppend)
|
||||||
|
defer func() {
|
||||||
|
os.Stdout = rescue
|
||||||
|
}()
|
||||||
|
|
||||||
err = convert.Run(ctx, app, []string{f.Name()})
|
err = convert.Run(ctx, app, []string{f.Name()})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
stdw.Close()
|
file, err := ioutil.ReadFile(f.Name())
|
||||||
|
|
||||||
out, err := ioutil.ReadAll(stdr)
|
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
os.Stdout = originalStdout
|
formatFound := syft.IdentifyFormat(file)
|
||||||
|
|
||||||
formatFound := syft.IdentifyFormat(out)
|
|
||||||
if format.ID() == table.ID {
|
if format.ID() == table.ID {
|
||||||
require.Nil(t, formatFound)
|
require.Nil(t, formatFound)
|
||||||
return
|
return
|
||||||
|
|||||||
@ -0,0 +1 @@
|
|||||||
|
9
|
||||||
@ -0,0 +1,57 @@
|
|||||||
|
%NAME%
|
||||||
|
pacman
|
||||||
|
|
||||||
|
%VERSION%
|
||||||
|
6.0.1-5
|
||||||
|
|
||||||
|
%BASE%
|
||||||
|
pacman
|
||||||
|
|
||||||
|
%DESC%
|
||||||
|
A library-based package manager with dependency support
|
||||||
|
|
||||||
|
%URL%
|
||||||
|
https://www.archlinux.org/pacman/
|
||||||
|
|
||||||
|
%ARCH%
|
||||||
|
x86_64
|
||||||
|
|
||||||
|
%BUILDDATE%
|
||||||
|
1652116331
|
||||||
|
|
||||||
|
%INSTALLDATE%
|
||||||
|
1654074247
|
||||||
|
|
||||||
|
%PACKAGER%
|
||||||
|
Morten Linderud <foxboron@archlinux.org>
|
||||||
|
|
||||||
|
%SIZE%
|
||||||
|
4925474
|
||||||
|
|
||||||
|
%REASON%
|
||||||
|
1
|
||||||
|
|
||||||
|
%GROUPS%
|
||||||
|
base-devel
|
||||||
|
|
||||||
|
%LICENSE%
|
||||||
|
GPL
|
||||||
|
|
||||||
|
%VALIDATION%
|
||||||
|
pgp
|
||||||
|
|
||||||
|
%DEPENDS%
|
||||||
|
bash
|
||||||
|
glibc
|
||||||
|
libarchive
|
||||||
|
curl
|
||||||
|
gpgme
|
||||||
|
pacman-mirrorlist
|
||||||
|
archlinux-keyring
|
||||||
|
|
||||||
|
%OPTDEPENDS%
|
||||||
|
perl-locale-gettext: translation support in makepkg-template
|
||||||
|
|
||||||
|
%PROVIDES%
|
||||||
|
libalpm.so=13-64
|
||||||
|
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
%FILES%
|
||||||
|
etc/
|
||||||
|
etc/makepkg.conf
|
||||||
|
etc/pacman.conf
|
||||||
|
usr/
|
||||||
|
usr/bin/
|
||||||
|
usr/bin/makepkg
|
||||||
|
usr/bin/makepkg-template
|
||||||
|
usr/bin/pacman
|
||||||
|
usr/bin/pacman-conf
|
||||||
|
usr/bin/pacman-db-upgrade
|
||||||
|
usr/bin/pacman-key
|
||||||
|
usr/bin/repo-add
|
||||||
|
usr/bin/repo-elephant
|
||||||
|
usr/bin/repo-remove
|
||||||
|
usr/bin/testpkg
|
||||||
|
usr/bin/vercmp
|
||||||
|
usr/include/
|
||||||
|
usr/include/alpm.h
|
||||||
|
usr/include/alpm_list.h
|
||||||
|
usr/lib/
|
||||||
|
usr/lib/libalpm.so
|
||||||
|
usr/lib/libalpm.so.13
|
||||||
|
usr/lib/libalpm.so.13.0.1
|
||||||
|
usr/lib/pkgconfig/
|
||||||
|
usr/lib/pkgconfig/libalpm.pc
|
||||||
|
|
||||||
|
%BACKUP%
|
||||||
|
etc/pacman.conf de541390e52468165b96511c4665bff4
|
||||||
|
etc/makepkg.conf 79fce043df7dfc676ae5ecb903762d8b
|
||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user