From 69f6b81874ccfab9b81c03463af02cae8565f4db Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Wed, 25 Sep 2024 10:38:11 +0800 Subject: [PATCH] update Signed-off-by: Patrick Zheng --- internal/file/file.go | 3 ++- verifier/crl/crl.go | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/internal/file/file.go b/internal/file/file.go index 2863e8b0..97990166 100644 --- a/internal/file/file.go +++ b/internal/file/file.go @@ -117,7 +117,8 @@ func TrimFileExtension(fileName string) string { return strings.TrimSuffix(fileName, filepath.Ext(fileName)) } -// WriteFile writes content to path with all parent directories created. +// WriteFile writes content to a temporary file and move it to path with all +// parent directories created. // If path already exists and is a file, WriteFile overwrites it. func WriteFile(path string, content []byte) (writeErr error) { if err := os.MkdirAll(filepath.Dir(path), 0700); err != nil { diff --git a/verifier/crl/crl.go b/verifier/crl/crl.go index 7cc47711..9ebd16db 100644 --- a/verifier/crl/crl.go +++ b/verifier/crl/crl.go @@ -23,7 +23,6 @@ import ( "errors" "fmt" "io/fs" - nurl "net/url" "os" "path/filepath" "time" @@ -82,10 +81,6 @@ func (c *FileCache) Get(ctx context.Context, url string) (*corecrl.Bundle, error logger := log.GetLogger(ctx) logger.Debugf("Retrieving crl bundle from file cache with key %q ...", url) - // sanity check - if _, err := nurl.Parse(url); err != nil { - return nil, fmt.Errorf("invalid url: %w", err) - } // get content from file cache contentBytes, err := os.ReadFile(filepath.Join(c.root, c.fileName(url))) if err != nil { @@ -131,10 +126,6 @@ func (c *FileCache) Set(ctx context.Context, url string, bundle *corecrl.Bundle) logger := log.GetLogger(ctx) logger.Debugf("Storing crl bundle to file cache with key %q ...", url) - // sanity check - if _, err := nurl.Parse(url); err != nil { - return fmt.Errorf("invalid url: %w", err) - } if bundle == nil { return errors.New("failed to store crl bundle in file cache: bundle cannot be nil") }