cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow to use $2y$ passwords as well

Browse Source
This commit is contained in:
ravenclaw900 2021-06-12 17:17:00 -05:00
parent 80bb9de533
commit 7df29169ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/util/net/http.go
View File

@ -65,7 +65,7 @@ func (authMid *HTTPAuthMiddleware) Middleware(next http.Handler) http.Handler {
if (authMid.user == "" && authMid.passwd == "") || if (authMid.user == "" && authMid.passwd == "") ||
(hasAuth && reqUser == authMid.user && reqPasswd == authMid.passwd) { (hasAuth && reqUser == authMid.user && reqPasswd == authMid.passwd) {
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
} else if authMid.user == reqUser && authMid.passwd[:4] == "$2a$" { } else if authMid.user == reqUser && authMid.passwd[:4] == "$2a$" || authMid.passwd[:4] == "$2y$" {
correct := bcrypt.CompareHashAndPassword([]byte(authMid.passwd), []byte(reqPasswd)) correct := bcrypt.CompareHashAndPassword([]byte(authMid.passwd), []byte(reqPasswd))
if correct == nil { if correct == nil {
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
@ -86,7 +86,7 @@ func HTTPBasicAuth(h http.HandlerFunc, user, passwd string) http.HandlerFunc {
if (user == "" && passwd == "") || if (user == "" && passwd == "") ||
(hasAuth && reqUser == user && reqPasswd == passwd) { (hasAuth && reqUser == user && reqPasswd == passwd) {
h.ServeHTTP(w, r) h.ServeHTTP(w, r)
} else if user == reqUser && passwd[:4] == "$2a$" { } else if user == reqUser && passwd[:4] == "$2a$" || passwd[:4] == "$2y$" {
correct := bcrypt.CompareHashAndPassword([]byte(passwd), []byte(reqPasswd)) correct := bcrypt.CompareHashAndPassword([]byte(passwd), []byte(reqPasswd))
if correct == nil { if correct == nil {
h.ServeHTTP(w, r) h.ServeHTTP(w, r)