Merge branch 'master' into improved_verify
This commit is contained in:
commit
79033f42b4
|
@ -10,17 +10,14 @@
|
||||||
import arrow
|
import arrow
|
||||||
import requests
|
import requests
|
||||||
import xmltodict
|
import xmltodict
|
||||||
|
from cryptography import x509
|
||||||
from flask import current_app
|
from flask import current_app
|
||||||
|
|
||||||
from cryptography import x509
|
from lemur.common.utils import get_psuedo_random_string
|
||||||
from lemur.extensions import metrics
|
from lemur.extensions import metrics
|
||||||
|
|
||||||
from lemur.plugins import lemur_verisign as verisign
|
from lemur.plugins import lemur_verisign as verisign
|
||||||
from lemur.plugins.bases import IssuerPlugin, SourcePlugin
|
from lemur.plugins.bases import IssuerPlugin, SourcePlugin
|
||||||
|
|
||||||
from lemur.common.utils import get_psuedo_random_string
|
|
||||||
|
|
||||||
# https://support.venafi.com/entries/66445046-Info-VeriSign-Error-Codes
|
# https://support.venafi.com/entries/66445046-Info-VeriSign-Error-Codes
|
||||||
VERISIGN_ERRORS = {
|
VERISIGN_ERRORS = {
|
||||||
"0x30c5": "Domain Mismatch when enrolling for an SSL certificate, a domain in your request has not been added to verisign",
|
"0x30c5": "Domain Mismatch when enrolling for an SSL certificate, a domain in your request has not been added to verisign",
|
||||||
|
@ -108,7 +105,8 @@ def process_options(options):
|
||||||
'firstName': current_app.config.get("VERISIGN_FIRST_NAME"),
|
'firstName': current_app.config.get("VERISIGN_FIRST_NAME"),
|
||||||
'lastName': current_app.config.get("VERISIGN_LAST_NAME"),
|
'lastName': current_app.config.get("VERISIGN_LAST_NAME"),
|
||||||
'signatureAlgorithm': 'sha256WithRSAEncryption',
|
'signatureAlgorithm': 'sha256WithRSAEncryption',
|
||||||
'email': current_app.config.get("VERISIGN_EMAIL")
|
'email': current_app.config.get("VERISIGN_EMAIL"),
|
||||||
|
'ctLogOption': current_app.config.get("VERISIGN_CS_LOG_OPTION", "public"),
|
||||||
}
|
}
|
||||||
|
|
||||||
data['subject_alt_names'] = ",".join(get_additional_names(options))
|
data['subject_alt_names'] = ",".join(get_additional_names(options))
|
||||||
|
|
Loading…
Reference in New Issue