SystemSh0cker/gocsaf
1
0
Fork 0
mirror of https://github.com/gocsaf/csaf.git synced 2025-12-22 11:55:40 +01:00
Code Issues Releases Activity Actions

Use correct base URL
Some checks failed
Go / build (push) Has been cancelled
Details
Go / run_modver (push) Has been cancelled
Details

Browse source
This commit is contained in:
koplas 2025-06-20 14:46:26 +02:00
parent 6ac97810d0
commit 1098c6add0
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmd/csaf_checker/processor.go
View file

@ -632,7 +632,6 @@ func (p *processor) integrity(
if err != nil { if err != nil {
return err return err
} }
makeAbs := makeAbsolute(b)
client := p.httpClient() client := p.httpClient()
var data bytes.Buffer var data bytes.Buffer
@ -643,7 +642,6 @@ func (p *processor) integrity(
lg(ErrorType, "Bad URL %s: %v", f, err) lg(ErrorType, "Bad URL %s: %v", f, err)
continue continue
} }
fp = makeAbs(fp)
u := misc.JoinURL(b, fp).String() u := misc.JoinURL(b, fp).String()
@ -777,7 +775,6 @@ func (p *processor) integrity(
lg(ErrorType, "Bad URL %s: %v", x.url(), err) lg(ErrorType, "Bad URL %s: %v", x.url(), err)
continue continue
} }
hu = makeAbs(hu)
hashFile := misc.JoinURL(b, hu).String() hashFile := misc.JoinURL(b, hu).String()
p.checkTLS(hashFile) p.checkTLS(hashFile)
@ -827,7 +824,6 @@ func (p *processor) integrity(
lg(ErrorType, "Bad URL %s: %v", f.SignURL(), err) lg(ErrorType, "Bad URL %s: %v", f.SignURL(), err)
continue continue
} }
su = makeAbs(su)
sigFile := misc.JoinURL(b, su).String() sigFile := misc.JoinURL(b, su).String()
p.checkTLS(sigFile) p.checkTLS(sigFile)
@ -1527,6 +1523,7 @@ func (p *processor) checkPGPKeys(_ string) error {
if err != nil { if err != nil {
return err return err
} }
base.Path = ""
for i := range keys { for i := range keys {
key := &keys[i] key := &keys[i]

3
cmd/csaf_checker/roliecheck.go
View file

@ -222,6 +222,7 @@ func (p *processor) processROLIEFeeds(feeds [][]csaf.Feed) error {
if err != nil { if err != nil {
return err return err
} }
base.Path = ""
p.badROLIEFeed.use() p.badROLIEFeed.use()
advisories := map[*csaf.Feed][]csaf.AdvisoryFile{} advisories := map[*csaf.Feed][]csaf.AdvisoryFile{}
@ -291,7 +292,7 @@ func (p *processor) processROLIEFeeds(feeds [][]csaf.Feed) error {
// TODO: Issue a warning if we want check AMBER+ without an // TODO: Issue a warning if we want check AMBER+ without an
// authorizing client. // authorizing client.
if err := p.integrity(files, feedBase, rolieMask, p.badProviderMetadata.add); err != nil { if err := p.integrity(files, base.String(), rolieMask, p.badProviderMetadata.add); err != nil {
if err != errContinue { if err != errContinue {
return err return err
} }

1
cmd/csaf_downloader/downloader.go
View file

@ -229,6 +229,7 @@ func (d *downloader) download(ctx context.Context, domain string) error {
if err != nil { if err != nil {
return fmt.Errorf("invalid URL '%s': %v", lpmd.URL, err) return fmt.Errorf("invalid URL '%s': %v", lpmd.URL, err)
} }
base.Path = ""
expr := util.NewPathEval() expr := util.NewPathEval()

1
csaf/advisories.go
View file

@ -295,6 +295,7 @@ func (afp *AdvisoryFileProcessor) processROLIE(
slog.Error("Cannot parse feed base URL", "url", fb, "err", err) slog.Error("Cannot parse feed base URL", "url", fb, "err", err)
continue continue
} }
feedBaseURL.Path = ""
res, err := afp.client.Get(feedURL.String()) res, err := afp.client.Get(feedURL.String())
if err != nil { if err != nil {