[grade=B] DC-131/132/133 install from any Git host
CI / Test & Lint (push) Waiting to run
CI / Security audit (push) Waiting to run

Codex source gate: urn:ump:iw2tbbe6mssyl5divymmwo42ael65sbfrciztvyowo3zhrbtircq

Generated assets gate: urn:ump:hintflviuxfpeidth42ry5fi4lwqsjhkxipzspfmk7vrvfc2cnqq
This commit is contained in:
DashCaddy Polish Loop
2026-09-14 20:10:14 -07:00
parent 7557b49b5b
commit f9cbb13a3d
7 changed files with 1119 additions and 280 deletions
@@ -0,0 +1,325 @@
/**
* DC-131/133 additions to the deploys routes tests: install-from-any-host.
*
* Covers the judge round-1 blocking issues:
* - POST /install accepts any https host/owner/repo (not just github.com)
* and forwards the optional per-request token to the bridge.
* - POST /gitea-repos carries {gitea_url, token} in the JSON body.
* - Token validation rejects non-string / oversized tokens before the
* proxy call.
*/
const FIXTURE_INSTALL = {
ok: true,
service: {
id: 'demo-hi', name: 'demo-hi', repo_url: 'https://git.example/owner/demo-hi',
subdomain: 'demo-hi', url: 'https://demo-hi.sami', logo: '',
mode: 'go-build', port: 8951, dir: '/root/repos/demo-hi',
installed_at: '2026-09-14T18:00:00Z', deploy_seconds: 28.0,
},
output: '== build ==\n== deploy ==',
};
const FIXTURE_GITEA_LIST = {
ok: true,
repos: [{ id: 'demo-hi', name: 'demo-hi', full_name: 'owner/demo-hi', url: 'https://git.example/owner/demo-hi', description: 'demo' }],
};
// ---- self-contained harness (same pattern as deploys.routes.test.js) ----
const express = require('express');
function buildApp(fetchT, env = {}) {
process.env.SHIPDECK_BRIDGE_URL = env.url !== undefined ? env.url : 'http://172.17.0.1:8977';
process.env.SHIPDECK_BRIDGE_TOKEN_FILE = env.tokenFile !== undefined ? env.tokenFile : '';
jest.resetModules();
const mod = require('../../routes/deploys');
const router = mod({
asyncHandler: (fn) => async (req, res, next) => {
try { await fn(req, res, next); } catch (e) { next(e); }
},
log: { info: jest.fn(), warn: jest.fn(), error: jest.fn() },
auditLogger: { log: jest.fn(async () => {}) },
fetchT,
});
const app = express();
app.use(express.json());
app.use('/api/v1/deploys', router);
app.use((err, req, res, next) => {
res.status(500).json({ success: false, error: err.message });
});
return app;
}
function jsonFetcher(responses) {
const calls = [];
const fetchT = jest.fn(async (url, opts) => {
const key = `${(opts && opts.method) || 'GET'} ${url.replace(/^https?:\/\/[^/]+/, '')}`;
calls.push({ key, opts });
const r = responses[key] || { status: 404, body: { ok: false, error: 'no fixture' } };
return { status: r.status, json: async () => r.body };
});
return { calls, fetchT };
}
describe('routes/deploys — DC-131/133 install from any host', () => {
test('POST /install accepts any https host URL and forwards token to the bridge', async () => {
const f = jsonFetcher({ 'POST /api/install': { status: 200, body: FIXTURE_INSTALL } });
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/install`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
repo_url: 'https://git.example/owner/demo-hi',
service: 'demo-hi',
token: 'per-request-secret',
}),
});
const body = await r.json();
server.close();
expect(r.status).toBe(200);
expect(body.success).toBe(true);
expect(body.service.id).toBe('demo-hi');
// bridge call carries the forwarded token
const sent = JSON.parse(f.calls[0].opts.body);
expect(f.calls[0].key).toBe('POST /api/install');
expect(sent.token).toBe('per-request-secret');
expect(sent.repo_url).toBe('https://git.example/owner/demo-hi');
});
test('POST /install accepts host:port URLs and .git suffixes', async () => {
const f = jsonFetcher({ 'POST /api/install': { status: 200, body: FIXTURE_INSTALL } });
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/install`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: 'https://git.example:3443/owner/demo.hi.git', service: 'demo-hi' }),
});
server.close();
expect(r.status).toBe(200);
expect(JSON.parse(f.calls[0].opts.body).repo_url).toBe('https://git.example:3443/owner/demo.hi.git');
});
test('POST /install rejects non-URL garbage with 400 and never calls the bridge', async () => {
const f = jsonFetcher({});
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/install`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: 'not a url', service: 'demo-hi' }),
});
server.close();
expect(r.status).toBe(400);
expect(f.calls).toHaveLength(0);
});
test('POST /install rejects non-string and oversized tokens (400, no proxy call)', async () => {
const f = jsonFetcher({});
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r1 = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/install`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: 'https://git.example/owner/repo', service: 'demo-hi', token: 12345 }),
});
const r2 = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/install`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: 'https://git.example/owner/repo', service: 'demo-hi', token: 'x'.repeat(513) }),
});
server.close();
expect(r1.status).toBe(400);
expect(r2.status).toBe(400);
expect(f.calls).toHaveLength(0);
});
test('POST /gitea-repos proxies {gitea_url, token} in the body', async () => {
const f = jsonFetcher({ 'POST /api/gitea/repos': { status: 200, body: FIXTURE_GITEA_LIST } });
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/gitea-repos`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ gitea_url: 'https://git.example', token: 'per-request-secret' }),
});
const body = await r.json();
server.close();
expect(r.status).toBe(200);
expect(body.success).toBe(true);
expect(body.repos[0].full_name).toBe('owner/demo-hi');
const sent = JSON.parse(f.calls[0].opts.body);
expect(f.calls[0].key).toBe('POST /api/gitea/repos');
expect(sent.gitea_url).toBe('https://git.example');
expect(sent.token).toBe('per-request-secret');
});
test('POST /gitea-repos works with no host/token (fleet defaults)', async () => {
const f = jsonFetcher({ 'POST /api/gitea/repos': { status: 200, body: FIXTURE_GITEA_LIST } });
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/gitea-repos`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: '{}',
});
server.close();
expect(r.status).toBe(200);
const sent = JSON.parse(f.calls[0].opts.body);
expect(sent).toEqual({});
});
test('install success persists no token in the service metadata returned to the panel', async () => {
const f = jsonFetcher({ 'POST /api/install': { status: 200, body: FIXTURE_INSTALL } });
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/install`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: 'https://git.example/owner/demo-hi', service: 'demo-hi', token: 'per-request-secret' }),
});
const body = await r.json();
server.close();
expect(JSON.stringify(body)).not.toContain('per-request-secret');
});
test('POST /install accepts tokens of 201-512 chars (bridge contract matches proxy)', async () => {
// Round-2 judge: proxy allowed <=512 but the bridge capped at 200, so
// values accepted by the panel could fail downstream. The bridge now
// matches: <=512 is forwarded and must pass proxy validation.
const f = jsonFetcher({ 'POST /api/install': { status: 200, body: FIXTURE_INSTALL } });
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
for (const len of [201, 300, 512]) {
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/install`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: 'https://git.example/owner/repo', service: 'demo-hi', token: 'a'.repeat(len) }),
});
expect(r.status).toBe(200);
}
server.close();
expect(f.calls).toHaveLength(3);
});
test('POST /gitea-repos rejects tokens over 512 chars (400, no proxy call)', async () => {
const f = jsonFetcher({});
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/gitea-repos`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ gitea_url: 'https://git.example', token: 'x'.repeat(513) }),
});
server.close();
expect(r.status).toBe(400);
expect(f.calls).toHaveLength(0);
});
test('POST /gitea-repos rejects non-string tokens (400, no proxy call)', async () => {
const f = jsonFetcher({});
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
for (const bad of [12345, {}, ['x']]) {
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/gitea-repos`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ gitea_url: 'https://git.example', token: bad }),
});
expect(r.status).toBe(400);
}
server.close();
expect(f.calls).toHaveLength(0);
});
test('empty-string token means explicitly anonymous: preserved on wire', async () => {
const f = jsonFetcher({ 'POST /api/gitea/repos': { status: 200, body: FIXTURE_GITEA_LIST } });
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/gitea-repos`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ gitea_url: 'https://git.example', token: '' }),
});
server.close();
expect(r.status).toBe(200);
const sent = JSON.parse(f.calls[0].opts.body);
expect(sent.token).toBe('');
// same explicit-anonymous wire representation on /install
const f2 = jsonFetcher({ 'POST /api/install': { status: 200, body: FIXTURE_INSTALL } });
const app2 = buildApp(f2.fetchT);
const server2 = app2.listen(0);
const port2 = server2.address().port;
const r2 = await fetch(`http://127.0.0.1:${port2}/api/v1/deploys/install`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: 'https://git.example/owner/repo', service: 'demo-hi', token: '' }),
});
server2.close();
expect(r2.status).toBe(200);
const sent2 = JSON.parse(f2.calls[0].opts.body);
expect(sent2.token).toBe('');
});
test('POST /install rejects non-string tokens (400, no proxy call)', async () => {
const f = jsonFetcher({});
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/install`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: 'https://git.example/owner/repo', service: 'demo-hi', token: { evil: true } }),
});
server.close();
expect(r.status).toBe(400);
expect(f.calls).toHaveLength(0);
});
test('POST /install forwards valid env unchanged', async () => {
const f = jsonFetcher({ 'POST /api/install': { status: 200, body: FIXTURE_INSTALL } });
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const env = { GREETING: 'hello world', PORT_HINT: '8950' };
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/install`, {
method: 'POST', headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: 'https://git.example/owner/repo', service: 'demo-hi', env }),
});
server.close();
expect(r.status).toBe(200);
expect(JSON.parse(f.calls[0].opts.body).env).toEqual(env);
});
test('POST /install rejects invalid env before bridge call', async () => {
const bad = [
'not-an-object', [], { COUNT: 123 }, { lowercase: 'x' },
{ TOO_LONG: 'x'.repeat(301) }, { QUOTE: 'a"b' }, { SLASH: 'a\\b' },
{ NEWLINE: 'a\nb' }, { NUL: 'a\u0000b' }, { DEL: 'a\u007fb' },
];
for (const env of bad) {
const f = jsonFetcher({});
const app = buildApp(f.fetchT);
const server = app.listen(0);
const port = server.address().port;
const r = await fetch(`http://127.0.0.1:${port}/api/v1/deploys/install`, {
method: 'POST', headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: 'https://git.example/owner/repo', service: 'demo-hi', env }),
});
server.close();
expect(r.status).toBe(400);
expect(f.calls).toHaveLength(0);
}
});
});
+139 -115
View File
@@ -1,117 +1,141 @@
[ [
{ {
"id": "router", "id": "router",
"name": "Router UI", "name": "Router UI",
"logo": "/assets/router.png", "logo": "/assets/router.png",
"url": "https://router.sami", "url": "https://router.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": false "tailscaleOnly": false
}, },
{ {
"id": "chat", "id": "chat",
"name": "Chat", "name": "Chat",
"logo": "/assets/chat.png", "logo": "/assets/chat.png",
"url": "https://chat.sami", "url": "https://chat.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": false "tailscaleOnly": false
}, },
{ {
"id": "sync", "id": "sync",
"name": "Syncthing", "name": "Syncthing",
"logo": "/assets/syncthing.png", "logo": "/assets/syncthing.png",
"url": "https://sync.sami", "url": "https://sync.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": false "tailscaleOnly": false
}, },
{ {
"id": "torrent", "id": "torrent",
"name": "qBittorrent", "name": "qBittorrent",
"logo": "/assets/qBittorrent.png", "logo": "/assets/qBittorrent.png",
"url": "https://torrent.sami", "url": "https://torrent.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": false, "tailscaleOnly": false,
"deployedAt": "2026-01-18T06:04:55.246Z" "deployedAt": "2026-01-18T06:04:55.246Z"
}, },
{ {
"id": "sonarr", "id": "sonarr",
"name": "Sonarr", "name": "Sonarr",
"logo": "/assets/sonarr.png", "logo": "/assets/sonarr.png",
"url": "https://sonarr.sami", "url": "https://sonarr.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": false, "tailscaleOnly": false,
"deployedAt": "2026-01-18T06:04:56.612Z" "deployedAt": "2026-01-18T06:04:56.612Z"
}, },
{ {
"id": "radarr", "id": "radarr",
"name": "Radarr", "name": "Radarr",
"logo": "/assets/radarr.png", "logo": "/assets/radarr.png",
"url": "https://radarr.sami", "url": "https://radarr.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": false, "tailscaleOnly": false,
"deployedAt": "2026-01-18T08:28:12.359Z" "deployedAt": "2026-01-18T08:28:12.359Z"
}, },
{ {
"id": "prowlarr", "id": "prowlarr",
"name": "Prowlarr", "name": "Prowlarr",
"logo": "/assets/prowlarr.png", "logo": "/assets/prowlarr.png",
"url": "https://prowlarr.sami", "url": "https://prowlarr.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": false, "tailscaleOnly": false,
"deployedAt": "2026-01-18T08:28:13.739Z" "deployedAt": "2026-01-18T08:28:13.739Z"
}, },
{ {
"id": "ca", "id": "ca",
"name": "DashCA", "name": "DashCA",
"logo": "/assets/certificate-icon.png", "logo": "/assets/certificate-icon.png",
"containerId": null, "containerId": null,
"appTemplate": "dashca", "appTemplate": "dashca",
"tailscaleOnly": false, "tailscaleOnly": false,
"deployedAt": "2026-02-11T11:47:08.383Z", "deployedAt": "2026-02-11T11:47:08.383Z",
"url": "https://ca.sami" "url": "https://ca.sami"
}, },
{ {
"id": "plex", "id": "plex",
"name": "Plex", "name": "Plex",
"logo": "/assets/plex.png", "logo": "/assets/plex.png",
"containerId": null, "containerId": null,
"appTemplate": "plex", "appTemplate": "plex",
"tailscaleOnly": false, "tailscaleOnly": false,
"deployedAt": "2026-02-12T02:18:36.067Z", "deployedAt": "2026-02-12T02:18:36.067Z",
"url": "https://plex.sami" "url": "https://plex.sami"
}, },
{ {
"id": "requests", "id": "requests",
"name": "Seerr", "name": "Seerr",
"logo": "/assets/seerr.png", "logo": "/assets/seerr.png",
"url": "https://requests.sami", "url": "https://requests.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": false "tailscaleOnly": false
}, },
{ {
"id": "git", "id": "git",
"name": "Gitea", "name": "Gitea",
"logo": "/assets/gitea.png", "logo": "/assets/gitea.png",
"url": "https://git.sami", "url": "https://git.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": false "tailscaleOnly": false
}, },
{ {
"id": "files", "id": "files",
"name": "Sami Files", "name": "Sami Files",
"logo": "/assets/sami-files.png", "logo": "/assets/sami-files.png",
"url": "https://files.sami", "url": "https://files.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": false, "tailscaleOnly": false,
"containerId": null, "containerId": null,
"appTemplate": "sami-files", "appTemplate": "sami-files",
"deployedAt": "2026-06-19T00:00:00.000Z" "deployedAt": "2026-06-19T00:00:00.000Z"
}, },
{ {
"id": "sec", "id": "sec",
"name": "Security", "name": "Security",
"logo": "/assets/chat.png", "logo": "/assets/chat.png",
"url": "https://sec.sami", "url": "https://sec.sami",
"ip": "localhost", "ip": "localhost",
"tailscaleOnly": true "tailscaleOnly": true
} },
{
"id": "http-echo",
"name": "http-echo",
"url": "https://echo.sami",
"logo": "https://avatars.githubusercontent.com/u/761456?v=4",
"tailscaleOnly": true,
"isCustom": true
},
{
"id": "demo-hello",
"name": "demo-hello",
"url": "https://demo.sami",
"logo": "https://git.dashcaddy.net/avatars/f19511496aee4ceb8e11150676298d17",
"tailscaleOnly": true,
"isCustom": true
},
{
"id": "demo-hi",
"name": "demo-hi",
"url": "https://hi.sami",
"logo": "",
"tailscaleOnly": true,
"isCustom": true
}
] ]
+90
View File
@@ -197,5 +197,95 @@ module.exports = function ({ asyncHandler, log, auditLogger, fetchT }) {
} }
})); }));
// DC-131/133: install from ANY git host — clone+detect+deploy on the bridge
// host, then the client registers the card via POST /api/v1/services.
// Same URL grammar the bridge enforces: any https host/owner/repo. The
// optional per-request token is forwarded to the bridge (validated, never
// stored by either layer).
router.post('/install', asyncHandler(async (req, res) => {
const { repo_url: repoUrl, service, subdomain, args, token, env } = req.body || {};
if (typeof repoUrl !== 'string' || !/^https:\/\/[A-Za-z0-9.-]+(?::\d+)?\/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+(\.git)?\/?$/.test(repoUrl)) {
return errorResponse(res, 400, 'repo_url must be a https://host/owner/repo URL');
}
if (typeof service !== 'string' || !SERVICE_RE.test(service)) {
return errorResponse(res, 400, 'invalid service name');
}
// Uniform token contract (same as /gitea-repos): supplied token must be
// a string <=512 chars. Empty string is deliberately PRESERVED on the
// wire: the bridge distinguishes "explicit anonymous" from omitted
// (omitted may use the fleet fallback credential).
let cleanToken;
if (token !== undefined) {
if (typeof token !== 'string' || token.length > 512) {
return errorResponse(res, 400, 'invalid token');
}
cleanToken = token;
}
// Mirror the bridge's fail-closed environment contract so invalid
// values never cross the proxy boundary. Valid values are forwarded
// unchanged; omitted env stays omitted.
let cleanEnv;
if (env !== undefined) {
const validEnv = env && typeof env === 'object' && !Array.isArray(env) &&
Object.entries(env).every(([k, v]) =>
/^[A-Z_][A-Z0-9_]*$/.test(k) && typeof v === 'string' &&
v.length <= 300 && !/["\\\x00-\x1f\x7f]/.test(v));
if (!validEnv) {
return errorResponse(res, 400, 'env must map valid uppercase names to strings <=300 chars without quotes, backslashes, or control characters');
}
cleanEnv = env;
}
try {
const { status, body } = await bridge('POST', '/api/install', { repo_url: repoUrl, service, subdomain, args, token: cleanToken, env: cleanEnv }, SHIPDECK_DEPLOY_TIMEOUT);
if (auditLogger) {
auditLogger.log({
action: 'deploy.install',
resource: service,
details: { repo_url: repoUrl, subdomain: subdomain || service },
outcome: body.ok ? 'success' : 'failure',
}).catch(() => {});
}
if (status !== 200 || !body.ok) {
return errorResponse(res, status === 401 ? 502 : status === 500 ? 502 : status, body.error || 'install failed', { output: (body.output || '').slice(-4000) });
}
log.info('deploys', 'Install completed from ' + (repoUrl.split('/')[2] || 'git host'), { service });
return ok(res, { service: body.service, output: body.output });
} catch (e) {
log.error('deploys', 'bridge unreachable during install', { error: e.message });
return errorResponse(res, 502, 'shipdeck bridge unreachable: ' + e.message);
}
}));
// DC-132/133: list Gitea repos installable via the bridge — from any
// instance. POST with a JSON body so host/token ride in the body (a GET
// has no body; the earlier GET handler read req.body and always saw
// undefined). The bridge never persists the token.
router.post('/gitea-repos', asyncHandler(async (req, res) => {
const payload = {};
if (req.body && typeof req.body.gitea_url === 'string' && req.body.gitea_url.trim()) {
payload.gitea_url = req.body.gitea_url.trim();
}
if (req.body && req.body.token !== undefined) {
// Uniform token contract. Empty string is DELIBERATELY preserved on
// the wire: the bridge distinguishes explicit-anonymous from omitted
// (omitted may use the fleet credential).
const t = req.body.token;
if (typeof t !== 'string' || t.length > 512) {
return errorResponse(res, 400, 'invalid token');
}
payload.token = t;
}
try {
const { status, body } = await bridge('POST', '/api/gitea/repos', payload, 20000);
if (status !== 200 || !body.ok) {
return errorResponse(res, status === 502 ? 502 : status, body.error || 'gitea listing failed');
}
return ok(res, { repos: body.repos });
} catch (e) {
return errorResponse(res, 502, 'shipdeck bridge unreachable: ' + e.message);
}
}));
return router; return router;
}; };
+204 -163
View File
File diff suppressed because one or more lines are too long
+165 -1
View File
@@ -6,6 +6,31 @@
// Follows the security-center.js modal pattern (injectModal + button in the // Follows the security-center.js modal pattern (injectModal + button in the
// top bar) and the weather-modal visual language. // top bar) and the weather-modal visual language.
// DC-133: pure repo-option builder. Remote Gitea fields are UNTRUSTED (a
// hostile instance controls full_name/description/url), so every
// interpolated value must be HTML-escaped before innerHTML. Exposed on
// window so status/tests can pin the escaping with hostile payloads.
window.__dc133_buildRepoOptions = function (repos, escFn) {
var e = escFn || function (s) {
return String(s).replace(/[&<>"']/g, function (c) {
return { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c];
});
};
return '<option value="">— choose a repo —</option>' +
(repos || []).map(function (r) {
return '<option value="' + e(r.url) + '" data-id="' + e(r.id) + '">' +
e(r.full_name) + (r.description ? ' — ' + e(r.description) : '') + '</option>';
}).join('');
};
// Three-state token semantics, exposed for VM tests:
// anonymous=true -> explicit empty; typed value -> token; neither -> omitted.
window.__dc133_requestToken = function (anonymous, typed) {
if (anonymous) return '';
var t = String(typed || '').trim();
return t || undefined;
};
(function () { (function () {
injectModal('deploys-modal', `<div id="deploys-modal" class="weather-modal"> injectModal('deploys-modal', `<div id="deploys-modal" class="weather-modal">
<div class="weather-modal-content" style="min-width: 860px; max-width: 1200px;"> <div class="weather-modal-content" style="min-width: 860px; max-width: 1200px;">
@@ -17,7 +42,7 @@
<div class="sec-tabs" style="display:flex;gap:8px;margin-bottom:14px;border-bottom:1px solid var(--border);"> <div class="sec-tabs" style="display:flex;gap:8px;margin-bottom:14px;border-bottom:1px solid var(--border);">
<button class="dep-tab active" data-tab="services">Services</button> <button class="dep-tab active" data-tab="services">Services</button>
<button class="dep-tab" data-tab="deploy">Deploy</button> <button class="dep-tab" data-tab="deploy">Deploy</button>
<button class="dep-tab" data-tab="journal">Journal</button> <button class="dep-tab" data-tab="journal">Journal</button><button class="dep-tab" data-tab="install">Install</button>
</div> </div>
<!-- SERVICES TAB --> <!-- SERVICES TAB -->
@@ -47,6 +72,43 @@
<div id="dep-journal" class="scroll-container" style="max-height:320px;">Loading…</div> <div id="dep-journal" class="scroll-container" style="max-height:320px;">Loading…</div>
</div> </div>
<!-- INSTALL TAB (DC-131) -->
<div class="dep-panel" data-panel="install" style="display:none;">
<div style="display:grid;gap:10px;max-width:640px;">
<div style="display:grid;gap:4px;">
<span class="modal-subtitle" style="margin:0;">Gitea server (any instance)</span>
<div style="display:flex;gap:8px;">
<input id="dep-gh-gitea-host" placeholder="git.dashcaddy.net (default)" style="flex:1;" autocomplete="off" spellcheck="false" />
<input id="dep-gh-gitea-token" type="password" placeholder="token (private repos)" style="flex:1;" autocomplete="off" spellcheck="false" />
</div>
<label style="display:flex;gap:6px;align-items:center;font-size:12px;">
<input id="dep-gh-anonymous" type="checkbox" />
Anonymous — ignore the saved fleet token for this request
</label>
</div>
<label style="display:grid;gap:4px;">
<span class="modal-subtitle" style="margin:0;">Pick a repo</span>
<select id="dep-gh-gitea" style="min-width:280px;"><option value="">Loading…</option></select>
</label>
<label style="display:grid;gap:4px;">
<span class="modal-subtitle" style="margin:0;">…or paste any repo URL (GitHub, Gitea, or any https git host)</span>
<input id="dep-gh-url" placeholder="https://host/owner/repo" style="width:100%;" />
</label>
<label style="display:grid;gap:4px;">
<span class="modal-subtitle" style="margin:0;">Name (used as subdomain; card title falls back to repo name)</span>
<input id="dep-gh-service" placeholder="my-app" style="width:220px;" />
</label>
<label style="display:grid;gap:4px;">
<span class="modal-subtitle" style="margin:0;">Optional launch args (space-separated simple tokens, e.g. -text hi)</span>
<input id="dep-gh-args" placeholder="-text hello" style="width:100%;" />
</label>
<p class="modal-subtitle" style="margin:0;">
Go repos with a main package install automatically: build, systemd release,
Caddy gate (tailnet-only), DNS, verify, dashboard card. Takes ~30-60s.
</p>
<div><button class="btn btn-primary" id="dep-gh-btn">Install</button></div>
</div>
</div>
<!-- OUTPUT --> <!-- OUTPUT -->
<pre id="dep-output" class="scroll-container" style="display:none;max-height:260px;margin-top:12px;background:var(--bg-2,#111);padding:10px;border-radius:8px;white-space:pre-wrap;"></pre> <pre id="dep-output" class="scroll-container" style="display:none;max-height:260px;margin-top:12px;background:var(--bg-2,#111);padding:10px;border-radius:8px;white-space:pre-wrap;"></pre>
@@ -136,6 +198,91 @@
).join('') + '</tbody></table>'; ).join('') + '</tbody></table>';
} }
async function loadGiteaRepos() {
const sel = document.getElementById('dep-gh-gitea');
const hostEl = document.getElementById('dep-gh-gitea-host');
const tokEl = document.getElementById('dep-gh-gitea-token');
const anonEl = document.getElementById('dep-gh-anonymous');
const payload = {};
if (hostEl && hostEl.value.trim()) payload.gitea_url = 'https://' + hostEl.value.trim().replace(/^https?:\/*/, '');
// Distinguish omitted (fleet fallback allowed) from explicit anonymous
// (empty token preserved on wire). A non-empty user token wins.
if (anonEl && anonEl.checked) payload.token = '';
else {
const t = window.__dc133_requestToken(false, tokEl && tokEl.value);
if (t !== undefined) payload.token = t;
}
try {
const { status, body } = await api('/gitea-repos', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(payload),
});
if (!body.success || !(body.repos || []).length) {
sel.innerHTML = '<option value="">' + esc(body.error || 'no repos found') + '</option>';
return;
}
// All remote fields are untrusted (hostile Gitea instance or repo
// metadata) — build options through the escaping helper (pinned by
// status/tests/deploys-install.test.js).
sel.innerHTML = window.__dc133_buildRepoOptions(body.repos, esc);
} catch (e) {
sel.innerHTML = '<option value="">unavailable</option>';
}
}
async function runInstall() {
const btn = document.getElementById('dep-gh-btn');
const repoUrl = document.getElementById('dep-gh-url').value.trim();
const service = (document.getElementById('dep-gh-service').value.trim() || '').toLowerCase();
const argsRaw = document.getElementById('dep-gh-args').value.trim();
if (!repoUrl || !service) { showOutput('Repo URL and name are required.'); return; }
const args = argsRaw ? argsRaw.split(/\s+/) : [];
setBusy(true, btn, 'Install');
showOutput('Installing ' + repoUrl + '\nCloning, building, gating and DNS-ing... (~30-60s)');
try {
const anonymous = !!(document.getElementById('dep-gh-anonymous') || {}).checked;
const typedToken = (document.getElementById('dep-gh-gitea-token') || { value: '' }).value;
const requestToken = window.__dc133_requestToken(anonymous, typedToken);
const { status, body } = await api('/install', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ repo_url: repoUrl, service, args,
token: requestToken }),
});
if (!body.success) {
showOutput((body.output ? body.output + '\n' : '') + 'FAIL ' + (body.error || ('HTTP ' + status)));
setBusy(false, btn, 'Install');
return;
}
const svc = body.service || {};
const exists = (window.APPS || []).some((a) => a.id === svc.id);
if (!exists) {
const card = { id: svc.id, name: svc.name || svc.id, url: svc.url, logo: svc.logo, tailscaleOnly: true, isCustom: true };
try {
await fetch('/dashcaddy-api/api/v1/services', {
method: 'POST',
credentials: 'include',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(card),
});
window.APPS.push(card);
if (typeof window.renderApps === 'function') window.renderApps();
if (typeof window.renderGrid === 'function') window.renderGrid();
} catch (e) { /* card registration best-effort */ }
}
showOutput('INSTALLED ' + (svc.name || svc.id) + ' in ' + (svc.deploy_seconds || '?') + 's' +
'\nCard: ' + (svc.url || '') +
'\n' + (body.output || '').slice(-800));
loadServices();
} catch (e) {
showOutput('install error: ' + e.message);
}
setBusy(false, btn, 'Install');
}
function setBusy(busy, btn, label) { function setBusy(busy, btn, label) {
if (!btn) return; if (!btn) return;
btn.disabled = busy; btn.disabled = busy;
@@ -202,6 +349,7 @@
loadServices(); loadServices();
loadRepos(); loadRepos();
loadJournal(''); loadJournal('');
loadGiteaRepos();
} }
}); });
@@ -221,6 +369,22 @@
}); });
$('dep-deploy-btn').addEventListener('click', runDeploy); $('dep-deploy-btn').addEventListener('click', runDeploy);
$('dep-gh-btn').addEventListener('click', runInstall);
['dep-gh-gitea-host', 'dep-gh-gitea-token'].forEach((id) => {
const el = document.getElementById(id);
if (el) el.addEventListener('change', () => loadGiteaRepos());
});
document.getElementById('dep-gh-gitea').addEventListener('change', (e) => {
const v = e.target.value;
if (v) {
document.getElementById('dep-gh-url').value = v;
const opt = e.target.selectedOptions[0];
const id = opt && opt.dataset ? opt.dataset.id : '';
const svc = document.getElementById('dep-gh-service');
if (id && !svc.value) svc.value = id;
}
});
$('dep-journal-btn').addEventListener('click', () => loadJournal($('dep-journal-name').value.trim())); $('dep-journal-btn').addEventListener('click', () => loadJournal($('dep-journal-name').value.trim()));
$('dep-status-btn').addEventListener('click', () => { $('dep-status-btn').addEventListener('click', () => {
+1 -1
View File
@@ -1,4 +1,4 @@
const CACHE = 'dashcaddy-shell-e494299e9f'; const CACHE = 'dashcaddy-shell-31798d1d47';
const PRECACHE = [ const PRECACHE = [
'/', '/',
'/index.html', '/index.html',
+195
View File
@@ -0,0 +1,195 @@
'use strict';
/**
* DC-131/133 deploys Install tab tests.
*
* Pins the DOM-XSS escaping on the Gitea repo picker: remote repo fields
* (url, id, full_name, description) are UNTRUSTED — a hostile Gitea
* instance controls them — so they must be HTML-escaped before they reach
* innerHTML. We load status/js/deploys.js in a sandboxed VM with a minimal
* mocked DOM (same pattern as share-modal.test.js) and drive the exposed
* window.__dc133_buildRepoOptions() with hostile payloads.
*
* Also verifies the token input is type="password" (not echoed to screen)
* and that the modal carries no github.com-only assumptions.
*/
const fs = require('fs');
const path = require('path');
const vm = require('vm');
const test = require('node:test');
const assert = require('node:assert/strict');
function findTarget() {
// Prefer the panel (ui) file; the routes/deploys.js proxy file is a
// different module (CommonJS, jest-side) and must not match this scan.
const candidates = [
path.join(__dirname, '..', 'js', 'deploys.js'),
path.join(__dirname, 'deploys.js'),
path.join(__dirname, 'ui-deploys.js'),
];
for (const p of candidates) {
try { if (fs.statSync(p).isFile()) return p; } catch (_) { /* keep looking */ }
}
const dir = __dirname;
let entries = [];
try { entries = fs.readdirSync(dir); } catch (_) { return null; }
const match = entries.find(e => e.endsWith('_ui-deploys.js') || e.endsWith('-ui-deploys.js'));
return match ? path.join(dir, match) : null;
}
const SOURCE_PATH = findTarget();
if (!SOURCE_PATH) {
throw new Error('Cannot find ui-deploys.js (panel bundle source). Searched ' + __dirname + ' and ../js/.');
}
function buildFakeDom() {
const elements = new Map();
function makeEl(id) {
return {
id,
value: '',
textContent: '',
innerHTML: '',
style: {},
dataset: {},
classList: {
_set: new Set(),
add(c) { this._set.add(c); },
remove(c) { this._set.delete(c); },
toggle(c, on) { if (on) this._set.add(c); else this._set.delete(c); },
contains(c) { return this._set.has(c); },
},
disabled: false,
addEventListener() {},
appendChild() {},
querySelectorAll() { return []; },
selectedOptions: [],
setAttribute() {},
getAttribute() { return null; },
};
}
const knownIds = [
'deploys-modal', 'dep-gh-gitea', 'dep-gh-gitea-host', 'dep-gh-gitea-token',
'dep-gh-anonymous', 'dep-gh-url', 'dep-gh-service', 'dep-gh-args', 'dep-gh-btn',
'dep-output', 'dep-services', 'dep-journal', 'dep-journal-name',
'dep-journal-btn', 'dep-status-name', 'dep-status-btn',
'dep-repo-select', 'dep-close', 'dep-deploy-btn',
];
for (const id of knownIds) elements.set(id, makeEl(id));
return {
_elements: elements,
body: { insertAdjacentHTML() {}, appendChild() {} },
getElementById(id) { return elements.get(id) || null; },
createElement() { return makeEl('created'); },
addEventListener() {},
querySelectorAll() { return []; },
readyState: 'complete',
};
}
function buildSandbox() {
const dom = buildFakeDom();
const windowStub = {
escapeHtml: (s) => String(s == null ? '' : s)
.replace(/[&<>"']/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c])),
renderApps: undefined,
renderGrid: undefined,
APPS: [],
};
const sandbox = {
window: windowStub,
document: dom,
fetch: () => Promise.resolve({ status: 200, json: async () => ({ success: true, rows: [], repos: [], services: [] }) }),
URL,
location: { origin: 'https://status.sami' },
setTimeout,
clearTimeout,
navigator: {},
injectModal: () => {},
wireModal: () => {},
showNotification: () => {},
console,
};
vm.createContext(sandbox);
return { sandbox, dom, windowStub };
}
function loadModule() {
const { sandbox, dom, windowStub } = buildSandbox();
vm.runInContext(fs.readFileSync(SOURCE_PATH, 'utf8'), sandbox, { filename: SOURCE_PATH });
return { dom, windowStub };
}
test('deploys.js loads in sandbox and exposes the DC-133 option builder', () => {
const { windowStub } = loadModule();
assert.equal(typeof windowStub.__dc133_buildRepoOptions, 'function');
});
test('repo options escape hostile full_name/description/url/id payloads', () => {
const { windowStub } = loadModule();
const build = windowStub.__dc133_buildRepoOptions;
const hostile = [{
url: 'https://evil.example/"><script>alert(1)</script>/x',
id: 'x" onmouseover="alert(2)',
full_name: '<script>alert(3)</script>',
description: '"><img src=x onerror=alert(4)>',
}];
const html = build(hostile);
// Security property: the hostile payloads' raw attack vectors must not
// survive — tags cannot open, quotes cannot delimit attributes. (The
// output legitimately contains its own <option> elements; what must be
// absent is any raw form of the injected values.)
assert.equal(html.includes('<script'), false, 'raw <script from payload must not survive');
assert.equal(html.includes('<img'), false, 'raw <img from payload must not survive');
assert.equal(html.includes('"><'), false, 'quote-angle injection delimiter must not survive');
assert.equal(html.includes('onmouseover="'), false, 'raw quoted attribute from payload must not survive');
assert.ok(html.includes('&lt;script&gt;'), 'escaped script tag present as inert text');
assert.ok(html.includes('&quot;&gt;'), 'escaped quote-angle present');
});
test('repo options builder is safe with an injected escFn too (no bypass)', () => {
const { windowStub } = loadModule();
const build = windowStub.__dc133_buildRepoOptions;
const html = build([{ url: 'u"><svg onload=alert(9)>', id: 'i', full_name: 'n', description: 'd' }],
(s) => String(s).replace(/[&<>"']/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c])));
assert.equal(html.includes('<svg'), false, 'raw <svg from payload must not survive');
assert.equal(html.includes('"><'), false, 'quote-angle delimiter must not survive');
});
test('empty and null repos arrays produce just the placeholder option', () => {
const { windowStub } = loadModule();
const build = windowStub.__dc133_buildRepoOptions;
assert.ok(build([]).includes('choose a repo'));
assert.ok(build(null).includes('choose a repo'));
});
test('token input is type=password in the modal markup', () => {
const source = fs.readFileSync(SOURCE_PATH, 'utf8');
const m = source.match(/id="dep-gh-gitea-token"[^>]*>/);
assert.ok(m, 'token input exists');
assert.ok(/type="password"/.test(m[0]), 'token input must be type=password, got: ' + m[0]);
});
test('install modal has no github.com-only placeholders (any-host UX)', () => {
const source = fs.readFileSync(SOURCE_PATH, 'utf8');
assert.equal(source.includes('https://github.com/owner/repo'), false,
'placeholder must not suggest github-only URLs');
});
test('request-token helper preserves explicit anonymous versus omitted', () => {
const { windowStub } = loadModule();
const token = windowStub.__dc133_requestToken;
assert.equal(typeof token, 'function');
assert.equal(token(true, 'typed-secret'), '',
'anonymous checkbox wins and emits explicit empty string');
assert.equal(token(false, ' typed-secret '), 'typed-secret');
assert.equal(token(false, ''), undefined,
'blank field without anonymous checkbox omits token (fleet fallback allowed)');
assert.equal(token(false, ' '), undefined);
});
test('anonymous checkbox exists in modal markup', () => {
const source = fs.readFileSync(SOURCE_PATH, 'utf8');
assert.match(source, /id="dep-gh-anonymous"[^>]*type="checkbox"/);
});