mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-19 13:21:46 +00:00
2d0414b4a3
Fixes the critical + high + medium findings from our internal security
review. Bundled into one PR because the changes overlap heavily (JWT
verification unifies across three call sites; backup-code hashing and
demo-email handling cross-cut several services); splitting them out
would mean redundant reviews of the same files.
Critical
- CI-C1 — .github/workflows/test.yml: restore actions/{checkout,setup-
node,upload-artifact} to @v4. The @v6 refs don't exist, so the test
workflow was errorring before a single test ran.
- SEC-C1 — mfaPolicy now extracts the token via extractToken() (cookie-
first, Bearer fallback). Previously it only read Authorization, so
every cookie-authenticated SPA session bypassed require_mfa entirely.
- SEC-C2/C4/C6 — all JWT verification paths (MCP bearer, file download,
photo route) now go through the shared verifyJwtAndLoadUser that
checks password_version. resetPassword additionally deletes every
mcp_tokens row and marks outstanding oauth_tokens revoked, so a
password reset invalidates ALL credential classes — not just the
cookie JWT.
High
- SEC-H2 — reset email URL is built from server-side APP_URL /
ALLOWED_ORIGINS (via existing getAppUrl()), not request headers.
Closes the host-header-injection vector into reset links.
- SEC-H3 — OIDC findOrCreateUser wraps the invite-redemption UPDATE +
user INSERT in a transaction. The UPDATE is the capacity check; if
a concurrent callback takes the last slot, the whole transaction
aborts with registration_disabled instead of double-creating users.
- SEC-H4 — new verifyIdToken() performs full JWT signature
verification via the provider's JWKS (Node's crypto.createPublicKey
accepts JWK directly — no extra dependency), plus iss/aud/exp
checks. The callback also rejects the login when userinfo.sub does
not match id_token.sub.
- SEC-H5 — OAuth DCR now validates redirect_uris against an allowlist
of schemes: https, http-loopback, or a private custom scheme. Plain
http://non-loopback is rejected.
- SEC-H6 — oauthService audience defaults to mcpResource when the
`resource` parameter is missing, so tokens are always audience-bound
to /mcp instead of being issued with audience=null.
- SEC-H7 — HSTS is enabled any time NODE_ENV=production (previously
required FORCE_HTTPS=true), includeSubDomains defaults on and can
be disabled with HSTS_INCLUDE_SUBDOMAINS=false.
- SEC-H8 — trek_session cookie Secure flag is also driven by
req.secure (which Express resolves from X-Forwarded-Proto once
trust proxy is set), so instances behind a TLS-terminating proxy
get Secure cookies without needing FORCE_HTTPS.
Medium
- SEC-M1 — permanentDeleteFile / emptyTrash / avatar unlink now use
fs.promises.rm with { force: true } (one async op vs the previous
existsSync + unlinkSync pair per file).
- SEC-M2 — invalidatePermissionsCache() is called inside restoreFromZip
so a restored DB with different permission rows is honoured
immediately.
- SEC-M3 + C1 — idempotency store bounds the key at 128 chars, caches
only responses ≤ 256 KiB, and scopes the lookup by (key, user_id,
method, path) rather than (key, user_id). Same key replayed against
a different endpoint no longer returns a stale unrelated body.
- SEC-M4 — share_tokens gets an expires_at column; new tokens default
to 90-day TTL, expired tokens are denied at lookup. Existing tokens
stay NULL = no expiry so already-published links don't break.
- SEC-M5 — /uploads/photos/:filename now resolves the photo to its
trip_id and requires the share token to cover THAT trip. Previously
any share token for any trip would unlock any photo filename.
- SEC-M6 — BLOCKED_EXTENSIONS is the single source of truth shared
between fileService and collab uploads. The '*' allowed_file_types
wildcard now still rejects executables/scripts.
- SEC-M7 — single DEMO_EMAILS constant (services/demo.ts) used by
demoUploadBlock, mfaPolicy, and every demo-mode guard in
authService. The old demoUploadBlock only matched 'demo@nomad.app'
so the seed 'demo@trek.app' could in fact upload in demo mode.
- SEC-M8 — MFA backup codes are now bcrypt-hashed at rest
(hashBackupCodeBcrypt). matchBackupCode accepts both bcrypt and
legacy SHA-256 hex hashes, so existing installs keep working until
the user regenerates codes via enableMfa.
- SEC-M9 — document the "security via UUID v4 filename" model for
/uploads/avatars|covers|journey. Requires no code change but
captures the decision so future reviewers don't re-flag it.
- SEC-M10 — already covered by the resetPassword revocation logic
above: mcp_tokens DELETE + oauth_tokens UPDATE … SET revoked_at.
Performance
- PERF-H1 — new migration adds the indexes flagged in the audit:
trips(user_id), trips(created_at DESC), photos(day_id),
photos(place_id), reservations(day_id), share_tokens(token), plus
conditional day_accommodations and notifications indexes depending
on which columns are present.
Tests
- tests/integration/oidc.test.ts now mocks verifyIdToken and passes
an id_token in the exchangeCodeForToken stub for the three flows
that exercise a successful callback. The three remaining failures
tests pointed out were all pre-existing (file-upload flakes +
notificationPreferences event_types count drift), none introduced
by this PR.
329 lines
16 KiB
TypeScript
329 lines
16 KiB
TypeScript
import express, { Request, Response } from 'express';
|
|
import multer from 'multer';
|
|
import path from 'path';
|
|
import fs from 'fs';
|
|
import { v4 as uuidv4 } from 'uuid';
|
|
import { authenticate } from '../middleware/auth';
|
|
import { broadcast } from '../websocket';
|
|
import { validateStringLengths } from '../middleware/validate';
|
|
import { checkPermission } from '../services/permissions';
|
|
import { AuthRequest } from '../types';
|
|
import { db } from '../db/database';
|
|
import { BLOCKED_EXTENSIONS } from '../services/fileService';
|
|
import {
|
|
verifyTripAccess,
|
|
listNotes,
|
|
createNote,
|
|
updateNote,
|
|
deleteNote,
|
|
addNoteFile,
|
|
getFormattedNoteById,
|
|
deleteNoteFile,
|
|
listPolls,
|
|
createPoll,
|
|
votePoll,
|
|
closePoll,
|
|
deletePoll,
|
|
listMessages,
|
|
createMessage,
|
|
deleteMessage,
|
|
addOrRemoveReaction,
|
|
fetchLinkPreview,
|
|
} from '../services/collabService';
|
|
|
|
const MAX_NOTE_FILE_SIZE = 50 * 1024 * 1024; // 50 MB
|
|
const filesDir = path.join(__dirname, '../../uploads/files');
|
|
const noteUpload = multer({
|
|
storage: multer.diskStorage({
|
|
destination: (_req, _file, cb) => { if (!fs.existsSync(filesDir)) fs.mkdirSync(filesDir, { recursive: true }); cb(null, filesDir) },
|
|
filename: (_req, file, cb) => { cb(null, `${uuidv4()}${path.extname(file.originalname)}`) },
|
|
}),
|
|
limits: { fileSize: MAX_NOTE_FILE_SIZE },
|
|
defParamCharset: 'utf8',
|
|
fileFilter: (_req, file, cb) => {
|
|
const ext = path.extname(file.originalname).toLowerCase();
|
|
// Share the single BLOCKED_EXTENSIONS list from fileService so
|
|
// executable/script attachments can't sneak in via collab when the
|
|
// main uploader already rejects them.
|
|
if (BLOCKED_EXTENSIONS.includes(ext) || file.mimetype.includes('svg') || file.mimetype.includes('html') || file.mimetype.includes('javascript')) {
|
|
const err: Error & { statusCode?: number } = new Error('File type not allowed');
|
|
err.statusCode = 400;
|
|
return cb(err);
|
|
}
|
|
cb(null, true);
|
|
},
|
|
});
|
|
|
|
const router = express.Router({ mergeParams: true });
|
|
|
|
/* ------------------------------------------------------------------ */
|
|
/* Notes */
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
router.get('/notes', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId } = req.params;
|
|
if (!verifyTripAccess(tripId, authReq.user.id)) return res.status(404).json({ error: 'Trip not found' });
|
|
|
|
res.json({ notes: listNotes(tripId) });
|
|
});
|
|
|
|
router.post('/notes', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId } = req.params;
|
|
const { title, content, category, color, website } = req.body;
|
|
const access = verifyTripAccess(tripId, authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
if (!title) return res.status(400).json({ error: 'Title is required' });
|
|
|
|
const formatted = createNote(tripId, authReq.user.id, { title, content, category, color, website });
|
|
res.status(201).json({ note: formatted });
|
|
broadcast(tripId, 'collab:note:created', { note: formatted }, req.headers['x-socket-id'] as string);
|
|
|
|
import('../services/notificationService').then(({ send }) => {
|
|
const tripInfo = db.prepare('SELECT title FROM trips WHERE id = ?').get(tripId) as { title: string } | undefined;
|
|
send({ event: 'collab_message', actorId: authReq.user.id, scope: 'trip', targetId: Number(tripId), params: { trip: tripInfo?.title || 'Untitled', actor: authReq.user.email, tripId: String(tripId) } }).catch(() => {});
|
|
});
|
|
});
|
|
|
|
router.put('/notes/:id', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId, id } = req.params;
|
|
const { title, content, category, color, pinned, website } = req.body;
|
|
const access = verifyTripAccess(tripId, authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
|
|
const formatted = updateNote(tripId, id, { title, content, category, color, pinned, website });
|
|
if (!formatted) return res.status(404).json({ error: 'Note not found' });
|
|
|
|
res.json({ note: formatted });
|
|
broadcast(tripId, 'collab:note:updated', { note: formatted }, req.headers['x-socket-id'] as string);
|
|
});
|
|
|
|
router.delete('/notes/:id', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId, id } = req.params;
|
|
const access = verifyTripAccess(tripId, authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
|
|
if (!deleteNote(tripId, id)) return res.status(404).json({ error: 'Note not found' });
|
|
|
|
res.json({ success: true });
|
|
broadcast(tripId, 'collab:note:deleted', { noteId: Number(id) }, req.headers['x-socket-id'] as string);
|
|
});
|
|
|
|
/* ------------------------------------------------------------------ */
|
|
/* Note files */
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
router.post('/notes/:id/files', authenticate, noteUpload.single('file'), (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId, id } = req.params;
|
|
const access = verifyTripAccess(Number(tripId), authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('file_upload', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission to upload files' });
|
|
if (!req.file) return res.status(400).json({ error: 'No file uploaded' });
|
|
|
|
const result = addNoteFile(tripId, id, req.file);
|
|
if (!result) return res.status(404).json({ error: 'Note not found' });
|
|
|
|
res.status(201).json(result);
|
|
broadcast(Number(tripId), 'collab:note:updated', { note: getFormattedNoteById(id) }, req.headers['x-socket-id'] as string);
|
|
});
|
|
|
|
router.delete('/notes/:id/files/:fileId', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId, id, fileId } = req.params;
|
|
const access = verifyTripAccess(Number(tripId), authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
|
|
if (!deleteNoteFile(id, fileId)) return res.status(404).json({ error: 'File not found' });
|
|
|
|
res.json({ success: true });
|
|
broadcast(Number(tripId), 'collab:note:updated', { note: getFormattedNoteById(id) }, req.headers['x-socket-id'] as string);
|
|
});
|
|
|
|
/* ------------------------------------------------------------------ */
|
|
/* Polls */
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
router.get('/polls', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId } = req.params;
|
|
if (!verifyTripAccess(tripId, authReq.user.id)) return res.status(404).json({ error: 'Trip not found' });
|
|
|
|
res.json({ polls: listPolls(tripId) });
|
|
});
|
|
|
|
router.post('/polls', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId } = req.params;
|
|
const { question, options, multiple, multiple_choice, deadline } = req.body;
|
|
const access = verifyTripAccess(tripId, authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
if (!question) return res.status(400).json({ error: 'Question is required' });
|
|
if (!Array.isArray(options) || options.length < 2) {
|
|
return res.status(400).json({ error: 'At least 2 options are required' });
|
|
}
|
|
|
|
const poll = createPoll(tripId, authReq.user.id, { question, options, multiple, multiple_choice, deadline });
|
|
res.status(201).json({ poll });
|
|
broadcast(tripId, 'collab:poll:created', { poll }, req.headers['x-socket-id'] as string);
|
|
});
|
|
|
|
router.post('/polls/:id/vote', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId, id } = req.params;
|
|
const { option_index } = req.body;
|
|
const access = verifyTripAccess(tripId, authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
|
|
const result = votePoll(tripId, id, authReq.user.id, option_index);
|
|
if (result.error === 'not_found') return res.status(404).json({ error: 'Poll not found' });
|
|
if (result.error === 'closed') return res.status(400).json({ error: 'Poll is closed' });
|
|
if (result.error === 'invalid_index') return res.status(400).json({ error: 'Invalid option index' });
|
|
|
|
res.json({ poll: result.poll });
|
|
broadcast(tripId, 'collab:poll:voted', { poll: result.poll }, req.headers['x-socket-id'] as string);
|
|
});
|
|
|
|
router.put('/polls/:id/close', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId, id } = req.params;
|
|
const access = verifyTripAccess(tripId, authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
|
|
const updatedPoll = closePoll(tripId, id);
|
|
if (!updatedPoll) return res.status(404).json({ error: 'Poll not found' });
|
|
|
|
res.json({ poll: updatedPoll });
|
|
broadcast(tripId, 'collab:poll:closed', { poll: updatedPoll }, req.headers['x-socket-id'] as string);
|
|
});
|
|
|
|
router.delete('/polls/:id', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId, id } = req.params;
|
|
const access = verifyTripAccess(tripId, authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
|
|
if (!deletePoll(tripId, id)) return res.status(404).json({ error: 'Poll not found' });
|
|
|
|
res.json({ success: true });
|
|
broadcast(tripId, 'collab:poll:deleted', { pollId: Number(id) }, req.headers['x-socket-id'] as string);
|
|
});
|
|
|
|
/* ------------------------------------------------------------------ */
|
|
/* Messages */
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
router.get('/messages', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId } = req.params;
|
|
const { before } = req.query;
|
|
if (!verifyTripAccess(tripId, authReq.user.id)) return res.status(404).json({ error: 'Trip not found' });
|
|
|
|
res.json({ messages: listMessages(tripId, before as string | undefined) });
|
|
});
|
|
|
|
router.post('/messages', authenticate, validateStringLengths({ text: 5000 }), (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId } = req.params;
|
|
const { text, reply_to } = req.body;
|
|
const access = verifyTripAccess(tripId, authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
if (!text || !text.trim()) return res.status(400).json({ error: 'Message text is required' });
|
|
|
|
const result = createMessage(tripId, authReq.user.id, text, reply_to);
|
|
if (result.error === 'reply_not_found') return res.status(400).json({ error: 'Reply target message not found' });
|
|
|
|
res.status(201).json({ message: result.message });
|
|
broadcast(tripId, 'collab:message:created', { message: result.message }, req.headers['x-socket-id'] as string);
|
|
|
|
// Notify trip members about new chat message
|
|
import('../services/notificationService').then(({ send }) => {
|
|
const tripInfo = db.prepare('SELECT title FROM trips WHERE id = ?').get(tripId) as { title: string } | undefined;
|
|
const preview = text.trim().length > 80 ? text.trim().substring(0, 80) + '...' : text.trim();
|
|
send({ event: 'collab_message', actorId: authReq.user.id, scope: 'trip', targetId: Number(tripId), params: { trip: tripInfo?.title || 'Untitled', actor: authReq.user.email, preview, tripId: String(tripId) } }).catch(() => {});
|
|
});
|
|
});
|
|
|
|
/* ------------------------------------------------------------------ */
|
|
/* Reactions */
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
router.post('/messages/:id/react', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId, id } = req.params;
|
|
const { emoji } = req.body;
|
|
const access = verifyTripAccess(Number(tripId), authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
if (!emoji) return res.status(400).json({ error: 'Emoji is required' });
|
|
|
|
const result = addOrRemoveReaction(id, tripId, authReq.user.id, emoji);
|
|
if (!result.found) return res.status(404).json({ error: 'Message not found' });
|
|
|
|
res.json({ reactions: result.reactions });
|
|
broadcast(Number(tripId), 'collab:message:reacted', { messageId: Number(id), reactions: result.reactions }, req.headers['x-socket-id'] as string);
|
|
});
|
|
|
|
/* ------------------------------------------------------------------ */
|
|
/* Delete message */
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
router.delete('/messages/:id', authenticate, (req: Request, res: Response) => {
|
|
const authReq = req as AuthRequest;
|
|
const { tripId, id } = req.params;
|
|
const access = verifyTripAccess(tripId, authReq.user.id);
|
|
if (!access) return res.status(404).json({ error: 'Trip not found' });
|
|
if (!checkPermission('collab_edit', authReq.user.role, access.user_id, authReq.user.id, access.user_id !== authReq.user.id))
|
|
return res.status(403).json({ error: 'No permission' });
|
|
|
|
const result = deleteMessage(tripId, id, authReq.user.id);
|
|
if (result.error === 'not_found') return res.status(404).json({ error: 'Message not found' });
|
|
if (result.error === 'not_owner') return res.status(403).json({ error: 'You can only delete your own messages' });
|
|
|
|
res.json({ success: true });
|
|
broadcast(tripId, 'collab:message:deleted', { messageId: Number(id), username: result.username || authReq.user.username }, req.headers['x-socket-id'] as string);
|
|
});
|
|
|
|
/* ------------------------------------------------------------------ */
|
|
/* Link preview */
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
router.get('/link-preview', authenticate, async (req: Request, res: Response) => {
|
|
const { url } = req.query as { url?: string };
|
|
if (!url) return res.status(400).json({ error: 'URL is required' });
|
|
|
|
try {
|
|
const preview = await fetchLinkPreview(url);
|
|
const asAny = preview as any;
|
|
if (asAny.error) return res.status(400).json({ error: asAny.error });
|
|
res.json(preview);
|
|
} catch {
|
|
res.json({ title: null, description: null, image: null, url });
|
|
}
|
|
});
|
|
|
|
export default router;
|