source: Klonkt/src/routes/admin-sites.js@ e9128bc

main
Last change on this file since e9128bc was e9128bc, checked in by Robin <roboburr@…>, 4 weeks ago

Alle migratie-opties bij elkaar op één pagina

Robin: ik wil alle migratie-opties op de migrate-pagina hebben, dus ook
fediverse alias en move.

Ze stonden op de site-bewerkpagina, tussen de kleuren, de feedinstellingen en
de custom head-html. Dat is de verkeerde plek in twee opzichten: het zijn stap
1 en de laatste stap van een verhuizing, en dat scherm gaat over hoe je site
eruitziet. Een verhuizing is geen uiterlijk.

De pagina vertelt nu het verhaal in de goede volgorde:

1 je oude account claimen (alsoKnownAs)

meenemen (zip)
ophalen bij je oude Klonkt
hierheen halen (zip)

4 de verhuizing aankondigen (Move)

Claimen bovenaan omdat de bron zonder die claim niets afgeeft en de Move
weigert met no_backreference. Aankondigen onderaan met een rode knop: het is de
enige stap op deze pagina die niet terug te draaien is.

De verhuisknop post naar de BESTAANDE /admin/sites/:slug/move. Een tweede
implementatie van een onomkeerbare actie is precies wat je niet wilt; die route
kreeg alleen een next mee zodat je terugkomt waar je vandaan kwam.

EEN VAL DIE IK ONDERWEG MAAKTE. De opslagroute van het site-bewerkscherm
schreef ap_aliases uit het formulier. Haal je dat veld weg, dan komt er niets
binnen, en dan wist een gewone opslag je claim op je oude account. Je verandert
je accentkleur en drie stappen later weigert de Move met no_backreference,
zonder dat iets die twee met elkaar verbindt. Nu geldt: veld niet meegestuurd
is niet aanraken.

Changed files:
src/routes/admin-migrate.js

  • POST /admin/migrate/aliases, met de bestaande parseApAliases
  • aliassen en moved_to in de locals van alle drie de renders

src/routes/admin-sites.js

  • parseApAliases geexporteerd in plaats van gekopieerd
  • de save raakt ap_aliases alleen aan als het veld er echt is
  • /move mag terugsturen naar een eigen pad (geen open redirect)

src/views/pages/admin-migrate.ejs

  • alias bovenaan, verhuizen onderaan met een gewaarschuwde rode knop

src/views/pages/admin-site-edit.ejs

  • beide blokken eruit, een wegwijzer ervoor in de plaats

src/services/i18n.js

  • mig.alias_* en mig.move_* plus asite.moved_to_migrate, in nl/en/de

New file:
test/migrate-page.test.js

  • de velden staan op de goede pagina en niet meer op de oude
  • de volgorde: claimen boven ophalen, aankondigen onderaan
  • en een alias overleeft het opslaan van je uiterlijk

remarks: gedraaid op een echte instantie. Alias opslaan werkt, een onzin-adres
geeft een nette fout EN laat de bestaande alias staan, en de pagina rendert
schoon in nl/en/de. Suite 1005 groen.

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

  • Property mode set to 100644
