From 0257451bf7ea06164e3f6f5b71c3f85037409073 Mon Sep 17 00:00:00 2001 From: Luke Sneeringer Date: Mon, 21 Jul 2014 11:45:15 -0500 Subject: [PATCH] Adding GCE RSA keys. --- awx/main/models/credential.py | 4 ++-- awx/ui/static/js/forms/Credentials.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index 0105166361..2faca20561 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -193,9 +193,9 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique): def _validate_ssh_private_key(self, data): 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*?(.+?)(\\??)$') - 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() if not lines: raise validation_error diff --git a/awx/ui/static/js/forms/Credentials.js b/awx/ui/static/js/forms/Credentials.js index f84f63f186..815fd67657 100644 --- a/awx/ui/static/js/forms/Credentials.js +++ b/awx/ui/static/js/forms/Credentials.js @@ -208,7 +208,7 @@ angular.module('CredentialFormDefinition', []) "ssh_key_data": { labelBind: 'sshKeyDataLabel', type: 'textarea', - ngShow: "kind.value == 'ssh' || kind.value == 'scm'", + ngShow: "kind.value == 'ssh' || kind.value == 'scm' || kind.value == 'gce'", addRequired: false, editRequired: false, 'class': 'ssh-key-field',