1 Commits
Author SHA1 Message Date
Denozordec 9cc6c8d958 feat(routes): add access-denied route and update authentication flow
quality / changes (push) Successful in 5s
quality / api (push) Skipped
quality / commitlint (push) Skipped
quality / docker-check (push) Skipped
CD / update-wiki (push) Successful in 5s
quality / web (push) Successful in 57s
CD / quality (push) Successful in 1m9s
CD / publish (push) Successful in 1m39s
- Introduced a new Access Denied route to handle unauthorized access.
- Updated routing logic to redirect to the Access Denied page when necessary.
- Enhanced authentication checks to prevent infinite redirect loops and improve user experience.
- Adjusted API client to handle JWT rejection scenarios more gracefully.
2026-09-04 14:23:23 +07:00
9 changed files with 139 additions and 14 deletions
+7
View File
@@ -30,6 +30,13 @@ async function handoffOnUnauthorized(): Promise<void> {
redirectToPortalLogin(`${window.location.origin}/auth/callback`) redirectToPortalLogin(`${window.location.origin}/auth/callback`)
return return
} }
// Cooldown / recent handoff — stop SSO storm (wrong JWT secret / issuer).
if (cfg.required || isAuthEnabled()) {
window.location.assign(
`${window.location.origin}/auth/callback?error=jwt_rejected`,
)
return
}
if (!cfg.required && !isAuthEnabled()) { if (!cfg.required && !isAuthEnabled()) {
window.location.href = '/login' window.location.href = '/login'
} }
+7 -1
View File
@@ -62,5 +62,11 @@ export function getAppUrl(
export function getCurrentApp( export function getCurrentApp(
config: AppSwitcherConfig = DEFAULT_APP_SWITCHER_CONFIG, config: AppSwitcherConfig = DEFAULT_APP_SWITCHER_CONFIG,
): AppSwitcherEntry { ): AppSwitcherEntry {
return config.apps.find((app) => app.id === CURRENT_APP_ID) ?? config.apps[0]! const current = config.apps.find((app) => app.id === CURRENT_APP_ID)
if (current) return current
if (config.apps[0]) return config.apps[0]
return (
DEFAULT_APP_SWITCHER_CONFIG.apps.find((a) => a.id === CURRENT_APP_ID) ??
DEFAULT_APP_SWITCHER_CONFIG.apps[0]!
)
} }
+1 -1
View File
@@ -255,5 +255,5 @@ export function firstAllowedPath(): string {
const perm = permissionForPath(path) const perm = permissionForPath(path)
if (!perm || can(perm)) return path if (!perm || can(perm)) return path
} }
return '/' return '/access-denied'
} }
+21
View File
@@ -10,6 +10,7 @@
import { Route as rootRouteImport } from './routes/__root' import { Route as rootRouteImport } from './routes/__root'
import { Route as LoginRouteImport } from './routes/login' import { Route as LoginRouteImport } from './routes/login'
import { Route as AccessDeniedRouteImport } from './routes/access-denied'
import { Route as AuthRouteImport } from './routes/_auth' import { Route as AuthRouteImport } from './routes/_auth'
import { Route as AuthIndexRouteImport } from './routes/_auth/index' import { Route as AuthIndexRouteImport } from './routes/_auth/index'
import { Route as AuthCallbackRouteImport } from './routes/auth.callback' import { Route as AuthCallbackRouteImport } from './routes/auth.callback'
@@ -28,6 +29,11 @@ const LoginRoute = LoginRouteImport.update({
path: '/login', path: '/login',
getParentRoute: () => rootRouteImport, getParentRoute: () => rootRouteImport,
} as any) } as any)
const AccessDeniedRoute = AccessDeniedRouteImport.update({
id: '/access-denied',
path: '/access-denied',
getParentRoute: () => rootRouteImport,
} as any)
const AuthRoute = AuthRouteImport.update({ const AuthRoute = AuthRouteImport.update({
id: '/_auth', id: '/_auth',
getParentRoute: () => rootRouteImport, getParentRoute: () => rootRouteImport,
@@ -91,6 +97,7 @@ const AuthSettingsAppearanceRoute = AuthSettingsAppearanceRouteImport.update({
export interface FileRoutesByFullPath { export interface FileRoutesByFullPath {
'/': typeof AuthIndexRoute '/': typeof AuthIndexRoute
'/access-denied': typeof AccessDeniedRoute
'/login': typeof LoginRoute '/login': typeof LoginRoute
'/settings': typeof AuthSettingsRouteRouteWithChildren '/settings': typeof AuthSettingsRouteRouteWithChildren
'/aliases': typeof AuthAliasesRoute '/aliases': typeof AuthAliasesRoute
@@ -104,6 +111,7 @@ export interface FileRoutesByFullPath {
'/settings/': typeof AuthSettingsIndexRoute '/settings/': typeof AuthSettingsIndexRoute
} }
export interface FileRoutesByTo { export interface FileRoutesByTo {
'/access-denied': typeof AccessDeniedRoute
'/login': typeof LoginRoute '/login': typeof LoginRoute
'/aliases': typeof AuthAliasesRoute '/aliases': typeof AuthAliasesRoute
'/nodes': typeof AuthNodesRoute '/nodes': typeof AuthNodesRoute
@@ -119,6 +127,7 @@ export interface FileRoutesByTo {
export interface FileRoutesById { export interface FileRoutesById {
__root__: typeof rootRouteImport __root__: typeof rootRouteImport
'/_auth': typeof AuthRouteWithChildren '/_auth': typeof AuthRouteWithChildren
'/access-denied': typeof AccessDeniedRoute
'/login': typeof LoginRoute '/login': typeof LoginRoute
'/_auth/settings': typeof AuthSettingsRouteRouteWithChildren '/_auth/settings': typeof AuthSettingsRouteRouteWithChildren
'/_auth/aliases': typeof AuthAliasesRoute '/_auth/aliases': typeof AuthAliasesRoute
@@ -136,6 +145,7 @@ export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath fileRoutesByFullPath: FileRoutesByFullPath
fullPaths: fullPaths:
| '/' | '/'
| '/access-denied'
| '/login' | '/login'
| '/settings' | '/settings'
| '/aliases' | '/aliases'
@@ -149,6 +159,7 @@ export interface FileRouteTypes {
| '/settings/' | '/settings/'
fileRoutesByTo: FileRoutesByTo fileRoutesByTo: FileRoutesByTo
to: to:
| '/access-denied'
| '/login' | '/login'
| '/aliases' | '/aliases'
| '/nodes' | '/nodes'
@@ -163,6 +174,7 @@ export interface FileRouteTypes {
id: id:
| '__root__' | '__root__'
| '/_auth' | '/_auth'
| '/access-denied'
| '/login' | '/login'
| '/_auth/settings' | '/_auth/settings'
| '/_auth/aliases' | '/_auth/aliases'
@@ -179,6 +191,7 @@ export interface FileRouteTypes {
} }
export interface RootRouteChildren { export interface RootRouteChildren {
AuthRoute: typeof AuthRouteWithChildren AuthRoute: typeof AuthRouteWithChildren
AccessDeniedRoute: typeof AccessDeniedRoute
LoginRoute: typeof LoginRoute LoginRoute: typeof LoginRoute
AuthCallbackRoute: typeof AuthCallbackRoute AuthCallbackRoute: typeof AuthCallbackRoute
} }
@@ -192,6 +205,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof LoginRouteImport preLoaderRoute: typeof LoginRouteImport
parentRoute: typeof rootRouteImport parentRoute: typeof rootRouteImport
} }
'/access-denied': {
id: '/access-denied'
path: '/access-denied'
fullPath: '/access-denied'
preLoaderRoute: typeof AccessDeniedRouteImport
parentRoute: typeof rootRouteImport
}
'/_auth': { '/_auth': {
id: '/_auth' id: '/_auth'
path: '' path: ''
@@ -318,6 +338,7 @@ const AuthRouteWithChildren = AuthRoute._addFileChildren(AuthRouteChildren)
const rootRouteChildren: RootRouteChildren = { const rootRouteChildren: RootRouteChildren = {
AuthRoute: AuthRouteWithChildren, AuthRoute: AuthRouteWithChildren,
AccessDeniedRoute: AccessDeniedRoute,
LoginRoute: LoginRoute, LoginRoute: LoginRoute,
AuthCallbackRoute: AuthCallbackRoute, AuthCallbackRoute: AuthCallbackRoute,
} }
+2 -1
View File
@@ -16,7 +16,8 @@ export const Route = createRootRouteWithContext<RouterContext>()({
beforeLoad: async ({ location }) => { beforeLoad: async ({ location }) => {
const isLogin = location.pathname === '/login' const isLogin = location.pathname === '/login'
const isCallback = location.pathname === '/auth/callback' const isCallback = location.pathname === '/auth/callback'
if (isCallback) return const isAccessDenied = location.pathname === '/access-denied'
if (isCallback || isAccessDenied) return
const cfg = await ensureAuthConfig() const cfg = await ensureAuthConfig()
const token = getToken() const token = getToken()
+6 -3
View File
@@ -30,16 +30,19 @@ export const Route = createFileRoute('/_auth')({
await new Promise(() => {}) await new Promise(() => {})
return return
} }
// NEVER redirect to `/` here — `/` is under `_auth` and causes an infinite loop
// (browser: «Страница не отвечает»).
if (!claims.apps.includes('cdn')) { if (!claims.apps.includes('cdn')) {
throw redirect({ to: '/' }) throw redirect({ to: '/access-denied' })
} }
const perm = permissionForPath(location.pathname) const perm = permissionForPath(location.pathname)
if (perm && !can(perm)) { if (perm && !can(perm)) {
const fallback = firstAllowedPath() const fallback = firstAllowedPath()
if (fallback !== location.pathname) { if (fallback === '/access-denied' || fallback === location.pathname) {
throw redirect({ to: fallback as '/' }) throw redirect({ to: '/access-denied' })
} }
throw redirect({ to: fallback as '/' })
} }
}, },
component: () => ( component: () => (
+47
View File
@@ -0,0 +1,47 @@
import { createFileRoute } from '@tanstack/react-router'
import {
authPortalUrl,
clearToken,
ensureAuthConfig,
redirectToPortalLogout,
} from '@/lib/auth'
import { Button } from '@cdnmanager/ui/components/button'
export const Route = createFileRoute('/access-denied')({
beforeLoad: async () => {
await ensureAuthConfig()
},
component: AccessDeniedPage,
})
function AccessDeniedPage() {
return (
<div className="flex min-h-svh flex-col items-center justify-center gap-4 p-6 text-center">
<h1 className="text-lg font-semibold">Нет доступа к CDN Manager</h1>
<p className="text-muted-foreground max-w-md text-sm">
В JWT нет приложения <code className="text-xs">cdn</code> или нужных прав{' '}
<code className="text-xs">cdn:*</code>. Выдайте доступ в Auth Portal
Админка пользователи, затем войдите снова.
</p>
<div className="flex flex-wrap items-center justify-center gap-2">
<Button
type="button"
variant="outline"
render={<a href={`${authPortalUrl().replace(/\/$/, '')}/admin`} />}
>
Открыть портал
</Button>
<Button
type="button"
variant="default"
onClick={() => {
clearToken()
redirectToPortalLogout()
}}
>
Выйти
</Button>
</div>
</div>
)
}
+46 -8
View File
@@ -7,11 +7,24 @@ import {
firstAllowedPath, firstAllowedPath,
getClaims, getClaims,
getToken, getToken,
markPortalHandoff,
parseHashToken, parseHashToken,
redirectToPortalLogin, redirectToPortalLogin,
setToken, setToken,
} from '@/lib/auth' } from '@/lib/auth'
async function verifyTokenAccepted(token: string): Promise<boolean> {
try {
const res = await fetch('/api/v1/locations', {
headers: { Authorization: `Bearer ${token}` },
})
// 401 = JWT rejected (secret/issuer). 403 = JWT ok, RBAC — still accepted.
return res.status !== 401
} catch {
return true
}
}
export const Route = createFileRoute('/auth/callback')({ export const Route = createFileRoute('/auth/callback')({
validateSearch: (search: Record<string, unknown>) => ({ validateSearch: (search: Record<string, unknown>) => ({
error: typeof search.error === 'string' ? search.error : undefined, error: typeof search.error === 'string' ? search.error : undefined,
@@ -19,25 +32,49 @@ export const Route = createFileRoute('/auth/callback')({
beforeLoad: async ({ search }) => { beforeLoad: async ({ search }) => {
await ensureAuthConfig() await ensureAuthConfig()
if (search.error === 'sso_loop') { if (search.error === 'sso_loop' || search.error === 'jwt_rejected') {
return return
} }
const { accessToken } = parseHashToken(window.location.hash) const { accessToken } = parseHashToken(window.location.hash)
if (accessToken) { if (accessToken) {
setToken(accessToken) setToken(accessToken)
// Start cooldown so a following API 401 cannot re-enter portal SSO storm.
markPortalHandoff()
clearPortalHandoffFlag() clearPortalHandoffFlag()
const claims = getClaims() const claims = getClaims()
if (!claims) { if (!claims) {
clearToken() clearToken()
window.location.assign(authPortalUrl()) throw redirect({
await new Promise(() => {}) to: '/auth/callback',
return search: { error: 'jwt_rejected' },
})
} }
throw redirect({ to: firstAllowedPath() as '/' }) if (!claims.apps.includes('cdn')) {
throw redirect({ to: '/access-denied' })
}
const ok = await verifyTokenAccepted(accessToken)
if (!ok) {
clearToken()
throw redirect({
to: '/auth/callback',
search: { error: 'jwt_rejected' },
})
}
const next = firstAllowedPath()
if (next === '/access-denied') {
throw redirect({ to: '/access-denied' })
}
throw redirect({ to: next as '/' })
} }
if (getToken() && getClaims()) { if (getToken() && getClaims()) {
clearPortalHandoffFlag() clearPortalHandoffFlag()
if (!getClaims()!.apps.includes('cdn')) {
throw redirect({ to: '/access-denied' })
}
throw redirect({ to: firstAllowedPath() as '/' }) throw redirect({ to: firstAllowedPath() as '/' })
} }
const ok = redirectToPortalLogin(`${window.location.origin}/auth/callback`) const ok = redirectToPortalLogin(`${window.location.origin}/auth/callback`)
@@ -51,13 +88,14 @@ export const Route = createFileRoute('/auth/callback')({
function AuthCallbackPage() { function AuthCallbackPage() {
const { error } = Route.useSearch() const { error } = Route.useSearch()
if (error === 'sso_loop') { if (error === 'sso_loop' || error === 'jwt_rejected') {
return ( return (
<div className="flex min-h-svh flex-col items-center justify-center gap-3 p-6 text-center"> <div className="flex min-h-svh flex-col items-center justify-center gap-3 p-6 text-center">
<h1 className="text-lg font-semibold">Сессия не принята</h1> <h1 className="text-lg font-semibold">Сессия не принята</h1>
<p className="text-muted-foreground max-w-md text-sm"> <p className="text-muted-foreground max-w-md text-sm">
Повторный вход через portal остановлен (защита от цикла редиректов). {error === 'jwt_rejected'
Обычно это несовпадение JWT_SECRET / ISSUER или просроченный токен. ? 'API отклонил JWT (обычно разный AUTH_JWT_SECRET / AUTH_ISSUER с portal). Проверьте .env контейнера CDN Manager.'
: 'Повторный вход через portal остановлен (защита от цикла редиректов). Обычно это несовпадение JWT_SECRET / ISSUER или просроченный токен.'}{' '}
Войдите заново на portal, затем откройте CDN Manager. Войдите заново на portal, затем откройте CDN Manager.
</p> </p>
<a className="text-primary text-sm underline" href={authPortalUrl()}> <a className="text-primary text-sm underline" href={authPortalUrl()}>
+2
View File
@@ -100,6 +100,8 @@ nano .env # заполнить секреты
На стороне портала добавьте origin в `RETURN_TO_ALLOWLIST` (`https://cdn.shnt.top`) и выдайте app **`cdn`** + права `cdn:*`. App Switcher URL: тот же origin. На стороне портала добавьте origin в `RETURN_TO_ALLOWLIST` (`https://cdn.shnt.top`) и выдайте app **`cdn`** + права `cdn:*`. App Switcher URL: тот же origin.
**Важно:** `AUTH_JWT_SECRET` в CDN Manager **должен совпадать** с `JWT_SECRET` auth-portal, `AUTH_ISSUER`с `ISSUER` портала. Иначе после SSO UI зацикливается / «Страница не отвечает».
--- ---
## 3. Запуск ## 3. Запуск