summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2021-09-11 22:43:04 +0200
committerMiloslav Trmač <mitr@redhat.com>2021-12-10 18:16:21 +0100
commitda86a232851162b584a143efa3c4f3032a480413 (patch)
tree4f6030736316dfbfdd3a7eb912981f2cd5312574
parent1589d70bcb522e49c75632c4e0edff52d2e459c2 (diff)
downloadpodman-da86a232851162b584a143efa3c4f3032a480413.tar.gz
podman-da86a232851162b584a143efa3c4f3032a480413.tar.bz2
podman-da86a232851162b584a143efa3c4f3032a480413.zip
Only look up HTTP header values once in GetCredentials
... and have GetCredentials pass the values down to getConfigCredentials and getAuthCredentials. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
-rw-r--r--pkg/auth/auth.go29
1 files changed, 14 insertions, 15 deletions
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
index 9a4e2af85..a95ae4764 100644
--- a/pkg/auth/auth.go
+++ b/pkg/auth/auth.go
@@ -33,19 +33,18 @@ const XRegistryConfigHeader HeaderAuthName = "X-Registry-Config"
// GetCredentials queries the http.Request for X-Registry-.* headers and extracts
// the necessary authentication information for libpod operations
func GetCredentials(r *http.Request) (*types.DockerAuthConfig, string, error) {
- has := func(key HeaderAuthName) bool {
+ nonemptyHeaderValue := func(key HeaderAuthName) ([]string, bool) {
hdr := r.Header.Values(key.String())
- return len(hdr) > 0
+ return hdr, len(hdr) > 0
}
- switch {
- case has(XRegistryConfigHeader):
- c, f, err := getConfigCredentials(r)
+ if hdr, ok := nonemptyHeaderValue(XRegistryConfigHeader); ok {
+ c, f, err := getConfigCredentials(r, hdr)
if err != nil {
return nil, "", errors.Wrapf(err, "failed to parse %q header for %s", XRegistryConfigHeader, r.URL.String())
}
return c, f, nil
- case has(XRegistryAuthHeader):
- c, f, err := getAuthCredentials(r)
+ } else if hdr, ok := nonemptyHeaderValue(XRegistryAuthHeader); ok {
+ c, f, err := getAuthCredentials(hdr)
if err != nil {
return nil, "", errors.Wrapf(err, "failed to parse %q header for %s", XRegistryAuthHeader, r.URL.String())
}
@@ -54,14 +53,14 @@ func GetCredentials(r *http.Request) (*types.DockerAuthConfig, string, error) {
return nil, "", nil
}
-// getConfigCredentials extracts one or more docker.AuthConfig from the request's
-// header. An empty key will be used as default while a named registry will be
+// getConfigCredentials extracts one or more docker.AuthConfig from a request and its
+// XRegistryConfigHeader value. An empty key will be used as default while a named registry will be
// returned as types.DockerAuthConfig
-func getConfigCredentials(r *http.Request) (*types.DockerAuthConfig, string, error) {
+func getConfigCredentials(r *http.Request, headers []string) (*types.DockerAuthConfig, string, error) {
var auth *types.DockerAuthConfig
configs := make(map[string]types.DockerAuthConfig)
- for _, h := range r.Header[string(XRegistryConfigHeader)] {
+ for _, h := range headers {
param, err := base64.URLEncoding.DecodeString(h)
if err != nil {
return nil, "", errors.Wrapf(err, "failed to decode %q", XRegistryConfigHeader)
@@ -110,13 +109,13 @@ func getConfigCredentials(r *http.Request) (*types.DockerAuthConfig, string, err
return auth, authfile, err
}
-// getAuthCredentials extracts one or more DockerAuthConfigs from the request's
-// header. The header could specify a single-auth config in which case the
+// getAuthCredentials extracts one or more DockerAuthConfigs from an XRegistryAuthHeader
+// value. The header could specify a single-auth config in which case the
// first return value is set. In case of a multi-auth header, the contents are
// stored in a temporary auth file (2nd return value). Note that the auth file
// should be removed after usage.
-func getAuthCredentials(r *http.Request) (*types.DockerAuthConfig, string, error) {
- authHeader := r.Header.Get(XRegistryAuthHeader.String())
+func getAuthCredentials(headers []string) (*types.DockerAuthConfig, string, error) {
+ authHeader := headers[0]
// First look for a multi-auth header (i.e., a map).
authConfigs, err := parseMultiAuthHeader(authHeader)