Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
api
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cubicweb
cubes
api
Commits
1527ef3e653e
Commit
1527ef3e653e
authored
2 years ago
by
Arnaud Vergnet
Browse files
Options
Downloads
Patches
Plain Diff
fix: add typing to pyramid_jwt
parent
0ca194061137
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!21
fix: revert to base pyramid_jwt implementation using a custom cookie serializer
Pipeline
#135830
canceled
2 years ago
Stage: lint
Stage: tests
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cubicweb_api/jwt_policy.py
+9
-8
9 additions, 8 deletions
cubicweb_api/jwt_policy.py
with
9 additions
and
8 deletions
cubicweb_api/jwt_policy.py
+
9
−
8
View file @
1527ef3e
...
...
@@ -36,6 +36,7 @@
from
pyramid.authentication
import
CallbackAuthenticationPolicy
from
pyramid.interfaces
import
IAuthenticationPolicy
,
IRendererFactory
from
pyramid.request
import
Request
from
pyramid.response
import
Response
log
=
logging
.
getLogger
(
__name__
)
marker
=
[]
...
...
@@ -268,7 +269,7 @@
**
kwargs
)
def
_get_cookies
(
self
,
request
,
value
,
max_age
=
None
,
domains
=
None
):
def
_get_cookies
(
self
,
request
:
Request
,
value
,
max_age
=
None
,
domains
=
None
):
profile
=
self
.
cookie_profile
(
request
)
if
domains
is
None
:
domains
=
[
request
.
domain
]
...
...
@@ -280,7 +281,7 @@
headers
=
profile
.
get_headers
(
value
,
**
kw
)
return
headers
def
remember
(
self
,
request
,
principal
,
**
kw
):
def
remember
(
self
,
request
:
Request
,
principal
,
**
kw
):
token
=
self
.
create_token
(
principal
,
self
.
expiration
,
self
.
audience
,
**
kw
)
if
hasattr
(
request
,
"
_jwt_cookie_reissued
"
):
...
...
@@ -290,7 +291,7 @@
return
self
.
_get_cookies
(
request
,
token
,
self
.
max_age
,
domains
=
domains
)
def
forget
(
self
,
request
):
def
forget
(
self
,
request
:
Request
):
request
.
_jwt_cookie_reissue_revoked
=
True
return
self
.
_get_cookies
(
request
,
None
)
...
...
@@ -294,7 +295,7 @@
request
.
_jwt_cookie_reissue_revoked
=
True
return
self
.
_get_cookies
(
request
,
None
)
def
get_claims
(
self
,
request
):
def
get_claims
(
self
,
request
:
Request
):
profile
=
self
.
cookie_profile
.
bind
(
request
)
cookie
=
profile
.
get_value
()
...
...
@@ -309,7 +310,7 @@
self
.
_handle_reissue
(
request
,
claims
)
return
claims
def
_handle_reissue
(
self
,
request
,
claims
):
def
_handle_reissue
(
self
,
request
:
Request
,
claims
:
dict
):
if
not
request
or
not
claims
:
raise
ValueError
(
"
Cannot handle JWT reissue: insufficient arguments
"
)
...
...
@@ -331,6 +332,6 @@
)
headers
=
self
.
remember
(
request
,
principal
,
**
extra_claims
)
def
reissue_jwt_cookie
(
request
,
r
esponse
):
if
not
hasattr
(
request
,
"
_jwt_cookie_reissue_revoked
"
):
def
reissue_jwt_cookie
(
inner_
request
:
Request
,
inner_response
:
R
esponse
):
if
not
hasattr
(
inner_
request
,
"
_jwt_cookie_reissue_revoked
"
):
for
k
,
v
in
headers
:
...
...
@@ -336,5 +337,5 @@
for
k
,
v
in
headers
:
response
.
headerlist
.
append
((
k
,
v
))
inner_
response
.
headerlist
.
append
((
k
,
v
))
request
.
add_response_callback
(
reissue_jwt_cookie
)
request
.
_jwt_cookie_reissued
=
True
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment