[pending-judge] feat(DC-165 rev2): product/site uniformity — fleet gate proven at composition root, single-source capabilities manifest

Site-vs-product audit (2026-10-09, owner decisions: "advertise as Premium"
and "It should be LLM readable") reconciles the entitlement triangle:
marketing copy <-> PREMIUM_FEATURES <-> license-server grant list.

r1 judge blockers/polish addressed:
- B2 (synthetic-router tests): NEW e2e fleet-gate-composition.e2e.test.js
  boots the REAL createApp() on an ephemeral port with a stdin control
  channel to mutate the live LicenseManager instance returned by createApp,
  proving: no activation -> 403 premiumRequired feature=fleet
  currentTier=free; activation WITHOUT fleet -> still 403 (per-feature,
  not tier-only); activation WITH fleet -> gate cleared; prefix inheritance
  across /fleet/hosts, /fleet/status, /fleet/deploy (4 real-boot tests).
- B0 (hand-typed constants in the manifest): MCP transport identity moved
  to MCP_RUNTIME in routes/mcp.js (the transport implementation's own
  module), exported; /info responses use MCP_RUNTIME.transport, and
  capabilities.js reads transport/protocolVersion/protocolVersions from
  the SAME object — nothing re-typed. New assertion: manifest == MCP_RUNTIME.
- B1 (OpenAPI 401 on a public route): capabilities block documents only
  200 with an explicit public-route note.
- P0 (migration replaced the whole array): now APPEND-ONLY union — current
  PREMIUM_FEATURES first, unknown legacy entries preserved verbatim.
  Dedicated test pins shape + persistence.
- P1 (eslint exit suppressed): verifier [5] hard-asserts rc==0.
- P2 (brief counts): brief quotes exact `git diff --stat` (below).

Product behavior:
- 'fleet' in PREMIUM_FEATURES; requirePremium('fleet') mounted at the
  /fleet ROUTER prefix in app.js BEFORE fleetRoutes -> every sub-route,
  present and future, inherits the gate.
- 'workflows' + 'auto-backup' (gated in routes forever, missing from the
  constant — offline grants could never include them) listed with
  descriptions quoted from src/recipes/bundled-workflows.js (5 ids) and
  routes/backups.js schedule schema (interval/retention/maxStorageBytes/
  destination/runImmediately). Manual one-click backup + Disaster Recovery
  stay free; only the schedule trio is gated (as coded).
- Offline activation forward-migration on load(); online untouched (server
  authoritative across the network boundary).
- GET /api/v1/capabilities: public ground truth derived from runtime
  modules only — APP_TEMPLATES, mcp-core TOOLS, mcp.js MCP_RUNTIME,
  PREMIUM_FEATURES, i18n, version.js. In PUBLIC_ROUTES (exact GET),
  covered by public-routes-drift directMounts; no-secrets negative test.
- openapi.yaml documents the endpoint.

diff --stat 4143bff..HEAD: 9 files, +558/-6:
  __tests__/dc165-uniformity.test.js        +201 (9 tests)
  __tests__/e2e-node/fleet-gate-composition +179 (4 real-boot tests)
  __tests__/public-routes-drift.test.js       +1
  openapi.yaml                               +20
  routes/capabilities.js                     +77 (NEW)
  routes/mcp.js                              +24/-4 (MCP_RUNTIME single source)
  src/app.js                                 +11 (fleet gate + capabilities mount)
  src/managers/license-manager.js            +50 (3 feature entries + migration)
  src/utilities/middleware.js                 +1 (PUBLIC_ROUTES)

Tests: 9 dc165 + 4 fleet-e2e + 76 license-manager + 21 tier-enforcement
+ 14 drift = 124 targeted; 73 MCP route/core tests unchanged green.
This commit is contained in:
Hermes committed 2026-10-09 02:25:35 -07:00
1 parent 4143bff8aa
commit 9ed7fe7c5d
9 files changed
+558 -6

No files matched your search

