Skip to content

quadlet API: fix tar install when non-quadlet file sorts first #28696

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

Open
inknos wants to merge 1 commit into
base: main
Choose a base branch
from
+56 −4
Open

quadlet API: fix tar install when non-quadlet file sorts first #28696

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
10 changes: 10 additions & 0 deletions pkg/api/handlers/libpod/quadlets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,16 @@ func InstallQuadlets(w http.ResponseWriter, r *http.Request) {
return
}

// QuadletInstall expects the quadlet file to be first in the list.
// filepath.Walk returns files in lexicographic order, so a non-quadlet
// file (e.g. "Containerfile") may sort before the ".container" file.
for i, filePath := range filePaths {
if quadlet.IsExtSupported(filePath) {
filePaths[0], filePaths[i] = filePaths[i], filePaths[0]
break
}
}

containerEngine := abi.ContainerEngine{Libpod: runtime}
installOptions := entities.QuadletInstallOptions{
Replace: query.Replace,
Expand Down
50 changes: 46 additions & 4 deletions test/apiv2/36-quadlets.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ t POST "libpod/quadlets" "$TMPD/$quadlet_3_4.tar" 400 \
# Scenario: install tar that contains one quadlet file and a non-quadlet file will succeed
# then update the quadlet file, and the non-quadlet file, and verify the update is successful
quadlet_5=quadlet-test-5-$(cat /proc/sys/kernel/random/uuid).container
containerfile_1=quadlet-test-containerfile-1-$(cat /proc/sys/kernel/random/uuid).Containerfile
containerfile_1=quadlet-test-containerfile-1-$(cat /proc/sys/kernel/random/uuid)
configfile_1=quadlet-test-configfile-1-$(cat /proc/sys/kernel/random/uuid).conf
Copy link
Copy Markdown
Member

@Honny1 Honny1 May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file removed on cleanup?


containerfile_1_content=$(cat << EOF
FROM quay.io/podman/hello
Expand Down Expand Up @@ -241,17 +242,25 @@ CMD ["echo", "Updated"]
EOF
)

configfile_1_content=$(cat << EOF
[ini]
foo=bar
EOF
)

echo "$quadlet_5_content" > "$TMPD/$quadlet_5"
echo "$containerfile_1_content" > "$TMPD/$containerfile_1"
tar --format=posix -C "$TMPD" -cvf "$TMPD/$quadlet_5$containerfile_1.tar" "$quadlet_5" "$containerfile_1" &> /dev/null
echo "$configfile_1_content" > "$TMPD/$configfile_1"
tar --format=posix -C "$TMPD" -cvf "$TMPD/$quadlet_5$containerfile_1.tar" "$quadlet_5" "$containerfile_1" "$configfile_1" &> /dev/null

t POST "libpod/quadlets" "$TMPD/$quadlet_5$containerfile_1.tar" 200 \
'.InstalledQuadlets|length=2' \
'.InstalledQuadlets|length=3' \
'.QuadletErrors|length=0'

t GET "libpod/quadlets/$quadlet_5/file" 200
is "$output" "$quadlet_5_content" "quadlet-5 should be installed"
is "$(cat "$quadlet_install_dir/$containerfile_1")" "$containerfile_1_content" "containerfile_1 should be installed"
is "$(cat "$quadlet_install_dir/$configfile_1")" "$configfile_1_content" "configfile_1 should be installed"

echo "$quadlet_5_updated_content" > "$TMPD/$quadlet_5"
echo "$containerfile_1_updated_content" > "$TMPD/$containerfile_1"
Expand All @@ -273,6 +282,36 @@ t GET "libpod/quadlets/$quadlet_5/file" 200
is "$output" "$quadlet_5_updated_content" "quadlet-5 should be updated"
is "$(cat "$quadlet_install_dir/$containerfile_1")" "$containerfile_1_updated_content" "containerfile_1 should be installed"

# Scenario: install tar where a non-quadlet file sorts lexicographically before the quadlet file.
# "AAA-" sorts before "quadlet-test-", exercising the file ordering in the API handler.
quadlet_7=quadlet-test-7-$(cat /proc/sys/kernel/random/uuid).container
containerfile_3=AAA-containerfile-$(cat /proc/sys/kernel/random/uuid)

quadlet_7_content=$(cat << EOF
[Container]
ContainerName=quadlet-7
Image=quay.io/podman/hello
EOF
)

containerfile_3_content=$(cat << EOF
FROM quay.io/podman/hello
CMD ["echo", "hello"]
EOF
)

echo "$quadlet_7_content" > "$TMPD/$quadlet_7"
echo "$containerfile_3_content" > "$TMPD/$containerfile_3"
tar --format=posix -C "$TMPD" -cvf "$TMPD/$quadlet_7$containerfile_3.tar" "$quadlet_7" "$containerfile_3" &> /dev/null

t POST "libpod/quadlets" "$TMPD/$quadlet_7$containerfile_3.tar" 200 \
'.InstalledQuadlets|length=2' \
Copy link
Copy Markdown
Member

@Honny1 Honny1 May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct?

'.QuadletErrors|length=0'

t GET "libpod/quadlets/$quadlet_7/file" 200
is "$output" "$quadlet_7_content" "quadlet-7 should be installed"
is "$(cat "$quadlet_install_dir/$containerfile_3")" "$containerfile_3_content" "containerfile_3 should be installed"
Copy link
Copy Markdown
Member

@Honny1 Honny1 May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should ' $ configfile_1 ' also be checked?

Copy link
Copy Markdown
Collaborator Author

@inknos inknos May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixing your comments, thanks


# Scenario: test a multipart call, then update without replace, and then replace
quadlet_6=quadlet-test-6-$(cat /proc/sys/kernel/random/uuid).container
containerfile_2=quadlet-test-containerfile-2-$(cat /proc/sys/kernel/random/uuid).Containerfile
Expand Down Expand Up @@ -332,10 +371,13 @@ is "$(cat "$quadlet_install_dir/$containerfile_2")" "$containerfile_2_updated_co

podman quadlet rm "$quadlet_1" \
"$quadlet_5" \
"$quadlet_6"
"$quadlet_6" \
"$quadlet_7"

rm -f "$quadlet_install_dir/$containerfile_1"
rm -f "$quadlet_install_dir/$configfile_1"
rm -f "$quadlet_install_dir/$containerfile_2"
rm -f "$quadlet_install_dir/$containerfile_3"
rm -rf $TMPD

# DELETE endpoint tests
Expand Down