Skip to content

fix(packages): mirror canonical RPM paths #60

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

Merged
jmgilman merged 1 commit into from
Aug 22, 2026
Merged

fix(packages): mirror canonical RPM paths #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions internal/stage/pkgrepo/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,13 @@ func TestPackageObjectFormatAcceptsOnlyCanonicalTrees(t *testing.T) {
},
{
name: "RPM package",
path: "rpm/stable/x86_64/Packages/release-cli-1.2.3-1.x86_64.rpm",
path: "rpm/stable/x86_64/packages/release-cli-1.2.3-1.x86_64.rpm",
format: FormatRPM,
ok: true,
},
{name: "APK package", path: "apk/stable/main/aarch64/release-cli-1.2.3.apk", format: FormatAPK, ok: true},
{name: "wrong channel", path: "rpm/testing/x86_64/Packages/release-cli.rpm"},
{name: "wrong channel", path: "rpm/testing/x86_64/packages/release-cli.rpm"},
{name: "legacy uppercase RPM path", path: "rpm/stable/x86_64/Packages/release-cli.rpm"},
{name: "metadata suffix", path: "rpm/stable/x86_64/repodata/primary.xml.gz"},
{name: "traversal", path: "../apt/pool/main/release-cli.deb"},
}
Expand Down
2 changes: 1 addition & 1 deletion internal/stage/pkgrepo/publish_values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ func packageObjectFormat(name string, channel Channel) (Format, bool) {
}
channelName := string(channel)
if strings.HasPrefix(name, path.Join("rpm", channelName)+"/") &&
strings.Contains(name, "/Packages/") && strings.HasSuffix(name, ".rpm") {
strings.Contains(name, "/packages/") && strings.HasSuffix(name, ".rpm") {
return FormatRPM, true
}
if strings.HasPrefix(name, path.Join("apk", channelName, "main")+"/") && strings.HasSuffix(name, ".apk") {
Expand Down