0.7 release

lemur/__about__.py

@@ -9,7 +9,7 @@ __title__ = "lemur"
 __summary__ = ("Certificate management and orchestration service")
 __uri__ = "https://github.com/Netflix/lemur"
 
-__version__ = "0.7.0dev"
+__version__ = "0.7.0"
 
 __author__ = "The Lemur developers"
 __email__ = "security@netflix.com"

lemur/certificates/schemas.py

@@ -9,6 +9,17 @@ from flask import current_app
 from marshmallow import fields, validate, validates_schema, post_load, pre_load
 from marshmallow.exceptions import ValidationError
 
+from lemur.authorities.schemas import AuthorityNestedOutputSchema
+from lemur.common import validators, missing
+from lemur.common.fields import ArrowDateTime, Hex
+from lemur.common.schema import LemurInputSchema, LemurOutputSchema
+from lemur.constants import CERTIFICATE_KEY_TYPES
+from lemur.destinations.schemas import DestinationNestedOutputSchema
+from lemur.domains.schemas import DomainNestedOutputSchema
+from lemur.notifications import service as notification_service
+from lemur.notifications.schemas import NotificationNestedOutputSchema
+from lemur.policies.schemas import RotationPolicyNestedOutputSchema
+from lemur.roles.schemas import RoleNestedOutputSchema
 from lemur.schemas import (
     AssociatedAuthoritySchema,
     AssociatedDestinationSchema,
@@ -21,20 +32,7 @@ from lemur.schemas import (
     AssociatedRotationPolicySchema,
     DnsProviderSchema
 )
-
-from lemur.authorities.schemas import AuthorityNestedOutputSchema
-from lemur.destinations.schemas import DestinationNestedOutputSchema
-from lemur.notifications.schemas import NotificationNestedOutputSchema
-from lemur.roles.schemas import RoleNestedOutputSchema
-from lemur.domains.schemas import DomainNestedOutputSchema
 from lemur.users.schemas import UserNestedOutputSchema
-from lemur.policies.schemas import RotationPolicyNestedOutputSchema
-
-from lemur.common.schema import LemurInputSchema, LemurOutputSchema
-from lemur.common import validators, missing
-from lemur.notifications import service as notification_service
-
-from lemur.common.fields import ArrowDateTime, Hex
 
 
 class CertificateSchema(LemurInputSchema):
@@ -76,11 +74,7 @@ class CertificateInputSchema(CertificateCreationSchema):
     csr = fields.String(validate=validators.csr)
 
     key_type = fields.String(
-        validate=validate.OneOf(
-            ['RSA2048', 'RSA4096', 'ECCPRIME192V1', 'ECCPRIME256V1', 'ECCSECP192R1', 'ECCSECP224R1',
-             'ECCSECP256R1', 'ECCSECP384R1', 'ECCSECP521R1', 'ECCSECP256K1', 'ECCSECT163K1', 'ECCSECT233K1',
-             'ECCSECT283K1', 'ECCSECT409K1', 'ECCSECT571K1', 'ECCSECT163R2', 'ECCSECT233R1', 'ECCSECT283R1',
-             'ECCSECT409R1', 'ECCSECT571R2']),
+        validate=validate.OneOf(CERTIFICATE_KEY_TYPES),
         missing='RSA2048')
 
     notify = fields.Boolean(default=True)

lemur/common/utils.py

@@ -6,17 +6,15 @@
 
 .. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
 """
-import string
 import random
+import string
 
 import sqlalchemy
-from sqlalchemy import and_, func
-
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import rsa, ec
-
 from flask_restful.reqparse import RequestParser
+from sqlalchemy import and_, func
 
 from lemur.constants import CERTIFICATE_KEY_TYPES
 from lemur.exceptions import InvalidConfiguration

lemur/dns_providers/models.py

@@ -4,6 +4,7 @@ from sqlalchemy_utils import ArrowType
 
 from lemur.database import db
 from lemur.plugins.base import plugins
+from lemur.utils import Vault
 
 
 class DnsProviders(db.Model):
@@ -15,7 +16,7 @@ class DnsProviders(db.Model):
     name = Column(String(length=256), unique=True, nullable=True)
     description = Column(String(length=1024), nullable=True)
     provider_type = Column(String(length=256), nullable=True)
-    credentials = Column(String(length=256), nullable=True)
+    credentials = Column(Vault, nullable=True)
     api_endpoint = Column(String(length=256), nullable=True)
     date_created = Column(ArrowType(), server_default=text('now()'), nullable=False)
     status = Column(String(length=128), nullable=True)

lemur/models.py

@@ -55,7 +55,7 @@ certificate_replacement_associations = db.Table('certificate_replacement_associa
                                                        ForeignKey('certificates.id', ondelete='cascade'))
                                                 )
 
-Index('certificate_replacement_associations_ix', certificate_replacement_associations.c.replaced_certificate_id, certificate_replacement_associations.c.certificate_id)
+Index('certificate_replacement_associations_ix', certificate_replacement_associations.c.replaced_certificate_id, certificate_replacement_associations.c.certificate_id, unique=True)
 
 roles_authorities = db.Table('roles_authorities',
                              Column('authority_id', Integer, ForeignKey('authorities.id')),

lemur/plugins/lemur_acme/cloudflare.py

@@ -1,6 +1,6 @@
 import time
-import CloudFlare
 
+import CloudFlare
 from flask import current_app
 
 

lemur/plugins/lemur_acme/dyn.py

@@ -1,7 +1,7 @@
-import dns.exception
-import dns.resolver
 import time
 
+import dns.exception
+import dns.resolver
 from dyn.tm.session import DynectSession
 from dyn.tm.zones import Node, Zone
 from flask import current_app

lemur/plugins/lemur_acme/plugin.py

@@ -11,25 +11,22 @@
 .. moduleauthor:: Mikhail Khodorovskiy <mikhail.khodorovskiy@jivesoftware.com>
 .. moduleauthor:: Curtis Castrapel <ccastrapel@netflix.com>
 """
-import josepy as jose
 import json
 
-from flask import current_app
-
-from acme.client import Client
+import OpenSSL.crypto
+import josepy as jose
 from acme import challenges, messages
+from acme.client import Client
 from acme.errors import PollError
 from botocore.exceptions import ClientError
-
-from lemur.common.utils import generate_private_key
-
-import OpenSSL.crypto
+from flask import current_app
 
 from lemur.authorizations import service as authorization_service
+from lemur.common.utils import generate_private_key
 from lemur.dns_providers import service as dns_provider_service
 from lemur.exceptions import InvalidAuthority, InvalidConfiguration
-from lemur.plugins.bases import IssuerPlugin
 from lemur.plugins import lemur_acme as acme
+from lemur.plugins.bases import IssuerPlugin
 
 
 def find_dns_challenge(authz):

lemur/plugins/lemur_acme/route53.py

@@ -1,4 +1,5 @@
 import time
+
 from lemur.plugins.lemur_aws.sts import sts_client
 
 

lemur/plugins/lemur_acme/tests/test_acme.py

@@ -1,8 +1,9 @@
 import unittest
 
-from lemur.plugins.lemur_acme import plugin
 from mock import MagicMock, Mock, patch
 
+from lemur.plugins.lemur_acme import plugin
+
 
 class TestAcme(unittest.TestCase):
 

lemur/utils.py

@@ -6,12 +6,12 @@
 .. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
 """
 import os
-from flask import current_app
-from cryptography.fernet import Fernet, MultiFernet
-import sqlalchemy.types as types
-
-from contextlib import contextmanager
 import tempfile
+from contextlib import contextmanager
+
+import sqlalchemy.types as types
+from cryptography.fernet import Fernet, MultiFernet
+from flask import current_app
 
 
 @contextmanager