Skip to content
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

chore: replace pyjwkest with pyjwt #233

Merged
merged 3 commits into from
May 10, 2023
Merged

chore: replace pyjwkest with pyjwt #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5f6d2d
chore: replace pyjwkest with pyjwt
mumarkhan999 Mar 27, 2023
e13753d
Merge branch 'master' into umar/replace-jwkest-with-pyjwt
mumarkhan999 Mar 27, 2023
734e581
Merge branch 'master' into umar/replace-jwkest-with-pyjwt
mumarkhan999 May 10, 2023
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
19 changes: 9 additions & 10 deletions auth_backends/tests/test_backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
import json
from calendar import timegm

import jwt
import six
from Cryptodome.PublicKey import RSA
from django.core.cache import cache
from jwkest.jwk import RSAKey
from jwkest.jws import JWS
from social_core.tests.backends.oauth import OAuth2Test


Expand All @@ -25,7 +24,7 @@ class EdXOAuth2Tests(OAuth2Test):
def setUp(self):
cache.clear()
super().setUp()
self.key = RSAKey(kid='testkey', key=RSA.generate(2048))
self.key = RSA.generate(2048).export_key('PEM')

def set_social_auth_setting(self, setting_name, value):
"""
Expand All @@ -45,7 +44,7 @@ def access_token_body(self, request, _url, headers):
self.assertEqual(body['token_type'], ['jwt'])

expires_in = 3600
access_token = self.create_jws_access_token(expires_in)
access_token = self.create_jwt_access_token(expires_in)
body = json.dumps({
'scope': 'read write profile email user_id',
'token_type': 'JWT',
Expand All @@ -54,18 +53,18 @@ def access_token_body(self, request, _url, headers):
})
return 200, headers, body

def create_jws_access_token(self, expires_in=3600, issuer=None, key=None, alg='RS512'):
def create_jwt_access_token(self, expires_in=3600, issuer=None, key=None, alg='RS512'):
"""
Creates a signed (JWS) access token.
Creates a signed (JWT) access token.

Arguments:
expires_in (int): Number of seconds after which the token expires.
issuer (str): Issuer of the token.
key (jwkest.jwk.Key): Key used to sign the token.
key (bytes PEM-format): Key used to sign the token.
alg (str): Signing algorithm.

Returns:
str: JWS
str: JWT
"""
key = key or self.key
now = datetime.datetime.utcnow()
Expand All @@ -86,7 +85,7 @@ def create_jws_access_token(self, expires_in=3600, issuer=None, key=None, alg='R
'family_name': 'Smith',
'user_id': '1',
}
access_token = JWS(payload, jwk=key, alg=alg).sign_compact()
access_token = jwt.encode(payload, key, algorithm=alg)
return access_token

def extra_settings(self):
Expand Down Expand Up @@ -150,7 +149,7 @@ def test_end_session_url(self):
self.assertEqual(self.backend.end_session_url(), self.public_url_root + logout_location)

def test_user_data(self):
user_data = self.backend.user_data(self.create_jws_access_token())
user_data = self.backend.user_data(self.create_jwt_access_token())
self.assertDictEqual(user_data, {
'name': 'Joe Smith',
'preferred_username': 'jsmith',
Expand Down
9 changes: 0 additions & 9 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ filelock==3.12.0
# -r requirements/test.txt
# tox
# virtualenv
future==0.18.3
# via
# -r requirements/test.txt
# pyjwkest
httpretty==1.1.4
# via -r requirements/test.txt
idna==3.4
Expand Down Expand Up @@ -170,10 +166,6 @@ pycparser==2.21
# -r requirements/test.txt
# cffi
pycryptodomex==3.17
# via
# -r requirements/test.txt
# pyjwkest
pyjwkest==1.4.2
# via -r requirements/test.txt
pyjwt[crypto]==2.6.0
# via
Expand Down Expand Up @@ -243,7 +235,6 @@ six==1.16.0
# -r requirements/ci.txt
# -r requirements/test.txt
# edx-lint
# pyjwkest
# tox
# unittest2
social-auth-app-django==5.2.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coverage
edx-lint
httpretty
pycodestyle
pyjwkest # used for crypto tests
pycryptodomex # used for crypto tests
pytest-cov
pytest-django
tox
Expand Down
6 changes: 0 additions & 6 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ filelock==3.12.0
# via
# tox
# virtualenv
future==0.18.3
# via pyjwkest
httpretty==1.1.4
# via -r requirements/test.in
idna==3.4
Expand Down Expand Up @@ -115,8 +113,6 @@ pycparser==2.21
# -r requirements/base.txt
# cffi
pycryptodomex==3.17
# via pyjwkest
pyjwkest==1.4.2
# via -r requirements/test.in
pyjwt[crypto]==2.6.0
# via
Expand Down Expand Up @@ -159,7 +155,6 @@ pyyaml==6.0
requests==2.29.0
# via
# -r requirements/base.txt
# pyjwkest
# requests-oauthlib
# social-auth-core
requests-oauthlib==1.3.1
Expand All @@ -170,7 +165,6 @@ six==1.16.0
# via
# -r requirements/base.txt
# edx-lint
# pyjwkest
# tox
# unittest2
social-auth-app-django==5.2.0
Expand Down