Commit3d89c29

David Glick

committed

Sign JWTs for github app auth using PyJWT instead of jwcrypto

1 parentbe71aba commit3d89c29Copy full SHA for 3d89c29

File tree

+16

-18

lines changed

+16

-18

lines changed

Lines changed: 2 additions & 0 deletions

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,14 @@ Dependencies`
`18`	`18`
`19`	`19`	`-requests_`
`20`	`20`	`-uritemplate_`
	`21`	`+-python-dateutil_`
	`22`	`+-PyJWT_`
`21`	`23`
`22`	`24`	`.. _requests:https://github.com/kennethreitz/requests`
`23`	`25`	`.. _uritemplate:https://github.com/sigmavirus24/uritemplate`
	`26`	`+.. _python-dateutil:https://github.com/dateutil/dateutil`
	`27`	`+.. _PyJWT:https://github.com/jpadilla/pyjwt`
	`28`	`+`
`24`	`29`
`25`	`30`	`Contributing`
`26`	`31`	`------------`
`@@ -45,13 +50,11 @@ this in a virtual environment. These need to be installed for the tests to run.`
`45`	`50`	`Build status`
`46`	`51`	`~~~~~~~~~~~~`
`47`	`52`
`48`		-You can find`master`build statuses for different environments.
	`53`	`+You can find build statuses for different environments.`
`49`	`54`
`50`	`55`	`-Github_`
`51`		`--appveyor_`
`52`	`56`
`53`	`57`	`.. _Github:https://github.com/sigmavirus24/github3.py/actions`
`54`		`-.. _appveyor:https://ci.appveyor.com/project/sigmavirus24/github3-py/branch/master`
`55`	`58`
`56`	`59`	`License`
`57`	`60`	`-------`

Lines changed: 2 additions & 2 deletions

Lines changed: 6 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`	`"""`
`5`	`5`	`importtime`
`6`	`6`
`7`		`-fromjwcryptoimportjwk`
`8`		`-fromjwcryptoimportjwt`
	`7`	`+importjwt`
`9`	`8`
`10`	`9`	`from .importmodels`
`11`	`10`	`from .importusers`
`@@ -155,10 +154,6 @@ def _update_attributes(self, json):`
`155`	`154`	`self.updated_at=self._strptime(json["updated_at"])`
`156`	`155`
`157`	`156`
`158`		`-def_load_private_key(pem_key_bytes):`
`159`		`-returnjwk.JWK.from_pem(pem_key_bytes)`
`160`		`-`
`161`		`-`
`162`	`157`	`defcreate_token(private_key_pem,app_id,expire_in=TEN_MINUTES_AS_SECONDS):`
`163`	`158`	`"""Create an encrypted token for the specified App.`
`164`	`159`
`@@ -176,15 +171,13 @@ def create_token(private_key_pem, app_id, expire_in=TEN_MINUTES_AS_SECONDS):`
`176`	`171`	`"""`
`177`	`172`	`ifnotisinstance(private_key_pem,bytes):`
`178`	`173`	`raiseValueError('"private_key_pem" parameter must be byte-string')`
`179`		`-key=_load_private_key(private_key_pem)`
`180`	`174`	`now=int(time.time())`
`181`		`-token=jwt.JWT(`
`182`		`-header={"alg":"RS256"},`
`183`		`-claims={"iat":now,"exp":now+expire_in,"iss":app_id},`
`184`		`-algs=["RS256"],`
	`175`	`+token=jwt.encode(`
	`176`	`+payload={"iat":now,"exp":now+expire_in,"iss":app_id},`
	`177`	`+key=private_key_pem,`
	`178`	`+algorithm="RS256",`
`185`	`179`	`)`
`186`		`-token.make_signed_token(key)`
`187`		`-returntoken.serialize()`
	`180`	`+returntoken`
`188`	`181`
`189`	`182`
`190`	`183`	`defcreate_jwt_headers(`

Comments

(0)