인증 경로 보존과 의존성 보안 검증을 보강
This commit is contained in:
parent
d2ba836565
commit
d801a1619d
10 changed files with 222 additions and 77 deletions
|
|
@ -4,7 +4,7 @@ from __future__ import annotations
|
|||
|
||||
from typing import Literal
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, model_validator
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
|
||||
|
||||
|
||||
AttentionSignalType = Literal[
|
||||
|
|
@ -31,6 +31,17 @@ ManifestDomain = Literal["alliance", "rupture", "transfer", "calibration"]
|
|||
DriftStatus = Literal["stable", "drift_flagged", "insufficient_evidence"]
|
||||
|
||||
|
||||
def _validate_app_relative_route(value: str) -> str:
|
||||
if not value.startswith("/") or value.startswith("//"):
|
||||
raise ValueError("route must be an app-relative path")
|
||||
if not all(
|
||||
char.isascii() and (char.isalnum() or char in "_{}?&=./-")
|
||||
for char in value
|
||||
):
|
||||
raise ValueError("route contains unsupported characters")
|
||||
return value
|
||||
|
||||
|
||||
class LedgerEvidencePointer(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid", frozen=True, protected_namespaces=())
|
||||
|
||||
|
|
@ -39,6 +50,11 @@ class LedgerEvidencePointer(BaseModel):
|
|||
session_id: str | None = Field(default=None, max_length=180)
|
||||
route_hint: str = Field(pattern=r"^/[a-zA-Z0-9_{}?&=./-]+$")
|
||||
|
||||
@field_validator("route_hint")
|
||||
@classmethod
|
||||
def require_app_relative_route(cls, value: str) -> str:
|
||||
return _validate_app_relative_route(value)
|
||||
|
||||
|
||||
class LearnerAttentionSignal(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid", frozen=True, protected_namespaces=())
|
||||
|
|
@ -87,6 +103,13 @@ class AttentionQueueItem(BaseModel):
|
|||
reasons: tuple[AttentionQueueReason, ...] = Field(min_length=1)
|
||||
drilldown_routes: tuple[str, ...] = Field(min_length=1)
|
||||
|
||||
@field_validator("drilldown_routes")
|
||||
@classmethod
|
||||
def require_app_relative_drilldown_routes(
|
||||
cls, value: tuple[str, ...]
|
||||
) -> tuple[str, ...]:
|
||||
return tuple(_validate_app_relative_route(route) for route in value)
|
||||
|
||||
@model_validator(mode="after")
|
||||
def enforce_direct_drilldown(self) -> "AttentionQueueItem":
|
||||
if len(self.drilldown_routes) > 3:
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import asyncio
|
|||
import importlib.util
|
||||
import json
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
|
||||
from .paths import repo_path
|
||||
from .services import guardrail
|
||||
|
|
@ -453,7 +454,12 @@ class ClientReplyQualityGateTest(unittest.TestCase):
|
|||
).read_text(encoding="utf-8")
|
||||
)
|
||||
runner = _load_clinical_observation_runner()
|
||||
current = asyncio.run(runner.build_observations(artifact["generated_at"]))
|
||||
with patch.object(
|
||||
runner.orchestrator.settings,
|
||||
"client_affect_provider",
|
||||
"legacy",
|
||||
):
|
||||
current = asyncio.run(runner.build_observations(artifact["generated_at"]))
|
||||
|
||||
self.assertEqual(
|
||||
artifact["schema_version"],
|
||||
|
|
|
|||
|
|
@ -140,6 +140,13 @@ class CaptureStreamEngine:
|
|||
|
||||
class OrchestratorMaskingGateTest(unittest.IsolatedAsyncioTestCase):
|
||||
def setUp(self) -> None:
|
||||
self.client_affect_provider_patch = patch.object(
|
||||
orchestrator.settings,
|
||||
"client_affect_provider",
|
||||
"legacy",
|
||||
)
|
||||
self.client_affect_provider_patch.start()
|
||||
self.addCleanup(self.client_affect_provider_patch.stop)
|
||||
self.presidio_patch = patch.object(
|
||||
guardrail,
|
||||
"_try_load_presidio",
|
||||
|
|
|
|||
|
|
@ -331,6 +331,15 @@ class ScenarioDirectorSelectionTests(unittest.TestCase):
|
|||
|
||||
|
||||
class ScenarioDirectorPromptIntegrationTests(unittest.IsolatedAsyncioTestCase):
|
||||
def setUp(self) -> None:
|
||||
self.client_affect_provider_patch = patch.object(
|
||||
orchestrator.settings,
|
||||
"client_affect_provider",
|
||||
"legacy",
|
||||
)
|
||||
self.client_affect_provider_patch.start()
|
||||
self.addCleanup(self.client_affect_provider_patch.stop)
|
||||
|
||||
async def test_generate_request_keeps_cue_in_prompt_and_provenance_metadata_only(
|
||||
self,
|
||||
) -> None:
|
||||
|
|
|
|||
|
|
@ -111,6 +111,13 @@ async def _consume_event_source(response: object) -> bytes:
|
|||
|
||||
class SessionTurnPersistenceTest(unittest.IsolatedAsyncioTestCase):
|
||||
async def asyncSetUp(self) -> None:
|
||||
self.client_affect_provider_patch = patch.object(
|
||||
orchestrator.settings,
|
||||
"client_affect_provider",
|
||||
"legacy",
|
||||
)
|
||||
self.client_affect_provider_patch.start()
|
||||
self.addCleanup(self.client_affect_provider_patch.stop)
|
||||
store._sessions.clear()
|
||||
sessions._RECALL_CACHE.clear()
|
||||
sessions._KB_CUES_CACHE.clear()
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@ from pathlib import Path
|
|||
from pydantic import ValidationError
|
||||
|
||||
from .contracts.supervision_research import (
|
||||
AttentionQueueItem,
|
||||
EvaluationVersionBatch,
|
||||
LedgerEvidencePointer,
|
||||
LearnerAttentionSignal,
|
||||
Phase3OutcomeEvidenceManifest,
|
||||
TeacherAiDisagreement,
|
||||
|
|
@ -99,6 +101,61 @@ class AttentionQueueTests(unittest.TestCase):
|
|||
LearnerAttentionSignal.model_validate(payload)
|
||||
|
||||
|
||||
class SupervisionRouteContractTests(unittest.TestCase):
|
||||
VALID_ROUTES = (
|
||||
"/teach",
|
||||
"/teach/session/uuid/review",
|
||||
"/teacher/dashboard?cohort=abc",
|
||||
)
|
||||
INVALID_ROUTES = (
|
||||
"//evil.test/path",
|
||||
"https://evil.test/path",
|
||||
"/\\evil.test/path",
|
||||
"/teach\nnext",
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls) -> None:
|
||||
cls.pack = load_supervision_research_benchmark(BENCHMARK_PATH)
|
||||
cls.queue_item_payload = build_attention_queue(cls.pack.attention_signals)[
|
||||
0
|
||||
].model_dump(mode="json")
|
||||
|
||||
def test_ledger_evidence_routes_allow_app_relative_paths(self) -> None:
|
||||
for route in self.VALID_ROUTES:
|
||||
with self.subTest(route=route):
|
||||
pointer = LedgerEvidencePointer(
|
||||
ledger="measurement_event",
|
||||
event_id="event-1",
|
||||
route_hint=route,
|
||||
)
|
||||
self.assertEqual(pointer.route_hint, route)
|
||||
|
||||
def test_ledger_evidence_routes_reject_external_and_unsupported_paths(self) -> None:
|
||||
for route in self.INVALID_ROUTES:
|
||||
with self.subTest(route=route):
|
||||
with self.assertRaises(ValidationError):
|
||||
LedgerEvidencePointer(
|
||||
ledger="measurement_event",
|
||||
event_id="event-1",
|
||||
route_hint=route,
|
||||
)
|
||||
|
||||
def test_attention_queue_routes_allow_app_relative_paths(self) -> None:
|
||||
payload = dict(self.queue_item_payload)
|
||||
payload["drilldown_routes"] = list(self.VALID_ROUTES)
|
||||
item = AttentionQueueItem.model_validate(payload)
|
||||
self.assertEqual(item.drilldown_routes, self.VALID_ROUTES)
|
||||
|
||||
def test_attention_queue_routes_reject_external_and_unsupported_paths(self) -> None:
|
||||
for route in self.INVALID_ROUTES:
|
||||
with self.subTest(route=route):
|
||||
payload = dict(self.queue_item_payload)
|
||||
payload["drilldown_routes"] = [route]
|
||||
with self.assertRaises(ValidationError):
|
||||
AttentionQueueItem.model_validate(payload)
|
||||
|
||||
|
||||
class CalibrationDatasetTests(unittest.TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls) -> None:
|
||||
|
|
|
|||
|
|
@ -206,6 +206,26 @@ test.describe("uc auth-onboarding", () => {
|
|||
}
|
||||
});
|
||||
|
||||
// usecase: 쿼리·해시가 있는 보호 경로 북마크도 OAuth가 원래 앱 내부 주소 그대로 돌려받는다
|
||||
test("비인증 보호 딥링크의 쿼리와 해시를 Google 로그인 next에 보존한다", async ({ page }) => {
|
||||
const deepLink = "/learn/practice?assignment_id=qa%2F123&mode=review#turn-3";
|
||||
await routeUnmockedApi(page);
|
||||
await routeUnauthenticated(page);
|
||||
await routeAuthConfig(page);
|
||||
|
||||
await page.goto(deepLink);
|
||||
await page.waitForURL(/\/login(?:$|[/?#])/);
|
||||
|
||||
const loginRequest = page.waitForRequest((request) => {
|
||||
const url = new URL(request.url());
|
||||
return url.pathname === "/api/auth/login" && url.searchParams.get("provider") === "google";
|
||||
});
|
||||
await page.getByRole("button", { name: /Google 계정으로 로그인/ }).click();
|
||||
|
||||
const requested = new URL((await loginRequest).url());
|
||||
expect(requested.searchParams.get("next")).toBe(deepLink);
|
||||
});
|
||||
|
||||
// usecase: 이미 로그인한 학습자가 /login 북마크를 다시 열면 자신의 홈으로 되돌린다
|
||||
test("로그인된 학습자가 /login을 다시 열면 학습자 홈으로 튕긴다", async ({ page }) => {
|
||||
await routeUnmockedApi(page);
|
||||
|
|
|
|||
158
apps/web/package-lock.json
generated
158
apps/web/package-lock.json
generated
|
|
@ -12,7 +12,7 @@
|
|||
"@tanstack/react-virtual": "^3.14.8",
|
||||
"react": "^19.1.0",
|
||||
"react-dom": "^19.1.0",
|
||||
"react-router-dom": "^6.30.1"
|
||||
"react-router-dom": "7.18.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@playwright/test": "^1.61.1",
|
||||
|
|
@ -1589,9 +1589,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@redocly/openapi-core": {
|
||||
"version": "1.34.16",
|
||||
"resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.34.16.tgz",
|
||||
"integrity": "sha512-zIgmQTT2TV/U/SJ3N4jlIw36erH6X8ga1UNIoyrlbr0yLEbsiII/16LZ0kMxWu2A8pw0xd56rwTz5sMudy2OAw==",
|
||||
"version": "1.34.21",
|
||||
"resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.34.21.tgz",
|
||||
"integrity": "sha512-yXMiBFYJbP5JOaxPzx2tJhK+v8h2Wu2uhad1Ro6GzVT8E3F4GcQ7sbLPJ9w4zvGjfxroD0bIh5B0pDtnLV/qUA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
@ -1600,7 +1600,7 @@
|
|||
"colorette": "1.4.0",
|
||||
"https-proxy-agent": "7.0.6",
|
||||
"js-levenshtein": "1.1.6",
|
||||
"js-yaml": "4.2.0",
|
||||
"js-yaml": "4.3.2",
|
||||
"minimatch": "5.1.9",
|
||||
"pluralize": "8.0.0",
|
||||
"yaml-ast-parser": "0.0.43"
|
||||
|
|
@ -1610,15 +1610,6 @@
|
|||
"npm": ">=9.5.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@remix-run/router": {
|
||||
"version": "1.23.3",
|
||||
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.3.tgz",
|
||||
"integrity": "sha512-4An71tdz9X8+3sI4Qqqd2LWd9vS39J7sqd9EU4Scw7TJE/qB10Flv/UuqbPVgfQV9XoK8Np6jNquZitnZq5i+Q==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@rolldown/pluginutils": {
|
||||
"version": "1.0.0-beta.27",
|
||||
"resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
|
||||
|
|
@ -2175,9 +2166,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/baseline-browser-mapping": {
|
||||
"version": "2.10.38",
|
||||
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.38.tgz",
|
||||
"integrity": "sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==",
|
||||
"version": "2.11.30",
|
||||
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.30.tgz",
|
||||
"integrity": "sha512-YJs6Pz17RMNv8HoyKREtCY38E3BV1nPkWVmIb+XN1uHC1Vqt3KZCH/uJH9ZKRoiKb/icZ6tvehyee6RZNbFfRA==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
|
|
@ -2188,9 +2179,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/brace-expansion": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz",
|
||||
"integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
|
||||
"version": "2.1.7",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz",
|
||||
"integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
@ -2198,9 +2189,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/browserslist": {
|
||||
"version": "4.28.4",
|
||||
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.4.tgz",
|
||||
"integrity": "sha512-MTc8i/x9jBQd1iMw2CFGS+rwMa07eYjLR0CCTLDACl9xhxy+nIs3KeML/biicXtk9JrZ6dnnTatmc7ErPXIxqw==",
|
||||
"version": "4.29.4",
|
||||
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.4.tgz",
|
||||
"integrity": "sha512-2TcbbiwXEq+N0kD36tykpCfyyQigUXmuwNQbnPp4Xk4PX9JOqVIKjJlIDjpH7uY6tmRGoAd+apeT1p60T8wsdA==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -2218,11 +2209,11 @@
|
|||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"baseline-browser-mapping": "^2.10.38",
|
||||
"caniuse-lite": "^1.0.30001799",
|
||||
"electron-to-chromium": "^1.5.376",
|
||||
"node-releases": "^2.0.48",
|
||||
"update-browserslist-db": "^1.2.3"
|
||||
"baseline-browser-mapping": "^2.11.29",
|
||||
"caniuse-lite": "^1.0.30001816",
|
||||
"electron-to-chromium": "^1.5.459",
|
||||
"node-releases": "^2.0.59",
|
||||
"update-browserslist-db": "^1.3.4"
|
||||
},
|
||||
"bin": {
|
||||
"browserslist": "cli.js"
|
||||
|
|
@ -2232,9 +2223,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/caniuse-lite": {
|
||||
"version": "1.0.30001799",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz",
|
||||
"integrity": "sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==",
|
||||
"version": "1.0.30001817",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001817.tgz",
|
||||
"integrity": "sha512-uZ1JG80BwhtMalIAGPxPfmNhHyd/B/nTdr3hITWlRamSyAdUStP1Gop01e7SD5q6J90ixJvWDbvmiFVfDgn4bw==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -2273,6 +2264,19 @@
|
|||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cookie": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
|
||||
"integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/express"
|
||||
}
|
||||
},
|
||||
"node_modules/csstype": {
|
||||
"version": "3.2.3",
|
||||
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
|
||||
|
|
@ -2299,9 +2303,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/electron-to-chromium": {
|
||||
"version": "1.5.378",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.378.tgz",
|
||||
"integrity": "sha512-VinvOAuuPmdD1guEgGv5f2Qp7/vlfqOrUOMYNnOD4wj3pit8kRsQHzfIf6teyUGWo15Tg5+bOJaRunvyltpVWQ==",
|
||||
"version": "1.5.461",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.461.tgz",
|
||||
"integrity": "sha512-3WZFARz1By+/rYcqQ0OLj4UcEdhd6tz2LEcDtKBUq7ey77EeJ1OtetY/5hjSUxw7dC5r5mA7FfkhRbqO9vnTCg==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
|
|
@ -2501,9 +2505,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/js-yaml": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz",
|
||||
"integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
|
||||
"version": "4.3.2",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
|
||||
"integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -2750,9 +2754,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/nanoid": {
|
||||
"version": "3.3.15",
|
||||
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.15.tgz",
|
||||
"integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
|
||||
"version": "3.3.20",
|
||||
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz",
|
||||
"integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -2769,9 +2773,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/node-releases": {
|
||||
"version": "2.0.50",
|
||||
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.50.tgz",
|
||||
"integrity": "sha512-J6l92tKHX6w8Jy5nO1Vuc01NoIiRGi/d6qBKVxh+IQ8Cr3b6HbVNfKiF8ZpFKufTwpwxMmce2W3iQZ861ZRyTg==",
|
||||
"version": "2.0.59",
|
||||
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.59.tgz",
|
||||
"integrity": "sha512-5qr2okC4ItAI0hG5SaV0HoYMpnM/Y6+Oqr7AmPYy/2uEoGvS+GbSKLeRxSS1uAdu59yz0ouzcuXievSgg///WA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
|
|
@ -2974,9 +2978,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/postcss": {
|
||||
"version": "8.5.15",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
|
||||
"integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
|
||||
"version": "8.5.31",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.31.tgz",
|
||||
"integrity": "sha512-YUbWYCgErwnMAVkjUnYa+KlMBzGpHwiIt/DE7f0G33AuX2LH9UcTk6KgWxd3zRU+pN3u/C+Xl3EnMLM4Hea7Sg==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -2994,9 +2998,9 @@
|
|||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"nanoid": "^3.3.12",
|
||||
"nanoid": "^3.3.20",
|
||||
"picocolors": "^1.1.1",
|
||||
"source-map-js": "^1.2.1"
|
||||
"source-map-js": "^1.2.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^10 || ^12 || >=14"
|
||||
|
|
@ -3034,35 +3038,41 @@
|
|||
}
|
||||
},
|
||||
"node_modules/react-router": {
|
||||
"version": "6.30.4",
|
||||
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.4.tgz",
|
||||
"integrity": "sha512-SVUsDe+DybHM/WmYKIVYhZh1o5Dcuf16yM6WjG02Q9XVFMZIJyHYhwrr6bFBXZkVP6z69kNkMyBCujt8FaFLJA==",
|
||||
"version": "7.18.4",
|
||||
"resolved": "https://registry.npmjs.org/react-router/-/react-router-7.18.4.tgz",
|
||||
"integrity": "sha512-PUPQcMhMGRAslLcvtlPz/kmzBEWPhLdgLFrL7pLNepBL6dX0lWj4WD2cUYVgYCuT3jxvghYFg81cDTj44DhetQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@remix-run/router": "1.23.3"
|
||||
"cookie": "^1.0.1",
|
||||
"set-cookie-parser": "^2.6.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
"node": ">=20.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": ">=16.8"
|
||||
"react": ">=18",
|
||||
"react-dom": ">=18"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"react-dom": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/react-router-dom": {
|
||||
"version": "6.30.4",
|
||||
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.4.tgz",
|
||||
"integrity": "sha512-q4HvNl+mmDdkS0g+MqiBZNteQJCuimWoOyHMy4T/RQLAn9Z29+E91QXRaxOujeMl2HTzRSS0KFPd7lxX3PjV0Q==",
|
||||
"version": "7.18.4",
|
||||
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.18.4.tgz",
|
||||
"integrity": "sha512-yrfmJHIpDG7taCpqKjT1G5B6q3O2K+RN8/fgNf0lTjCwiPbQ0ei6vXX9ZjQR+7ld8Tr7Z5xmyMnZ8YJrphWQUw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@remix-run/router": "1.23.3",
|
||||
"react-router": "6.30.4"
|
||||
"react-router": "7.18.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
"node": ">=20.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": ">=16.8",
|
||||
"react-dom": ">=16.8"
|
||||
"react": ">=18",
|
||||
"react-dom": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/require-from-string": {
|
||||
|
|
@ -3146,10 +3156,16 @@
|
|||
"semver": "bin/semver.js"
|
||||
}
|
||||
},
|
||||
"node_modules/set-cookie-parser": {
|
||||
"version": "2.7.2",
|
||||
"resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
|
||||
"integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/smol-toml": {
|
||||
"version": "1.7.0",
|
||||
"resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.7.0.tgz",
|
||||
"integrity": "sha512-aqVvWoyO21L23mb+drl4RmMXbf6N7FdHjAhTRA9ZBL7apWBgfWC16KjrASI+1p9GAroljyMHj6fK67i0UiTNvQ==",
|
||||
"version": "1.9.1",
|
||||
"resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.9.1.tgz",
|
||||
"integrity": "sha512-j7WyPdf0CJoutMzMoPLF/bVXHtKZIT9Rb4eGeEbWw8X2t5oirjPgpL+OpaENZrILYaXqYwnVH+qgUwVbl+pUJQ==",
|
||||
"dev": true,
|
||||
"license": "BSD-3-Clause",
|
||||
"engines": {
|
||||
|
|
@ -3160,9 +3176,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/source-map-js": {
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
|
||||
"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
|
||||
"integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
|
||||
"dev": true,
|
||||
"license": "BSD-3-Clause",
|
||||
"engines": {
|
||||
|
|
@ -3258,9 +3274,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/update-browserslist-db": {
|
||||
"version": "1.2.3",
|
||||
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
|
||||
"integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
|
||||
"version": "1.3.4",
|
||||
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.4.tgz",
|
||||
"integrity": "sha512-t8wonIOdQyOjtPd2VktlBu6QjTVTks6v8bSi7kd0r2Vll8TK1JYDZtRRdbmCHOAMphkZgrzK+L+vXK4pyZ8t4A==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
"@tanstack/react-virtual": "^3.14.8",
|
||||
"react": "^19.1.0",
|
||||
"react-dom": "^19.1.0",
|
||||
"react-router-dom": "^6.30.1"
|
||||
"react-router-dom": "7.18.4"
|
||||
},
|
||||
"overrides": {
|
||||
"gh-pages": "^6.3.0"
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ function RequireAuth({
|
|||
|
||||
if (loading) return <BootScreen />;
|
||||
if (!user) {
|
||||
return <Navigate to="/login" replace state={{ from: location.pathname }} />;
|
||||
return <Navigate to="/login" replace state={{ from: `${location.pathname}${location.search}${location.hash}` }} />;
|
||||
}
|
||||
if (roles && !roles.some((role) => canAccessRole(user, role))) {
|
||||
return <Navigate to={roleHomePath(user.role)} replace />;
|
||||
|
|
@ -189,7 +189,7 @@ function OnboardingGate({ children }: { children: ReactNode }) {
|
|||
if (isAdminWorkspacePath(path) && canAccessRole(user, "admin")) {
|
||||
return <>{children}</>;
|
||||
}
|
||||
return <Navigate to="/onboarding" replace state={{ from: path }} />;
|
||||
return <Navigate to="/onboarding" replace state={{ from: `${path}${location.search}${location.hash}` }} />;
|
||||
}
|
||||
if (
|
||||
user &&
|
||||
|
|
@ -208,7 +208,7 @@ function PendingApprovalGate({ children }: { children: ReactNode }) {
|
|||
|
||||
if (loading) return <BootScreen />;
|
||||
if (user && user.accountStatus !== "approved" && path !== "/pending") {
|
||||
return <Navigate to="/pending" replace state={{ from: path }} />;
|
||||
return <Navigate to="/pending" replace state={{ from: `${path}${location.search}${location.hash}` }} />;
|
||||
}
|
||||
if (user && user.accountStatus === "approved" && path === "/pending") {
|
||||
return <Navigate to={approvedHomePath(user)} replace />;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue