shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

updated regex

Browse Source
This commit is contained in:
Brian Duffy 2018-02-16 16:06:33 +00:00
parent 6b5a6e9226
commit 235213bd3b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/tests/unit/test_validators.py
View File

@ -26,7 +26,7 @@ def test_invalid_keys():
"-----BEGIN FOO-----foobar---END FOO----", "-----BEGIN FOO-----foobar---END FOO----",
"----- BEGIN FOO ----- foobar ----- FAIL FOO ----", "----- BEGIN FOO ----- foobar ----- FAIL FOO ----",
"----- FAIL FOO ----- foobar ----- END FOO ----", "----- FAIL FOO ----- foobar ----- END FOO ----",
"----BEGIN FOO----foobar----END FOO--------BEGIN FOO----foobar----END FOO----" "----BEGIN FOO----foobar----END BAR----"
] ]
for invalid_key in invalid_keys: for invalid_key in invalid_keys:
with pytest.raises(ValidationError): with pytest.raises(ValidationError):
@ -37,6 +37,16 @@ def test_invalid_keys():
validate_ssh_private_key(invalid_key) validate_ssh_private_key(invalid_key)
def test_invalid_rsa_key():
invalid_key = TEST_SSH_KEY_DATA.replace('-----END', '----END')
with pytest.raises(ValidationError):
validate_private_key(invalid_key)
with pytest.raises(ValidationError):
validate_certificate(invalid_key)
with pytest.raises(ValidationError):
validate_ssh_private_key(invalid_key)
def test_valid_catted_rsa_key(): def test_valid_catted_rsa_key():
valid_key = TEST_CATTED_SSH_KEY_DATA valid_key = TEST_CATTED_SSH_KEY_DATA
pem_objects = validate_private_key(valid_key) pem_objects = validate_private_key(valid_key)
@ -48,7 +58,6 @@ def test_valid_catted_rsa_key():
assert pem_objects[0]['key_type'] == 'rsa' assert pem_objects[0]['key_type'] == 'rsa'
assert not pem_objects[0]['key_enc'] assert not pem_objects[0]['key_enc']
def test_valid_rsa_key(): def test_valid_rsa_key():
valid_key = TEST_SSH_KEY_DATA valid_key = TEST_SSH_KEY_DATA
pem_objects = validate_private_key(valid_key) pem_objects = validate_private_key(valid_key)

4
awx/main/validators.py
View File

@ -48,9 +48,9 @@ def validate_pem(data, min_keys=0, max_keys=None, min_certs=0, max_certs=None):
# Build regular expressions for matching each object in the PEM file. # Build regular expressions for matching each object in the PEM file.
pem_obj_re = re.compile( pem_obj_re = re.compile(
r'^-{4,} *BEGIN (?P<type>[A-Z ]+?) *-{4,}' + r'^(?P<dashes>-{4,}) *BEGIN (?P<type>[A-Z ]+?) *(?P=dashes)' +
r'\s*(?P<data>.+?)\s*' + r'\s*(?P<data>.+?)\s*' +
r'-{4,} *END [A-Z ]+? *-{4,}' + r'(?P=dashes) *END (?P=type) *(?P=dashes)' +
r'(?P<next>.*?)$', re.DOTALL r'(?P<next>.*?)$', re.DOTALL
) )
pem_obj_header_re = re.compile(r'^(.+?):\s*?(.+?)(\\??)$') pem_obj_header_re = re.compile(r'^(.+?):\s*?(.+?)(\\??)$')