From 058d2938fb06a29bcfff5ad4c5e3b56fcfdc19d9 Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Tue, 29 Nov 2016 11:30:44 -0800
Subject: [PATCH] migrating off of openssl (#539)

---
 lemur/certificates/verify.py | 37 ++++++++++++++++++++++--------------
 lemur/manage.py              |  3 +++
 setup.py                     |  2 --
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/lemur/certificates/verify.py b/lemur/certificates/verify.py
index 46402441..c1b2aa1e 100644
--- a/lemur/certificates/verify.py
+++ b/lemur/certificates/verify.py
@@ -7,12 +7,11 @@
 """
 import requests
 import subprocess
-from OpenSSL import crypto
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
 
-from flask import current_app
 from lemur.utils import mktempfile
+from lemur.common.utils import parse_certificate
 
 
 def ocsp_verify(cert_path, issuer_chain_path):
@@ -33,13 +32,16 @@ def ocsp_verify(cert_path, issuer_chain_path):
                            '-cert', cert_path, "-url", url.strip()], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
     message, err = p2.communicate()
-    if 'error' in message or 'Error' in message:
+
+    p_message = message.decode('utf-8')
+
+    if 'error' in p_message or 'Error' in p_message:
         raise Exception("Got error when parsing OCSP url")
 
-    elif 'revoked' in message:
+    elif 'revoked' in p_message:
         return
 
-    elif 'good' not in message:
+    elif 'good' not in p_message:
         raise Exception("Did not receive a valid response")
 
     return True
@@ -54,17 +56,27 @@ def crl_verify(cert_path):
     :raise Exception: If certificate does not have CRL
     """
     with open(cert_path, 'rt') as c:
-        cert = x509.load_pem_x509_certificate(c.read(), default_backend())
+        cert = parse_certificate(c.read())
 
     distribution_points = cert.extensions.get_extension_for_oid(x509.OID_CRL_DISTRIBUTION_POINTS).value
+
     for p in distribution_points:
         point = p.full_name[0].value
-        response = requests.get(point)
-        crl = crypto.load_crl(crypto.FILETYPE_ASN1, response.content)  # TODO this should be switched to cryptography when support exists
-        revoked = crl.get_revoked()
-        for r in revoked:
-            if cert.serial == r.get_serial():
+
+        try:
+            response = requests.get(point)
+
+            if response.status_code != 200:
+                raise Exception("Unable to retrieve CRL: {0}".format(point))
+        except ConnectionError:
+            raise Exception("Unable to retrieve CRL: {0}".format(point))
+
+        crl = x509.load_der_x509_crl(response.content, backend=default_backend())
+
+        for r in crl:
+            if cert.serial == r.serial_number:
                 return
+
     return True
 
 
@@ -81,13 +93,10 @@ def verify(cert_path, issuer_chain_path):
     try:
         return ocsp_verify(cert_path, issuer_chain_path)
     except Exception as e:
-        current_app.logger.debug("Could not use OCSP: {0}".format(e))
         try:
             return crl_verify(cert_path)
         except Exception as e:
-            current_app.logger.debug("Could not use CRL: {0}".format(e))
             raise Exception("Failed to verify")
-        raise Exception("Failed to verify")
 
 
 def verify_string(cert_string, issuer_string):
diff --git a/lemur/manage.py b/lemur/manage.py
index af6702e6..b8bed77f 100755
--- a/lemur/manage.py
+++ b/lemur/manage.py
@@ -154,8 +154,11 @@ def check_revoked():
                 status = verify_string(cert.body, "")
 
             cert.status = 'valid' if status else 'invalid'
+
         except Exception as e:
+            current_app.logger.exception(e)
             cert.status = 'unknown'
+
         database.update(cert)
 
 
diff --git a/setup.py b/setup.py
index 881913bc..e34a2d9f 100644
--- a/setup.py
+++ b/setup.py
@@ -50,9 +50,7 @@ install_requires = [
     'gunicorn==19.6.0',
     'marshmallow-sqlalchemy==0.12.0',
     'marshmallow==2.10.4',
-    'pycrypto==2.6.1',
     'cryptography==1.6',
-    'pyopenssl==16.1.0',
     'pyjwt==1.4.2',
     'xmltodict==0.10.2',
     'lockfile==0.12.2',