if digest auth passed, skip basic auth check

twu2 · twu2 · commit 48a2129db70b · 2025-02-09T07:48:36.000+08:00
Change-Id: If0287548bdb9fa9ca7685f1f7f09653b68f22da5
diff --git a/protocol/http/handshake.go b/protocol/http/handshake.go
@@ -50,7 +50,7 @@ func HandleConnectionEx(
 					ctx = auth.ContextWithUser(ctx, username)
 				}
 			}
-			if strings.HasPrefix(authorization, "Basic ") {
+			if !authOk && strings.HasPrefix(authorization, "Basic ") {
 				userPassword, _ := base64.URLEncoding.DecodeString(authorization[6:])
 				userPswdArr := strings.SplitN(string(userPassword), ":", 2)
 				if len(userPswdArr) == 2 {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func HandleConnectionEx(`
`50`	`50`	`ctx = auth.ContextWithUser(ctx, username)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`		`- if strings.HasPrefix(authorization, "Basic ") {`
	`53`	`+ if !authOk && strings.HasPrefix(authorization, "Basic ") {`
`54`	`54`	`userPassword, _ := base64.URLEncoding.DecodeString(authorization[6:])`
`55`	`55`	`userPswdArr := strings.SplitN(string(userPassword), ":", 2)`
`56`	`56`	`if len(userPswdArr) == 2 {`