SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.
Python attacksurfacecticybersecurityfootprintinghackinginformation-gatheringinformation-securityinfosecintelligence-gatheringosintosint-frameworkosint-reconnaissanceosint-toolpentestingpythonreconsecurity-toolsthreat-intelligencethreatintel
sflib: sslDerToPem raise TypeError upon invalid input certificate data
Brendan Colesf13180d381a5
diff --git a/sflib.py b/sflib.pyindex cdecdd1d..e7bcd08f 100644--- a/sflib.py+++ b/sflib.py@@ -1713,12 +1713,21 @@ class SpiderFoot:return list(ibanNumbers)-- def sslDerToPem(self, der):- """Return a PEM for a DER."""- return ssl.DER_cert_to_PEM_cert(der)+ def sslDerToPem(self, der_cert):+ """Given a certificate as a DER-encoded blob of bytes, returns a PEM-encoded string version of the same certificate.++ Args:+ der_cert (bytes): certificate in DER format++ Returns:+ str: PEM-encoded certificate as a byte string+ """++ if not isinstance(der_cert, bytes):+ raise TypeError("der_cert is %s; expected bytes()" % type(der_cert))++ return ssl.DER_cert_to_PEM_cert(der_cert)- # Parse a PEM-format SSL certificatedef parseCert(self, rawcert, fqdn=None, expiringdays=30):"""Parse a PEM-format SSL certificate.diff --git a/test/unit/test_spiderfoot.py b/test/unit/test_spiderfoot.pyindex 39d70b32..94b20071 100644--- a/test/unit/test_spiderfoot.py+++ b/test/unit/test_spiderfoot.py@@ -781,11 +781,14 @@ class TestSpiderFoot(unittest.TestCase):"""sf = SpiderFoot(self.default_options)- pem = sf.sslDerToPem(None)- self.assertEqual(None, pem)+ with self.assertRaises(TypeError) as cm:+ pem = sf.sslDerToPem(None)- pem = sf.sslDerToPem("")- self.assertEqual(None, pem)+ with self.assertRaises(TypeError) as cm:+ pem = sf.sslDerToPem([])++ with self.assertRaises(TypeError) as cm:+ pem = sf.sslDerToPem("")def test_parse_cert_should_return_a_dict(self):"""