Fix watch tracking, video unlocking and access-control gaps
Deploy Vault CMS / deploy (push) Failing after 38s
Deploy Vault CMS / deploy (push) Failing after 38s
Watch progress and unlocking: - Player samples the playhead and reports the ranges actually played, so skipped sections earn no credit and early plays are not lost - Server merges ranges into compact segment rows; progress never regresses - Single 80% unlock rule enforced server-side (lib/watch-progress.ts); the Unlock button and automatic unlock now agree - Lock state and progress bar update live from each progress save - Playlist is derived from the video, so unlocks work for shared playlists and for links from watch history and liked videos - First/previous video decided by playlist position, not index numbers Access control: - Video API and HLS/MP4 routes require a signed-in viewer who is enrolled and has the video unlocked; thumbnails require sign-in - Enrolment sync reads course codes from the allow-list, not the request - /api/admin/meta is admin-only - Account status, role and levels are re-checked from the database during a session, so deactivated students lose access within a minute Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -8,6 +8,8 @@ import { NextResponse } from "next/server";
|
||||
import fs from "fs";
|
||||
import path from "path";
|
||||
import { Readable } from "stream";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { checkVideoAccess, getViewer } from "@/lib/video-access";
|
||||
|
||||
const VIDEOS_DIR = path.join(process.env.UPLOADS_DIR || "/uploads", "videos");
|
||||
|
||||
@@ -63,12 +65,52 @@ function parseRange(
|
||||
return { start, end };
|
||||
}
|
||||
|
||||
// Maps a requested file to the Video row it belongs to, then applies the same
|
||||
// access rule as the video API. Files with no Video row are admin-only.
|
||||
const VIDEO_ID_TTL_MS = 5 * 60_000;
|
||||
const videoIdByPath = new Map<string, { expires: number; videoId: string | null }>();
|
||||
|
||||
async function findVideoId(segments: string[]): Promise<string | null> {
|
||||
const relative = segments.join("/");
|
||||
const hit = videoIdByPath.get(relative);
|
||||
if (hit && hit.expires > Date.now()) return hit.videoId;
|
||||
|
||||
const byUrl = await prisma.video.findFirst({
|
||||
where: { url: `/uploads/videos/${relative}` },
|
||||
select: { id: true },
|
||||
});
|
||||
// Uploads are normally stored as {videoId}.mp4
|
||||
const byName =
|
||||
byUrl ??
|
||||
(await prisma.video.findUnique({
|
||||
where: { id: path.basename(relative, path.extname(relative)) },
|
||||
select: { id: true },
|
||||
}));
|
||||
|
||||
const videoId = byName?.id ?? null;
|
||||
if (videoIdByPath.size >= 5000) videoIdByPath.clear();
|
||||
videoIdByPath.set(relative, { expires: Date.now() + VIDEO_ID_TTL_MS, videoId });
|
||||
return videoId;
|
||||
}
|
||||
|
||||
async function authorize(segments: string[]): Promise<{ status: number; error: string } | null> {
|
||||
const viewer = await getViewer();
|
||||
if (!viewer) return { status: 401, error: "Unauthorized" };
|
||||
if (viewer.isAdmin) return null;
|
||||
|
||||
const videoId = await findVideoId(segments);
|
||||
if (!videoId) return { status: 404, error: "Not found" };
|
||||
|
||||
const access = await checkVideoAccess(viewer, videoId);
|
||||
return access.ok ? null : { status: access.status, error: access.error };
|
||||
}
|
||||
|
||||
function baseHeaders(filePath: string, stats: fs.Stats): Record<string, string> {
|
||||
const ext = path.extname(filePath).toLowerCase();
|
||||
return {
|
||||
"Content-Type": CONTENT_TYPES[ext] ?? "application/octet-stream",
|
||||
"Accept-Ranges": "bytes",
|
||||
"Cache-Control": "public, max-age=3600",
|
||||
"Cache-Control": "private, max-age=3600",
|
||||
"Last-Modified": stats.mtime.toUTCString(),
|
||||
};
|
||||
}
|
||||
@@ -84,6 +126,11 @@ export async function GET(
|
||||
return NextResponse.json({ error: "Invalid request" }, { status: 400 });
|
||||
}
|
||||
|
||||
const denied = await authorize(params?.path || []);
|
||||
if (denied) {
|
||||
return NextResponse.json({ error: denied.error }, { status: denied.status });
|
||||
}
|
||||
|
||||
const stats = await statFile(filePath);
|
||||
if (!stats) {
|
||||
console.log(`[Videos] File not found: ${filePath}`);
|
||||
@@ -132,6 +179,9 @@ export async function HEAD(
|
||||
const filePath = resolveVideoPath(params?.path || []);
|
||||
if (!filePath) return new NextResponse(null, { status: 400 });
|
||||
|
||||
const denied = await authorize(params?.path || []);
|
||||
if (denied) return new NextResponse(null, { status: denied.status });
|
||||
|
||||
const stats = await statFile(filePath);
|
||||
if (!stats) return new NextResponse(null, { status: 404 });
|
||||
|
||||
|
||||
Reference in New Issue
Block a user