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

Adding GCE RSA keys.

Browse Source
This commit is contained in:
Luke Sneeringer
2014-07-21 11:45:15 -05:00
parent 4d0abd4cca
commit 0257451bf7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/credential.py
View File

@@ -193,9 +193,9 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
def _validate_ssh_private_key(self, data): def _validate_ssh_private_key(self, data):
validation_error = ValidationError('Invalid SSH private key') validation_error = ValidationError('Invalid SSH private key')
begin_re = re.compile(r'^(-{4,})\s*?BEGIN\s([A-Z0-9]+?)\sPRIVATE\sKEY\s*?(-{4,})$') begin_re = re.compile(r'^(-{4,})\s*BEGIN\s+([A-Z0-9]+)?\s*PRIVATE\sKEY\s*(-{4,})$')
header_re = re.compile(r'^(.+?):\s*?(.+?)(\\??)$') header_re = re.compile(r'^(.+?):\s*?(.+?)(\\??)$')
end_re = re.compile(r'^(-{4,})\s*?END\s([A-Z0-9]+?)\sPRIVATE\sKEY\s*?(-{4,})$') end_re = re.compile(r'^(-{4,})\s*END\s+([A-Z0-9]+)?\s*PRIVATE\sKEY\s*(-{4,})$')
lines = data.strip().splitlines() lines = data.strip().splitlines()
if not lines: if not lines:
raise validation_error raise validation_error

2
awx/ui/static/js/forms/Credentials.js
View File

@@ -208,7 +208,7 @@ angular.module('CredentialFormDefinition', [])
"ssh_key_data": { "ssh_key_data": {
labelBind: 'sshKeyDataLabel', labelBind: 'sshKeyDataLabel',
type: 'textarea', type: 'textarea',
ngShow: "kind.value == 'ssh' || kind.value == 'scm'", ngShow: "kind.value == 'ssh' || kind.value == 'scm' || kind.value == 'gce'",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
'class': 'ssh-key-field', 'class': 'ssh-key-field',