Fix: when no alias is entered when exporting a certificate, the alias is set to 'blah'.
This fix sets it to the common name instead.
This commit is contained in:
parent
c79d9c7051
commit
ef0c08dfd9
|
@ -15,6 +15,8 @@ from cryptography.fernet import Fernet
|
||||||
from lemur.utils import mktempfile, mktemppath
|
from lemur.utils import mktempfile, mktemppath
|
||||||
from lemur.plugins.bases import ExportPlugin
|
from lemur.plugins.bases import ExportPlugin
|
||||||
from lemur.plugins import lemur_java as java
|
from lemur.plugins import lemur_java as java
|
||||||
|
from lemur.common.utils import parse_certificate
|
||||||
|
from lemur.common.defaults import common_name
|
||||||
|
|
||||||
|
|
||||||
def run_process(command):
|
def run_process(command):
|
||||||
|
@ -233,7 +235,7 @@ class JavaKeystoreExportPlugin(ExportPlugin):
|
||||||
if self.get_option('alias', options):
|
if self.get_option('alias', options):
|
||||||
alias = self.get_option('alias', options)
|
alias = self.get_option('alias', options)
|
||||||
else:
|
else:
|
||||||
alias = "blah"
|
alias = common_name(parse_certificate(body))
|
||||||
|
|
||||||
with mktemppath() as jks_tmp:
|
with mktemppath() as jks_tmp:
|
||||||
create_keystore(body, chain, jks_tmp, key, alias, passphrase)
|
create_keystore(body, chain, jks_tmp, key, alias, passphrase)
|
||||||
|
|
|
@ -14,7 +14,8 @@ from flask import current_app
|
||||||
from lemur.utils import mktempfile, mktemppath
|
from lemur.utils import mktempfile, mktemppath
|
||||||
from lemur.plugins.bases import ExportPlugin
|
from lemur.plugins.bases import ExportPlugin
|
||||||
from lemur.plugins import lemur_openssl as openssl
|
from lemur.plugins import lemur_openssl as openssl
|
||||||
from lemur.common.utils import get_psuedo_random_string
|
from lemur.common.utils import get_psuedo_random_string, parse_certificate
|
||||||
|
from lemur.common.defaults import common_name
|
||||||
|
|
||||||
|
|
||||||
def run_process(command):
|
def run_process(command):
|
||||||
|
@ -122,7 +123,7 @@ class OpenSSLExportPlugin(ExportPlugin):
|
||||||
if self.get_option('alias', options):
|
if self.get_option('alias', options):
|
||||||
alias = self.get_option('alias', options)
|
alias = self.get_option('alias', options)
|
||||||
else:
|
else:
|
||||||
alias = "blah"
|
alias = common_name(parse_certificate(body))
|
||||||
|
|
||||||
type = self.get_option('type', options)
|
type = self.get_option('type', options)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue