Merge remote-tracking branch 'upstream/master' into elb-ssl-automation

lemur/auth/permissions.py

@@ -21,13 +21,13 @@ CertificateCreatorNeed = partial(CertificateCreator, 'key')
 
 class ViewKeyPermission(Permission):
     def __init__(self, certificate_id, owner):
-        c_need = CertificateCreatorNeed(str(certificate_id))
+        c_need = CertificateCreatorNeed(certificate_id)
         super(ViewKeyPermission, self).__init__(c_need, RoleNeed(owner), RoleNeed('admin'))
 
 
 class UpdateCertificatePermission(Permission):
     def __init__(self, certificate_id, owner):
-        c_need = CertificateCreatorNeed(str(certificate_id))
+        c_need = CertificateCreatorNeed(certificate_id)
         super(UpdateCertificatePermission, self).__init__(c_need, RoleNeed(owner), RoleNeed('admin'))
 
 

lemur/certificates/service.py

@@ -320,6 +320,7 @@ def create_csr(csr_config):
         x509.BasicConstraints(ca=False, path_length=None), critical=True,
     )
 
+    if csr_config.get('extensions'):
         for k, v in csr_config.get('extensions', {}).items():
             if k == 'subAltNames':
                 # map types to their x509 objects

lemur/certificates/views.py

@@ -446,8 +446,7 @@ class CertificatePrivateKey(AuthenticatedResource):
 
         role = role_service.get_by_name(cert.owner)
 
-        if role:
-            permission = ViewKeyPermission(certificate_id, role.name)
+        permission = ViewKeyPermission(certificate_id, getattr(role, 'name', None))
 
         if permission.can():
             response = make_response(jsonify(key=cert.private_key), 200)

lemur/plugins/lemur_verisign/plugin.py

@@ -56,6 +56,7 @@ VERISIGN_ERRORS = {
     "0x4828": "Verisign certificates can be at most two years in length",
     "0x3043": "Certificates must have a validity of at least 1 day",
     "0x950b": "CSR: Invalid State",
+    "0x3105": "Organization Name Not Matched",
 }
 
 

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

@@ -36,7 +36,7 @@
         Organization
       </label>
       <div class="col-sm-10">
-        <input name="organization" ng-model="certificate.organization" placeholder="Organization" class="form-control" ng-init="certificate.organization = 'Netflix'" required/>
+        <input name="organization" ng-model="certificate.organization" placeholder="Organization" class="form-control" ng-init="certificate.organization = 'Netflix, Inc.'" required/>
         <p ng-show="dnForm.organization.$invalid && !dnForm.organization.$pristine" class="help-block">You must enter a organization</p>
       </div>
     </div>

lemur/utils.py

@@ -17,4 +17,5 @@ def get_key():
     try:
         return current_app.config.get('LEMUR_ENCRYPTION_KEY').strip()
     except RuntimeError:
+        print("No Encryption Key Found")
         return ''