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

Minor changes for python3. (#477)

This commit is contained in:
kevgliss 2016-11-07 14:33:07 -08:00 committed by GitHub
parent 4afedaf537
commit b74df2b3e4
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/common/schema.py
View File

@ -136,7 +136,7 @@ def validate_schema(input_schema, output_schema):
resp = f(*args, **kwargs) resp = f(*args, **kwargs)
except Exception as e: except Exception as e:
current_app.logger.exception(e) current_app.logger.exception(e)
return dict(message=e.message), 500 return dict(message=str(e)), 500
if isinstance(resp, tuple): if isinstance(resp, tuple):
return resp[0], resp[1] return resp[0], resp[1]

11
lemur/common/utils.py
View File

@ -6,6 +6,7 @@
.. moduleauthor:: Kevin Glisson <kglisson@netflix.com> .. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
""" """
import six
import sys import sys
import string import string
import random import random
@ -36,11 +37,13 @@ def get_psuedo_random_string():
def parse_certificate(body): def parse_certificate(body):
if sys.version_info >= (3, 0): if sys.version_info[0] <= 2:
if isinstance(body, bytes): return x509.load_pem_x509_certificate(bytes(body), default_backend())
if isinstance(body, six.string_types):
body = body.encode('utf-8')
return x509.load_pem_x509_certificate(body, default_backend()) return x509.load_pem_x509_certificate(body, default_backend())
return x509.load_pem_x509_certificate(bytes(body, 'utf8'), default_backend())
return x509.load_pem_x509_certificate(body.encode('utf-8'), default_backend())
def is_weekend(date): def is_weekend(date):

2
lemur/plugins/lemur_verisign/plugin.py
View File

@ -21,7 +21,6 @@ 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",
"0x482d": "Cannot issue SHA1 certificates expiring after 31/12/2016",
"0x3a10": "Invalid X509 certificate format.: an unsupported certificate format was submitted", "0x3a10": "Invalid X509 certificate format.: an unsupported certificate format was submitted",
"0x4002": "Internal QM Error. : Internal Database connection error.", "0x4002": "Internal QM Error. : Internal Database connection error.",
"0x3301": "Bad transaction id or parent cert not renewable.: User try to renew a certificate that is not yet ready for renew or the transaction id is wrong", "0x3301": "Bad transaction id or parent cert not renewable.: User try to renew a certificate that is not yet ready for renew or the transaction id is wrong",
@ -58,6 +57,7 @@ VERISIGN_ERRORS = {
"0x3105": "Organization Name Not Matched", "0x3105": "Organization Name Not Matched",
"0x300a": "Domain/SubjectAltName Mismatched -- make sure that the SANs have the proper domain suffix", "0x300a": "Domain/SubjectAltName Mismatched -- make sure that the SANs have the proper domain suffix",
"0x950e": "Invalid Common Name -- make sure the CN has a proper domain suffix", "0x950e": "Invalid Common Name -- make sure the CN has a proper domain suffix",
"0xa00e": "Pending. (Insufficient number of tokens.)"
} }