devchain-cli 0.24.2 → 0.26.0

package/dist/server/modules/remotes/host/host-api-key-io.adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"host-api-key-io.adapter.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/host-api-key-io.adapter.ts"],"names":[],"mappings":";;;AACA,mEAAuD;AAEvD,kDAAwD;AAGxD,MAAa,mBAAoB,SAAQ,8BAAS;IAG7B;IAFnB,YACE,GAA4B,EACX,IAAuB;QAExC,KAAK,CAAC,GAAG,CAAC,CAAC;QAFM,SAAI,GAAJ,IAAI,CAAmB;IAG1C,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,OAAgC;QAC3D,OAAO,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE;YAChC,GAAG,OAAO;YACV,YAAY,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;gBAClC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;oBACzC,QAAQ,CAAC,oCAAqB,EAAE,KAAK,CAAC,CAAC;gBACzC,CAAC;qBAAM,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;oBACjC,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC1C,CAAC;qBAAM,CAAC;oBACN,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;SAC+B,CAAC,CAAC;IACtC,CAAC;CACF;AAtBD,kDAsBC"}
+{"version":3,"file":"host-api-key-io.adapter.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/host-api-key-io.adapter.ts"],"names":[],"mappings":";;;AACA,mEAAuD;AAIvD,MAAa,mBAAoB,SAAQ,8BAAS;IAG7B;IAFnB,YACE,GAA4B,EACX,IAAuB;QAExC,KAAK,CAAC,GAAG,CAAC,CAAC;QAFM,SAAI,GAAJ,IAAI,CAAmB;IAG1C,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,OAAgC;QAC3D,OAAO,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE;YAChC,GAAG,OAAO;YACV,YAAY,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;gBAClC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBACpD,IAAI,OAAO,EAAE,CAAC;oBACZ,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAChC,CAAC;qBAAM,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;oBACjC,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC1C,CAAC;qBAAM,CAAC;oBACN,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;SAC+B,CAAC,CAAC;IACtC,CAAC;CACF;AAvBD,kDAuBC"}

package/dist/server/modules/remotes/host/host-api-key.module.js

