[pending-judge] fix(DC-161 r2): address judge r1 blockers

All five r1 blocking issues fixed + polish items applied:

- Unified credential-key convention: registerAutoWiredSource now stores at
  calendar:source:<source.id> — the same key the events fetcher resolves —
  so auto-wired sources authenticate on first fetch (was calendar:radicale:
  <subdomain>, fetched key never written = empty-password CalDAV auth).
- calendarStateManager is now passed INTO assembleContext(...) (the r1 patch
  only extended the function signature, so ctx.calendarStateManager was
  undefined and the deploy hook silently skipped auto-wiring).
- Radicale config is provisioned BEFORE container start (Radicale reads its
  config at startup): the deploy hook writes config+htpasswd ahead of
  deployContainer() and passes the pre-start credentials to the post-deploy
  registration step; useExisting path logs an explicit restart warning.
- PUT /sources/:id now validates URL updates through the same shared
  validateSourceUrl() used by POST (protocol + remote-plaintext rules).
- New end-to-end contract test (calendar-autowire.e2e.test.js): spins a real
  HTTP CalDAV server, registers an auto-wired source, then fetches events
  through the API — the server verifies Basic auth against the provisioned
  password, so a credential-key or wiring regression fails the suite.

Polish: provisioning is idempotent (deterministic source id, update instead
of duplicate), unbiased rejection-sampling for password/salt generation,
writeRadicaleConfig docstring no longer claims idempotence.

Calendar suites: 35 passed (32 prior + 3 new). Lint: 0 errors; complexity
warnings in deploy.js pre-exist at base (61 vs 68 now — the hook did not
worsen the trend line materially; calendar files themselves lint clean).
This commit is contained in:
Hermes committed 2026-10-07 20:14:17 -07:00
1 parent 74e21c1edc
commit 0b3a03a4c2
7 files changed
+317 -30

No files matched your search

+19 -8
View File
@@ -43,6 +43,22 @@ module.exports = function createCalendarRoutes({
}) {
const router = express.Router();
// DC-161 (judge r1 blocker fix): ONE shared URL security validation used by
// BOTH add and update — an update must not bypass protocol/localhost rules.
function validateSourceUrl(urlStr) {
let parsed;
try { parsed = new URL(urlStr); } catch (_) {
throw new ValidationError('[DC-405] url must be an absolute URL');
}
if (!['https:', 'http:'].includes(parsed.protocol)) {
throw new ValidationError('[DC-405] url must be http(s)');
}
if (parsed.protocol === 'http:' && !['127.0.0.1', 'localhost', '::1'].includes(parsed.hostname)) {
throw new ValidationError('[DC-401] plaintext HTTP is only allowed for localhost sources');
}
return parsed;
}
function findSource(id) {
return calendarStateManager.findItem(id);
}
@@ -59,12 +75,7 @@ module.exports = function createCalendarRoutes({
const { name, type, url, user, pass, token, enabled } = req.body || {};
if (!name || !type || !url) throw new ValidationError('[DC-405] name, type and url are required');
if (!['caldav', 'ics'].includes(type)) throw new ValidationError('[DC-405] type must be "caldav" or "ics"');
let parsed;
try { parsed = new URL(url); } catch (_) { throw new ValidationError('[DC-405] url must be an absolute URL'); }
if (!['https:', 'http:'].includes(parsed.protocol)) throw new ValidationError('[DC-405] url must be http(s)');
if (parsed.protocol === 'http:' && !['127.0.0.1', 'localhost', '::1'].includes(parsed.hostname)) {
throw new ValidationError('[DC-401] plaintext HTTP is only allowed for localhost sources');
}
const parsed = validateSourceUrl(url);
if (type === 'caldav' && !user && !token) throw new ValidationError('[DC-405] CalDAV sources need user+pass or a token');
const source = {
@@ -93,8 +104,8 @@ module.exports = function createCalendarRoutes({
for (const field of ['name', 'url', 'enabled']) {
if (req.body[field] !== undefined) updates[field] = req.body[field];
}
if (updates.url) {
try { new URL(updates.url); } catch (_) { throw new ValidationError('[DC-405] url must be an absolute URL'); }
if (updates.url !== undefined) {
updates.url = validateSourceUrl(updates.url).toString();
}
if (req.body.pass !== undefined || req.body.token !== undefined) {
await credentialManager.store(`calendar:source:${existing.id}`,