anatoly/autocad-mcp-pro
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(task-2): close the trailing-newline tag hole and gate DXF-illegal layer names

Browse Source 
Two ways a malformed block_define request slipped past the pre-write
validator and reached the engine:

* `ATTDEF_TAG_RE.match` with a `$` anchor accepts 'TAG\n' because `$`
  matches before a trailing newline. ezdxf strips the newline on write, so
  'TAG\n' + 'TAG' landed as two ATTDEFs with one tag, defeating the
  duplicate-tag refusal, and the tag-keyed attribute readers then dropped
  one silently. Now `fullmatch`.

* `_layer` only required a non-empty string, so a DXF-illegal name such as
  'BAD<LAYER' passed and ezdxf raised DXFValueError mid-loop, after the
  block existed and earlier primitives were written (with overwrite=True,
  after the old definition was already wiped). The gate now refuses on the
  same forbidden-character rule `sanitize_symbol_name` uses, exposed as
  `security.illegal_symbol_name_chars`, with a TypeError naming
  `entities[i]` and 'layer'.

Tests cover both repros and fail against the previous code.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FKFStjEFzpGyLq5bMpWxTd
This commit is contained in:
Umut CAN
2026-09-15 13:22:56 +03:00
co-authored by Claude Opus 5
parent 2cc4008fe8
commit 41585757c9
3 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_block_specs.py
+33
View File
@@ -58,6 +58,9 @@ def test_each_type_normalises_to_floats_and_layer_zero():
({"type": "solid", "points": [[0, 0], [1, 0]]}, "points"),
({"type": "solid", "points": [[0, 0], [1, 0], [1, 1], [0, 1], [2, 2]]}, "at most 4"),
({"type": "line", "x1": 0, "y1": 0, "x2": 1, "y2": 0, "layer": ""}, "layer"),
({"type": "line", "x1": 0, "y1": 0, "x2": 1, "y2": 0, "layer": "BAD<LAYER"}, "layer"),
({"type": "line", "x1": 0, "y1": 0, "x2": 1, "y2": 0, "layer": "A;B"}, "layer"),
({"type": "line", "x1": 0, "y1": 0, "x2": 1, "y2": 0, "layer": "A\x01B"}, "layer"),
({"type": "line", "x1": True, "y1": 0, "x2": 1, "y2": 0}, "x1"),
],
)
@@ -68,6 +71,22 @@ def test_bad_entity_names_the_index_and_key(bad, fragment):
assert fragment in str(exc.value)
def test_illegal_layer_name_is_refused_before_any_write():
"""ezdxf would raise DXFValueError on this layer mid-loop, after earlier
primitives (and, with overwrite, the old definition) were already written.
The gate has to be ours, typed, and indexed."""
with pytest.raises(TypeError, match=r"entities\[0\].*'layer'") as exc:
validate_entity_specs(
[{"type": "line", "x1": 0, "y1": 0, "x2": 1, "y2": 0, "layer": "BAD<LAYER"}]
)
assert "'<'" in str(exc.value)
# Legal names, including the ones with spaces and dots, still pass.
out = validate_entity_specs(
[{"type": "line", "x1": 0, "y1": 0, "x2": 1, "y2": 0, "layer": " PID.Valves-1 "}]
)
assert out[0]["layer"] == "PID.Valves-1"
def test_attdefs_normalise_and_default():
out = validate_attdef_specs([{"tag": "TAG", "x": 0, "y": 3, "height": 2.5}])
assert out == [
@@ -90,6 +109,7 @@ def test_attdefs_normalise_and_default():
[
({"tag": "tag", "x": 0, "y": 0, "height": 1}, "tag"),
({"tag": "T-1", "x": 0, "y": 0, "height": 1}, "tag"),
({"tag": "TAG\n", "x": 0, "y": 0, "height": 1}, "tag"),
({"tag": "TAG", "x": 0, "y": 0, "height": 0}, "height"),
({"tag": "TAG", "x": 0, "y": 0, "height": 1, "invisible": 1}, "invisible"),
({"tag": "TAG", "x": 0, "y": 0, "height": 1, "default": 3}, "default"),
@@ -111,6 +131,19 @@ def test_duplicate_attdef_tags_are_refused():
)
def test_trailing_newline_cannot_smuggle_a_duplicate_tag():
"""`$` matches before a trailing newline; ezdxf strips it on write, so
'TAG\n' + 'TAG' would land as two ATTDEFs with the same tag and the
attribute readers (dict keyed by tag) would silently drop one."""
with pytest.raises(TypeError, match=r"attdefs\[0\].*'tag'"):
validate_attdef_specs(
[
{"tag": "TAG\n", "x": 0, "y": 0, "height": 1},
{"tag": "TAG", "x": 0, "y": 0, "height": 1},
]
)
def test_solid_vertices_use_dxf_bowtie_order():
quad = [(0.0, 0.0), (1.0, 0.0), (1.0, 1.0), (0.0, 1.0)]
assert solid_vertices(quad) == [(0.0, 0.0), (1.0, 0.0), (0.0, 1.0), (1.0, 1.0)]