Skip to content

changed the validation rules for DirectoryService.DomainName #5981

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

changed the validation rules for DirectoryService.DomainName #5981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56b3d94
changed the validation rules for DirectoryService.DomainName
salemgolemugoo Dec 27, 2023
657187e
fix: tests
salemgolemugoo Dec 3, 2024
4b35cc6
Merge branch 'develop' into domainname-validator
salemgolemugoo Dec 13, 2024
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 cli/src/pcluster/validators/directory_service_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class DomainNameValidator(Validator):
"""Domain name validator."""

FQDN_PATTERN = "^([a-zA-Z0-9_-]+)(\\.[a-zA-Z0-9_-]+)*$"
LDAP_DN_PATTERN = "^((DC|dc)=[a-zA-Z0-9_-]+)(,(DC|dc)=[a-zA-Z0-9_-]+)*$"
LDAP_DN_PATTERN = "^((DC|dc|O|o)=[a-zA-Z0-9_-]+)(,(DC|dc)=[a-zA-Z0-9_-]+)*$"

def _validate(self, domain_name):
"""Validate that domain address is a Fully Qualified Domain Name (FQDN) or a LDAP Distinguished Name (DN)."""
Expand Down
3 changes: 3 additions & 0 deletions cli/tests/pcluster/validators/test_directory_service_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,15 @@
("DC=corp,DC=example,DC=com", None),
("dc=corp,dc=example,dc=com", None),
("dc=corp,DC=example,dc=com", None),
("O=org,dc=corp,dc=example,dc=com", None),
("o=org,dc=corp,dc=example,dc=com", None),
("", DOMAIN_NAME_ERROR_MESSAGE),
(" ", DOMAIN_NAME_ERROR_MESSAGE),
("corp.", DOMAIN_NAME_ERROR_MESSAGE),
("DC=corp,", DOMAIN_NAME_ERROR_MESSAGE),
("corp.examp/e.com", DOMAIN_NAME_ERROR_MESSAGE),
("DC=corp,DC=examp/e,DC=com", DOMAIN_NAME_ERROR_MESSAGE),
("o=or/g,dc=corp,dc=example,dc=com", DOMAIN_NAME_ERROR_MESSAGE),
],
)
def test_domain_name(domain_name, expected_message):
Expand Down