Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2019-03-01 19:15:05 +01:00
parent 89925bcd57 0beec878c6
commit a4b4ba3859
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
process/epasswd.py
View File

@ -70,9 +70,9 @@ class EPasswd:
pw = self.get_passwd(id) pw = self.get_passwd(id)
if pw[0:4]=='$2a$' or pw[0:4]=='$2y$': if pw[0:4]=='$2a$' or pw[0:4]=='$2y$':
try: try:
h1 = pw.encode('utf8') uhash = pw.encode('utf8')
h2 = passwd.encode('utf8') upass = passwd.encode('utf8')
return bcrypt.checkpw(h1, h2) return bcrypt.checkpw(upass, uhash)
except: except:
return False return False
return pw == passwd return pw == passwd