opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

remote: fix invalid --cidfile + --ignore

Browse Source 
When the cidfile does not exists and ignore is set the cli parser skips
the file without error and we call into the backend code without any
names at all. This should logically be a NOP but on remote it caused all
containers to be returned which caused podman stop to stop everything in
this case.

Fixes #23554

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2024-08-12 15:09:28 +02:00
parent 708d6c5e2b
commit 6fce734f42
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/domain/infra/tunnel/helpers.go
View File

@ -24,6 +24,13 @@ func getContainersAndInputByContext(contextWithConnection context.Context, all,
if all && len(namesOrIDs) > 0 {
return nil, nil, errors.New("cannot look up containers and all")
}
// short cut if not all, not filters and no names are given. This can happen with
// --ignore and --cidfile, https://github.com/containers/podman/issues/23554.
// In this case we have to do nothting and not even have to do a request
if !all && len(filters) == 0 && len(namesOrIDs) == 0 {
return nil, nil, nil
}
options := new(containers.ListOptions).WithAll(true).WithSync(true).WithFilters(filters)
allContainers, err := containers.List(contextWithConnection, options)
if err != nil {

9
test/system/050-stop.bats
View File

@ -110,8 +110,15 @@ load helpers
run_podman 125 stop --cidfile=$nosuchfile
is "$output" "Error: reading CIDFile: open $nosuchfile: no such file or directory" "podman stop with missing cidfile, without --ignore"
# create a container to reproduce (#23554)
run_podman run -d $IMAGE sleep inf
cid="$output"
# Important for (#23554) that there is no output here
run_podman stop --cidfile=$nosuchfile --ignore
is "$output" "" "podman stop with missing cidfile, with --ignore"
is "$output" "" "podman stop with missing cidfile, with --ignore (empty output)"
run_podman rm -f -t0 $cid
}