sliccy 2.42.0 → 2.43.0

package/dist/node-server/_shared/secrets-pipeline.js

@@ -0,0 +1,249 @@
+import { mask as cryptoMask, buildScrubber, matchesDomains, } from './secret-masking.js';
+function indexOfBytes(haystack, needle, from = 0) {
+    outer: for (let i = from; i <= haystack.length - needle.length; i++) {
+        for (let j = 0; j < needle.length; j++) {
+            if (haystack[i + j] !== needle[j])
+                continue outer;
+        }
+        return i;
+    }
+    return -1;
+}
+function replaceAllBytes(haystack, needle, replacement) {
+    if (indexOfBytes(haystack, needle) < 0)
+        return haystack;
+    const out = [];
+    let i = 0;
+    while (i < haystack.length) {
+        const idx = indexOfBytes(haystack, needle, i);
+        if (idx < 0) {
+            for (let k = i; k < haystack.length; k++)
+                out.push(haystack[k]);
+            break;
+        }
+        for (let k = i; k < idx; k++)
+            out.push(haystack[k]);
+        for (let k = 0; k < replacement.length; k++)
+            out.push(replacement[k]);
+        i = idx + needle.length;
+    }
+    return new Uint8Array(out);
+}
+/**
+ * Stateful unmask/scrub pipeline shared between node-server's /api/fetch-proxy
+ * and the chrome-extension SW's fetch-proxy.fetch Port handler.
+ *
+ * Public surface has four method families:
+ *
+ *   ┌────────────┬────────────────────────────────┬─────────────────────────┐
+ *   │            │ Text-safe (string in / out)    │ Byte-safe (Uint8Array)  │
+ *   ├────────────┼────────────────────────────────┼─────────────────────────┤
+ *   │ Unmask     │ unmask, unmaskBody,            │ unmaskBodyBytes         │
+ *   │ (mask→real)│ unmaskHeaders, …Basic, …Url    │                         │
+ *   ├────────────┼────────────────────────────────┼─────────────────────────┤
+ *   │ Scrub      │ scrubResponse, scrubHeaders    │ scrubResponseBytes      │
+ *   │ (real→mask)│                                │                         │
+ *   └────────────┴────────────────────────────────┴─────────────────────────┘
+ *
+ * Use the byte-safe variants for request/response bodies that may be binary
+ * (git packfiles, ZIPs, images, application/octet-stream). The text variants
+ * UTF-8-decode their input, which corrupts non-UTF-8 byte sequences
+ * (`Buffer.toString('utf-8')` replaces invalid bytes with U+FFFD).
+ *
+ * Note: unmaskHeaders MUTATES its input in place (matching SecretProxyManager's
+ * legacy semantics). The other methods return new strings/byte arrays.
+ */
+export class SecretsPipeline {
+    sessionId;
+    source;
+    maskedToSecret = new Map();
+    scrubber = (t) => t;
+    constructor(opts) {
+        this.sessionId = opts.sessionId;
+        this.source = opts.source;
+    }
+    async reload() {
+        const all = await this.source.listAll();
+        const next = new Map();
+        for (const s of all) {
+            const maskedValue = await cryptoMask(this.sessionId, s.name, s.value);
+            next.set(maskedValue, {
+                name: s.name,
+                realValue: s.value,
+                maskedValue,
+                domains: s.domains,
+            });
+        }
+        this.maskedToSecret = next;
+        const pairs = Array.from(next.values()).map((ms) => ({
+            realValue: ms.realValue,
+            maskedValue: ms.maskedValue,
+        }));
+        this.scrubber = buildScrubber(pairs);
+    }
+    async maskOne(name, value) {
+        return cryptoMask(this.sessionId, name, value);
+    }
+    hasSecrets() {
+        return this.maskedToSecret.size > 0;
+    }
+    getMaskedEntries() {
+        return Array.from(this.maskedToSecret.values()).map((ms) => ({
+            name: ms.name,
+            maskedValue: ms.maskedValue,
+            domains: ms.domains,
+        }));
+    }
+    /**
+     * Unmask a single string. Domain mismatch on a matched secret → forbidden.
+     * Returns { text } on success, { text: original, forbidden } on block.
+     */
+    unmask(text, hostname) {
+        let result = text;
+        for (const [maskedValue, ms] of this.maskedToSecret) {
+            if (!result.includes(maskedValue))
+                continue;
+            if (!matchesDomains(hostname, ms.domains)) {
+                return { text, forbidden: { secretName: ms.name, hostname } };
+            }
+            result = result.split(maskedValue).join(ms.realValue);
+        }
+        return { text: result };
+    }
+    /**
+     * Unmask body text. Domain mismatch on a matched secret leaves it untouched
+     * (NO forbidden — masked values in conversation context are harmless).
+     */
+    unmaskBody(text, hostname) {
+        let result = text;
+        for (const [maskedValue, ms] of this.maskedToSecret) {
+            if (!result.includes(maskedValue))
+                continue;
+            if (!matchesDomains(hostname, ms.domains))
+                continue;
+            result = result.split(maskedValue).join(ms.realValue);
+        }
+        return { text: result };
+    }
+    unmaskAuthorizationBasic(headerValue, hostname) {
+        const pattern = /^Basic\s+(.+)$/;
+        const match = pattern.exec(headerValue);
+        if (!match)
+            return { value: headerValue };
+        let decoded;
+        try {
+            decoded = atob(match[1].trim());
+        }
+        catch {
+            return { value: headerValue };
+        }
+        const colon = decoded.indexOf(':');
+        if (colon < 0)
+            return { value: headerValue };
+        let user = decoded.slice(0, colon);
+        let pass = decoded.slice(colon + 1);
+        let touched = false;
+        for (const [maskedValue, ms] of this.maskedToSecret) {
+            if (user.includes(maskedValue) || pass.includes(maskedValue)) {
+                if (!matchesDomains(hostname, ms.domains)) {
+                    return { value: headerValue, forbidden: { secretName: ms.name, hostname } };
+                }
+                if (user.includes(maskedValue))
+                    user = user.split(maskedValue).join(ms.realValue);
+                if (pass.includes(maskedValue))
+                    pass = pass.split(maskedValue).join(ms.realValue);
+                touched = true;
+            }
+        }
+        if (!touched)
+            return { value: headerValue };
+        return { value: `Basic ${btoa(`${user}:${pass}`)}` };
+    }
+    extractAndUnmaskUrlCredentials(rawUrl) {
+        let parsed;
+        try {
+            parsed = new URL(rawUrl);
+        }
+        catch {
+            return { url: rawUrl };
+        }
+        if (!parsed.username && !parsed.password)
+            return { url: rawUrl };
+        let user = decodeURIComponent(parsed.username);
+        let pass = decodeURIComponent(parsed.password);
+        const host = parsed.host;
+        let touched = false;
+        for (const [maskedValue, ms] of this.maskedToSecret) {
+            if (user.includes(maskedValue) || pass.includes(maskedValue)) {
+                if (!matchesDomains(host, ms.domains)) {
+                    return { url: rawUrl, forbidden: { secretName: ms.name, hostname: host } };
+                }
+                if (user.includes(maskedValue)) {
+                    user = user.split(maskedValue).join(ms.realValue);
+                    touched = true;
+                }
+                if (pass.includes(maskedValue)) {
+                    pass = pass.split(maskedValue).join(ms.realValue);
+                    touched = true;
+                }
+            }
+        }
+        const synthetic = touched && (user || pass) ? `Basic ${btoa(`${user}:${pass}`)}` : undefined;
+        parsed.username = '';
+        parsed.password = '';
+        return { url: parsed.toString(), syntheticAuthorization: synthetic };
+    }
+    /**
+     * Unmask headers IN PLACE. Mutates the headers parameter; returns only { forbidden? }.
+     * Match SecretProxyManager's existing semantics so call sites compile unchanged.
+     */
+    unmaskHeaders(headers, hostname) {
+        for (const [key, val] of Object.entries(headers)) {
+            if (key.toLowerCase() === 'authorization' && /^Basic\s/i.test(val)) {
+                const basic = this.unmaskAuthorizationBasic(val, hostname);
+                if (basic.forbidden)
+                    return { forbidden: basic.forbidden };
+                headers[key] = basic.value;
+                continue;
+            }
+            const { text, forbidden } = this.unmask(val, hostname);
+            if (forbidden)
+                return { forbidden };
+            headers[key] = text;
+        }
+        return {};
+    }
+    unmaskBodyBytes(body, hostname) {
+        let out = body;
+        const enc = new TextEncoder();
+        for (const [maskedValue, ms] of this.maskedToSecret) {
+            if (!matchesDomains(hostname, ms.domains))
+                continue;
+            const needle = enc.encode(maskedValue);
+            const replacement = enc.encode(ms.realValue);
+            out = replaceAllBytes(out, needle, replacement);
+        }
+        return { bytes: out };
+    }
+    scrubResponse(text) {
+        return this.scrubber(text);
+    }
+    scrubResponseBytes(bytes) {
+        let out = bytes;
+        const enc = new TextEncoder();
+        for (const [maskedValue, ms] of this.maskedToSecret) {
+            const needle = enc.encode(ms.realValue);
+            const replacement = enc.encode(maskedValue);
+            out = replaceAllBytes(out, needle, replacement);
+        }
+        return out;
+    }
+    scrubHeaders(headers) {
+        const out = {};
+        headers.forEach((v, k) => {
+            out[k] = this.scrubber(v);
+        });
+        return out;
+    }
+}
+//# sourceMappingURL=secrets-pipeline.js.map

