summaryrefslogtreecommitdiff
path: root/pkg/api/handlers/utils/handler.go
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-01-30 12:40:19 -0600
committerBrent Baude <bbaude@redhat.com>2020-01-31 08:38:25 -0600
commitf1eaccedfa08455d699d00dcda63b95aeb34833e (patch)
tree65d385fd683a66686b225827c760e5bc95f7e346 /pkg/api/handlers/utils/handler.go
parent36af2833f954e1c822b917ecff45c05858188c2d (diff)
downloadpodman-f1eaccedfa08455d699d00dcda63b95aeb34833e.tar.gz
podman-f1eaccedfa08455d699d00dcda63b95aeb34833e.tar.bz2
podman-f1eaccedfa08455d699d00dcda63b95aeb34833e.zip
fix longname handling for bindings
the api needs to account for image input where the image is encoded as a fqd image name. Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/api/handlers/utils/handler.go')
-rw-r--r--pkg/api/handlers/utils/handler.go18
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")
+}