1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-01-24 06:05:20 +00:00

Merge pull request #561 from weidongkl/master

enhancement: optimize regular expressions
This commit is contained in:
catborise 2022-12-26 09:09:32 +03:00 committed by GitHub
commit fe550317d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -38,9 +38,7 @@ class AddStgPool(forms.Form):
def clean_target(self): def clean_target(self):
storage_type = self.cleaned_data["stg_type"] storage_type = self.cleaned_data["stg_type"]
target = self.cleaned_data["target"] target = self.cleaned_data["target"]
have_symbol = re.match("^[^-][a-zA-Z0-9/_-]+$", target) and not re.match( have_symbol = re.match("^[^-](\/?((?:[0-9a-zA-Z_])|(?:\.)|((?<!\/)-))*)+$", target)
".*/-", target
)
if storage_type in ["dir", "netfs"] and not have_symbol: if storage_type in ["dir", "netfs"] and not have_symbol:
raise forms.ValidationError( raise forms.ValidationError(
_("The target must not contain any special characters") _("The target must not contain any special characters")