Skip to content

Commit

Permalink
fix: handle panic during checksum validation (#2262)
Browse files Browse the repository at this point in the history
## Description

Handles a condition where execution would panic when a package contained
no checksums.

## Related Issue

Fixes #2261

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [x] Test, docs, adr added or updated as needed
- [x] [Contributor Guide
Steps](https://github.com/defenseunicorns/zarf/blob/main/CONTRIBUTING.md#developer-workflow)
followed

---------

Co-authored-by: Wayne Starr <Racer159@users.noreply.github.com>
  • Loading branch information
mjnagel and Racer159 committed Jan 29, 2024
1 parent e208cca commit 48c2eab
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/pkg/packager/sources/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,17 @@ func ValidatePackageIntegrity(loaded *layout.PackagePaths, aggregateChecksum str
checkedMap[loaded.Signature] = true

err = lineByLine(checksumPath, func(line string) error {
// If the line is empty (i.e. there is no checksum) simply skip it - this can result from a package with no images/components
if line == "" {
return nil
}

split := strings.Split(line, " ")
// If the line is not splitable into two pieces the file is likely corrupted
if len(split) != 2 {
return fmt.Errorf("invalid checksum line: %s", line)
}

sha := split[0]
rel := split[1]

Expand Down

0 comments on commit 48c2eab

Please sign in to comment.