From 70add5fef5274c697f79c0e5628c49540bd8e52b Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 28 Jun 2015 11:34:02 -0400 Subject: Initial stab at unifying the extension parsing code fro CSRs and certificates --- src/cryptography/hazmat/backends/openssl/x509.py | 154 +++++++++++------------ 1 file changed, 75 insertions(+), 79 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index 8e361fa2..b7693bc1 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -163,6 +163,44 @@ def _decode_general_name(backend, gn): ) +def _decode_ocsp_no_check(backend, ext): + return x509.OCSPNoCheck() + + +class _X509ExtensionParser(object): + def __init__(self, ext_count, get_ext, handlers): + self.ext_count = ext_count + self.get_ext = get_ext + self.handlers = handlers + + def parse(self, backend, x509_obj): + extensions = [] + seen_oids = set() + for i in range(self.ext_count(x509_obj)): + ext = self.get_ext(x509_obj, i) + assert ext != backend._ffi.NULL + crit = backend._lib.X509_EXTENSION_get_critical(ext) + critical = crit == 1 + oid = x509.ObjectIdentifier(_obj2txt(backend, ext.object)) + if oid in seen_oids: + raise x509.DuplicateExtension( + "Duplicate {0} extension found".format(oid), oid + ) + for handler_oid, f in self.handlers: + if handler_oid == oid: + value = f(backend, ext) + extensions.append(x509.Extension(oid, critical, value)) + break + else: + if critical: + raise x509.UnsupportedExtension( + "{0} is not currently supported".format(oid), oid + ) + seen_oids.add(oid) + + return x509.Extensions(extensions) + + @utils.register_interface(x509.Certificate) class _Certificate(object): def __init__(self, backend, x509): @@ -268,58 +306,36 @@ class _Certificate(object): @property def extensions(self): - extensions = [] - seen_oids = set() - extcount = self._backend._lib.X509_get_ext_count(self._x509) - for i in range(0, extcount): - ext = self._backend._lib.X509_get_ext(self._x509, i) - assert ext != self._backend._ffi.NULL - crit = self._backend._lib.X509_EXTENSION_get_critical(ext) - critical = crit == 1 - oid = x509.ObjectIdentifier(_obj2txt(self._backend, ext.object)) - if oid in seen_oids: - raise x509.DuplicateExtension( - "Duplicate {0} extension found".format(oid), oid - ) - elif oid == x509.OID_BASIC_CONSTRAINTS: - value = _decode_basic_constraints(self._backend, ext) - elif oid == x509.OID_SUBJECT_KEY_IDENTIFIER: - value = _decode_subject_key_identifier(self._backend, ext) - elif oid == x509.OID_KEY_USAGE: - value = _decode_key_usage(self._backend, ext) - elif oid == x509.OID_SUBJECT_ALTERNATIVE_NAME: - value = _decode_subject_alt_name(self._backend, ext) - elif oid == x509.OID_EXTENDED_KEY_USAGE: - value = _decode_extended_key_usage(self._backend, ext) - elif oid == x509.OID_AUTHORITY_KEY_IDENTIFIER: - value = _decode_authority_key_identifier(self._backend, ext) - elif oid == x509.OID_AUTHORITY_INFORMATION_ACCESS: - value = _decode_authority_information_access( - self._backend, ext - ) - elif oid == x509.OID_CERTIFICATE_POLICIES: - value = _decode_certificate_policies(self._backend, ext) - elif oid == x509.OID_CRL_DISTRIBUTION_POINTS: - value = _decode_crl_distribution_points(self._backend, ext) - elif oid == x509.OID_OCSP_NO_CHECK: - value = x509.OCSPNoCheck() - elif oid == x509.OID_INHIBIT_ANY_POLICY: - value = _decode_inhibit_any_policy(self._backend, ext) - elif oid == x509.OID_ISSUER_ALTERNATIVE_NAME: - value = _decode_issuer_alt_name(self._backend, ext) - elif critical: - raise x509.UnsupportedExtension( - "{0} is not currently supported".format(oid), oid - ) - else: - # Unsupported non-critical extension, silently skipping for now - seen_oids.add(oid) - continue - - seen_oids.add(oid) - extensions.append(x509.Extension(oid, critical, value)) - - return x509.Extensions(extensions) + return _X509ExtensionParser( + ext_count=self._backend._lib.X509_get_ext_count, + get_ext=self._backend._lib.X509_get_ext, + handlers=[ + (x509.OID_BASIC_CONSTRAINTS, _decode_basic_constraints), + ( + x509.OID_SUBJECT_KEY_IDENTIFIER, + _decode_subject_key_identifier + ), + (x509.OID_KEY_USAGE, _decode_key_usage), + (x509.OID_SUBJECT_ALTERNATIVE_NAME, _decode_subject_alt_name), + (x509.OID_EXTENDED_KEY_USAGE, _decode_extended_key_usage), + ( + x509.OID_AUTHORITY_KEY_IDENTIFIER, + _decode_authority_key_identifier + ), + ( + x509.OID_AUTHORITY_INFORMATION_ACCESS, + _decode_authority_information_access + ), + (x509.OID_CERTIFICATE_POLICIES, _decode_certificate_policies), + ( + x509.OID_CRL_DISTRIBUTION_POINTS, + _decode_crl_distribution_points + ), + (x509.OID_OCSP_NO_CHECK, _decode_ocsp_no_check), + (x509.OID_INHIBIT_ANY_POLICY, _decode_inhibit_any_policy), + (x509.OID_ISSUER_ALTERNATIVE_NAME, _decode_issuer_alt_name), + ] + ).parse(self._backend, self._x509) def public_bytes(self, encoding): bio = self._backend._create_mem_bio() @@ -704,35 +720,15 @@ class _CertificateSigningRequest(object): @property def extensions(self): - extensions = [] - seen_oids = set() x509_exts = self._backend._lib.X509_REQ_get_extensions(self._x509_req) - extcount = self._backend._lib.sk_X509_EXTENSION_num(x509_exts) - for i in range(0, extcount): - ext = self._backend._lib.sk_X509_EXTENSION_value(x509_exts, i) - assert ext != self._backend._ffi.NULL - crit = self._backend._lib.X509_EXTENSION_get_critical(ext) - critical = crit == 1 - oid = x509.ObjectIdentifier(_obj2txt(self._backend, ext.object)) - if oid in seen_oids: - raise x509.DuplicateExtension( - "Duplicate {0} extension found".format(oid), oid - ) - elif oid == x509.OID_BASIC_CONSTRAINTS: - value = _decode_basic_constraints(self._backend, ext) - elif critical: - raise x509.UnsupportedExtension( - "{0} is not currently supported".format(oid), oid - ) - else: - # Unsupported non-critical extension, silently skipping for now - seen_oids.add(oid) - continue - seen_oids.add(oid) - extensions.append(x509.Extension(oid, critical, value)) - - return x509.Extensions(extensions) + return _X509ExtensionParser( + ext_count=self._backend._lib.sk_X509_EXTENSION_num, + get_ext=self._backend._lib.sk_X509_EXTENSION_value, + handlers=[ + (x509.OID_BASIC_CONSTRAINTS, _decode_basic_constraints), + ] + ).parse(self._backend, x509_exts) def public_bytes(self, encoding): bio = self._backend._create_mem_bio() -- cgit v1.2.3 From e0aa76c1486e35ec1c2eeedef4c9765ec1929d5d Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 28 Jun 2015 16:06:24 -0400 Subject: Factor this code out. --- src/cryptography/hazmat/backends/openssl/x509.py | 75 +++++++++++------------- 1 file changed, 35 insertions(+), 40 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index b7693bc1..e5bf9726 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -176,8 +176,8 @@ class _X509ExtensionParser(object): def parse(self, backend, x509_obj): extensions = [] seen_oids = set() - for i in range(self.ext_count(x509_obj)): - ext = self.get_ext(x509_obj, i) + for i in range(self.ext_count(backend, x509_obj)): + ext = self.get_ext(backend, x509_obj, i) assert ext != backend._ffi.NULL crit = backend._lib.X509_EXTENSION_get_critical(ext) critical = crit == 1 @@ -306,36 +306,7 @@ class _Certificate(object): @property def extensions(self): - return _X509ExtensionParser( - ext_count=self._backend._lib.X509_get_ext_count, - get_ext=self._backend._lib.X509_get_ext, - handlers=[ - (x509.OID_BASIC_CONSTRAINTS, _decode_basic_constraints), - ( - x509.OID_SUBJECT_KEY_IDENTIFIER, - _decode_subject_key_identifier - ), - (x509.OID_KEY_USAGE, _decode_key_usage), - (x509.OID_SUBJECT_ALTERNATIVE_NAME, _decode_subject_alt_name), - (x509.OID_EXTENDED_KEY_USAGE, _decode_extended_key_usage), - ( - x509.OID_AUTHORITY_KEY_IDENTIFIER, - _decode_authority_key_identifier - ), - ( - x509.OID_AUTHORITY_INFORMATION_ACCESS, - _decode_authority_information_access - ), - (x509.OID_CERTIFICATE_POLICIES, _decode_certificate_policies), - ( - x509.OID_CRL_DISTRIBUTION_POINTS, - _decode_crl_distribution_points - ), - (x509.OID_OCSP_NO_CHECK, _decode_ocsp_no_check), - (x509.OID_INHIBIT_ANY_POLICY, _decode_inhibit_any_policy), - (x509.OID_ISSUER_ALTERNATIVE_NAME, _decode_issuer_alt_name), - ] - ).parse(self._backend, self._x509) + return _CERTIFICATE_EXTENSION_PARSER.parse(self._backend, self._x509) def public_bytes(self, encoding): bio = self._backend._create_mem_bio() @@ -721,14 +692,7 @@ class _CertificateSigningRequest(object): @property def extensions(self): x509_exts = self._backend._lib.X509_REQ_get_extensions(self._x509_req) - - return _X509ExtensionParser( - ext_count=self._backend._lib.sk_X509_EXTENSION_num, - get_ext=self._backend._lib.sk_X509_EXTENSION_value, - handlers=[ - (x509.OID_BASIC_CONSTRAINTS, _decode_basic_constraints), - ] - ).parse(self._backend, x509_exts) + return _CSR_EXTENSION_PARSER.parse(self._backend, x509_exts) def public_bytes(self, encoding): bio = self._backend._create_mem_bio() @@ -743,3 +707,34 @@ class _CertificateSigningRequest(object): assert res == 1 return self._backend._read_mem_bio(bio) + + +_CERTIFICATE_EXTENSION_PARSER = _X509ExtensionParser( + ext_count=lambda backend, x: backend._lib.X509_get_ext_count(x), + get_ext=lambda backend, x, i: backend._lib.X509_get_ext(x, i), + handlers=[ + (x509.OID_BASIC_CONSTRAINTS, _decode_basic_constraints), + (x509.OID_SUBJECT_KEY_IDENTIFIER, _decode_subject_key_identifier), + (x509.OID_KEY_USAGE, _decode_key_usage), + (x509.OID_SUBJECT_ALTERNATIVE_NAME, _decode_subject_alt_name), + (x509.OID_EXTENDED_KEY_USAGE, _decode_extended_key_usage), + (x509.OID_AUTHORITY_KEY_IDENTIFIER, _decode_authority_key_identifier), + ( + x509.OID_AUTHORITY_INFORMATION_ACCESS, + _decode_authority_information_access + ), + (x509.OID_CERTIFICATE_POLICIES, _decode_certificate_policies), + (x509.OID_CRL_DISTRIBUTION_POINTS, _decode_crl_distribution_points), + (x509.OID_OCSP_NO_CHECK, _decode_ocsp_no_check), + (x509.OID_INHIBIT_ANY_POLICY, _decode_inhibit_any_policy), + (x509.OID_ISSUER_ALTERNATIVE_NAME, _decode_issuer_alt_name), + ] +) + +_CSR_EXTENSION_PARSER = _X509ExtensionParser( + ext_count=lambda backend, x: backend._lib.sk_X509_EXTENSION_num(x), + get_ext=lambda backend, x, i: backend._lib.sk_X509_EXTENSION_value(x, i), + handlers=[ + (x509.OID_BASIC_CONSTRAINTS, _decode_basic_constraints), + ] +) -- cgit v1.2.3 From a4de4934a59faf65c99da5c41a75fa7ed2216453 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 28 Jun 2015 16:31:58 -0400 Subject: use a dict here --- src/cryptography/hazmat/backends/openssl/x509.py | 48 ++++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index e5bf9726..cc805755 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -186,16 +186,17 @@ class _X509ExtensionParser(object): raise x509.DuplicateExtension( "Duplicate {0} extension found".format(oid), oid ) - for handler_oid, f in self.handlers: - if handler_oid == oid: - value = f(backend, ext) - extensions.append(x509.Extension(oid, critical, value)) - break - else: + try: + handler = self.handlers[oid] + except KeyError: if critical: raise x509.UnsupportedExtension( "{0} is not currently supported".format(oid), oid ) + else: + value = handler(backend, ext) + extensions.append(x509.Extension(oid, critical, value)) + seen_oids.add(oid) return x509.Extensions(extensions) @@ -712,29 +713,28 @@ class _CertificateSigningRequest(object): _CERTIFICATE_EXTENSION_PARSER = _X509ExtensionParser( ext_count=lambda backend, x: backend._lib.X509_get_ext_count(x), get_ext=lambda backend, x, i: backend._lib.X509_get_ext(x, i), - handlers=[ - (x509.OID_BASIC_CONSTRAINTS, _decode_basic_constraints), - (x509.OID_SUBJECT_KEY_IDENTIFIER, _decode_subject_key_identifier), - (x509.OID_KEY_USAGE, _decode_key_usage), - (x509.OID_SUBJECT_ALTERNATIVE_NAME, _decode_subject_alt_name), - (x509.OID_EXTENDED_KEY_USAGE, _decode_extended_key_usage), - (x509.OID_AUTHORITY_KEY_IDENTIFIER, _decode_authority_key_identifier), - ( - x509.OID_AUTHORITY_INFORMATION_ACCESS, + handlers={ + x509.OID_BASIC_CONSTRAINTS: _decode_basic_constraints, + x509.OID_SUBJECT_KEY_IDENTIFIER: _decode_subject_key_identifier, + x509.OID_KEY_USAGE: _decode_key_usage, + x509.OID_SUBJECT_ALTERNATIVE_NAME: _decode_subject_alt_name, + x509.OID_EXTENDED_KEY_USAGE: _decode_extended_key_usage, + x509.OID_AUTHORITY_KEY_IDENTIFIER: _decode_authority_key_identifier, + x509.OID_AUTHORITY_INFORMATION_ACCESS: ( _decode_authority_information_access ), - (x509.OID_CERTIFICATE_POLICIES, _decode_certificate_policies), - (x509.OID_CRL_DISTRIBUTION_POINTS, _decode_crl_distribution_points), - (x509.OID_OCSP_NO_CHECK, _decode_ocsp_no_check), - (x509.OID_INHIBIT_ANY_POLICY, _decode_inhibit_any_policy), - (x509.OID_ISSUER_ALTERNATIVE_NAME, _decode_issuer_alt_name), - ] + x509.OID_CERTIFICATE_POLICIES: _decode_certificate_policies, + x509.OID_CRL_DISTRIBUTION_POINTS: _decode_crl_distribution_points, + x509.OID_OCSP_NO_CHECK: _decode_ocsp_no_check, + x509.OID_INHIBIT_ANY_POLICY: _decode_inhibit_any_policy, + x509.OID_ISSUER_ALTERNATIVE_NAME: _decode_issuer_alt_name, + } ) _CSR_EXTENSION_PARSER = _X509ExtensionParser( ext_count=lambda backend, x: backend._lib.sk_X509_EXTENSION_num(x), get_ext=lambda backend, x, i: backend._lib.sk_X509_EXTENSION_value(x, i), - handlers=[ - (x509.OID_BASIC_CONSTRAINTS, _decode_basic_constraints), - ] + handlers={ + x509.OID_BASIC_CONSTRAINTS: _decode_basic_constraints, + } ) -- cgit v1.2.3