File size: 17.9 KB
Line 
1/**
2 * Admin: Site management — Phase E.
3 *
4 * GET /admin/sites -> list all sites
5 * GET /admin/sites/new -> create form
6 * POST /admin/sites/create -> insert + redirect to edit
7 * GET /admin/sites/:slug/edit -> edit form
8 * POST /admin/sites/:slug/save -> update
9 * POST /admin/sites/:slug/delete-> delete (refuses if site has posts)
10 *
11 * God-only (requireGod middleware). Slug is immutable after create — too
12 * many things hang off it (URLs, manifest scope, federation). If you really
13 * need to rename: delete + re-create.
14 */
15
16import express from 'express';
17import path from 'path';
18import fs from 'fs';
19import multer from 'multer';
20import { v4 as uuid } from 'uuid';
21import db from '../config/database.js';
22import { renderPage } from '../middleware/render.js';
23import { requireGod, requireAuth, requireSiteManagerBySlug } from '../middleware/auth.js';
24import ThemeService from '../services/ThemeService.js';
25import { listPlatforms, PLATFORMS } from '../services/PlatformIcons.js';
26import { toWebp } from '../services/ImageWebpService.js';
27import { mediaDir } from '../config/paths.js';
28import AP from '../services/ActivityPubService.js';
29
30
31// Profile photos share the avatar directory with user avatars — same physical
32// folder, same URL prefix. Filenames are uuid-prefixed so site photos and
33// user avatars never collide.
34const PHOTO_DIR = mediaDir('AVATAR_PATH', 'avatars');
35fs.mkdirSync(PHOTO_DIR, { recursive: true });
36
37const ALLOWED_PHOTO_EXT = new Set(['.jpg', '.jpeg', '.png', '.webp', '.gif']);
38const MAX_PHOTO_BYTES = 5 * 1024 * 1024;
39const photoUpload = multer({
40 storage: multer.diskStorage({
41 destination: (req, file, cb) => cb(null, PHOTO_DIR),
42 filename: (req, file, cb) => {
43 const ext = path.extname(file.originalname || '').toLowerCase() || '.jpg';
44 cb(null, `site-${uuid()}${ext}`);
45 },
46 }),
47 limits: { fileSize: MAX_PHOTO_BYTES },
48 fileFilter: (req, file, cb) => {
49 const ext = path.extname(file.originalname || '').toLowerCase();
50 if (!ALLOWED_PHOTO_EXT.has(ext)) {
51 return cb(new Error('Alleen JPG/PNG/WebP/GIF toegestaan'));
52 }
53 cb(null, true);
54 },
55});
56
57/** Coerce req.body fields into the JSON profile_links array. */
58function buildProfileLinks(body) {
59 const platforms = body.profile_link_platform || [];
60 const urls = body.profile_link_url || [];
61 const arr = [];
62 const platformsArr = Array.isArray(platforms) ? platforms : [platforms];
63 const urlsArr = Array.isArray(urls) ? urls : [urls];
64 for (let i = 0; i < platformsArr.length; i++) {
65 const p = (platformsArr[i] || '').toString().trim();
66 const u = (urlsArr[i] || '').toString().trim();
67 if (!p || !u) continue;
68 if (!PLATFORMS[p]) continue;
69 if (!/^https?:\/\//i.test(u) && p !== 'email') continue;
70 if (p === 'email' && !/^mailto:|^[^\s@]+@[^\s@]+$/i.test(u)) continue;
71 arr.push({ platform: p, url: u });
72 }
73 return arr.length ? JSON.stringify(arr) : null;
74}
75
76/**
77 * FEP-7628 aliases (alsoKnownAs): one former identity per line, as an actor
78 * URL or an @user@host handle. Handles resolve via WebFinger AT SAVE TIME on
79 * purpose — a typo'd alias that silently lands on the actor would make a later
80 * Move fail at the old server with no hint why. Throws the offending line.
81 */
82export async function parseApAliases(raw, ownActorUri) {
83 const lines = String(raw || '').split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
84 if (lines.length > 5) throw new Error(lines[5] + ' (max 5)');
85 const out = [];
86 for (const line of lines) {
87 let uri = null;
88 if (/^https?:\/\//i.test(line)) uri = line;
89 else if (line.includes('@')) uri = await AP.webfingerResolve(line).catch(() => null);
90 if (!uri) throw new Error(line);
91 if (uri === ownActorUri) continue; // claiming yourself adds nothing
92 if (!out.includes(uri)) out.push(uri);
93 }
94 return out;
95}
96
97const router = express.Router();
98
99// ==================== UPLOAD PROFILE PHOTO (JSON) ====================
100// POST /admin/sites/upload-photo → { ok: true, url: '/media/avatars/<filename>' }
101// Used by the admin-site-edit form's photo picker. The form itself still
102// holds the URL string in `profile_photo` — this endpoint just stores the
103// file and hands back a URL that the form can paste into the input field.
104router.post('/upload-photo', requireAuth, (req, res) => {
105 photoUpload.single('photo')(req, res, (err) => {
106 if (err) return res.status(400).json({ ok: false, error: err.message });
107 if (!req.file) return res.status(400).json({ ok: false, error: 'Geen bestand ontvangen' });
108 res.json({
109 ok: true,
110 url: `/media/avatars/${toWebp(req.file)}`,
111 size: req.file.size,
112 mime: req.file.mimetype,
113 });
114 });
115});
116
117const RESERVED_SITE_SLUGS = new Set([
118 'auth', 'admin', 'login', 'register', 'logout', 'archive', 'search',
119 'account', 'sites', 'comments', 'posts', 'media', 'audio',
120 'forum', 'tag', 'user', 'users', 'artiesten', 'leden', 'feed.xml', 'atom.xml', 'sitemap.xml',
121 'manifest.webmanifest', 'sw.js', 'favicon.ico', 'favicon.svg', 'assets',
122 'paid', 'push', 'guardian',
123]);
124
125function siteEditableFields() {
126 return {
127 title: '',
128 description: '',
129 tagline: '',
130 language: 'nl',
131 palette: 'klonkt',
132 accent: '#e8b04b',
133 profile_photo: '',
134 profile_enabled: 1,
135 profile_name: '',
136 profile_bio: '',
137 is_public: 1,
138 robots_index: 1,
139 require_login_to_comment: 1,
140 enable_audio_player: 1,
141 comments_moderation_mode: 'moderate',
142 feed_view_default: 'grid',
143 feed_view_switch: 1,
144 show_search: 1,
145 show_archive_link: 1,
146 title_template: '{title} — {site}',
147 twitter: '',
148 canonical: '',
149 google_verification: '',
150 bing_verification: '',
151 pinterest_verification: '',
152 yandex_verification: '',
153 custom_css: '',
154 custom_head_html: '',
155 custom_foot_html: '',
156 };
157}
158
159/** Valid user-id for owner assignment, or null if empty/unknown. */
160function validOwnerId(raw) {
161 const id = (raw || '').toString().trim();
162 if (!id) return null;
163 return db.prepare('SELECT 1 FROM users WHERE id = ?').get(id) ? id : null;
164}
165
166/** Grant a user admin rights on a site (idempotent upsert). */
167function grantSiteAdmin(siteId, userId) {
168 db.prepare(`
169 INSERT INTO site_members (site_id, user_id, role) VALUES (?, ?, 'admin')
170 ON CONFLICT(site_id, user_id) DO UPDATE SET role = 'admin'
171 `).run(siteId, userId);
172}
173
174/** Candidate owners for the owner selector field (god-only). */
175function listOwnerCandidates() {
176 return db.prepare('SELECT id, username, role FROM users ORDER BY username').all();
177}
178
179// ==================== LIST ====================
180router.get('/', requireGod, (req, res) => {
181 const sites = db.prepare(`
182 SELECT s.id, s.slug, s.title, s.description, s.created_at,
183 s.is_public, s.robots_index, s.is_primary,
184 u.username AS owner_username,
185 (SELECT COUNT(*) FROM posts WHERE site_id = s.id) AS post_count
186 FROM sites s LEFT JOIN users u ON u.id = s.owner_id
187 ORDER BY s.is_primary DESC, s.created_at DESC
188 `).all();
189
190 renderPage(req, res, 'pages/admin-sites', {
191 pageTitleKey: 'admin.t_sites',
192 bodyClass: 'on-admin',
193 sites,
194 success: req.query.success || null,
195 error: req.query.error || null,
196 });
197});
198
199// ==================== NEW (form) ====================
200router.get('/new', requireGod, (req, res) => {
201 renderPage(req, res, 'pages/admin-site-edit', {
202 pageJs: 'admin-site-edit',
203 pageTitleKey: 'admin.t_newsite',
204 bodyClass: 'on-admin',
205 isNew: true,
206 // ?owner=<id> (from the users page: "give this user a Klonkt") is
207 // pre-selected; otherwise defaults to the creating god.
208 site: { slug: '', owner_id: validOwnerId(req.query.owner) || req.session.user.id, ...siteEditableFields() },
209 users: listOwnerCandidates(),
210 palettes: ThemeService.listPalettes(),
211 accents: ThemeService.listAccents(),
212 platforms: listPlatforms(),
213 parsedLinks: [],
214 apAliases: '',
215 error: null,
216 });
217});
218
219// ==================== CREATE ====================
220router.post('/create', requireGod, (req, res) => {
221 const slug = (req.body.slug || '').toString().toLowerCase().trim();
222 if (!/^[a-z0-9_-]{2,40}$/.test(slug)) {
223 return res.redirect('/admin/sites/new?error=' + encodeURIComponent('Slug: 2-40 chars, letters/numbers/underscore/dash'));
224 }
225 if (RESERVED_SITE_SLUGS.has(slug)) {
226 return res.redirect('/admin/sites/new?error=' + encodeURIComponent('That slug is reserved'));
227 }
228 const existing = db.prepare('SELECT id FROM sites WHERE slug = ?').get(slug);
229 if (existing) {
230 return res.redirect('/admin/sites/new?error=' + encodeURIComponent('Slug already taken'));
231 }
232
233 const f = { ...siteEditableFields(), ...req.body };
234
235 // Owner: god may assign the site to a DIFFERENT user — this is the core of
236 // hub mode (each user their own self-managed Klonkt). Empty or invalid → the
237 // creating god themselves.
238 const ownerId = validOwnerId(req.body.owner_id) || req.session.user.id;
239
240 const siteId = uuid();
241 db.prepare(`
242 INSERT INTO sites (
243 id, slug, title, description, tagline, owner_id,
244 language, palette, accent, profile_photo,
245 is_public, robots_index, require_login_to_comment, enable_audio_player,
246 feed_view_default
247 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
248 `).run(
249 siteId, slug,
250 (f.title || slug).slice(0, 200),
251 (f.description || '').slice(0, 500),
252 (f.tagline || '').slice(0, 200),
253 ownerId,
254 f.language || 'nl',
255 f.palette || 'klonkt',
256 ThemeService.validateAccent(f.accent) || '#e8b04b',
257 f.profile_photo || null,
258 f.is_public ? 1 : 0,
259 f.robots_index ? 1 : 0,
260 f.require_login_to_comment ? 1 : 0,
261 (f.enable_audio_player !== undefined ? (f.enable_audio_player ? 1 : 0) : 1),
262 f.feed_view_default === 'timeline' ? 'timeline' : 'grid',
263 );
264
265 // The OWNER (not necessarily the creator) gets a site_members admin row → this
266 // lets them pass canAdminSite + requireSiteManager gates to manage their site.
267 grantSiteAdmin(siteId, ownerId);
268
269 res.redirect(`/admin/sites/${slug}/edit?success=` + encodeURIComponent('Site aangemaakt'));
270});
271
272// ==================== EDIT (form) ====================
273router.get('/:slug/edit', requireSiteManagerBySlug, (req, res) => {
274 const site = db.prepare('SELECT * FROM sites WHERE slug = ?').get(req.params.slug);
275 if (!site) return res.redirect('/admin/sites?error=Not+found');
276
277 let parsedLinks = [];
278 if (site.profile_links) {
279 try { parsedLinks = JSON.parse(site.profile_links) || []; } catch {}
280 }
281
282 let apAliases = '';
283 try { apAliases = (JSON.parse(site.ap_aliases || '[]') || []).join('\n'); } catch { /* show empty on malformed */ }
284
285 renderPage(req, res, 'pages/admin-site-edit', {
286 pageJs: 'admin-site-edit',
287 pageTitleKey: 'admin.t_editsite', pageTitleVars: { title: site.title },
288 bodyClass: 'on-admin',
289 isNew: false,
290 site,
291 users: listOwnerCandidates(),
292 palettes: ThemeService.listPalettes(),
293 accents: ThemeService.listAccents(),
294 platforms: listPlatforms(),
295 parsedLinks,
296 apAliases,
297 success: req.query.success || null,
298 error: req.query.error || null,
299 });
300});
301
302// ==================== MOVE (FEP-7628, slice 2) ====================
303// The explicit departure: announce to every follower that this account now
304// lives elsewhere. Deliberately its own POST with its own button, never a
305// side effect of Save: a Move is a door you close behind you.
306router.post('/:slug/move', requireSiteManagerBySlug, async (req, res) => {
307 const site = db.prepare('SELECT * FROM sites WHERE slug = ?').get(req.params.slug);
308 if (!site) return res.redirect('/admin/sites?error=Not+found');
309 const r = await AP.moveAccount(site, req.body.move_target || '');
310 if (r && r.ok) {
311 return res.redirect(`/admin/sites/${req.params.slug}/edit?success=` + encodeURIComponent(`Verhuizing aangekondigd naar ${r.target} (${r.inboxes} inboxen).`));
312 }
313 const msg = {
314 guarded_account: 'Dit account heeft guardians; verhuizen kan pas als de guardianship mee kan (shaer-tge).',
315 no_backreference: 'Het nieuwe profiel claimt dit account niet in zijn aliassen. Zet daar eerst dit adres als alias.',
316 not_found: 'Nieuw adres niet gevonden. Gebruik @naam@server of een actor-URL.',
317 unreachable: 'Het nieuwe profiel is niet bereikbaar.',
318 self: 'Dat is dit account zelf.',
319 }[r && r.error] || 'Verhuizen mislukte; probeer het opnieuw.';
320 res.redirect(`/admin/sites/${req.params.slug}/edit?error=` + encodeURIComponent(msg));
321});
322
323// ==================== SAVE ====================
324router.post('/:slug/save', requireSiteManagerBySlug, async (req, res) => {
325 const site = db.prepare('SELECT id, ap_aliases FROM sites WHERE slug = ?').get(req.params.slug);
326 if (!site) return res.redirect('/admin/sites?error=Not+found');
327
328 const f = req.body;
329 const feedViewDef = f.feed_view_default === 'grid' ? 'grid' : 'timeline';
330 const profileLinksJson = buildProfileLinks(f);
331
332 // FEP-7628 aliases — validated/resolved before anything is written.
333 const base = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, '');
334 // Het INVOERVELD staat hier sinds 14-8 niet meer: aliassen horen bij
335 // Migreren. Dit formulier mag ze dus niet aanraken, en al helemaal niet
336 // leegmaken omdat het veld ontbreekt. Anders verlies je je claim op je oude
337 // account door je kleuren aan te passen, en weigert de Move daarna met
338 // no_backreference. Alleen verwerken als het veld ECHT is meegestuurd, zodat
339 // een oude gecachte pagina die hem nog wel heeft blijft werken.
340 let apAliasesJson = site.ap_aliases || null;
341 if (Object.prototype.hasOwnProperty.call(f, 'ap_aliases')) {
342 try {
343 const arr = await parseApAliases(f.ap_aliases, AP.actorId(base, req.params.slug));
344 apAliasesJson = arr.length ? JSON.stringify(arr) : null;
345 } catch (e) {
346 return res.redirect(`/admin/sites/${req.params.slug}/edit?error=` + encodeURIComponent(`Alias niet herkend of niet vindbaar: ${e.message}`));
347 }
348 }
349
350 // theme_override: only accept the three legal values. Empty string means
351 // "Auto" — defer to user's prefers-color-scheme on first paint.
352 const themeOverride = ['light', 'dark'].includes(f.theme_override) ? f.theme_override : '';
353
354 // accent: only accept colors from the curated ACCENTS list. Falls back to
355 // the orange default if the submitted value isn't recognised.
356 const accent = ThemeService.validateAccent(f.accent) || '#e8b04b';
357
358 db.prepare(`
359 UPDATE sites SET
360 title = ?, description = ?, tagline = ?, language = ?,
361 palette = ?, accent = ?, theme_override = ?, profile_photo = ?,
362 profile_enabled = ?,
363 profile_links = ?,
364 ap_aliases = ?,
365 is_public = ?, robots_index = ?, require_login_to_comment = ?,
366 enable_audio_player = ?,
367 feed_view_default = ?, feed_view_switch = ?,
368 show_search = ?, show_archive_link = ?,
369 custom_css = ?, custom_head_html = ?, custom_foot_html = ?,
370 updated_at = CURRENT_TIMESTAMP
371 WHERE id = ?
372 `).run(
373 (f.title || '').slice(0, 200),
374 (f.description || '').slice(0, 500),
375 (f.tagline || '').slice(0, 200),
376 f.language || 'nl',
377 f.palette || 'klonkt',
378 accent,
379 themeOverride,
380 f.profile_photo || null,
381 f.profile_enabled ? 1 : 0,
382 profileLinksJson,
383 apAliasesJson,
384 f.is_public ? 1 : 0,
385 f.robots_index ? 1 : 0,
386 f.require_login_to_comment ? 1 : 0,
387 f.enable_audio_player ? 1 : 0,
388 feedViewDef,
389 f.feed_view_switch ? 1 : 0,
390 f.show_search ? 1 : 0,
391 f.show_archive_link ? 1 : 0,
392 f.custom_css || null,
393 f.custom_head_html || null,
394 f.custom_foot_html || null,
395 site.id,
396 );
397
398 // (Re)assign owner — god ONLY. A site-owner editing their own site cannot
399 // change the owner (the field is not shown to non-god users either).
400 if (req.session.user.role === 'god') {
401 const newOwner = validOwnerId(req.body.owner_id);
402 if (newOwner) {
403 db.prepare('UPDATE sites SET owner_id = ? WHERE id = ?').run(newOwner, site.id);
404 grantSiteAdmin(site.id, newOwner);
405 }
406 }
407
408 // Alias change → broadcast an actor Update so remote caches refresh. The old
409 // server re-fetches the actor live during a Move anyway; this is freshness,
410 // not correctness, hence best-effort.
411 if ((site.ap_aliases || null) !== apAliasesJson) {
412 try {
413 const fresh = db.prepare('SELECT * FROM sites WHERE id = ?').get(site.id);
414 AP.deliverActorUpdate(fresh).catch(() => {});
415 } catch { /* never blocks the save */ }
416 }
417
418 res.redirect(`/admin/sites/${req.params.slug}/edit?success=` + encodeURIComponent('Opgeslagen'));
419});
420
421// ==================== MAKE PRIMARY ====================
422// God chooses which site is the primary/main site (the label/company site in hub;
423// in solo mode: the one site). Exactly one site is primary → clear all, then set this one.
424router.post('/:slug/make-primary', requireGod, (req, res) => {
425 const site = db.prepare('SELECT id FROM sites WHERE slug = ?').get(req.params.slug);
426 if (!site) return res.redirect('/admin/sites?error=Niet+gevonden');
427 db.transaction(() => {
428 db.prepare('UPDATE sites SET is_primary = 0').run();
429 db.prepare('UPDATE sites SET is_primary = 1 WHERE id = ?').run(site.id);
430 })();
431 res.redirect('/admin/sites?success=' + encodeURIComponent('Primaire site bijgewerkt'));
432});
433
434// ==================== DELETE ====================
435router.post('/:slug/delete', requireGod, (req, res) => {
436 const site = db.prepare('SELECT id FROM sites WHERE slug = ?').get(req.params.slug);
437 if (!site) return res.redirect('/admin/sites?error=Not+found');
438
439 const postCount = db.prepare('SELECT COUNT(*) AS c FROM posts WHERE site_id = ?').get(site.id).c;
440 if (postCount > 0) {
441 return res.redirect('/admin/sites?error=' + encodeURIComponent(`Cannot delete: site has ${postCount} post(s). Delete posts first.`));
442 }
443
444 // Clean up site_members and audio_tracks (no posts to worry about).
445 db.prepare('DELETE FROM site_members WHERE site_id = ?').run(site.id);
446 db.prepare('DELETE FROM audio_tracks WHERE site_id = ?').run(site.id);
447 db.prepare('DELETE FROM sites WHERE id = ?').run(site.id);
448
449 res.redirect('/admin/sites?success=' + encodeURIComponent('Site deleted'));
450});
451
452export default router;
Note: See TracBrowser for help on using the repository browser.