Merge pull request #7089 from vrothberg/2.0-fix-7078

[2.0] events parsing fix #7078
containers · Jul 27, 2020 · eea6bd1 · eea6bd1
2 parents 9352c34 + e2cb457
commit eea6bd1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go
@@ -29,8 +29,14 @@ func filtersFromRequest(r *http.Request) ([]string, error) {
 		compatFilters map[string]map[string]bool
 		filters       map[string][]string
 		libpodFilters []string
+		raw           []byte
 	)
-	raw := []byte(r.Form.Get("filters"))
+
+	if _, found := r.URL.Query()["filters"]; found {
+		raw = []byte(r.Form.Get("filters"))
+	} else {
+		return []string{}, nil
+	}
 
 	// Backwards compat with older versions of Docker.
 	if err := json.Unmarshal(raw, &compatFilters); err == nil {

diff --git a/test/apiv2/01-basic.at b/test/apiv2/01-basic.at
@@ -68,4 +68,8 @@ else
     _show_ok 0 "Time for ten /info requests" "<= 5 seconds" "$delta_t seconds"
 fi
 
+# Simple events test (see #7078)
+t GET "events?stream=false"  200
+t GET "libpod/events?stream=false"  200
+
 # vim: filetype=sh