opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 00:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

api: handle nil pointer dereference in rest endpoints

Browse Source 
When `?all=garbage` is passed to an API endpoint schema validation fails
and err is nil. Wrapf uses err to create an error message causing a nil
pointer dereference.

Signed-off-by: Jelle van der Waa <jvanderwaa@redhat.com>
This commit is contained in:
Jelle van der Waa
2021-09-14 22:23:01 +02:00
parent 323fe36313
commit 9b04e17893
6 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/handlers/compat/containers.go
View File

@ -104,8 +104,12 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
}
filterMap, err := util.PrepareFilters(r)
if err != nil {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "failed to decode filter parameters for %s", r.URL.String()))
return
}
if dErr := decoder.Decode(&query, r.URL.Query()); dErr != nil || err != nil {
if err := decoder.Decode(&query, r.URL.Query()); err != nil {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
return
}

7
pkg/api/handlers/libpod/containers.go
View File

@ -73,8 +73,13 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
}
filterMap, err := util.PrepareFilters(r)
if err != nil {
utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
errors.Wrapf(err, "failed to decode filter parameters for %s", r.URL.String()))
return
}
if dErr := decoder.Decode(&query, r.URL.Query()); dErr != nil || err != nil {
if err := decoder.Decode(&query, r.URL.Query()); err != nil {
utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
return

8
pkg/api/handlers/libpod/images.go
View File

@ -156,8 +156,14 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
}
filterMap, err := util.PrepareFilters(r)
if err != nil {
utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
errors.
Wrapf(err, "failed to decode filter parameters for %s", r.URL.String()))
return
}
if dErr := decoder.Decode(&query, r.URL.Query()); dErr != nil || err != nil {
if err := decoder.Decode(&query, r.URL.Query()); err != nil {
utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
errors.
Wrapf(err, "failed to parse parameters for %s", r.URL.String()))

4
test/apiv2/10-images.at
View File

@ -94,6 +94,10 @@ t GET libpod/images/json?filters='garb1age}' 500 \
t GET libpod/images/json?filters='{"label":["testl' 500 \
.cause="unexpected end of JSON input"
# Prune images - bad all input
t POST libpod/images/prune?all='garb1age' 500 \
.cause="schema: error converting value for \"all\""
# Prune images - bad filter input
t POST images/prune?filters='garb1age}' 500 \
.cause="invalid character 'g' looking for beginning of value"

4
test/apiv2/20-containers.at
View File

@ -22,6 +22,10 @@ podman run $IMAGE true
t GET libpod/containers/json 200 length=0
# bad all input
t GET libpod/containers/json?all='garb1age' 500 \
.cause="schema: error converting value for \"all\""
t GET libpod/containers/json?all=true 200 \
length=1 \
.[0].Id~[0-9a-f]\\{64\\} \

1
test/apiv2/test-apiv2
View File

@ -327,6 +327,7 @@ function start_service() {
die "Cannot start service on non-localhost ($HOST)"
fi
echo $WORKDIR
$PODMAN_BIN --root $WORKDIR/server_root --syslog=true \
system service \
--time 15 \