NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-10-28 19:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(marker): reserve "global" name prefix for future marker inheritance

Browse Source
This commit is contained in:
YueGuobin 2026-07-13 15:23:27 +08:00
parent d3527c00de
commit 369badc6c2
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/compute/base_node.py
View File

@ -1093,7 +1093,7 @@ class BaseNode:
# mark <bpf> [tag <id>] [pcap <path>] — tag/pcap keyword pairs, any order. # mark <bpf> [tag <id>] [pcap <path>] — tag/pcap keyword pairs, any order.
# name travels from the controller REST layer (MarkerCreate schema) but is # name travels from the controller REST layer (MarkerCreate schema) but is
# validated here too as defense-in-depth against hand-edited topology files. # validated here too as defense-in-depth against hand-edited topology files.
_MARKER_NAME_RE = re.compile(r"^[A-Za-z0-9][A-Za-z0-9_.-]*$") _MARKER_NAME_RE = re.compile(r"^(?i)(?!global)[A-Za-z0-9][A-Za-z0-9_.-]*$")
if not _MARKER_NAME_RE.match(name): if not _MARKER_NAME_RE.match(name):
raise UbridgeError(f"Invalid marker name: {name!r}") raise UbridgeError(f"Invalid marker name: {name!r}")
cmd = 'bridge add_packet_filter {bridge} {name} mark "{bpf}"'.format( cmd = 'bridge add_packet_filter {bridge} {name} mark "{bpf}"'.format(

4
gns3server/schemas/controller/links.py
View File

@ -151,9 +151,9 @@ class MarkerCreate(BaseModel):
name: Optional[str] = Field( name: Optional[str] = Field(
None, None,
pattern=r"^[A-Za-z0-9][A-Za-z0-9_.-]*$", pattern=r"^(?i)(?!global)[A-Za-z0-9][A-Za-z0-9_.-]*$",
max_length=128, max_length=128,
description="Unique marker name on the link. Auto-generated when absent.", description='Unique marker name on the link. Auto-generated when absent. Names starting with "global" are reserved.',
) )
bpf: str bpf: str
tag: Optional[int] = None tag: Optional[int] = None