Changeset 8afbdd6 in Klonkt for src/server.js

Timestamp:

06/14/2026 06:07:51 PM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

c869272

Parents:

b94c08e

Message:

feat: viewer role + artists directory + Klonkt Hub Beta rebrand

Viewer role (replaces the separate view-mode/readonly toggle):

• 'kijker' is now a real role (VALID_ROLES) selectable in Admin. May view EVERYTHING including Admin, but cannot modify anything.
• isViewer(user) (= role kijker or legacy readonly flag) is the source; requireGod/requireSiteManager(BySlug) let a viewer through (viewing), the global guard 403s every write. Existing readonly accounts are migrated on each role change (readonly=0).
• Write leaks via GET patched: /prutter/new (INSERT) blocks for viewers, /prutter/:id skips markAsRead (UPDATE); WS upgrade rejects viewers (the HTTP guard doesn't cover WebSockets).
• Clean "Viewer mode" page (viewer-blocked) instead of raw 403 text; styled sticky banner; account page shows read-only UI instead of an upload button that silently 403s. canMutate hides write buttons.

Scalability (>50 artists):

• Hub home shows max 24 (most active first) + "All N artists ->".
• New searchable, paginated /artiesten directory (hub only).
• 'user' + 'artiesten' reserved as slugs.

Rebrand PrutFolio v1 -> Klonkt Hub Beta (footer, PWA manifest, account/
admin texts, default page title, startup, README; internal package +
PWA id 'prutfolio' remain for stability).

Co-Authored-By: Claude <noreply@…>

File:

• src/server.js (modified) (8 diffs)

src/server.js

@@ -1 +1 @@
 /**
- * PrutFolio v1 — server bootstrap
+ * Klonkt Hub Beta — server bootstrap
  *
  * Persoonlijk multi-site platform forked van PrutCMS v9 (PHP, file-based).
@@ -21 +21 @@
 
 import { resolveSite, loadAudioTracks, loadTheme } from './middleware/site.js';
+import { isViewer } from './middleware/auth.js';
+import { renderPage } from './middleware/render.js';
 import authRoutes from './routes/auth.js';
 import accountRoutes from './routes/account.js';
@@ -39 +41 @@
 import feedRoutes from './routes/feed.js';
 import hubRoutes from './routes/hub.js';
+import artistsRoutes from './routes/artists.js';
 import postsRoutes from './routes/posts.js';
 
@@ -164 +167 @@
 });
 
-// Read-only/kijk-accounts: alles bekijken mag, niets wijzigen. Blokkeert elke
-// state-wijzigende methode (de login-POST zelf zet de sessie pas, dus die valt
-// hier nog niet onder).
+// Kijker-accounts: alles bekijken mag (incl. Beheer), niets wijzigen. Dit is de
+// ENIGE schrijf-blokkade — fail-closed, vóór alle route-handlers. Elke state-
+// wijzigende methode wordt geweigerd (de login-POST zet de sessie pas ná deze
+// guard, dus die valt er niet onder). I.p.v. rauwe 403-tekst tonen we een nette
+// pagina (of, bij HTMX, een ingeswapte melding).
 app.use((req, res, next) => {
-  if (req.session?.user?.readonly && req.method !== 'GET' && req.method !== 'HEAD' && req.method !== 'OPTIONS') {
-    return res.status(403).send('Demo-account: alleen-lezen — wijzigen is uitgeschakeld.');
+  const mutating = req.method !== 'GET' && req.method !== 'HEAD' && req.method !== 'OPTIONS';
+  if (mutating && isViewer(req.session?.user)) {
+    if (req.headers['hx-request'] === 'true') {
+      // htmx swapt niet op 4xx; stuur 200 + retarget zodat de melding in #pcms-main verschijnt.
+      res.setHeader('HX-Retarget', '#pcms-main');
+      res.setHeader('HX-Reswap', 'innerHTML');
+      res.status(200);
+    } else {
+      res.status(403);
+    }
+    return renderPage(req, res, 'pages/viewer-blocked', {
+      pageTitle: 'Kijker-modus',
+      bodyClass: 'on-special',
+    });
   }
   next();
@@ -192 +209 @@
 // Feed/sitemap routes are mounted at root because they're at well-known paths
 app.use('/', feedRoutes);
+app.use('/artiesten', artistsRoutes); // doorzoekbare artiesten-directory (alleen hub; solo: next())
 app.use('/', hubRoutes); // hub-overview op '/' (solo: next() -> postsRoutes)
 app.use('/', postsRoutes);
@@ -215 +233 @@
   res.json({
     id: idBase,
-    name: site?.title || 'PrutFolio',
-    short_name: (site?.title || 'PrutFolio').slice(0, 12),
+    name: site?.title || 'Klonkt Hub Beta',
+    short_name: (site?.title || 'Klonkt').slice(0, 12),
     description: site?.description || site?.tagline || '',
     scope,
@@ -324 +342 @@
       return;
     }
+    // Kijker-accounts zijn alleen-lezen: weiger de WS-upgrade. De HTTP-guard
+    // dekt geen WS, dus dit is de plek om schrijven via een (toekomstige)
+    // message-handler te voorkomen.
+    if (isViewer(req.session.user)) {
+      socket.write('HTTP/1.1 403 Forbidden\r\n\r\n');
+      socket.destroy();
+      return;
+    }
     wss.handleUpgrade(req, socket, head, (ws) => {
       ws.userId = req.session.user.id;
@@ -350 +376 @@
 server.listen(PORT, () => {
   console.log('');
-  console.log('🪶 PrutFolio v1 — alpha');
+  console.log('🪶 Klonkt Hub Beta');
   console.log(`   http://localhost:${PORT}`);
   console.log('');