package/dist/node-server/_shared/secrets-pipeline.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"secrets-pipeline.js","sourceRoot":"","sources":["../src/secrets-pipeline.ts"],"names":[],"mappings":"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"}

package/dist/node-server/index.js

@@ -3,7 +3,8 @@ import { createServer } from 'http';
 import { createServer as createNetServer } from 'net';
 import { spawn } from 'child_process';
 import { existsSync, readFileSync } from 'fs';
-import { join, resolve } from 'path';
+import { join, resolve, dirname } from 'path';
+import { homedir } from 'os';
 import { Readable, Transform } from 'stream';
 import { StringDecoder } from 'string_decoder';
 import { fileURLToPath } from 'url';
@@ -18,7 +19,9 @@ import { FileLogger } from './file-logger.js';
 import { CliLogDedup } from './cli-log-dedup.js';
 import { EnvSecretStore } from './secrets/env-secret-store.js';
 import { SecretProxyManager } from './secrets/proxy-manager.js';
+import { OauthSecretStore } from './secrets/oauth-secret-store.js';
 import { handleDaSignAndForward, handleS3SignAndForward } from './secrets/sign-and-forward.js';
+import { readOrCreateSessionId } from './secrets/session-id-file.js';
 import { FETCH_PROXY_SKIP_HEADERS } from './fetch-proxy-headers.js';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 const PROJECT_ROOT = resolve(__dirname, '..', '..');
