Merge pull request #2802 from davidswu/2.7-autoredirect

[2.7] default autoredirect to false
distribution · Jan 7, 2019 · e702d95 · e702d95
2 parents 40b7b58 + caf43bb
commit e702d95
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/registry/auth/token/accesscontroller.go b/registry/auth/token/accesscontroller.go
@@ -162,11 +162,14 @@ func checkOptions(options map[string]interface{}) (tokenAccessOptions, error) {
 
 	opts.realm, opts.issuer, opts.service, opts.rootCertBundle = vals[0], vals[1], vals[2], vals[3]
 
-	autoRedirect, ok := options["autoredirect"].(bool)
-	if !ok {
-		return opts, fmt.Errorf("token auth requires a valid option bool: autoredirect")
+	autoRedirectVal, ok := options["autoredirect"]
+	if ok {
+		autoRedirect, ok := autoRedirectVal.(bool)
+		if !ok {
+			return opts, fmt.Errorf("token auth requires a valid option bool: autoredirect")
+		}
+		opts.autoRedirect = autoRedirect
 	}
-	opts.autoRedirect = autoRedirect
 
 	return opts, nil
 }