gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 11:48:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1420 from kingkorf/master

Browse Source 
Support all bcrypt versions
This commit is contained in:
Derek Collison
2020-05-27 14:18:54 -07:00
committed by GitHub
parent d72dff4e0f 5b5edc4b4b
commit 3b1bf16d59
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/auth.go
View File

@@ -20,6 +20,7 @@ import (
"encoding/base64"
"fmt"
"net"
"regexp"
"strings"
"time"
@@ -736,11 +737,11 @@ func (s *Server) isLeafNodeAuthorized(c *client) bool {
}
// Support for bcrypt stored passwords and tokens.
const bcryptPrefix = "$2a$"
var validBcryptPrefix = regexp.MustCompile(`^\$2[a,b,x,y]{1}\$\d{2}\$.*`)
// isBcrypt checks whether the given password or token is bcrypted.
func isBcrypt(password string) bool {
return strings.HasPrefix(password, bcryptPrefix)
return validBcryptPrefix.MatchString(password)
}
func comparePasswords(serverPassword, clientPassword string) bool {