@@ -440,7 +443,6 @@ async function main() {
                 console.error(error instanceof Error ? error.message : String(error));
                 process.exit(1);
             }
-            throw new Error('unreachable');
         })();
         const chromePath = findChromeExecutable({
             executablePreference: !DEV_MODE && !chromeProfile.id ? 'installed' : 'chrome-for-testing',
@@ -489,7 +491,16 @@ async function main() {
         });
     }
     // 3. Set up express app with request logging
-    const secretProxy = new SecretProxyManager();
+    const sessionDir = RUNTIME_FLAGS.envFile
+        ? dirname(RUNTIME_FLAGS.envFile)
+        : join(homedir(), '.slicc');
+    const sessionId = readOrCreateSessionId(sessionDir);
+    const oauthStore = new OauthSecretStore();
+    // Env-file secrets (~/.slicc/secrets.env) feed the fetch-proxy mask
+    // pipeline alongside OAuth tokens. The same instance is reused below
+    // for /api/secrets and handleS3SignAndForward.
+    const secretStore = new EnvSecretStore(RUNTIME_FLAGS.envFile ?? undefined);
+    const secretProxy = new SecretProxyManager(secretStore, sessionId, oauthStore);
     try {
         await secretProxy.reload();
         if (secretProxy.hasSecrets()) {
@@ -792,8 +803,9 @@ async function main() {
         });
         res.json({ ok: true });
     });
-    // Secret management API — direct .env file access (no browser needed)
-    const secretStore = new EnvSecretStore(RUNTIME_FLAGS.envFile ?? undefined);
+    // Secret management API — direct .env file access (no browser needed).
+    // `secretStore` was created above and wired into `secretProxy` so the
+    // fetch-proxy and the management API share one source of truth.
     app.get('/api/secrets', (_req, res) => {
         try {
             const entries = secretStore.list();
@@ -873,6 +885,31 @@ async function main() {
                 .json({ error: err instanceof Error ? err.message : 'Failed to get masked secrets' });
         }
     });
+    // OAuth secret update — stores access token from OAuth login flow
+    app.post('/api/secrets/oauth-update', express.json(), async (req, res) => {
+        const { providerId, accessToken, domains } = req.body ?? {};
+        if (typeof providerId !== 'string' ||
+            typeof accessToken !== 'string' ||
+            !Array.isArray(domains) ||
+            domains.length === 0) {
+            return res.status(400).json({ error: 'bad-request' });
+        }
+        const name = `oauth.${providerId}.token`;
+        oauthStore.set(name, accessToken, domains);
+        await secretProxy.reload();
+        const masked = secretProxy.getMaskedEntries().find((e) => e.name === name)?.maskedValue;
+        res.json({ providerId, name, maskedValue: masked, domains });
+    });
+    // OAuth secret deletion — removes access token on logout
+    app.delete('/api/secrets/oauth/:providerId', async (req, res) => {
+        const name = `oauth.${req.params.providerId}.token`;
+        if (!oauthStore.list().some((e) => e.name === name)) {
+            return res.status(404).json({ error: 'not-found' });
+        }
+        oauthStore.delete(name);
+        await secretProxy.reload();
+        res.status(204).end();
+    });
     // Fetch proxy — forwards cross-origin requests from the browser to bypass CORS.
     // Used by just-bash's curl which calls the browser's fetch() API.
     // Note: express.json() may have already parsed the body, so we check req.body first.
@@ -986,6 +1023,23 @@ async function main() {
                     return;
                 }
             }
