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

254 duplication certificate name (#319)

Browse Source
This commit is contained in:
kevgliss
2016-05-16 15:59:40 -07:00
parent 62b61ed980
commit 1763a1a717
11 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lemur/certificates/models.py
View File

@ -53,8 +53,6 @@ def create_name(issuer, not_before, not_after, subject, san):
not_after=not_after.strftime('%Y%m%d')
)
# NOTE we may want to give more control over naming
# aws doesn't allow special chars except '-'
disallowed_chars = ''.join(c for c in map(chr, range(256)) if not c.isalnum())
disallowed_chars = disallowed_chars.replace("-", "")
disallowed_chars = disallowed_chars.replace(".", "")
@ -64,7 +62,13 @@ def create_name(issuer, not_before, not_after, subject, san):
temp = temp.replace(c, "")
# white space is silly too
return temp.replace(" ", "-")
final = temp.replace(" ", "-")
# we don't want any overlapping certificate names
if Certificate.query.filter(Certificate.name == final).all():
final += '-1'
return final
def get_signing_algorithm(cert):