summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-07-27 09:59:00 +0200
committerValentin Rothberg <rothberg@redhat.com>2020-07-27 10:02:55 +0200
commit5ee35ca783d55711793bdd1a101205049d08f4c8 (patch)
tree10071a5b6bf1071d313b39c106f708522421d153 /pkg
parent11e8e655683535999f4d7f2b79859a8ec537b765 (diff)
downloadpodman-5ee35ca783d55711793bdd1a101205049d08f4c8.tar.gz
podman-5ee35ca783d55711793bdd1a101205049d08f4c8.tar.bz2
podman-5ee35ca783d55711793bdd1a101205049d08f4c8.zip
API events: fix parsing error
Fix an error where an absent "filters" parameter led to JSON parsing errors. Fixes: #7078 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/handlers/compat/events.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go
index 9d5cb5045..8c4ad575b 100644
--- 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 {