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

require url scheme for credential type url inputs

Browse Source 
This adds a url formatting type for credential input string fields
The validator for this formatting type will throw an error if the
provided url string doesn't have a url schema.
This commit is contained in:
Jake McDermott 2019-04-30 13:17:15 -04:00
parent 52276ebbab
commit 9737ab620c
No known key found for this signature in database
GPG Key ID: 9A6F084352C3A0B7
6 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/credential_plugins/aim.py
View File

@ -15,6 +15,7 @@ aim_inputs = {
'id': 'url',
'label': _('CyberArk AIM URL'),
'type': 'string',
'format': 'url',
}, {
'id': 'app_id',
'label': _('Application ID'),

1
awx/main/credential_plugins/azure_kv.py
View File

@ -10,6 +10,7 @@ azure_keyvault_inputs = {
'id': 'url',
'label': _('Vault URL (DNS Name)'),
'type': 'string',
'format': 'url',
}, {
'id': 'client',
'label': _('Client ID'),

1
awx/main/credential_plugins/conjur.py
View File

@ -16,6 +16,7 @@ conjur_inputs = {
'id': 'url',
'label': _('Conjur URL'),
'type': 'string',
'format': 'url',
}, {
'id': 'api_key',
'label': _('API Key'),

1
awx/main/credential_plugins/hashivault.py
View File

@ -14,6 +14,7 @@ base_inputs = {
'id': 'url',
'label': _('Server URL'),
'type': 'string',
'format': 'url',
'help_text': _('The URL to the HashiCorp Vault'),
}, {
'id': 'token',

11
awx/main/fields.py
View File

@ -490,6 +490,15 @@ def format_ssh_private_key(value):
return True
@JSONSchemaField.format_checker.checks('url')
def format_url(value):
if urllib.parse.urlparse(value).scheme == '':
raise jsonschema.exceptions.FormatError(
'Invalid URL: Missing url scheme (http, https, etc.)'
)
return True
class DynamicCredentialInputField(JSONSchemaField):
"""
Used to validate JSON for
@ -722,7 +731,7 @@ class CredentialTypeInputField(JSONSchemaField):
'type': 'object',
'properties': {
'type': {'enum': ['string', 'boolean']},
'format': {'enum': ['ssh_private_key']},
'format': {'enum': ['ssh_private_key', 'url']},
'choices': {
'type': 'array',
'minItems': 1,

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

@ -1942,3 +1942,34 @@ def test_create_credential_missing_user_team_org_xfail(post, admin, credentialty
admin
)
assert response.status_code == 400
@pytest.mark.django_db
def test_create_credential_with_missing_url_schema_xfail(post, organization, admin):
credential_type = CredentialType(
kind='test',
name='MyTestCredentialType',
inputs = {
'fields': [{
'id': 'server_url',
'label': 'Server Url',
'type': 'string',
'format': 'url'
}]
}
)
credential_type.save()
params = {
'name': 'Second Best credential ever',
'organization': organization.pk,
'credential_type': credential_type.pk,
'inputs': {'server_url': 'foo.com'}
}
endpoint = reverse('api:credential_list', kwargs={'version': 'v2'})
response = post(endpoint, params, admin)
assert response.status_code == 400
params['inputs'] = {'server_url': 'http://foo.com'}
response = post(endpoint, params, admin)
assert response.status_code == 201