Compare commits

...

2 Commits

Author SHA1 Message Date
Patrick 098317cbcb implemented custom csrf 2025-07-27 18:07:11 +02:00
Patrick 8eb4724458 reintroduced use:enhance for login form 2025-07-27 17:49:43 +02:00
4 changed files with 67 additions and 4 deletions

View File

@ -1,8 +1,11 @@
import type { Handle } from "@sveltejs/kit"; import type { Handle } from "@sveltejs/kit";
import { error, redirect } from "@sveltejs/kit"; import { error, redirect } from "@sveltejs/kit";
import { sequence } from "@sveltejs/kit/hooks";
import { env } from "$env/dynamic/private" import { env } from "$env/dynamic/private"
import { csrf } from "$lib/server/csrf"
import SessionStore from "$lib/server/session_store" import SessionStore from "$lib/server/session_store"
import { init_db, close_db, create_user, do_users_exist } from "$lib/server/database"; import { init_db, close_db, create_user, do_users_exist } from "$lib/server/database";
@ -63,7 +66,7 @@ process.on("uncaughtExceptionMonitor", (error, origin) => {
await init(); await init();
export let handle: Handle = async function ({ event, resolve }) { export let handle: Handle = sequence(csrf([], []), async function ({ event, resolve }) {
event.locals.setup = local_setup event.locals.setup = local_setup
Logs.route.debug(`incoming ${event.request.method} request to: ${event.url.href} (route id: ${event.route.id})`); Logs.route.debug(`incoming ${event.request.method} request to: ${event.url.href} (route id: ${event.route.id})`);
@ -106,4 +109,4 @@ export let handle: Handle = async function ({ event, resolve }) {
event.locals.user = user; event.locals.user = user;
return await resolve(event); return await resolve(event);
} })

60
src/lib/server/csrf.ts Normal file
View File

@ -0,0 +1,60 @@
/*
* Imported and adapted from https://gist.github.com/Maxiviper117/95a31750b74510bbb413d2e4ae20b4e8 on 27.07.2025
* */
import type { Handle } from '@sveltejs/kit';
import { json, text } from '@sveltejs/kit';
/**
* CSRF protection middleware for SvelteKit.
*
* @param allowedPaths - Paths that bypass CSRF protection.
* @param allowedOrigins - Trusted origins that can submit cross-origin forms.
* @returns SvelteKit handle function.
*/
export function csrf(allowedPaths: string[], allowedOrigins: string[] = []): Handle {
return async ({ event, resolve }) => {
const { request, url } = event;
const requestOrigin = request.headers.get('origin');
const isSameOrigin = requestOrigin === url.origin;
const isAllowedOrigin = allowedOrigins.includes(requestOrigin ?? '');
// Block form submissions that don't match CSRF rules
const forbidden =
isFormContentType(request) &&
['POST', 'PUT', 'PATCH', 'DELETE'].includes(request.method) &&
!isSameOrigin && // Not from same origin
!isAllowedOrigin && // Not in allowed origins
!allowedPaths.includes(url.pathname); // Path is not explicitly allowed
if (forbidden) {
const message = `Cross-site ${request.method} form submissions are forbidden`;
if (request.headers.get('accept') === 'application/json') {
return json({ message }, { status: 403 });
}
return text(message, { status: 403 });
}
return resolve(event);
};
}
/**
* Check if request content type matches given types.
*/
function isContentType(request: Request, ...types: string[]) {
const type = request.headers.get('content-type')?.split(';', 1)[0].trim() ?? '';
return types.includes(type.toLowerCase());
}
/**
* Determines if a request is a form submission.
*/
function isFormContentType(request: Request) {
return isContentType(
request,
'application/x-www-form-urlencoded',
'multipart/form-data',
'text/plain'
);
}

View File

@ -8,7 +8,7 @@
<div> <div>
<h1>Login</h1> <h1>Login</h1>
<form id="login" method="POST" action="?/login"> <form id="login" method="POST" action="?/login" use:enhance={({formElement}) => { formElement.reset() }}>
<table> <table>
<tbody> <tbody>
<tr> <tr>

View File

@ -28,7 +28,7 @@ const config = {
} }
}, },
checkOrigin: true, checkOrigin: false,
//warningFilter: (warning) => !warning.code.startsWith('a11y') //warningFilter: (warning) => !warning.code.startsWith('a11y')
}; };