xynginc 1.0.93 → 1.0.94

package/dist/index.js

@@ -7,6 +7,7 @@ import { Plugin } from "xypriss";
 import { Logger } from "./mods/logger";
 import { validateConfig } from "./mods/validateConfig";
 import { startXNCPlugin } from "./startPlugin";
+import { getHostEnv } from "./mods/getHostEnv";
 /**
  * XyNginC Plugin for XyPriss.
  * Automates Nginx and SSL management for your server.
@@ -17,19 +18,11 @@ import { startXNCPlugin } from "./startPlugin";
 export default function XNCP(options) {
     const { domains, autoReload = true, autoFixFirewall = false, binaryPath, autoDownload = true, version = "latest", installRequirements = true, sudoPassword, } = options;
     const pkg = Plugin.manifest(__sys__);
-    const hostRoot = (typeof __sys__ !== "undefined" && __sys__.__env__?.get("__root__")) ||
-        process.cwd();
     const effectiveSudoPassword = sudoPassword ||
-        (typeof __sys__ !== "undefined" &&
-            typeof __sys__.__env__?.getForRoot === "function" &&
-            hostRoot
-            ? __sys__.__env__.getForRoot("SUDO_PASSWORD", hostRoot)
-            : undefined) ||
-        (typeof __sys__ !== "undefined"
-            ? __sys__.__env__?.get("SUDO_PASSWORD")
-            : undefined) ||
+        getHostEnv("SUDO_PASSWORD") ||
+        getHostEnv("XY_SUDO_PASSWORD") ||
+        getHostEnv("XYPRISS_SUDO_PASSWORD") ||
         "";
-    console.log("effectiveSudoPassword: ", effectiveSudoPassword);
     return Plugin.create({
         name: pkg.name,
         version: pkg.version,

package/dist/mods/getHostEnv.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Recovers environment variables from the host application, bypassing
+ * the XyPriss caller-isolation sandbox if not explicitly injected.
+ */
+export declare function getHostEnv(key: string): string | undefined;

package/dist/mods/getHostEnv.js

@@ -0,0 +1,73 @@
+import fs from "fs";
+import path from "path";
+/**
+ * Recovers environment variables from the host application, bypassing
+ * the XyPriss caller-isolation sandbox if not explicitly injected.
+ */
+export function getHostEnv(key) {
+    // 1. Inspect XyPriss internal Symbol-keyed store map on globalThis
+    try {
+        const symbols = Object.getOwnPropertySymbols(globalThis);
+        const envStoreSym = symbols.find((s) => s.description === "__xy_env_store__" ||
+            String(s).includes("__xy_env_store__"));
+        if (envStoreSym && globalThis[envStoreSym]) {
+            const storeMap = globalThis[envStoreSym];
+            for (const [root, env] of storeMap.entries()) {
+                if (env && typeof env[key] === "string" && env[key].length > 0) {
+                    return env[key];
+                }
+            }
+        }
+    }
+    catch {
+        // Ignore error
+    }
+    // 2. Direct process.env check for whitelisted prefixes (allowed by XyPriss Environment Shield)
+    try {
+        const prefixes = ["", "XY_", "XYPRISS_", "__"];
+        for (const prefix of prefixes) {
+            const val = process.env[`${prefix}${key}`];
+            if (typeof val === "string" && val.length > 0) {
+                return val;
+            }
+        }
+    }
+    catch {
+        // Shield might block
+    }
+    // 3. Fallback: Parse .env directly from process.cwd() or parent directories
+    try {
+        let currentDir = process.cwd();
+        const systemRoot = path.parse(currentDir).root;
+        while (currentDir && currentDir !== systemRoot) {
+            const envPath = path.join(currentDir, ".env");
+            if (fs.existsSync(envPath)) {
+                const content = fs.readFileSync(envPath, "utf-8");
+                const lines = content.replace(/\r\n?/gm, "\n").split("\n");
+                for (const line of lines) {
+                    const trimmed = line.trim();
+                    if (!trimmed || trimmed.startsWith("#"))
+                        continue;
+                    const match = trimmed.match(/^([^=]+)=(.*)$/);
+                    if (match) {
+                        const varName = match[1].trim();
+                        if (varName === key) {
+                            let value = match[2].trim();
+                            // Remove surrounding quotes if present
+                            if ((value.startsWith('"') && value.endsWith('"')) ||
+                                (value.startsWith("'") && value.endsWith("'"))) {
+                                value = value.slice(1, -1);
+                            }
+                            return value;
+                        }
+                    }
+                }
+            }
+            currentDir = path.dirname(currentDir);
+        }
+    }
+    catch {
+        // Ignore error
+    }
+    return undefined;
+}

