Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions packages/todo0/src/app-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import express from 'express';
import path from 'path';
import bodyParser from 'body-parser';
import session from 'express-session';
import { randomUUID } from 'crypto';
import * as dotenv from 'dotenv';
import { createRequireAuth } from './middleware/requireAuth';
import { createAuthRouter } from './routes/auth';
Expand Down Expand Up @@ -108,6 +109,7 @@ declare module 'express-session' {
id_token?: string;
userId?: string; // User's Okta sub claim for user-scoped operations
userEmail?: string; // User's email for display
csrfToken?: string; // CSRF protection token
pkce?: {
code_verifier: string;
state: string;
Expand Down Expand Up @@ -144,6 +146,26 @@ app.use(bodyParser.urlencoded({ extended: false }));
app.use(express.json()); // Enable JSON body parsing for API routes
app.use(express.static(path.join(__dirname, '../public')));

// CSRF Protection: Generate token and make available to views
app.use((req, res, next) => {
if (!req.session.csrfToken) {
req.session.csrfToken = randomUUID();
}
res.locals.csrfToken = req.session.csrfToken;
next();
});

// CSRF Protection: Validate token on state-changing requests
app.use((req, res, next) => {
if (['POST', 'PUT', 'DELETE', 'PATCH'].includes(req.method)) {
const token = req.body?._csrf || req.headers['x-csrf-token'];
if (token !== req.session.csrfToken) {
return res.status(403).send('Invalid CSRF token');
}
}
next();
});

console.log('[SERVER] Registering routes...');
app.use('/', todosRouter);
app.use('/', authRouter);
Expand Down
5 changes: 5 additions & 0 deletions packages/todo0/views/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="csrf-token" content="<%= csrfToken %>">
<title>Todo0</title>
<style>
body {
Expand Down Expand Up @@ -122,6 +123,7 @@
<% } else { %>
<h1>Todo0</h1>
<form action="/todos" method="POST">
<input type="hidden" name="_csrf" value="<%= csrfToken %>" />
<input type="text" name="title" placeholder="New todo" required />
<button type="submit">Add</button>
</form>
Expand All @@ -130,15 +132,18 @@
<li class="<%= todo.completed ? 'done' : '' %>">
<span style="flex:1"><%= todo.title %></span>
<form action="/todos/<%= todo.id %>/complete" method="POST" style="display:inline">
<input type="hidden" name="_csrf" value="<%= csrfToken %>" />
<button type="submit"><%= todo.completed ? 'Undo' : 'Complete' %></button>
</form>
<form action="/todos/<%= todo.id %>/delete" method="POST" style="display:inline">
<input type="hidden" name="_csrf" value="<%= csrfToken %>" />
<button type="submit">Delete</button>
</form>
</li>
<% }) %>
</ul>
<form action="/logout" method="POST">
<input type="hidden" name="_csrf" value="<%= csrfToken %>" />
<button type="submit" class="logout-btn">Logout</button>
</form>
<% } %>
Expand Down