bajaclaw 0.21.0 → 0.21.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Path validation for skill_manage write_file / remove_file.
|
|
2
2
|
// Restricts agent file writes to a whitelist of subdirs under a skill dir.
|
|
3
|
-
import { resolve, isAbsolute } from "node:path";
|
|
3
|
+
import { resolve, isAbsolute, relative, sep } from "node:path";
|
|
4
4
|
const ALLOWED_SUBDIRS = new Set(["references", "templates", "scripts", "assets"]);
|
|
5
5
|
export function validateSkillSubpath(skillDir, rel) {
|
|
6
6
|
if (!rel || typeof rel !== "string")
|
|
@@ -9,6 +9,7 @@ export function validateSkillSubpath(skillDir, rel) {
|
|
|
9
9
|
return { ok: false, reason: "absolute paths rejected" };
|
|
10
10
|
if (rel.includes("\0"))
|
|
11
11
|
return { ok: false, reason: "null byte" };
|
|
12
|
+
// Always split on both separators so input is normalized regardless of host.
|
|
12
13
|
const parts = rel.split(/[\\/]+/).filter(Boolean);
|
|
13
14
|
if (parts.length < 2)
|
|
14
15
|
return { ok: false, reason: "path must be <subdir>/<file>" };
|
|
@@ -22,7 +23,18 @@ export function validateSkillSubpath(skillDir, rel) {
|
|
|
22
23
|
}
|
|
23
24
|
const absolute = resolve(skillDir, rel);
|
|
24
25
|
const skillResolved = resolve(skillDir);
|
|
25
|
-
|
|
26
|
+
// Cross-platform containment check: path.relative returns "" or
|
|
27
|
+
// <subpath> when the target is inside the dir, and a string starting
|
|
28
|
+
// with ".." or an absolute path when it isn't. Works on both POSIX
|
|
29
|
+
// and Windows separators.
|
|
30
|
+
const inside = relative(skillResolved, absolute);
|
|
31
|
+
if (inside === "" || inside.startsWith("..") || isAbsolute(inside)) {
|
|
32
|
+
if (inside !== "" && (inside.startsWith("..") || isAbsolute(inside))) {
|
|
33
|
+
return { ok: false, reason: "path resolves outside skill dir" };
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
// Sanity on the leading sep just in case.
|
|
37
|
+
if (!absolute.startsWith(skillResolved + sep) && absolute !== skillResolved) {
|
|
26
38
|
return { ok: false, reason: "path resolves outside skill dir" };
|
|
27
39
|
}
|
|
28
40
|
return { ok: true, absolute };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-safety.js","sourceRoot":"","sources":["../../src/skills/path-safety.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,2EAA2E;AAE3E,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"path-safety.js","sourceRoot":"","sources":["../../src/skills/path-safety.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,2EAA2E;AAE3E,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAE/D,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;AAQlF,MAAM,UAAU,oBAAoB,CAAC,QAAgB,EAAE,GAAW;IAChE,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IAChF,IAAI,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC;IAC7E,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAElE,6EAA6E;IAC7E,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,8BAA8B,EAAE,CAAC;IACnF,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAC;IACpF,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;QACpC,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,0BAA0B,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;SAClF,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACxC,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxC,gEAAgE;IAChE,qEAAqE;IACrE,mEAAmE;IACnE,0BAA0B;IAC1B,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACjD,IAAI,MAAM,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACnE,IAAI,MAAM,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACrE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,iCAAiC,EAAE,CAAC;QAClE,CAAC;IACH,CAAC;IACD,0CAA0C;IAC1C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,aAAa,GAAG,GAAG,CAAC,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;QAC5E,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,iCAAiC,EAAE,CAAC;IAClE,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAChC,CAAC"}
|