@blogic-cz/agent-tools 1.6.9 → 1.6.11

package/README.md

@@ -654,9 +654,9 @@ Claude Code uses shell command hooks. The package ships a ready-made wrapper scr
 
 That's it. The hook reads tool input from stdin, runs the guard, and exits with code 2 (blocked + reason on stderr) or 0 (allowed).
 
-The guard permits static `printenv` reads and simple `echo`/`printf` expansions only for exact names in `credentialGuard.allowedEnvironmentVariables`. The default list is empty. Multiple names are allowed only when each name is approved. Approved environment values may be displayed, but redirecting their pipeline or passing them to an executor stays blocked.
+The guard permits static `printenv` reads and simple `echo`/`printf` expansions only for exact names in `credentialGuard.allowedEnvironmentVariables`. Quoted empty defaults such as `"${NAME:-}"` follow the same display rules, including `printf` data arguments with a literal format; unquoted defaults, nonempty defaults, and other parameter operators stay blocked. The default list is empty. Multiple names are allowed only when each name is approved. Approved environment values may be displayed, but redirecting their pipeline or passing them to an executor stays blocked.
 
-Python inline programs and quoted stdin heredocs can also display approved values through `os.getenv("NAME")`, `os.environ.get("NAME", "default")`, or `os.environ["NAME"]`. The complete program must be `import os` followed by `print(...)` statements using these reads and plain string labels or defaults. Dynamic names, aliases, escaped or interpolated strings, additional statements, and whole-environment output remain unsupported. The same redirection and pipeline restrictions apply.
+Python inline programs and quoted stdin heredocs can also display approved values through `os.getenv("NAME")`, `os.environ.get("NAME", "default")`, or `os.environ["NAME"]`. The complete program must import unaliased `os`, plus `json` for JSON display, followed by `print(...)` statements. `json.dumps(...)` supports dictionaries and lists of approved reads, including comprehensions over a nonempty literal list of approved names. Every dictionary key and environment read must use an approved name. Each projection has at most 16 entries; the program has at most 65,536 characters. Computed or unbounded names, aliases, escaped or interpolated strings, additional statements, and whole-environment output remain unsupported. The same redirection and pipeline restrictions apply.
 
 Literal assignments such as `F=README.md; cat "$F"` work in supported static commands. Bounded proofs also support a literal `for` loop over a fixed list, a single ASCII-letter path binding such as `cd PATH && A=docs/report.md && shasum -a 256 "$A"` or `F=README.md; cat "$F"`, including the existing `git add -- "$T/file"` form, and literal path braces such as `rg -n -i PATTERN src/{a,b} docs/{guide,api}.md`. Path braces work with supported passive text commands and `cat`, and support one unquoted comma list per path, at most 16 members per list and 32 generated paths per command, within 64 KiB. Nested braces, ranges, empty members, mixed quoting, command positions, and compound commands remain unsupported. Path bindings accept literal values and `;`, newline, or `&&` sequencing; a binding conditional on successful `cd` is proved only for uses in that same `&&` list. Their uses must be supported read-only file operands or explicit `git add --` paths. Rebinding, executable operands, startup-variable names, and uncertain scopes cannot establish this proof. Loop binders are a single lowercase letter or `T`, and their uses must occupy supported data operands. Every body command and expanded path is checked; unsupported control flow, mutations such as `printf -v`, and unknown command roles cannot establish the proof. Other variable assignments and brace expansions retain conservative refusal. Fully quoted literal braces remain usable in static searches.
 

