Patch React2Shell RCE and harden auth, uploads and containers

- Upgrade next 16.0.3 -> 16.3.5 and react/react-dom 19.2.0 -> 19.3.0
  (CVE-2025-55182 / CVE-2025-66478 unauthenticated RCE), next-auth -> 4.24.15
- Require admin role on /api/users, /api/courses and /api/enrollments,
  which were unauthenticated
- Replace ALLOWED_ADMINS checks that allowed any signed-in user when the
  variable was empty with the role-based requireAdmin
- Sanitize upload filenames, restrict thumbnail extensions, store edited
  thumbnails in UPLOADS_DIR, tighten traversal checks in file routes
- Dockerfile: Node 22, pinned pnpm, non-root user, critical audit gate
- Compose: read-only rootfs, dropped caps, no-new-privileges, Postgres
  password from env
- Exclude .env from Docker build context; add security headers
- Deploy with git reset --hard instead of git pull
- Remove stale package-lock.json

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

app/api/admin/create-course/route.ts

@@ -1,19 +1,11 @@
 // app/api/admin/create-course/route.ts
 import { NextResponse } from 'next/server';
 import { prisma } from '@/lib/prisma';
-import { getServerSession } from 'next-auth';
-import { authOptions } from '@/lib/auth-options';
-
-async function checkAdmin() {
-  const session = await getServerSession(authOptions);
-  if (!session?.user?.email) throw { status: 401, message: 'Unauthorized' };
-  const allowed = (process.env.ALLOWED_ADMINS || '').split(',').map(s=>s.trim()).filter(Boolean);
-  if (allowed.length && !allowed.includes(session.user.email)) throw { status: 403, message: 'Forbidden' };
-}
+import { requireAdmin } from '@/lib/admin-check';
 
 export async function POST(req: Request) {
   try {
-    await checkAdmin();
+    await requireAdmin();
     const body = await req.json();
     const { title, code } = body;
     if (!title) return NextResponse.json({ error: 'missing title' }, { status: 400 });

app/api/admin/create-playlist/route.ts

@@ -1,19 +1,11 @@
 // app/api/admin/create-playlist/route.ts
 import { NextResponse } from 'next/server';
 import { prisma } from '@/lib/prisma';
-import { getServerSession } from 'next-auth';
-import { authOptions } from '@/lib/auth-options';
-
-async function checkAdmin() {
-  const session = await getServerSession(authOptions);
-  if (!session?.user?.email) throw { status: 401, message: 'Unauthorized' };
-  const allowed = (process.env.ALLOWED_ADMINS || '').split(',').map(s=>s.trim()).filter(Boolean);
-  if (allowed.length && !allowed.includes(session.user.email)) throw { status: 403, message: 'Forbidden' };
-}
+import { requireAdmin } from '@/lib/admin-check';
 
 export async function POST(req: Request) {
   try {
-    await checkAdmin();
+    await requireAdmin();
     const { title, courseId, additionalCourseIds } = await req.json();
     if (!title || !courseId) return NextResponse.json({ error: 'missing fields' }, { status: 400 });
 

app/api/admin/manage-playlist-courses/route.ts

@@ -2,20 +2,12 @@
 // Assign or remove a playlist from additional courses
 import { NextResponse } from 'next/server';
 import { prisma } from '@/lib/prisma';
-import { getServerSession } from 'next-auth';
-import { authOptions } from '@/lib/auth-options';
-
-async function checkAdmin() {
-  const session = await getServerSession(authOptions);
-  if (!session?.user?.email) throw { status: 401, message: 'Unauthorized' };
-  const allowed = (process.env.ALLOWED_ADMINS || '').split(',').map(s=>s.trim()).filter(Boolean);
-  if (allowed.length && !allowed.includes(session.user.email)) throw { status: 403, message: 'Forbidden' };
-}
+import { requireAdmin } from '@/lib/admin-check';
 
 // GET: Get all courses a playlist is assigned to
 export async function GET(req: Request) {
   try {
-    await checkAdmin();
+    await requireAdmin();
     const { searchParams } = new URL(req.url);
     const playlistId = searchParams.get('playlistId');
     
@@ -49,7 +41,7 @@ export async function GET(req: Request) {
 // POST: Assign playlist to an additional course
 export async function POST(req: Request) {
   try {
-    await checkAdmin();
+    await requireAdmin();
     const { playlistId, courseId } = await req.json();
     
     if (!playlistId || !courseId) return NextResponse.json({ error: 'missing fields' }, { status: 400 });
@@ -76,7 +68,7 @@ export async function POST(req: Request) {
 // DELETE: Remove playlist from a course
 export async function DELETE(req: Request) {
   try {
-    await checkAdmin();
+    await requireAdmin();
     const { searchParams } = new URL(req.url);
     const playlistId = searchParams.get('playlistId');
     const courseId = searchParams.get('courseId');

app/api/admin/update-video/route.ts

@@ -5,6 +5,16 @@ import { authOptions } from '@/lib/auth-options';
 import { prisma } from '@/lib/prisma';
 import { writeFile, mkdir } from 'fs/promises';
 import { join } from 'path';
+import { randomUUID } from 'crypto';
+
+const UPLOADS_DIR = process.env.UPLOADS_DIR || '/uploads';
+
+const THUMBNAIL_EXTS: Record<string, string> = {
+  'image/jpeg': '.jpg',
+  'image/png': '.png',
+  'image/webp': '.webp',
+  'image/gif': '.gif',
+};
 
 export async function PATCH(req: Request) {
   try {
@@ -93,18 +103,27 @@ export async function POST(req: Request) {
 
     // Handle thumbnail upload if provided
     if (thumbnail && thumbnail.size > 0) {
+      // extension comes from an allowlist, never from client-supplied strings
+      const ext = THUMBNAIL_EXTS[thumbnail.type];
+      if (!ext) {
+        return NextResponse.json(
+          { error: 'Thumbnail must be a JPEG, PNG, WebP or GIF image' },
+          { status: 400 }
+        );
+      }
+
       const bytes = await thumbnail.arrayBuffer();
       const buffer = Buffer.from(bytes);
 
-      // Save to public/thumbnails
-      const uploadDir = join(process.cwd(), 'public', 'thumbnails');
+      // Save with the upload route's thumbnails; the app directory itself is
+      // read-only in production
+      const uploadDir = join(UPLOADS_DIR, 'thumbnails');
       await mkdir(uploadDir, { recursive: true });
 
-      const filename = `${videoId}-${Date.now()}.${thumbnail.type.split('/')[1] || 'jpg'}`;
-      const filepath = join(uploadDir, filename);
-      await writeFile(filepath, buffer);
+      const filename = `${Date.now()}-${randomUUID()}${ext}`;
+      await writeFile(join(uploadDir, filename), buffer);
 
-      updateData.thumbnail = `/thumbnails/${filename}`;
+      updateData.thumbnail = `/api/thumbnails/${filename}`;
     }
 
     if (Object.keys(updateData).length === 0 && !thumbnail && restrictedCourseIds === null) {

app/api/admin/upload/finalize/route.ts

@@ -4,8 +4,7 @@ import fs from "fs";
 import path from "path";
 import { spawn } from "child_process";
 import { prisma } from "@/lib/prisma";
-import { getServerSession } from "next-auth";
-import { authOptions } from "@/lib/auth-options";
+import { requireAdmin } from "@/lib/admin-check";
 
 const UPLOADS_DIR = process.env.UPLOADS_DIR || "/uploads";
 
@@ -56,23 +55,11 @@ async function getVideoDurationFromFile(filePath: string): Promise<number | null
   });
 }
 
-async function checkAdmin() {
-  const session = await getServerSession(authOptions);
-  if (!session?.user?.email) throw { status: 401, message: "Unauthorized" };
-  const allowed = (process.env.ALLOWED_ADMINS || "")
-    .split(",")
-    .map((s) => s.trim())
-    .filter(Boolean);
-  if (allowed.length && !allowed.includes(session.user.email))
-    throw { status: 403, message: "Forbidden" };
-  return session;
-}
-
 export async function POST(req: Request) {
   try {
     console.log('[Upload/Finalize] Request received');
     
-    await checkAdmin();
+    await requireAdmin();
     
     const body = await req.json();
     const { videoId } = body;

app/api/admin/upload/route.ts

@@ -7,8 +7,7 @@ import { IncomingMessage } from "http";
 import { spawn } from "child_process";
 import formidable, { Fields, Files, File as FormidableFile } from "formidable";
 import { prisma } from "@/lib/prisma";
-import { getServerSession } from "next-auth";
-import { authOptions } from "@/lib/auth-options";
+import { requireAdmin } from "@/lib/admin-check";
 
 // For 2GB uploads over Tailscale (~10-50 Mbps), need 30-45 minutes
 export const maxDuration = 2700; // 45 minutes for very large uploads over slow connections
@@ -20,6 +19,8 @@ const UPLOADS_DIR = process.env.UPLOADS_DIR || "/uploads";
 // post-parse rename is a cheap atomic move instead of a multi-GB copy
 const TMP_DIR = path.join(UPLOADS_DIR, "tmp");
 
+const THUMBNAIL_EXTS = new Set([".jpg", ".jpeg", ".png", ".webp", ".gif"]);
+
 // Helper to extract video duration using FFprobe
 async function getVideoDurationFromFile(filePath: string): Promise<number | null> {
   return new Promise((resolve) => {
@@ -134,18 +135,6 @@ async function moveFile(src: string, dest: string) {
   await fs.promises.chmod(dest, 0o644);
 }
 
-async function checkAdmin() {
-  const session = await getServerSession(authOptions);
-  if (!session?.user?.email) throw { status: 401, message: "Unauthorized" };
-  const allowed = (process.env.ALLOWED_ADMINS || "")
-    .split(",")
-    .map((s) => s.trim())
-    .filter(Boolean);
-  if (allowed.length && !allowed.includes(session.user.email))
-    throw { status: 403, message: "Forbidden" };
-  return session;
-}
-
 export async function POST(req: Request) {
   // track saved paths so we can cleanup on error
   let savedVideoDest: string | undefined;
@@ -156,7 +145,7 @@ export async function POST(req: Request) {
   try {
     console.log('[Upload] Request received, content-type:', req.headers.get("content-type"));
 
-    const session = await checkAdmin();
+    const session = await requireAdmin();
 
     console.log('[Upload] Admin check passed for:', session.user?.email);
 
@@ -184,8 +173,8 @@ export async function POST(req: Request) {
     if (thumbFile) {
       try {
         const originalThumbName = thumbFile.originalFilename || path.basename(thumbFile.filepath);
-        const tExt = path.extname(originalThumbName) || ".jpg";
-        const thumbFilename = `${Date.now()}-thumb${tExt}`;
+        const tExt = path.extname(originalThumbName).toLowerCase();
+        const thumbFilename = `${Date.now()}-thumb${THUMBNAIL_EXTS.has(tExt) ? tExt : ".jpg"}`;
         const thumbDest = path.join(UPLOADS_DIR, "thumbnails", thumbFilename);
         await moveFile(thumbFile.filepath, thumbDest);
         thumbnailUrl = `/api/thumbnails/${thumbFilename}`;
@@ -198,7 +187,8 @@ export async function POST(req: Request) {
     if (!isManualCopy) {
       if (!videoFile) return NextResponse.json({ error: "no file" }, { status: 400 });
 
-      const originalFilename = videoFile.originalFilename || path.basename(videoFile.filepath);
+      // basename: the client-supplied name must not be able to contain "../"
+      const originalFilename = path.basename(videoFile.originalFilename || videoFile.filepath);
       const filename = `${Date.now()}-${originalFilename}`;
       const dest = path.join(UPLOADS_DIR, "videos", filename);
 

app/api/courses/route.ts

@@ -1,8 +1,12 @@
-// app/api/users/route.ts
+// app/api/courses/route.ts
 import { NextResponse } from "next/server";
 import { prisma } from "../../../lib/prisma";
+import { adminGuard } from "@/lib/admin-check";
 
 export async function GET() {
+  const denied = await adminGuard();
+  if (denied) return denied;
+
   const courses = await prisma.course.findMany({ select: { id: true, title: true, code: true } });
   return NextResponse.json(courses);
 }

app/api/enrollments/route.ts

@@ -1,13 +1,15 @@
 // /app/api/enrollments/route.ts
 import { NextResponse } from 'next/server';
 import type { NextRequest } from 'next/server';
-import { PrismaClient } from '@prisma/client';
-
-const prisma = new PrismaClient();
+import { prisma } from '@/lib/prisma';
+import { adminGuard } from '@/lib/admin-check';
 
 // --- GET --------------------------------------------------------------------
 
 export async function GET() {
+  const denied = await adminGuard();
+  if (denied) return denied;
+
   try {
     const enrollments = await prisma.enrollment.findMany({
       include: {
@@ -26,6 +28,9 @@ export async function GET() {
 // --- POST --------------------------------------------------------------------
 
 export async function POST(req: NextRequest) {
+  const denied = await adminGuard();
+  if (denied) return denied;
+
   try {
     const body = await req.json();
 
@@ -74,6 +79,9 @@ export async function POST(req: NextRequest) {
 // --- DELETE --------------------------------------------------------------------
 
 export async function DELETE(req: NextRequest) {
+  const denied = await adminGuard();
+  if (denied) return denied;
+
   try {
     const body = await req.json();
     const id = body?.id;

app/api/thumbnails/[...path]/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     const requestedPath = path.join(THUMBNAILS_DIR, ...pathSegments);
     
     // Security: prevent directory traversal attacks
-    if (!requestedPath.startsWith(THUMBNAILS_DIR)) {
+    if (!requestedPath.startsWith(THUMBNAILS_DIR + path.sep)) {
       return NextResponse.json(
         { error: 'Invalid request' },
         { status: 403 }
@@ -93,7 +93,7 @@ export async function HEAD(
     const requestedPath = path.join(THUMBNAILS_DIR, ...pathSegments);
     
     // Security: prevent directory traversal attacks
-    if (!requestedPath.startsWith(THUMBNAILS_DIR)) {
+    if (!requestedPath.startsWith(THUMBNAILS_DIR + path.sep)) {
       return new NextResponse(null, { status: 403 });
     }
 

app/api/users/route.ts

@@ -1,9 +1,13 @@
 // app/api/users/route.ts
 import { NextResponse } from "next/server";
 import { prisma } from "../../../lib/prisma";
+import { adminGuard } from "@/lib/admin-check";
 
 
 export async function GET() {
+  const denied = await adminGuard();
+  if (denied) return denied;
+
   const users = await prisma.user.findMany({ select: { id: true, name: true, email: true } });
   return NextResponse.json(users);
 }

app/api/videos/hls/[...path]/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     const requestedPath = path.join(HLS_DIR, ...pathSegments);
     
     // Security: prevent directory traversal attacks
-    if (!requestedPath.startsWith(HLS_DIR)) {
+    if (!requestedPath.startsWith(HLS_DIR + path.sep)) {
       return NextResponse.json(
         { error: 'Invalid request' },
         { status: 403 }
@@ -92,7 +92,7 @@ export async function HEAD(
     const requestedPath = path.join(HLS_DIR, ...pathSegments);
     
     // Security: prevent directory traversal attacks
-    if (!requestedPath.startsWith(HLS_DIR)) {
+    if (!requestedPath.startsWith(HLS_DIR + path.sep)) {
       return new NextResponse(null, { status: 403 });
     }