summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-15 06:23:00 -0400
committerGitHub <noreply@github.com>2021-09-15 06:23:00 -0400
commit10873c6f494fbc7a43365000f6f9702c21741077 (patch)
tree8eb5e73ac7144c4918d95c31a9b0b68746038b53
parentaff64dda65514064ccbf7fcaf78293e111539eb6 (diff)
parent9b04e17893dbf91326c0f68ce7627d7bb07cf515 (diff)
downloadpodman-10873c6f494fbc7a43365000f6f9702c21741077.tar.gz
podman-10873c6f494fbc7a43365000f6f9702c21741077.tar.bz2
podman-10873c6f494fbc7a43365000f6f9702c21741077.zip
Merge pull request #11578 from jelly/handle_nil_pointer_deref
api: handle nil pointer dereference in api endpoints
-rw-r--r--pkg/api/handlers/compat/containers.go6
-rw-r--r--pkg/api/handlers/libpod/containers.go7
-rw-r--r--pkg/api/handlers/libpod/images.go8
-rw-r--r--test/apiv2/10-images.at4
-rw-r--r--test/apiv2/20-containers.at4
-rwxr-xr-xtest/apiv2/test-apiv21
6 files changed, 27 insertions, 3 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 26e1bf00b..a15fdb553 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -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
}
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go
index 4639093f2..343c0d0b3 100644
--- a/pkg/api/handlers/libpod/containers.go
+++ b/pkg/api/handlers/libpod/containers.go
@@ -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
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index 72093c492..b4f08a746 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -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()))
diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at
index abc8d44b7..d3fde9f9d 100644
--- a/test/apiv2/10-images.at
+++ b/test/apiv2/10-images.at
@@ -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"
diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
index 8fdecb4bd..afff68c22 100644
--- a/test/apiv2/20-containers.at
+++ b/test/apiv2/20-containers.at
@@ -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\\} \
diff --git a/test/apiv2/test-apiv2 b/test/apiv2/test-apiv2
index e1bf28bae..c644b9578 100755
--- a/test/apiv2/test-apiv2
+++ b/test/apiv2/test-apiv2
@@ -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 \