Merge pull request #18345 from vrothberg/fix-18092

api: fix parsing filters
containers · May 2, 2023 · 0851d64 · 0851d64
2 parents 09c11a8 + 1720042
commit 0851d64
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
@@ -21,6 +21,7 @@ import (
 	"github.com/containers/podman/v4/pkg/auth"
 	"github.com/containers/podman/v4/pkg/domain/entities"
 	"github.com/containers/podman/v4/pkg/domain/infra/abi"
+	"github.com/containers/podman/v4/pkg/util"
 	"github.com/containers/storage"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/gorilla/schema"
@@ -431,12 +432,22 @@ func GetImages(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	filterList, err := filters.FiltersFromRequest(r)
-	if err != nil {
-		utils.Error(w, http.StatusInternalServerError, err)
-		return
-	}
-	if !utils.IsLibpodRequest(r) {
+	var filterList []string
+	var err error
+	if utils.IsLibpodRequest(r) {
+		// Podman clients split the filter map as `"{"label":["version","1.0"]}`
+		filterList, err = filters.FiltersFromRequest(r)
+		if err != nil {
+			utils.Error(w, http.StatusInternalServerError, err)
+			return
+		}
+	} else {
+		// Docker clients split the filter map as `"{"label":["version=1.0"]}`
+		filterList, err = util.FiltersFromRequest(r)
+		if err != nil {
+			utils.Error(w, http.StatusInternalServerError, err)
+			return
+		}
 		if len(query.Filter) > 0 { // Docker 1.24 compatibility
 			filterList = append(filterList, "reference="+query.Filter)
 		}

diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at
@@ -133,7 +133,7 @@ from alpine
 RUN >file1
 EOF
 
-podman image build -t test:test --label xyz -<<EOF
+podman image build -t test:test --label xyz --label abc -<<EOF
 from alpine
 RUN >file2
 EOF
@@ -143,7 +143,7 @@ t POST images/prune?filters='{"dangling":["true"]}' 200
 t GET images/json?filters='{"dangling":["true"]}' 200 length=0
 
 #label filter check in libpod and compat
-t GET images/json?filters='{"label":["xyz"]}' 200 length=1
+t GET images/json?filters='{"label":["xyz","abc"]}' 200 length=1
 t GET libpod/images/json?filters='{"label":["xyz"]}' 200 length=1
 
 t DELETE libpod/images/test:test 200