package/dist/startPlugin.js

@@ -1,22 +1,17 @@
 import { ensureBinary } from "./mods/ensureBinary";
 import { Logger } from "./mods/logger";
 import { addDomain, applyConfig, checkRequirements, getStatus, installRequirementsHandler, listDomains, reloadNginx, removeDomain, testNginx, } from "./mods/requirements";
+import { getHostEnv } from "./mods/getHostEnv";
 const getSudo = (sudoPassword) => {
     // 1. Direct option passed by the user
     if (sudoPassword) {
         Logger.info(`[XyNginC] Using sudo password provided via plugin options(${sudoPassword.slice(0, 2)}***).`);
         return `echo '${sudoPassword}' | sudo -S`;
     }
-    // 2. Read from host project .env via XyPriss getForRoot
-    // In XyPriss Zero-Trust sandboxing, __sys__.__env__.get() scopes to the caller module root.
-    // We use the host application root (__root__ or process.cwd()) to retrieve project-level secrets.
-    const hostRoot = (typeof __sys__ !== "undefined" && __sys__.__env__?.get("__root__")) ||
-        process.cwd();
-    const envPwd = (typeof __sys__ !== "undefined" &&
-        typeof __sys__.__env__?.getForRoot === "function" &&
-        hostRoot
-        ? __sys__.__env__.getForRoot("SUDO_PASSWORD", hostRoot)
-        : undefined) ||
+    // 2. Multi-tier resolution of SUDO_PASSWORD from the host environment
+    const envPwd = getHostEnv("SUDO_PASSWORD") ||
+        getHostEnv("XY_SUDO_PASSWORD") ||
+        getHostEnv("XYPRISS_SUDO_PASSWORD") ||
         (typeof __sys__ !== "undefined"
             ? __sys__.__env__?.get("SUDO_PASSWORD")
             : undefined);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xynginc",
-  "version": "1.0.93",
+  "version": "1.0.94",
   "description": "XyPriss Nginx Controller - Automatic Nginx & SSL management for XyPriss servers",
   "author": "Seth Eleazar - iDevo",
   "license": "NOSL",

package/xypriss.plugin.xsig

@@ -1,11 +1,11 @@
 --- XYPRISS SIGNATURE (G3) ---
-Manifest: xynginc@1.0.93
+Manifest: xynginc@1.0.94
 Min-Engine: 1.0.81
-Fingerprint: sha256:03604e0d879653568e2b805ed55cce558bd4de72f7787e784ebdd0bc3c85e128
+Fingerprint: sha256:02cff76c2401603f866188ef21d27dcc33cb8786e4353384ae479b51cb185e4b
 Identity: ed25519:0e2e1accdbba45480979305256d50d368ae6cc2c0d7ee378c5f1999ae834cf58
 Privileges: XHS.HOOK.LIFECYCLE.REGISTER,XHS.HOOK.LIFECYCLE.SERVER_START,XHS.HOOK.LIFECYCLE.SERVER_STOP,XHS.HOOK.LIFECYCLE.SERVER_READY
-Expires: 2027-09-12T18:00:07Z
+Expires: 2027-09-12T18:05:47Z
 Revision: sha256:none
 --- BEGIN CRYPTOGRAPHIC PROOF ---
-base64:pPdQIlTA2rrp+vWXh9st+1bemSKN28DAMl3MtxyDwnVipcGP/k6ftC2+m/Xzt68WrAsaum2aM3Uwpqs7vw3+CQ==
+base64:mdMvFSrts0+fvRJHfgoqVfjr7Sc5QosURA5ZuYacpdCzdUOtFyeBrGPB/uScomtRQD4LWU3X8Ms4Q5UsiiYHBA==
 --- END XYPRISS SIGNATURE ---