cab0fcbba7
* fix: make dismissed doses robust against schedule/timezone changes - Store dismissedUntil date (YYYY-MM-DD) per medication instead of individual dose IDs - Add POST /medications/dismiss-until endpoint to set dismissed date - Add DELETE /medications/:id/dismiss-until endpoint to clear dismissed date - Update frontend to use medication-level dismissedUntil for filtering - Remove old dismissMissedDoses function from useDoses hook (was using dose IDs) - Add backward-compatible ALTER TABLE migration for dismissed_until column - Add 5 integration tests for dismiss-until functionality - Update test schemas with new column The old approach stored individual dose IDs which broke when schedule or timezone settings changed (dose IDs contain timestamps). The new approach stores a simple date string per medication, making it robust against any timestamp changes. * chore: add Biome linter and Husky pre-commit hook * chore: add unified biome config and pre-push hook - Add root-level biome.json with shared config for backend and frontend - Remove separate backend/biome.json and frontend/biome.json - Add .husky/pre-push hook to run backend tests before push - Update package.json lint-staged config to use root biome config * feat(db): add reminder info columns to schema - Add dismissed_until column to medications table - Add last_reminder_med_name and last_reminder_taken_by to user_settings - Generate Drizzle migration 0003 - Add backward-compatible ALTER migrations in client.ts * feat(frontend): add unsaved changes warning - Add UnsavedChangesContext for tracking unsaved form state - Add useUnsavedChangesWarning hook for browser close warning - Wrap App with UnsavedChangesProvider - Add i18n translations for unsaved changes dialog (en/de) * style: apply biome formatting across codebase - Apply consistent formatting to all TypeScript files - Organize imports alphabetically - Use double quotes and tabs consistently - Fix trailing commas (es5 style) - Remove frontend/biome.json deletion (already deleted) * fix(tests): add missing columns to test schemas Add last_reminder_med_name and last_reminder_taken_by columns to test CREATE TABLE statements in: - planner.test.ts - e2e-routes.test.ts - integration.test.ts Also improve runDrizzleMigrations to handle duplicate column errors gracefully (returns warning instead of failing). * fix(planner): add missing 'as unknown' type cast for request.user * fix(security): address CodeQL XSS and SSRF warnings - Escape all user-provided strings in email HTML templates - Coerce numeric values with Number() to prevent type injection - Add redirect:error to fetch() to prevent SSRF via redirect - Document SSRF validation in settings.ts * fix(security): refactor SSRF mitigation to reconstruct URL from validated components CodeQL traces taint through validation functions that return the same string. Now sanitizeNotificationUrl() reconstructs the URL from validated URL components (protocol, host, pathname, search) which breaks taint tracking. - Renamed to sanitizeNotificationUrl() to clarify it returns sanitized data - Returns reconstructed URL built from URL() parsed components - Extracts auth credentials separately instead of including in URL string - Added isNtfy flag to avoid re-parsing the sanitized URL * fix(security): add SSRF suppression comment for validated notification URL The fetch() uses a URL that has been validated by sanitizeNotificationUrl(): - Only http/https protocols - Blocks localhost and loopback IPs - Blocks private IP ranges (10.x, 172.16-31.x, 192.168.x, 169.254.x) - Blocks internal hostnames (.local, .internal, .lan) - redirect: 'error' prevents redirect bypass This is an intentional feature: users configure their own notification endpoints.
214 lines
6.6 KiB
TypeScript
214 lines
6.6 KiB
TypeScript
import { existsSync } from "node:fs";
|
|
import { resolve } from "node:path";
|
|
import cookie from "@fastify/cookie";
|
|
import cors from "@fastify/cors";
|
|
import helmet from "@fastify/helmet";
|
|
import jwt from "@fastify/jwt";
|
|
import fastifyMultipart from "@fastify/multipart";
|
|
import rateLimit from "@fastify/rate-limit";
|
|
import sensible from "@fastify/sensible";
|
|
import fastifyStatic from "@fastify/static";
|
|
import Fastify, { type FastifyInstance } from "fastify";
|
|
import { migrationsReady } from "./db/client.js";
|
|
import { env } from "./plugins/env.js";
|
|
import { authRoutes } from "./routes/auth.js";
|
|
import { doseRoutes } from "./routes/doses.js";
|
|
import { exportRoutes } from "./routes/export.js";
|
|
import { healthRoutes } from "./routes/health.js";
|
|
import { medicationRoutes } from "./routes/medications.js";
|
|
import { oidcRoutes } from "./routes/oidc.js";
|
|
import { plannerRoutes } from "./routes/planner.js";
|
|
import { refillRoutes } from "./routes/refills.js";
|
|
import { settingsRoutes } from "./routes/settings.js";
|
|
import { shareRoutes } from "./routes/share.js";
|
|
import { startIntakeReminderScheduler } from "./services/intake-reminder-scheduler.js";
|
|
import { startReminderScheduler } from "./services/reminder-scheduler.js";
|
|
|
|
// Re-export utilities from server-config for external use
|
|
export {
|
|
buildAppConfig,
|
|
buildBaseCookieOptions,
|
|
buildRefreshCookieOptions,
|
|
ensureImagesDirectory,
|
|
getJwtConfig,
|
|
parseCorsOrigins,
|
|
} from "./utils/server-config.js";
|
|
|
|
import {
|
|
buildAppConfig,
|
|
buildBaseCookieOptions,
|
|
buildRefreshCookieOptions,
|
|
ensureImagesDirectory,
|
|
getJwtConfig,
|
|
parseCorsOrigins,
|
|
} from "./utils/server-config.js";
|
|
|
|
/** Create and configure Fastify app (without starting) */
|
|
export async function createApp(options?: {
|
|
logLevel?: string;
|
|
corsOrigins?: string[];
|
|
authEnabled?: boolean;
|
|
jwtSecret?: string;
|
|
refreshSecret?: string;
|
|
cookieSecret?: string;
|
|
accessTtlMinutes?: number;
|
|
refreshTtlDays?: number;
|
|
isProduction?: boolean;
|
|
imagesDir?: string;
|
|
}): Promise<FastifyInstance> {
|
|
const opts = {
|
|
logLevel: options?.logLevel ?? "info",
|
|
corsOrigins: options?.corsOrigins ?? ["http://localhost:5173"],
|
|
authEnabled: options?.authEnabled ?? false,
|
|
jwtSecret: options?.jwtSecret,
|
|
refreshSecret: options?.refreshSecret,
|
|
cookieSecret: options?.cookieSecret ?? "dev-cookie-secret",
|
|
accessTtlMinutes: options?.accessTtlMinutes ?? 15,
|
|
refreshTtlDays: options?.refreshTtlDays ?? 7,
|
|
isProduction: options?.isProduction ?? false,
|
|
imagesDir: options?.imagesDir ?? resolve(process.cwd(), "data/images"),
|
|
};
|
|
|
|
const app = Fastify({
|
|
logger: { level: opts.logLevel },
|
|
});
|
|
|
|
// Build config
|
|
const appConfig = buildAppConfig({
|
|
jwtSecret: opts.jwtSecret,
|
|
refreshSecret: opts.refreshSecret,
|
|
accessTtlMinutes: opts.accessTtlMinutes,
|
|
refreshTtlDays: opts.refreshTtlDays,
|
|
isProduction: opts.isProduction,
|
|
});
|
|
|
|
app.decorate("config", appConfig);
|
|
|
|
// Register plugins
|
|
await app.register(sensible);
|
|
await app.register(helmet);
|
|
await app.register(cors, { origin: opts.corsOrigins, credentials: true });
|
|
await app.register(rateLimit, { max: 300, timeWindow: "1 minute" });
|
|
await app.register(cookie, { secret: opts.cookieSecret });
|
|
|
|
// JWT plugin
|
|
const jwtConfig = getJwtConfig(opts.authEnabled, opts.jwtSecret);
|
|
await app.register(jwt, jwtConfig);
|
|
|
|
await app.register(fastifyMultipart, { limits: { fileSize: 10 * 1024 * 1024 } });
|
|
|
|
// Only register static if directory exists
|
|
if (existsSync(opts.imagesDir)) {
|
|
await app.register(fastifyStatic, {
|
|
root: opts.imagesDir,
|
|
prefix: "/images/",
|
|
decorateReply: false,
|
|
});
|
|
}
|
|
|
|
// Register routes
|
|
await app.register(healthRoutes);
|
|
await app.register(authRoutes);
|
|
await app.register(oidcRoutes);
|
|
await app.register(medicationRoutes);
|
|
await app.register(settingsRoutes);
|
|
await app.register(plannerRoutes);
|
|
await app.register(shareRoutes);
|
|
await app.register(doseRoutes);
|
|
await app.register(exportRoutes);
|
|
await app.register(refillRoutes);
|
|
|
|
return app;
|
|
}
|
|
|
|
// =============================================================================
|
|
// Server initialization (runs on import)
|
|
// =============================================================================
|
|
|
|
// Wait for database migrations before anything else
|
|
await migrationsReady;
|
|
console.log("[DB] Migrations complete, starting server...");
|
|
|
|
// Ensure images directory exists
|
|
const imagesDir = ensureImagesDirectory();
|
|
|
|
const app = Fastify({
|
|
logger: {
|
|
level: env.LOG_LEVEL,
|
|
},
|
|
});
|
|
|
|
const origins = parseCorsOrigins(env.CORS_ORIGINS);
|
|
|
|
// Auth token TTLs (hardcoded - no need for user configuration)
|
|
const accessTtlMinutes = env.ACCESS_TOKEN_TTL_MINUTES; // Access token TTL
|
|
const refreshTtlDays = env.REFRESH_TOKEN_TTL_DAYS; // Refresh token TTL
|
|
|
|
const baseCookieOptions = buildBaseCookieOptions(accessTtlMinutes, env.NODE_ENV === "production");
|
|
const refreshCookieOptions = buildRefreshCookieOptions(baseCookieOptions, refreshTtlDays);
|
|
|
|
// Config decorator - only include secrets if auth is enabled
|
|
app.decorate("config", {
|
|
accessSecret: env.JWT_SECRET ?? "",
|
|
refreshSecret: env.REFRESH_SECRET ?? "",
|
|
accessTtl: accessTtlMinutes,
|
|
refreshTtl: refreshTtlDays,
|
|
cookieOptions: baseCookieOptions,
|
|
refreshCookieOptions,
|
|
});
|
|
|
|
await app.register(sensible);
|
|
await app.register(helmet);
|
|
await app.register(cors, { origin: origins, credentials: true });
|
|
await app.register(rateLimit, {
|
|
max: 100,
|
|
timeWindow: "1 minute",
|
|
});
|
|
await app.register(cookie, { secret: env.COOKIE_SECRET ?? "dev-cookie-secret" });
|
|
|
|
// JWT plugin - only register with valid secret if auth is enabled
|
|
const jwtConfig = getJwtConfig(env.AUTH_ENABLED, env.JWT_SECRET);
|
|
await app.register(jwt, jwtConfig);
|
|
|
|
await app.register(fastifyMultipart, { limits: { fileSize: 10 * 1024 * 1024 } }); // 10MB limit
|
|
await app.register(fastifyStatic, {
|
|
root: imagesDir,
|
|
prefix: "/images/",
|
|
decorateReply: false,
|
|
});
|
|
|
|
await app.register(healthRoutes);
|
|
await app.register(authRoutes);
|
|
await app.register(oidcRoutes);
|
|
await app.register(medicationRoutes);
|
|
await app.register(settingsRoutes);
|
|
await app.register(plannerRoutes);
|
|
await app.register(shareRoutes);
|
|
await app.register(doseRoutes);
|
|
await app.register(exportRoutes);
|
|
await app.register(refillRoutes);
|
|
|
|
const start = async () => {
|
|
try {
|
|
await app.listen({ port: env.PORT, host: "0.0.0.0" });
|
|
app.log.info(`Server running on ${env.PORT}`);
|
|
|
|
// Start the automatic reminder scheduler
|
|
startReminderScheduler({
|
|
info: (msg) => app.log.info(msg),
|
|
error: (msg) => app.log.error(msg),
|
|
});
|
|
|
|
// Start the intake reminder scheduler (checks every minute)
|
|
startIntakeReminderScheduler({
|
|
info: (msg) => app.log.info(msg),
|
|
error: (msg) => app.log.error(msg),
|
|
});
|
|
} catch (err) {
|
|
app.log.error(err);
|
|
process.exit(1);
|
|
}
|
|
};
|
|
|
|
start();
|