External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 06:56:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

require a valid netloc for Credential Type inputs w/ format=url

Browse Source
This commit is contained in:
Ryan Petrello
2019-05-02 14:32:24 -04:00
parent de56e20f11
commit e560dccd36
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/fields.py
View File

@@ -493,13 +493,17 @@ def format_ssh_private_key(value):
@JSONSchemaField.format_checker.checks('url') @JSONSchemaField.format_checker.checks('url')
def format_url(value): def format_url(value):
try: try:
scheme = urllib.parse.urlparse(value).scheme parsed = urllib.parse.urlparse(value)
except Exception as e: except Exception as e:
raise jsonschema.exceptions.FormatError(str(e)) raise jsonschema.exceptions.FormatError(str(e))
if scheme == '': if parsed.scheme == '':
raise jsonschema.exceptions.FormatError( raise jsonschema.exceptions.FormatError(
'Invalid URL: Missing url scheme (http, https, etc.)' 'Invalid URL: Missing url scheme (http, https, etc.)'
) )
if parsed.netloc == '':
raise jsonschema.exceptions.FormatError(
'Invalid URL: {}'.format(value)
)
return True return True

25
awx/main/tests/functional/api/test_credential.py
View File

@@ -1944,8 +1944,15 @@ def test_create_credential_missing_user_team_org_xfail(post, admin, credentialty
assert response.status_code == 400 assert response.status_code == 400
@pytest.mark.parametrize('url, status, msg', [
('foo.com', 400, 'Invalid URL: Missing url scheme (http, https, etc.)'),
('https://[dead:beef', 400, 'Invalid IPv6 URL'),
('http:domain:8080', 400, 'Invalid URL: http:domain:8080'),
('http:/domain:8080', 400, 'Invalid URL: http:/domain:8080'),
('http://foo.com', 201, None)
])
@pytest.mark.django_db @pytest.mark.django_db
def test_create_credential_with_invalid_url_xfail(post, organization, admin): def test_create_credential_with_invalid_url_xfail(post, organization, admin, url, status, msg):
credential_type = CredentialType( credential_type = CredentialType(
kind='test', kind='test',
name='MyTestCredentialType', name='MyTestCredentialType',
@@ -1964,18 +1971,10 @@ def test_create_credential_with_invalid_url_xfail(post, organization, admin):
'name': 'Second Best Credential Ever', 'name': 'Second Best Credential Ever',
'organization': organization.pk, 'organization': organization.pk,
'credential_type': credential_type.pk, 'credential_type': credential_type.pk,
'inputs': {'server_url': 'foo.com'} 'inputs': {'server_url': url}
} }
endpoint = reverse('api:credential_list', kwargs={'version': 'v2'}) endpoint = reverse('api:credential_list', kwargs={'version': 'v2'})
response = post(endpoint, params, admin) response = post(endpoint, params, admin)
assert response.status_code == 400 assert response.status_code == status
assert response.data['inputs']['server_url'] == ['Invalid URL: Missing url scheme (http, https, etc.)'] if status != 201:
assert response.data['inputs']['server_url'] == [msg]
params['inputs']['server_url'] = 'https://[dead:beef'
response = post(endpoint, params, admin)
assert response.status_code == 400
assert response.data['inputs']['server_url'] == ['Invalid IPv6 URL']
params['inputs']['server_url'] = 'http://foo.com'
response = post(endpoint, params, admin)
assert response.status_code == 201