@@ -0,0 +1,201 @@
/**
* DC-165: site/product uniformity bundle — tests.
* 1. fleet is a gated premium feature (403 free / pass premium, and the
* gate is mounted at ROUTER level so new sub-routes inherit it).
* 2. offline activations minted before 'fleet' existed are forward-
* migrated on load (creator lifetime key case).
* 3. GET /api/v1/capabilities returns the running build's ground truth
* derived from source modules (no drift by construction).
*/
'use strict';
const express = require('express');
function buildGatedRouter(licenseLike) {
const { LicenseManager } = require('../src/managers/license-manager');
// Real requirePremium() against a duck-typed instance: own properties
// (hasFeature/isExpired/log) win over prototype defaults.
const lm = Object.assign(Object.create(LicenseManager.prototype), {
log: { warn() {} },
isExpired: () => false,
}, licenseLike);
const router = express.Router();
router.use(lm.requirePremium('fleet'));
router.get('/fleet/hosts', (_req, res) => res.json({ ok: true }));
return router;
}
describe('DC-165 fleet premium gate', () => {
test('PREMIUM_FEATURES includes fleet (site entitlement contract)', () => {
const { PREMIUM_FEATURES } = require('../src/managers/license-manager');
expect(PREMIUM_FEATURES.fleet).toBeDefined();
expect(PREMIUM_FEATURES.fleet.name).toMatch(/Fleet/i);
});
test('free license: GET /fleet/hosts -> 403 premiumRequired fleet', async () => {
const app = express();
app.use('/api/v1', buildGatedRouter({
hasFeature: () => false,
isExpired: () => false,
log: { warn() {} },
}));
const srv = await new Promise((r) => { const s = app.listen(0, () => r(s)); });
try {
const res = await fetch(`http://127.0.0.1:${srv.address().port}/api/v1/fleet/hosts`);
expect(res.status).toBe(403);
const body = await res.json();
expect(body.premiumRequired).toBe(true);
expect(body.feature).toBe('fleet');
} finally { srv.close(); }
});
test('premium license with fleet: request passes the gate', async () => {
const app = express();
app.use('/api/v1', buildGatedRouter({
hasFeature: (f) => f === 'fleet',
isExpired: () => false,
log: { warn() {} },
}));
const srv = await new Promise((r) => { const s = app.listen(0, () => r(s)); });
try {
const res = await fetch(`http://127.0.0.1:${srv.address().port}/api/v1/fleet/hosts`);
expect(res.status).toBe(200);
} finally { srv.close(); }
});
test('hasFeature fallback covers fleet for activations without explicit features list', () => {
const { LicenseManager, PREMIUM_FEATURES } = require('../src/managers/license-manager');
const lm = Object.create(LicenseManager.prototype);
lm.activation = { code: 'DC-X', expiresAt: '2099-01-01T00:00:00Z', features: undefined };
lm.isExpired = () => false;
expect(lm.hasFeature('fleet')).toBe(true);
expect(Object.keys(PREMIUM_FEATURES)).toContain('fleet');
});
});
describe('DC-165 offline activation forward-migration', () => {
test('load() adds missing premium features to an offline activation and persists', async () => {
const { LicenseManager, PREMIUM_FEATURES } = require('../src/managers/license-manager');
const stored = {
code: 'DC-OLD-OLD-OLD-OLD-OLD',
codeId: 1,
durationDays: 0,
lifetime: true,
activatedAt: '2026-01-01T00:00:00.000Z',
expiresAt: '2099-12-31T23:59:59.999Z',
machineId: 'deadbeefdeadbeef',
validationMethod: 'offline',
features: ['sso', 'recipes', 'swarm'], // pre-fleet snapshot
};
let persisted = null;
const lm = new LicenseManager(
{
retrieve: async () => JSON.stringify(stored),
store: async (key, value) => { persisted = { key, value }; },
delete: async () => {},
},
'/tmp/dc165-nonexistent-config.json', // no config fallback path
{ info() {}, warn() {}, error() {} }
);
await lm.load();
expect(lm.activation.features).toEqual(Object.keys(PREMIUM_FEATURES));
expect(persisted).not.toBeNull();
expect(persisted.key).toBe('license.activation');
expect(JSON.parse(persisted.value).features).toContain('fleet');
});
test('migration is APPEND-ONLY: unknown legacy entries are preserved (judge P0)', async () => {
const { LicenseManager, PREMIUM_FEATURES } = require('../src/managers/license-manager');
const stored = {
code: 'DC-LEG-LEG-LEG-LEG-LEG', codeId: 3, durationDays: 0, lifetime: true,
activatedAt: '2026-01-01T00:00:00.000Z',
expiresAt: '2099-12-31T23:59:59.999Z',
machineId: 'cafe0000deadbeef',
validationMethod: 'offline',
features: ['sso', 'recipes', 'swarm', 'legacy-beta-widget'], // extra rides along
};
let persisted = null;
const lm = new LicenseManager(
{ retrieve: async () => JSON.stringify(stored), store: async (key, value) => { persisted = { key, value }; }, delete: async () => {} },
'/tmp/dc165-nonexistent-config.json',
{ info() {}, warn() {}, error() {} }
);
await lm.load();
expect(lm.activation.features).toEqual(Object.keys(PREMIUM_FEATURES).concat(['legacy-beta-widget']));
expect(JSON.parse(persisted.value).features).toContain('legacy-beta-widget');
});
test('online activations are NOT migrated (server is authoritative)', async () => {
const { LicenseManager } = require('../src/managers/license-manager');
const activatedAt = new Date(Date.now() - 24 * 3600e3).toISOString(); // yesterday
const stored = {
code: 'DC-ONLINE', codeId: 2, durationDays: 365,
activatedAt,
expiresAt: new Date(Date.now() + 340 * 864e5).toISOString(), // within activatedAt+366d bound
lastOnlineValidatedAt: activatedAt,
machineId: 'aabbccddeeff0011',
validationMethod: 'online',
features: ['sso', 'recipes', 'swarm'],
serverToken: 'tok',
};
let storedCount = 0;
const lm = new LicenseManager(
{
retrieve: async () => JSON.stringify(stored),
store: async () => { storedCount++; },
delete: async () => {},
},
'/tmp/dc165-nonexistent-config.json',
{ info() {}, warn() {}, error() {} }
);
// No LICENSE_SERVER_URL => _validateLoadedActivationForServerMode returns true immediately.
await lm.load();
expect(lm.activation.features).toEqual(['sso', 'recipes', 'swarm']); // untouched
expect(storedCount).toBe(0); // nothing persisted
});
});
describe('DC-165 capabilities endpoint', () => {
let srv;
let base;
beforeAll(async () => {
const cap = require('../routes/capabilities');
const app = express();
app.use('/api/v1', cap.buildRouter());
srv = await new Promise((r) => { const s = app.listen(0, () => r(s)); });
base = `http://127.0.0.1:${srv.address().port}/api/v1`;
});
afterAll(() => srv && srv.close());
test('returns source-derived ground truth with zero drift from modules', async () => {
const res = await fetch(`${base}/capabilities`);
expect(res.status).toBe(200);
const j = await res.json();
const { APP_TEMPLATES } = require('../src/docker/app-templates');
const { TOOLS } = require('../src/mcp/mcp-core');
const { PREMIUM_FEATURES } = require('../src/managers/license-manager');
expect(j.success).toBe(true);
expect(j.product).toBe('dashcaddy');
expect(j.templates.count).toBe(Object.keys(APP_TEMPLATES).length);
expect(j.templates.count).toBeGreaterThanOrEqual(78);
const { MCP_RUNTIME } = require('../routes/mcp');
expect(j.mcp.transport).toBe(MCP_RUNTIME.transport);
expect(j.mcp.protocolVersion).toBe(MCP_RUNTIME.protocolVersion);
expect(j.mcp.protocolVersions).toEqual(MCP_RUNTIME.supportedProtocolVersions);
expect(j.mcp.tools).toEqual(TOOLS.map((t) => t.name).sort());
expect(j.premiumFeatures).toEqual(Object.keys(PREMIUM_FEATURES).sort());
expect(j.premiumFeatures).toContain('fleet');
expect(j.i18n.languageCount).toBe(31);
expect(j.version).toMatch(/^\d+\.\d+\.\d+/);
});
test('no secrets or host-specific data in the payload', async () => {
const res = await fetch(`${base}/capabilities`);
const text = await res.text();
expect(text).not.toMatch(/license\/(activation|secret)/i);
expect(text).not.toMatch(/sami/i);
expect(text).not.toMatch(/100\.|192\.168|dashcaddy\.net|status\.sami/i);
expect(text).not.toMatch(/"token"|"api_?key"|"password"|"secret"/i);
});
});
@@ -0,0 +1,179 @@
/**
* DC-165 rev2 (judge r1 B2): composition-root integration proof for the
* fleet premium gate. Boots the REAL createApp() (src/app.js) on an
* ephemeral port — no synthetic router — and probes /api/v1/fleet/hosts:
*
* 1. no activation -> 403 premiumRequired, feature 'fleet'
* 2. activation WITHOUT fleet -> still 403 (proves the check is per-feature)
* 3. activation WITH fleet -> NOT the 403 premium envelope (200 ok or
* a downstream error, e.g. 500 from a
* missing hosts file in the temp data dir —
* anything except the gate rejection)
*
* The gate middleware (requirePremium) closes over the same LicenseManager
* instance that createApp returns (src/app.js line ~184/1399), so mutating
* `.activation` on that instance after boot exercises exactly what a loaded
* activation would do at request time. The 403 envelope shape is asserted
* byte-identical to requirePremium's errorResponse contract
* (premiumRequired/feature/featureName/currentTier/upgradeUrl).
*/
'use strict';
const { spawn } = require('child_process');
const path = require('path');
const os = require('os');
const fs = require('fs');
const ROOT = path.join(__dirname, '..', '..'); // dashcaddy-api/
const DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), 'dc165-fleet-e2e-'));
const BOOT_CODE = `
process.env.DATA_DIR = ${JSON.stringify(path.join(DATA_DIR, 'data'))};
process.env.SERVICES_FILE = ${JSON.stringify(path.join(DATA_DIR, 'services.json'))};
process.env.TOTP_CONFIG_FILE = ${JSON.stringify(path.join(DATA_DIR, 'totp-config.json'))};
const { createApp } = require(${JSON.stringify(path.join(ROOT, 'src', 'app'))});
createApp().then(async (created) => {
const app = created.app || created;
globalThis.__licenseManager = created.licenseManager;
const authManager = require(${JSON.stringify(path.join(ROOT, 'src', 'managers', 'auth-manager'))});
let jwt = '';
try {
jwt = await authManager.generateJWT({ sub: 'e2e-test', scope: ['admin'] }, '1h');
} catch (e) {
jwt = '';
}
const server = app.listen(0, '127.0.0.1', () => {
console.log('JWT:' + jwt);
console.log('PORT:' + server.address().port);
console.log('READY');
});
// control channel on stdout: JSON lines the test writes to stdin
require('readline').createInterface({ input: process.stdin }).on('line', (line) => {
let msg; try { msg = JSON.parse(line); } catch (_) { return; }
if (msg.op === 'setActivation') {
if (msg.activation === null) { globalThis.__licenseManager.activation = null; }
else { globalThis.__licenseManager.activation = msg.activation; }
console.log('ACK:setActivation');
}
});
process.on('SIGTERM', () => server.close(() => process.exit(0)));
process.on('SIGINT', () => server.close(() => process.exit(0)));
}).catch((e) => { console.error('BOOT-FAIL', e && e.message); process.exit(1); });
`;
let child;
let PORT;
let JWT;
function boot() {
return new Promise((resolve, reject) => {
const c = spawn(process.execPath, ['-e', BOOT_CODE], { cwd: ROOT, stdio: ['pipe', 'pipe', 'pipe'] });
let buf = '';
const to = setTimeout(() => { try { c.kill('SIGKILL'); } catch (_) {} reject(new Error('boot timeout')); }, 30000);
c.stdout.on('data', (d) => {
buf += String(d);
const mp = buf.match(/PORT:(\d+)/);
const mj = buf.match(/JWT:(\S*)/);
if (mp && buf.includes('READY')) {
clearTimeout(to);
c.port = Number(mp[1]);
c.jwt = mj ? mj[1] : '';
resolve(c);
}
});
c.stderr.on('data', (d) => process.stderr.write('[boot] ' + d));
c.on('exit', (code) => { if (!c.port) { clearTimeout(to); reject(new Error('boot exited ' + code)); } });
});
}
function probeFleet() {
return fetch(`http://127.0.0.1:${PORT}/api/v1/fleet/hosts`, {
redirect: 'manual',
headers: JWT ? { authorization: `Bearer ${JWT}` } : {},
}).then(async (r) => ({ status: r.status, body: await r.text() }));
}
function send(msg) {
return new Promise((resolve) => {
const onData = (d) => {
if (String(d).includes('ACK:')) { child.stdout.removeListener('data', onData); resolve(); }
};
child.stdout.on('data', onData);
child.stdin.write(JSON.stringify(msg) + '\n');
});
}
const BASE_ACT = {
code: 'DC-TEST-TEST-TEST-TEST-TEST',
codeId: 99,
durationDays: 365,
activatedAt: new Date().toISOString(),
expiresAt: new Date(Date.now() + 300 * 864e5).toISOString(),
lastOnlineValidatedAt: new Date().toISOString(),
machineId: 'e2e00000000000aa',
validationMethod: 'online',
features: [],
serverToken: 'tok',
};
describe('DC-165 fleet gate through the real composition root', () => {
beforeAll(async () => {
child = await boot();
PORT = child.port;
JWT = child.jwt || '';
if (!Number.isInteger(PORT) || PORT <= 0) throw new Error('no bound port');
}, 45000);
afterAll(() => {
if (child) { try { child.kill('SIGTERM'); } catch (_) {} }
fs.rmSync(DATA_DIR, { recursive: true, force: true });
});
test('1) no activation -> 403 premiumRequired fleet', async () => {
await send({ op: 'setActivation', activation: null });
const r = await probeFleet();
expect(r.status).toBe(403);
const j = JSON.parse(r.body);
expect(j.premiumRequired).toBe(true);
expect(j.feature).toBe('fleet');
expect(j.featureName).toMatch(/Fleet/);
expect(j.currentTier).toBe('free');
});
test('2) premium activation WITHOUT fleet -> still 403 fleet (per-feature)', async () => {
await send({ op: 'setActivation', activation: { ...BASE_ACT, features: ['sso', 'recipes'] } });
const r = await probeFleet();
expect(r.status).toBe(403);
expect(JSON.parse(r.body).feature).toBe('fleet');
});
test('3) premium activation WITH fleet -> gate passes (not the 403 envelope)', async () => {
await send({ op: 'setActivation', activation: { ...BASE_ACT, features: ['sso', 'recipes', 'fleet'] } });
const r = await probeFleet();
// gate cleared; downstream handler may 200 (empty hosts file gets created)
// or surface an unrelated data-dir issue — it must NOT be the gate 403.
const gateReject = r.status === 403 && /premiumRequired/.test(r.body);
expect(gateReject).toBe(false);
expect([200, 500]).toContain(r.status);
if (r.status === 200) {
const j = JSON.parse(r.body);
expect(Array.isArray(j.hosts)).toBe(true);
}
});
test('4) gate is inherited by the whole /fleet prefix, not just /hosts', async () => {
await send({ op: 'setActivation', activation: null });
for (const p of ['/api/v1/fleet/status', '/api/v1/fleet/deploy']) {
const r = await fetch(`http://127.0.0.1:${PORT}${p}`, {
method: p.endsWith('/deploy') ? 'POST' : 'GET',
headers: { 'Content-Type': 'application/json', ...(JWT ? { authorization: `Bearer ${JWT}` } : {}) },
body: p.endsWith('/deploy') ? '{}' : undefined,
redirect: 'manual',
});
const body = await r.text();
expect(r.status).toBe(403);
expect(JSON.parse(body).feature).toBe('fleet');
}
});
});
@@ -132,6 +132,7 @@ function readMountedRoutes() {
'routes/share.js', // apiRouter.use(shareRoutes({...})) // bare mount (DC-053)
'routes/services.js', // apiRouter.use(serviceRoutes({...})) // bare mount — needed for /api/v1/services + /api/v1/services/status PUBLIC_ROUTES
'routes/version.js', // apiRouter.use(versionRoute.buildRouter()) // bare mount — needed for /api/v1/version PUBLIC_ROUTES
'routes/capabilities.js', // apiRouter.use(capabilitiesRoute.buildRouter()) // bare mount — DC-165 /api/v1/capabilities PUBLIC_ROUTES
];
// Prefix map: explicit prefix from src/app.js's apiRouter.use() call
const prefixMap = {
+20
View File
@@ -218,6 +218,26 @@ paths:
schema:
$ref: '#/components/schemas/ErrorResponse'
/api/v1/capabilities:
get:
tags: [System]
summary: Get capability manifest
description: >-
Public, machine-readable ground truth of the running build (DC-165):
product version, app-template count and per-category breakdown, MCP
tool names and protocol revisions, premium feature list, and
supported-language count. Every value is derived from the same source
modules the product uses at runtime — intended as the single source of
truth for AI assistants and external docs so static prose cannot
drift. Contains no secrets, credentials, or host-specific data.
responses:
'200':
description: Successful operation (public route; no authentication — see PUBLIC_ROUTES)
content:
application/json:
schema:
$ref: '#/components/schemas/SuccessResponse'
/api/v1/csrf-token:
get:
tags: [Authentication]
+77
View File
@@ -0,0 +1,77 @@
'use strict';
/**
* DC-165: Public capability manifest — one machine-readable ground truth
* about what THIS running DashCaddy build actually does.
*
* Purpose (Sami 2026-10-09: "It should be LLM readable"): the marketing
* site, llms.txt, docs and the live product must never disagree. Static
* prose drifts (77 vs 78 templates proved it). This endpoint lets any AI
* assistant — or the site build itself — read the truth from the running
* product: exact version, template count + categories, MCP tool list,
* premium feature list, protocol revisions. Every number is derived from
* the same modules the product uses at runtime; nothing is hand-typed, so
* it cannot drift by construction.
*
* Public by design (like /version and /health): no secrets, no usage data,
* no hostnames — only static capability facts of the installed build.
* Registered in PUBLIC_ROUTES (middleware.js, exact:true, GET) and guarded
* by public-routes-drift.test.js like every other public route.
*
* buildRouter() is attached as a property so the drift test's router-walk
* sees the route (routes/version.js convention).
*/
const express = require('express');
const { ok } = require('../src/utils/responses');
const versionRoute = require('./version');
function buildRouter(deps = {}) {
const router = express.Router();
const asyncHandler = deps.asyncHandler
|| ((fn) => (req, res, next) => Promise.resolve(fn(req, res, next)).catch(next));
router.get('/capabilities', asyncHandler(async (req, res) => {
const { APP_TEMPLATES } = require('../src/docker/app-templates');
const templates = APP_TEMPLATES || {};
const templateIds = Object.keys(templates);
const categories = {};
for (const id of templateIds) {
const c = (templates[id] && templates[id].category) || 'uncategorized';
categories[c] = (categories[c] || 0) + 1;
}
const { TOOLS } = require('../src/mcp/mcp-core');
const { MCP_RUNTIME } = require('./mcp');
const tools = (TOOLS || []).map((t) => t.name).sort();
const { PREMIUM_FEATURES } = require('../src/managers/license-manager');
const premiumFeatures = Object.keys(PREMIUM_FEATURES || {}).sort();
const i18n = require('../src/utilities/i18n');
let languageCount = null;
try { languageCount = i18n.getSupportedLanguages().length; } catch (_) { /* optional surface */ }
ok(res, {
product: 'dashcaddy',
version: versionRoute.getVersion(),
description: 'Self-hosting dashboard: one-click Docker app deployment with automatic SSL, DNS and reverse proxy; AI intent router; MCP control plane.',
templates: { count: templateIds.length, categories },
mcp: {
transport: MCP_RUNTIME.transport,
protocolVersion: MCP_RUNTIME.protocolVersion,
protocolVersions: MCP_RUNTIME.supportedProtocolVersions,
endpoint: '/api/v1/mcp',
tools
},
premiumFeatures,
api: { restMount: '/api/v1' },
i18n: { languageCount }
});
}));
return router;
}
module.exports = { buildRouter };
module.exports.default = function factory(ctx) { return buildRouter(ctx); };
+19 -5
View File
@@ -63,8 +63,18 @@ const { ValidationError, ForbiddenError } = require('../src/utilities/errors');
const { ok } = require('../src/utils/responses');
const { createToolHandler, createMcpHandler, TOOLS } = require('../src/mcp/mcp-core');
const PROTOCOL_VERSION = '2025-03-10';
const SUPPORTED_PROTOCOL_VERSIONS = ['2025-03-10', '2024-11-05'];
// MCP_RUNTIME is the single source of truth for the transport identity.
// DC-165 rev2 (judge B0): the /info route AND the /api/v1/capabilities
// manifest both read these values instead of re-typing them, so a protocol
// bump in one place cannot leave the other stale. The capability test asserts
// the manifest equals these constants.
const MCP_RUNTIME = {
transport: 'streamable-http',
protocolVersion: '2025-03-10',
supportedProtocolVersions: ['2025-03-10', '2024-11-05'],
};
const PROTOCOL_VERSION = MCP_RUNTIME.protocolVersion;
const SUPPORTED_PROTOCOL_VERSIONS = MCP_RUNTIME.supportedProtocolVersions;
const SERVER_VERSION = (() => {
try {
return require(path.join(__dirname, '..', 'package.json')).version;
@@ -275,7 +285,7 @@ module.exports = function createMcpRoutes({ asyncHandler, errorResponse, log, au
router.get('/info', asyncHandler(async (req, res) => {
ok(res, {
endpoint: publicEndpoint(req),
transport: 'streamable-http',
transport: MCP_RUNTIME.transport,
protocolVersion: PROTOCOL_VERSION,
supportedProtocolVersions: SUPPORTED_PROTOCOL_VERSIONS,
serverVersion: SERVER_VERSION,
@@ -320,7 +330,7 @@ module.exports = function createMcpRoutes({ asyncHandler, errorResponse, log, au
// shapes they don't (e.g. ChatGPT hosted connectors need public https).
const httpConfig = {
url: endpoint,
transport: 'streamable-http',
transport: MCP_RUNTIME.transport,
headers: { 'x-api-key': keyData.key },
mcpProtocolVersion: PROTOCOL_VERSION,
};
@@ -336,7 +346,7 @@ module.exports = function createMcpRoutes({ asyncHandler, errorResponse, log, au
name: keyData.name,
scopes: keyData.scopes,
endpoint,
transport: 'streamable-http',
transport: MCP_RUNTIME.transport,
httpConfig,
note: clientNotes[client],
warning: 'Save this key securely — it will not be shown again. Revoke any time from Settings → Connect your AI.',
@@ -347,3 +357,7 @@ module.exports = function createMcpRoutes({ asyncHandler, errorResponse, log, au
return router;
};
// DC-165 rev2: expose transport identity so the capabilities manifest reads
// the SAME constants the live MCP route serves (single source of truth).
module.exports.MCP_RUNTIME = MCP_RUNTIME;
+11
View File
@@ -542,6 +542,13 @@ async function createApp() {
apiRouter.use(versionRouter);
log.info('app', `Version endpoint available at /api/v1/version (v${appVersion})`);
// DC-165: capability manifest — public, machine-readable ground truth of
// THIS build (template count, MCP tools, premium features). Same-shape
// registration as /version so public-routes-drift.test.js walks it.
const capabilitiesRoute = require('../routes/capabilities');
apiRouter.use(capabilitiesRoute.buildRouter());
log.info('app', 'Capability manifest available at /api/v1/capabilities');
// Wire up notification listeners for resourceMonitor and backupManager
if (ctx.notification && ctx.resourceMonitor) {
ctx.resourceMonitor.on('alert', (alertData) => {
@@ -693,6 +700,10 @@ async function createApp() {
}));
// DC-108: Multi-host fleet management
// DC-165: gate behind premium entitlement ('fleet' in PREMIUM_FEATURES).
// Mounted at the router level so EVERY future fleet sub-route inherits
// the gate by default (fail-closed for new endpoints).
apiRouter.use('/fleet', ctx.licenseManager.requirePremium('fleet'));
apiRouter.use(fleetRoutes({
log: ctx.log,
asyncHandler: ctx.asyncHandler,
+49 -1
View File
@@ -24,7 +24,25 @@ const LICENSE_SERVER_URL = process.env.LICENSE_SERVER_URL || null; // Set when l
const PREMIUM_FEATURES = {
sso: { name: 'Auto-Login SSO', description: 'Automatic single sign-on for deployed apps' },
recipes: { name: 'Recipes', description: 'Multi-container stack deployment' },
swarm: { name: 'Docker Swarm', description: 'Multi-node cluster orchestration' }
swarm: { name: 'Docker Swarm', description: 'Multi-node cluster orchestration' },
// DC-165: site has always sold Fleet as Premium (pricing page + comparison
// table); the gate was missing. hasFeature() falls back to
// Object.keys(PREMIUM_FEATURES) for activations that stored no explicit
// features list, so existing premium licenses (incl. offline activations
// like the creator lifetime key) gain fleet automatically on next load.
// 'fleet' is now part of the shipped entitlement contract — a new
// PREMIUM_FEATURES key must ALWAYS be accompanied by the license-server
// grant list (plans.js) or online activations will 403 it.
fleet: { name: 'Multi-Host Fleet Management', description: 'Register remote DashCaddy instances, health probes, and multi-host deploys' },
// DC-165: these two have ALWAYS been requirePremium-gated (routes/
// workflows.js line 32, routes/backups.js schedule routes) but were
// never listed here — offline activations could therefore never gain
// them, and the marketing site didn't advertise them either. The site
// now advertises both (Sami's decision 2026-10-09: "advertise as
// Premium"); listing them here closes the offline path and makes
// PREMIUM_FEATURES the single source of truth for gated features.
workflows: { name: 'Workflow Automation', description: 'Bundled one-click maintenance workflows — update checks, disk cleanup, cert expiry checks — enable, run, and review history' },
'auto-backup': { name: 'Scheduled Backups', description: 'Automated per-app backup schedules (manual one-click backup stays free)' }
};
class LicenseManager {
@@ -76,6 +94,36 @@ class LicenseManager {
expiredAt: this.activation.expiresAt
});
} else {
// DC-165 forward-migration for OFFLINE activations: activate()
// stores features = Object.keys(PREMIUM_FEATURES) at activation
// time (line ~294), so a lifetime/creator activation minted
// before a feature was added (e.g. 'fleet') would lack it and
// requirePremium() 403s despite an active premium license.
// Refresh the snapshot to the CURRENT premium set — identical to
// what the same code would store if re-activated today. Online
// activations are NOT touched here: their authoritative feature
// list comes from the license server on validation.
if (this.activation.validationMethod === 'offline' && Array.isArray(this.activation.features)) {
const stored = new Set(this.activation.features);
const missing = Object.keys(PREMIUM_FEATURES).filter((f) => !stored.has(f));
if (missing.length) {
// Append-only union (judge P0): unknown/legacy entries stored
// by an OLDER build stay in the array — removal of a feature
// is never implied by a missing-key repair. Order = current
// premium set first, then any preserved extras.
const extras = this.activation.features.filter((f) => !Object.keys(PREMIUM_FEATURES).includes(f));
this.activation.features = Object.keys(PREMIUM_FEATURES).concat(extras);
try {
await this.credentialManager.store(LICENSE_CRED_KEY, JSON.stringify(this.activation), {
activatedAt: this.activation.activatedAt,
expiresAt: this.activation.expiresAt
});
} catch (error) {
this.log.warn?.('license', 'Could not persist premium-feature migration (in-memory state still correct)', { error: error.message });
}
this.log.info?.('license', 'Migrated offline activation to current premium feature set', { added: missing });
}
}
this.log.info?.('license', 'License loaded', {
code: this._maskCode(this.activation.code),
expiresAt: this.activation.expiresAt,
@@ -498,6 +498,7 @@ module.exports = function configureMiddleware(app, {
{ path: '/api/v1/monitoring/stats', exact: true, method: 'GET', monitoring: true },
{ path: '/api/v1/health-checks/status', exact: true, method: 'GET', monitoring: true },
{ path: '/api/v1/version', exact: true, method: 'GET' },
{ path: '/api/v1/capabilities', exact: true, method: 'GET' },
// Security ingest endpoints — auth via per-host Bearer token (handled in routes/security.js),
// NOT via TOTP/JWT. This lets remote DashCaddy agents and log parsers push events
// without needing a TOTP session.