From 9b04e17893dbf91326c0f68ce7627d7bb07cf515 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Tue, 14 Sep 2021 22:23:01 +0200
Subject: 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>
---
 test/apiv2/10-images.at     | 4 ++++
 test/apiv2/20-containers.at | 4 ++++
 test/apiv2/test-apiv2       | 1 +
 3 files changed, 9 insertions(+)

(limited to 'test/apiv2')

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 \
-- 
cgit v1.2.3-54-g00ecf