Skip to content

Restructure cache directory to use subdirs to avoid issues with long URL's #1940

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Restructure cache directory to use subdirs to avoid issues with long URL's #1940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6edb22
Fix offline mode caching for Alpine APK keys
javacruft Nov 17, 2025
450e48c
Update tests to align with new cache path structure
javacruft Nov 17, 2025
1052068
Merge branch 'main' into bug/fix-offline-alpine
javacruft Nov 17, 2025
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
20 changes: 10 additions & 10 deletions pkg/apk/apk/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,16 +492,16 @@ func cachePathFromURL(root string, u url.URL) (string, error) {
u2.ForceQuery = false
u2.RawFragment = ""
u2.RawQuery = ""
filename := filepath.Base(u2.Path)
archDir := filepath.Dir(u2.Path)
dir := filepath.Base(archDir)
repoDir := filepath.Dir(archDir)
// include the hostname
u2.Path = repoDir

// url encode it so it can be a single directory
repoDir = url.QueryEscape(u2.String())
cacheFile := filepath.Join(root, repoDir, dir, filename)

// Use the full path as the cache structure to handle both top-level and nested files uniformly
cachePath := strings.TrimPrefix(filepath.Clean(u2.Path), "/")
baseURL := u2
baseURL.Path = ""

// url encode the base URL so it can be a single directory
baseDir := url.QueryEscape(baseURL.String())
cacheFile := filepath.Join(root, baseDir, cachePath)

// validate it is within root
cacheFile = filepath.Clean(cacheFile)
cleanroot := filepath.Clean(root)
Expand Down
17 changes: 13 additions & 4 deletions pkg/apk/apk/implementation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,10 @@ func TestFetchPackage(t *testing.T) {
tmpDir := t.TempDir()
a := prepLayout(t, tmpDir)
// fill the cache
repoDir := filepath.Join(tmpDir, url.QueryEscape(testAlpineRepos), testArch)
// New cache structure uses full path: https%3A%2F%2Fhost/path/to/arch/file
repoURL, _ := url.Parse(testAlpineRepos)
baseDir := url.QueryEscape(repoURL.Scheme + "://" + repoURL.Host)
repoDir := filepath.Join(tmpDir, baseDir, strings.TrimPrefix(repoURL.Path, "/"), testArch)
err := os.MkdirAll(repoDir, 0o755)
require.NoError(t, err, "unable to mkdir cache")

Expand Down Expand Up @@ -757,7 +760,9 @@ func TestFetchPackage(t *testing.T) {
tmpDir := t.TempDir()
a := prepLayout(t, tmpDir)
// fill the cache
repoDir := filepath.Join(tmpDir, url.QueryEscape(testAlpineRepos), testArch)
repoURL, _ := url.Parse(testAlpineRepos)
baseDir := url.QueryEscape(repoURL.Scheme + "://" + repoURL.Host)
repoDir := filepath.Join(tmpDir, baseDir, strings.TrimPrefix(repoURL.Path, "/"), testArch)
err := os.MkdirAll(repoDir, 0o755)
require.NoError(t, err, "unable to mkdir cache")

Expand Down Expand Up @@ -785,7 +790,9 @@ func TestFetchPackage(t *testing.T) {
tmpDir := t.TempDir()
a := prepLayout(t, tmpDir)
// fill the cache
repoDir := filepath.Join(tmpDir, url.QueryEscape(testAlpineRepos), testArch)
repoURL, _ := url.Parse(testAlpineRepos)
baseDir := url.QueryEscape(repoURL.Scheme + "://" + repoURL.Host)
repoDir := filepath.Join(tmpDir, baseDir, strings.TrimPrefix(repoURL.Path, "/"), testArch)
err := os.MkdirAll(repoDir, 0o755)
require.NoError(t, err, "unable to mkdir cache")

Expand Down Expand Up @@ -815,7 +822,9 @@ func TestFetchPackage(t *testing.T) {
tmpDir := t.TempDir()
a := prepLayout(t, tmpDir)
// fill the cache
repoDir := filepath.Join(tmpDir, url.QueryEscape(testAlpineRepos), testArch)
repoURL, _ := url.Parse(testAlpineRepos)
baseDir := url.QueryEscape(repoURL.Scheme + "://" + repoURL.Host)
repoDir := filepath.Join(tmpDir, baseDir, strings.TrimPrefix(repoURL.Path, "/"), testArch)
err := os.MkdirAll(repoDir, 0o755)
require.NoError(t, err, "unable to mkdir cache")

Expand Down
4 changes: 3 additions & 1 deletion pkg/apk/apk/repo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ func TestGetRepositoryIndexes(t *testing.T) {
tmpDir := t.TempDir()
a := prepLayout(t, tmpDir, []string{testAlpineRepos})
// fill the cache
repoDir := filepath.Join(tmpDir, url.QueryEscape(testAlpineRepos), testArch)
repoURL, _ := url.Parse(testAlpineRepos)
baseDir := url.QueryEscape(repoURL.Scheme + "://" + repoURL.Host)
repoDir := filepath.Join(tmpDir, baseDir, strings.TrimPrefix(repoURL.Path, "/"), testArch)

a.SetClient(&http.Client{
Transport: &testLocalTransport{
Expand Down
Loading