package/dist/credential-guard/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/credential-guard/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAmB,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAK5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAM/D,8CAA8C;AAC9C,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,+CAA+C;AAC/C,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B,CAAC;AAQF,+CAA+C;AAC/C,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACxE,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC3E,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IAC7C,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IAC7C,sBAAsB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACrD,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACjF,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACjD,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;CACxD,CAAC;AA+oFF,6CAA6C;AAC7C,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAErE;AAED,2CAA2C;AAC3C,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAEpE;AAED,2CAA2C;AAC3C,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAEpE;AAMD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,CAAC,EAAE,qBAAqB,GAAG,eAAe,CA4VrF;AAQD,kEAAkE;AAClE,eAAO,MAAM,uBAAuB,UArhGD,SAAS,UAAU,UAAU,KAAK,IAqhGM,CAAC;AAE5E,oDAAoD;AACpD,eAAO,MAAM,aAAa,YAvhGC,MAAM,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAuhGjB,CAAC;AAExD,yEAAyE;AACzE,eAAO,MAAM,aAAa,aAzhGE,MAAM,KAAK,OAyhGgB,CAAC;AAExD,yDAAyD;AACzD,eAAO,MAAM,aAAa,aA3hGE,MAAM,KAAK,OA2hGgB,CAAC;AAExD,oEAAoE;AACpE,eAAO,MAAM,sBAAsB,YA7hGC,MAAM,KAAK,OA6hG0B,CAAC;AAE1E,iDAAiD;AACjD,eAAO,MAAM,iBAAiB,YA/hGC,MAAM,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IA+hGf,CAAC;AAEhE,wDAAwD;AACxD,eAAO,MAAM,kBAAkB,YAjiGC,MAAM,KAAK,OAiiGsB,CAAC;AAElE,8EAA8E;AAC9E,eAAO,MAAM,kBAAkB,YAniGC,MAAM,KAAK,MAAM,GAAG,IAmiGa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/credential-guard/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAmB,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAK5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAM/D,8CAA8C;AAC9C,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,+CAA+C;AAC/C,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B,CAAC;AAQF,+CAA+C;AAC/C,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACxE,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC3E,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IAC7C,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IAC7C,sBAAsB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACrD,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACjF,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACjD,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;CACxD,CAAC;AA2uFF,6CAA6C;AAC7C,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAErE;AAED,2CAA2C;AAC3C,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAEpE;AAED,2CAA2C;AAC3C,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAEpE;AAMD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,CAAC,EAAE,qBAAqB,GAAG,eAAe,CA4VrF;AAQD,kEAAkE;AAClE,eAAO,MAAM,uBAAuB,UAjnGD,SAAS,UAAU,UAAU,KAAK,IAinGM,CAAC;AAE5E,oDAAoD;AACpD,eAAO,MAAM,aAAa,YAnnGC,MAAM,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAmnGjB,CAAC;AAExD,yEAAyE;AACzE,eAAO,MAAM,aAAa,aArnGE,MAAM,KAAK,OAqnGgB,CAAC;AAExD,yDAAyD;AACzD,eAAO,MAAM,aAAa,aAvnGE,MAAM,KAAK,OAunGgB,CAAC;AAExD,oEAAoE;AACpE,eAAO,MAAM,sBAAsB,YAznGC,MAAM,KAAK,OAynG0B,CAAC;AAE1E,iDAAiD;AACjD,eAAO,MAAM,iBAAiB,YA3nGC,MAAM,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IA2nGf,CAAC;AAEhE,wDAAwD;AACxD,eAAO,MAAM,kBAAkB,YA7nGC,MAAM,KAAK,OA6nGsB,CAAC;AAElE,8EAA8E;AAC9E,eAAO,MAAM,kBAAkB,YA/nGC,MAAM,KAAK,MAAM,GAAG,IA+nGa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blogic-cz/agent-tools",
-  "version": "1.6.9",
+  "version": "1.6.11",
   "description": "CLI tools for AI coding agent workflows — GitHub, database, Kubernetes, Azure platform, Azure DevOps, logs, sessions, and audit",
   "keywords": [
     "agent",

package/src/credential-guard/index.ts

@@ -1608,8 +1608,10 @@ function isAllowedPythonEnvironmentRead(argv: string[], allowedNames: Set<string
     return false;
 
   const program = argv[index] ?? "";
+  if (program.length > 65_536) return false;
   let position = 0;
   let foundRead = false;
+  let importedJson = false;
   const skipInlineWhitespace = () => {
     while (/[\t ]/.test(program[position] ?? "")) position++;
   };
@@ -1619,7 +1621,12 @@ function isAllowedPythonEnvironmentRead(argv: string[], allowedNames: Set<string
     return true;
   };
   const takeIdentifier = (value: string): boolean => {
-    if (!take(value) || /[A-Za-z0-9_]/.test(program[position] ?? "")) return false;
+    if (
+      !program.startsWith(value, position) ||
+      /[A-Za-z0-9_]/.test(program[position + value.length] ?? "")
+    )
+      return false;
+    position += value.length;
     return true;
   };
   const takeString = (): string | undefined => {
@@ -1638,8 +1645,14 @@ function isAllowedPythonEnvironmentRead(argv: string[], allowedNames: Set<string
     position++;
     return value;
   };
-  const takeEnvironmentRead = (): boolean => {
+  const takeEnvironmentRead = (variable?: string): boolean => {
     skipInlineWhitespace();
+    const takeName = (): boolean => {
+      skipInlineWhitespace();
+      if (variable !== undefined) return takeIdentifier(variable);
+      const name = takeString();
+      return name !== undefined && allowedNames.has(name);
+    };
     const start = position;
     if (!takeIdentifier("os")) return false;
     if (!take(".")) {
@@ -1648,8 +1661,7 @@ function isAllowedPythonEnvironmentRead(argv: string[], allowedNames: Set<string
     }
     if (takeIdentifier("getenv")) {
       if (!take("(")) return false;
-      const name = takeString();
-      if (name === undefined || !allowedNames.has(name)) return false;
+      if (!takeName()) return false;
       skipInlineWhitespace();
       if (take(",")) {
         if (takeString() === undefined) return false;
@@ -1662,8 +1674,7 @@ function isAllowedPythonEnvironmentRead(argv: string[], allowedNames: Set<string
     if (!takeIdentifier("environ")) return false;
     if (take(".")) {
       if (!takeIdentifier("get") || !take("(")) return false;
-      const name = takeString();
-      if (name === undefined || !allowedNames.has(name)) return false;
+      if (!takeName()) return false;
       skipInlineWhitespace();
       if (take(",")) {
         if (takeString() === undefined) return false;
@@ -1674,15 +1685,91 @@ function isAllowedPythonEnvironmentRead(argv: string[], allowedNames: Set<string
       return true;
     }
     if (!take("[")) return false;
-    const name = takeString();
-    if (name === undefined || !allowedNames.has(name)) return false;
+    if (!takeName()) return false;
     skipInlineWhitespace();
     if (!take("]")) return false;
     foundRead = true;
     return true;
   };
+  const takeApprovedNames = (): boolean => {
+    if (!take("[")) return false;
+    for (let count = 0; count < 16; count++) {
+      const name = takeString();
+      if (name === undefined || !allowedNames.has(name)) return false;
+      skipInlineWhitespace();
+      if (take("]")) return true;
+      if (!take(",")) return false;
+      skipInlineWhitespace();
+      if (take("]")) return true;
+    }
+    return false;
+  };
+  const takeComprehension = (): boolean => {
+    const dictionary = take("{");
+    if (!dictionary && !take("[")) return false;
+    skipInlineWhitespace();
+    const variable = dictionary
+      ? /^[A-Za-z_][A-Za-z0-9_]*/.exec(program.slice(position))?.[0]
+      : /^os\.(?:getenv\(|environ(?:\.get\(|\[))[\t ]*([A-Za-z_][A-Za-z0-9_]*)/.exec(
+          program.slice(position),
+        )?.[1];
+    if (!variable || ["os", "json", "print"].includes(variable)) return false;
+    if (dictionary) {
+      if (!takeIdentifier(variable)) return false;
+      skipInlineWhitespace();
+      if (!take(":")) return false;
+    }
+    if (!takeEnvironmentRead(variable)) return false;
+    const loop = new RegExp(`[\\t ]+for[\\t ]+${variable}[\\t ]+in[\\t ]+`, "y");
+    loop.lastIndex = position;
+    const match = loop.exec(program);
+    if (!match) return false;
+    position = loop.lastIndex;
+    if (!takeApprovedNames()) return false;
+    skipInlineWhitespace();
+    return take(dictionary ? "}" : "]");
+  };
+  const takeProjection = (): boolean => {
+    const start = position;
+    const previousRead = foundRead;
+    if (takeComprehension()) return true;
+    position = start;
+    foundRead = previousRead;
+    const dictionary = take("{");
+    if (!dictionary && !take("[")) return false;
+    const close = dictionary ? "}" : "]";
+    for (let count = 0; count < 16; count++) {
+      if (dictionary) {
+        const key = takeString();
+        if (key === undefined || !allowedNames.has(key)) return false;
+        skipInlineWhitespace();
+        if (!take(":")) return false;
+      }
+      if (!takeEnvironmentRead()) return false;
+      skipInlineWhitespace();
+      if (take(close)) return true;
+      if (!take(",")) return false;
+      skipInlineWhitespace();
+      if (take(close)) return true;
+    }
+    return false;
+  };
+  const takeJsonDisplay = (): boolean => {
+    if (!importedJson || !takeIdentifier("json") || !take(".dumps")) return false;
+    skipInlineWhitespace();
+    if (!take("(")) return false;
+    skipInlineWhitespace();
+    if (!takeProjection()) return false;
+    skipInlineWhitespace();
+    return take(")");
+  };
   const takeExpression = (): boolean => {
-    const takeTerm = (): boolean => takeString() !== undefined || takeEnvironmentRead();
+    const takeTerm = (): boolean => {
+      skipInlineWhitespace();
+      return program.startsWith("json", position)
+        ? takeJsonDisplay()
+        : takeString() !== undefined || takeEnvironmentRead();
+    };
     if (!takeTerm()) return false;
     skipInlineWhitespace();
     while (take("+")) {
@@ -1718,10 +1805,26 @@ function isAllowedPythonEnvironmentRead(argv: string[], allowedNames: Set<string
   skipInlineWhitespace();
   if (!takeIdentifier("import")) return false;
   skipInlineWhitespace();
-  if (!takeIdentifier("os")) return false;
+  const jsonFirst = takeIdentifier("json");
+  if (!jsonFirst && !takeIdentifier("os")) return false;
+  importedJson = jsonFirst;
+  skipInlineWhitespace();
+  if (take(",")) {
+    skipInlineWhitespace();
+    if (!takeIdentifier(jsonFirst ? "os" : "json")) return false;
+    importedJson = true;
+  } else if (jsonFirst) return false;
   skipInlineWhitespace();
   if (!(take(";") || take("\n") || take("\r\n"))) return false;
   skipSeparators();
+  if (!importedJson && takeIdentifier("import")) {
+    skipInlineWhitespace();
+    if (!takeIdentifier("json")) return false;
+    importedJson = true;
+    skipInlineWhitespace();
+    if (!(take(";") || take("\n") || take("\r\n"))) return false;
+    skipSeparators();
+  }
   while (position < program.length) {
     if (!takePrint()) return false;
     skipInlineWhitespace();
@@ -2449,7 +2552,7 @@ function hasEnvironmentVariableExpansionRead(
     const name = variable[1] ?? variable[3] ?? "";
     if (variable[2]) {
       if (quote !== '"' || !allowedNames.has(name)) invalidExpansion = true;
-      normalized += "ENVTESTVALUE";
+      normalized += "ENVVALUE";
       i += variable[0].length - 1;
       continue;
     }
@@ -2503,13 +2606,6 @@ function hasEnvironmentVariableExpansionRead(
     )
       return true;
   }
-  for (const words of parsed.pipelines.flat()) {
-    if (
-      words.some((arg) => arg.includes("ENVTESTVALUE")) &&
-      !isApprovedEnvironmentPredicate(unwrapStaticCommand(words))
-    )
-      return true;
-  }
   for (const words of parsed.pipelines.flat()) {
     if (!words.some((arg) => arg.includes("UNKNOWNVALUE"))) continue;
     if (words.some((arg) => arg.includes("UNKNOWNVALUEUNQUOTED"))) return true;
@@ -2520,7 +2616,7 @@ function hasEnvironmentVariableExpansionRead(
     )
       return true;
   }
-  if (!localMaterialized.includes("ENVVALUE") && !localMaterialized.includes("ENVTESTVALUE")) {
+  if (!localMaterialized.includes("ENVVALUE")) {
     return (
       hasSensitiveFileRead(localMaterialized, isPathBlocked) ||
       hasSensitivePathRedirect(localMaterialized, isPathBlocked) ||
@@ -2530,7 +2626,7 @@ function hasEnvironmentVariableExpansionRead(
 
   for (const [index, pipeline] of parsed.pipelines.entries()) {
     const hasEnvironmentValue = pipeline.some((argv) =>
-      argv.some((arg) => arg.includes("ENVVALUE") || arg.includes("ENVTESTVALUE")),
+      argv.some((arg) => arg.includes("ENVVALUE")),
     );
     if (!hasEnvironmentValue) continue;
     if (parsed.redirects.some((redirect) => redirect.pipeline === index)) return true;
@@ -2538,12 +2634,8 @@ function hasEnvironmentVariableExpansionRead(
       pipeline.some((argv) => {
         const unwrapped = unwrapStaticCommand(argv);
         const name = unwrapped[0]?.split("/").at(-1) ?? "";
-        if (argv.some((arg) => arg.includes("ENVVALUE") || arg.includes("ENVTESTVALUE"))) {
-          if (
-            argv
-              .slice(0, argv.length - unwrapped.length)
-              .some((arg) => arg.includes("ENVVALUE") || arg.includes("ENVTESTVALUE"))
-          )
+        if (argv.some((arg) => arg.includes("ENVVALUE"))) {
+          if (argv.slice(0, argv.length - unwrapped.length).some((arg) => arg.includes("ENVVALUE")))
             return true;
           if (isApprovedEnvironmentPredicate(unwrapped)) return false;
           if (isNavigationOperand(unwrapped, "ENVVALUE")) {
@@ -2579,7 +2671,7 @@ function isApprovedEnvironmentPredicate(argv: string[]): boolean {
     if (args.at(-1) !== "]") return false;
     args = args.slice(0, -1);
   } else if (argv[0] !== "test") return false;
-  const value = (arg: string | undefined) => arg === "ENVVALUE" || arg === "ENVTESTVALUE";
+  const value = (arg: string | undefined) => arg === "ENVVALUE";
   const literal = (arg: string | undefined) =>
     /^[A-Za-z0-9_.:-]*$/.test(arg ?? "") && arg !== undefined;
   return (