opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 12:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix container filters

Browse Source 
container filters were being double encoded (maybe triple) which resulted in the wrong encoding representation of filters being sent by the go-bindings.  Also, on the server side, Filter needed to be changed to Filter to decode properly. Finally, due to the changed return type of List Containers, the go bindings return values needed to be changed.

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2020-02-11 12:40:41 -06:00
parent 86b5a89d1a
commit ad4a92c5e5
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/api/handlers/libpod/containers.go
View File

@ -56,7 +56,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
decoder := r.Context().Value("decoder").(*schema.Decoder)
query := struct {
All bool `schema:"all"`
Filter map[string][]string `schema:"filter"`
Filters map[string][]string `schema:"filters"`
Last int `schema:"last"`
Namespace bool `schema:"namespace"`
Pod bool `schema:"pod"`
@ -71,6 +71,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
return
}
runtime := r.Context().Value("runtime").(*libpod.Runtime)
opts := shared.PsOptions{
All: query.All,
@ -82,8 +83,8 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
Pod: query.Pod,
Sync: query.Sync,
}
if len(query.Filter) > 0 {
for k, v := range query.Filter {
if len(query.Filters) > 0 {
for k, v := range query.Filters {
for _, val := range v {
generatedFunc, err := shared.GenerateContainerFilterFuncs(k, val, runtime)
if err != nil {

12
pkg/bindings/connection.go
View File

@ -130,7 +130,7 @@ func (c *Connection) DoRequest(httpBody io.Reader, httpMethod, endpoint string,
// if more desirable we could use url to form the encoded endpoint with params
r := req.URL.Query()
for k, v := range queryParams {
r.Add(k, url.QueryEscape(v))
r.Add(k, v)
}
req.URL.RawQuery = r.Encode()
}
@ -155,18 +155,14 @@ func GetConnectionFromContext(ctx context.Context) (*Connection, error) {
return conn, nil
}
// FiltersToHTML converts our typical filter format of a
// FiltersToString converts our typical filter format of a
// map[string][]string to a query/html safe string.
func FiltersToHTML(filters map[string][]string) (string, error) {
func FiltersToString(filters map[string][]string) (string, error) {
lowerCaseKeys := make(map[string][]string)
for k, v := range filters {
lowerCaseKeys[strings.ToLower(k)] = v
}
unsafeString, err := jsoniter.MarshalToString(lowerCaseKeys)
if err != nil {
return "", err
}
return url.QueryEscape(unsafeString), nil
return jsoniter.MarshalToString(lowerCaseKeys)
}
// IsInformation returns true if the response code is 1xx

17
pkg/bindings/containers/containers.go
View File

@ -5,8 +5,8 @@ import (
"net/http"
"strconv"
"github.com/containers/libpod/cmd/podman/shared"
"github.com/containers/libpod/libpod"
lpapiv2 "github.com/containers/libpod/pkg/api/handlers/libpod"
"github.com/containers/libpod/pkg/bindings"
)
@ -15,13 +15,16 @@ import (
// the most recent number of containers. The pod and size booleans indicate that pod information and rootfs
// size information should also be included. Finally, the sync bool synchronizes the OCI runtime and
// container state.
func List(ctx context.Context, filters map[string][]string, last *int, pod, size, sync *bool) ([]*shared.PsContainerOutput, error) { // nolint:typecheck
func List(ctx context.Context, filters map[string][]string, all *bool, last *int, pod, size, sync *bool) ([]lpapiv2.ListContainer, error) { // nolint:typecheck
conn, err := bindings.GetConnectionFromContext(ctx)
if err != nil {
return nil, err
}
var images []*shared.PsContainerOutput
var containers []lpapiv2.ListContainer
params := make(map[string]string)
if all != nil {
params["all"] = strconv.FormatBool(*all)
}
if last != nil {
params["last"] = strconv.Itoa(*last)
}
@ -35,7 +38,7 @@ func List(ctx context.Context, filters map[string][]string, last *int, pod, size
params["sync"] = strconv.FormatBool(*sync)
}
if filters != nil {
filterString, err := bindings.FiltersToHTML(filters)
filterString, err := bindings.FiltersToString(filters)
if err != nil {
return nil, err
}
@ -43,9 +46,9 @@ func List(ctx context.Context, filters map[string][]string, last *int, pod, size
}
response, err := conn.DoRequest(nil, http.MethodGet, "/containers/json", params)
if err != nil {
return images, err
return containers, err
}
return images, response.Process(nil)
return containers, response.Process(&containers)
}
// Prune removes stopped and exited containers from local storage. The optional filters can be
@ -62,7 +65,7 @@ func Prune(ctx context.Context, filters map[string][]string) ([]string, error) {
}
params := make(map[string]string)
if filters != nil {
filterString, err := bindings.FiltersToHTML(filters)
filterString, err := bindings.FiltersToString(filters)
if err != nil {
return nil, err
}

4
pkg/bindings/images/images.go
View File

@ -38,7 +38,7 @@ func List(ctx context.Context, all *bool, filters map[string][]string) ([]*handl
params["all"] = strconv.FormatBool(*all)
}
if filters != nil {
strFilters, err := bindings.FiltersToHTML(filters)
strFilters, err := bindings.FiltersToString(filters)
if err != nil {
return nil, err
}
@ -155,7 +155,7 @@ func Prune(ctx context.Context, filters map[string][]string) ([]string, error) {
}
params := make(map[string]string)
if filters != nil {
stringFilter, err := bindings.FiltersToHTML(filters)
stringFilter, err := bindings.FiltersToString(filters)
if err != nil {
return nil, err
}

2
pkg/bindings/images/search.go
View File

@ -26,7 +26,7 @@ func Search(ctx context.Context, term string, limit *int, filters map[string][]s
params["limit"] = strconv.Itoa(*limit)
}
if filters != nil {
stringFilter, err := bindings.FiltersToHTML(filters)
stringFilter, err := bindings.FiltersToString(filters)
if err != nil {
return nil, err
}

2
pkg/bindings/pods/pods.go
View File

@ -97,7 +97,7 @@ func List(ctx context.Context, filters map[string][]string) (*[]libpod.PodInspec
}
params := make(map[string]string)
if filters != nil {
stringFilter, err := bindings.FiltersToHTML(filters)
stringFilter, err := bindings.FiltersToString(filters)
if err != nil {
return nil, err
}