Merge pull request #84 from adorton-adobe/jwt-fix

jwt fix and pin dependencies

Author: adorton-adobe

.github/workflows/python-package.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2

setup.py

@@ -52,8 +52,8 @@
       packages=find_packages(),
       install_requires=[
           'requests>=2.4.2',
-          'cryptography',
-          'PyJWT',
+          'cryptography==3.3.1',
+          'PyJWT==2.0.1',
           'six',
           'enum34;python_version<"3.4"',
       ],

tests/fixture/certificate_pub.crt

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDXDCCAkSgAwIBAgIUWJ3RCA9FPvq48sj2pHh1eOP/NsEwDQYJKoZIhvcNAQEL
+BQAwaDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlVUMQ0wCwYDVQQHDARMZWhpMQ0w
+CwYDVQQKDARUZXN0MQ0wCwYDVQQDDARUZXN0MR8wHQYJKoZIhvcNAQkBFhB0ZXN0
+QGV4YW1wbGUuY29tMB4XDTIxMDEyNjEzMTU0OFoXDTMxMDEyODEzMTUyM1owaDEL
+MAkGA1UEBhMCVVMxCzAJBgNVBAgMAlVUMQ0wCwYDVQQHDARMZWhpMQ0wCwYDVQQK
+DARUZXN0MQ0wCwYDVQQDDARUZXN0MR8wHQYJKoZIhvcNAQkBFhB0ZXN0QGV4YW1w
+bGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu6Nu0lWkJ9ww
+XYaqFbnT+eG4/1048iz8Vq2FJNFTDLodzCF+Lbqe6LVYj+hUnPGXtsUninCrTg9t
+oYx6vSep8lXgxLCCzfz9VxC9XQiR9b+Gbu7999RNxJnX9rppQP5oyrCizAWqMDmu
+hUZXcIQoZb2/PaSwSahnSJu/kPJ+uFbB+/Ty/vknprMfL20VN8NLTuCknk2OJGRa
+nuz1jgUcCXpa/p8DKIhXACQ/GjcBumvk6PsI3N57YYmzEITKyWn2gS5UsMMoGq4o
+q5rekTcqfZ8Hp5v4NC9kRVdH0VCg8NChClbjXi8kByAky7QJtflsxBCEz2nv/OR1
+mqfg1foJowIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCFB7pSvDpU8M+I/Z3qb5Nb
+WxIYhlVhW4wt0OozxqriGV2cEfzJSsZFSs1UBqWjv6zux5r2PU8jBgGKSeFxHQjh
+XSjtQS/Z5DvTilc1Wb1oyFm7h45kPHBygfu3GMa60FlJMDjH+bH/gWhh0XRlMIAR
+pF9gZCexfNDYpzFyEkF7ArjEqjE5VFtWl5l7bEpwdvWZz4kEG8BXOpzYt1nrDMq7
+73S1b9nXRxL3larw/EZ8Xd0+SN3M/8IExM0QHAAKMmI72W0OpD2zaD21DsnOHKrl
+9iOAARUfFUR31Aq2qNKFpZtUQgpNC0VURBGkF5id4UerQslhr8bWQRCg/gJkDKBj
+-----END CERTIFICATE-----

