Skip to content

fix: Fixes regression in backend logic for argon2 and bcrypt #29

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
Daverball wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Fixes regression in backend logic for argon2 and bcrypt #29

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion passlib/handlers/argon2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ def _calc_checksum(self, secret):
self._stub_requires_backend()
# NOTE: have to use super() here so that we don't recursively
# call subclass's wrapped _calc_checksum
return super()._calc_checksum(secret)
return super(argon2, self)._calc_checksum(secret)


class _CffiBackend(_Argon2Common):
Expand Down
8 changes: 4 additions & 4 deletions passlib/handlers/bcrypt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ def _calc_checksum(self, secret):
self._stub_requires_backend()
# NOTE: have to use super() here so that we don't recursively
# call subclass's wrapped _calc_checksum, e.g. bcrypt_sha256._calc_checksum
return self._calc_checksum(secret)
return super(bcrypt, self)._calc_checksum(secret)


class _BcryptBackend(_BcryptCommon):
Expand Down Expand Up @@ -770,17 +770,17 @@ class _wrapped_bcrypt(bcrypt):
# def hash(cls, secret, **kwds):
# # bypass bcrypt backend overriding this method
# # XXX: would wrapping bcrypt make this easier than subclassing it?
# return super().hash(secret, **kwds)
# return super(_BcryptCommon, cls).hash(secret, **kwds)
#
# @classmethod
# def verify(cls, secret, hash):
# # bypass bcrypt backend overriding this method
# return super().verify(secret, hash)
# return super(_BcryptCommon, cls).verify(secret, hash)
#
# @classmethod
# def genhash(cls, secret, hash):
# # bypass bcrypt backend overriding this method
# return super().genhash(secret, hash)
# return super(_BcryptCommon, cls).genhash(secret, hash)

@classmethod
def _check_truncate_policy(cls, secret):
Expand Down