mirror of
https://github.com/containers/podman.git
synced 2025-05-21 09:05:56 +08:00
api: handle nil pointer dereference in rest endpoints
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:
@ -104,8 +104,12 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
filterMap, err := util.PrepareFilters(r)
|
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()))
|
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -73,8 +73,13 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
filterMap, err := util.PrepareFilters(r)
|
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,
|
utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
|
||||||
errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
|
errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
|
||||||
return
|
return
|
||||||
|
@ -156,8 +156,14 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
filterMap, err := util.PrepareFilters(r)
|
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,
|
utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
|
||||||
errors.
|
errors.
|
||||||
Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
|
Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
|
||||||
|
@ -94,6 +94,10 @@ t GET libpod/images/json?filters='garb1age}' 500 \
|
|||||||
t GET libpod/images/json?filters='{"label":["testl' 500 \
|
t GET libpod/images/json?filters='{"label":["testl' 500 \
|
||||||
.cause="unexpected end of JSON input"
|
.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
|
# Prune images - bad filter input
|
||||||
t POST images/prune?filters='garb1age}' 500 \
|
t POST images/prune?filters='garb1age}' 500 \
|
||||||
.cause="invalid character 'g' looking for beginning of value"
|
.cause="invalid character 'g' looking for beginning of value"
|
||||||
|
@ -22,6 +22,10 @@ podman run $IMAGE true
|
|||||||
|
|
||||||
t GET libpod/containers/json 200 length=0
|
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 \
|
t GET libpod/containers/json?all=true 200 \
|
||||||
length=1 \
|
length=1 \
|
||||||
.[0].Id~[0-9a-f]\\{64\\} \
|
.[0].Id~[0-9a-f]\\{64\\} \
|
||||||
|
@ -327,6 +327,7 @@ function start_service() {
|
|||||||
die "Cannot start service on non-localhost ($HOST)"
|
die "Cannot start service on non-localhost ($HOST)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo $WORKDIR
|
||||||
$PODMAN_BIN --root $WORKDIR/server_root --syslog=true \
|
$PODMAN_BIN --root $WORKDIR/server_root --syslog=true \
|
||||||
system service \
|
system service \
|
||||||
--time 15 \
|
--time 15 \
|
||||||
|
Reference in New Issue
Block a user