Spaces:
Running
Running
Upload managed_auth.py
Browse files- managed_auth.py +19 -49
managed_auth.py
CHANGED
|
@@ -4,11 +4,10 @@
|
|
| 4 |
from __future__ import annotations
|
| 5 |
|
| 6 |
import base64
|
| 7 |
-
import hashlib
|
| 8 |
-
import hmac
|
| 9 |
import html
|
| 10 |
import io
|
| 11 |
import os
|
|
|
|
| 12 |
import time
|
| 13 |
from datetime import datetime, timezone
|
| 14 |
from typing import Any, Callable
|
|
@@ -32,14 +31,11 @@ from i18n import tr
|
|
| 32 |
REQUEST_TIMEOUT = (3.05, 8.0)
|
| 33 |
SESSION_VERIFY_INTERVAL_SECONDS = 60
|
| 34 |
AUTO_LOGIN_POLL_INTERVAL_SECONDS = 2.0
|
| 35 |
-
|
| 36 |
-
|
| 37 |
-
GATEWAY_HEADER_TIMESTAMP = "X-SmartPaper-Gateway-Timestamp"
|
| 38 |
-
GATEWAY_HEADER_BROWSER_TOKEN = "X-SmartPaper-Browser-Token"
|
| 39 |
-
GATEWAY_HEADER_SIGNATURE = "X-SmartPaper-Gateway-Signature"
|
| 40 |
-
GATEWAY_ASSERTION_MAX_AGE_SECONDS = 120
|
| 41 |
|
| 42 |
_HTTP_SESSION = requests.Session()
|
|
|
|
| 43 |
_HTTP_SESSION.headers.update(
|
| 44 |
{
|
| 45 |
"Accept": "application/json",
|
|
@@ -84,7 +80,7 @@ def _normalize_https_origin(value: str) -> str:
|
|
| 84 |
|
| 85 |
def _api_base() -> str:
|
| 86 |
value = _normalize_https_origin(
|
| 87 |
-
_runtime_value("SMARTPAPER_AUTH_API")
|
| 88 |
)
|
| 89 |
if not value:
|
| 90 |
raise RuntimeError("SMARTPAPER_AUTH_API must be an HTTPS origin.")
|
|
@@ -181,15 +177,15 @@ def _clear_session(*, clear_browser: bool = False) -> None:
|
|
| 181 |
st.session_state.pop("sp_browser_restore_checked", None)
|
| 182 |
|
| 183 |
|
| 184 |
-
def
|
| 185 |
try:
|
| 186 |
context = getattr(st, "context", None)
|
| 187 |
-
|
| 188 |
-
direct =
|
| 189 |
if direct:
|
| 190 |
return str(direct).strip()
|
| 191 |
target = name.lower()
|
| 192 |
-
for key, value in getattr(
|
| 193 |
if str(key).lower() == target:
|
| 194 |
return str(value or "").strip()
|
| 195 |
except Exception:
|
|
@@ -197,38 +193,12 @@ def _context_header(name: str) -> str:
|
|
| 197 |
return ""
|
| 198 |
|
| 199 |
|
| 200 |
-
def
|
| 201 |
-
|
| 202 |
-
|
| 203 |
-
browser_token = _context_header(GATEWAY_HEADER_BROWSER_TOKEN)
|
| 204 |
-
signature = _context_header(GATEWAY_HEADER_SIGNATURE).lower()
|
| 205 |
-
try:
|
| 206 |
-
secret = _service_key()
|
| 207 |
-
except RuntimeError:
|
| 208 |
-
return ""
|
| 209 |
-
if not all((version == "1", timestamp_text, browser_token, signature, secret)):
|
| 210 |
-
return ""
|
| 211 |
-
try:
|
| 212 |
-
timestamp_ms = int(timestamp_text)
|
| 213 |
-
except ValueError:
|
| 214 |
-
return ""
|
| 215 |
-
age_seconds = abs(time.time() - timestamp_ms / 1000.0)
|
| 216 |
-
if age_seconds > GATEWAY_ASSERTION_MAX_AGE_SECONDS:
|
| 217 |
-
return ""
|
| 218 |
-
payload = (
|
| 219 |
-
f"gateway-v1\n{timestamp_text}\n{browser_token}"
|
| 220 |
-
).encode("utf-8")
|
| 221 |
-
expected = hmac.new(
|
| 222 |
-
secret.encode("utf-8"),
|
| 223 |
-
payload,
|
| 224 |
-
hashlib.sha256,
|
| 225 |
-
).hexdigest()
|
| 226 |
-
if not hmac.compare_digest(expected, signature):
|
| 227 |
-
return ""
|
| 228 |
-
return browser_token
|
| 229 |
|
| 230 |
|
| 231 |
-
def
|
| 232 |
# A Streamlit rerun (for example, changing interface language) must not
|
| 233 |
# repeat a negative remote restore check. A browser refresh creates a new
|
| 234 |
# Streamlit session, so it still performs one fresh restore attempt.
|
|
@@ -236,7 +206,7 @@ def _try_restore_gateway_session() -> bool:
|
|
| 236 |
return False
|
| 237 |
st.session_state["sp_browser_restore_checked"] = True
|
| 238 |
|
| 239 |
-
browser_token =
|
| 240 |
if not browser_token:
|
| 241 |
return False
|
| 242 |
st.session_state["sp_browser_token"] = browser_token
|
|
@@ -325,7 +295,7 @@ def _store_authenticated_session(result: dict[str, Any]) -> None:
|
|
| 325 |
browser_token = str(
|
| 326 |
result.get("browser_token")
|
| 327 |
or st.session_state.get("sp_browser_token")
|
| 328 |
-
or
|
| 329 |
or ""
|
| 330 |
).strip()
|
| 331 |
if browser_token:
|
|
@@ -334,8 +304,8 @@ def _store_authenticated_session(result: dict[str, Any]) -> None:
|
|
| 334 |
|
| 335 |
|
| 336 |
def _try_restore_authenticated_session() -> bool:
|
| 337 |
-
"""
|
| 338 |
-
return
|
| 339 |
|
| 340 |
|
| 341 |
@st.cache_data(show_spinner=False)
|
|
@@ -520,7 +490,7 @@ def _poll_login_once(
|
|
| 520 |
}
|
| 521 |
browser_token = str(
|
| 522 |
st.session_state.get("sp_browser_token")
|
| 523 |
-
or
|
| 524 |
or ""
|
| 525 |
).strip()
|
| 526 |
if browser_token:
|
|
@@ -672,7 +642,7 @@ def logout_alipay_session(
|
|
| 672 |
session_token = str(st.session_state.get("sp_session_token") or "").strip()
|
| 673 |
browser_token = str(
|
| 674 |
st.session_state.get("sp_browser_token")
|
| 675 |
-
or
|
| 676 |
or ""
|
| 677 |
).strip()
|
| 678 |
user_id = str((st.session_state.get("sp_user") or {}).get("id") or "")
|
|
|
|
| 4 |
from __future__ import annotations
|
| 5 |
|
| 6 |
import base64
|
|
|
|
|
|
|
| 7 |
import html
|
| 8 |
import io
|
| 9 |
import os
|
| 10 |
+
import re
|
| 11 |
import time
|
| 12 |
from datetime import datetime, timezone
|
| 13 |
from typing import Any, Callable
|
|
|
|
| 31 |
REQUEST_TIMEOUT = (3.05, 8.0)
|
| 32 |
SESSION_VERIFY_INTERVAL_SECONDS = 60
|
| 33 |
AUTO_LOGIN_POLL_INTERVAL_SECONDS = 2.0
|
| 34 |
+
BROWSER_COOKIE_NAME = "__Host-smartpaper_browser"
|
| 35 |
+
BROWSER_TOKEN_PATTERN = re.compile(r"^[A-Za-z0-9_-]{40,128}$")
|
|
|
|
|
|
|
|
|
|
|
|
|
| 36 |
|
| 37 |
_HTTP_SESSION = requests.Session()
|
| 38 |
+
_HTTP_SESSION.trust_env = False
|
| 39 |
_HTTP_SESSION.headers.update(
|
| 40 |
{
|
| 41 |
"Accept": "application/json",
|
|
|
|
| 80 |
|
| 81 |
def _api_base() -> str:
|
| 82 |
value = _normalize_https_origin(
|
| 83 |
+
_runtime_value("SMARTPAPER_AUTH_API")
|
| 84 |
)
|
| 85 |
if not value:
|
| 86 |
raise RuntimeError("SMARTPAPER_AUTH_API must be an HTTPS origin.")
|
|
|
|
| 177 |
st.session_state.pop("sp_browser_restore_checked", None)
|
| 178 |
|
| 179 |
|
| 180 |
+
def _context_cookie(name: str) -> str:
|
| 181 |
try:
|
| 182 |
context = getattr(st, "context", None)
|
| 183 |
+
cookies = getattr(context, "cookies", {}) if context is not None else {}
|
| 184 |
+
direct = cookies.get(name, "")
|
| 185 |
if direct:
|
| 186 |
return str(direct).strip()
|
| 187 |
target = name.lower()
|
| 188 |
+
for key, value in getattr(cookies, "items", lambda: ())():
|
| 189 |
if str(key).lower() == target:
|
| 190 |
return str(value or "").strip()
|
| 191 |
except Exception:
|
|
|
|
| 193 |
return ""
|
| 194 |
|
| 195 |
|
| 196 |
+
def _browser_token_from_cookie() -> str:
|
| 197 |
+
token = _context_cookie(BROWSER_COOKIE_NAME)
|
| 198 |
+
return token if BROWSER_TOKEN_PATTERN.fullmatch(token) else ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 199 |
|
| 200 |
|
| 201 |
+
def _try_restore_browser_session() -> bool:
|
| 202 |
# A Streamlit rerun (for example, changing interface language) must not
|
| 203 |
# repeat a negative remote restore check. A browser refresh creates a new
|
| 204 |
# Streamlit session, so it still performs one fresh restore attempt.
|
|
|
|
| 206 |
return False
|
| 207 |
st.session_state["sp_browser_restore_checked"] = True
|
| 208 |
|
| 209 |
+
browser_token = _browser_token_from_cookie()
|
| 210 |
if not browser_token:
|
| 211 |
return False
|
| 212 |
st.session_state["sp_browser_token"] = browser_token
|
|
|
|
| 295 |
browser_token = str(
|
| 296 |
result.get("browser_token")
|
| 297 |
or st.session_state.get("sp_browser_token")
|
| 298 |
+
or _browser_token_from_cookie()
|
| 299 |
or ""
|
| 300 |
).strip()
|
| 301 |
if browser_token:
|
|
|
|
| 304 |
|
| 305 |
|
| 306 |
def _try_restore_authenticated_session() -> bool:
|
| 307 |
+
"""Restore the server-side browser session from the initial request cookie."""
|
| 308 |
+
return _try_restore_browser_session()
|
| 309 |
|
| 310 |
|
| 311 |
@st.cache_data(show_spinner=False)
|
|
|
|
| 490 |
}
|
| 491 |
browser_token = str(
|
| 492 |
st.session_state.get("sp_browser_token")
|
| 493 |
+
or _browser_token_from_cookie()
|
| 494 |
or ""
|
| 495 |
).strip()
|
| 496 |
if browser_token:
|
|
|
|
| 642 |
session_token = str(st.session_state.get("sp_session_token") or "").strip()
|
| 643 |
browser_token = str(
|
| 644 |
st.session_state.get("sp_browser_token")
|
| 645 |
+
or _browser_token_from_cookie()
|
| 646 |
or ""
|
| 647 |
).strip()
|
| 648 |
user_id = str((st.session_state.get("sp_user") or {}).get("id") or "")
|