From 8e49194764abdf7d24ad20a35d6293a0e987c091 Mon Sep 17 00:00:00 2001
From: Neil Schelly <neil@neilschelly.com>
Date: Fri, 10 Feb 2017 15:43:41 -0500
Subject: [PATCH] Issue 688 cert templates (#689)

* subAltNames were getting wiped out every time a template was selected

* isCritical variables aren't presented in the UI, nor is this information used in determining to use them.
---
 .../app/angular/certificates/certificate/certificate.js   | 8 --------
 lemur/static/app/angular/certificates/services.js         | 5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lemur/static/app/angular/certificates/certificate/certificate.js b/lemur/static/app/angular/certificates/certificate/certificate.js
index 3962590d..ef6c1b50 100644
--- a/lemur/static/app/angular/certificates/certificate/certificate.js
+++ b/lemur/static/app/angular/certificates/certificate/certificate.js
@@ -166,11 +166,9 @@ angular.module('lemur')
         'extensions': {
           'basicConstraints': {},
           'keyUsage': {
-            'isCritical': true,
             'useDigitalSignature': true
           },
           'extendedKeyUsage': {
-            'isCritical': true,
             'useClientAuthentication': true
           },
           'subjectKeyIdentifier': {
@@ -184,12 +182,10 @@ angular.module('lemur')
         'extensions' : {
           'basicConstraints': {},
           'keyUsage': {
-            'isCritical': true,
             'useKeyEncipherment': true,
             'useDigitalSignature': true
           },
           'extendedKeyUsage': {
-            'isCritical': true,
             'useServerAuthentication': true
           },
           'subjectKeyIdentifier': {
@@ -295,11 +291,9 @@ angular.module('lemur')
       'extensions': {
         'basicConstraints': {},
         'keyUsage': {
-          'isCritical': true,
           'useDigitalSignature': true
         },
         'extendedKeyUsage': {
-          'isCritical': true,
           'useClientAuthentication': true
         },
         'subjectKeyIdentifier': {
@@ -313,12 +307,10 @@ angular.module('lemur')
       'extensions' : {
         'basicConstraints': {},
         'keyUsage': {
-          'isCritical': true,
           'useKeyEncipherment': true,
           'useDigitalSignature': true
         },
         'extendedKeyUsage': {
-          'isCritical': true,
           'useServerAuthentication': true
         },
         'subjectKeyIdentifier': {
diff --git a/lemur/static/app/angular/certificates/services.js b/lemur/static/app/angular/certificates/services.js
index 4fc1e800..90b5f912 100644
--- a/lemur/static/app/angular/certificates/services.js
+++ b/lemur/static/app/angular/certificates/services.js
@@ -107,7 +107,12 @@ angular.module('lemur')
           });
         },
         useTemplate: function () {
+          var saveSubAltNames = {};
+          if (this.extensions && this.extensions.subAltNames) {
+            saveSubAltNames = this.extensions.subAltNames;
+          }
           this.extensions = this.template.extensions;
+          this.extensions.subAltNames = saveSubAltNames;
         }
       });
     });