dara-core 1.13.1__py3-none-any.whl → 1.14.0a0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- dara/core/auth/base.py +10 -1
- dara/core/auth/routes.py +51 -1
- dara/core/umd/dara.core.umd.js +490 -415
- {dara_core-1.13.1.dist-info → dara_core-1.14.0a0.dist-info}/METADATA +10 -10
- {dara_core-1.13.1.dist-info → dara_core-1.14.0a0.dist-info}/RECORD +8 -8
- {dara_core-1.13.1.dist-info → dara_core-1.14.0a0.dist-info}/LICENSE +0 -0
- {dara_core-1.13.1.dist-info → dara_core-1.14.0a0.dist-info}/WHEEL +0 -0
- {dara_core-1.13.1.dist-info → dara_core-1.14.0a0.dist-info}/entry_points.txt +0 -0
dara/core/auth/base.py
CHANGED
|
@@ -18,7 +18,7 @@ limitations under the License.
|
|
|
18
18
|
import abc
|
|
19
19
|
from typing import Any, ClassVar, Dict, Union
|
|
20
20
|
|
|
21
|
-
from fastapi import Response
|
|
21
|
+
from fastapi import HTTPException, Response
|
|
22
22
|
from pydantic import BaseModel
|
|
23
23
|
from typing_extensions import TypedDict
|
|
24
24
|
|
|
@@ -91,6 +91,15 @@ class BaseAuthConfig(BaseModel, abc.ABC):
|
|
|
91
91
|
:param token: encoded token
|
|
92
92
|
"""
|
|
93
93
|
|
|
94
|
+
def refresh_token(self, refresh_token: str) -> tuple[str, str]:
|
|
95
|
+
"""
|
|
96
|
+
Create a new session token and refresh token from a refresh token.
|
|
97
|
+
|
|
98
|
+
:param refresh_token: encoded refresh token
|
|
99
|
+
:return: new session token, new refresh token
|
|
100
|
+
"""
|
|
101
|
+
raise HTTPException(400, f'Auth config {self.__class__.__name__} does not support token refresh')
|
|
102
|
+
|
|
94
103
|
def revoke_token(self, token: str, response: Response) -> Union[SuccessResponse, RedirectResponse]:
|
|
95
104
|
"""
|
|
96
105
|
Revoke a session token.
|
dara/core/auth/routes.py
CHANGED
|
@@ -16,9 +16,10 @@ limitations under the License.
|
|
|
16
16
|
"""
|
|
17
17
|
|
|
18
18
|
from inspect import iscoroutinefunction
|
|
19
|
+
from typing import Union, cast
|
|
19
20
|
|
|
20
21
|
import jwt
|
|
21
|
-
from fastapi import APIRouter, Depends, HTTPException, Request, Response
|
|
22
|
+
from fastapi import APIRouter, Cookie, Depends, HTTPException, Request, Response
|
|
22
23
|
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
|
23
24
|
|
|
24
25
|
from dara.core.auth.base import BaseAuthConfig
|
|
@@ -103,6 +104,55 @@ async def _revoke_session(response: Response, credentials: HTTPAuthorizationCred
|
|
|
103
104
|
raise HTTPException(status_code=400, detail=BAD_REQUEST_ERROR('No auth credentials passed'))
|
|
104
105
|
|
|
105
106
|
|
|
107
|
+
@auth_router.post('/refresh-token')
|
|
108
|
+
async def handle_refresh_token(
|
|
109
|
+
response: Response,
|
|
110
|
+
dara_refresh_token: Union[str, None] = Cookie(default=None),
|
|
111
|
+
):
|
|
112
|
+
"""
|
|
113
|
+
Given a refresh token, issues a new session token and refresh token cookie.
|
|
114
|
+
|
|
115
|
+
:param response: FastAPI response object
|
|
116
|
+
:param dara_refresh_token: refresh token cookie
|
|
117
|
+
:param settings: env settings object
|
|
118
|
+
"""
|
|
119
|
+
if dara_refresh_token is None:
|
|
120
|
+
raise HTTPException(status_code=400, detail=BAD_REQUEST_ERROR('No refresh token provided'))
|
|
121
|
+
|
|
122
|
+
from dara.core.internal.registries import auth_registry
|
|
123
|
+
|
|
124
|
+
auth_config: BaseAuthConfig = auth_registry.get('auth_config')
|
|
125
|
+
|
|
126
|
+
try:
|
|
127
|
+
# Refresh logic up to implementation
|
|
128
|
+
session_token, refresh_token = auth_config.refresh_token(dara_refresh_token)
|
|
129
|
+
|
|
130
|
+
# Using 'Strict' as it is only used for the refresh-token endpoint so cross-site requests are not expected
|
|
131
|
+
response.set_cookie(
|
|
132
|
+
key='dara_refresh_token', value=refresh_token, secure=True, httponly=True, samesite='strict'
|
|
133
|
+
)
|
|
134
|
+
return {'token': session_token}
|
|
135
|
+
except BaseException as e:
|
|
136
|
+
# Regardless of exception type, clear the refresh token cookie
|
|
137
|
+
response.delete_cookie('dara_refresh_token')
|
|
138
|
+
headers = {'set-cookie': response.headers['set-cookie']}
|
|
139
|
+
|
|
140
|
+
# If an explicit HTTPException was raised, re-raise it with the cookie header
|
|
141
|
+
if isinstance(e, HTTPException):
|
|
142
|
+
dev_logger.error('Auth Error', error=e)
|
|
143
|
+
e.headers = headers
|
|
144
|
+
raise e
|
|
145
|
+
|
|
146
|
+
# Explicitly handle expired signature error
|
|
147
|
+
if isinstance(e, jwt.ExpiredSignatureError):
|
|
148
|
+
dev_logger.error('Expired Token Signature', error=e)
|
|
149
|
+
raise HTTPException(status_code=401, detail=EXPIRED_TOKEN_ERROR, headers=headers)
|
|
150
|
+
|
|
151
|
+
# Otherwise show a generic invalid token error
|
|
152
|
+
dev_logger.error('Invalid Token', error=cast(Exception, e))
|
|
153
|
+
raise HTTPException(status_code=401, detail=INVALID_TOKEN_ERROR, headers=headers)
|
|
154
|
+
|
|
155
|
+
|
|
106
156
|
# Request to retrieve a session token from the backend. The app does this on startup.
|
|
107
157
|
@auth_router.post('/session')
|
|
108
158
|
async def _get_session(body: SessionRequestBody):
|