Skip to content

orm/users: replace removed stdlib crypt/legacycrypt with passlib #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
midasi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

orm/users: replace removed stdlib crypt/legacycrypt with passlib #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions orm/users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@
from sqlalchemy.ext.hybrid import hybrid_property
from sqlalchemy.orm import column_property, relationship, selectinload, validates

try:
# python 3.13
import legacycrypt as crypt
except ImportError:
import crypt as crypt
from passlib.hash import sha512_crypt, bcrypt

import json
import sys
Expand Down Expand Up @@ -368,13 +364,17 @@ def password(self):
def password(self, pw):
# On OpenBSD only blowfish is supported
if sys.platform.startswith("openbsd"):
_method = crypt.METHOD_BLOWFISH
self._password = bcrypt.hash(pw)
else:
_method = crypt.METHOD_SHA512
self._password = crypt.crypt(pw, crypt.mksalt(_method))
self._password = sha512_crypt.hash(pw)

def chkPw(self, pw):
return crypt.crypt(pw, self.password) == self.password
try:
if self.password.startswith(("$2a$", "$2b$", "$2y$")):
return bcrypt.verify(pw, self.password)
return sha512_crypt.verify(pw, self.password)
except ValueError:
return False

@property
def propmap_id(self):
Expand Down