Skip to content

sbom: enable generating SBOM given a dir #947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imjasonh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

sbom: enable generating SBOM given a dir #947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions pkg/sbom/sbom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,19 @@ func Generate(ctx context.Context, inputFilePath string, f io.Reader, distroID s
}
logger.Debug("unpacked APK file to temp directory", "apkFilePath", inputFilePath)

return GenerateFS(ctx, tempDir, distroID)
}

func GenerateFS(ctx context.Context, tempDir, distroID string) (*sbom.SBOM, error) {
logger := clog.FromContext(ctx)
// Sanity check: count the number of files in the temp directory. Create an
// fs.FS and walk it. We'll also use this to attach a list of files to the APK
// package.

var includedFiles []string

tempFsys := os.DirFS(tempDir)
err = fs.WalkDir(tempFsys, ".", func(path string, _ os.DirEntry, err error) error {
err := fs.WalkDir(tempFsys, ".", func(path string, _ os.DirEntry, err error) error {
if err != nil {
return err
}
Expand Down Expand Up @@ -135,7 +140,7 @@ func Generate(ctx context.Context, inputFilePath string, f io.Reader, distroID s
ID: distroID,
},
},
Source: getDeterministicSourceDescription(src, inputFilePath, apkPackage.Name, apkPackage.Version),
Source: getDeterministicSourceDescription(src, apkPackage.Name, apkPackage.Version),
Descriptor: sbom.Descriptor{
Name: "wolfictl",
},
Expand All @@ -144,17 +149,13 @@ func Generate(ctx context.Context, inputFilePath string, f io.Reader, distroID s
return &s, nil
}

func getDeterministicSourceDescription(src source.Source, inputFilePath, apkName, apkVersion string) source.Description {
func getDeterministicSourceDescription(src source.Source, apkName, apkVersion string) source.Description {
description := src.Describe()

description.ID = "(redacted for determinism)"
description.Name = apkName
description.Version = apkVersion
metadata := source.DirectoryMetadata{
Path: inputFilePath,
Copy link
Member

@jonjohnsonjr jonjohnsonjr Jun 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we not need this?

Copy link
Member

@luhring luhring Jun 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to keep this

}
description.Metadata = metadata

description.Metadata = source.DirectoryMetadata{}
return description
}

Expand Down