@@ -28,8 +28,9 @@ let HostApiKeyModule = class HostApiKeyModule {
             return;
         adapter.getInstance().addHook('onRequest', async (request, reply) => {
             const rotation = request.method === 'POST' && request.url.split('?', 1)[0] === '/api/host/api-key';
-            if (!this.keys.allows(request.raw, 'http', rotation)) {
-                return reply.code(401).send(host_api_key_service_1.HOST_API_KEY_REJECTION);
+            const refusal = this.keys.allows(request.raw, 'http', rotation);
+            if (refusal) {
+                return reply.code(refusal.statusCode).send(refusal);
             }
         });
         this.registered = true;

package/dist/server/modules/remotes/host/host-api-key.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"host-api-key.module.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/host-api-key.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAsD;AACtD,uCAA+C;AAE/C,iEAAmF;AACnF,uEAAiE;AAO1D,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAIR;IACA;IAJX,UAAU,GAAG,KAAK,CAAC;IAE3B,YACmB,WAA4B,EAC5B,IAAuB;QADvB,gBAAW,GAAX,WAAW,CAAiB;QAC5B,SAAI,GAAJ,IAAI,CAAmB;IACvC,CAAC;IAEJ,YAAY;QACV,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC;QAC7C,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,KAAK,SAAS;YAAE,OAAO;QAC3E,OAAO,CAAC,WAAW,EAAmB,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;YACnF,MAAM,QAAQ,GACZ,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,mBAAmB,CAAC;YACpF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;gBACrD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,6CAAsB,CAAC,CAAC;YACtD,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;CACF,CAAA;AApBY,4CAAgB;2BAAhB,gBAAgB;IAL5B,IAAA,eAAM,EAAC;QACN,WAAW,EAAE,CAAC,8CAAoB,CAAC;QACnC,SAAS,EAAE,CAAC,wCAAiB,CAAC;QAC9B,OAAO,EAAE,CAAC,wCAAiB,CAAC;KAC7B,CAAC;qCAKgC,sBAAe;QACtB,wCAAiB;GAL/B,gBAAgB,CAoB5B"}
+{"version":3,"file":"host-api-key.module.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/host-api-key.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAsD;AACtD,uCAA+C;AAE/C,iEAA2D;AAC3D,uEAAiE;AAO1D,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAIR;IACA;IAJX,UAAU,GAAG,KAAK,CAAC;IAE3B,YACmB,WAA4B,EAC5B,IAAuB;QADvB,gBAAW,GAAX,WAAW,CAAiB;QAC5B,SAAI,GAAJ,IAAI,CAAmB;IACvC,CAAC;IAEJ,YAAY;QACV,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC;QAC7C,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,KAAK,SAAS;YAAE,OAAO;QAC3E,OAAO,CAAC,WAAW,EAAmB,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;YACnF,MAAM,QAAQ,GACZ,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,mBAAmB,CAAC;YACpF,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAChE,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtD,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;CACF,CAAA;AArBY,4CAAgB;2BAAhB,gBAAgB;IAL5B,IAAA,eAAM,EAAC;QACN,WAAW,EAAE,CAAC,8CAAoB,CAAC;QACnC,SAAS,EAAE,CAAC,wCAAiB,CAAC;QAC9B,OAAO,EAAE,CAAC,wCAAiB,CAAC;KAC7B,CAAC;qCAKgC,sBAAe;QACtB,wCAAiB;GAL/B,gBAAgB,CAqB5B"}

package/dist/server/modules/remotes/host/host-api-key.service.d.ts

@@ -1,12 +1,14 @@
 import type { IncomingMessage } from 'node:http';
+import { type BrowserRequestRefusal } from '../../../common/http/browser-request-guard';
 export declare const HOST_API_KEY_REJECTION: {
-    statusCode: number;
-    code: string;
-    message: string;
+    readonly statusCode: 401;
+    readonly code: "HOST_API_KEY_REJECTED";
+    readonly message: "Host API key rejected";
 };
+export type HostAdmissionRefusal = BrowserRequestRefusal | typeof HOST_API_KEY_REJECTION;
 export declare class HostApiKeyService {
     private cachedKey?;
-    allows(request: IncomingMessage, transport: 'http' | 'socket', requireKey?: boolean): boolean;
+    allows(request: IncomingMessage, transport: 'http' | 'socket', requireKey?: boolean): HostAdmissionRefusal | null;
     rotate(request: IncomingMessage, sha256: string): void;
     private holdsKey;
     private logRejection;

package/dist/server/modules/remotes/host/host-api-key.service.js

@@ -13,6 +13,7 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const env_config_1 = require("../../../common/config/env.config");
 const integration_admission_1 = require("../../../common/config/integration-admission");
+const browser_request_guard_1 = require("../../../common/http/browser-request-guard");
 const error_types_1 = require("../../../common/errors/error-types");
 const logger_1 = require("../../../common/logging/logger");
 const host_api_key_1 = require("../host-api-key");
@@ -26,27 +27,39 @@ let HostApiKeyService = class HostApiKeyService {
     cachedKey;
     allows(request, transport, requireKey = false) {
         const claim = this.readClaim();
+        if (!claim.claimed) {
+            const env = (0, env_config_1.getEnvConfig)();
+            const refusal = (0, browser_request_guard_1.guardBrowserRequest)(request.headers, request.url ?? '', request.method, [
+                ...env.ALLOWED_HOSTS,
+                env.HOST,
+            ]);
+            if (refusal) {
+                this.logRejection(request, refusal);
+                return refusal;
+            }
+        }
         if (!requireKey) {
             if (!claim.claimed)
-                return true;
+                return null;
             if ((0, integration_admission_1.isLoopbackHost)(request.socket.remoteAddress ?? ''))
-                return true;
+                return null;
             if (transport === 'http' &&
                 request.method === 'GET' &&
                 this.path(request) === '/api/runtime') {
-                return true;
+                return null;
             }
         }
         if (this.holdsKey(claim, request))
-            return true;
-        this.logRejection(request);
-        return false;
+            return null;
+        this.logRejection(request, exports.HOST_API_KEY_REJECTION);
+        return exports.HOST_API_KEY_REJECTION;
     }
     rotate(request, sha256) {
         const claim = this.readClaim();
         if (!this.holdsKey(claim, request)) {
-            this.logRejection(request);
-            throw new error_types_1.AppError('Host API key rejected', host_api_key_1.HOST_API_KEY_REJECTED, 401);
+            this.logRejection(request, exports.HOST_API_KEY_REJECTION);
+            const { message, code, statusCode } = exports.HOST_API_KEY_REJECTION;
+            throw new error_types_1.AppError(message, code, statusCode);
         }
         const { keyPath } = claim;
         const temp = `${keyPath}.${(0, node_crypto_1.randomUUID)()}.tmp`;
@@ -71,8 +84,15 @@ let HostApiKeyService = class HostApiKeyService {
             claim.keyPath !== null &&
             this.matches(request.headers.authorization, claim.keyPath));
     }
-    logRejection(request) {
-        logger.warn({ peer: request.socket.remoteAddress, method: request.method, path: this.path(request) }, 'Host API key rejected');
+    logRejection(request, refusal) {
+        logger.warn({
+            peer: request.socket.remoteAddress,
+            method: request.method,
+            path: this.path(request),
+            origin: request.headers.origin,
+            host: request.headers.host,
+            code: refusal.code,
+        }, refusal.message);
     }
     path(request) {
         return (request.url ?? '').split('?', 1)[0];

package/dist/server/modules/remotes/host/host-api-key.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"host-api-key.service.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/host-api-key.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"host-api-key.service.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/host-api-key.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,6CAA0D;AAC1D,qCAAwF;AACxF,yCAA6C;AAE7C,kEAAiE;AACjE,wFAA8E;AAC9E,sFAGoD;AACpD,oEAAuE;AACvE,2DAA8D;AAC9D,kDAKyB;AAEzB,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,mBAAmB,CAAC,CAAC;AACpC,QAAA,sBAAsB,GAAG;IACpC,UAAU,EAAE,GAAG;IACf,IAAI,EAAE,oCAAqB;IAC3B,OAAO,EAAE,uBAAuB;CACxB,CAAC;AASJ,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACpB,SAAS,CAAa;IAE9B,MAAM,CACJ,OAAwB,EACxB,SAA4B,EAC5B,UAAU,GAAG,KAAK;QAElB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAEnB,MAAM,GAAG,GAAG,IAAA,yBAAY,GAAE,CAAC;YAC3B,MAAM,OAAO,GAAG,IAAA,2CAAmB,EAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE;gBACtF,GAAG,GAAG,CAAC,aAAa;gBACpB,GAAG,CAAC,IAAI;aACT,CAAC,CAAC;YACH,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACpC,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,OAAO;gBAAE,OAAO,IAAI,CAAC;YAChC,IAAI,IAAA,sCAAc,EAAC,OAAO,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE,CAAC;gBAAE,OAAO,IAAI,CAAC;YACpE,IACE,SAAS,KAAK,MAAM;gBACpB,OAAO,CAAC,MAAM,KAAK,KAAK;gBACxB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,cAAc,EACrC,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;YAAE,OAAO,IAAI,CAAC;QAC/C,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,8BAAsB,CAAC,CAAC;QACnD,OAAO,8BAAsB,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,OAAwB,EAAE,MAAc;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,8BAAsB,CAAC,CAAC;YACnD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,8BAAsB,CAAC;YAC7D,MAAM,IAAI,sBAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QAC1B,MAAM,IAAI,GAAG,GAAG,OAAO,IAAI,IAAA,wBAAU,GAAE,MAAM,CAAC;QAC9C,IAAI,CAAC;YACH,IAAA,uBAAa,EAAC,IAAI,EAAE,GAAG,MAAM,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAChE,IAAA,oBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC1B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC7B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,qBAAO,CAAC,oCAAoC,CAAC,CAAC;QAC1D,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC;gBACH,IAAA,oBAAU,EAAC,IAAI,CAAC,CAAC;YACnB,CAAC;YAAC,MAAM,CAAC;YAET,CAAC;QACH,CAAC;IACH,CAAC;IAEO,QAAQ,CAAC,KAAY,EAAE,OAAwB;QACrD,OAAO,CACL,KAAK,CAAC,OAAO;YACb,KAAK,CAAC,OAAO,KAAK,IAAI;YACtB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC,CAC3D,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,OAAwB,EAAE,OAA6B;QAC1E,MAAM,CAAC,IAAI,CACT;YACE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa;YAClC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACxB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM;YAC9B,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;YAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,EACD,OAAO,CAAC,OAAO,CAChB,CAAC;IACJ,CAAC;IAEO,IAAI,CAAC,OAAwB;QACnC,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAEO,SAAS;QACf,MAAM,MAAM,GAAG,IAAA,yBAAY,GAAE,CAAC,qBAAqB,CAAC;QACpD,IAAI,CAAC,IAAA,4BAAa,EAAC,MAAM,CAAC;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,KAAK,GAAY,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAA,gBAAI,EAAC,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;YACpF,IACE,OAAO,KAAK,KAAK,QAAQ;gBACzB,KAAK,KAAK,IAAI;gBACd,UAAU,IAAI,KAAK;gBACnB,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ;gBAClC,IAAA,sBAAU,EAAC,KAAK,CAAC,QAAQ,CAAC,EAC1B,CAAC;gBACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAA,gBAAI,EAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,cAAc,CAAC,EAAE,CAAC;YACvF,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAEO,OAAO,CAAC,aAAiC,EAAE,IAAY;QAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAErC,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,IAAI,CAAC,mCAAoB,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACzE,OAAO,IAAA,6BAAe,EAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAA,6BAAc,EAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IAC5E,CAAC;IAEO,UAAU,CAAC,IAAY;QAC7B,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC;YAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;YAC9B,IACE,MAAM;gBACN,MAAM,CAAC,IAAI,KAAK,IAAI;gBACpB,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,OAAO;gBAC7B,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI;gBACzB,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG;gBAEvB,OAAO,MAAM,CAAC,MAAM,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE;gBAAE,OAAO,IAAI,CAAC;YACpD,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC3C,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,OAAO,IAAI,CAAC;YACnD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YACxD,IAAI,CAAC,SAAS,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC;YACvF,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAC3B,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF,CAAA;AA3IY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CA2I7B"}

package/dist/server/modules/remotes/host/host-docker-volume-associations.store.d.ts

@@ -0,0 +1,14 @@
+import type { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
+export declare class HostDockerVolumeAssociationsStore {
+    private readonly sqlite;
+    private readonly transactions;
+    constructor(db: BetterSQLite3Database);
+    matches(projectId: string, volume: string, composeProject: string): boolean;
+    record(projectId: string, volumes: Array<{
+        volume: string;
+        composeProject: string;
+    }>): Promise<void>;
+    delete(volume: string): Promise<void>;
+    private read;
+    private write;
+}

package/dist/server/modules/remotes/host/host-docker-volume-associations.store.js

@@ -0,0 +1,91 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HostDockerVolumeAssociationsStore = void 0;
+const common_1 = require("@nestjs/common");
+const zod_1 = require("zod");
+const error_types_1 = require("../../../common/errors/error-types");
+const db_provider_1 = require("../../storage/db/db.provider");
+const sqlite_raw_1 = require("../../storage/db/sqlite-raw");
+const transaction_runner_1 = require("../../storage/db/transaction-runner");
+const SETTINGS_KEY = 'host.dockerVolumeAssociations';
+const RecordSchema = zod_1.z
+    .object({
+    projectId: zod_1.z.string().min(1),
+    volume: zod_1.z.string().min(1),
+    composeProject: zod_1.z.string().min(1),
+    recordedAt: zod_1.z.string().datetime(),
+})
+    .strict();
+let HostDockerVolumeAssociationsStore = class HostDockerVolumeAssociationsStore {
+    sqlite;
+    transactions;
+    constructor(db) {
+        this.sqlite = (0, sqlite_raw_1.getRawSqliteClient)(db);
+        this.transactions = new transaction_runner_1.TransactionRunner(this.sqlite);
+    }
+    matches(projectId, volume, composeProject) {
+        return this.read().some((record) => record.projectId === projectId &&
+            record.volume === volume &&
+            record.composeProject === composeProject);
+    }
+    async record(projectId, volumes) {
+        if (!volumes.length)
+            return;
+        await this.transactions.runImmediateQueued(() => {
+            const records = this.read().filter((record) => !volumes.some((v) => v.volume === record.volume));
+            const recordedAt = new Date().toISOString();
+            this.write([
+                ...records,
+                ...volumes.map((volume) => RecordSchema.parse({ projectId, ...volume, recordedAt })),
+            ]);
+        });
+    }
+    async delete(volume) {
+        await this.transactions.runImmediateQueued(() => {
+            const records = this.read();
+            const kept = records.filter((record) => record.volume !== volume);
+            if (kept.length !== records.length)
+                this.write(kept);
+        });
+    }
+    read() {
+        const row = this.sqlite
+            .prepare('SELECT value FROM settings WHERE key = ?')
+            .get(SETTINGS_KEY);
+        if (!row)
+            return [];
+        try {
+            return zod_1.z.array(RecordSchema).parse(JSON.parse(row.value));
+        }
+        catch {
+            throw new error_types_1.AppError('Stored Docker volume associations are invalid', 'DOCKER_VOLUME_ASSOCIATIONS_INVALID', 500);
+        }
+    }
+    write(records) {
+        const now = new Date().toISOString();
+        this.sqlite
+            .prepare(`INSERT INTO settings (id, key, value, created_at, updated_at)
+      VALUES (lower(hex(randomblob(16))), ?, ?, ?, ?)
+      ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at`)
+            .run(SETTINGS_KEY, JSON.stringify(records), now, now);
+    }
+};
+exports.HostDockerVolumeAssociationsStore = HostDockerVolumeAssociationsStore;
+exports.HostDockerVolumeAssociationsStore = HostDockerVolumeAssociationsStore = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(db_provider_1.DB_CONNECTION)),
+    __metadata("design:paramtypes", [Function])
+], HostDockerVolumeAssociationsStore);
+//# sourceMappingURL=host-docker-volume-associations.store.js.map

package/dist/server/modules/remotes/host/host-docker-volume-associations.store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"host-docker-volume-associations.store.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/host-docker-volume-associations.store.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/remotes/host/host-docker.dto.d.ts

@@ -647,6 +647,7 @@ export declare const DockerContainerCreateSchema: z.ZodObject<{
 }>;
 export declare const DockerArchiveRequestSchema: z.ZodObject<{
     projectId: z.ZodString;
+    projectRoot: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     image: z.ZodString;
     mountType: z.ZodEnum<["volume", "bind", "file"]>;
     source: z.ZodString;
@@ -655,11 +656,13 @@ export declare const DockerArchiveRequestSchema: z.ZodObject<{
     source: string;
     image: string;
     mountType: "bind" | "file" | "volume";
+    projectRoot?: string | undefined;
 }, {
     projectId: string;
     source: string;
     image: string;
     mountType: "bind" | "file" | "volume";
+    projectRoot?: string | undefined;
 }>;
 export declare const DockerResourceIdSchema: z.ZodString;
 export type DockerVolumeCreate = z.infer<typeof DockerVolumeCreateSchema>;
@@ -673,6 +676,8 @@ export interface DockerVolumeHolder {
 export declare const DOCKER_PROJECT_LABEL = "dev.devchain.project";
 export declare const COMPOSE_PROJECT_LABEL = "com.docker.compose.project";
 export declare const COMPOSE_SERVICE_LABEL = "com.docker.compose.service";
+export declare const COMPOSE_VOLUME_LABEL = "com.docker.compose.volume";
+export declare const COMPOSE_VERSION_LABEL = "com.docker.compose.version";
 export interface DockerHostOptions {
     signal?: AbortSignal;
     apiVersion?: string;
@@ -702,26 +707,52 @@ export declare const DockerBindPrepareSchema: z.ZodObject<{
         path: z.ZodEffects<z.ZodString, string, string>;
         replace: z.ZodBoolean;
         image: z.ZodOptional<z.ZodString>;
+        owner: z.ZodOptional<z.ZodObject<{
+            uid: z.ZodNumber;
+            gid: z.ZodNumber;
+        }, "strict", z.ZodTypeAny, {
+            uid: number;
+            gid: number;
+        }, {
+            uid: number;
+            gid: number;
+        }>>;
         file: z.ZodOptional<z.ZodLiteral<true>>;
     }, "strict", z.ZodTypeAny, {
         path: string;
         replace: boolean;
         file?: true | undefined;
+        owner?: {
+            uid: number;
+            gid: number;
+        } | undefined;
         image?: string | undefined;
     }, {
         path: string;
         replace: boolean;
         file?: true | undefined;
+        owner?: {
+            uid: number;
+            gid: number;
+        } | undefined;
         image?: string | undefined;
     }>, {
         path: string;
         replace: boolean;
         file?: true | undefined;
+        owner?: {
+            uid: number;
+            gid: number;
+        } | undefined;
         image?: string | undefined;
     }, {
         path: string;
         replace: boolean;
         file?: true | undefined;
+        owner?: {
+            uid: number;
+            gid: number;
+        } | undefined;
         image?: string | undefined;
     }>, "many">;
 }, "strict", z.ZodTypeAny, {
@@ -730,6 +761,10 @@ export declare const DockerBindPrepareSchema: z.ZodObject<{
         path: string;
         replace: boolean;
         file?: true | undefined;
+        owner?: {
+            uid: number;
+            gid: number;
+        } | undefined;
         image?: string | undefined;
     }[];
 }, {
@@ -738,6 +773,10 @@ export declare const DockerBindPrepareSchema: z.ZodObject<{
         path: string;
         replace: boolean;
         file?: true | undefined;
+        owner?: {
+            uid: number;
+            gid: number;
+        } | undefined;
         image?: string | undefined;
     }[];
 }>;
@@ -821,6 +860,8 @@ export interface DockerScanResult {
     containers: Array<{
         id: string;
         image?: string;
+        imageReference?: string;
+        user?: string;
         metadata?: DockerHolderMetadata;
         name: string;
         labels: Record<string, string>;

package/dist/server/modules/remotes/host/host-docker.dto.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DockerScanRequestSchema = exports.DockerImageLoadResultSchema = exports.DockerArchiveWriteResultSchema = exports.DockerBindPrepareSchema = exports.DockerCapacityRequestSchema = exports.DOCKER_ARCHIVE_SHA256_TRAILER = exports.DOCKER_API_VERSION_HEADER = exports.COMPOSE_SERVICE_LABEL = exports.COMPOSE_PROJECT_LABEL = exports.DOCKER_PROJECT_LABEL = exports.DockerResourceIdSchema = exports.DockerArchiveRequestSchema = exports.DockerContainerCreateSchema = exports.DockerNetworkCreateSchema = exports.DockerVolumeCreateSchema = exports.DockerImageMatchResultSchema = exports.DockerImageMatchRequestSchema = exports.DockerIdsSchema = exports.DockerOwnerSchema = void 0;
+exports.DockerScanRequestSchema = exports.DockerImageLoadResultSchema = exports.DockerArchiveWriteResultSchema = exports.DockerBindPrepareSchema = exports.DockerCapacityRequestSchema = exports.DOCKER_ARCHIVE_SHA256_TRAILER = exports.DOCKER_API_VERSION_HEADER = exports.COMPOSE_VERSION_LABEL = exports.COMPOSE_VOLUME_LABEL = exports.COMPOSE_SERVICE_LABEL = exports.COMPOSE_PROJECT_LABEL = exports.DOCKER_PROJECT_LABEL = exports.DockerResourceIdSchema = exports.DockerArchiveRequestSchema = exports.DockerContainerCreateSchema = exports.DockerNetworkCreateSchema = exports.DockerVolumeCreateSchema = exports.DockerImageMatchResultSchema = exports.DockerImageMatchRequestSchema = exports.DockerIdsSchema = exports.DockerOwnerSchema = void 0;
 const zod_1 = require("zod");
 const node_path_1 = require("node:path");
 const docker_image_metadata_1 = require("../../core/controllers/docker-image-metadata");
@@ -75,6 +75,7 @@ exports.DockerContainerCreateSchema = zod_1.z
 exports.DockerArchiveRequestSchema = zod_1.z
     .object({
     projectId,
+    projectRoot: scanPath.optional(),
     image: identifier,
     mountType: zod_1.z.enum(['volume', 'bind', 'file']),
     source: zod_1.z.string().min(1).max(4096),
@@ -84,6 +85,8 @@ exports.DockerResourceIdSchema = identifier;
 exports.DOCKER_PROJECT_LABEL = 'dev.devchain.project';
 exports.COMPOSE_PROJECT_LABEL = 'com.docker.compose.project';
 exports.COMPOSE_SERVICE_LABEL = 'com.docker.compose.service';
+exports.COMPOSE_VOLUME_LABEL = 'com.docker.compose.volume';
+exports.COMPOSE_VERSION_LABEL = 'com.docker.compose.version';
 exports.DOCKER_API_VERSION_HEADER = 'x-devchain-docker-api-version';
 exports.DOCKER_ARCHIVE_SHA256_TRAILER = 'x-devchain-archive-sha256';
 exports.DockerCapacityRequestSchema = zod_1.z
@@ -98,10 +101,17 @@ exports.DockerBindPrepareSchema = zod_1.z
         path: scanPath,
         replace: zod_1.z.boolean(),
         image: identifier.optional(),
+        owner: zod_1.z
+            .object({
+            uid: zod_1.z.number().int().nonnegative().max(4294967295),
+            gid: zod_1.z.number().int().nonnegative().max(4294967295),
+        })
+            .strict()
+            .optional(),
         file: zod_1.z.literal(true).optional(),
     })
         .strict()
-        .refine((bind) => !bind.replace || bind.image !== undefined))
+        .refine((bind) => (!bind.replace && !bind.owner) || bind.image !== undefined))
         .min(1)
         .max(64),
 })

package/dist/server/modules/remotes/host/host-docker.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"host-docker.dto.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/host-docker.dto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"host-docker.dto.js","sourceRoot":"","sources":["../../../../src/modules/remotes/host/host-docker.dto.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/remotes/host/host-docker.service.d.ts

@@ -3,6 +3,7 @@ import { Readable } from 'node:stream';
 import { DockerVersion } from '../../core/controllers/docker-engine.client';
 import { DockerArchiveRequest, DockerContainerCreate, DockerNetworkCreate, DockerVolumeCreate, DockerVolumeHolder, DockerCapacityResult, DockerScanResult, DockerArchiveWriteResult, DockerBindPrepare, DockerImageLoadResult } from './host-docker.dto';
 import { type HostIPv4RouteReader } from './host-ipv4-routes';
+import { HostDockerVolumeAssociationsStore } from './host-docker-volume-associations.store';
 type Labels = Record<string, string>;
 type Volume = {
     Name: string;
@@ -15,8 +16,9 @@ type MatchedImage = {
 };
 export declare class HostDockerService {
     private readonly archives;
+    private readonly associations;
     private readonly routes;
-    constructor(archives: DockerArchiveJournal, routes?: HostIPv4RouteReader);
+    constructor(archives: DockerArchiveJournal, associations: HostDockerVolumeAssociationsStore, routes?: HostIPv4RouteReader);
     version(signal?: AbortSignal): Promise<DockerVersion>;
     private engine;
     scan(paths: string[], signal?: AbortSignal, apiVersion?: string, holderVolumes?: string[], networkNames?: string[]): Promise<DockerScanResult>;
@@ -44,6 +46,7 @@ export declare class HostDockerService {
     remove(kind: 'volumes' | 'containers' | 'networks', id: string, projectId: string, signal?: AbortSignal, apiVersion?: string, projectRoot?: string): Promise<void>;
     writeArchive(input: DockerArchiveRequest, body: Readable, signal?: AbortSignal, apiVersion?: string): Promise<DockerArchiveWriteResult>;
     prepareBinds(input: DockerBindPrepare, signal?: AbortSignal, apiVersion?: string): Promise<void>;
+    private clearBindUnlessEmpty;
     private clearBind;
     stopProject(projectId: string, signal?: AbortSignal, apiVersion?: string): Promise<{
         stopped: string[];
@@ -52,8 +55,12 @@ export declare class HostDockerService {
     readArchive(input: DockerArchiveRequest, signal?: AbortSignal, apiVersion?: string): Promise<Readable>;
     private validateProjectRoot;
     private requireOwner;
-    private composeOwnsProjectVolume;
+    private projectHolder;
+    private projectVolumes;
     private composeHolder;
     private archiveSource;
+    private liveContainers;
+    private requireVolume;
+    private recordMountedVolumes;
 }
 export {};