Skip to content

Validate immutable portable tool records #91

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
omry wants to merge 1 commit into from
Open

Validate immutable portable tool records #91

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.25.0
require (
github.com/Microsoft/go-winio v0.6.2
github.com/aquasecurity/go-pep440-version v0.0.1
github.com/aquasecurity/go-version v0.0.1
github.com/charmbracelet/bubbles v1.0.0
github.com/charmbracelet/bubbletea v1.3.10
github.com/charmbracelet/lipgloss v1.1.0
Expand All @@ -22,7 +23,6 @@ require (
require (
dario.cat/mergo v1.0.0 // indirect
github.com/ProtonMail/go-crypto v1.1.6 // indirect
github.com/aquasecurity/go-version v0.0.1 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/charmbracelet/colorprofile v0.4.1 // indirect
Expand Down
6 changes: 6 additions & 0 deletions internal/toolcatalog/records_decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ func decodeRecordV1(filename string, payload []byte) (loadedRecordV1, error) {
return loadedRecordV1{}, fmt.Errorf("decode %s: %w", filename, err)
}
record := loadedRecordV1{ID: header.ID, Schema: header.Schema, Path: filename, Value: value}
if err := validateLoadedRecordV1(record); err != nil {
return loadedRecordV1{}, fmt.Errorf("validate %s: %w", filename, err)
}
digest, err := canonical.Sum("portable-tool-record", portableToolRecordIdentityV1, value)
if err != nil {
return loadedRecordV1{}, fmt.Errorf("digest %s: %w", filename, err)
Expand Down Expand Up @@ -578,6 +581,9 @@ func validateSortedUniqueStringsV1(field string, values []string, allowEmpty boo
if values == nil {
return fmt.Errorf("%s must use an array", field)
}
if len(values) > maxDefinitionReferences {
return fmt.Errorf("%s must use at most %d entries", field, maxDefinitionReferences)
}
for index, value := range values {
if !allowEmpty && value == "" || strings.TrimSpace(value) != value || containsControlV1(value) || index > 0 && values[index-1] >= value {
return fmt.Errorf("%s must contain unique sorted canonical values", field)
Expand Down
Loading
Loading