sami7777/dashcaddy
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source 
All three r2 blocking issues fixed + polish applied:

- useExisting (adopted) Radicale containers no longer get a source registered
  with credentials the operator never provisioned. Registration happens ONLY
  when pre-start provisioning succeeded; adopted deployments get a
  calendarHint in the deploy response pointing at the manual-wiring modal.
- Weekly BYDAY expansion: candidates earlier than DTSTART are skipped (they
  do not consume COUNT); window inclusion now uses interval-overlap
  semantics (occurrence span vs window span) for both recurring and
  non-recurring events. Three new tests cover midweek DTSTART, a straddling
  multi-day event, and a boundary-exactly-ending event.
- Verifier is now read-only on the graded tree: no stash/checkout/rewrite.
  Base proof runs in a temporary git worktree of 448f535 under /tmp (removed
  on exit); the flaky pdf-parse suite is proven pre-existing via "red at
  base" + "patch touches no billing file" (empty diff), and a race-flaky
  suite (DC-116, witnessed once under parallel load) is given one isolated
  rerun which must pass.

Polish: PUT /sources normalizes the user field (and clamps name) like POST.

Calendar suites: 38 passed (35 + 3 new recurrence tests). The 3558/3564
full-suite numbers vary by one flaky pdf-parse member between runs; the
evidence now asserts the invariant (suite red at base, no billing file in
the patch, flaky suites green on isolated rerun) instead of an exact count.
This commit is contained in:
Hermes committed 2026-10-07 20:44:07 -07:00
1 parent 0b3a03a4c2
commit eb8de990df
4 files changed
+82 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dashcaddy-api/routes/apps/deploy.js
+31 -24
View File
@@ -290,6 +290,10 @@ module.exports = function({ docker, caddy, credentialManager, servicesStateManag
// Radicale reads its config at container start, so the htpasswd config
// MUST be written BEFORE the container starts (blocker fix, judge r1):
// this block runs ahead of deployContainer() for the radicale template.
// Adopted (useExisting) containers are NOT auto-provisioned — their
// config lives wherever the operator put it, so registering credentials
// they don't know would create a knowingly invalid source (judge r2
// blocker). The deploy response tells the operator how to wire it.
if (appId === 'radicale' && !config.useExisting) {
try {
const { generatePassword, writeRadicaleConfig } = require('../../src/calendar/radicale-provisioner');
@@ -428,31 +432,29 @@ module.exports = function({ docker, caddy, credentialManager, servicesStateManag
log.info('deploy', 'Service added to dashboard', { subdomain: config.subdomain });
// DC-161: register the auto-wired calendar source AFTER service config
// exists (URL known) using the credentials generated pre-start above.
if (appId === 'radicale' && ctx.calendarStateManager) {
try {
const { registerAutoWiredSource } = require('../../src/calendar/radicale-provisioner');
if (!config._calendarCreds) {
// useExisting path or pre-start step skipped: generate now (config
// file on disk is unchanged; container already running Radicale's
// default no-auth config gets its users file rewritten + restart
// is left to the operator, logged as a warning).
const { generatePassword } = require('../../src/calendar/radicale-provisioner');
config._calendarCreds = { user: 'dashcaddy', pass: generatePassword() };
log.warn('deploy', 'Radicale creds generated post-start (useExisting path); restart the container to pick up the htpasswd file', { subdomain: config.subdomain });
// exists (URL known), using the credentials generated pre-start above.
// useExisting (adopted) Radicale containers skip registration entirely —
// no source is created for credentials the operator never provisioned;
// the deploy response points them at the manual-wiring modal instead.
if (appId === 'radicale') {
if (config._calendarCreds && ctx.calendarStateManager) {
try {
const { registerAutoWiredSource } = require('../../src/calendar/radicale-provisioner');
await registerAutoWiredSource({
calendarStateManager: ctx.calendarStateManager,
credentialManager,
subdomain: config.subdomain,
serviceUrl,
creds: config._calendarCreds,
templateId: 'radicale',
});
log.info('deploy', 'Calendar widget auto-wired to Radicale', { subdomain: config.subdomain });
} catch (calError) {
// Non-fatal: the app is deployed; wiring can be redone via POST /api/v1/calendar/radicale/provision
log.warn('deploy', 'Calendar auto-wiring failed (non-fatal)', { error: calError.message });
}
await registerAutoWiredSource({
calendarStateManager: ctx.calendarStateManager,
credentialManager,
subdomain: config.subdomain,
serviceUrl,
creds: config._calendarCreds,
templateId: 'radicale',
});
log.info('deploy', 'Calendar widget auto-wired to Radicale', { subdomain: config.subdomain });
} catch (calError) {
// Non-fatal: the app is deployed; wiring can be redone via POST /api/v1/calendar/radicale/provision
log.warn('deploy', 'Calendar auto-wiring failed (non-fatal)', { error: calError.message });
} else if (usedExisting) {
log.info('deploy', 'Adopted Radicale container: use the calendar widget settings to wire credentials manually', { subdomain: config.subdomain });
}
}
@@ -463,6 +465,11 @@ module.exports = function({ docker, caddy, credentialManager, servicesStateManag
setupInstructions: template.setupInstructions || []
};
if (dnsWarning) response.warning = dnsWarning;
// DC-161: adopted Radicale gets manual wiring instructions instead of
// an auto-created source (see comment at the registration block above).
if (appId === 'radicale' && usedExisting) {
response.calendarHint = 'Adopted container: open the calendar widget settings on the dashboard and add this CalDAV URL with your existing credentials.';
}
const notificationMessage = usedExisting
? `**${template.name}** configured using existing container.\nURL: ${serviceUrl}`