+            // --- Secret injection: unmask URL-embedded credentials ---
+            let cleanedUrl = targetUrl;
+            if (secretProxy.hasSecrets()) {
+                const credsResult = secretProxy.extractAndUnmaskUrlCredentials(targetUrl);
+                if (credsResult.forbidden) {
+                    res.setHeader('X-Proxy-Error', '1');
+                    res.status(403).json({
+                        error: `Secret "${credsResult.forbidden.secretName}" is not allowed for domain "${credsResult.forbidden.hostname}"`,
+                    });
+                    return;
+                }
+                cleanedUrl = credsResult.url;
+                // Attach synthetic Authorization if the URL had credentials and the header isn't already set
+                if (credsResult.syntheticAuthorization && !('authorization' in headers)) {
+                    headers.authorization = credsResult.syntheticAuthorization;
+                }
+            }
             if (Object.keys(headers).length > 0)
                 fetchInit.headers = headers;
             if (rawBody.length > 0 && !['GET', 'HEAD'].includes(req.method)) {
@@ -994,7 +1048,24 @@ async function main() {
                 // (safe/meaningless) rather than rejecting. This avoids false 403s when
                 // LLM conversation context contains masked secrets sent to non-matching
                 // domains like Bedrock.
-                if (secretProxy.hasSecrets()) {
+                //
+                // Skip the unmask for non-text content (git packfiles, octet-stream,
+                // ZIPs, images, …) — `Buffer.toString('utf-8')` on arbitrary bytes
+                // replaces invalid sequences with U+FFFD, silently corrupting the
+                // payload. Masked values are hex strings with known prefixes; they
+                // do not appear in deflated git packfiles or other compressed binary,
+                // so skipping is safe.
+                const reqCt = (headers['content-type'] ?? headers['Content-Type'] ?? '').toLowerCase();
+                const reqIsText = !reqCt ||
+                    reqCt.startsWith('text/') ||
+                    reqCt.includes('json') ||
+                    reqCt.includes('xml') ||
+                    reqCt.includes('javascript') ||
+                    reqCt.includes('ecmascript') ||
+                    reqCt.includes('html') ||
+                    reqCt.includes('css') ||
+                    reqCt.includes('svg');
+                if (reqIsText && secretProxy.hasSecrets()) {
                     const bodyStr = rawBody.toString('utf-8');
                     const bodyResult = secretProxy.unmaskBody(bodyStr, targetHostname);
                     rawBody = Buffer.from(bodyResult.text, 'utf-8');
@@ -1020,7 +1091,7 @@ async function main() {
             };
             res.on('close', onClientClose);
             fetchInit.signal = abortController.signal;
-            const upstream = await fetch(targetUrl, fetchInit);
+            const upstream = await fetch(cleanedUrl, fetchInit);
             // Forward status, prevent browser caching of proxy responses
             res.status(upstream.status);
             res.setHeader('Cache-Control', 'no-store, no-cache');

package/dist/node-server/secrets/index.d.ts

@@ -1,5 +1,5 @@
-export type { Secret, SecretEntry, SecretStore } from './types.js';
+export type { Secret, SecretEntry, SecretStore, MaskedSecret } from './types.js';
 export { EnvSecretStore } from './env-secret-store.js';
-export { matchDomain, matchesDomains } from './domain-match.js';
+export { domainMatches as matchDomain, matchesDomains } from '../_shared/index.js';
 export { parseEnvFile, serializeEnvFile } from './env-file.js';
-export { SecretProxyManager, type MaskedSecret } from './proxy-manager.js';
+export { SecretProxyManager } from './proxy-manager.js';

package/dist/node-server/secrets/index.js

@@ -1,4 +1,4 @@
 export { EnvSecretStore } from './env-secret-store.js';
-export { matchDomain, matchesDomains } from './domain-match.js';
+export { domainMatches as matchDomain, matchesDomains } from '../_shared/index.js';
 export { parseEnvFile, serializeEnvFile } from './env-file.js';
 export { SecretProxyManager } from './proxy-manager.js';

package/dist/node-server/secrets/oauth-secret-store.d.ts

@@ -0,0 +1,12 @@
+export interface OauthEntry {
+    name: string;
+    value: string;
+    domains: string[];
+}
+export declare class OauthSecretStore {
+    private entries;
+    set(name: string, value: string, domains: string[]): void;
+    delete(name: string): void;
+    list(): OauthEntry[];
+    get(name: string): string | undefined;
+}

package/dist/node-server/secrets/oauth-secret-store.js

@@ -0,0 +1,18 @@
+export class OauthSecretStore {
+    entries = new Map();
+    set(name, value, domains) {
+        if (!Array.isArray(domains) || domains.length === 0) {
+            throw new Error('OauthSecretStore: domains must be non-empty');
+        }
+        this.entries.set(name, { name, value, domains });
+    }
+    delete(name) {
+        this.entries.delete(name);
+    }
+    list() {
+        return Array.from(this.entries.values());
+    }
+    get(name) {
+        return this.entries.get(name)?.value;
+    }
+}

package/dist/node-server/secrets/proxy-manager.d.ts

@@ -4,45 +4,27 @@
  *
  * On init: loads all secrets, generates session-scoped masked values,
  * and builds lookup tables for fast replacement.
+ *
+ * As of Task 1.4, this is a thin wrapper around SecretsPipeline from @slicc/shared-ts.
  */
-import { EnvSecretStore } from './env-secret-store.js';
-export interface MaskedSecret {
-    name: string;
-    maskedValue: string;
-    realValue: string;
-    domains: string[];
-}
+import { type EnvSecretStore } from './env-secret-store.js';
+import { type OauthSecretStore } from './oauth-secret-store.js';
 export declare class SecretProxyManager {
-    private readonly store;
-    private readonly sessionId;
-    /** maskedValue → MaskedSecret */
-    private maskedToSecret;
-    /** Scrubber that replaces real→masked in response content */
-    private scrubber;
-    constructor(store?: EnvSecretStore, sessionId?: string);
-    /**
-     * Load secrets from the store and generate masked values.
-     * Call once on startup and again whenever secrets change.
-     */
+    private readonly pipeline;
+    private readonly _sessionId;
+    private _envStore?;
+    private _oauthStore?;
+    constructor(store?: EnvSecretStore, sessionId?: string, oauthStore?: OauthSecretStore);
+    private buildSource;
+    setOauthStore(store: OauthSecretStore): void;
+    get sessionId(): string;
     reload(): Promise<void>;
-    /**
-     * Check if any secrets are loaded.
-     */
     hasSecrets(): boolean;
-    /**
-     * Get all masked entries (name + maskedValue + domains) for env population.
-     */
     getMaskedEntries(): Array<{
         name: string;
         maskedValue: string;
         domains: string[];
     }>;
-    /**
-     * Unmask a text blob: replace masked values with real values.
-     * Validates each secret against the target hostname.
-     *
-     * @returns { text, forbidden } — forbidden is set if a secret was blocked.
-     */
     unmask(text: string, targetHostname: string): {
         text: string;
         forbidden?: {
@@ -50,34 +32,16 @@ export declare class SecretProxyManager {
             hostname: string;
         };
     };
-    /**
-     * Unmask body text: replace masked values with real values when domain matches.
-     * When domain does NOT match, the masked value is left as-is (not rejected).
-     * This is safe because the masked value is meaningless to the remote service —
-     * it's typically just conversation context sent to an LLM API.
-     */
     unmaskBody(text: string, targetHostname: string): {
         text: string;
     };
-    /**
-     * Unmask headers in-place. Returns forbidden info if blocked.
-     */
     unmaskHeaders(headers: Record<string, string>, targetHostname: string): {
         forbidden?: {
             secretName: string;
             hostname: string;
         };
     };
-    /**
-     * Scrub real secret values from response text → masked values.
-     */
+    extractAndUnmaskUrlCredentials(rawUrl: string): import("../_shared/index.js").ExtractedUrlCreds;
     scrubResponse(text: string): string;
-    /**
-     * Scrub headers: replace real values with masked in header values.
-     */
     scrubHeaders(headers: Headers): Record<string, string>;
-    /**
-     * Look up a secret by its masked value.
-     */
-    getByMaskedValue(maskedValue: string): MaskedSecret | undefined;
 }