| {"repo": "RIPE-NCC/ripe-atlas-sagan", "pull_number": 81, "instance_id": "RIPE-NCC__ripe-atlas-sagan-81", "issue_numbers": "", "base_commit": "5a0919eaf98c1165a4f95ffa9cf0266477395388", "patch": "diff --git a/ripe/atlas/sagan/ssl.py b/ripe/atlas/sagan/ssl.py\n--- a/ripe/atlas/sagan/ssl.py\n+++ b/ripe/atlas/sagan/ssl.py\n@@ -15,28 +15,30 @@\n \n import logging\n import pytz\n-import re\n+import codecs\n \n from datetime import datetime\n-from dateutil.relativedelta import relativedelta\n \n try:\n- import OpenSSL\n+ from cryptography import x509\n+ from cryptography.hazmat.backends import openssl\n+ from cryptography.hazmat.primitives import hashes\n except ImportError:\n logging.warning(\n- \"pyOpenSSL is not installed, without it you cannot parse SSL \"\n+ \"cryptography module is not installed, without it you cannot parse SSL \"\n \"certificate measurement results\"\n )\n \n from .base import Result, ResultParseError, ParsingDict\n \n \n-class Certificate(ParsingDict):\n+OID_COUNTRY = \"2.5.4.6\"\n+OID_ORG = \"2.5.4.10\"\n+OID_COMMON_NAME = \"2.5.4.3\"\n+EXT_SAN = \"subjectAltName\"\n \n- TIME_FORMAT = \"%Y%m%d%H%M%SZ\"\n- TIME_REGEX = re.compile(\n- \"(\\d\\d\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\d\\d)(\\+|\\-)(\\d\\d)(\\d\\d)\"\n- )\n+\n+class Certificate(ParsingDict):\n \n def __init__(self, data, **kwargs):\n \n@@ -49,6 +51,7 @@ def __init__(self, data, **kwargs):\n self.issuer_cn = None\n self.issuer_o = None\n self.issuer_c = None\n+\n self.valid_from = None\n self.valid_until = None\n \n@@ -58,32 +61,59 @@ def __init__(self, data, **kwargs):\n \n self.has_expired = None\n \n- # Clean up the certificate data and use OpenSSL to parse it\n- x509 = OpenSSL.crypto.load_certificate(\n- OpenSSL.crypto.FILETYPE_PEM,\n- data.replace(\"\\\\/\", \"/\").replace(\"\\n\\n\", \"\\n\")\n- )\n- subject = dict(x509.get_subject().get_components())\n- issuer = dict(x509.get_issuer().get_components())\n+ self.extensions = {}\n+\n+ cert = x509.load_pem_x509_certificate(data.encode(\"ascii\"), openssl.backend)\n \n- if x509 and subject and issuer:\n+ if cert:\n+ self.checksum_md5 = self._colonify(cert.fingerprint(hashes.MD5()))\n+ self.checksum_sha1 = self._colonify(cert.fingerprint(hashes.SHA1()))\n+ self.checksum_sha256 = self._colonify(cert.fingerprint(hashes.SHA256()))\n \n- self.subject_cn = self._string_from_dict_or_none(subject, b\"CN\")\n- self.subject_o = self._string_from_dict_or_none(subject, b\"O\")\n- self.subject_c = self._string_from_dict_or_none(subject, b\"C\")\n- self.issuer_cn = self._string_from_dict_or_none(issuer, b\"CN\")\n- self.issuer_o = self._string_from_dict_or_none(issuer, b\"O\")\n- self.issuer_c = self._string_from_dict_or_none(issuer, b\"C\")\n+ self.valid_from = pytz.utc.localize(cert.not_valid_before)\n+ self.valid_until = pytz.utc.localize(cert.not_valid_after)\n \n- self.checksum_md5 = x509.digest(\"md5\").decode()\n- self.checksum_sha1 = x509.digest(\"sha1\").decode()\n- self.checksum_sha256 = x509.digest(\"sha256\").decode()\n+ self.has_expired = self._has_expired()\n \n- self.has_expired = bool(x509.has_expired())\n+ self._add_extensions(cert)\n \n- self.valid_from = None\n- self.valid_until = None\n- self._process_validation_times(x509)\n+ if cert and cert.subject:\n+ self.subject_cn, self.subject_o, self.subject_c = \\\n+ self._parse_x509_name(cert.subject)\n+\n+ if cert and cert.issuer:\n+ self.issuer_cn, self.issuer_o, self.issuer_c = \\\n+ self._parse_x509_name(cert.issuer)\n+\n+ def _add_extensions(self, cert):\n+ for ext in cert.extensions:\n+ if ext.oid._name == EXT_SAN:\n+ self.extensions[EXT_SAN] = []\n+ for san in ext.value:\n+ self.extensions[EXT_SAN].append(san.value)\n+\n+ @staticmethod\n+ def _colonify(bytes):\n+ hex = codecs.getencoder(\"hex_codec\")(bytes)[0].decode(\"ascii\").upper()\n+ return \":\".join(a+b for a,b in zip(hex[::2], hex[1::2]))\n+\n+ @staticmethod\n+ def _parse_x509_name(name):\n+ cn = None\n+ o = None\n+ c = None\n+ for attr in name:\n+ if attr.oid.dotted_string == OID_COUNTRY:\n+ c = attr.value\n+ elif attr.oid.dotted_string == OID_ORG:\n+ o = attr.value\n+ elif attr.oid.dotted_string == OID_COMMON_NAME:\n+ cn = attr.value\n+ return cn, o, c\n+\n+ def _has_expired(self):\n+ now = pytz.utc.localize(datetime.utcnow())\n+ return self.valid_from <= now <= self.valid_until\n \n @property\n def cn(self):\n@@ -113,72 +143,6 @@ def country(self):\n def checksum(self):\n return self.checksum_sha256\n \n- def _process_validation_times(self, x509):\n- \"\"\"\n- PyOpenSSL uses a kooky date format that *usually* parses out quite\n- easily but on the off chance that it's not in UTC, a lot of work needs\n- to be done.\n- \"\"\"\n-\n- valid_from = x509.get_notBefore()\n- valid_until = x509.get_notAfter()\n-\n- try:\n- self.valid_from = pytz.UTC.localize(datetime.strptime(\n- valid_from.decode(),\n- self.TIME_FORMAT\n- ))\n- except ValueError:\n- self.valid_from = self._process_nonstandard_time(valid_from)\n-\n- try:\n- self.valid_until = pytz.UTC.localize(datetime.strptime(\n- valid_until.decode(),\n- self.TIME_FORMAT\n- ))\n- except ValueError:\n- self.valid_until = self._process_nonstandard_time(valid_until)\n-\n- def _process_nonstandard_time(self, string):\n- \"\"\"\n- In addition to `YYYYMMDDhhmmssZ`, PyOpenSSL can also use timestamps\n- in `YYYYMMDDhhmmss+hhmm` or `YYYYMMDDhhmmss-hhmm`.\n- \"\"\"\n-\n- match = re.match(self.TIME_REGEX, string)\n-\n- if not match:\n- raise ResultParseError(\n- \"Unrecognised time format: {s}\".format(s=string)\n- )\n-\n- r = datetime(\n- int(match.group(1)),\n- int(match.group(2)),\n- int(match.group(3)),\n- int(match.group(4)),\n- int(match.group(5)),\n- int(match.group(6)),\n- 0,\n- pytz.UTC\n- )\n- delta = relativedelta(\n- hours=int(match.group(8)),\n- minutes=int(match.group(9))\n- )\n- if match.group(7) == \"-\":\n- return r - delta\n- return r + delta\n-\n- @staticmethod\n- def _string_from_dict_or_none(dictionary, key):\n- \"\"\"\n- Created to make nice with the Python3 problem.\n- \"\"\"\n- if key not in dictionary:\n- return None\n- return dictionary[key].decode(\"UTF-8\")\n-\n \n class Alert(ParsingDict):\n \ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -12,9 +12,8 @@\n \n tests_require = [\"nose\"]\n \n-# pyOpenSSL support is flaky on some systems (I'm looking at you Apple)\n if \"SAGAN_WITHOUT_SSL\" not in os.environ:\n- install_requires.append(\"pyOpenSSL\")\n+ install_requires.append(\"cryptography\")\n \n # Allow setup.py to be run from any path\n os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))\n", "test_patch": "diff --git a/tests/ssl.py b/tests/ssl.py\n--- a/tests/ssl.py\n+++ b/tests/ssl.py\n@@ -386,3 +386,9 @@ def test_alert():\n result = Result.get('{\"af\":4,\"cert\":[\"-----BEGIN CERTIFICATE-----\\\\nMIIFBTCCAu2gAwIBAgIDDLHHMA0GCSqGSIb3DQEBBQUAMHkxEDAOBgNVBAoTB1Jv\\\\nb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ\\\\nQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y\\\\ndEBjYWNlcnQub3JnMB4XDTEzMDEwNjE0MDA1NVoXDTEzMDcwNTE0MDA1NVowGDEW\\\\nMBQGA1UEAxQNKi5wcmV0aWNhbC5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC\\\\nAQoCggEBAMS+vX7gA8TvzFwxryFFRj1OyQjnW88GvfMuGhKJopalG1EB103oRsxi\\\\nMcXqwFZUicpqLKHW4lCHcRuhpKoZp8EOILnRAJRKFOjgIrcHQ02Xn4Lf/ewl601h\\\\n5qxqt1keU1P8j+u9m7zZN+vOoNlEKZ5SnZhysAAYqr/XIt1WY2cji/4GxjF+q1OH\\\\nIl5zddkIfnE52UbREKKlIakfFdj/c6GXqqsP2QTmm4x2HitCD964tZ06fA9BitQj\\\\nnnBXNhtm2MCuBIPBSq0/C7LREwmfnqxCFqE7iqEPNIQ2IT2D4Gh4c+nIZHqYKvCV\\\\nP3zh3aUaBj1o5Lo83IDdXCKAIiQRFMkCAwEAAaOB9jCB8zAMBgNVHRMBAf8EAjAA\\\\nMA4GA1UdDwEB/wQEAwIDqDA0BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUHAwEG\\\\nCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAzBggrBgEFBQcBAQQnMCUwIwYIKwYBBQUH\\\\nMAGGF2h0dHA6Ly9vY3NwLmNhY2VydC5vcmcvMDEGA1UdHwQqMCgwJqAkoCKGIGh0\\\\ndHA6Ly9jcmwuY2FjZXJ0Lm9yZy9yZXZva2UuY3JsMDUGA1UdEQQuMCyCDSoucHJl\\\\ndGljYWwuZWWgGwYIKwYBBQUHCAWgDwwNKi5wcmV0aWNhbC5lZTANBgkqhkiG9w0B\\\\nAQUFAAOCAgEAycddS/c47eo0WVrFxpvCIJdfvn7CYdTPpXNSg0kjapkSjYuAkcmq\\\\nsrScUUGMBe6tfkmkdPTuNKwRVYNJ1Wi9EYaMvJ3CVw6x9O5mgktmu0ogbIXsivwI\\\\nTSzGDMWcb9Of85e/ALWpK0cWIugtWO0d6v3qMWfxlYfAaYu49pttOJQOjbXAAhfR\\\\njE5VOcDaIlWChG48jLAyCLsMwHlyLw8D5Myb9MfTs1XxgLESO9ZTSqGEqJw+BwTJ\\\\nstHk/oCHo9FL/Xv5MmFcNaTpqbB60duYJ+DLLX1QiRRfLJ18G7wEiEAm6H9egupQ\\\\nL9MhQQLJ4o60xTrCnpqGTXTSR16jiTm70bDB0+SU3xTpNwCzdigH6ceKbPIr0cO6\\\\no0ump598e2JNCPsXIc+XcbLDDFgYrlnl3YnK3J+K3LC7SWPMsYdDfe+Im880tNuW\\\\nOlnOCDpP8408KqCp4xm0DMznmThUM34/Ia+o8Q3NWNBfuaOsJ9aA+FmgobJhih9e\\\\nUr9x3ByRQXcW5Cs/AMtCikKWVPsx+IA5eeyt+1i+dKBWksO40B3ADsq1O5DRYYRa\\\\n+dwqdX/jduqZjbyHuFH04q28j4zVDviUBQEa9UQoDM3c82dILDjbYtZ+T28sPMTa\\\\nbMZdcMur9E+ovrS58lIKGCvDEPSUDXHzr0tpb4A13TTnxW6pclqUyJk=\\\\n-----END CERTIFICATE-----\"],\"dst_addr\":\"80.79.115.54\",\"dst_name\":\"pretical.ee\",\"dst_port\":\"https\",\"from\":\"77.95.64.18\",\"fw\":4480,\"method\":\"SSL\",\"msm_id\":1006864,\"prb_id\":517,\"src_addr\":\"77.95.64.18\",\"timestamp\":1362454627,\"type\":\"sslcert\",\"ver\":\"3.0\"}')\n assert(result.alert is None)\n assert(result.is_error is False)\n+\n+def test_san_extension():\n+ result = Result.get('{\"af\":4,\"cert\":[\"-----BEGIN CERTIFICATE-----\\nMIIH4jCCBsqgAwIBAgIIFaqhpQEYRXIwDQYJKoZIhvcNAQELBQAwSTELMAkGA1UE\\nBhMCVVMxEzARBgNVBAoTCkdvb2dsZSBJbmMxJTAjBgNVBAMTHEdvb2dsZSBJbnRl\\ncm5ldCBBdXRob3JpdHkgRzIwHhcNMTcwMzE2MDkzNzQyWhcNMTcwNjA4MDg1NDAw\\nWjBmMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwN\\nTW91bnRhaW4gVmlldzETMBEGA1UECgwKR29vZ2xlIEluYzEVMBMGA1UEAwwMKi5n\\nb29nbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjgPs3rpA\\ntF2jQzXrVQ8x33EVHB3OIpj3GcwVf8U9qcPce0XuG97fHInb20U9Uw1b45ecNRtn\\nWLUw14/7+F4cvFJXHHsYaoUdBoeSJAcOy8ktgxvIEMk82KJwJlzWA7X7B459Fy1U\\nr8Dvu6dNFzhtu8eJs8bFOMJ/Wczjh8tylKXyWNMpotTbvAG3rGH+8fttmGXnztTB\\n3dwxxf6SEL6m4XGH7POxwH9+AKzIwV9PrkU4JM5U2YsGPHf6ao/w27gPVpO5sh3g\\nP9J/3jf8lXNwPZWSLCK5C2i7kz12ohaD7jlipVyw4nYLcEFPs27LwzjYa/YFU8VZ\\nreIcbazBmDsqBwIDAQABo4IErzCCBKswHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG\\nAQUFBwMCMIIDewYDVR0RBIIDcjCCA26CDCouZ29vZ2xlLmNvbYINKi5hbmRyb2lk\\nLmNvbYIWKi5hcHBlbmdpbmUuZ29vZ2xlLmNvbYISKi5jbG91ZC5nb29nbGUuY29t\\ngg4qLmdjcC5ndnQyLmNvbYIWKi5nb29nbGUtYW5hbHl0aWNzLmNvbYILKi5nb29n\\nbGUuY2GCCyouZ29vZ2xlLmNsgg4qLmdvb2dsZS5jby5pboIOKi5nb29nbGUuY28u\\nanCCDiouZ29vZ2xlLmNvLnVrgg8qLmdvb2dsZS5jb20uYXKCDyouZ29vZ2xlLmNv\\nbS5hdYIPKi5nb29nbGUuY29tLmJygg8qLmdvb2dsZS5jb20uY2+CDyouZ29vZ2xl\\nLmNvbS5teIIPKi5nb29nbGUuY29tLnRygg8qLmdvb2dsZS5jb20udm6CCyouZ29v\\nZ2xlLmRlggsqLmdvb2dsZS5lc4ILKi5nb29nbGUuZnKCCyouZ29vZ2xlLmh1ggsq\\nLmdvb2dsZS5pdIILKi5nb29nbGUubmyCCyouZ29vZ2xlLnBsggsqLmdvb2dsZS5w\\ndIISKi5nb29nbGVhZGFwaXMuY29tgg8qLmdvb2dsZWFwaXMuY26CFCouZ29vZ2xl\\nY29tbWVyY2UuY29tghEqLmdvb2dsZXZpZGVvLmNvbYIMKi5nc3RhdGljLmNugg0q\\nLmdzdGF0aWMuY29tggoqLmd2dDEuY29tggoqLmd2dDIuY29tghQqLm1ldHJpYy5n\\nc3RhdGljLmNvbYIMKi51cmNoaW4uY29tghAqLnVybC5nb29nbGUuY29tghYqLnlv\\ndXR1YmUtbm9jb29raWUuY29tgg0qLnlvdXR1YmUuY29tghYqLnlvdXR1YmVlZHVj\\nYXRpb24uY29tggsqLnl0aW1nLmNvbYIaYW5kcm9pZC5jbGllbnRzLmdvb2dsZS5j\\nb22CC2FuZHJvaWQuY29tghtkZXZlbG9wZXIuYW5kcm9pZC5nb29nbGUuY26CBGcu\\nY2+CBmdvby5nbIIUZ29vZ2xlLWFuYWx5dGljcy5jb22CCmdvb2dsZS5jb22CEmdv\\nb2dsZWNvbW1lcmNlLmNvbYIKdXJjaGluLmNvbYIKd3d3Lmdvby5nbIIIeW91dHUu\\nYmWCC3lvdXR1YmUuY29tghR5b3V0dWJlZWR1Y2F0aW9uLmNvbTBoBggrBgEFBQcB\\nAQRcMFowKwYIKwYBBQUHMAKGH2h0dHA6Ly9wa2kuZ29vZ2xlLmNvbS9HSUFHMi5j\\ncnQwKwYIKwYBBQUHMAGGH2h0dHA6Ly9jbGllbnRzMS5nb29nbGUuY29tL29jc3Aw\\nHQYDVR0OBBYEFHRy1woLF5IqQVubJZ5ZvXAjaJ0aMAwGA1UdEwEB/wQCMAAwHwYD\\nVR0jBBgwFoAUSt0GFhu89mi1dvWBtrtiGrpagS8wIQYDVR0gBBowGDAMBgorBgEE\\nAdZ5AgUBMAgGBmeBDAECAjAwBgNVHR8EKTAnMCWgI6Ahhh9odHRwOi8vcGtpLmdv\\nb2dsZS5jb20vR0lBRzIuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQAsoPR1jJz2adkK\\nTVXpGse/M3l+xKgmuZHpXzXkAiqE9wcsxXxCU3dEUmPBYYGRTqODNkOh9AMyGzIL\\nfrYh/zY9rhqJ2B26OunmxKFF9BmwRi2rp+Ksvg/+27F57Hyaq2phSaR8E7hRZcYR\\nYqCaNA5e1hialuB1g58mAvs38jxxV4bQhKzCKkBOxolhYbUEBEV4mQ14ODdSvAB0\\n8L1dMjk3+LEDB/hWdtpOOhtMbSPa1u7xJeM/Ip7+GV47lS3V6rUALDKz4ASNk8ih\\nX0ZmxPA1rabqNFutG8L/4HK2/ffO4bKEkHEdOQXC9B17n1x65fbLUbweDPDAzaow\\nrum/OChG\\n-----END CERTIFICATE-----\"],\"dst_addr\":\"193.0.6.158\",\"dst_name\":\"atlas.ripe.net\",\"dst_port\":\"443\",\"from\":\"86.82.178.27\",\"fw\":4760,\"lts\":133,\"method\":\"TLS\",\"msm_id\":14002,\"msm_name\":\"SSLCert\",\"prb_id\":10951,\"rt\":51.558465,\"src_addr\":\"192.168.180.22\",\"timestamp\":1490659208,\"ttc\":14.88238,\"type\":\"sslcert\",\"ver\":\"1.2\"}')\n+ ext = result.certificates[0].extensions\n+ assert(ext and len(ext['subjectAltName'])==54)\n+\n", "problem_statement": "", "hints_text": "", "created_at": "2017-04-03T11:57:18Z"} | |