tests/fixture/private.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAu6Nu0lWkJ9wwXYaqFbnT+eG4/1048iz8Vq2FJNFTDLodzCF+
+Lbqe6LVYj+hUnPGXtsUninCrTg9toYx6vSep8lXgxLCCzfz9VxC9XQiR9b+Gbu79
+99RNxJnX9rppQP5oyrCizAWqMDmuhUZXcIQoZb2/PaSwSahnSJu/kPJ+uFbB+/Ty
+/vknprMfL20VN8NLTuCknk2OJGRanuz1jgUcCXpa/p8DKIhXACQ/GjcBumvk6PsI
+3N57YYmzEITKyWn2gS5UsMMoGq4oq5rekTcqfZ8Hp5v4NC9kRVdH0VCg8NChClbj
+Xi8kByAky7QJtflsxBCEz2nv/OR1mqfg1foJowIDAQABAoIBACQDD+fqa+ECj33D
+tK0KxzY0Li9EkwNXwu5Xyy/vxMKyjbl5zB+2q3z6IQ8thd/BNl7ro9UcHqSSrXXN
+4lifXiyWctcNEW27Wlv1aIKMfIbvxTtRPwjrhClxZVODH2RL74zHLdd+VtV+nJIT
+mACOPLqaGjQYgYUBfyEeUzvcbpmuKL3kh/t/a2keCielLfSQgvTj4bgLkWbGDRs8
+sVae+Rj76tCRqnRkym0zZ52WKIP/b1ZJcyOBdXA7JYSAZ3bM9WO7XeS8dE/O4hug
+sMO3S/CU7m/qY/nSFlX0DilWo+b88TF2HlOlvnSFAasl7KWK/xXrZvDLg86ZVMh0
+aSNShhECgYEA5jkZEJqKrzHh6sQSDlFh706RZAcYQBi8URGlJCJHfet3Y0CN349M
+v3oXiPf/x54m0RPBEUtqOhWjxX5X23FSQAtiGq6EaaRJQNfG7yeQt4BRmJ0MfX+i
+eTiPp1313MB4eVuPaop1YWpgnvyGs5x7oHa8XzfuiDkE21cZiCGq2X0CgYEA0KW6
+bTL8ZNM5wKhtmNYMNlHTnaVjb577hxqI0FX05vDt7UVnk+e6szQxfjlhzaqepOos
+i7fzKDpXiyasLr1R4LLsOqhwyoGQYZwA8rOcmvcY8WfCpiJfuzg0g1FEbyldzzhr
+j+mAfBqpqOULZEaurFRHjRpiHVotce25N9wq2Z8CgYEAtYf4N5tkF1ih5tfL1PZe
+3q94/QKLIJ9gfhwHt0JAVQ3CCcTxGYKI5cKDpEDIssIFoX6OEfEBReOiSyugYywr
+yswvAxLw3cvo5vQ9rH3qIodPz6KmIp7tod/zhekU4Ifzdt23bC7Y94NFxJciL6YH
+5TM6vWoA7/Dl334CZ9EEQpECgYAb2cNkyCWAn+FZoiHfANNofMuug2EeiS4x/oy8
+onyqRwa7YUROLeRx/0mL+8TeWyQKB2gizk8a047T+DmLk6HWSIvX2JwVq+3F2bkW
+rHr/BHTD5IHLA1Ob/gikbrifzfnDq1hQQW7xIe37qXc3z2eJgUZ7w0XNfTgLuRu8
+JRtjKQKBgALYVgAMQGOlDBUzFCIKUT/n/YWNxCP1AndSakWh30Rdjpsao4FOSTB/
+PLCUPQuJGgInHn+lkK+vU6vMf0KTuqZbL224rVafU45SJP3l6PnTZkSCX9/mWTIr
+TADDJMlR5MM8HL8XSVilRMQnIPHA7PGj4G3F1QFDhdG+gg99KMA8
+-----END RSA PRIVATE KEY-----

tests/test_connections.py

@@ -33,6 +33,7 @@
 from umapi_client import UserAction, GroupTypes, IdentityTypes, RoleTypes, UserGroupAction
 from umapi_client import __version__ as umapi_version
 from umapi_client.auth import Auth
+from umapi_client.auth import JWT
 
 
 def test_remote_status_success():
@@ -485,3 +486,10 @@ def test_split_group_action():
     group.add_users(users=add_users)
     assert group.maybe_split_groups(10) is True
     assert len(group.commands) == 3
+
+def test_jwt():
+    # make sure we get no errors when constructing a JWT
+    from pathlib import Path
+    with open(Path(__file__).parents[0] / 'fixture/private.key') as keyfile:
+        jwt = JWT('xxxxxx', 'xxxxx', 'example.com', 'xxxxx', keyfile)
+        jwt()

umapi_client/auth.py

@@ -48,9 +48,7 @@ def __call__(self):
 
         # create JSON Web Token
         # noinspection PyUnresolvedReferences
-        jwt_token = jwt.encode(payload, self.key, algorithm='RS256')
-        # decode bytes into string
-        return jwt_token.decode("utf-8")
+        return jwt.encode(payload, self.key, algorithm='RS256')
 
 
 class AccessRequest(object):