Quote issuer QS parameter in provisioning_uri. Fixes pyauth#47.

kirves · Jun 3, 2017 · dbc5194 · dbc5194
1 parent bd59a56
commit dbc5194
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/pyotp/utils.py b/src/pyotp/utils.py
@@ -53,7 +53,7 @@ def build_uri(secret, name, initial_count=None, issuer_name=None,
     label = quote(name)
     if issuer_name is not None:
         label = quote(issuer_name) + ':' + label
-        url_args['issuer'] = issuer_name
+        url_args['issuer'] = quote(issuer_name)
 
     if is_initial_count_present:
         url_args['counter'] = initial_count

diff --git a/test.py b/test.py
@@ -67,7 +67,7 @@ def test_provisioning_uri(self):
         self.assertEqual(url.path, '/FooCorp%21:mark%40percival')
         self.assertEqual(dict(parse_qsl(url.query)),
                          {'secret': 'wrn3pqx5uqxqvnqr', 'counter': '0',
-                          'issuer': 'FooCorp!'})
+                          'issuer': 'FooCorp%21'})
 
         key = 'c7uxuqhgflpw7oruedmglbrk7u6242vb'
         hotp = pyotp.HOTP(key, digits=8, digest=hashlib.sha256)
@@ -83,14 +83,14 @@ def test_provisioning_uri(self):
 
         hotp = pyotp.HOTP(key, digits=8)
         url = urlparse(
-            hotp.provisioning_uri('baco@peperina', issuer_name='FooCorp',
+            hotp.provisioning_uri('baco@peperina', issuer_name='Foo Corp',
                                   initial_count=10))
         self.assertEqual(url.scheme, 'otpauth')
         self.assertEqual(url.netloc, 'hotp')
-        self.assertEqual(url.path, '/FooCorp:baco%40peperina')
+        self.assertEqual(url.path, '/Foo%20Corp:baco%40peperina')
         self.assertEqual(dict(parse_qsl(url.query)),
                          {'secret': 'c7uxuqhgflpw7oruedmglbrk7u6242vb',
-                          'counter': '10', 'issuer': 'FooCorp',
+                          'counter': '10', 'issuer': 'Foo%20Corp',
                           'digits': '8'})
 
     def test_other_secret(self):
@@ -199,7 +199,7 @@ def test_provisioning_uri(self):
         self.assertEqual(url.path, '/FooCorp%21:mark%40percival')
         self.assertEqual(dict(parse_qsl(url.query)),
                          {'secret': 'wrn3pqx5uqxqvnqr',
-                          'issuer': 'FooCorp!'})
+                          'issuer': 'FooCorp%21'})
 
         key = 'c7uxuqhgflpw7oruedmglbrk7u6242vb'
         totp = pyotp.TOTP(key, digits=8, interval=60, digest=hashlib.sha256)