Skip to content

Agent skill that turns natural language, code, Terraform/K8s, SQL, OpenAPI, AsyncAPI, Protobuf and GraphQL sources into editable, tested draw.io architecture diagrams: incremental sync, multi-view projection, drift diff, CI architecture tests, whiteboard derasterize, interactive HTML/PPTX/Mermaid exports.

security: fix resource leaks in file operations

Security Review92ea2a557c2a
diff --git a/skills/drawio-skill/scripts/aiicons.py b/skills/drawio-skill/scripts/aiicons.py
index b6fcd59..7993aa8 100644
--- a/skills/drawio-skill/scripts/aiicons.py
+++ b/skills/drawio-skill/scripts/aiicons.py
@@ -138,7 +138,8 @@ def main():
if not os.path.exists(MANIFEST):
sys.exit(f"error: manifest not found at {MANIFEST}")
- manifest = json.load(open(MANIFEST, encoding="utf-8"))
+ with open(MANIFEST, encoding="utf-8") as f:
+ manifest = json.load(f)
fam = families(manifest["icons"])
cdn = manifest["cdn"]
diff --git a/skills/drawio-skill/scripts/dockerimports.py b/skills/drawio-skill/scripts/dockerimports.py
index ef098ec..9c74396 100644
--- a/skills/drawio-skill/scripts/dockerimports.py
+++ b/skills/drawio-skill/scripts/dockerimports.py
@@ -69,7 +69,11 @@ def main():
help="group containers by compose project (else first network)")
args = ap.parse_args()
- text = sys.stdin.read() if args.input == "-" else open(args.input, encoding="utf-8").read()
+ if args.input == "-":
+ text = sys.stdin.read()
+ else:
+ with open(args.input, encoding="utf-8") as f:
+ text = f.read()
try:
data = json.loads(text)
except json.JSONDecodeError as exc:
diff --git a/skills/drawio-skill/scripts/goimports.py b/skills/drawio-skill/scripts/goimports.py
index 8b70a2d..ae135c2 100644
--- a/skills/drawio-skill/scripts/goimports.py
+++ b/skills/drawio-skill/scripts/goimports.py
@@ -35,7 +35,8 @@ def module_path(root):
gomod = os.path.join(root, "go.mod")
if not os.path.exists(gomod):
return None
- m = MODULE.search(open(gomod, encoding="utf-8", errors="ignore").read())
+ with open(gomod, encoding="utf-8", errors="ignore") as f:
+ m = MODULE.search(f.read())
return m.group(1) if m else None
@@ -61,7 +62,8 @@ def imports_of(files, modpath, pkgs):
found = set()
for path in files:
try:
- src = open(path, encoding="utf-8", errors="ignore").read()
+ with open(path, encoding="utf-8", errors="ignore") as f:
+ src = f.read()
except OSError:
continue
specs = []
@@ -129,7 +131,8 @@ def main():
}
text = json.dumps(graph, indent=2)
if args.output:
- open(args.output, "w", encoding="utf-8").write(text)
+ with open(args.output, "w", encoding="utf-8") as f:
+ f.write(text)
sys.stderr.write(f"wrote {args.output}\n")
else:
sys.stdout.write(text)
diff --git a/skills/drawio-skill/scripts/jsimports.py b/skills/drawio-skill/scripts/jsimports.py
index afa6d6a..6908ea8 100644
--- a/skills/drawio-skill/scripts/jsimports.py
+++ b/skills/drawio-skill/scripts/jsimports.py
@@ -77,7 +77,8 @@ def edges_of(mid, path, root, modules):
"""Intra-project modules imported by module `mid`."""
found = set()
try:
- src = open(path, encoding="utf-8", errors="ignore").read()
+ with open(path, encoding="utf-8", errors="ignore") as f:
+ src = f.read()
except OSError:
return found
for m in SPEC.finditer(src):
@@ -150,7 +151,8 @@ def main():
}
text = json.dumps(graph, indent=2)
if args.output:
- open(args.output, "w", encoding="utf-8").write(text)
+ with open(args.output, "w", encoding="utf-8") as f:
+ f.write(text)
sys.stderr.write(f"wrote {args.output}\n")
else:
sys.stdout.write(text)
diff --git a/skills/drawio-skill/scripts/pyclasses.py b/skills/drawio-skill/scripts/pyclasses.py
index 570acb4..ac69036 100644
--- a/skills/drawio-skill/scripts/pyclasses.py
+++ b/skills/drawio-skill/scripts/pyclasses.py
@@ -59,7 +59,8 @@ def base_name(node):
def classes_in(module, path):
"""Top-level classes of a module: list of (qualified_id, simple_name, [base names])."""
try:
- tree = ast.parse(open(path, encoding="utf-8").read(), filename=path)
+ with open(path, encoding="utf-8") as f:
+ tree = ast.parse(f.read(), filename=path)
except SyntaxError:
return []
out = []
@@ -144,7 +145,8 @@ def main():
}
text = json.dumps(graph, indent=2)
if args.output:
- open(args.output, "w", encoding="utf-8").write(text)
+ with open(args.output, "w", encoding="utf-8") as f:
+ f.write(text)
sys.stderr.write(f"wrote {args.output}\n")
else:
sys.stdout.write(text)
diff --git a/skills/drawio-skill/scripts/pyimports.py b/skills/drawio-skill/scripts/pyimports.py
index 4dd96e5..6a498bb 100644
--- a/skills/drawio-skill/scripts/pyimports.py
+++ b/skills/drawio-skill/scripts/pyimports.py
@@ -61,7 +61,8 @@ def edges_of(name, path, modules):
pkg = name if path.endswith("__init__.py") else name.rsplit(".", 1)[0] if "." in name else ""
found = set()
try:
- tree = ast.parse(open(path, encoding="utf-8").read(), filename=path)
+ with open(path, encoding="utf-8") as f:
+ tree = ast.parse(f.read(), filename=path)
except SyntaxError:
return found
for node in ast.walk(tree):
@@ -141,7 +142,8 @@ def main():
}
text = json.dumps(graph, indent=2)
if args.output:
- open(args.output, "w", encoding="utf-8").write(text)
+ with open(args.output, "w", encoding="utf-8") as f:
+ f.write(text)
sys.stderr.write(f"wrote {args.output}\n")
else:
sys.stdout.write(text)
diff --git a/skills/drawio-skill/scripts/rustimports.py b/skills/drawio-skill/scripts/rustimports.py
index 6f13ba5..df17b84 100644
--- a/skills/drawio-skill/scripts/rustimports.py
+++ b/skills/drawio-skill/scripts/rustimports.py
@@ -37,8 +37,8 @@ USE = re.compile(r"\buse\s+([^;]+);")
def crate_name(root):
cargo = os.path.join(root, "Cargo.toml")
if os.path.exists(cargo):
- m = re.search(r'(?m)^\s*name\s*=\s*"([^"]+)"',
- open(cargo, encoding="utf-8", errors="ignore").read())
+ with open(cargo, encoding="utf-8", errors="ignore") as f:
+ m = re.search(r'(?m)^\s*name\s*=\s*"([^"]+)"', f.read())
if m:
return m.group(1)
return "crate"
@@ -117,7 +117,8 @@ def edges_of(current, path, modules):
"""Intra-crate module paths used by the module at `current`."""
found = set()
try:
- src = open(path, encoding="utf-8", errors="ignore").read()
+ with open(path, encoding="utf-8", errors="ignore") as f:
+ src = f.read()
except OSError:
return found
for stmt in USE.findall(src):
@@ -191,7 +192,8 @@ def main():
}
text = json.dumps(graph, indent=2)
if args.output:
- open(args.output, "w", encoding="utf-8").write(text)
+ with open(args.output, "w", encoding="utf-8") as f:
+ f.write(text)
sys.stderr.write(f"wrote {args.output}\n")
else:
sys.stdout.write(text)
diff --git a/skills/drawio-skill/scripts/tfstate.py b/skills/drawio-skill/scripts/tfstate.py
index 2135e40..33496eb 100644
--- a/skills/drawio-skill/scripts/tfstate.py
+++ b/skills/drawio-skill/scripts/tfstate.py
@@ -60,7 +60,11 @@ def main():
help="plain boxes instead of official cloud icons")
args = ap.parse_args()
- text = sys.stdin.read() if args.input == "-" else open(args.input, encoding="utf-8").read()
+ if args.input == "-":
+ text = sys.stdin.read()
+ else:
+ with open(args.input, encoding="utf-8") as f:
+ text = f.read()
try:
data = json.loads(text)
except json.JSONDecodeError as exc:
diff --git a/skills/drawio-skill/scripts/timelapse.py b/skills/drawio-skill/scripts/timelapse.py
index a4bbc02..ebcd05a 100644
--- a/skills/drawio-skill/scripts/timelapse.py
+++ b/skills/drawio-skill/scripts/timelapse.py
@@ -93,11 +93,13 @@ def build_frame(importer, importer_args, work_path, direction, tmp):
capture_output=True)
if imp.returncode != 0 or not os.path.exists(graph_json):
return None
- graph = json.loads(open(graph_json, encoding="utf-8").read())
+ with open(graph_json, encoding="utf-8") as f:
+ graph = json.loads(f.read())
if not graph.get("nodes"):
return None
graph["direction"] = direction
- open(graph_json, "w", encoding="utf-8").write(json.dumps(graph))
+ with open(graph_json, "w", encoding="utf-8") as f:
+ f.write(json.dumps(graph))
drawio = os.path.join(tmp, "frame.drawio")
lay = subprocess.run(
[sys.executable, os.path.join(HERE, "autolayout.py"), graph_json, "-o", drawio],
@@ -109,7 +111,9 @@ def build_frame(importer, importer_args, work_path, direction, tmp):
"-o", png, drawio], capture_output=True)
if exp.returncode != 0 or not os.path.exists(png):
return None
- return open(png, "rb").read(), len(graph["nodes"]), len(graph["edges"])
+ with open(png, "rb") as f:
+ png_data = f.read()
+ return png_data, len(graph["nodes"]), len(graph["edges"])
def build_html(frames, title):
@@ -238,12 +242,14 @@ def main():
frames.append((png, h, date, subj, nn, ee))
if args.keep_frames:
fp = f"{os.path.splitext(args.output)[0]}-frame{len(frames):02d}.png"
- open(fp, "wb").write(png)
+ with open(fp, "wb") as f:
+ f.write(png)
if not frames:
sys.exit("error: no frames produced (importer found nothing in any commit)")
title = f"Architecture evolution — {os.path.basename(os.path.abspath(args.path))}"
- open(args.output, "w", encoding="utf-8").write(build_html(frames, title))
+ with open(args.output, "w", encoding="utf-8") as f:
+ f.write(build_html(frames, title))
sys.stderr.write(f"wrote {args.output} ({len(frames)} frames)\n")
diff --git a/skills/drawio-skill/scripts/tubemap.py b/skills/drawio-skill/scripts/tubemap.py
index e893ae2..4c1bd14 100644
--- a/skills/drawio-skill/scripts/tubemap.py
+++ b/skills/drawio-skill/scripts/tubemap.py
@@ -158,7 +158,11 @@ def main():
ap.add_argument("--grid", type=int, default=110, help="grid pitch in px (default 110)")
args = ap.parse_args()
- raw = sys.stdin.read() if args.input == "-" else open(args.input, encoding="utf-8").read()
+ if args.input == "-":
+ raw = sys.stdin.read()
+ else:
+ with open(args.input, encoding="utf-8") as f:
+ raw = f.read()
try:
data = json.loads(raw)
except json.JSONDecodeError as exc: