diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-31 08:06:41 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-31 08:06:41 -0800 |
commit | 1cf4b72a6ea8f6fe8344e91badd19a8fe264193e (patch) | |
tree | 835d3de0f328facc0d7c456ec3824f24fcf58e81 /pkg/api/handlers/utils/handler.go | |
parent | c29273e84f98e67589d8adcb7ab8d142d4563cd3 (diff) | |
parent | f1eaccedfa08455d699d00dcda63b95aeb34833e (diff) | |
download | podman-1cf4b72a6ea8f6fe8344e91badd19a8fe264193e.tar.gz podman-1cf4b72a6ea8f6fe8344e91badd19a8fe264193e.tar.bz2 podman-1cf4b72a6ea8f6fe8344e91badd19a8fe264193e.zip |
Merge pull request #5030 from baude/apiv2longname
fix longname handling for bindings
Diffstat (limited to 'pkg/api/handlers/utils/handler.go')
-rw-r--r-- | pkg/api/handlers/utils/handler.go | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go index f2ce26f1a..970f93791 100644 --- a/pkg/api/handlers/utils/handler.go +++ b/pkg/api/handlers/utils/handler.go @@ -3,11 +3,14 @@ package utils import ( "encoding/json" "fmt" + "github.com/pkg/errors" "io" "net/http" + "net/url" "os" "strings" + "github.com/gorilla/mux" "github.com/sirupsen/logrus" ) @@ -59,3 +62,18 @@ func FilterMapToString(filters map[string][]string) (string, error) { } return string(f), nil } + +func getVar(r *http.Request, k string) string { + val := mux.Vars(r)[k] + safeVal, err := url.PathUnescape(val) + if err != nil { + logrus.Error(errors.Wrapf(err, "failed to unescape mux key %s, value %s", k, val)) + return val + } + return safeVal +} + +// GetName extracts the name from the mux +func GetName(r *http.Request) string { + return getVar(r, "name") +} |