From c2387dc120f34e91558262375724f8ff26c193c2 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Thu, 7 Apr 2016 10:29:08 -0700 Subject: [PATCH] Fixes an issue where custom OIDs would clear out san extensions --- lemur/plugins/lemur_aws/elb.py | 3 +-- lemur/static/app/angular/authorities/services.js | 7 ++++++- lemur/static/app/angular/certificates/services.js | 10 +++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lemur/plugins/lemur_aws/elb.py b/lemur/plugins/lemur_aws/elb.py index 1b9226fb..20958f12 100644 --- a/lemur/plugins/lemur_aws/elb.py +++ b/lemur/plugins/lemur_aws/elb.py @@ -1,5 +1,5 @@ """ -.. module: elb +.. module: lemur.plugins.lemur_aws.elb :synopsis: Module contains some often used and helpful classes that are used to deal with ELBs @@ -28,7 +28,6 @@ def is_valid(listener_tuple): :param listener_tuple: """ - current_app.logger.debug(listener_tuple) lb_port, i_port, lb_protocol, arn = listener_tuple current_app.logger.debug(lb_protocol) diff --git a/lemur/static/app/angular/authorities/services.js b/lemur/static/app/angular/authorities/services.js index 123e5ec3..4763a0c3 100644 --- a/lemur/static/app/angular/authorities/services.js +++ b/lemur/static/app/angular/authorities/services.js @@ -29,7 +29,11 @@ angular.module('lemur') this.extensions.subAltNames.names.splice(index, 1); }, attachCustom: function () { - if (this.extensions === undefined || this.extensions.custom === undefined) { + if (this.extensions === undefined) { + this.extensions = {}; + } + + if (this.extensions.custom === undefined) { this.extensions = {'custom': []}; } @@ -80,6 +84,7 @@ angular.module('lemur') AuthorityService.create = function (authority) { authority.attachSubAltName(); + authority.attachCustom(); return AuthorityApi.post(authority); }; diff --git a/lemur/static/app/angular/certificates/services.js b/lemur/static/app/angular/certificates/services.js index b22714b7..317ae379 100644 --- a/lemur/static/app/angular/certificates/services.js +++ b/lemur/static/app/angular/certificates/services.js @@ -23,7 +23,7 @@ angular.module('lemur') if (angular.isString(this.subAltValue) && angular.isString(this.subAltType)) { this.extensions.subAltNames.names.push({'nameType': this.subAltType, 'value': this.subAltValue}); - this.findDuplicates(); + //this.findDuplicates(); } this.subAltType = null; @@ -31,10 +31,14 @@ angular.module('lemur') }, removeSubAltName: function (index) { this.extensions.subAltNames.names.splice(index, 1); - this.findDuplicates(); + //this.findDuplicates(); }, attachCustom: function () { - if (this.extensions === undefined || this.extensions.custom === undefined) { + if (this.extensions === undefined) { + this.extensions = {}; + } + + if (this.extensions.custom === undefined) { this.extensions = {'custom': []}; }