Skip to content

Allow underscore in vlan name #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
treviza153 merged 6 commits into from
Apr 28, 2020
Merged

Allow underscore in vlan name #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eeb6888
Merge pull request #3 from treviza153/bugfix/DeployIPv6Equip
treviza153 Apr 1, 2020
586bb90
aplying security fix in master
treviza153 Apr 1, 2020
9a4b507
adding authapi in authentication process
treviza153 Apr 9, 2020
68c0841
adding vlan name special character verification and fix PEP8 from files
treviza153 Apr 9, 2020
c48e688
allow underscore in vlan name
treviza153 Apr 28, 2020
c76c363
Merge branch 'develop' into master
treviza153 Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion networkapi/util/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def is_valid_vlan_name(vlan_name):
return False

regex_for_breakline = re.compile('\r|\n\r|\n')
regex_for_special_characters = re.compile('[@_!#$%^&*()<>?/\\\|}{~:]')
regex_for_special_characters = re.compile('[@!#$%^&*()<>?/\\\|}{~:]')

return False if regex_for_breakline.search(vlan_name) or regex_for_special_characters.search(vlan_name) else True

Expand Down
5 changes: 5 additions & 0 deletions networkapi/vlan/resource/NetworkTypeResource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ def handle_post(self, request, user, *args, **kwargs):

net_type = TipoRede(tipo_rede=name)

if not is_valid_vlan_name(name):
self.log.error(
u'Parameter %s is invalid because is using special characters and/or breaklines.', name)
raise InvalidValueError(None, 'name', name)

try:
TipoRede.get_by_name(net_type.tipo_rede)
raise NetworkTypeNameDuplicatedError(
Expand Down