@wocker/core 1.1.5-beta.2 → 1.1.6-beta.0

package/lib/env.d.ts

@@ -1,7 +1,8 @@
-export declare const WOCKER_VERSION = "1.1.5";
+export declare const WOCKER_VERSION = "1.1.6";
 export declare const WOCKER_VERSION_KEY = "__WOCKER_VERSION__";
 export declare const WOCKER_DATA_DIR: string;
 export declare const WOCKER_DATA_DIR_KEY = "__WOCKER_DATA_DIR__";
+export declare const WOCKER_INTERNAL_ALLOWED_MOUNTS: string[];
 export declare const FILE_SYSTEM_DRIVER_KEY = "__FILE_SYSTEM_DRIVER_";
 export declare const PLUGIN_DIR_KEY = "PLUGIN_DIR";
 export declare const IS_CONTROLLER_METADATA = "IS_CONTROLLER";

package/lib/env.js

@@ -3,13 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MODULE_METADATA = exports.PLUGIN_NAME_METADATA = exports.INJECT_TOKEN_METADATA = exports.SELF_DECLARED_DEPS_METADATA = exports.PARAMTYPES_METADATA = exports.ALIAS_METADATA = exports.ARGS_OLD_METADATA = exports.ARGS_METADATA = exports.LISTENER_METADATA = exports.COMPLETION_METADATA = exports.COMMAND_METADATA = exports.DESCRIPTION_METADATA = exports.INJECTABLE_WATERMARK = exports.IS_MODULE_METADATA = exports.IS_GLOBAL_METADATA = exports.IS_CONTROLLER_METADATA = exports.PLUGIN_DIR_KEY = exports.FILE_SYSTEM_DRIVER_KEY = exports.WOCKER_DATA_DIR_KEY = exports.WOCKER_DATA_DIR = exports.WOCKER_VERSION_KEY = exports.WOCKER_VERSION = void 0;
+exports.MODULE_METADATA = exports.PLUGIN_NAME_METADATA = exports.INJECT_TOKEN_METADATA = exports.SELF_DECLARED_DEPS_METADATA = exports.PARAMTYPES_METADATA = exports.ALIAS_METADATA = exports.ARGS_OLD_METADATA = exports.ARGS_METADATA = exports.LISTENER_METADATA = exports.COMPLETION_METADATA = exports.COMMAND_METADATA = exports.DESCRIPTION_METADATA = exports.INJECTABLE_WATERMARK = exports.IS_MODULE_METADATA = exports.IS_GLOBAL_METADATA = exports.IS_CONTROLLER_METADATA = exports.PLUGIN_DIR_KEY = exports.FILE_SYSTEM_DRIVER_KEY = exports.WOCKER_INTERNAL_ALLOWED_MOUNTS = exports.WOCKER_DATA_DIR_KEY = exports.WOCKER_DATA_DIR = exports.WOCKER_VERSION_KEY = exports.WOCKER_VERSION = void 0;
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-exports.WOCKER_VERSION = "1.1.5";
+exports.WOCKER_VERSION = "1.1.6";
 exports.WOCKER_VERSION_KEY = "__WOCKER_VERSION__";
 exports.WOCKER_DATA_DIR = process.env.WS_DIR || path_1.default.join(os_1.default.homedir(), ".workspace");
 exports.WOCKER_DATA_DIR_KEY = "__WOCKER_DATA_DIR__";
+exports.WOCKER_INTERNAL_ALLOWED_MOUNTS = [
+    "/var/run/docker.sock",
+    "/var/run/docker.sock.raw",
+    exports.WOCKER_DATA_DIR
+];
 exports.FILE_SYSTEM_DRIVER_KEY = "__FILE_SYSTEM_DRIVER_";
 exports.PLUGIN_DIR_KEY = "PLUGIN_DIR";
 exports.IS_CONTROLLER_METADATA = "IS_CONTROLLER";

package/lib/makes/AppConfig.d.ts

@@ -28,7 +28,7 @@ export declare abstract class AppConfig {
     getEnv(key: string, byDefault: string): string;
     setEnv(name: string, value: string): void;
     unsetEnv(name: string): void;
-    isMountAllowed(path: string): boolean;
+    isMountAllowed(path: string, internal?: boolean): boolean;
     addMountAllow(path: string): void;
     removeMountAllow(path: string): void;
     addMountDeny(path: string): void;

package/lib/makes/AppConfig.js

@@ -13,6 +13,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfig = void 0;
 const isPathAllowed_1 = require("../utils/isPathAllowed");
+const env_1 = require("../env");
 class AppConfig {
     constructor(data) {
         const { plugins = [], presets = [], projects = [] } = data, rest = __rest(data, ["plugins", "presets", "projects"]);
@@ -160,9 +161,12 @@ class AppConfig {
             delete this.env;
         }
     }
-    isMountAllowed(path) {
+    isMountAllowed(path, internal = false) {
         var _a, _b, _c, _d;
-        return (0, isPathAllowed_1.isPathAllowed)(path, (_b = (_a = this.permissions) === null || _a === void 0 ? void 0 : _a.mounts) === null || _b === void 0 ? void 0 : _b.allow, (_d = (_c = this.permissions) === null || _c === void 0 ? void 0 : _c.mounts) === null || _d === void 0 ? void 0 : _d.deny);
+        return (0, isPathAllowed_1.isPathAllowed)(path, [
+            ...((_b = (_a = this.permissions) === null || _a === void 0 ? void 0 : _a.mounts) === null || _b === void 0 ? void 0 : _b.allow) || [],
+            ...internal ? env_1.WOCKER_INTERNAL_ALLOWED_MOUNTS : []
+        ], (_d = (_c = this.permissions) === null || _c === void 0 ? void 0 : _c.mounts) === null || _d === void 0 ? void 0 : _d.deny);
     }
     addMountAllow(path) {
         if (!this.permissions) {

package/lib/modules/docker/services/ContainerService.d.ts

@@ -18,8 +18,6 @@ export declare namespace ContainerService {
         user?: string;
         restart?: "always";
         entrypoint?: string | string[];
-        /** @deprecated */
-        projectId?: string;
         tty?: boolean;
         memory?: number;
         memorySwap?: number;
@@ -35,6 +33,7 @@ export declare namespace ContainerService {
         };
         networkMode?: string;
         extraHosts?: any;
+        internal?: boolean;
         volumes?: string[];
         ports?: string[];
         cmd?: string[];

package/lib/services/AppService.d.ts

@@ -40,7 +40,7 @@ export declare class AppService {
     unsetMeta(key: string): void;
     get experimentalFeatures(): string[];
     isExperimentalEnabled(key: string): boolean;
-    isAllowedPath(path: string): boolean;
+    isAllowedPath(path: string, internal?: boolean): boolean;
     save(): void;
 }
 export {};

package/lib/services/AppService.js

@@ -126,8 +126,8 @@ let AppService = class AppService {
     isExperimentalEnabled(key) {
         return this.config.getMeta(`experimental.${key}`) === "enabled";
     }
-    isAllowedPath(path) {
-        return this.config.isMountAllowed(path);
+    isAllowedPath(path, internal = false) {
+        return this.config.isMountAllowed(path, internal);
     }
     save() {
         this.config.save();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@wocker/core",
     "type": "commonjs",
-    "version": "1.1.5-beta.2",
+    "version": "1.1.6-beta.0",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Core of the Wocker",
     "license": "MIT",