NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-09-19 08:20:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(marker): replace pydantic lookahead pattern with field_validator

Browse Source 
pydantic_core (Rust engine) does not support regex look-around.
Keep the character-class pattern for basic safety and enforce the
"global" prefix reservation via a field_validator instead.
This commit is contained in:
YueGuobin 2026-07-13 15:40:25 +08:00
parent 31991fe359
commit 686f96b748
No known key found for this signature in database
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from pydantic import BaseModel, Field
from pydantic import BaseModel, Field, field_validator
from typing import List, Optional, Tuple
from enum import Enum
from uuid import UUID, uuid4
@ -151,9 +151,9 @@ class MarkerCreate(BaseModel):
name: Optional[str] = Field(
None,
pattern=r"^(?i)(?!global)[A-Za-z0-9][A-Za-z0-9_.-]*$",
pattern=r"^[A-Za-z0-9][A-Za-z0-9_.-]*$",
max_length=128,
description='Unique marker name on the link. Auto-generated when absent. Names starting with "global" are reserved.',
description='Unique marker name on the link. Auto-generated when absent.',
)
bpf: str
tag: Optional[int] = None
@ -167,6 +167,13 @@ class MarkerCreate(BaseModel):
description="Whether the marker is active. Defaults to true on creation.",
)
@field_validator("name")
@classmethod
def _check_name_not_reserved(cls, v):
if v is not None and v.lower().startswith("global"):
raise ValueError('Names starting with "global" are reserved')
return v
class MarkerDefinitionCreate(BaseModel):
"""
@ -179,7 +186,7 @@ class MarkerDefinitionCreate(BaseModel):
name: Optional[str] = Field(
None,
pattern=r"^(?i)(?!global)[A-Za-z0-9][A-Za-z0-9_.-]*$",
pattern=r"^[A-Za-z0-9][A-Za-z0-9_.-]*$",
max_length=128,
description="Unique definition name. Auto-generated when absent.",
)
@ -190,4 +197,11 @@ class MarkerDefinitionCreate(BaseModel):
description="User-chosen hex color for the marker in the Web UI, e.g. '#ff5722'",
)
@field_validator("name")
@classmethod
def _check_name_not_reserved(cls, v):
if v is not None and v.lower().startswith("global"):
raise ValueError('Names starting with "global" are reserved')
return v