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

Removed extraneous warning when using garbage credentials for ssh_key_data

Browse Source 
added in logic to check if there was an existing error before checking form field entry for ssh_key_unlock, also added a test to ensure that garbage data entered would not trigger the error message for both the incorrect ssh_key_data and the incorrect ssh_key_unlock, rather just the incorrect ssh_key_data
This commit is contained in:
Rebeccah Hunter
2019-08-21 16:41:30 -04:00
parent 1d05c21af4
commit 017274e2aa
2 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/fields.py
View File

@@ -688,16 +688,18 @@ class CredentialInputField(JSONSchemaField):
model_instance.inputs['ssh_key_data'] = model_instance.__class__.objects.get(
pk=model_instance.pk
).inputs.get('ssh_key_data')
if model_instance.has_encrypted_ssh_key_data and not value.get('ssh_key_unlock'):
errors['ssh_key_unlock'] = [_('must be set when SSH key is encrypted.')]
if all([
model_instance.inputs.get('ssh_key_data'),
value.get('ssh_key_unlock'),
not model_instance.has_encrypted_ssh_key_data
not model_instance.has_encrypted_ssh_key_data,
'ssh_key_data' not in errors
]):
errors['ssh_key_unlock'] = [_('should not be set when SSH key is not encrypted.')]
if errors:
raise serializers.ValidationError({
'inputs': errors