debian index file is now deleted after use

updated caching directories to ensure that there cannot be clashes between different repositories
fixed a potential file descriptor leak when updating CA certificates

Author: djcass44

pkg/ca-certificates/update-ca-certificates.go

@@ -84,6 +84,7 @@ func readBlockedCerts(ctx context.Context, path string, rootfs memfs.FullFS) ([]
 		log.Error(err, "failed to open configuration file")
 		return nil, err
 	}
+	defer f.Close()
 
 	var blocked []string
 

pkg/ca-certificates/update-ca-certificates_test.go

@@ -2,13 +2,14 @@ package ca_certificates
 
 import (
 	"context"
+	"testing"
+
 	"github.com/Snakdy/container-build-engine/pkg/files"
 	"github.com/Snakdy/container-build-engine/pkg/vfs"
 	"github.com/go-logr/logr"
 	"github.com/go-logr/logr/testr"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestUpdateCertificates(t *testing.T) {

pkg/debian/index.go

@@ -56,6 +56,9 @@ func downloadIndex(ctx context.Context, repository, release, component, arch, fi
 		return nil, err
 	}
 	defer f.Close()
+	defer func() {
+		_ = os.Remove(f.Name())
+	}()
 	resp, err := http.Get(target)
 	if err != nil {
 		return nil, err

pkg/downloader/downloader.go

@@ -30,7 +30,8 @@ func (d *Downloader) Download(ctx context.Context, src string) (string, error) {
 
 	// download the file to a predictable location so that
 	// we can avoid repeated downloads
-	dst := filepath.Join(d.cacheDir, uri.Hostname(), filepath.Base(uri.Path))
+	cachePath := HashString(uri.Hostname() + "/" + uri.Path)
+	dst := filepath.Join(d.cacheDir, cachePath, filepath.Base(uri.Path))
 	// create the parent directory so that we don't
 	// have any name clashes between different repositories
 	if err := os.MkdirAll(filepath.Dir(dst), 0755); err != nil {

pkg/downloader/hash.go

@@ -0,0 +1,14 @@
+package downloader
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+)
+
+// HashString generates a 12-character SHA256 hash
+// from a given string.
+// It should not be used for cryptographic operations.
+func HashString(s string) string {
+	h := sha256.Sum256([]byte(s))
+	return hex.EncodeToString(h[:])[:12]
+}