fix: use formatted strings instead of bytes in verify method

authlib · Sep 9, 2023 · 6c0f358 · 6c0f358
1 parent b0847d4
commit 6c0f358
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/otpauth/core.py b/src/otpauth/core.py
@@ -80,7 +80,7 @@ def string_code(self, code: int) -> str:
 
         :param code: The number that this OTP generated.
         """
-        return "{code:0{w}}".format(code=code, w=self.digit)
+        return f'{code:0{self.digit}}'
 
     @abstractmethod
     def generate(self, *args: t.Any, **kwargs: t.Any) -> int:

diff --git a/src/otpauth/rfc4226.py b/src/otpauth/rfc4226.py
@@ -35,7 +35,7 @@ def verify(self, code: int, counter: int) -> bool:  # type: ignore[override]
         """
         if len(str(code)) > self.digit:
             return False
-        return hmac.compare_digest(f'{self.generate(counter):0{self.digit}}', f'{code:0{self.digit}}')
+        return hmac.compare_digest(self.string_code(self.generate(counter)), self.string_code(code))
 
     def to_uri(self, label: str, issuer: str, counter: int) -> str:  # type: ignore[override]
         """Generate the otpauth protocal string for HOTP.

diff --git a/src/otpauth/rfc6238.py b/src/otpauth/rfc6238.py
@@ -40,7 +40,7 @@ def verify(self, code: int, timestamp: t.Optional[int] = None) -> bool:  # type:
         """
         if len(str(code)) > self.digit:
             return False
-        return hmac.compare_digest(f'{self.generate(timestamp):0{self.digit}}', f'{code:0{self.digit}}')
+        return hmac.compare_digest(self.string_code(self.generate(timestamp)), self.string_code(code))
 
     def to_uri(self, label: str, issuer: str) -> str:  # type: ignore[override]
         """Generate the otpauth protocal string for TOTP.