Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #276 from kevgliss/san-hotfix 

Fixes an issue where custom OIDs would clear out san extensions
This commit is contained in:
kevgliss 2016-04-07 10:30:12 -07:00
parent 9a8e1534c0 c2387dc120
commit 676f843c92
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lemur/plugins/lemur_aws/elb.py
View File

@ -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)

7
lemur/static/app/angular/authorities/services.js vendored
View File

@ -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);
};

10
lemur/static/app/angular/certificates/services.js vendored
View File

@ -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': []};
}