Merge branch 'master' into doppins/moto-equals-1.3.1

lemur/certificates/models.py

@@ -332,9 +332,8 @@ class Certificate(db.Model):
 
                     return_extensions['authority_key_identifier'] = aki
 
-                # TODO: Don't support CRLDistributionPoints yet https://github.com/Netflix/lemur/issues/662
                 elif isinstance(value, x509.CRLDistributionPoints):
-                    current_app.logger.warning('CRLDistributionPoints not yet supported for clone operation.')
+                    return_extensions['crl_distribution_points'] = {'include_crl_dp': value}
 
                 # TODO: Not supporting custom OIDs yet. https://github.com/Netflix/lemur/issues/665
                 else:

lemur/schemas.py

@@ -220,6 +220,14 @@ class CertificateInfoAccessSchema(BaseExtensionSchema):
         return {'includeAIA': data['include_aia']}
 
 
+class CRLDistributionPointsSchema(BaseExtensionSchema):
+    include_crl_dp = fields.String()
+
+    @post_dump
+    def handle_keys(self, data):
+        return {'includeCRLDP': data['include_crl_dp']}
+
+
 class SubjectKeyIdentifierSchema(BaseExtensionSchema):
     include_ski = fields.Boolean()
 
@@ -240,13 +248,14 @@ class NamesSchema(BaseExtensionSchema):
 
 
 class ExtensionSchema(BaseExtensionSchema):
-    basic_constraints = BasicConstraintsExtension(missing={'ca': False})
+    basic_constraints = BasicConstraintsExtension()  # some devices balk on default basic constraints
     key_usage = KeyUsageExtension()
     extended_key_usage = ExtendedKeyUsageExtension()
     subject_key_identifier = fields.Nested(SubjectKeyIdentifierSchema)
     sub_alt_names = fields.Nested(NamesSchema)
     authority_key_identifier = fields.Nested(AuthorityKeyIdentifierSchema)
     certificate_info_access = fields.Nested(CertificateInfoAccessSchema)
+    crl_distribution_points = fields.Nested(CRLDistributionPointsSchema, dump_to='cRL_distribution_points')
     # FIXME: Convert custom OIDs to a custom field in fields.py like other Extensions
     # FIXME: Remove support in UI for Critical custom extensions https://github.com/Netflix/lemur/issues/665
     custom = fields.List(fields.Nested(CustomOIDSchema))

lemur/static/app/angular/authorities/authority/extensions.tpl.html

@@ -160,7 +160,7 @@
     <div class="col-sm-10">
       <div class="checkbox">
         <label tooltip-trigger="mouseenter" tooltip-placement="top" uib-tooltip="Ask CA to include/not include AIA extension" >
-          <input type="checkbox" ng-model="authority.extensions.certificateInfoAccess.includeAIA">Include AIA 
+          <input type="checkbox" ng-model="authority.extensions.certificateInfoAccess.includeAIA">Include AIA
         </label>
       </div>
     </div>
@@ -182,7 +182,7 @@
       cRL Distribution Points
     </label>
     <div class="col-sm-8">
-      <select class="form-control" ng-model="authority.extensions.cRLDistributionPoints.includeCRLDP" ng-options="item for item in ['yes', 'no', 'default']"></select>
+      <select class="form-control" ng-model="authority.extensions.crlDistributionPoints.includeCrlDp" ng-options="item for item in ['yes', 'no', 'default']"></select>
     </div>
   </div>
   <div class="form-group">

lemur/static/app/angular/certificates/certificate/options.tpl.html

@@ -196,7 +196,7 @@
           cRL Distribution Points
         </label>
         <div class="col-sm-10">
-          <select class="form-control" ng-model="certificate.extensions.cRLDistributionPoints.includeCRLDP"
+          <select class="form-control" ng-model="certificate.extensions.crlDistributionPoints.includeCrlDp"
                   ng-options="item for item in ['yes', 'no', 'default']"></select>
         </div>
       </div>

requirements-tests.txt

@@ -42,8 +42,8 @@ pycparser==2.18           # via cffi
 pyflakes==1.6.0
 pytest-flask==0.10.0
 pytest-mock==1.7.1
-pytest==3.4.2
+pytest==3.5.0
-python-dateutil==2.6.1    # via botocore, faker, freezegun, moto
+python-dateutil==2.7.2    # via botocore, faker, freezegun, moto
 pytz==2018.3              # via moto
 pyyaml==3.12              # via pyaml
 requests-mock==1.4.0