mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-19 13:21:46 +00:00
25f326a659
* fix(mcp): MCP RFC compliant for more strict clients * fix(mcp): serve flat /.well-known/oauth-protected-resource for ChatGPT reconnect Clients such as ChatGPT probe the flat well-known URL on every fresh discovery cycle (i.e. after a full disconnect/reconnect where cached OAuth state is cleared). The SDK's mcpAuthMetadataRouter only serves the path-based form /.well-known/oauth-protected-resource/mcp, so the flat probe returned 404. Without the resource metadata, ChatGPT fell back to the issuer URL as the resource parameter (https://…/ instead of https://…/mcp). The authorize handler then rejected it with invalid_target and redirected back to ChatGPT's callback with an error — showing the user the TREK home page instead of the consent form. Add an explicit GET handler for the flat URL that returns the same protected resource metadata, so the resource URI is discovered correctly on the first probe. * fix(mcp): fix OAuth popup blank page — SW denylist and COOP header Service worker was intercepting /oauth/authorize navigate requests (not in denylist), serving index.html, and React Router's catch-all redirected to / instead of the SDK authorize handler. Helmet's default COOP: same-origin isolated the /oauth/consent popup from its cross-origin opener, making window.opener null and breaking the popup-based OAuth completion signal for ChatGPT and similar clients. * fix(ntfy): encode non-Latin-1 header values with RFC 2047 to prevent ByteString crash Todo/trip names containing chars like → or € (and non-Latin-1 locale templates for Czech, Chinese, Russian, etc.) caused the Fetch API to throw when setting the ntfy Title header. Apply RFC 2047 base64 encoded-word encoding for any header value containing chars above U+00FF; ntfy decodes this automatically. * docs(mcp): document Cloudflare bot detection blocking ChatGPT MCP requests Add Cloudflare WAF note to MCP-Setup and a full troubleshooting entry covering root cause (IP reputation + UA heuristics), free-plan limitation (disable Bot Fight Mode entirely, with explicit warning), and paid-plan WAF skip rule with the full expression syntax and path table for all MCP/OAuth/.well-known routes. * fix(pwa): detect upstream proxy auth challenges and recover gracefully Behind Cloudflare Zero Trust or Pangolin, cross-origin auth redirects on /api/* calls surface as CORS errors (error.response === undefined) that the existing 401 interceptor never catches, leaving the PWA stuck with network-error toasts instead of re-authenticating. New connectivity module probes /api/health every 30s using fetch with cache:no-store and inspects Content-Type to reliably detect whether the server is reachable vs intercepted by an upstream proxy. axios interceptor changes: - On !error.response + navigator.onLine: run probeNow(); if the health probe also fails (proxy is intercepting all requests), trigger a guarded window.location.reload() so the edge proxy can intercept the top-level navigation and run its auth flow (covers CF Access and Pangolin 302 mode) - On error.response status 401 with text/html body: same reload path, covering Pangolin header-auth extended compatibility mode which returns 401+HTML instead of a 302 redirect. TREK own 401s are always JSON so there is no collision with the existing AUTH_REQUIRED branch. - sessionStorage flag prevents reload loops; cleared on any successful response so the guard resets after re-auth. /api/health excluded from SW NetworkFirst cache (vite.config.js regex) and Cache-Control: no-store added server-side so probes always hit the network and cannot be served stale from the 24h api-data cache. LoginPage caches last-known appConfig in localStorage so the SSO button renders in OIDC+UN/PW dual mode even when the config fetch is intercepted by the proxy. Auto-redirect to IdP skipped when config comes from cache to avoid redirect loops while the proxy is challenging. Fixes discussion #836. * fix(files): add bottom-nav padding to files tab wrapper on mobile * fix(budget): expose toolbar on mobile so users can add budget categories * fix(pwa): unregister SW before proxy-reauth reload so Pangolin can challenge WorkBox's NavigationRoute served the cached SPA shell on window.location.reload(), meaning Pangolin/CF Access never saw the navigation and the app was left stuck showing stale offline data. Unregistering the SW first lets the navigation reach the network so the upstream proxy can run its auth flow. Also rebuilds server/public with corrected sw.js (health excluded from NetworkFirst, /oauth/ and /.well-known/ added to NavigationRoute denylist). * chore: remove committed build artifacts from server/public Dockerfile and Proxmox community script both rebuild client/dist and copy it into server/public at build time — committed artifacts were never used. Replace with .gitkeep and add server/public/* to .gitignore. * chore: add build-from-sources script
359 lines
17 KiB
TypeScript
359 lines
17 KiB
TypeScript
import React, { useEffect, useState } from 'react'
|
||
import { useAuthStore } from '../store/authStore'
|
||
import { oauthApi } from '../api/client'
|
||
import { SCOPE_GROUPS } from '../api/oauthScopes'
|
||
import { Lock, ShieldCheck, AlertTriangle, Loader2, LogIn } from 'lucide-react'
|
||
import { useTranslation } from '../i18n'
|
||
|
||
interface ValidateResult {
|
||
valid: boolean
|
||
error?: string
|
||
error_description?: string
|
||
client?: { name: string; allowed_scopes: string[] }
|
||
scopes?: string[]
|
||
consentRequired?: boolean
|
||
loginRequired?: boolean
|
||
scopeSelectable?: boolean
|
||
}
|
||
|
||
type PageState = 'loading' | 'login_required' | 'consent' | 'auto_approving' | 'error' | 'done'
|
||
|
||
export default function OAuthAuthorizePage(): React.ReactElement {
|
||
const { t } = useTranslation()
|
||
const { isAuthenticated, isLoading: authLoading, loadUser } = useAuthStore()
|
||
const [pageState, setPageState] = useState<PageState>('loading')
|
||
const [validation, setValidation] = useState<ValidateResult | null>(null)
|
||
const [submitting, setSubmitting] = useState(false)
|
||
const [errorMsg, setErrorMsg] = useState<string | null>(null)
|
||
const [selectedScopes, setSelectedScopes] = useState<string[]>([])
|
||
|
||
const params = new URLSearchParams(window.location.search)
|
||
const clientId = params.get('client_id') || ''
|
||
const redirectUri = params.get('redirect_uri') || ''
|
||
const scope = params.get('scope') || ''
|
||
const state = params.get('state') || ''
|
||
const codeChallenge = params.get('code_challenge') || ''
|
||
const ccMethod = params.get('code_challenge_method') || ''
|
||
const resource = params.get('resource') || undefined
|
||
|
||
// Load auth state once, then validate
|
||
useEffect(() => {
|
||
loadUser({ silent: true }).catch(() => {})
|
||
}, [loadUser])
|
||
|
||
useEffect(() => {
|
||
if (authLoading) return
|
||
validateRequest()
|
||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||
}, [authLoading, isAuthenticated])
|
||
|
||
async function validateRequest() {
|
||
setPageState('loading')
|
||
try {
|
||
const result = await oauthApi.validate({
|
||
client_id: clientId,
|
||
redirect_uri: redirectUri,
|
||
scope,
|
||
state,
|
||
code_challenge: codeChallenge,
|
||
code_challenge_method: ccMethod,
|
||
response_type: 'code',
|
||
resource,
|
||
})
|
||
setValidation(result)
|
||
|
||
if (!result.valid) {
|
||
setPageState('error')
|
||
setErrorMsg(result.error_description || result.error || 'Invalid authorization request')
|
||
return
|
||
}
|
||
|
||
if (result.loginRequired) {
|
||
setPageState('login_required')
|
||
return
|
||
}
|
||
|
||
if (!result.consentRequired) {
|
||
// Consent already on record — auto-approve silently with the full validated scope
|
||
setPageState('auto_approving')
|
||
await submitConsent(true, result.scopes ?? [])
|
||
return
|
||
}
|
||
|
||
// Pre-select all scopes the client is requesting — user can deselect
|
||
setSelectedScopes(result.scopes ?? [])
|
||
setPageState('consent')
|
||
} catch (err: unknown) {
|
||
setPageState('error')
|
||
setErrorMsg('Failed to validate authorization request. Please try again.')
|
||
}
|
||
}
|
||
|
||
async function submitConsent(approved: boolean, scopes: string[] = selectedScopes) {
|
||
setSubmitting(true)
|
||
try {
|
||
const result = await oauthApi.authorize({
|
||
client_id: clientId,
|
||
redirect_uri: redirectUri,
|
||
// When approving, send only the scopes the user selected; deny uses original scope
|
||
scope: approved ? scopes.join(' ') : scope,
|
||
state,
|
||
code_challenge: codeChallenge,
|
||
code_challenge_method: ccMethod,
|
||
approved,
|
||
resource,
|
||
})
|
||
setPageState('done')
|
||
window.location.href = result.redirect
|
||
} catch {
|
||
setPageState('error')
|
||
setErrorMsg('Authorization failed. Please try again.')
|
||
setSubmitting(false)
|
||
}
|
||
}
|
||
|
||
function toggleScope(s: string) {
|
||
setSelectedScopes(prev =>
|
||
prev.includes(s) ? prev.filter(x => x !== s) : [...prev, s]
|
||
)
|
||
}
|
||
|
||
function toggleGroup(groupScopes: string[], allSelected: boolean) {
|
||
setSelectedScopes(prev =>
|
||
allSelected
|
||
? prev.filter(s => !groupScopes.includes(s))
|
||
: [...new Set([...prev, ...groupScopes])]
|
||
)
|
||
}
|
||
|
||
function handleLoginRedirect() {
|
||
const next = '/oauth/consent?' + params.toString() + window.location.hash
|
||
window.location.href = '/login?redirect=' + encodeURIComponent(next)
|
||
}
|
||
|
||
// Group requested scopes by their translated group name
|
||
const scopesByGroup = React.useMemo(() => {
|
||
const requested = validation?.scopes || []
|
||
const groups: Record<string, string[]> = {}
|
||
for (const s of requested) {
|
||
const keys = SCOPE_GROUPS[s]
|
||
const group = keys ? t(keys.groupKey) : 'Other'
|
||
if (!groups[group]) groups[group] = []
|
||
groups[group].push(s)
|
||
}
|
||
return groups
|
||
}, [validation, t])
|
||
|
||
// ---- Render states ----
|
||
|
||
if (pageState === 'loading' || pageState === 'auto_approving') {
|
||
return (
|
||
<div className="min-h-screen flex items-center justify-center" style={{ background: 'var(--bg-primary)' }}>
|
||
<div className="flex flex-col items-center gap-3">
|
||
<Loader2 className="w-8 h-8 animate-spin" style={{ color: 'var(--accent-primary, #4f46e5)' }} />
|
||
<p className="text-sm" style={{ color: 'var(--text-secondary)' }}>
|
||
{pageState === 'auto_approving' ? 'Authorizing…' : 'Loading…'}
|
||
</p>
|
||
</div>
|
||
</div>
|
||
)
|
||
}
|
||
|
||
if (pageState === 'error') {
|
||
return (
|
||
<div className="min-h-screen flex items-center justify-center p-4" style={{ background: 'var(--bg-primary)' }}>
|
||
<div className="w-full max-w-sm rounded-xl shadow-lg p-8 space-y-4 text-center" style={{ background: 'var(--bg-card)' }}>
|
||
<AlertTriangle className="w-10 h-10 mx-auto text-red-500" />
|
||
<h1 className="text-xl font-semibold" style={{ color: 'var(--text-primary)' }}>Authorization Error</h1>
|
||
<p className="text-sm" style={{ color: 'var(--text-secondary)' }}>{errorMsg}</p>
|
||
</div>
|
||
</div>
|
||
)
|
||
}
|
||
|
||
if (pageState === 'login_required') {
|
||
return (
|
||
<div className="min-h-screen flex items-center justify-center p-4" style={{ background: 'var(--bg-primary)' }}>
|
||
<div className="w-full max-w-sm rounded-xl shadow-lg p-8 space-y-5" style={{ background: 'var(--bg-card)' }}>
|
||
<div className="text-center space-y-2">
|
||
<Lock className="w-10 h-10 mx-auto" style={{ color: 'var(--accent-primary, #4f46e5)' }} />
|
||
<h1 className="text-xl font-semibold" style={{ color: 'var(--text-primary)' }}>Sign in to continue</h1>
|
||
<p className="text-sm" style={{ color: 'var(--text-secondary)' }}>
|
||
<strong>{validation?.client?.name || clientId}</strong> wants access to your TREK account. Please sign in first.
|
||
</p>
|
||
</div>
|
||
<button
|
||
onClick={handleLoginRedirect}
|
||
className="w-full flex items-center justify-center gap-2 px-4 py-2.5 rounded-lg text-sm font-medium text-white"
|
||
style={{ background: 'var(--accent-primary, #4f46e5)' }}>
|
||
<LogIn className="w-4 h-4" />
|
||
Sign in to TREK
|
||
</button>
|
||
</div>
|
||
</div>
|
||
)
|
||
}
|
||
|
||
// pageState === 'consent'
|
||
return (
|
||
<div className="min-h-screen flex items-center justify-center p-4" style={{ background: 'var(--bg-primary)' }}>
|
||
<div className="w-full max-w-2xl rounded-xl shadow-lg overflow-hidden flex flex-col sm:flex-row" style={{ background: 'var(--bg-card)' }}>
|
||
|
||
{/* Left panel — app identity + actions */}
|
||
<div className="sm:w-64 sm:flex-shrink-0 flex flex-col px-8 py-8 sm:border-r" style={{ borderColor: 'var(--border-primary)' }}>
|
||
<div className="flex-1 space-y-4">
|
||
<div className="w-12 h-12 rounded-full flex items-center justify-center" style={{ background: 'var(--bg-secondary)' }}>
|
||
<ShieldCheck className="w-6 h-6" style={{ color: 'var(--accent-primary, #4f46e5)' }} />
|
||
</div>
|
||
<div>
|
||
<p className="text-xs font-medium uppercase tracking-wide mb-1" style={{ color: 'var(--text-tertiary)' }}>Authorization Request</p>
|
||
<h1 className="text-lg font-semibold leading-snug" style={{ color: 'var(--text-primary)' }}>
|
||
{validation?.client?.name || clientId}
|
||
</h1>
|
||
<p className="text-sm mt-2" style={{ color: 'var(--text-secondary)' }}>
|
||
This application is requesting access to your TREK account.
|
||
</p>
|
||
</div>
|
||
</div>
|
||
|
||
<div className="mt-8 space-y-2">
|
||
<p className="text-xs mb-3" style={{ color: 'var(--text-tertiary)' }}>
|
||
Only grant access to applications you trust. Your data stays on your server.
|
||
</p>
|
||
<button
|
||
onClick={() => submitConsent(true)}
|
||
disabled={submitting || (validation?.scopeSelectable === true && selectedScopes.length === 0)}
|
||
className="w-full px-4 py-2.5 rounded-lg text-sm font-medium text-white disabled:opacity-60 transition-opacity"
|
||
style={{ background: 'var(--accent-primary, #4f46e5)' }}>
|
||
{submitting
|
||
? 'Authorizing…'
|
||
: validation?.scopeSelectable && selectedScopes.length === 0
|
||
? 'Select at least one scope'
|
||
: validation?.scopeSelectable
|
||
? `Approve (${selectedScopes.length} scope${selectedScopes.length !== 1 ? 's' : ''})`
|
||
: 'Approve Access'}
|
||
</button>
|
||
<button
|
||
onClick={() => submitConsent(false)}
|
||
disabled={submitting}
|
||
className="w-full px-4 py-2.5 rounded-lg text-sm font-medium border transition-colors hover:bg-slate-50 dark:hover:bg-slate-800 disabled:opacity-60"
|
||
style={{ borderColor: 'var(--border-primary)', color: 'var(--text-secondary)' }}>
|
||
Deny
|
||
</button>
|
||
</div>
|
||
</div>
|
||
|
||
{/* Right panel — selectable scopes */}
|
||
<div className="flex-1 px-6 py-8 overflow-y-auto max-h-[80vh] sm:max-h-[600px]">
|
||
<div className="space-y-6">
|
||
{Object.keys(scopesByGroup).length > 0 && (
|
||
<div>
|
||
<p className="text-xs font-medium uppercase tracking-wide mb-4" style={{ color: 'var(--text-tertiary)' }}>
|
||
{validation?.scopeSelectable ? 'Choose which permissions to grant' : 'Permissions requested'}
|
||
</p>
|
||
|
||
{validation?.scopeSelectable ? (
|
||
/* DCR client — user selects which scopes to grant */
|
||
<div className="space-y-3">
|
||
{Object.entries(scopesByGroup).map(([group, groupScopes]) => {
|
||
const allGroupSelected = groupScopes.every(s => selectedScopes.includes(s))
|
||
const someGroupSelected = groupScopes.some(s => selectedScopes.includes(s))
|
||
return (
|
||
<div key={group} className="rounded-lg border overflow-hidden" style={{ borderColor: 'var(--border-primary)' }}>
|
||
<label className="flex items-center gap-2.5 px-3 py-2 cursor-pointer" style={{ background: 'var(--bg-secondary)' }}>
|
||
<input
|
||
type="checkbox"
|
||
checked={allGroupSelected}
|
||
ref={el => { if (el) el.indeterminate = someGroupSelected && !allGroupSelected }}
|
||
onChange={() => toggleGroup(groupScopes, allGroupSelected)}
|
||
className="rounded flex-shrink-0"
|
||
/>
|
||
<span className="text-xs font-semibold" style={{ color: 'var(--text-secondary)' }}>{group}</span>
|
||
<span className="ml-auto text-xs" style={{ color: 'var(--text-tertiary)' }}>
|
||
{groupScopes.filter(s => selectedScopes.includes(s)).length}/{groupScopes.length}
|
||
</span>
|
||
</label>
|
||
<div className="divide-y" style={{ borderColor: 'var(--border-primary)' }}>
|
||
{groupScopes.map(s => {
|
||
const keys = SCOPE_GROUPS[s]
|
||
return (
|
||
<label
|
||
key={s}
|
||
className="flex items-start gap-2.5 px-3 py-2 cursor-pointer transition-colors hover:bg-slate-50 dark:hover:bg-slate-800/50">
|
||
<input
|
||
type="checkbox"
|
||
checked={selectedScopes.includes(s)}
|
||
onChange={() => toggleScope(s)}
|
||
className="mt-0.5 rounded flex-shrink-0"
|
||
/>
|
||
<span className="mt-0.5 text-base leading-none flex-shrink-0">
|
||
{s.endsWith(':delete') ? '🗑️' : s.endsWith(':write') ? '✏️' : '👁️'}
|
||
</span>
|
||
<div className="min-w-0">
|
||
<p className="text-sm font-medium" style={{ color: 'var(--text-primary)' }}>{keys ? t(keys.labelKey) : s}</p>
|
||
<p className="text-xs mt-0.5" style={{ color: 'var(--text-tertiary)' }}>{keys ? t(keys.descriptionKey) : ''}</p>
|
||
</div>
|
||
</label>
|
||
)
|
||
})}
|
||
</div>
|
||
</div>
|
||
)
|
||
})}
|
||
</div>
|
||
) : (
|
||
/* Settings-created client — scopes are fixed, show read-only */
|
||
<div className="space-y-5">
|
||
{Object.entries(scopesByGroup).map(([group, groupScopes]) => (
|
||
<div key={group}>
|
||
<p className="text-xs font-semibold mb-2" style={{ color: 'var(--text-secondary)' }}>{group}</p>
|
||
<div className="space-y-1.5">
|
||
{groupScopes.map(s => {
|
||
const keys = SCOPE_GROUPS[s]
|
||
return (
|
||
<div key={s} className="flex items-start gap-2.5 px-3 py-2 rounded-lg" style={{ background: 'var(--bg-secondary)' }}>
|
||
<span className="mt-0.5 text-base leading-none flex-shrink-0">
|
||
{s.endsWith(':delete') ? '🗑️' : s.endsWith(':write') ? '✏️' : '👁️'}
|
||
</span>
|
||
<div className="min-w-0">
|
||
<p className="text-sm font-medium" style={{ color: 'var(--text-primary)' }}>{keys ? t(keys.labelKey) : s}</p>
|
||
<p className="text-xs mt-0.5" style={{ color: 'var(--text-tertiary)' }}>{keys ? t(keys.descriptionKey) : ''}</p>
|
||
</div>
|
||
</div>
|
||
)
|
||
})}
|
||
</div>
|
||
</div>
|
||
))}
|
||
</div>
|
||
)}
|
||
</div>
|
||
)}
|
||
|
||
{/* Always-available tools — granted regardless of scopes */}
|
||
<div>
|
||
<p className="text-xs font-medium uppercase tracking-wide mb-3" style={{ color: 'var(--text-tertiary)' }}>
|
||
Always included
|
||
</p>
|
||
<div className="space-y-1.5">
|
||
{[
|
||
{ name: 'list_trips', desc: 'List your trips so the AI can discover trip IDs' },
|
||
{ name: 'get_trip_summary', desc: 'Read a trip overview needed to use any other tool' },
|
||
].map(({ name, desc }) => (
|
||
<div key={name} className="flex items-start gap-2.5 px-3 py-2 rounded-lg" style={{ background: 'var(--bg-secondary)' }}>
|
||
<span className="mt-0.5 text-base leading-none flex-shrink-0">👁️</span>
|
||
<div className="min-w-0">
|
||
<p className="text-sm font-medium font-mono" style={{ color: 'var(--text-primary)' }}>{name}</p>
|
||
<p className="text-xs mt-0.5" style={{ color: 'var(--text-tertiary)' }}>{desc}</p>
|
||
</div>
|
||
</div>
|
||
))}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
|
||
</div>
|
||
</div>
|
||
)
|
||
} |