PyOTP 2.4.0__tar.gz → 2.4.1__tar.gz

{pyotp-2.4.0/src/pyotp.egg-info → pyotp-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyotp
-Version: 2.4.0
+Version: 2.4.1
 Summary: Python One Time Password Library
 Home-page: https://github.com/pyotp/pyotp
 Author: PyOTP contributors

{pyotp-2.4.0 → pyotp-2.4.1}/setup.py

@@ -7,7 +7,7 @@ install_requires = [line.rstrip() for line in open(os.path.join(os.path.dirname(
 
 setup(
     name="pyotp",
-    version="2.4.0",
+    version="2.4.1",
     url="https://github.com/pyotp/pyotp",
     license="MIT License",
     author="PyOTP contributors",

{pyotp-2.4.0 → pyotp-2.4.1}/src/pyotp/__init__.py

@@ -84,9 +84,9 @@ def parse_uri(uri: str) -> OTP:
                 raise ValueError('Digits may only be 6 or 8')
             otp_data['digits'] = digits
         elif key == 'period':
-            otp_data['interval'] = value
+            otp_data['interval'] = int(value)
         elif key == 'counter':
-            otp_data['initial_count'] = value
+            otp_data['initial_count'] = int(value)
         else:
             raise ValueError('{} is not a valid parameter'.format(key))
 

{pyotp-2.4.0 → pyotp-2.4.1}/src/pyotp/hotp.py

@@ -22,7 +22,7 @@ class HOTP(OTP):
         :param count: the OTP HMAC counter
         :returns: OTP
         """
-        return self.generate_otp(count)
+        return self.generate_otp(self.initial_count + count)
 
     def verify(self, otp: str, counter: int) -> bool:
         """

{pyotp-2.4.0 → pyotp-2.4.1}/src/pyotp/totp.py

@@ -1,5 +1,6 @@
 from typing import Any, Union, Optional
 
+import calendar
 import datetime
 import time
 
@@ -80,5 +81,13 @@ class TOTP(OTP):
                                digits=self.digits, period=self.interval)
 
     def timecode(self, for_time: datetime.datetime) -> int:
-        i = time.mktime(for_time.timetuple())
-        return int(i / self.interval)
+        """
+        Accepts either a timezone naive (`for_time.tzinfo is None`) or
+        a timezone aware datetime as argument and returns the
+        corresponding counter value (timecode).
+
+        """
+        if for_time.tzinfo:
+            return int(calendar.timegm(for_time.utctimetuple()) / self.interval)
+        else:
+            return int(time.mktime(for_time.timetuple()) / self.interval)

{pyotp-2.4.0 → pyotp-2.4.1/src/pyotp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyotp
-Version: 2.4.0
+Version: 2.4.1
 Summary: Python One Time Password Library
 Home-page: https://github.com/pyotp/pyotp
 Author: PyOTP contributors

{pyotp-2.4.0 → pyotp-2.4.1}/test.py

@@ -339,6 +339,7 @@ class ValidWindowTest(unittest.TestCase):
         self.assertTrue(totp.verify("681610", 200, 1))
         self.assertFalse(totp.verify("195979", 200, 1))
 
+
 class ParseUriTest(unittest.TestCase):
     def test_invalids(self):
         with self.assertRaises(ValueError) as cm:
@@ -369,15 +370,48 @@ class ParseUriTest(unittest.TestCase):
             pyotp.parse_uri('otpauth://totp?algorithm=aes')
         self.assertEqual('Invalid value for algorithm, must be SHA1, SHA256 or SHA512', str(cm.exception))
 
+    @unittest.skipIf(sys.version_info < (3, 6), "Skipping test that requires deterministic dict key enumeration")
     def test_algorithms(self):
-        otp = pyotp.parse_uri('otpauth://totp?algorithm=SHA1&secret=123456&algorithm=SHA1')
+        otp = pyotp.parse_uri('otpauth://totp?algorithm=SHA1&secret=GEZDGNBV&algorithm=SHA1')
+        self.assertEqual(hashlib.sha1, otp.digest)
+        self.assertEqual(otp.at(0), '734055')
+        self.assertEqual(otp.at(30), '662488')
+        self.assertEqual(otp.at(60), '289363')
+        self.assertEqual(otp.provisioning_uri(), 'otpauth://totp/Secret?secret=GEZDGNBV')
+        self.assertEqual(otp.provisioning_uri(name='n', issuer_name='i'), 'otpauth://totp/i:n?secret=GEZDGNBV&issuer=i')
+
+        otp = pyotp.parse_uri('otpauth://totp?algorithm=SHA1&secret=GEZDGNBV&algorithm=SHA1&period=60')
+        self.assertEqual(hashlib.sha1, otp.digest)
+        self.assertEqual(otp.at(30), '734055')
+        self.assertEqual(otp.at(60), '662488')
+        self.assertEqual(otp.provisioning_uri(name='n', issuer_name='i'),
+                         'otpauth://totp/i:n?secret=GEZDGNBV&issuer=i&period=60')
+
+        otp = pyotp.parse_uri('otpauth://hotp?algorithm=SHA1&secret=GEZDGNBV&algorithm=SHA1')
+        self.assertEqual(hashlib.sha1, otp.digest)
+        self.assertEqual(otp.at(0), '734055')
+        self.assertEqual(otp.at(1), '662488')
+        self.assertEqual(otp.at(2), '289363')
+        self.assertEqual(otp.provisioning_uri(name='n', issuer_name='i'),
+                         'otpauth://hotp/i:n?secret=GEZDGNBV&issuer=i&counter=0')
+
+        otp = pyotp.parse_uri('otpauth://hotp?algorithm=SHA1&secret=GEZDGNBV&algorithm=SHA1&counter=1')
         self.assertEqual(hashlib.sha1, otp.digest)
+        self.assertEqual(otp.at(0), '662488')
+        self.assertEqual(otp.at(1), '289363')
+        self.assertEqual(otp.provisioning_uri(name='n', issuer_name='i'),
+                         'otpauth://hotp/i:n?secret=GEZDGNBV&issuer=i&counter=1')
 
-        otp = pyotp.parse_uri('otpauth://totp?algorithm=SHA1&secret=123456&algorithm=SHA256')
+        otp = pyotp.parse_uri('otpauth://totp?algorithm=SHA1&secret=GEZDGNBV&algorithm=SHA256')
         self.assertEqual(hashlib.sha256, otp.digest)
+        self.assertEqual(otp.at(0), '918961')
+        self.assertEqual(otp.at(9000), '934470')
 
-        otp = pyotp.parse_uri('otpauth://totp?algorithm=SHA1&secret=123456&algorithm=SHA512')
+        otp = pyotp.parse_uri('otpauth://totp?algorithm=SHA1&secret=GEZDGNBV&algorithm=SHA512')
         self.assertEqual(hashlib.sha512, otp.digest)
+        self.assertEqual(otp.at(0), '816660')
+        self.assertEqual(otp.at(9000), '524153')
+
 
 class Timecop(object):
     """