Adds support for CDLDistributionPoints. (#1130)
This commit is contained in:
parent
416791d4c5
commit
db746f1296
|
@ -332,9 +332,8 @@ class Certificate(db.Model):
|
||||||
|
|
||||||
return_extensions['authority_key_identifier'] = aki
|
return_extensions['authority_key_identifier'] = aki
|
||||||
|
|
||||||
# TODO: Don't support CRLDistributionPoints yet https://github.com/Netflix/lemur/issues/662
|
|
||||||
elif isinstance(value, x509.CRLDistributionPoints):
|
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
|
# TODO: Not supporting custom OIDs yet. https://github.com/Netflix/lemur/issues/665
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -220,6 +220,14 @@ class CertificateInfoAccessSchema(BaseExtensionSchema):
|
||||||
return {'includeAIA': data['include_aia']}
|
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):
|
class SubjectKeyIdentifierSchema(BaseExtensionSchema):
|
||||||
include_ski = fields.Boolean()
|
include_ski = fields.Boolean()
|
||||||
|
|
||||||
|
@ -247,6 +255,7 @@ class ExtensionSchema(BaseExtensionSchema):
|
||||||
sub_alt_names = fields.Nested(NamesSchema)
|
sub_alt_names = fields.Nested(NamesSchema)
|
||||||
authority_key_identifier = fields.Nested(AuthorityKeyIdentifierSchema)
|
authority_key_identifier = fields.Nested(AuthorityKeyIdentifierSchema)
|
||||||
certificate_info_access = fields.Nested(CertificateInfoAccessSchema)
|
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: 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
|
# FIXME: Remove support in UI for Critical custom extensions https://github.com/Netflix/lemur/issues/665
|
||||||
custom = fields.List(fields.Nested(CustomOIDSchema))
|
custom = fields.List(fields.Nested(CustomOIDSchema))
|
||||||
|
|
|
@ -182,7 +182,7 @@
|
||||||
cRL Distribution Points
|
cRL Distribution Points
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-8">
|
<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>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
|
|
@ -196,7 +196,7 @@
|
||||||
cRL Distribution Points
|
cRL Distribution Points
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-10">
|
<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>
|
ng-options="item for item in ['yes', 'no', 'default']"></select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue