An open source, self-hosted, real-time port monitoring and discovery tool.
fix: harden credential handling and peer requests (#123)
Mostafa Wahied0028cfcbc43c
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex e9d2c0d..02929ec 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -4,6 +4,20 @@ All notable changes to portracker will be documented in this file.## [Unreleased]+## [1.3.14] - 2026-09-14++### Security++<!-- whatsnew:title=Better protection for your servers -->+<!-- whatsnew:description=Container details now hide sensitive settings. If you use connected servers, include the encryption key file with your database backups. -->+- **[Container Diagnostics]**: Omit environment values, commands, arbitrary labels, health-check output and raw application configuration from diagnostic responses and exports. Require a signed-in user for raw diagnostics when authentication is enabled, prevent submitted peer keys from reaching error logs, and validate external autoxpose links as HTTP(S). Reported privately through GitHub issue #116.++<!-- whatsnew:hide -->+- **[Peer Credentials]**: Encrypt saved outbound peer API keys with authenticated encryption bound to the peer ID and URL, migrate legacy values, and fail closed when encrypted data has no matching key file. Preserve keys for unchanged peer edits and clear them when the destination changes. Back up the database and peer-keys.key, or the file selected by PEER_KEY_FILE, together; see SECURITY.md for recovery and old-backup limitations.++<!-- whatsnew:hide -->+- **[Request Boundaries]**: Require authentication or a valid peer key for port generation when authentication is enabled. Restrict ping to discovered server/port inventory, validate and pin outbound addresses, reject unsafe peer URLs and redirects, and bound request time, response size and request rates. Private HTTP peers remain supported; HTTPS peer certificate verification remains enabled. Peer loopback, link-local and reserved destinations are rejected. Add route-guard inventory and regression checks across both image architectures.+## [1.3.13] - 2026-09-14### Fixeddiff --git a/SECURITY.md b/SECURITY.mdnew file mode 100644index 0000000..6d1c075--- /dev/null+++ b/SECURITY.md@@ -0,0 +1,79 @@+# Security++Report suspected vulnerabilities privately through [GitHub private reporting](https://github.com/mostafa-wahied/portracker/security/advisories/new).+Please include the affected version, deployment configuration, prerequisites and a minimal+reproduction using synthetic data. Do not post credentials or exploit details in public issues.++## Deployment Trust++Authentication is opt-in. With `ENABLE_AUTH` unset or false, reachable clients are trusted+administrators. Do not expose that mode to untrusted networks. Enable authentication and+use network access controls for shared or remotely reachable deployments.++HTTP peer connections remain supported. HTTP does not encrypt peer keys or responses;+prefer HTTPS or a suitably protected encrypted network. HTTPS certificate verification+is not disabled. Configure the final peer URL: redirects are not followed. Peer destinations+are validated and their DNS addresses are pinned for each request. Private network addresses+are supported; loopback, link-local and reserved peer destinations are rejected.++Changing a peer address or type clears its saved key unless a replacement is supplied.+Renaming a peer does not clear its key. A compromised configured peer can still receive+credentials intended for that peer; destination validation is not protection against a+compromised trusted endpoint.++## Peer Key Storage And Recovery++Outbound peer keys require reversible storage because Portracker must send them to peers.+They are encrypted with AES-256-GCM and bound to the peer ID and URL. Inbound API keys remain+hashed. Legacy outbound keys are migrated automatically and transactionally when needed.++The default encryption key is a generated 32-byte file named `peer-keys.key` beside the+database. It is created with mode 600. `PEER_KEY_FILE` can specify an absolute path to a+separate persistent key file; the application must be able to read it. Symlinks, malformed+keys and group/world-readable key files are rejected on systems supporting POSIX permissions.++Back up the database and its matching key file together, privately. A complete backup of+the default data directory includes both. If using `PEER_KEY_FILE`, back up that separate+file too. Keep the key across container recreation, host migration and restores.++An encrypted database with a missing, incorrect or unreadable key fails closed at startup.+Restore its original key file and permissions before restarting. Do not generate a new key+over an encrypted database. Contact the maintainer for controlled peer reconfiguration if+the key is irretrievably lost; other database records should not be discarded.++This protects a database-only disclosure, not access to both the database and key or a+compromised host. Older backups can still contain plaintext keys; migration cannot erase+external backups or storage snapshots. Protect or retire them and rotate credentials when+exposure is suspected. Rolling back to a version without encrypted-key support requires a+compatible, protected backup and explicit recovery planning.++## Diagnostics And Request Limits++Raw container diagnostics are opt-in and, with authentication enabled, require a signed-in+user rather than a peer key. Diagnostic APIs omit environment values, commands, arbitrary+labels, health-check output and raw application configuration. Compose grouping and normal+port/VM metadata remain available. Do not deliberately place secrets in display names.+Known health reason codes remain visible; untrusted free-form diagnostic errors are hidden.+For a remote peer that requires a session for raw diagnostics, the details drawer offers+"Open remote server". Sign in there to view or export raw diagnostics. Browser sessions+are not forwarded between instances, and peer keys retain access to standard details only.++Peer responses have a separate default size limit of 8 MiB. `PEER_MAX_RESPONSE_BYTES` accepts+a positive integer byte limit for trusted larger inventories. An oversized response reports+this setting instead of suggesting a bad credential. Keep a finite budget appropriate to+available memory; larger limits increase per-request memory exposure. The autoxpose response+budget is separate and unchanged.++Ping is restricted to the latest server-side discovered inventory, with validated destinations,+bounded responses and no redirects. Refresh discovery after restarting or changing services.+Discovered local services may be checked; this is not an arbitrary network probing API.++Generation defaults to 30 requests per minute per client IP; ping defaults to 6000 to support+large dashboards. `GENERATE_PORT_REQUESTS_PER_MINUTE` and `PING_REQUESTS_PER_MINUTE` accept+positive integer overrides. Excess requests return 429 and `Retry-After`. Limits are per+process and reset at restart. Reverse proxies can cause clients to share the same rate-limit+bucket; size limits for that deployment rather than trusting arbitrary forwarded IP headers.++If credentials may have been exposed, restrict access, update to the relevant fixed release,+rotate affected credentials in their owning services and review their access logs. A passing+test or an upgrade does not establish whether a past compromise occurred.\ No newline at end of filediff --git a/backend/db.js b/backend/db.jsindex 2125b02..2920f3d 100644--- a/backend/db.js+++ b/backend/db.js@@ -3,6 +3,7 @@ const path = require("path");const Database = require("better-sqlite3");const { Logger } = require("./lib/logger");const { migrateServersInPlace } = require("./lib/db/servers-migrations");+const { createPeerKeyStore } = require("./lib/peer-key-store");const logger = new Logger("Database", { debug: process.env.DEBUG === 'true' });@@ -530,11 +531,6 @@ if (!tableExists) {/*** Ensures that a local server record with the correct URL, type, and platform_type exists in the database.- *- * If the local server entry does not exist, it is created with the specified port and default platform type. If it exists but its URL, type, or platform_type are incorrect, the entry is updated accordingly.- *- * @param {number} [port=3000] - The port to use for the local server's URL.- * @param {boolean} [appDebugEnabled=false] - Enables debug logging if set to true.* @returns {boolean} True if the local server entry exists or was successfully created/updated; false if an error occurred or the schema is incomplete.*/function ensureLocalServer(port = 3000, appDebugEnabled = false) {@@ -651,6 +647,9 @@ function updateLocalServerPlatformType(platformType, appDebugEnabled = false) {}}+db.peerKeys = createPeerKeyStore(db, {+ keyFile: dbPath === ":memory:" ? null : process.env.PEER_KEY_FILE || path.join(path.dirname(path.resolve(dbPath)), "peer-keys.key"),+});module.exports = db;module.exports.ensureLocalServer = ensureLocalServer;module.exports.updateLocalServerPlatformType = updateLocalServerPlatformType;diff --git a/backend/index.js b/backend/index.jsindex 715766b..d3ad752 100644--- a/backend/index.js+++ b/backend/index.js@@ -6,14 +6,13 @@ const session = require('express-session');const cookieParser = require('cookie-parser');const path = require('path');const fs = require('fs');-const fetch = (...args) => (globalThis.fetch ? globalThis.fetch(...args) : import('node-fetch').then(m => m.default(...args)));const { Logger } = require('./lib/logger');const DockerAPIClient = require('./lib/docker-api');const { createCollector, detectCollector } = require('./collectors');const net = require('net');const db = require('./db');-const https = require("https");-const { getConfiguredCorsOrigins, requireAllowedOrigin, requireAuth, requireAuthOrApiKey, checkAuthEnabled, isAuthEnabled } = require('./middleware/auth');+const { getConfiguredCorsOrigins, requireAllowedOrigin, requireAuth, requireAuthOrApiKey, requireDiagnosticSession, checkAuthEnabled, isAuthEnabled } = require('./middleware/auth');+const { sanitizeDiagnosticResponses } = require('./lib/diagnostic-data');const authRoutes = require('./routes/auth');const settingsRoutes = require('./routes/settings');const autoxposeRoutes = require('./routes/autoxpose');@@ -23,6 +22,11 @@ const recoveryManager = require('./lib/recovery-manager');const { enrichComposeLabelsOnPorts: enrichComposeLabelsOnPortsImpl } = require('./lib/docker/compose-attribution');const { getDockerHostIP } = require('./lib/docker-host');const { buildContainerPortDetails, sanitizeDockerInspection, sanitizeInternalPortRows, sanitizeScanPayload } = require('./lib/docker/internal-ports');+const { PingTargets, probeFetch } = require('./lib/ping-policy');+const pingTargets = new PingTargets();+const { requestPeer } = require('./lib/peer-http');+const peerRequest = (server, endpoint, options = {}) => requestPeer(server, endpoint, { ...options, openKey: db.peerKeys.open });+const { generatePortLimit, pingRequestLimit } = require('./middleware/operation-limits');const logger = new Logger("Server", { debug: process.env.DEBUG === 'true' });const BASE_DEBUG = process.env.DEBUG === 'true';@@ -121,18 +125,20 @@ function detectServiceType(port, owner) {return { name: 'Service', type: 'service', description: 'Application service' };}-async function testProtocol(scheme, host_ip, port, path = "/", isDebugEnabled = false) {+async function testProtocol(scheme, host_ip, port, path = "/", isDebugEnabled = false, allowLoopback = false) {const controller = new AbortController();const timeout = setTimeout(() => controller.abort(), PING_TIMEOUT);- const url = `${scheme}://${host_ip}:${port}${path}`;+ const hostname = net.isIP(host_ip) === 6 ? `[${host_ip}]` : host_ip;+ const url = `${scheme}://${hostname}:${port}${path}`;try {const startTime = Date.now();try {- const headResponse = await fetch(url, {+ const headResponse = await probeFetch(url, {method: 'HEAD',+ allowLoopback,signal: controller.signal,headers: {'User-Agent': 'PortTracker/1.0',@@ -167,8 +173,9 @@ async function testProtocol(scheme, host_ip, port, path = "/", isDebugEnabled =try {const getStartTime = Date.now();- const getResponse = await fetch(url, {+ const getResponse = await probeFetch(url, {method: 'GET',+ allowLoopback,signal: controller.signal,headers: {'User-Agent': 'PortTracker/1.0',@@ -234,28 +241,8 @@ async function testProtocol(scheme, host_ip, port, path = "/", isDebugEnabled =if (scheme === 'https') {try {const start = Date.now();- const permissiveStatus = await new Promise((resolve, reject) => {- const req = https.request(- {- hostname: host_ip,- port,- path,- method: 'GET',- rejectUnauthorized: false,- timeout: PING_TIMEOUT,- },- (res) => {- const code = res.statusCode || 200;- res.resume();- resolve({ statusCode: code });- }- );- req.on('error', reject);- req.on('timeout', () => {- req.destroy(new Error('timeout'));- });- req.end();- });+ const fallback = await probeFetch(url, { method: 'GET', signal: controller.signal, allowLoopback, rejectUnauthorized: false });+ const permissiveStatus = { statusCode: fallback.status };const duration = Date.now() - start;if (isDebugEnabled) {logPingDebug(`testProtocol HTTPS permissive GET ${url} -> ${permissiveStatus.statusCode} (${duration}ms)`);@@ -521,6 +508,7 @@ if (isAuthEnabled()) {}app.use(checkAuthEnabled);+app.use(['/api/ports', '/api/all-ports', '/api/services', '/api/servers/:id/scan', '/api/containers/:id/details'], sanitizeDiagnosticResponses);app.use('/api/auth', authRoutes);app.use('/api/settings', requireAuth, settingsRoutes);@@ -579,6 +567,7 @@ app.get("/api/ports", requireAuthOrApiKey, async (req, res) => {...e,owner: e.owners.join(", "),}));+ pingTargets.record({ id: 'local' }, payload);if (!debug && process.env.DISABLE_CACHE !== 'true') {responseCache.set(cacheKey, payload, RESP_TTL_PORTS);}@@ -664,6 +653,7 @@ async function getLocalPortsUsingCollectors(options = {}) {logger.debug(`[getLocalPortsUsingCollectors] Detected collector: ${collector?.platform}`);const ports = sanitizeInternalPortRows(await collector.getPorts(), logger.warn.bind(logger));+ pingTargets.record({ id: 'local' }, ports);logger.debug(`[getLocalPortsUsingCollectors] Collected ${ports?.length || 0} ports.`);await enrichComposeLabelsOnPorts(ports);@@ -918,6 +908,7 @@ app.get("/api/servers/:id/scan", requireAuthOrApiKey, async (req, res) => {collectData.ports?.length || 0}, VMs: ${collectData.vms?.length || 0}`);+ pingTargets.record(server, collectData.ports);return res.json(collectData);}@@ -928,20 +919,8 @@ app.get("/api/servers/:id/scan", requireAuthOrApiKey, async (req, res) => {const peerScanUrl = new URL("/api/servers/local/scan", server.url).href;logger.debug(`[GET /api/servers/${serverId}/scan] Fetching from peer URL: ${peerScanUrl}`);- const controller = new AbortController();- const timeoutId = setTimeout(() => controller.abort(), 15000);-- const fetchHeaders = {};- if (server.remote_api_key) {- fetchHeaders['X-API-Key'] = server.remote_api_key;- }-try {- const peerResponse = await fetch(peerScanUrl, {- signal: controller.signal,- headers: fetchHeaders- });- clearTimeout(timeoutId);+ const peerResponse = await peerRequest(server, '/api/servers/local/scan');if (!peerResponse.ok) {let errorBody = "Peer responded with an error.";@@ -960,11 +939,10 @@ app.get("/api/servers/:id/scan", requireAuthOrApiKey, async (req, res) => {}const peerScanData = sanitizeScanPayload(await peerResponse.json(), logger.warn.bind(logger));-+ pingTargets.record(server, peerScanData.ports);logger.debug(`Peer scan complete: ${server.label} (${serverId})`);return res.json(peerScanData);} catch (fetchError) {- clearTimeout(timeoutId);if (fetchError.name === 'AbortError') {logger.error(`[GET /api/servers/${serverId}/scan] Timeout after 15s communicating with peer ${server.label} at ${server.url}`@@ -1011,11 +989,10 @@ app.get("/api/servers/:id/scan", requireAuthOrApiKey, async (req, res) => {}});-app.post("/api/servers/:id/generate-port", async (req, res) => {+app.post("/api/servers/:id/generate-port", requireAuthOrApiKey, generatePortLimit, async (req, res) => {const serverId = req.params.id;const currentDebug = req.query.debug === "true" || process.env.DEBUG === 'true';if (Object.prototype.hasOwnProperty.call(req.query, 'debug')) logger.setDebugEnabled(currentDebug);-try {const server = db.prepare("SELECT * FROM servers WHERE id = ?").get(serverId);if (!server) {@@ -1031,18 +1008,8 @@ app.post("/api/servers/:id/generate-port", async (req, res) => {}if (server.type === "peer" && server.url) {- const peerUrl = new URL("/api/servers/local/generate-port", server.url).href;- const controller = new AbortController();- const timeoutId = setTimeout(() => controller.abort(), 15000);-- const peerHeaders = {};- if (server.remote_api_key) {- peerHeaders['X-API-Key'] = server.remote_api_key;- }-try {- const peerResponse = await fetch(peerUrl, { method: "POST", signal: controller.signal, headers: peerHeaders });- clearTimeout(timeoutId);+ const peerResponse = await peerRequest(server, '/api/servers/local/generate-port', { method: 'POST' });if (peerResponse.ok) {const payload = await peerResponse.json();@@ -1052,8 +1019,7 @@ app.post("/api/servers/:id/generate-port", async (req, res) => {if (peerResponse.status === 404 || peerResponse.status === 405 || peerResponse.status === 501) {logger.warn(`[generate-port] Peer ${server.label} missing generate endpoint, falling back to scan.`);try {- const scanUrl = new URL("/api/servers/local/scan", server.url).href;- const scanResponse = await fetch(scanUrl, { method: "GET", signal: controller.signal, headers: peerHeaders });+ const scanResponse = await peerRequest(server, '/api/servers/local/scan');if (scanResponse.ok) {const scanData = sanitizeScanPayload(await scanResponse.json(), logger.warn.bind(logger));@@ -1078,7 +1044,6 @@ app.post("/api/servers/:id/generate-port", async (req, res) => {details: body || `Status ${peerResponse.status}`,});} catch (err) {- clearTimeout(timeoutId);const errMsg = err.name === "AbortError" ? "Peer request timed out" : err.message;logger.error(`[generate-port] Failed to reach peer ${server.label} (${server.url}): ${errMsg}`);return res.status(502).json({@@ -2100,7 +2065,7 @@ app.post("/api/notes/batch", requireAuth, (req, res) => {}});-app.get("/api/ping", requireAuthOrApiKey, async (req, res) => {+app.get("/api/ping", requireAuthOrApiKey, pingRequestLimit, pingTargets.guard(db), async (req, res) => {const { host_ip, host_port, target_server_url, owner, internal, container_id, source } = req.query;const serverId = req.query.server_id;const currentDebug = req.query.debug === "true";@@ -2126,7 +2091,6 @@ app.get("/api/ping", requireAuthOrApiKey, async (req, res) => {if (!row || !row.url) {return res.status(400).json({ error: 'server url not found for remote ping' });}- const base = row.url.replace(/\/$/, '');const params = new URLSearchParams();params.set('internal', 'true');params.set('container_id', container_id);@@ -2135,10 +2099,8 @@ app.get("/api/ping", requireAuthOrApiKey, async (req, res) => {if (owner) params.set('owner', owner);if (source) params.set('source', source);if (currentDebug) params.set('debug', 'true');- const url = `${base}/api/ping?${params.toString()}`;- const resp = await fetch(url, { headers: { 'accept': 'application/json' } });- const text = await resp.text();- let body; try { body = JSON.parse(text); } catch { body = text; }+ const resp = await peerRequest(req.pingServer, '/api/ping?' + params.toString());+ const body = resp.ok ? await resp.json() : { error: 'Peer ping failed' };return res.status(resp.status).send(body);} catch (e) {logger.error(`[GET /api/ping] Remote proxy to ${serverId} failed:`, e.message);@@ -2258,8 +2220,8 @@ app.get("/api/ping", requireAuthOrApiKey, async (req, res) => {logger.debug(`Testing ${serviceInfo.name} (${serviceInfo.type}) on ${pingable_host_ip}:${portNum}`);}- const httpsResponse = await testProtocol("https", pingable_host_ip, portNum, "/", currentDebug);- const httpResponse = await testProtocol("http", pingable_host_ip, portNum, "/", currentDebug);+ const httpsResponse = await testProtocol("https", pingable_host_ip, portNum, "/", currentDebug, req.pingServer.id === "local");+ const httpResponse = await testProtocol("http", pingable_host_ip, portNum, "/", currentDebug, req.pingServer.id === "local");const result = determineServiceStatus(serviceInfo, httpsResponse, httpResponse);@@ -2346,7 +2308,7 @@ app.get('/api/version', (req, res) => {}});-app.get("/api/containers/:id/details", requireAuthOrApiKey, async (req, res) => {+app.get("/api/containers/:id/details", requireAuthOrApiKey, requireDiagnosticSession, async (req, res) => {const containerId = req.params.id;const currentDebug = req.query.debug === 'true';const serverId = req.query.server_id;@@ -2364,18 +2326,23 @@ app.get("/api/containers/:id/details", requireAuthOrApiKey, async (req, res) =>try {if (serverId && serverId !== 'local') {try {- const row = db.prepare('SELECT url FROM servers WHERE id = ?').get(serverId);+ const row = db.prepare('SELECT * FROM servers WHERE id = ?').get(serverId);if (!row || !row.url) {return res.status(400).json({ error: 'server url not found for remote details' });}- const base = row.url.replace(/\/$/, '');const forwardable = ['raw','size','stats','export','debug'];const qsFlags = forwardable.filter(f => req.query[f] === 'true').map(f => `${f}=true`);- const url = `${base}/api/containers/${encodeURIComponent(containerId)}/details${qsFlags.length ? '?' + qsFlags.join('&') : ''}`;- const remoteResp = await fetch(url, { method: 'GET', headers: { 'accept': 'application/json' } });- const text = await remoteResp.text();- let body;- try { body = JSON.parse(text); } catch { body = text; }+ const endpoint = `/api/containers/${encodeURIComponent(containerId)}/details${qsFlags.length ? '?' + qsFlags.join('&') : ''}`;+ const remoteResp = await peerRequest(row, endpoint);+ const peerPage = new URL('/', row.url);+ peerPage.search = new URLSearchParams({ server: 'local', container: containerId }).toString();+ if (includeRaw && [401, 403].includes(remoteResp.status)) {+ return res.status(403).json({ code: 'RAW_DIAGNOSTICS_REQUIRE_REMOTE_LOGIN', error: 'Sign in on the remote server to view raw diagnostics.', peerUrl: peerPage.href });+ }+ const body = remoteResp.ok ? await remoteResp.json() : { error: 'Peer container details failed' };+ if (remoteResp.ok && body && typeof body === 'object' && !Array.isArray(body)) {+ body.rawDiagnostics = { available: body.rawDiagnostics?.available !== false, peerUrl: peerPage.href };+ }if (body && Array.isArray(body.ports)) {body.ports = sanitizeInternalPortRows(body.ports, logger.warn.bind(logger));body.exposedUnmapped = body.ports@@ -2389,7 +2356,7 @@ app.get("/api/containers/:id/details", requireAuthOrApiKey, async (req, res) =>} catch (proxyErr) {logger.error(`Proxy to peer ${serverId} for container ${containerId} failed:`, proxyErr.message);logger.debug('Stack trace:', proxyErr.stack || '');- return res.status(502).json({ error: 'failed to proxy remote container details' });+ return res.status(502).json({ error: proxyErr.code === 'PEER_RESPONSE_TOO_LARGE' ? proxyErr.message : 'failed to proxy remote container details' });}}@@ -2433,6 +2400,7 @@ app.get("/api/containers/:id/details", requireAuthOrApiKey, async (req, res) =>const ephemeral = normalizedRestartPolicy === 'none' && (uptimeSeconds != null) && uptimeSeconds < 300;const response = {+ rawDiagnostics: { available: !isAuthEnabled() || !!req.session?.userId },id: insp.Id?.substring(0, 12) || containerId,name: (insp.Name || '').replace(/^\//, ''),image: insp.Config?.Image,diff --git a/backend/lib/autoxpose-http.js b/backend/lib/autoxpose-http.jsindex 432d27e..0702258 100644--- a/backend/lib/autoxpose-http.js+++ b/backend/lib/autoxpose-http.js@@ -72,8 +72,8 @@ async function requestAutoxposeJson(baseUrl, endpoint, options = {}) {);request = requestImplementation(target, {- method: "GET",- headers: { Accept: "application/json" },+ method: options.method || "GET",+ headers: { Accept: "application/json", ...options.headers },lookup: createPinnedLookup(resolution.addresses),agent: false,}, (response) => {@@ -92,6 +92,7 @@ async function requestAutoxposeJson(baseUrl, endpoint, options = {}) {size += buffer.length;if (size > maxResponseBytes) {const error = new Error("Autoxpose response exceeds the size limit");+ error.code = "RESPONSE_TOO_LARGE";fail(error);response.destroy();request?.destroy();@@ -119,5 +120,6 @@ async function requestAutoxposeJson(baseUrl, endpoint, options = {}) {}module.exports = {+ createPinnedLookup,requestAutoxposeJson,};\ No newline at end of filediff --git a/backend/lib/diagnostic-data.js b/backend/lib/diagnostic-data.jsnew file mode 100644index 0000000..21da462--- /dev/null+++ b/backend/lib/diagnostic-data.js@@ -0,0 +1,41 @@+const omitted = new Set(["env", "environment", "command", "cmd", "args", "entrypoint", "healthcheck", "containerconfig", "logconfig"]);+const labels = new Set(["com.docker.compose.project", "com.docker.compose.service", "com.docker.compose.container-number", "com.docker.compose.version"]);+const originalFields = new Set(["id", "name", "memory", "vcpus", "cpu", "status", "autostart"]);+const safeErrors = new Set([+ "ECONNREFUSED", "ECONNRESET", "ETIMEDOUT", "EHOSTUNREACH", "ENETUNREACH", "ENOTFOUND", "EAI_AGAIN",+ "timeout", "healthcheck-unhealthy", "stale-completion", "docker-api-unavailable", "inspect-failed",+ "send-failed", "send-threw", "no-valid-host-port", "missing-container-id", "unreachable",+ "Peer response exceeds PEER_MAX_RESPONSE_BYTES; increase this byte limit for a trusted larger inventory",+ "PEER_MAX_RESPONSE_BYTES must be a positive integer byte limit",+ "Sign in on the remote server to view raw diagnostics.",+]);++function diagnosticError(error) {+ if (!error || safeErrors.has(error)) return error;+ if (typeof error === "string" && (/^exit-code--?\d{1,10}$/.test(error) ||+ /^not-exited-(created|running|paused|restarting|removing|exited|dead)$/.test(error))) return error;+ return "Diagnostic operation failed";+}++function redactDiagnosticData(value, depth = 0) {+ if (depth > 32) return null;+ if (!value || typeof value !== "object") return value;+ if (Array.isArray(value)) return value.map(item => redactDiagnosticData(item, depth + 1));+ return Object.fromEntries(Object.entries(value).flatMap(([key, entry]) => {+ const lower = key.toLowerCase();+ if (omitted.has(lower) || /password|passwd|secret|token|api[_-]?key|credential|private[_-]?key/.test(lower)) return [];+ if (lower === "labels") return [[key, Object.fromEntries(Object.entries(entry || {}).filter(([name]) => labels.has(name)))]];+ if (lower === "orig_data") entry = Object.fromEntries(Object.entries(entry || {}).filter(([name]) => originalFields.has(name)));+ if (lower === "health" && entry && typeof entry === "object") entry = { Status: entry.Status, FailingStreak: entry.FailingStreak };+ if (lower === "error") return [[key, diagnosticError(entry)]];+ return [[key, redactDiagnosticData(entry, depth + 1)]];+ }));+}++function sanitizeDiagnosticResponses(_request, response, next) {+ const json = response.json;+ response.json = function (body) { return json.call(this, redactDiagnosticData(body)); };+ next();+}++module.exports = { redactDiagnosticData, sanitizeDiagnosticResponses };\ No newline at end of filediff --git a/backend/lib/diagnostic-data.test.js b/backend/lib/diagnostic-data.test.jsnew file mode 100644index 0000000..4ddb2de--- /dev/null+++ b/backend/lib/diagnostic-data.test.js@@ -0,0 +1,135 @@+const { describe, test, expect, jest: jestObject, afterEach } = require("@jest/globals");+const fs = require("node:fs");+const path = require("node:path");+const vm = require("node:vm");+const { once } = require("node:events");+const express = require("express");+jestObject.mock("./api-key-manager", () => ({ validateAnyApiKey: async key => ({ valid: key === "synthetic-peer-key", serverId: "local" }) }));+const { redactDiagnosticData, sanitizeDiagnosticResponses } = require("./diagnostic-data");+const { requireDiagnosticSession, requireAuthOrApiKey, isAuthEnabled } = require("../middleware/auth");+const { buildContainerPortDetails, sanitizeInternalPortRows, sanitizeDockerInspection } = require("./docker/internal-ports");+const originalAuth = process.env.ENABLE_AUTH;+afterEach(() => { if (originalAuth === undefined) delete process.env.ENABLE_AUTH; else process.env.ENABLE_AUTH = originalAuth; });++describe("diagnostic confidentiality", () => {+ test.each([["true", false], ["false", false], ["true", true]])("preserves peer diagnostics auth=%s legacy=%s without elevating keys", async (auth, legacy) => {+ process.env.ENABLE_AUTH = auth;+ const source = fs.readFileSync(path.join(__dirname, "../index.js"), "utf8");+ const route = source.match(/app\.get\("\/api\/containers\/:id\/details",[\s\S]+?\n\}\);/)[0];+ const logger = { warn() {}, error() {}, debug() {}, setDebugEnabled() {} };+ const common = { requireAuthOrApiKey, requireDiagnosticSession, isAuthEnabled, URL, URLSearchParams, logger, buildContainerPortDetails, sanitizeInternalPortRows, sanitizeDockerInspection };+ const peer = express();+ const origin = express();+ peer.use(sanitizeDiagnosticResponses);+ origin.use(sanitizeDiagnosticResponses);+ origin.use((request, _response, next) => { request.session = { userId: "fixture-user" }; next(); });+ vm.runInNewContext(route, { ...common, app: peer, dockerApi: {+ inspectContainer: async () => ({ Id: "fixture", Config: { Image: "fixture:1" }, State: { Status: "running" } }),+ getContainerHealth: async () => ({ health: "healthy" }),+ getContainerStats: async () => ({ read: "2026-09-14T00:00:00Z", memory: 4096 }),+ } });+ const listener = peer.listen(0, "127.0.0.1");+ let proxy;+ try {+ await once(listener, "listening");+ vm.runInNewContext(route, { ...common, app: origin,+ db: { prepare: () => ({ get: () => ({ id: "peer", url: "https://peer.invalid:8443", remote_api_key: "encrypted-fixture" }) }) },+ peerRequest: async (_server, endpoint) => {+ const response = await fetch(`http://127.0.0.1:${listener.address().port}${endpoint}`, { headers: { "X-API-Key": "synthetic-peer-key" } });+ const body = await response.json();+ if (legacy) delete body.rawDiagnostics;+ else if (body.rawDiagnostics) body.rawDiagnostics.peerUrl = "https://untrusted.invalid/";+ return { ok: response.ok, status: response.status, json: async () => body };+ },+ });+ proxy = origin.listen(0, "127.0.0.1");+ await once(proxy, "listening");+ const base = `http://127.0.0.1:${proxy.address().port}/api/containers/fixture/details?server_id=peer`;+ const normal = await fetch(base);+ expect(normal.status).toBe(200);+ expect((await normal.json()).rawDiagnostics).toEqual({ available: auth !== "true" || legacy, peerUrl: "https://peer.invalid:8443/?server=local&container=fixture" });+ const stats = await fetch(base + "&stats=true");+ expect(stats.status).toBe(200);+ expect((await stats.json()).stats.memory).toBe(4096);+ for (const flags of ["&raw=true", "&raw=true&export=true"]) {+ const response = await fetch(base + flags);+ expect(response.status).toBe(auth === "true" ? 403 : 200);+ const body = await response.json();+ if (auth !== "true") { expect(body.raw.Config.Image).toBe("fixture:1"); continue; }+ expect(body.code).toBe("RAW_DIAGNOSTICS_REQUIRE_REMOTE_LOGIN");+ expect(body.error).toBe("Sign in on the remote server to view raw diagnostics.");+ expect(body.peerUrl).toBe("https://peer.invalid:8443/?server=local&container=fixture");+ expect(body.raw).toBeUndefined();+ }+ } finally {+ for (const server of [proxy, listener].filter(Boolean)) { server.closeAllConnections(); await new Promise(resolve => server.close(resolve)); }+ }+ });++});++describe("diagnostic response redaction", () => {+ test("redacts every accepted spelling of production diagnostic routes", async () => {+ const app = express();+ const source = fs.readFileSync(path.join(__dirname, "../index.js"), "utf8");+ const registration = source.split("\n").find(line => line.includes("app.use(") && line.includes("sanitizeDiagnosticResponses"));+ expect(registration).toBeDefined();+ vm.runInNewContext(registration, { app, sanitizeDiagnosticResponses });+ const routes = ["/api/ports", "/api/all-ports", "/api/services", "/api/servers/:id/scan", "/api/containers/:id/details"];+ for (const route of routes) app.get(route, (_request, response) => response.json({+ command: "synthetic-private-command", labels: { custom: "synthetic-private-label" },+ raw: { Config: { Env: ["SYNTHETIC=private"], Cmd: ["synthetic-private-command"] } },+ applications: [{ platform_data: { orig_data: { config: { custom: "synthetic-private-config" }, memory: 4096 } } }],+ }));+ const listener = app.listen(0, "127.0.0.1");+ try {+ await once(listener, "listening");+ for (const route of routes) {+ const canonical = route.replace(":id", "fixture");+ for (const variant of [canonical, canonical + "/", canonical.toUpperCase(), canonical.toUpperCase() + "/"]) {+ const response = await fetch(`http://127.0.0.1:${listener.address().port}${variant}?raw=true&export=true`);+ expect(response.status).toBe(200);+ const text = await response.text();+ expect(text).not.toContain("private");+ expect(JSON.parse(text).applications[0].platform_data.orig_data.memory).toBe(4096);+ }+ }+ } finally { listener.closeAllConnections(); await new Promise(resolve => listener.close(resolve)); }+ });++ test("preserves safe health codes but hides untrusted free-form errors", () => {+ const known = ["ECONNREFUSED", "ETIMEDOUT", "timeout", "healthcheck-unhealthy", "docker-api-unavailable", "exit-code-12", "not-exited-running",+ "Peer response exceeds PEER_MAX_RESPONSE_BYTES; increase this byte limit for a trusted larger inventory",+ "PEER_MAX_RESPONSE_BYTES must be a positive integer byte limit"];+ for (const error of known) expect(redactDiagnosticData({ probe: { error } }).probe.error).toBe(error);+ for (const error of ["synthetic-private-error", "ECONNREFUSED synthetic-private", "exit-code-1 synthetic-private", { message: "synthetic-private" }]) {+ expect(redactDiagnosticData({ probe: { error } }).probe.error).toBe("Diagnostic operation failed");+ }+ });++ test("removes command, labels, health logs and raw application configuration without mutation", () => {+ const data = { ports: [{ host_port: 8080, command: "synthetic-secret" }], raw: {+ Args: ["synthetic-secret"], Config: { Env: ["synthetic-secret"], Cmd: ["synthetic-secret"], Entrypoint: ["synthetic-secret"], Labels: { "custom": "synthetic-secret", "com.docker.compose.project": "fixture" }, Healthcheck: { Test: ["synthetic-secret"] } },+ State: { Health: { Status: "healthy", Log: [{ Output: "synthetic-secret" }] } },+ }, applications: [{ platform_data: { orig_data: { id: "fixture", config: { custom: "synthetic-secret" }, memory: 4096 } } }], password: "synthetic-secret" };+ const before = JSON.stringify(data);+ const safe = redactDiagnosticData(data);+ expect(JSON.stringify(safe)).not.toContain("synthetic-secret");+ expect(safe.ports[0].host_port).toBe(8080);+ expect(safe.raw.Config.Labels).toEqual({ "com.docker.compose.project": "fixture" });+ expect(safe.applications[0].platform_data.orig_data.memory).toBe(4096);+ expect(JSON.stringify(data)).toBe(before);+ expect(redactDiagnosticData(safe)).toEqual(safe);+ });++ test.each([["true", false, "true", 403], ["true", true, "true", 200], ["false", false, "true", 200], ["true", false, undefined, 200]])(+ "restricts raw diagnostics auth=%s session=%s raw=%s", (auth, session, raw, expected) => {+ process.env.ENABLE_AUTH = auth;+ const response = { status: jestObject.fn().mockReturnThis(), json: jestObject.fn() };+ const next = jestObject.fn();+ requireDiagnosticSession({ query: { raw }, session: session ? { userId: "fixture" } : null }, response, next);+ if (expected === 403) { expect(response.status).toHaveBeenCalledWith(403); expect(next).not.toHaveBeenCalled(); }+ else expect(next).toHaveBeenCalledTimes(1);+ }+ );+});\ No newline at end of filediff --git a/backend/lib/docker/internal-ports.js b/backend/lib/docker/internal-ports.jsindex 1bb691e..189909e 100644--- a/backend/lib/docker/internal-ports.js+++ b/backend/lib/docker/internal-ports.js@@ -1,4 +1,5 @@const DEFAULT_MAX_UNPUBLISHED_EXPOSED_PORTS = 100;+const { redactDiagnosticData } = require("../diagnostic-data");function getMaxUnpublishedExposedPorts() {const raw = Number(process.env.MAX_INTERNAL_PORTS_PER_CONTAINER || "");@@ -175,6 +176,7 @@ function sanitizeDockerInspection(inspection, logWarn) {if (!inspection || typeof inspection !== "object") {return inspection;}+ inspection = redactDiagnosticData(inspection);const config = inspection.Config || {};const networkSettings = inspection.NetworkSettings || {};const hostConfig = inspection.HostConfig || {};diff --git a/backend/lib/docker/internal-ports.test.js b/backend/lib/docker/internal-ports.test.jsindex 8dfdcc0..2fd0488 100644--- a/backend/lib/docker/internal-ports.test.js+++ b/backend/lib/docker/internal-ports.test.js@@ -204,7 +204,7 @@ describe("sanitizeDockerInspection", () => {Id: "abcdef1234567890",Name: "/test-container",Config: {- Labels: { test: "value" },+ Labels: { "com.docker.compose.project": "value" },ExposedPorts: { "80/tcp": {}, ...makeExposedPorts(3, 1000) },},HostConfig: {@@ -232,18 +232,18 @@ describe("sanitizeDockerInspection", () => {expect(result.NetworkSettings.Ports).toEqual({"80/tcp": [{ HostIp: "0.0.0.0", HostPort: "8080" }],});- expect(result.Config.Labels).toEqual({ test: "value" });+ expect(result.Config.Labels).toEqual({ "com.docker.compose.project": "value" });expect(result.NetworkSettings.Networks.bridge.IPAddress).toBe("172.17.0.2");});- test("returns the original inspection at or below the limit", () => {+ test("preserves safe inspection values at or below the limit", () => {process.env.MAX_INTERNAL_PORTS_PER_CONTAINER = "2";const inspection = {Config: { ExposedPorts: makeExposedPorts(2) },NetworkSettings: { Ports: {} },};- expect(sanitizeDockerInspection(inspection)).toBe(inspection);+ expect(sanitizeDockerInspection(inspection)).toEqual(inspection);});});diff --git a/backend/lib/peer-http.js b/backend/lib/peer-http.jsnew file mode 100644index 0000000..a0771ff--- /dev/null+++ b/backend/lib/peer-http.js@@ -0,0 +1,42 @@+const { requestAutoxposeJson } = require("./autoxpose-http");+const DEFAULT_PEER_RESPONSE_BYTES = 8 * 1024 * 1024;++function peerResponseLimit() {+ const configured = process.env.PEER_MAX_RESPONSE_BYTES;+ if (configured === undefined) return DEFAULT_PEER_RESPONSE_BYTES;+ const value = Number(configured);+ if (!Number.isSafeInteger(value) || value < 1) throw new Error("PEER_MAX_RESPONSE_BYTES must be a positive integer byte limit");+ return value;+}++function validatePeerUrl(value) {+ let url;+ try { url = new URL(value); } catch { throw new Error("Peer URL must be an absolute HTTP or HTTPS URL"); }+ if (typeof value !== "string" || !["http:", "https:"].includes(url.protocol) ||+ url.username || url.password || url.search || url.hash || value.includes("\\") || [...value].some(character => character.charCodeAt(0) <= 32)) {+ throw new Error("Peer URL must use HTTP or HTTPS without credentials, query or fragment");+ }+ return url.href;+}++async function requestPeer(server, endpoint, options = {}) {+ validatePeerUrl(server.url);+ if (!endpoint.startsWith("/api/") || endpoint.startsWith("//") || endpoint.includes("#")) throw new Error("Invalid peer endpoint");+ const key = server.remote_api_key ? options.openKey(server) : null;+ const maxResponseBytes = peerResponseLimit();+ try {+ const result = await requestAutoxposeJson(new URL(server.url).origin, endpoint, {+ timeoutMs: 15000, maxResponseBytes, ...options, headers: key ? { "X-API-Key": key } : {},+ });+ return { ok: result.ok, status: result.status, json: async () => result.data, text: async () => "Peer request failed" };+ } catch (error) {+ if (error.code === "RESPONSE_TOO_LARGE") {+ const failure = new Error("Peer response exceeds PEER_MAX_RESPONSE_BYTES; increase this byte limit for a trusted larger inventory");+ failure.code = "PEER_RESPONSE_TOO_LARGE";+ throw failure;+ }+ throw new Error("Peer request failed; verify its address, reachability, certificate and credential configuration");+ }+}++module.exports = { requestPeer, validatePeerUrl };\ No newline at end of filediff --git a/backend/lib/peer-http.test.js b/backend/lib/peer-http.test.jsnew file mode 100644index 0000000..dee01ae--- /dev/null+++ b/backend/lib/peer-http.test.js@@ -0,0 +1,92 @@+const { EventEmitter } = require("node:events");+const { Readable } = require("node:stream");+const { describe, test, expect, jest: jestObject, afterEach } = require("@jest/globals");+const { requestPeer, validatePeerUrl } = require("./peer-http");++const originalLimit = process.env.PEER_MAX_RESPONSE_BYTES;+afterEach(() => {+ if (originalLimit === undefined) delete process.env.PEER_MAX_RESPONSE_BYTES;+ else process.env.PEER_MAX_RESPONSE_BYTES = originalLimit;+});++function fixtureResponse(status = 200, body = { ports: [], echo: "synthetic-error-key" }) {+ const calls = [];+ const request = (url, options, callback) => {+ calls.push({ url, options });+ const outgoing = new EventEmitter();+ outgoing.destroy = () => {};+ outgoing.end = () => {+ const response = Readable.from([JSON.stringify(body)]);+ response.statusCode = status;+ callback(response);+ };+ return outgoing;+ };+ return { request, calls, lookup: async () => [{ address: "192.168.1.20", family: 4 }], openKey: () => "synthetic-peer-key" };+}++describe("peer request boundary", () => {+ test.each(["0", "-1", "invalid", "1.5", "Infinity"])("rejects an invalid peer budget %s before sending requests", async value => {+ process.env.PEER_MAX_RESPONSE_BYTES = value;+ const request = jestObject.fn();+ await expect(requestPeer({ url: "http://peer.invalid" }, "/api/version", { request })).rejects.toThrow("PEER_MAX_RESPONSE_BYTES must be");+ expect(request).not.toHaveBeenCalled();+ });++ test("accepts a valid peer inventory larger than the autoxpose budget", async () => {+ delete process.env.PEER_MAX_RESPONSE_BYTES;+ const body = { ports: Array.from({ length: 9600 }, (_, index) => ({+ source: "docker", host_ip: "0.0.0.0", host_port: 20000 + index % 80, protocol: "tcp", internal: true,+ container_id: `fixture-${Math.floor(index / 80)}-${"c".repeat(64)}`, owner: `fixture-service-${Math.floor(index / 80)}`,+ compose_project: "fixture-project", compose_service: "fixture-service", target: "fixture-container:20000(internal)", note: "ordinary saved note",+ })), applications: [] };+ expect(Buffer.byteLength(JSON.stringify(body))).toBeGreaterThan(2 * 1024 * 1024);+ const response = await requestPeer({ url: "http://peer.invalid" }, "/api/servers/local/scan", fixtureResponse(200, body));+ expect(response.ok).toBe(true);+ expect((await response.json()).ports).toHaveLength(9600);+ });++ test("enforces the configured byte boundary with an actionable safe error", async () => {+ const body = { message: "synthetic-private-value" };+ const size = Buffer.byteLength(JSON.stringify(body));+ process.env.PEER_MAX_RESPONSE_BYTES = String(size);+ expect((await requestPeer({ url: "http://peer.invalid" }, "/api/version", fixtureResponse(200, body))).ok).toBe(true);+ process.env.PEER_MAX_RESPONSE_BYTES = String(size - 1);+ await expect(requestPeer({ url: "http://peer.invalid" }, "/api/version", fixtureResponse(200, body))).rejects.toMatchObject({+ code: "PEER_RESPONSE_TOO_LARGE", message: expect.stringContaining("PEER_MAX_RESPONSE_BYTES"),+ });+ });++ test.each(["http", "https"])("preserves private %s peers with pinned DNS and credentials", async scheme => {+ const fixture = fixtureResponse();+ const response = await requestPeer({ url: `${scheme}://peer.invalid/base`, remote_api_key: "encrypted" }, "/api/servers/local/generate-port", { ...fixture, method: "POST" });+ expect(response.status).toBe(200);+ expect(fixture.calls[0].url.pathname).toBe("/api/servers/local/generate-port");+ expect(fixture.calls[0].options.method).toBe("POST");+ expect(fixture.calls[0].options.headers["X-API-Key"]).toBe("synthetic-peer-key");+ expect(fixture.calls[0].options.rejectUnauthorized).not.toBe(false);+ const addresses = await new Promise(resolve => fixture.calls[0].options.lookup("peer.invalid", { all: true }, (_error, answer) => resolve(answer)));+ expect(addresses).toEqual([{ address: "192.168.1.20", family: 4 }]);+ });++ test.each(["127.0.0.1", "169.254.169.254", "::1", "::ffff:169.254.169.254"])("refuses resolved %s before sending a credential", async address => {+ const request = jestObject.fn();+ await expect(requestPeer({ url: "http://peer.invalid", remote_api_key: "encrypted" }, "/api/version", {+ request, openKey: () => "synthetic-peer-key", lookup: async () => [{ address, family: address.includes(":") ? 6 : 4 }],+ })).rejects.toThrow("Peer request failed");+ expect(request).not.toHaveBeenCalled();+ });++ test.each([301, 302, 307, 308, 401, 500])("does not follow or reflect status %i", async status => {+ const fixture = fixtureResponse(status);+ const response = await requestPeer({ url: "http://peer.invalid" }, "/api/version", fixture);+ expect(response.ok).toBe(false);+ expect(await response.text()).not.toContain("synthetic-error-key");+ expect(await response.json()).toBeNull();+ expect(fixture.calls).toHaveLength(1);+ });++ test.each(["ftp://peer.invalid", "http://user:[email protected]", "http://peer.invalid/?x=1", "http://peer.invalid/#x", "http://peer.invalid\\other", "http://peer.invalid\n"])("rejects unsafe configuration %s", url => {+ expect(() => validatePeerUrl(url)).toThrow();+ });+});\ No newline at end of filediff --git a/backend/lib/peer-key-store.js b/backend/lib/peer-key-store.jsnew file mode 100644index 0000000..081071b--- /dev/null+++ b/backend/lib/peer-key-store.js@@ -0,0 +1,79 @@+const fs = require("node:fs");+const path = require("node:path");+const crypto = require("node:crypto");++const prefix = "pkey:v1:";++function peerIdentity(server) {+ return JSON.stringify([server.id, new URL(server.url).href]);+}++function loadKey(filename, encryptedRows) {+ if (!filename) {+ if (encryptedRows) throw new Error("Persistent peer encryption key is required");+ return crypto.randomBytes(32);+ }+ if (!path.isAbsolute(filename)) throw new Error("PEER_KEY_FILE must be an absolute path");+ if (!fs.existsSync(filename)) {+ if (encryptedRows) throw new Error("Peer encryption key is missing; restore the original PEER_KEY_FILE with the database");+ const descriptor = fs.openSync(filename, "wx", 0o600);+ try { fs.writeFileSync(descriptor, crypto.randomBytes(32)); fs.fsyncSync(descriptor); }+ finally { fs.closeSync(descriptor); }+ }+ const descriptor = fs.openSync(filename, fs.constants.O_RDONLY | (fs.constants.O_NOFOLLOW || 0));+ try {+ const stat = fs.fstatSync(descriptor);+ if (!stat.isFile() || stat.size !== 32 || fs.lstatSync(filename).isSymbolicLink() ||+ (process.platform !== "win32" && (stat.mode & 0o077))) {+ throw new Error("Peer encryption key must be a private mode-600 regular file containing 32 bytes");+ }+ return fs.readFileSync(descriptor);+ } finally { fs.closeSync(descriptor); }+}++function createPeerKeyStore(db, { keyFile } = {}) {+ const rows = db.prepare("SELECT id, url, remote_api_key FROM servers WHERE remote_api_key IS NOT NULL").all();+ const encryptedRows = rows.some(row => row.remote_api_key.startsWith("pkey:"));+ let key = rows.length ? loadKey(keyFile, encryptedRows) : null;+ const seal = (server, value) => {+ if (value === null || value === undefined || value === "") return null;+ if (typeof value !== "string" || value.length > 8192 || /[\r\n]/.test(value)) throw new Error("Invalid peer API key");+ key ||= loadKey(keyFile, false);+ const nonce = crypto.randomBytes(12);+ const cipher = crypto.createCipheriv("aes-256-gcm", key, nonce);+ cipher.setAAD(Buffer.from(peerIdentity(server)));+ const ciphertext = Buffer.concat([cipher.update(value, "utf8"), cipher.final()]);+ return prefix + [nonce, cipher.getAuthTag(), ciphertext].map(bytes => bytes.toString("base64url")).join(":");+ };+ const open = server => {+ if (!server.remote_api_key) return null;+ try {+ if (!key || !server.remote_api_key.startsWith(prefix)) throw new Error();+ const parts = server.remote_api_key.slice(prefix.length).split(":");+ if (parts.length !== 3 || parts.some(value => !/^[A-Za-z0-9_-]+$/.test(value))) throw new Error();+ const [nonce, tag, ciphertext] = parts.map(value => Buffer.from(value, "base64url"));+ if (nonce.length !== 12 || tag.length !== 16) throw new Error();+ const cipher = crypto.createDecipheriv("aes-256-gcm", key, nonce);+ cipher.setAAD(Buffer.from(peerIdentity(server)));+ cipher.setAuthTag(tag);+ return Buffer.concat([cipher.update(ciphertext), cipher.final()]).toString("utf8");+ } catch {+ throw new Error("Peer credential cannot be decrypted; restore the matching key file or reconfigure this peer");+ }+ };+ const legacy = rows.filter(row => !row.remote_api_key.startsWith("pkey:"));+ rows.filter(row => row.remote_api_key.startsWith("pkey:")).forEach(open);+ if (legacy.length) {+ db.pragma("secure_delete = ON");+ const update = db.prepare("UPDATE servers SET remote_api_key = ? WHERE id = ?");+ db.transaction(() => {+ for (const row of legacy) update.run(seal(row, row.remote_api_key), row.id);+ })();+ db.pragma("wal_checkpoint(TRUNCATE)");+ db.exec("VACUUM");+ db.pragma("wal_checkpoint(TRUNCATE)");+ }+ return { seal, open };+}++module.exports = { createPeerKeyStore, peerIdentity };\ No newline at end of filediff --git a/backend/lib/peer-key-store.test.js b/backend/lib/peer-key-store.test.jsnew file mode 100644index 0000000..493f9dd--- /dev/null+++ b/backend/lib/peer-key-store.test.js@@ -0,0 +1,75 @@+const fs = require("node:fs");+const os = require("node:os");+const path = require("node:path");+const Database = require("better-sqlite3");+const { describe, test, expect } = require("@jest/globals");+const { createPeerKeyStore } = require("./peer-key-store");++function fixture(run) {+ const directory = fs.mkdtempSync(path.join(os.tmpdir(), "peer-key-test-"));+ const file = path.join(directory, "database.sqlite");+ const keyFile = path.join(directory, "peer.key");+ const db = new Database(file);+ db.exec("CREATE TABLE servers (id TEXT PRIMARY KEY, url TEXT, remote_api_key TEXT)");+ const peer = { id: "fixture", url: "http://peer.invalid:4999" };+ try { run({ db, file, keyFile, peer, directory }); }+ finally { db.close(); fs.rmSync(directory, { recursive: true, force: true }); }+}++describe("encrypted outbound peer keys", () => {+ test("migrates plaintext and preserves keys across restart and restore", () => fixture(({ db, file, keyFile, peer, directory }) => {+ db.prepare("INSERT INTO servers VALUES (?, ?, ?)").run(peer.id, peer.url, "synthetic-peer-secret");+ const store = createPeerKeyStore(db, { keyFile });+ const saved = db.prepare("SELECT * FROM servers").get();+ expect(saved.remote_api_key).not.toContain("synthetic-peer-secret");+ expect(store.open(saved)).toBe("synthetic-peer-secret");+ expect(createPeerKeyStore(db, { keyFile }).open(saved)).toBe("synthetic-peer-secret");+ expect(fs.readFileSync(file).includes(Buffer.from("synthetic-peer-secret"))).toBe(false);+ expect(fs.statSync(keyFile).mode & 0o777).toBe(0o600);+ const restoredKey = path.join(directory, "restored.key");+ fs.copyFileSync(keyFile, restoredKey); fs.chmodSync(restoredKey, 0o600);+ const restoredDb = path.join(directory, "restored.sqlite");+ fs.copyFileSync(file, restoredDb);+ const copy = new Database(restoredDb);+ try { expect(createPeerKeyStore(copy, { keyFile: restoredKey }).open(saved)).toBe("synthetic-peer-secret"); }+ finally { copy.close(); }+ }));++ test("uses fresh nonces and binds keys to peer identity and destination", () => fixture(({ db, keyFile, peer }) => {+ const store = createPeerKeyStore(db, { keyFile });+ const remote_api_key = store.seal(peer, "synthetic-key");+ expect(store.seal(peer, "synthetic-key")).not.toBe(remote_api_key);+ expect(store.open({ ...peer, remote_api_key })).toBe("synthetic-key");+ expect(() => store.open({ ...peer, id: "other", remote_api_key })).toThrow("cannot be decrypted");+ expect(() => store.open({ ...peer, url: "http://other.invalid", remote_api_key })).toThrow("cannot be decrypted");+ expect(() => store.open({ ...peer, remote_api_key: remote_api_key.slice(0, -4) + "xxxx" })).toThrow("cannot be decrypted");+ }));++ test("does not regenerate missing or accept incorrect keys for encrypted databases", () => fixture(({ db, keyFile, peer }) => {+ const store = createPeerKeyStore(db, { keyFile });+ db.prepare("INSERT INTO servers VALUES (?, ?, ?)").run(peer.id, peer.url, store.seal(peer, "synthetic-key"));+ fs.unlinkSync(keyFile);+ expect(() => createPeerKeyStore(db, { keyFile })).toThrow("missing");+ expect(fs.existsSync(keyFile)).toBe(false);+ fs.writeFileSync(keyFile, Buffer.alloc(32), { mode: 0o600 });+ expect(() => createPeerKeyStore(db, { keyFile })).toThrow("cannot be decrypted");+ }));++ test("rejects insecure permissions, symlinks and malformed keys", () => fixture(({ db, keyFile, peer, directory }) => {+ fs.writeFileSync(keyFile, Buffer.alloc(32), { mode: 0o644 });+ expect(() => createPeerKeyStore(db, { keyFile }).seal(peer, "synthetic-key")).toThrow("mode-600");+ fs.chmodSync(keyFile, 0o600);+ const link = path.join(directory, "linked.key"); fs.symlinkSync(keyFile, link);+ expect(() => createPeerKeyStore(db, { keyFile: link }).seal(peer, "synthetic-key")).toThrow();+ fs.writeFileSync(keyFile, "short");+ expect(() => createPeerKeyStore(db, { keyFile }).seal(peer, "synthetic-key")).toThrow("32 bytes");+ }));++ test("does not partially migrate when an existing encrypted row fails validation", () => fixture(({ db, keyFile, peer }) => {+ const store = createPeerKeyStore(db, { keyFile });+ db.prepare("INSERT INTO servers VALUES (?, ?, ?)").run(peer.id, peer.url, store.seal(peer, "synthetic-key") + "bad");+ db.prepare("INSERT INTO servers VALUES (?, ?, ?)").run("legacy", peer.url, "synthetic-legacy");+ expect(() => createPeerKeyStore(db, { keyFile })).toThrow();+ expect(db.prepare("SELECT remote_api_key FROM servers WHERE id='legacy'").get().remote_api_key).toBe("synthetic-legacy");+ }));+});\ No newline at end of filediff --git a/backend/lib/ping-policy.js b/backend/lib/ping-policy.jsnew file mode 100644index 0000000..c7298ed--- /dev/null+++ b/backend/lib/ping-policy.js@@ -0,0 +1,145 @@+const net = require("node:net");+const dns = require("node:dns").promises;+const http = require("node:http");+const https = require("node:https");+const { isBlockedAddress } = require("./autoxpose-url");+const { createPinnedLookup } = require("./autoxpose-http");+const loopback = new net.BlockList();+loopback.addSubnet("127.0.0.0", 8, "ipv4");+loopback.addAddress("::1", "ipv6");++function normalizeHost(value) {+ if (typeof value !== "string" || !value || value.length > 253) return null;+ const hostname = value.replace(/^\[([^\]]+)\]$/, "$1").toLowerCase();+ if (net.isIP(hostname)) return hostname;+ if (!/^[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?$/.test(hostname)) return null;+ try {+ return new URL(`http://${hostname}`).hostname === hostname ? hostname : null;+ } catch {+ return null;+ }+}++function portNumber(value) {+ if (!/^[0-9]+$/.test(String(value))) return null;+ const port = Number(value);+ return Number.isSafeInteger(port) && port > 0 && port <= 65535 ? port : null;+}++class PingTargets {+ constructor() {+ this.servers = new Map();+ }++ record(server, ports) {+ this.servers.set(server.id, {+ url: server.id === "local" ? null : server.url || null,+ ports: (Array.isArray(ports) ? ports : []).flatMap(port => {+ const host = normalizeHost(port?.host_ip);+ const number = portNumber(port?.host_port);+ return host && number ? [{ ...port, host, number }] : [];+ }),+ });+ }++ guard(db) {+ return (request, response, next) => {+ const query = request.query;+ for (const field of ["host_ip", "host_port", "server_id", "target_server_url", "internal", "container_id"]) {+ if (query[field] !== undefined && typeof query[field] !== "string") {+ return response.status(400).json({ error: "Invalid ping target" });+ }+ }+ const host = normalizeHost(query.host_ip);+ const number = portNumber(query.host_port);+ if (!host || !number) return response.status(400).json({ error: "Invalid ping target" });+ const server = query.server_id || !query.target_server_url+ ? db.prepare("SELECT * FROM servers WHERE id = ?").get(query.server_id || "local")+ : db.prepare("SELECT * FROM servers WHERE url = ?").get(query.target_server_url);+ const inventory = server && this.servers.get(server.id);+ if (!inventory || inventory.url !== (server.id === "local" ? null : server.url || null) ||+ (query.target_server_url && query.target_server_url !== server.url)) {+ return response.status(403).json({ error: "Ping target is not in the discovered server inventory" });+ }+ const port = inventory.ports.find(entry => entry.host === host && entry.number === number &&+ Boolean(entry.internal) === (query.internal === "true") &&+ (!entry.internal || String(entry.container_id || "") === (query.container_id || "")));+ if (!port) return response.status(403).json({ error: "Ping target is not in the discovered server inventory" });+ query.host_ip = port.host_ip;+ query.host_port = String(number);+ query.owner = port.owner;+ query.source = port.source;+ query.server_id = server.id;+ if (server.id !== "local") query.target_server_url = server.url;+ else delete query.target_server_url;+ request.pingServer = server;+ return next();+ };+ }+}++function probeFetch(value, options = {}) {+ const signal = options.signal || AbortSignal.timeout(2000);+ return new Promise((resolve, reject) => {+ let request;+ let settled = false;+ const finish = (error, result) => {+ if (settled) return;+ settled = true;+ signal.removeEventListener("abort", abort);+ if (error) {+ request?.destroy();+ reject(error);+ } else resolve(result);+ };+ const abort = () => finish(new Error("Probe timed out"));+ if (signal.aborted) { abort(); return; }+ signal.addEventListener("abort", abort, { once: true });+ Promise.resolve().then(async () => {+ const target = new URL(value);+ const hostname = normalizeHost(target.hostname);+ if (!hostname || !["http:", "https:"].includes(target.protocol) ||+ target.pathname !== "/" || target.search || target.hash || target.username || target.password) {+ throw new Error("Invalid probe URL");+ }+ const family = net.isIP(hostname);+ const addresses = family ? [{ address: hostname, family }] :+ await (options.lookup || dns.lookup)(hostname, { all: true, verbatim: true });+ if (settled) return;+ if (!Array.isArray(addresses) || !addresses.length || addresses.some(({ address }) => {+ const addressFamily = net.isIP(address);+ return !addressFamily || (isBlockedAddress(address) && !(options.allowLoopback &&+ loopback.check(address, addressFamily === 4 ? "ipv4" : "ipv6")));+ })) throw new Error("Probe destination is not allowed");+ const method = options.method || "GET";+ if (!["HEAD", "GET"].includes(method)) throw new Error("Invalid probe method");+ const transport = options.request || (target.protocol === "https:" ? https.request : http.request);+ request = transport(target, {+ method, headers: { "User-Agent": "PortTracker/1.0" }, agent: false,+ lookup: createPinnedLookup(addresses.map(({ address }) => ({ address, family: net.isIP(address) }))),+ rejectUnauthorized: options.rejectUnauthorized !== false,+ }, response => {+ const chunks = [];+ let bytes = 0;+ response.on("data", chunk => {+ bytes += chunk.length;+ if (bytes > (options.maxResponseBytes || 2 * 1024 * 1024)) {+ finish(new Error("Probe response exceeds the size limit"));+ response.destroy();+ } else chunks.push(chunk);+ });+ response.once("error", error => finish(error));+ response.once("aborted", () => finish(new Error("Probe response aborted")));+ response.once("end", () => finish(null, {+ status: response.statusCode,+ headers: { get: name => response.headers[name.toLowerCase()] || null },+ text: async () => Buffer.concat(chunks).toString("utf8"),+ }));+ });+ request.once("error", error => finish(error));+ request.end();+ }).catch(error => finish(error));+ });+}++module.exports = { PingTargets, normalizeHost, probeFetch };\ No newline at end of filediff --git a/backend/middleware/auth.js b/backend/middleware/auth.jsindex 17d7a63..57f46ac 100644--- a/backend/middleware/auth.js+++ b/backend/middleware/auth.js@@ -133,6 +133,13 @@ function requireAuthOrApiKey(req, res, next) {* Middleware to optionally check authentication* Passes through regardless, but sets req.isAuthenticated flag*/+function requireDiagnosticSession(req, res, next) {+ if (req.query.raw === 'true' && isAuthEnabled() && !req.session?.userId) {+ return res.status(403).json({ error: 'Raw diagnostics require a signed-in user' });+ }+ next();+}+function optionalAuth(req, res, next) {req.isAuthenticated = false;@@ -160,6 +167,7 @@ module.exports = {checkAuthEnabled,requireAuth,requireAuthOrApiKey,+ requireDiagnosticSession,optionalAuth,isLoggedIn,isAuthEnableddiff --git a/backend/middleware/operation-limits.js b/backend/middleware/operation-limits.jsnew file mode 100644index 0000000..bdf19d9--- /dev/null+++ b/backend/middleware/operation-limits.js@@ -0,0 +1,18 @@+const { rateLimit } = require("express-rate-limit");++function configuredLimit(name, fallback) {+ const value = Number(process.env[name]);+ return Number.isSafeInteger(value) && value > 0 ? value : fallback;+}++function operationLimit(limit, windowMs = 60000) {+ return rateLimit({+ windowMs, limit, standardHeaders: "draft-8", legacyHeaders: false,+ message: { error: "Too many requests; retry after the indicated delay" },+ });+}++const generatePortLimit = operationLimit(configuredLimit("GENERATE_PORT_REQUESTS_PER_MINUTE", 30));+const pingRequestLimit = operationLimit(configuredLimit("PING_REQUESTS_PER_MINUTE", 6000));++module.exports = { generatePortLimit, pingRequestLimit, operationLimit };\ No newline at end of filediff --git a/backend/package-lock.json b/backend/package-lock.jsonindex af1d86d..2e9c33f 100644--- a/backend/package-lock.json+++ b/backend/package-lock.json@@ -18,6 +18,7 @@"dockerode": "^5.0.1","dotenv": "^17.2.3","express": "^4.22.2",+ "express-rate-limit": "8.7.0","express-session": "^1.18.0","node-fetch": "^3.3.2","ws": "^8.21.3"@@ -679,9 +680,9 @@}},"node_modules/debug": {- "version": "4.4.1",- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",- "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",+ "version": "4.4.3",+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",+ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==","license": "MIT","dependencies": {"ms": "^2.1.3"@@ -968,6 +969,25 @@"url": "https://opencollective.com/express"}},+ "node_modules/express-rate-limit": {+ "version": "8.7.0",+ "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.7.0.tgz",+ "integrity": "sha512-hOwV7WOxXfjRpAM1DSJWZDXx3GhplwD8IfwuwvogD8i1Qnkgosw/H45s4ZnFAUHDAhPjlY9hLBvJhKmGMyY26g==",+ "license": "MIT",+ "dependencies": {+ "debug": "^4.4.3",+ "ip-address": "^10.2.0"+ },+ "engines": {+ "node": ">= 16"+ },+ "funding": {+ "url": "https://github.com/sponsors/express-rate-limit"+ },+ "peerDependencies": {+ "express": ">= 4.11"+ }+ },"node_modules/express-session": {"version": "1.18.2","resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.2.tgz",@@ -1409,6 +1429,15 @@"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==","license": "ISC"},+ "node_modules/ip-address": {+ "version": "10.7.0",+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.0.tgz",+ "integrity": "sha512-BGFsyJd5mpXp3rK6jIdADLNgpJUK1jnjzvYF8lK+VyDab9JAmqN0YOKDdP17HlgKb2+ehPgDc8EtnRLbGCAMhA==",+ "license": "MIT",+ "engines": {+ "node": ">= 12"+ }+ },"node_modules/ipaddr.js": {"version": "1.9.1","resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",diff --git a/backend/package.json b/backend/package.jsonindex 14b5bdd..4dd9030 100644--- a/backend/package.json+++ b/backend/package.json@@ -23,6 +23,7 @@"dockerode": "^5.0.1","dotenv": "^17.2.3","express": "^4.22.2",+ "express-rate-limit": "8.7.0","express-session": "^1.18.0","node-fetch": "^3.3.2","ws": "^8.21.3"diff --git a/backend/routes/additional-boundaries.test.js b/backend/routes/additional-boundaries.test.jsnew file mode 100644index 0000000..b05edf4--- /dev/null+++ b/backend/routes/additional-boundaries.test.js@@ -0,0 +1,40 @@+const fs = require("node:fs");+const path = require("node:path");+const vm = require("node:vm");+const { once } = require("node:events");+const express = require("express");+const { describe, test, expect } = require("@jest/globals");+const { operationLimit } = require("../middleware/operation-limits");++describe("additional report boundaries", () => {+ test("limits repeated operations before the handler and supplies Retry-After", async () => {+ const app = express();+ let calls = 0;+ app.get("/operation", operationLimit(2), (_request, response) => { calls += 1; response.json({ ok: true }); });+ const server = app.listen(0, "127.0.0.1");+ try {+ await once(server, "listening");+ const url = `http://127.0.0.1:${server.address().port}/operation`;+ expect((await fetch(url)).status).toBe(200);+ expect((await fetch(url)).status).toBe(200);+ const blocked = await fetch(url, { headers: { "X-Forwarded-For": "192.0.2.1" } });+ expect(blocked.status).toBe(429);+ expect(Number(blocked.headers.get("retry-after"))).toBeGreaterThan(0);+ expect(calls).toBe(2);+ } finally { server.closeAllConnections(); await new Promise(resolve => server.close(resolve)); }+ });++ test("both external link sinks use HTTP-only URL validation", () => {+ const source = fs.readFileSync(path.join(__dirname, "../../frontend/src/lib/external-url.js"), "utf8");+ const safe = vm.runInNewContext(source.replace("export function", "function") + "\nsafeExternalUrl", { URL });+ for (const value of ["javascript:alert(1)", "java\nscript:alert(1)", "data:text/html,fixture", "//other.invalid", "file:///tmp/fixture", "https://user:[email protected]", "invalid"]) expect(safe(value)).toBeUndefined();+ for (const value of ["http://192.168.1.1:8080/", "https://peer.invalid/path?q=1#section"]) expect(safe(value)).toBe(value);+ for (const component of ["ExternalUrlChip", "GlobeIconBadge"]) {+ const content = fs.readFileSync(path.join(__dirname, `../../frontend/src/components/autoxpose/${component}.jsx`), "utf8");+ expect(content).toContain("const href = safeExternalUrl(url)");+ expect(content).toContain("if (!href) return null");+ expect(content).toContain("href={href}");+ expect(content).not.toContain("href={url}");+ }+ });+});\ No newline at end of filediff --git a/backend/routes/auth-inventory.test.js b/backend/routes/auth-inventory.test.jsnew file mode 100644index 0000000..5bc82ec--- /dev/null+++ b/backend/routes/auth-inventory.test.js@@ -0,0 +1,72 @@+const fs = require("node:fs");+const path = require("node:path");+const { parse } = require("@babel/parser");+const { describe, test, expect } = require("@jest/globals");++const backend = path.join(__dirname, "..");+const guards = new Set(["requireAuth", "requireAuthOrApiKey"]);+const publicRoutes = new Set([+ "GET /api/health", "GET /api/config", "GET /api/changelog", "GET /api/version",+ "GET /api/auth/status", "POST /api/auth/setup", "POST /api/auth/login", "POST /api/auth/logout",+]);+const mounts = { auth: "/api/auth", settings: "/api/settings", autoxpose: "/api/autoxpose" };++function calls(source) {+ const result = [];+ function visit(node) {+ if (!node || typeof node !== "object") return;+ if (node.type === "CallExpression" && node.callee.type === "MemberExpression" &&+ ["app", "router"].includes(node.callee.object.name)) result.push(node);+ for (const child of Object.values(node)) {+ if (Array.isArray(child)) child.forEach(visit);+ else if (child && typeof child === "object") visit(child);+ }+ }+ visit(parse(source, { sourceType: "unambiguous" }));+ return result;+}++function inventory(indexSource) {+ const indexCalls = calls(indexSource);+ const protectedRouters = new Set();+ for (const item of indexCalls.filter(item => item.callee.property.name === "use")) {+ if (item.arguments.slice(1).some(argument => guards.has(argument.name))) protectedRouters.add(item.arguments[0]?.value);+ }+ const files = [["index", indexSource], ...fs.readdirSync(__dirname).filter(name => name.endsWith(".js") && !name.endsWith(".test.js")).map(name => [name.slice(0, -3), fs.readFileSync(path.join(__dirname, name), "utf8")])];+ const rows = [];+ for (const [file, source] of files) {+ for (const item of calls(source)) {+ const method = item.callee.property.name;+ if (!["get", "post", "put", "patch", "delete", "all", "head", "options"].includes(method)) continue;+ const route = item.arguments[0]?.value;+ if (route === "*") continue;+ if (typeof route !== "string") throw new Error("Nonliteral route requires an explicit inventory rule");+ const mount = item.callee.object.name === "router" ? mounts[file] : "";+ if (mount === undefined) throw new Error("Router mount missing from inventory");+ const full = mount + (route === "/" ? "" : route);+ if (!full.startsWith("/api/")) continue;+ const identity = method.toUpperCase() + " " + full;+ const protectedRoute = protectedRouters.has(mount) || item.arguments.slice(1).some(argument => guards.has(argument.name));+ if (!protectedRoute && !publicRoutes.has(identity)) throw new Error("Missing auth guard: " + identity);+ rows.push(identity);+ }+ }+ return rows;+}++describe("all API route authentication", () => {+ const source = fs.readFileSync(path.join(backend, "index.js"), "utf8");+ test("inventories every direct and mounted API route with explicit public exceptions", () => {+ const rows = inventory(source);+ expect(rows.length).toBeGreaterThan(40);+ expect(new Set(rows).size).toBe(rows.length);+ for (const route of publicRoutes) expect(rows).toContain(route);+ expect(rows).toContain("POST /api/servers/:id/generate-port");+ expect(rows).toContain("POST /api/auth/change-password");+ });++ test("fails if a route guard or a mounted-router guard is removed", () => {+ expect(() => inventory(source.replace('app.post("/api/servers/:id/generate-port", requireAuthOrApiKey,', 'app.post("/api/servers/:id/generate-port",'))).toThrow("Missing auth guard");+ expect(() => inventory(source.replace("app.use('/api/settings', requireAuth,", "app.use('/api/settings',"))).toThrow("Missing auth guard");+ });+});\ No newline at end of filediff --git a/backend/routes/auth.js b/backend/routes/auth.jsindex c624bd9..8ac40f0 100644--- a/backend/routes/auth.js+++ b/backend/routes/auth.js@@ -10,7 +10,7 @@ const bcrypt = require('bcryptjs');const crypto = require('crypto');const db = require('../db');const { Logger } = require('../lib/logger');-const { isAuthEnabled } = require('../middleware/auth');+const { isAuthEnabled, requireAuth } = require('../middleware/auth');const recoveryManager = require('../lib/recovery-manager');const router = express.Router();@@ -246,7 +246,7 @@ router.post('/logout', (req, res) => {});});-router.post('/change-password', async (req, res) => {+router.post('/change-password', requireAuth, async (req, res) => {try {if (!isAuthEnabled()) {return res.status(400).json({ error: 'Authentication is not enabled' });diff --git a/backend/routes/ping.test.js b/backend/routes/ping.test.jsnew file mode 100644index 0000000..b796180--- /dev/null+++ b/backend/routes/ping.test.js@@ -0,0 +1,202 @@+const fs = require("node:fs");+const path = require("node:path");+const vm = require("node:vm");+const { once } = require("node:events");+const http = require("node:http");+const { EventEmitter } = require("node:events");+const express = require("express");+const { describe, test, expect, jest: jestObject } = require("@jest/globals");+const { PingTargets, normalizeHost, probeFetch } = require("../lib/ping-policy");++describe("ping destination boundary", () => {+ test("rejects an undiscovered destination before probing", async () => {+ const source = fs.readFileSync(path.join(__dirname, "../index.js"), "utf8");+ const route = source.match(/app\.get\("\/api\/ping",[\s\S]+?\n\}\);/)[0];+ const probe = jestObject.fn(async () => ({ reachable: true }));+ const app = express();+ const context = {+ app,+ requireAuthOrApiKey: (_request, _response, next) => next(),+ pingRequestLimit: (_request, _response, next) => next(),+ testProtocol: probe,+ detectServiceType: () => ({ type: "web", name: "fixture" }),+ determineServiceStatus: () => ({ status: "accessible", color: "green" }),+ fs: { existsSync: () => false }, process: { env: {} },+ logPingDebug() {}, logger: { setDebugEnabled() {} },+ db: { prepare: () => ({ get: () => ({ id: "local" }) }) },+ };+ context.pingTargets = new PingTargets();+ vm.runInNewContext(route, context);+ const server = app.listen(0, "127.0.0.1");+ try {+ await once(server, "listening");+ const response = await fetch(`http://127.0.0.1:${server.address().port}/api/ping?host_ip=192.0.2.10&host_port=8080`, {+ headers: { Connection: "close" },+ });+ expect(response.status).toBe(403);+ expect(probe).not.toHaveBeenCalled();+ } finally {+ server.closeAllConnections();+ await new Promise(resolve => server.close(resolve));+ }+ });+});++function authorize(registry, query, server = { id: "local", url: "http://localhost:4999" }) {+ let status = 200;+ let allowed = false;+ const request = { query: { ...query } };+ const response = { status(code) { status = code; return this; }, json() {} };+ registry.guard({ prepare: () => ({ get: () => server }) })(request, response, () => { allowed = true; });+ return { status, allowed, query: request.query };+}++describe("discovered ping targets", () => {+ const query = { host_ip: "192.168.1.20", host_port: "8080" };+ const port = { host_ip: "192.168.1.20", host_port: 8080, owner: "fixture", source: "docker" };++ test("allows discovered private services and ignores forged status hints", () => {+ const registry = new PingTargets();+ registry.record({ id: "local" }, [port]);+ const result = authorize(registry, { ...query, owner: "sshd", source: "system" });+ expect(result.allowed).toBe(true);+ expect(result.query.owner).toBe("fixture");+ expect(result.query.source).toBe("docker");+ });++ test("replaces stale inventory and rejects deleted servers", () => {+ const registry = new PingTargets();+ registry.record({ id: "local" }, [port]);+ expect(authorize(registry, query, null).status).toBe(403);+ registry.record({ id: "local" }, []);+ expect(authorize(registry, query).status).toBe(403);+ });++ test("binds peer targets to their stored server and URL", () => {+ const registry = new PingTargets();+ const server = { id: "peer-a", url: "https://peer.invalid" };+ registry.record(server, [port]);+ expect(authorize(registry, { ...query, server_id: server.id }, server).allowed).toBe(true);+ expect(authorize(registry, query, { id: "peer-b", url: server.url }).status).toBe(403);+ expect(authorize(registry, query, { ...server, url: "https://changed.invalid" }).status).toBe(403);+ expect(authorize(registry, { ...query, target_server_url: "http://other.invalid" }, server).status).toBe(403);+ });++ test("requires the discovered container identity for internal ports", () => {+ const registry = new PingTargets();+ registry.record({ id: "local" }, [{ ...port, internal: true, container_id: "fixture-container" }]);+ expect(authorize(registry, query).status).toBe(403);+ expect(authorize(registry, { ...query, internal: "true", container_id: "wrong" }).status).toBe(403);+ expect(authorize(registry, { ...query, internal: "true", container_id: "fixture-container" }).allowed).toBe(true);+ });++ test.each(["127.1", "2130706433", "0x7f000001", "host/path", "host#fragment", "user@host", "host?query", "host%00", "[::1]:80", "host\\path"]) (+ "rejects ambiguous host syntax %s", hostname => expect(normalizeHost(hostname)).toBeNull()+ );++ test.each(["8080/path", "8080junk", "8e3", "0", "65536", ["8080", "80"]])("rejects invalid port %j", value => {+ expect(authorize(new PingTargets(), { ...query, host_port: value }).status).toBe(400);+ });+});++async function withHttpServer(handler, run) {+ const server = http.createServer(handler);+ server.listen(0, "127.0.0.1");+ try {+ await once(server, "listening");+ await run(`http://127.0.0.1:${server.address().port}/`);+ } finally {+ server.closeAllConnections();+ await new Promise(resolve => server.close(resolve));+ }+}++describe("bounded probe transport", () => {+ test("preserves bracketed IPv6 and IPv6 loopback host syntax", () => {+ expect(normalizeHost("[::1]")).toBe("::1");+ expect(normalizeHost("::1")).toBe("::1");+ expect(normalizeHost("[fd00::10]")).toBe("fd00::10");+ });+ test("probes an explicitly allowed local service", async () => {+ const hits = [];+ await withHttpServer((request, response) => {+ hits.push(request.url);+ response.end("fixture");+ }, async url => {+ const response = await probeFetch(url, { allowLoopback: true });+ expect(response.status).toBe(200);+ expect(await response.text()).toBe("fixture");+ expect(hits).toEqual(["/"]);+ await expect(probeFetch(url)).rejects.toThrow("not allowed");+ expect(hits).toHaveLength(1);+ });+ });++ test.each(["HEAD", "GET"])("does not follow a %s redirect", async method => {+ let destinationHits = 0;+ await withHttpServer((_request, response) => { destinationHits += 1; response.end(); }, async destination => {+ await withHttpServer((_request, response) => { response.writeHead(302, { Location: destination }); response.end(); }, async url => {+ expect((await probeFetch(url, { method, allowLoopback: true })).status).toBe(302);+ expect(destinationHits).toBe(0);+ });+ });+ });++ test.each(["169.254.169.254", "::ffff:169.254.169.254", "fe80::1", "127.0.0.1", "::1"])(+ "rejects resolved forbidden address %s before transport", async address => {+ const request = jestObject.fn();+ await expect(probeFetch("http://fixture.invalid/", {+ lookup: async () => [{ address, family: address.includes(":") ? 6 : 4 }], request,+ })).rejects.toThrow("not allowed");+ expect(request).not.toHaveBeenCalled();+ }+ );++ test("rejects mixed safe and forbidden DNS answers", async () => {+ const request = jestObject.fn();+ await expect(probeFetch("http://fixture.invalid/", {+ request, lookup: async () => [{ address: "192.168.1.20", family: 4 }, { address: "169.254.169.254", family: 4 }],+ })).rejects.toThrow("not allowed");+ expect(request).not.toHaveBeenCalled();+ });++ test("pins the validated DNS result without a second resolution", async () => {+ const lookup = jestObject.fn(async () => [{ address: "192.168.1.20", family: 4 }]);+ const request = (_url, options, callback) => {+ options.lookup("fixture.invalid", { all: true }, (error, addresses) => {+ expect(error).toBeNull();+ expect(addresses).toEqual([{ address: "192.168.1.20", family: 4 }]);+ });+ const outgoing = new EventEmitter();+ outgoing.end = () => {+ const response = new EventEmitter();+ response.statusCode = 200;+ response.headers = {};+ callback(response);+ response.emit("end");+ };+ outgoing.destroy = () => {};+ return outgoing;+ };+ expect((await probeFetch("http://fixture.invalid/", { lookup, request })).status).toBe(200);+ expect(lookup).toHaveBeenCalledTimes(1);+ });++ test("bounds response size and stalled bodies", async () => {+ await withHttpServer((_request, response) => response.end("fixture-too-large"), async url => {+ await expect(probeFetch(url, { allowLoopback: true, maxResponseBytes: 4 })).rejects.toThrow("size limit");+ });+ await withHttpServer((_request, response) => response.write("partial"), async url => {+ await expect(probeFetch(url, { allowLoopback: true, signal: AbortSignal.timeout(100) })).rejects.toThrow("timed out");+ });+ });++ test("bounds stalled DNS and rejects URL components", async () => {+ await expect(probeFetch("http://fixture.invalid/", {+ lookup: () => new Promise(() => {}), signal: AbortSignal.timeout(100),+ })).rejects.toThrow("timed out");+ for (const url of ["http://fixture.invalid/probe", "http://fixture.invalid/?query", "http://fixture.invalid/#hash", "http://user:[email protected]/"]) {+ await expect(probeFetch(url)).rejects.toThrow("Invalid probe URL");+ }+ });+});\ No newline at end of filediff --git a/backend/routes/security-boundary.test.js b/backend/routes/security-boundary.test.jsindex 39bf439..5a20894 100644--- a/backend/routes/security-boundary.test.js+++ b/backend/routes/security-boundary.test.js@@ -1,5 +1,6 @@const fs = require("fs");const path = require("path");+const vm = require("node:vm");const { once } = require("node:events");const { createRequire } = require("node:module");const express = require("express");@@ -13,12 +14,14 @@ const {const originalAuth = process.env.ENABLE_AUTH;const originalCorsOrigin = process.env.CORS_ORIGIN;+const originalPortLimit = process.env.MAX_INTERNAL_PORTS_PER_CONTAINER;jestObject.mock("../lib/api-key-manager", () => ({- validateAnyApiKey: async () => ({ valid: false }),+ validateAnyApiKey: async key => ({ valid: key === "synthetic-peer-key", serverId: "fixture" }),}));-const { requireAllowedOrigin, requireAuth } = require("../middleware/auth");+const { requireAllowedOrigin, requireAuth, requireAuthOrApiKey } = require("../middleware/auth");const expressRequire = createRequire(require.resolve("express"));const qs = expressRequire("qs");+const { sanitizeDockerInspection } = require("../lib/docker/internal-ports");function runRequireAuth(pathname, session) {let statusCode = null;@@ -47,6 +50,8 @@ function runRequireAuth(pathname, session) {}afterEach(() => {+ if (originalPortLimit === undefined) delete process.env.MAX_INTERNAL_PORTS_PER_CONTAINER;+ else process.env.MAX_INTERNAL_PORTS_PER_CONTAINER = originalPortLimit;if (originalAuth === undefined) {delete process.env.ENABLE_AUTH;} else {@@ -141,6 +146,86 @@ describe("router authentication", () => {});});+describe("port generation authentication", () => {+ test.each([+ ["anonymous", "true", false, null, 401],+ ["invalid key", "true", false, "invalid-fixture-key", 401],+ ["peer key", "true", false, "synthetic-peer-key", 200],+ ["session", "true", true, null, 200],+ ["auth disabled", "false", false, null, 200],+ ["auth unset", undefined, false, null, 200],+ ])("checks %s before reading or contacting a peer", async (_label, auth, session, key, expected) => {+ if (auth === undefined) delete process.env.ENABLE_AUTH;+ else process.env.ENABLE_AUTH = auth;+ const source = fs.readFileSync(path.join(__dirname, "../index.js"), "utf8");+ const route = source.match(/app\.post\("\/api\/servers\/:id\/generate-port",[\s\S]+?\n\}\);/)[0];+ const databaseReads = [];+ const outbound = [];+ const app = express();+ app.use((request, _response, next) => {+ if (session) request.session = { userId: "fixture-user" };+ next();+ });+ vm.runInNewContext(route, {+ app, requireAuthOrApiKey, process, URL, AbortController, setTimeout, clearTimeout,+ generatePortLimit: (_request, _response, next) => next(),+ BASE_DEBUG: false,+ logger: { setDebugEnabled() {}, warn() {}, error() {}, debug() {} },+ db: { peerKeys: { open: () => "synthetic-outbound-key" }, prepare: () => ({ get: id => {+ databaseReads.push(id);+ return { type: "peer", url: "http://peer.invalid", remote_api_key: "synthetic-outbound-key" };+ } }) },+ peerRequest: async (server, endpoint, options) => {+ outbound.push({ url: new URL(endpoint, server.url).href, options: { ...options, headers: { 'X-API-Key': 'synthetic-outbound-key' } } });+ return { ok: true, json: async () => ({ port: 12345 }) };+ },+ });+ const server = app.listen(0, "127.0.0.1");+ try {+ await once(server, "listening");+ const headers = { Connection: "close" };+ if (key) headers["X-API-Key"] = key;+ const response = await globalThis.fetch(`http://127.0.0.1:${server.address().port}/api/servers/fixture/generate-port`, {+ method: "POST", headers,+ });+ expect(response.status).toBe(expected);+ expect(databaseReads).toHaveLength(expected === 200 ? 1 : 0);+ expect(outbound).toHaveLength(expected === 200 ? 1 : 0);+ if (expected === 200) {+ expect(await response.json()).toEqual({ port: 12345 });+ expect(outbound[0].options.headers["X-API-Key"]).toBe("synthetic-outbound-key");+ }+ } finally {+ server.closeAllConnections();+ await new Promise(resolve => server.close(resolve));+ }+ });+});++describe("container inspection confidentiality", () => {+ test.each([1, 101])("omits environment values with %i unpublished ports", count => {+ delete process.env.MAX_INTERNAL_PORTS_PER_CONTAINER;+ const inspection = {+ Id: "fixture-container",+ Config: {+ Env: ["DATABASE_PASSWORD=synthetic-sensitive-value", "UNUSUAL_NAME=synthetic-peer-value"],+ Image: "fixture:1",+ ExposedPorts: Object.fromEntries(Array.from({ length: count }, (_, index) => [`${20000 + index}/tcp`, {}])),+ },+ HostConfig: { PortBindings: { "80/tcp": [{ HostPort: "18080", HostIp: "0.0.0.0" }] } },+ };+ const before = JSON.stringify(inspection);+ const sanitized = sanitizeDockerInspection(inspection);+ expect(sanitized.Config).not.toHaveProperty("Env");+ expect(JSON.stringify(sanitized)).not.toContain("synthetic-sensitive-value");+ expect(JSON.stringify(sanitized)).not.toContain("synthetic-peer-value");+ expect(sanitized.Config.Image).toBe("fixture:1");+ expect(sanitized.HostConfig.PortBindings["80/tcp"][0].HostPort).toBe("18080");+ expect(JSON.stringify(inspection)).toBe(before);+ expect(sanitizeDockerInspection(sanitized)).toEqual(sanitized);+ });+});+describe("browser origin policy", () => {function runOriginPolicy(origin, host = "portracker.local:4999") {let statusCode = null;diff --git a/backend/routes/servers.js b/backend/routes/servers.jsindex 0257e20..aa6b2a6 100644--- a/backend/routes/servers.js+++ b/backend/routes/servers.js@@ -1,3 +1,5 @@+const { validatePeerUrl } = require("../lib/peer-http");+function listHandler({ db, logger }) {return (req, res) => {logger.debug("GET /api/servers");@@ -30,7 +32,7 @@ function updateExistingServer(db, payload) {type,dbUnreachable,platform_type,- apiKey || null,+ db.peerKeys.seal(payload, apiKey),id);return;@@ -58,27 +60,23 @@ function insertNewServer(db, payload) {type,dbUnreachable,platform_type,- apiKey || null,+ db.peerKeys.seal(payload, apiKey),nextPosition);}-function handleUpsertError(error, id, body, logger, res) {- logger.error(`Database error in POST /api/servers (ID: ${id}): ${error.message}`);- logger.debug("Stack trace:", error.stack || "");+function handleUpsertError(error, id, logger, res) {+ logger.error("Failed to persist server configuration");if (error.message.includes("UNIQUE constraint failed")) {return res.status(409).json({ error: `Server with ID '${id}' already exists.` });}const lower = error.message.toLowerCase();if (lower.includes("can only bind") || lower.includes("datatype mismatch")) {- logger.error(- `Possible data binding/type issue for server ID ${id}. Payload received: ${JSON.stringify(body)}`- );return res.status(500)- .json({ error: "Failed to save server due to data type issue.", details: error.message });+ .json({ error: "Failed to save server due to data type issue." });}- return res.status(500).json({ error: "Failed to save server", details: error.message });+ return res.status(500).json({ error: "Failed to save server" });}function upsertHandler({ db, logger }) {@@ -95,10 +93,18 @@ function upsertHandler({ db, logger }) {});}const dbUnreachable = unreachable ? 1 : 0;+ if (type === "peer" && url) {+ try { validatePeerUrl(url); }+ catch (error) { return res.status(400).json({ error: error.message }); }+ }+ if (apiKey !== undefined && apiKey !== null && (typeof apiKey !== "string" || apiKey.length > 8192 || /[\r\n]/.test(apiKey))) {+ return res.status(400).json({ error: "Invalid peer API key" });+ }const payload = { id, label, url, parentId, type, dbUnreachable, platform_type, apiKey };try {- const existing = db.prepare("SELECT id FROM servers WHERE id = ?").get(id);+ const existing = db.prepare("SELECT id, url, type FROM servers WHERE id = ?").get(id);if (existing) {+ if (existing.url !== url || existing.type !== type) payload.apiKey = apiKey || null;updateExistingServer(db, payload);logger.info(`Server updated successfully. ID: ${id}, Label: "${label}"`);return res.status(200).json({ message: "Server updated successfully", id });@@ -107,7 +113,7 @@ function upsertHandler({ db, logger }) {logger.info(`Server added successfully. ID: ${id}, Label: "${label}"`);return res.status(201).json({ message: "Server added successfully", id });} catch (error) {- return handleUpsertError(error, id, req.body, logger, res);+ return handleUpsertError(error, id, logger, res);}};}diff --git a/backend/routes/servers.security.test.js b/backend/routes/servers.security.test.jsnew file mode 100644index 0000000..685c12e--- /dev/null+++ b/backend/routes/servers.security.test.js@@ -0,0 +1,49 @@+const { describe, expect, test, jest: jestObject } = require("@jest/globals");+const { registerServerRoutes } = require("./servers");+const Database = require("better-sqlite3");+const { createPeerKeyStore } = require("../lib/peer-key-store");++describe("peer configuration confidentiality", () => {+ test("encrypts submitted keys, preserves label edits and clears changed destinations", async () => {+ const db = new Database(":memory:");+ db.exec("CREATE TABLE servers (id TEXT PRIMARY KEY,label TEXT,url TEXT,parentId TEXT,type TEXT,unreachable INTEGER,platform_type TEXT,remote_api_key TEXT,position INTEGER)");+ db.peerKeys = createPeerKeyStore(db);+ let handler;+ registerServerRoutes({ get() {}, put() {}, post: (_route, ...handlers) => { handler = handlers.at(-1); } }, {+ db, logger: { debug() {}, info() {}, error() {} }, requireAuth() {}, validateServerInput() {},+ });+ const save = async body => {+ const response = { status: jestObject.fn().mockReturnThis(), json: jestObject.fn() };+ await handler({ body }, response);+ expect(response.status).toHaveBeenCalledWith(expect.any(Number));+ return db.prepare("SELECT * FROM servers WHERE id='fixture'").get();+ };+ try {+ const body = { id: "fixture", label: "Peer", url: "http://peer.invalid", type: "peer", platform_type: "docker" };+ let row = await save({ ...body, apiKey: "synthetic-peer-key" });+ expect(row.remote_api_key).not.toContain("synthetic-peer-key");+ expect(db.peerKeys.open(row)).toBe("synthetic-peer-key");+ const ciphertext = row.remote_api_key;+ row = await save({ ...body, label: "Renamed" });+ expect(row.remote_api_key).toBe(ciphertext);+ row = await save({ ...body, url: "http://changed.invalid" });+ expect(row.remote_api_key).toBeNull();+ } finally { db.close(); }+ });+ test("does not log or return a submitted key after a database failure", async () => {+ let handler;+ const logger = { debug() {}, info() {}, error: jestObject.fn() };+ registerServerRoutes({+ get() {}, put() {},+ post: (_route, ...handlers) => { handler = handlers.at(-1); },+ }, {+ db: { prepare: () => { throw new Error("datatype mismatch"); } },+ logger, requireAuth() {}, validateServerInput() {},+ });+ const response = { status: jestObject.fn().mockReturnThis(), json: jestObject.fn() };+ await handler({ body: { id: "fixture", type: "peer", url: "https://peer.invalid", apiKey: "synthetic-submitted-key" } }, response);+ expect(JSON.stringify(logger.error.mock.calls)).not.toContain("synthetic-submitted-key");+ expect(JSON.stringify(response.json.mock.calls)).not.toContain("synthetic-submitted-key");+ expect(response.status).toHaveBeenCalledWith(500);+ });+});\ No newline at end of filediff --git a/frontend/src/components/autoxpose/ExternalUrlChip.jsx b/frontend/src/components/autoxpose/ExternalUrlChip.jsxindex 6d51472..5a6a0c2 100644--- a/frontend/src/components/autoxpose/ExternalUrlChip.jsx+++ b/frontend/src/components/autoxpose/ExternalUrlChip.jsx@@ -7,6 +7,7 @@ import {TooltipTrigger,} from "@/components/ui/tooltip";import { SslIcon, getSslTooltip } from "./SslIcon";+import { safeExternalUrl } from "@/lib/external-url";const bgClassesByStatus = {active: "bg-emerald-100 text-emerald-800 dark:bg-emerald-800/40 dark:text-emerald-200",@@ -16,12 +17,14 @@ const bgClassesByStatus = {};export function ExternalUrlChip({ url, hostname, sslStatus = "active", compact = false }) {+ const href = safeExternalUrl(url);+ if (!href) return null;const bgClasses = bgClassesByStatus[sslStatus] || bgClassesByStatus.none;const displayName = compact ? hostname.split('.')[0] : hostname;return (<a- href={url}+ href={href}target="_blank"rel="noopener noreferrer"onClick={(e) => e.stopPropagation()}diff --git a/frontend/src/components/autoxpose/GlobeIconBadge.jsx b/frontend/src/components/autoxpose/GlobeIconBadge.jsxindex 6fc70a6..c15b8f7 100644--- a/frontend/src/components/autoxpose/GlobeIconBadge.jsx+++ b/frontend/src/components/autoxpose/GlobeIconBadge.jsx@@ -7,14 +7,17 @@ import {TooltipTrigger,} from "@/components/ui/tooltip";import { SslIcon } from "./SslIcon";+import { safeExternalUrl } from "@/lib/external-url";export function GlobeIconBadge({ url, hostname, sslStatus = "active" }) {+ const href = safeExternalUrl(url);+ if (!href) return null;return (<TooltipProvider><Tooltip><TooltipTrigger asChild><a- href={url}+ href={href}target="_blank"rel="noopener noreferrer"onClick={(e) => e.stopPropagation()}diff --git a/frontend/src/components/layout/Sidebar.jsx b/frontend/src/components/layout/Sidebar.jsxindex e785048..133d564 100644--- a/frontend/src/components/layout/Sidebar.jsx+++ b/frontend/src/components/layout/Sidebar.jsx@@ -238,7 +238,7 @@ export function Sidebar({type: form.type,unreachable: allowUnreachable,parentId: form.parentId || null,- apiKey: form.apiKey?.trim() || null,+ ...(form.apiKey?.trim() ? { apiKey: form.apiKey.trim() } : form.hasExistingKey ? {} : { apiKey: null }),};await onAdd(serverData, mode !== "add");setValidationStatus({@@ -491,11 +491,12 @@ export function Sidebar({className="mt-1.5"disabled={submitting}/>- <p className="text-xs text-slate-500 dark:text-slate-400 mt-1">- {form.hasExistingKey && !form.apiKey- ? "API key is saved. Enter a new key to replace it."- : "Required if the remote server has authentication enabled"}- </p>+ <p className="text-xs text-slate-500 dark:text-slate-400 mt-1">{form.hasExistingKey && !form.apiKey+ ? "Key saved. Changing the server address requires a new key."+ : "Required if the remote server has authentication enabled"}</p>+ {(form.apiKey || form.hasExistingKey) && !/^https:\/\//i.test(form.url) && (+ <p role="status" className="mt-1 text-xs text-amber-700 dark:text-amber-300">HTTP sends this key without encryption. Use HTTPS or an encrypted VPN on untrusted networks.</p>+ )}</div>)}{availableParents.length > 0 && (diff --git a/frontend/src/components/server/AggregatedHealthDot.jsx b/frontend/src/components/server/AggregatedHealthDot.jsxindex ca2a7c4..05e6b93 100644--- a/frontend/src/components/server/AggregatedHealthDot.jsx+++ b/frontend/src/components/server/AggregatedHealthDot.jsx@@ -104,15 +104,13 @@ export function AggregatedHealthDot({let pingApiUrl = `/api/ping?host_ip=${encodeURIComponent(port.host_ip)}&host_port=${port.host_port}`;+ if (serverId) pingApiUrl += `&server_id=${encodeURIComponent(serverId)}`;if (port.internal) {pingApiUrl += `&internal=true`;if (port.container_id) {pingApiUrl += `&container_id=${encodeURIComponent(port.container_id)}`;}- if (serverId) {- pingApiUrl += `&server_id=${encodeURIComponent(serverId)}`;- }}if (port.owner) {diff --git a/frontend/src/components/server/InternalPortDetails.jsx b/frontend/src/components/server/InternalPortDetails.jsxindex fc1896b..eac629c 100644--- a/frontend/src/components/server/InternalPortDetails.jsx+++ b/frontend/src/components/server/InternalPortDetails.jsx@@ -9,7 +9,7 @@ import {DrawerOverlay,} from "@/components/ui/drawer";import { Button } from "@/components/ui/button";-import { Copy, ChevronDown, ChevronUp, Check, Box, Activity, Globe2, Network, Terminal, Settings2, Tag, HardDrive, Info, Gauge, Cpu, FileJson, Download, RefreshCw } from "lucide-react";+import { Copy, ChevronDown, ChevronUp, Check, Box, Activity, Globe2, Network, Terminal, Settings2, Tag, HardDrive, Info, Gauge, Cpu, FileJson, Download, RefreshCw, ExternalLink } from "lucide-react";import StatsSkeleton from './parts/StatsSkeleton';import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem } from "@/components/ui/dropdown-menu";import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";@@ -18,6 +18,7 @@ import { DetailsPanel } from './parts/DetailsPanel';import { useClipboard } from '@/lib/hooks/useClipboard';import { formatBytes, formatDuration } from '@/lib/utils';import { RESTART_POLICY_STYLES, isEphemeralContainer } from '@/lib/constants';+import { safeExternalUrl } from '@/lib/external-url';export function InternalPortDetails({ open, onOpenChange, containerId, serverId }) {const [data, setData] = useState(null);@@ -35,6 +36,7 @@ export function InternalPortDetails({ open, onOpenChange, containerId, serverIdconst liveRegionRef = useRef(null);const announceRef = useRef(null);const [rawState, setRawState] = useState({ loading: false, error: null, data: null });+ const rawAbortRef = useRef(null);const statsAbortRef = useRef(null);const [statsLoading, setStatsLoading] = useState(false);const [statsError, setStatsError] = useState(null);@@ -45,24 +47,15 @@ export function InternalPortDetails({ open, onOpenChange, containerId, serverIdconst guessShell = (image) => {const img = (image || "").toLowerCase();if (img.includes("alpine")) return "/bin/ash";- if (- img.includes("ubuntu") ||- img.includes("debian") ||- img.includes("fedora") ||- img.includes("centos") ||- img.includes("rocky") ||- img.includes("rhel")- )- return "/bin/bash";+ if (["ubuntu", "debian", "fedora", "centos", "rocky", "rhel"].some(name => img.includes(name))) return "/bin/bash";return "/bin/sh";};--useEffect(() => {if (!open || !containerId) return;const controller = new AbortController();setLoading(true);setError(null);+ setRawState({ loading: false, error: null, data: null });const qs = serverId ? `?server_id=${encodeURIComponent(serverId)}` : "";fetch(`/api/containers/${encodeURIComponent(containerId)}/details${qs}`, { signal: controller.signal, priority: 'high' }).then((r) => r.ok ? r.json() : Promise.reject(new Error(`HTTP ${r.status}`)))@@ -75,7 +68,7 @@ export function InternalPortDetails({ open, onOpenChange, containerId, serverId.catch((e) => { if (e.name !== 'AbortError') setError(e.message); }).finally(() => setLoading(false));drawerRef.current && (drawerRef.current._detailsAbort = controller);- return () => { controller.abort(); };+ return () => { controller.abort(); rawAbortRef.current?.abort(); };}, [open, containerId, serverId]);const execTarget = data?.name || data?.id || containerId;@@ -87,19 +80,19 @@ export function InternalPortDetails({ open, onOpenChange, containerId, serverIdconst loadRaw = () => {if (rawState.loading || rawState.data) return;+ const controller = new AbortController();+ rawAbortRef.current = controller;setRawState(prev => ({ ...prev, loading: true, error: null }));- const qsParts = [];- if (serverId) qsParts.push(`server_id=${encodeURIComponent(serverId)}`);- qsParts.push('raw=true');- const qs = qsParts.length ? `?${qsParts.join('&')}` : '';- fetch(`/api/containers/${encodeURIComponent(containerId)}/details${qs}`)- .then(r => r.ok ? r.json() : Promise.reject(new Error(`HTTP ${r.status}`)))+ const query = new URLSearchParams({ raw: 'true', ...(serverId ? { server_id: serverId } : {}) });+ fetch(`/api/containers/${encodeURIComponent(containerId)}/details?${query}`, { signal: controller.signal })+ .then(async response => {+ const body = await response.json();+ if (!response.ok) throw new Error(body.code === 'RAW_DIAGNOSTICS_REQUIRE_REMOTE_LOGIN' ? 'Sign in on the remote server to view raw diagnostics.' : `Raw diagnostics unavailable (HTTP ${response.status}).`);+ return body;+ }).then(json => setRawState({ loading: false, error: null, data: json.raw || json }))- .catch(e => setRawState({ loading: false, error: e.message, data: null }));+ .catch(e => { if (e.name !== 'AbortError') setRawState({ loading: false, error: e.message, data: null }); });};---useEffect(() => {if (open) {document.body.style.overflowY = 'hidden';@@ -681,7 +674,11 @@ export function InternalPortDetails({ open, onOpenChange, containerId, serverId)}<DetailsPanel title="JSON (raw inspect)" icon={<FileJson className="w-4 h-4" />} defaultOpen={false}><div className="space-y-2">- {!rawState.data && !rawState.loading && !rawState.error && (+ {data.rawDiagnostics?.available === false && <p className="text-xs text-slate-600 dark:text-slate-400">Raw diagnostics require signing in on this server directly. Peer keys allow standard details only.</p>}+ {safeExternalUrl(data.rawDiagnostics?.peerUrl) && (data.rawDiagnostics?.available === false || rawState.error) && (+ <a href={safeExternalUrl(data.rawDiagnostics.peerUrl)} target="_blank" rel="noopener noreferrer" className="inline-flex items-center gap-1 text-xs underline"><ExternalLink className="h-3.5 w-3.5" />Open remote server</a>+ )}+ {data.rawDiagnostics?.available !== false && !rawState.data && !rawState.loading && !rawState.error && (<Button type="button" variant="outline" size="sm" onClick={loadRaw} className="h-7 px-2 inline-flex items-center gap-1"><FileJson className="w-3.5 h-3.5" /> Load Raw</Button>diff --git a/frontend/src/components/server/PortStatusIndicator.jsx b/frontend/src/components/server/PortStatusIndicator.jsxindex 400c092..a051b09 100644--- a/frontend/src/components/server/PortStatusIndicator.jsx+++ b/frontend/src/components/server/PortStatusIndicator.jsx@@ -64,15 +64,13 @@ export function PortStatusIndicator({let pingApiUrl = `/api/ping?host_ip=${encodeURIComponent(port.host_ip)}&host_port=${port.host_port}`;+ if (serverId) pingApiUrl += `&server_id=${encodeURIComponent(serverId)}`;if (port.internal) {pingApiUrl += `&internal=true`;if (port.container_id) {pingApiUrl += `&container_id=${encodeURIComponent(port.container_id)}`;}- if (serverId) {- pingApiUrl += `&server_id=${encodeURIComponent(serverId)}`;- }}if (port.owner) {diff --git a/frontend/src/components/server/ServiceCardGrid.jsx b/frontend/src/components/server/ServiceCardGrid.jsxindex 578f7cb..9bd5fb5 100644--- a/frontend/src/components/server/ServiceCardGrid.jsx+++ b/frontend/src/components/server/ServiceCardGrid.jsx@@ -1,4 +1,4 @@-import React, { useState } from "react";+import React, { useEffect, useState } from "react";import {Tooltip,TooltipContent,@@ -38,6 +38,10 @@ export function ServiceCardGrid({autoxposePorts,}) {const [isExpanded, setIsExpanded] = useState(false);+ const hasDeepLink = !!deepLinkContainerId && ports.some(port => port.container_id === deepLinkContainerId);+ useEffect(() => {+ if (hasDeepLink) setIsExpanded(true);+ }, [hasDeepLink]);const publishedPorts = ports.filter((p) => !p.internal);const internalPorts = ports.filter((p) => p.internal);diff --git a/frontend/src/components/server/ServiceCardList.jsx b/frontend/src/components/server/ServiceCardList.jsxindex 0bf39c1..1532721 100644--- a/frontend/src/components/server/ServiceCardList.jsx+++ b/frontend/src/components/server/ServiceCardList.jsx@@ -1,4 +1,4 @@-import React, { useState } from "react";+import React, { useEffect, useState } from "react";import { ChevronRight } from "lucide-react";import {Tooltip,@@ -39,6 +39,10 @@ export function ServiceCardList({autoxposePorts,}) {const [isExpanded, setIsExpanded] = useState(false);+ const hasDeepLink = !!deepLinkContainerId && ports.some(port => port.container_id === deepLinkContainerId);+ useEffect(() => {+ if (hasDeepLink) setIsExpanded(true);+ }, [hasDeepLink]);const publishedPorts = ports.filter((p) => !p.internal);const _internalPorts = ports.filter((p) => p.internal);diff --git a/frontend/src/components/server/ServiceCardTable.jsx b/frontend/src/components/server/ServiceCardTable.jsxindex 73788c4..632d98a 100644--- a/frontend/src/components/server/ServiceCardTable.jsx+++ b/frontend/src/components/server/ServiceCardTable.jsx@@ -13,6 +13,7 @@ import { ClickablePortBadge } from "./service-card-utils";import { GlobeIconBadge, ExternalUrlChip } from "@/components/autoxpose";import { InlinePortRow } from "./ExpandedPortViews";import { AggregatedHealthDot } from "./AggregatedHealthDot";+import { InternalPortDetails } from "./InternalPortDetails";export function ServiceCardTableRow({serviceName,@@ -25,6 +26,8 @@ export function ServiceCardTableRow({onNote,onToggleIgnore,onRename,+ deepLinkContainerId,+ onCloseContainerDetails,selectionMode,selectedPorts,onToggleSelection,@@ -67,6 +70,12 @@ export function ServiceCardTableRow({return (<>+ <InternalPortDetails+ open={!!deepLinkContainerId && ports.some(port => port.container_id === deepLinkContainerId)}+ containerId={deepLinkContainerId}+ serverId={serverId}+ onOpenChange={open => { if (!open) onCloseContainerDetails?.(); }}+ /><tronClick={() => setIsExpanded(!isExpanded)}aria-expanded={isExpanded}diff --git a/frontend/src/lib/external-url.js b/frontend/src/lib/external-url.jsnew file mode 100644index 0000000..5e6071e--- /dev/null+++ b/frontend/src/lib/external-url.js@@ -0,0 +1,10 @@+export function safeExternalUrl(value) {+ if (typeof value !== "string") return undefined;+ try {+ const parsed = new URL(value);+ return ["http:", "https:"].includes(parsed.protocol) && !parsed.username && !parsed.password+ ? parsed.href : undefined;+ } catch {+ return undefined;+ }+}\ No newline at end of filediff --git a/package.json b/package.jsonindex a4e656f..0e314d3 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "portracker",- "version": "1.3.13",+ "version": "1.3.14","description": "A multi-platform port-tracking dashboard","main": "backend/index.js","scripts": {diff --git a/scripts/browser-contracts.mjs b/scripts/browser-contracts.mjsindex 9d51baf..718554e 100644--- a/scripts/browser-contracts.mjs+++ b/scripts/browser-contracts.mjs@@ -66,6 +66,60 @@ async function memoryLabels(page, options) {}}+async function peerWarning(page, options) {+ await page.goto(options.baseUrl + '/?server=local', { waitUntil: 'domcontentloaded' });+ await page.getByPlaceholder('Search ports, processes...').waitFor();+ const add = page.getByRole('button', { name: 'Add Server', exact: true });+ const tip = page.getByRole('button', { name: 'Not now', exact: true });+ if (await tip.isVisible()) await tip.click();+ if (options.viewport.width < 768) await page.getByRole('button', { name: 'Open sidebar', exact: true }).click();+ await add.waitFor();+ await add.click();+ await page.locator('#label').fill('Security fixture');+ await page.locator('#server-url').fill('http://fixture:8080');+ await page.locator('#apiKey').fill('synthetic-ui-key');+ const warning = page.getByText('HTTP sends this key without encryption. Use HTTPS or an encrypted VPN on untrusted networks.', { exact: true });+ await warning.waitFor();+ await warning.scrollIntoViewIfNeeded();+ const bounds = await warning.boundingBox();+ assert(bounds && bounds.x >= 0 && bounds.x + bounds.width <= options.viewport.width);+ await page.screenshot({ path: path.join(options.artifacts, `${options.viewport.width}-peer-warning.png`), animations: 'disabled' });+ await page.locator('#server-url').fill('https://fixture:9443');+ await warning.waitFor({ state: 'hidden' });+ assert.equal(await warning.count(), 0);+ await page.goto(options.baseUrl + '/?server=local', { waitUntil: 'domcontentloaded' });+ await page.getByPlaceholder('Search ports, processes...').waitFor();+}++async function remoteDiagnostics(page, options) {+ const scan = await page.request.get(options.baseUrl + '/api/servers/auth-peer/scan');+ assert.equal(scan.status(), 200);+ const port = (await scan.json()).ports.find(row => Number(row.host_port) === 18080);+ assert(port?.container_id, 'Discovered peer port must identify its container');+ const previousLayout = await page.evaluate(() => localStorage.getItem('portLayout'));+ for (const layout of ['list', 'grid', 'table']) {+ await page.evaluate(value => localStorage.setItem('portLayout', value), layout);+ await page.goto(`${options.baseUrl}/?server=auth-peer&container=${encodeURIComponent(port.container_id)}`, { waitUntil: 'domcontentloaded' });+ await page.getByRole('heading', { name: 'Container Details', exact: true }).waitFor();+ await page.getByRole('button', { name: /More Details/ }).click();+ await page.getByRole('button', { name: /JSON \(raw inspect\)/ }).click();+ const guidance = page.getByText('Raw diagnostics require signing in on this server directly. Peer keys allow standard details only.', { exact: true });+ await guidance.waitFor(); await guidance.scrollIntoViewIfNeeded();+ assert.equal(await page.getByRole('button', { name: 'Load Raw', exact: true }).count(), 0);+ const link = page.getByRole('link', { name: 'Open remote server', exact: true });+ assert.equal(await link.getAttribute('href'), `http://auth-peer:4999/?server=local&container=${encodeURIComponent(port.container_id)}`);+ await link.scrollIntoViewIfNeeded();+ const linkBounds = await link.boundingBox();+ assert(linkBounds && linkBounds.x >= 0 && linkBounds.x + linkBounds.width <= options.viewport.width && linkBounds.y >= 0 && linkBounds.y + linkBounds.height <= options.viewport.height, 'Remote login action is clipped');+ const bounds = await guidance.boundingBox();+ assert(bounds && bounds.x >= 0 && bounds.x + bounds.width <= options.viewport.width);+ await page.screenshot({ path: path.join(options.artifacts, `${options.viewport.width}-remote-diagnostics-${layout}.png`), animations: 'disabled' });+ }+ await page.evaluate(value => { if (value === null) localStorage.removeItem('portLayout'); else localStorage.setItem('portLayout', value); }, previousLayout);+ await page.goto(options.baseUrl + '/?server=local', { waitUntil: 'domcontentloaded' });+ await page.getByPlaceholder('Search ports, processes...').waitFor();+}+async function viewportContract(browser, options) {const context = await browser.newContext({ viewport: options.viewport, reducedMotion: 'reduce' });const page = await context.newPage();@@ -88,6 +142,7 @@ async function viewportContract(browser, options) {await memoryLabels(page, options);await releaseNotice(page, options.version);await settings(page);+ await peerWarning(page, options);await page.reload({ waitUntil: 'domcontentloaded' });await search.waitFor();await search.fill('18080');@@ -100,6 +155,7 @@ async function viewportContract(browser, options) {const portBounds = await port.boundingBox();assert(portBounds && portBounds.x >= 0 && portBounds.x + portBounds.width <= options.viewport.width, 'Port result is clipped');await page.screenshot({ path: path.join(options.artifacts, `${options.viewport.width}-ports.png`), fullPage: true, animations: 'disabled' });+ await remoteDiagnostics(page, options);await page.locator('button').filter({ has: page.locator('svg.lucide-user') }).click();await page.getByRole('menuitem', { name: 'Logout', exact: true }).click();await page.getByRole('button', { name: 'Sign In', exact: true }).waitFor();diff --git a/scripts/contract-fixture.cjs b/scripts/contract-fixture.cjsindex 44ca25c..d5f668c 100644--- a/scripts/contract-fixture.cjs+++ b/scripts/contract-fixture.cjs@@ -9,22 +9,33 @@ ports.push({ PrivatePort: 80, PublicPort: 18080, IP: '0.0.0.0', Type: 'tcp' });const inspection = {Id: containerId, Name: '/contract-web', Created: '2026-01-01T00:00:00Z',State: { Running: true, Status: 'running', StartedAt: '2026-01-01T00:00:00Z' },- Config: { Image: 'contract-web:1', Labels: {}, Env: [], ExposedPorts: Object.fromEntries(ports.map(port => [`${port.PrivatePort}/tcp`, {}])) },+ Config: { Image: 'contract-web:1', Cmd: ['contract-command-marker'], Labels: { custom: 'contract-label-marker' }, Env: ['DATABASE_PASSWORD=contract-sensitive-marker', 'UNEXPECTED_NAME=contract-peer-marker'], ExposedPorts: Object.fromEntries(ports.map(port => [`${port.PrivatePort}/tcp`, {}])) },HostConfig: { NetworkMode: 'bridge', PortBindings: { '80/tcp': [{ HostIp: '0.0.0.0', HostPort: '18080' }] } },NetworkSettings: { Ports: Object.fromEntries(ports.map(port => [`${port.PrivatePort}/tcp`, port.PublicPort ? [{ HostIp: '0.0.0.0', HostPort: '18080' }] : null])), Networks: { bridge: { IPAddress: '172.20.0.10', Gateway: '172.20.0.1' } } },Mounts: [],};let mode = 'ready';let requests = 0;+let largeInventory = false;const sockets = new Set();http.createServer((request, response) => {const url = new URL(request.url, 'http://fixture');const route = url.pathname.replace(/^\/v\d+\.\d+/, '');let body;- if (route === '/mode' && request.method === 'POST') {+ if (route === '/large-inventory' && request.method === 'POST') {+ largeInventory = url.searchParams.get('enabled') === 'true'; body = { largeInventory };+ } else if (route === '/mode' && request.method === 'POST') {mode = url.searchParams.get('value');for (const socket of sockets) socket.close();body = { mode };+ } else if (route === '/inspection-env' && request.method === 'POST') {+ let text = '';+ request.on('data', chunk => { text += chunk; });+ request.on('end', () => {+ inspection.Config.Env = JSON.parse(text);+ response.setHeader('Content-Type', 'application/json'); response.end('{"updated":true}');+ });+ return;} else if (route === '/health') { requests += 1; body = { status: 'ok', version: 'contract' }; }else if (route === '/counters') body = { requests };else if (route === '/_ping') { response.end('OK'); return; }@@ -32,7 +43,12 @@ http.createServer((request, response) => {else if (route === '/info') body = { OperatingSystem: 'TrueNAS SCALE', Name: 'contract-host', NCPU: 4, MemTotal: 8589934592, ServerVersion: '28.0.0', Containers: 1 };else if (route === '/containers/json') body = [{ Id: containerId, Names: ['/contract-web'], Image: 'contract-web:1', State: 'running', Status: 'Up', Labels: {}, Ports: ports, NetworkSettings: inspection.NetworkSettings }];else if (route === `/containers/${containerId}/json` || route === `/containers/${containerId.slice(0, 12)}/json`) body = inspection;- else if (route === '/api/servers/local/scan') body = { platform: 'docker', ports: [{ host_ip: '0.0.0.0', host_port: 8088, protocol: 'tcp', service_name: 'peer-web', source: 'docker', internal: false }], applications: [] };+ else if (route === '/api/servers/local/scan') body = { platform: 'docker', ports: largeInventory ? Array.from({ length: 9600 }, (_, index) => ({+ host_ip: '0.0.0.0', host_port: 20000 + index % 80, protocol: 'tcp', source: 'docker', internal: true,+ container_id: `fixture-${Math.floor(index / 80)}-${'c'.repeat(64)}`, owner: `fixture-service-${Math.floor(index / 80)}`,+ compose_project: 'fixture-project', compose_service: 'fixture-service', target: 'fixture-container:20000(internal)', note: 'ordinary saved note',+ })) : [{ host_ip: '0.0.0.0', host_port: 8088, protocol: 'tcp', service_name: 'peer-web', source: 'docker', internal: false }], applications: [] };+ else if (route.startsWith('/api/containers/') && route.endsWith('/details')) body = { id: containerId, ports: [], raw: inspection };else if (route === '/api/version') body = { version: '1.3.10' };else if (route === '/api/system-info') body = { hostname: 'contract-peer', platform: 'linux' };else if (route === '/api/services') body = { services: [] };@@ -40,6 +56,7 @@ http.createServer((request, response) => {else { response.writeHead(404); response.end('{}'); return; }response.setHeader('Content-Type', 'application/json'); response.end(JSON.stringify(body));}).listen(8080, '0.0.0.0');+http.createServer((_request, response) => { response.end('discovered-peer-service'); }).listen(8088, '0.0.0.0');const tls = https.createServer({ key: fs.readFileSync('/fixture/key.pem'), cert: fs.readFileSync('/fixture/cert.pem') });new WebSocket.Server({ server: tls }).on('connection', socket => {sockets.add(socket); socket.on('close', () => sockets.delete(socket)); socket.on('error', () => {});diff --git a/scripts/image-contracts.mjs b/scripts/image-contracts.mjsindex e3b6453..bbb55eb 100644--- a/scripts/image-contracts.mjs+++ b/scripts/image-contracts.mjs@@ -16,9 +16,11 @@ const volume = `${prefix}-data`;const app = `${prefix}-app`;const fixture = `${prefix}-fixture`;const relay = `${prefix}-relay`;+const authenticatedPeer = `${prefix}-authenticated-peer`;const directory = fs.mkdtempSync(path.join(os.tmpdir(), prefix));const credentials = { username: 'contract-user', password: crypto.randomBytes(24).toString('hex') };let baseline = 'mostafawahied/portracker@sha256:c7b4143ae32da4642a339d49ef5559c8408862eb1d1aacd9052df46e8ae225cb';+let securityBaseline = process.env.SECURITY_BASELINE_IMAGE || null;const containers = new Set();let networkCreated = false;let accessNetworkCreated = false;@@ -42,16 +44,27 @@ function resolvePlatformImage(reference) {return reference.split('@')[0] + '@' + matches[0].digest;}async function request(route, options = {}) {- const response = await fetch(baseUrl + route, {- method: options.method || 'GET', headers: { ...(options.cookie === false || !cookie ? {} : { Cookie: cookie }), ...(options.body ? { 'Content-Type': 'application/json' } : {}), ...options.headers },- body: options.body ? JSON.stringify(options.body) : undefined, signal: AbortSignal.timeout(options.timeout || 30000),- });- const assignedCookie = response.headers.get('set-cookie');- if (assignedCookie && options.captureCookie) cookie = assignedCookie.split(';')[0];- const content = await response.text();- let body;- try { body = JSON.parse(content); } catch { body = content; }- return { status: response.status, body };+ const started = Date.now();+ try {+ const response = await fetch(baseUrl + route, {+ method: options.method || 'GET', headers: { ...(options.cookie === false || !cookie ? {} : { Cookie: cookie }), ...(options.body ? { 'Content-Type': 'application/json' } : {}), ...options.headers, Connection: 'close' },+ body: options.body ? JSON.stringify(options.body) : undefined, signal: AbortSignal.timeout(options.timeout || 30000),+ });+ const assignedCookie = response.headers.get('set-cookie');+ if (assignedCookie && options.captureCookie) cookie = assignedCookie.split(';')[0];+ const content = await response.text();+ let body;+ try { body = JSON.parse(content); } catch { body = content; }+ return { status: response.status, body };+ } catch (error) {+ const allowedCodes = new Set(['ECONNREFUSED', 'ECONNRESET', 'ETIMEDOUT', 'ENOTFOUND', 'EAI_AGAIN', 'EHOSTUNREACH', 'ENETUNREACH', 'UND_ERR_SOCKET', 'UND_ERR_CONNECT_TIMEOUT', 'UND_ERR_HEADERS_TIMEOUT', 'UND_ERR_BODY_TIMEOUT', 'ABORT_ERR']);+ const cause = error.cause?.code || error.code;+ const code = allowedCodes.has(cause) ? cause : error.name === 'TimeoutError' ? 'TIMEOUT' : 'UNKNOWN';+ const requestedMethod = options.method || 'GET';+ const method = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'].includes(requestedMethod) ? requestedMethod : 'OTHER';+ const pathname = new URL(route, 'http://contract.invalid').pathname;+ throw new Error(`Image contract ${method} ${pathname} failed after ${Date.now() - started}ms (${code})`);+ }}async function waitReady() {const deadline = Date.now() + 90000;@@ -96,7 +109,7 @@ async function seedPreviousRelease() {assert.equal((await request('/api/custom-service-names', { method: 'POST', body: { ...annotation, custom_name: 'preserved-service' } })).status, 200);assert.equal((await request(`/api/services/contract-service/components/${'c'.repeat(64)}/role`, { method: 'PUT', body: { role: 'support' } })).status, 200);for (const [id, label] of [['contract-a', 'Alpha'], ['contract-b', 'Beta']]) {- assert.equal((await request('/api/servers', { method: 'POST', body: { id, label, type: 'peer', url: 'http://fixture:8080', platform_type: 'docker' } })).status, 201);+ assert.equal((await request('/api/servers', { method: 'POST', body: { id, label, type: 'peer', url: 'http://fixture:8080', platform_type: 'docker', apiKey: id === 'contract-a' ? 'contract-legacy-peer-value' : null } })).status, 201);}assert.equal((await request('/api/servers/order', { method: 'PUT', body: { items: [{ id: 'contract-b', position: 0 }, { id: 'local', position: 1 }, { id: 'contract-a', position: 2 }] } })).status, 200);assert.equal((await request('/api/settings', { method: 'PUT', body: { autoxposeUrl: 'http://fixture:8080', autoxposeEnabled: true } })).status, 200);@@ -111,16 +124,19 @@ async function assertPreserved() {const servers = (await request('/api/servers')).body;assert.deepEqual(servers.map(server => server.id), ['contract-b', 'local', 'contract-a']);assert.equal(servers.find(server => server.id === 'contract-a').label, 'Alpha');+ const encrypted = docker(['exec', app, 'node', '-e', "console.log=console.info=console.warn=console.error=()=>{};const fs=require('fs'),db=require('./db');const row=db.prepare(\"SELECT * FROM servers WHERE id='contract-a'\").get();process.stdout.write(JSON.stringify({encrypted:row.remote_api_key.startsWith('pkey:v1:'),roundtrip:db.peerKeys.open(row)==='contract-legacy-peer-value',mode:fs.statSync('/data/peer-keys.key').mode&511}));"]);+ assert.deepEqual(JSON.parse(encrypted), { encrypted: true, roundtrip: true, mode: 384 });const result = docker(['exec', app, 'node', '-e', "const db=new(require('better-sqlite3'))('/data/contract.db',{readonly:true});const count=db.prepare(\"SELECT COUNT(*) AS count FROM user_settings WHERE setting_key IN ('autoxposeUrl','autoxposeEnabled')\").get().count;const migration=db.prepare(\"SELECT COUNT(*) AS count FROM settings_migrations WHERE id='autoxpose-connection-trust-v1'\").get().count;console.log(JSON.stringify({count,migration,integrity:db.pragma('quick_check',{simple:true})}));db.close();"]);assert.deepEqual(JSON.parse(result), { count: 0, migration: 1, integrity: 'ok' });}async function securityContracts() {- const routes = [['GET', '/api/settings'], ['PUT', '/api/settings'], ['GET', '/api/servers'], ['GET', '/api/ports'], ['GET', '/api/all-ports'], ['GET', '/api/notes?server_id=local'], ['GET', '/api/autoxpose/status'], ['POST', '/api/autoxpose/connect'], ['POST', '/api/autoxpose/disconnect'], ['GET', '/api/autoxpose/services'], ['GET', '/api/autoxpose/domain'], ['PUT', '/api/autoxpose/display-mode'], ['PUT', '/api/autoxpose/url-style']];+ const routes = [['POST', '/api/servers/local/generate-port'], ['POST', '/api/servers/contract-a/generate-port'], ['GET', '/api/ping?host_ip=127.0.0.1&host_port=8088'], ['GET', `/api/containers/${'c'.repeat(64)}/details?raw=true`], ['GET', '/api/settings'], ['PUT', '/api/settings'], ['GET', '/api/servers'], ['GET', '/api/ports'], ['GET', '/api/all-ports'], ['GET', '/api/notes?server_id=local'], ['GET', '/api/autoxpose/status'], ['POST', '/api/autoxpose/connect'], ['POST', '/api/autoxpose/disconnect'], ['GET', '/api/autoxpose/services'], ['GET', '/api/autoxpose/domain'], ['PUT', '/api/autoxpose/display-mode'], ['PUT', '/api/autoxpose/url-style']];for (const [method, route] of routes) assert.equal((await request(route, { method, cookie: false, ...(method === 'GET' ? {} : { body: { url: 'http://fixture:8080' } }) })).status, 401, `${method} ${route}`);const counters = () => JSON.parse(docker(['exec', fixture, 'node', '-e', "fetch('http://localhost:8080/counters').then(response=>response.json()).then(value=>console.log(JSON.stringify(value)))"]));assert.equal(counters().requests, 0, 'Unauthorized outbound request reached fixture');assert.equal((await request('/api/auth/login', { method: 'POST', body: { ...credentials, password: 'incorrect' }, cookie: false })).status, 401);await login();+ await confidentialDetails();assert.equal((await request('/api/settings', { method: 'PUT', headers: { Origin: 'https://untrusted.invalid' }, body: { theme: 'light' } })).status, 403);assert.equal((await request('/api/settings', { method: 'PUT', body: { autoxposeUrl: 'http://fixture:8080' } })).status, 400);assert.equal((await request('/api/autoxpose/connect', { method: 'POST', body: { url: 'http://fixture:8080' } })).body.success, true);@@ -137,6 +153,11 @@ async function apiKeyContracts() {return result.body.apiKey;};const first = await createKey();+ assert.equal((await request(`/api/containers/${'c'.repeat(64)}/details?raw=true`, { cookie: false, headers: { 'X-API-Key': first } })).status, 403);+ const peerDetails = await request(`/api/containers/${'c'.repeat(64)}/details`, { cookie: false, headers: { 'X-API-Key': first } });+ assert.equal(peerDetails.status, 200); assert(!peerDetails.body.raw);+ await pingContracts({ cookie: false, headers: { 'X-API-Key': first } });+ assert.equal((await request('/api/servers/local/generate-port', { method: 'POST', cookie: false, headers: { 'X-API-Key': first } })).status, 200);const keyRequest = key => request('/api/overrides', { cookie: false, headers: { 'X-API-Key': key } });assert.equal((await keyRequest(first)).status, 200);assert.equal((await keyRequest('invalid-contract-key')).status, 401);@@ -149,6 +170,75 @@ async function apiKeyContracts() {assert.equal((await keyRequest(replacement)).status, 401);record('api-key-permissions-rotation-revocation-and-redaction');}+async function confidentialDetails(options = {}) {+ for (const flags of ['raw=true', 'raw=true&export=true', 'raw=true&server_id=contract-a']) {+ for (const route of [`/api/containers/${'c'.repeat(64)}/details`, `/API/CONTAINERS/${'c'.repeat(64)}/DETAILS/`]) {+ const response = await request(`${route}?${flags}`, options);+ assert.equal(response.status, 200);+ assert(response.body.raw?.Config && !Object.hasOwn(response.body.raw.Config, 'Env'), 'Raw environment field leaked');+ assert(!JSON.stringify(response.body).includes('contract-sensitive-marker'), 'Synthetic environment value leaked');+ assert(!JSON.stringify(response.body).includes('contract-peer-marker'), 'Synthetic peer value leaked');+ assert(!JSON.stringify(response.body).includes('contract-command-marker'), 'Command value leaked');+ assert(!JSON.stringify(response.body).includes('contract-label-marker'), 'Custom label value leaked');+ assert(!Object.hasOwn(response.body, 'command') && Object.keys(response.body.labels || {}).every(label => label.startsWith('com.docker.compose.')));+ }+ }+}+async function authenticatedPeerContracts() {+ containers.add(authenticatedPeer);+ docker(['run', '-d', '--name', authenticatedPeer, '--platform', platform, '--network', network, '--network-alias', 'auth-peer', '--tmpfs', '/data',+ '-e', 'ENABLE_AUTH=true', '-e', 'DATABASE_PATH=/data/peer.db', '-e', 'DOCKER_HOST=tcp://fixture:8080', '-e', 'PORT=4999', image]);+ const setup = "const fs=require('fs');const credentials=JSON.parse(fs.readFileSync(0,'utf8'));(async()=>{const until=Date.now()+60000;let ready=false;while(Date.now()<until){try{const response=await fetch('http://localhost:4999/api/health',{signal:AbortSignal.timeout(1000)});if(response.ok){ready=true;break;}}catch{}await new Promise(resolve=>setTimeout(resolve,300));}if(!ready)throw new Error('readiness');const response=await fetch('http://localhost:4999/api/auth/setup',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(credentials)});if(!response.ok)throw new Error('setup');const cookie=response.headers.get('set-cookie').split(';')[0];const key=await fetch('http://localhost:4999/api/settings/servers/local/api-key',{method:'POST',headers:{Cookie:cookie,'Content-Type':'application/json'},body:'{}'});if(!key.ok)throw new Error('key');process.stdout.write(JSON.stringify(await key.json()));})().catch(()=>{process.exitCode=1;});";+ const generated = JSON.parse(docker(['exec', '-i', authenticatedPeer, 'node', '-e', setup], 90000, JSON.stringify(credentials)));+ assert(typeof generated.apiKey === 'string');+ assert.equal((await request('/api/servers', { method: 'POST', body: { id: 'auth-peer', label: 'Authenticated Peer', type: 'peer', url: 'http://auth-peer:4999', apiKey: generated.apiKey } })).status, 201);+ const base = `/api/containers/${'c'.repeat(64)}/details?server_id=auth-peer`;+ const details = await request(base);+ assert.equal(details.status, 200);+ assert.equal(details.body.rawDiagnostics.available, false);+ const link = `http://auth-peer:4999/?server=local&container=${'c'.repeat(64)}`;+ assert.equal(details.body.rawDiagnostics.peerUrl, link);+ for (const flags of ['&raw=true', '&raw=true&export=true']) {+ const result = await request(base + flags);+ assert.equal(result.status, 403);+ assert.equal(result.body.code, 'RAW_DIAGNOSTICS_REQUIRE_REMOTE_LOGIN');+ assert.equal(result.body.peerUrl, link);+ assert(!result.body.raw);+ }+ record('authenticated-peer-standard-details-and-raw-permissions');+}++async function largeInventoryContracts() {+ const mode = enabled => docker(['exec', fixture, 'node', '-e', `fetch('http://localhost:8080/large-inventory?enabled=${enabled}',{method:'POST'}).then(response=>{if(!response.ok)process.exitCode=1;})`]);+ mode(true);+ try {+ const response = await request('/api/servers/contract-a/scan');+ assert.equal(response.status, 200, 'Valid large peer inventory rejected');+ assert.equal(response.body.ports.length, 9600);+ } finally { mode(false); }+ record('large-peer-inventory-within-bounded-budget');+}+async function pingContracts(options = {}) {+ assert.equal((await request('/api/servers/contract-a/scan', options)).status, 200);+ const allowed = await request('/api/ping?server_id=contract-a&host_ip=0.0.0.0&host_port=8088', options);+ assert.equal(allowed.status, 200);+ assert.equal(allowed.body.reachable, true, 'Discovered private peer service must remain probeable');+ for (const query of ['host_ip=169.254.169.254&host_port=80', 'host_ip=127.0.0.1&host_port=1', 'server_id=contract-a&host_ip=0.0.0.0&host_port=8089', 'server_id=contract-a&host_ip=0.0.0.0&host_port=8088&target_server_url=http://unconfigured.invalid']) {+ assert.equal((await request(`/api/ping?${query}`, options)).status, 403, 'Undiscovered target accepted');+ }+ for (const host of ['fixture/probe#', 'user@fixture', '2130706433', '[::1]:80']) {+ assert.equal((await request(`/api/ping?host_ip=${encodeURIComponent(host)}&host_port=8088`, options)).status, 400);+ }+}+async function rateContracts() {+ let denied = false;+ for (let index = 0; index < 32; index += 1) {+ const response = await request('/api/servers/does-not-exist/generate-port', { method: 'POST' });+ assert([404, 429].includes(response.status));+ if (response.status === 429) { denied = true; break; }+ }+ assert(denied, 'Generation rate limiter did not reject excess requests');+}async function preservationNegativeControl() {const note = { server_id: 'local', host_ip: '0.0.0.0', host_port: 18080, protocol: 'tcp' };assert.equal((await request('/api/notes', { method: 'POST', body: { ...note, note: 'deliberately-changed' } })).status, 200);@@ -192,6 +282,7 @@ async function discoveryContracts() {assert.equal(container.platform_data.orig_data.memory, memory, 'Raw container memory must be preserved');}const peer = await request('/api/servers/contract-a/scan'); assert.equal(peer.status, 200); assert(peer.body.ports.some(port => Number(port.host_port) === 8088));+ await pingContracts();const cycle = await request('/api/servers/order', { method: 'PUT', body: { items: [{ id: 'contract-a', parentId: 'contract-b', position: 1 }, { id: 'contract-b', parentId: 'contract-a', position: 0 }] } }); assert.equal(cycle.status, 400);record('docker-ports-peer-scan-truenas-and-order-integrity');}@@ -206,9 +297,24 @@ async function failureContract() {docker(['restart', app]); await waitReady(); await login();await discoveryContracts(); record('bounded-enrichment-failure-and-recovery');}+async function verifyUnpatchedSecurityBaseline() {+ await startApp(securityBaseline, false, false, '/data/security-baseline.db');+ const details = await request(`/api/containers/${'c'.repeat(64)}/details?raw=true`, { cookie: false });+ assert.equal(details.status, 200);+ assert(details.body.raw.Config.Env.some(value => value === 'DATABASE_PASSWORD=contract-sensitive-marker'));+ const probe = await request('/api/ping?host_ip=fixture&host_port=8088', { cookie: false });+ assert.equal(probe.status, 200); assert.equal(probe.body.reachable, true);+ stopApp();+ await startApp(securityBaseline, true, false, '/data/security-baseline.db');+ assert.equal((await request('/api/servers/local/scan', { cookie: false })).status, 401);+ assert.equal((await request('/api/servers/local/generate-port', { method: 'POST', cookie: false })).status, 200);+ stopApp();+ record('unpatched-security-baseline-reproduced');+}try {image = resolvePlatformImage(image);baseline = resolvePlatformImage(baseline);+ if (securityBaseline) securityBaseline = resolvePlatformImage(securityBaseline);const nativeCode = fs.readFileSync(new URL('./native-contract.cjs', import.meta.url), 'utf8');const nativeArgs = ['run', '--rm', '--network', 'none', '--platform', platform, '-e', `EXPECTED_ARCH=${platform === 'linux/arm64' ? 'arm64' : 'x64'}`, '--entrypoint', 'node', image, '-e'];const native = docker([...nativeArgs, nativeCode]);@@ -223,16 +329,26 @@ try {docker(['volume', 'create', volume]); volumeCreated = true;const openssl = spawnSync('openssl', ['req', '-x509', '-newkey', 'rsa:2048', '-nodes', '-keyout', path.join(directory, 'key.pem'), '-out', path.join(directory, 'cert.pem'), '-subj', '/CN=fixture', '-days', '1'], { stdio: 'ignore', timeout: 15000 }); assert.equal(openssl.status, 0);const fixtureCode = fs.readFileSync(fileURLToPath(new URL('./contract-fixture.cjs', import.meta.url)), 'utf8');- containers.add(fixture); docker(['run', '-d', '--name', fixture, '--platform', platform, '--network', network, '--network-alias', 'fixture', '-v', `${directory}:/fixture:ro`, '--entrypoint', 'node', image, '-e', fixtureCode]);+ containers.add(fixture); docker(['run', '-d', '--name', fixture, '--platform', platform, '--network', network, '--network-alias', 'fixture', '-v', `${directory}:/fixture:ro`, '-e', 'DATABASE_PASSWORD=contract-sensitive-marker', '-e', 'UNEXPECTED_NAME=contract-peer-marker', '--entrypoint', 'node', image, '-e', fixtureCode]);+ const realEnvironment = JSON.parse(docker(['inspect', '--format', '{{json .Config.Env}}', fixture]));+ assert(realEnvironment.includes('DATABASE_PASSWORD=contract-sensitive-marker'));+ docker(['exec', fixture, 'node', '-e', "fetch('http://localhost:8080/inspection-env',{method:'POST',body:process.argv[1]}).then(response=>{if(!response.ok)process.exitCode=1;})", JSON.stringify(realEnvironment)]);startRelay();+ if (securityBaseline) await verifyUnpatchedSecurityBaseline();await seedPreviousRelease(); await startApp(image, true, true); await securityContracts(); await assertPreserved(); record('upgrade-data-and-trust-migration');await apiKeyContracts(); await preservationNegativeControl(); await serviceContracts();await discoveryContracts(); docker(['restart', app]); await waitReady(); await login(); await assertPreserved(); assert.equal((await request('/api/autoxpose/status')).body.connected, true); record('restart-persistence');await failureContract();+ await largeInventoryContracts();+ await authenticatedPeerContracts();+ await rateContracts();const { browserContracts } = await import('./browser-contracts.mjs');await browserContracts(baseUrl, credentials, JSON.parse(native).version); record('desktop-mobile-browser-contracts');+ assert.equal((await request('/api/servers/auth-peer', { method: 'DELETE' })).status, 200);+ docker(['rm', '-f', authenticatedPeer]); containers.delete(authenticatedPeer);+ await assertPreserved();assert.equal((await request('/api/auth/logout', { method: 'POST', body: {} })).status, 200); assert.equal((await request('/api/settings')).status, 401); record('logout-invalidates-session');- stopApp(); await startApp(image, false, true); assert.equal((await request('/api/auth/status', { cookie: false })).body.authEnabled, false); assert.equal((await request('/api/settings', { cookie: false })).status, 200); record('explicit-auth-disabled-mode');+ stopApp(); await startApp(image, false, true); assert.equal((await request('/api/auth/status', { cookie: false })).body.authEnabled, false); assert.equal((await request('/api/settings', { cookie: false })).status, 200); await confidentialDetails({ cookie: false }); await pingContracts({ cookie: false }); record('explicit-auth-disabled-mode');await assert.rejects(securityContracts, { code: 'ERR_ASSERTION' }); record('authentication-bypass-negative-control-rejected');stopApp(); await startApp(image, true, false, '/data/fresh.db');assert.equal((await request('/api/auth/status', { cookie: false })).body.setupRequired, true);