Skip to content

Fix silently discarded error in insert_purls() #12

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

Closed
krisharma955 wants to merge 2 commits into from
Closed

Fix silently discarded error in insert_purls() #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2620be5
Fix silent error swallowing in cmd/main.go
krisharma955 Sep 4, 2026
bf63459
Replace log.Fatal with error propagation in library init and fix file…
krisharma955 Sep 5, 2026
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
7 changes: 5 additions & 2 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
defer f.Close()

dirname := "cmd/data/"
entries, err := os.ReadDir(dirname)
Expand Down Expand Up @@ -55,9 +56,11 @@ func main() {
}

func insert_purls(builder *vellum.Builder, file string) int {
var err error
// #nosec G304
data, _ := os.ReadFile(file)
data, err := os.ReadFile(file)
if err != nil {
log.Fatal(err)
}
lines := strings.FieldsFunc(string(data), func(r rune) bool {
return r == '\n'
})
Expand Down
25 changes: 16 additions & 9 deletions purlvalidator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package purlvalidator
import (
_ "embed"
"fmt"
"log"
"sync"

"github.com/blevesearch/vellum"
"github.com/package-url/packageurl-go"
Expand All @@ -23,14 +23,17 @@ import (
//go:embed purls.fst
var fstData []byte

var validator *vellum.FST
var (
validator *vellum.FST
validatorOnce sync.Once
validatorErr error
)

func init() {
var err error
validator, err = vellum.Load(fstData)
if err != nil {
log.Fatal(err)
}
func getValidator() (*vellum.FST, error) {
validatorOnce.Do(func() {
validator, validatorErr = vellum.Load(fstData)
})
return validator, validatorErr
}

func validate_purl(packageURL string, fstMap *vellum.FST) (bool, error) {
Expand All @@ -47,5 +50,9 @@ func validate_purl(packageURL string, fstMap *vellum.FST) (bool, error) {
}

func Validate(packageURL string) (bool, error) {
return validate_purl(packageURL, validator)
v, err := getValidator()
if err != nil {
return false, err
}
return validate_purl(packageURL, v)
}