Merge branch 'master' into destination-tpl-fix

lemur/certificates/cli.py

@@ -238,17 +238,7 @@ def reissue(old_certificate_name, commit):
 
         if not old_cert:
             for certificate in get_all_pending_reissue():
-                try:
                 request_reissue(certificate, commit)
-                except Exception as e:
-                    sentry.captureException()
-                    current_app.logger.exception(
-                        "Error reissuing certificate: {}".format(certificate.name), exc_info=True)
-                    print(
-                        "[!] Failed to reissue certificates. Reason: {}".format(
-                            e
-                        )
-                    )
         else:
             request_reissue(old_cert, commit)
 
@@ -275,7 +265,7 @@ def query(fqdns, issuer, owner, expired):
     table = []
 
     q = database.session_query(Certificate)
-
+    if issuer:
         sub_query = database.session_query(Authority.id) \
             .filter(Authority.name.ilike('%{0}%'.format(issuer))) \
             .subquery()
@@ -286,12 +276,13 @@ def query(fqdns, issuer, owner, expired):
                 Certificate.authority_id.in_(sub_query)
             )
         )
-
+    if owner:
         q = q.filter(Certificate.owner.ilike('%{0}%'.format(owner)))
 
     if not expired:
         q = q.filter(Certificate.expired == False)  # noqa
 
+    if fqdns:
         for f in fqdns.split(','):
             q = q.filter(
                 or_(
@@ -373,9 +364,6 @@ def check_revoked():
             else:
                 status = verify_string(cert.body, "")
 
-            if status is None:
-                cert.status = 'unknown'
-            else:
             cert.status = 'valid' if status else 'revoked'
 
         except Exception as e:

lemur/common/fields.py

@@ -350,6 +350,7 @@ class SubjectAlternativeNameExtension(Field):
                     value = value.dotted_string
                 else:
                     current_app.logger.warning('Unknown SubAltName type: {name}'.format(name=name))
+                    continue
 
                 general_names.append({'nameType': name_type, 'value': value})