Voeg Api.AndreaSlopFotografie toe met setup-token, proxy-bewuste limiters en ASF-admin-thema
- Core: opt-in ForwardedHeaders:KnownProxies en rate limiters per clientadres (zonder configuratie ongewijzigd gedrag) - Identity: optioneel setup-token (X-Setup-Token), beide setup-endpoints onder de login-limiter, beveiligingsgebeurtenis setup_token_rejected (5007) - Nieuw client-project SlpModularCms.Api.AndreaSlopFotografie (Identity + Availability) met bijbehorende tests - Frontend: thema asf (VITE_THEME), VITE_DEFAULT_LANGUAGE, tokenveld op de setup-pagina - CI: jobs publish/deploy-asf-test achter ASF_TEST_DEPLOY_ENABLED - Fix U1: 301-Location wordt nu percent-encoded (gevonden door de property-test) Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -49,6 +49,22 @@ export const setupUninitializedHandlers = [
|
||||
),
|
||||
];
|
||||
|
||||
/** Override: setup requires the token; only 'correct-token' is accepted (401 otherwise, like the host). */
|
||||
export const setupTokenRequiredHandlers = [
|
||||
http.get(`${API_BASE}/api/v1/Setup/status`, () =>
|
||||
HttpResponse.json<SetupStatus>({ initialized: false, tokenRequired: true }),
|
||||
),
|
||||
http.post(`${API_BASE}/api/v1/Setup/owner`, ({ request }) => {
|
||||
if (request.headers.get('X-Setup-Token') !== 'correct-token') {
|
||||
return HttpResponse.json(
|
||||
{ title: 'Setup token ontbreekt of is onjuist.', status: 401 },
|
||||
{ status: 401 },
|
||||
);
|
||||
}
|
||||
return HttpResponse.json({ message: 'System initialized' }, { status: 201 });
|
||||
}),
|
||||
];
|
||||
|
||||
/** Override: POST /Setup/owner returns 409 — system already initialized. */
|
||||
export const setupConflictHandlers = [
|
||||
...setupUninitializedHandlers,
|
||||
|
||||
@@ -3,7 +3,7 @@ import { screen } from '@testing-library/react';
|
||||
import userEvent from '@testing-library/user-event';
|
||||
import { renderApp, mockGuest } from '@/test/utils';
|
||||
import { server } from '@/mocks/server';
|
||||
import { setupUninitializedHandlers, setupConflictHandlers } from '@/mocks/index';
|
||||
import { setupUninitializedHandlers, setupConflictHandlers, setupTokenRequiredHandlers } from '@/mocks/index';
|
||||
import { _resetSetupStatusCache } from '@/router';
|
||||
|
||||
// Each test starts with a fresh setup status cache so the MSW handler controls
|
||||
@@ -105,4 +105,70 @@ describe('SetupPage', () => {
|
||||
|
||||
expect(await screen.findByTestId('login-form-submit-button')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
describe('setup token', () => {
|
||||
const fillValidForm = async (user: ReturnType<typeof userEvent.setup>) => {
|
||||
await user.type(await screen.findByTestId('setup-name-input'), 'Alice Owner');
|
||||
await user.type(screen.getByTestId('setup-email-input'), 'alice@example.com');
|
||||
await user.type(screen.getByTestId('setup-password-input'), 'ValidPass1!');
|
||||
await user.type(screen.getByTestId('setup-confirmPassword-input'), 'ValidPass1!');
|
||||
};
|
||||
|
||||
it('does not show a token field when the host does not require one', async () => {
|
||||
server.use(...setupUninitializedHandlers);
|
||||
mockGuest();
|
||||
renderApp('/setup');
|
||||
|
||||
await screen.findByTestId('setup-name-input');
|
||||
expect(screen.queryByTestId('setup-token-input')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('shows the token field when the host requires one', async () => {
|
||||
server.use(...setupTokenRequiredHandlers);
|
||||
mockGuest();
|
||||
renderApp('/setup');
|
||||
|
||||
expect(await screen.findByTestId('setup-token-input')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('blocks submission without a token', async () => {
|
||||
server.use(...setupTokenRequiredHandlers);
|
||||
mockGuest();
|
||||
const user = userEvent.setup();
|
||||
renderApp('/setup');
|
||||
|
||||
await fillValidForm(user);
|
||||
await user.click(screen.getByTestId('setup-submit-button'));
|
||||
|
||||
expect(await screen.findByTestId('setup-token-error')).toBeInTheDocument();
|
||||
expect(screen.queryByTestId('setup-success')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('shows a clear message for a wrong token and stays on the page', async () => {
|
||||
server.use(...setupTokenRequiredHandlers);
|
||||
mockGuest();
|
||||
const user = userEvent.setup();
|
||||
renderApp('/setup');
|
||||
|
||||
await fillValidForm(user);
|
||||
await user.type(screen.getByTestId('setup-token-input'), 'wrong-token');
|
||||
await user.click(screen.getByTestId('setup-submit-button'));
|
||||
|
||||
expect(await screen.findByTestId('form-error-banner')).toBeInTheDocument();
|
||||
expect(screen.getByTestId('setup-form')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('sends the token in X-Setup-Token and completes setup', async () => {
|
||||
server.use(...setupTokenRequiredHandlers);
|
||||
mockGuest();
|
||||
const user = userEvent.setup();
|
||||
renderApp('/setup');
|
||||
|
||||
await fillValidForm(user);
|
||||
await user.type(screen.getByTestId('setup-token-input'), 'correct-token');
|
||||
await user.click(screen.getByTestId('setup-submit-button'));
|
||||
|
||||
expect(await screen.findByTestId('setup-success')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -13,7 +13,7 @@ import { FieldError } from '@/components/ui/FieldError';
|
||||
import { useSetup } from '@/features/setup/services/useSetup';
|
||||
import { ProblemDetailsError, NetworkError } from '@/lib/api-client';
|
||||
import { changeLanguage } from '@/i18n/config';
|
||||
import { _markSystemInitialized } from '@/router';
|
||||
import { _markSystemInitialized, isSetupTokenRequired } from '@/router';
|
||||
|
||||
interface FormError {
|
||||
message: string;
|
||||
@@ -26,6 +26,9 @@ export function SetupPage() {
|
||||
const [successMessage, setSuccessMessage] = useState(false);
|
||||
|
||||
const setupMutation = useSetup();
|
||||
const tokenRequired = isSetupTokenRequired();
|
||||
const [setupToken, setSetupToken] = useState('');
|
||||
const [tokenMissing, setTokenMissing] = useState(false);
|
||||
|
||||
const {
|
||||
register,
|
||||
@@ -46,9 +49,14 @@ export function SetupPage() {
|
||||
|
||||
const onSubmit = handleSubmit(async (values) => {
|
||||
setServerError(null);
|
||||
if (tokenRequired && setupToken.trim() === '') {
|
||||
setTokenMissing(true);
|
||||
return;
|
||||
}
|
||||
setTokenMissing(false);
|
||||
try {
|
||||
const { confirmPassword: _, ...payload } = values;
|
||||
await setupMutation.mutateAsync(payload);
|
||||
await setupMutation.mutateAsync(payload, tokenRequired ? setupToken.trim() : undefined);
|
||||
await changeLanguage(values.language);
|
||||
_markSystemInitialized();
|
||||
setSuccessMessage(true);
|
||||
@@ -56,7 +64,9 @@ export function SetupPage() {
|
||||
navigate({ to: '/login' });
|
||||
}, 2000);
|
||||
} catch (err) {
|
||||
if (err instanceof ProblemDetailsError) {
|
||||
if (err instanceof ProblemDetailsError && err.status === 401) {
|
||||
setServerError({ message: t('setup.tokenInvalid') });
|
||||
} else if (err instanceof ProblemDetailsError) {
|
||||
setServerError({ message: err.problem.detail || err.message || t('errors.generic') });
|
||||
} else if (err instanceof NetworkError) {
|
||||
setServerError({ message: t('errors.network') });
|
||||
@@ -99,6 +109,23 @@ export function SetupPage() {
|
||||
onDismiss={() => setServerError(null)}
|
||||
/>
|
||||
|
||||
{tokenRequired && (
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="setupToken">{t('setup.tokenLabel')}</Label>
|
||||
<Input
|
||||
id="setupToken"
|
||||
type="password"
|
||||
autoComplete="off"
|
||||
data-testid="setup-token-input"
|
||||
aria-invalid={tokenMissing}
|
||||
value={setupToken}
|
||||
onChange={(e) => setSetupToken(e.target.value)}
|
||||
/>
|
||||
<p className="text-xs text-muted-foreground">{t('setup.tokenHelp')}</p>
|
||||
{tokenMissing && <FieldError message={t('setup.tokenRequiredError')} testId="setup-token-error" />}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="name">{t('setup.nameLabel')}</Label>
|
||||
<Input
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
// Setup status (used by guards during bootstrap).
|
||||
export interface SetupStatus {
|
||||
initialized: boolean;
|
||||
/** True when the host requires the first-administrator setup token (X-Setup-Token). */
|
||||
tokenRequired?: boolean;
|
||||
}
|
||||
|
||||
export interface SetupRequest {
|
||||
|
||||
@@ -22,11 +22,16 @@ export function useSetup() {
|
||||
const [isPending, setIsPending] = useState(false);
|
||||
const [error, setError] = useState<Error | null>(null);
|
||||
|
||||
const mutateAsync = useCallback(async (data: SetupRequest): Promise<SetupResponse> => {
|
||||
const mutateAsync = useCallback(async (data: SetupRequest, setupToken?: string): Promise<SetupResponse> => {
|
||||
setIsPending(true);
|
||||
setError(null);
|
||||
try {
|
||||
const response = await api.post('/api/v1/Setup/owner', data);
|
||||
// skipAuthRefresh: a rejected token is a 401, and nobody is signed in yet, so the
|
||||
// client must not try (and fail) a session refresh that would signal an auth failure.
|
||||
const response = await api.post('/api/v1/Setup/owner', data, {
|
||||
skipAuthRefresh: true,
|
||||
headers: setupToken ? { 'X-Setup-Token': setupToken } : undefined,
|
||||
});
|
||||
return response as SetupResponse;
|
||||
} catch (err) {
|
||||
const error = err instanceof Error ? err : new Error(String(err));
|
||||
|
||||
Reference in New Issue
Block a user