|
@@ -2,7 +2,6 @@ package inbound
|
|
|
|
|
|
import (
|
|
import (
|
|
"context"
|
|
"context"
|
|
- "encoding/base64"
|
|
|
|
"encoding/binary"
|
|
"encoding/binary"
|
|
"io"
|
|
"io"
|
|
"math/rand"
|
|
"math/rand"
|
|
@@ -139,14 +138,9 @@ func (n *Naive) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
|
|
n.badRequest(ctx, request, E.New("missing naive padding"))
|
|
n.badRequest(ctx, request, E.New("missing naive padding"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- var authOk bool
|
|
|
|
- var userName string
|
|
|
|
- authorization := request.Header.Get("Proxy-Authorization")
|
|
|
|
- if strings.HasPrefix(authorization, "BASIC ") || strings.HasPrefix(authorization, "Basic ") {
|
|
|
|
- userPassword, _ := base64.URLEncoding.DecodeString(authorization[6:])
|
|
|
|
- userPswdArr := strings.SplitN(string(userPassword), ":", 2)
|
|
|
|
- userName = userPswdArr[0]
|
|
|
|
- authOk = n.authenticator.Verify(userPswdArr[0], userPswdArr[1])
|
|
|
|
|
|
+ userName, password, authOk := sHttp.ParseBasicAuth(request.Header.Get("Proxy-Authorization"))
|
|
|
|
+ if authOk {
|
|
|
|
+ authOk = n.authenticator.Verify(userName, password)
|
|
}
|
|
}
|
|
if !authOk {
|
|
if !authOk {
|
|
rejectHTTP(writer, http.StatusProxyAuthRequired)
|
|
rejectHTTP(writer, http.StatusProxyAuthRequired)
|