mirror of
https://github.com/quay/quay.git
synced 2026-01-26 06:21:37 +03:00
* Convert all Python2 to Python3 syntax. * Removes oauth2lib dependency * Replace mockredis with fakeredis * byte/str conversions * Removes nonexisting __nonzero__ in Python3 * Python3 Dockerfile and related * [PROJQUAY-98] Replace resumablehashlib with rehash * PROJQUAY-123 - replace gpgme with python3-gpg * [PROJQUAY-135] Fix unhashable class error * Update external dependencies for Python 3 - Move github.com/app-registry/appr to github.com/quay/appr - github.com/coderanger/supervisor-stdout - github.com/DevTable/container-cloud-config - Update to latest mockldap with changes applied from coreos/mockldap - Update dependencies in requirements.txt and requirements-dev.txt * Default FLOAT_REPR function to str in json encoder and removes keyword assignment True, False, and str were not keywords in Python2... * [PROJQUAY-165] Replace package `bencode` with `bencode.py` - Bencode is not compatible with Python 3.x and is no longer maintained. Bencode.py appears to be a drop-in replacement/fork that is compatible with Python 3. * Make sure monkey.patch is called before anything else ( * Removes anunidecode dependency and replaces it with text_unidecode * Base64 encode/decode pickle dumps/loads when storing value in DB Base64 encodes/decodes the serialized values when storing them in the DB. Also make sure to return a Python3 string instead of a Bytes when coercing for db, otherwise, Postgres' TEXT field will convert it into a hex representation when storing the value. * Implement __hash__ on Digest class In Python 3, if a class defines __eq__() but not __hash__(), its instances will not be usable as items in hashable collections (e.g sets). * Remove basestring check * Fix expected message in credentials tests * Fix usage of Cryptography.Fernet for Python3 (#219) - Specifically, this addresses the issue where Byte<->String conversions weren't being applied correctly. * Fix utils - tar+stream layer format utils - filelike util * Fix storage tests * Fix endpoint tests * Fix workers tests * Fix docker's empty layer bytes * Fix registry tests * Appr * Enable CI for Python 3.6 * Skip buildman tests Skip buildman tests while it's being rewritten to allow ci to pass. * Install swig for CI * Update expected exception type in redis validation test * Fix gpg signing calls Fix gpg calls for updated gpg wrapper, and add signing tests. * Convert / to // for Python3 integer division * WIP: Update buildman to use asyncio instead of trollius. This dependency is considered deprecated/abandoned and was only used as an implementation/backport of asyncio on Python 2.x This is a work in progress, and is included in the PR just to get the rest of the tests passing. The builder is actually being rewritten. * Target Python 3.8 * Removes unused files - Removes unused files that were added accidentally while rebasing - Small fixes/cleanup - TODO tasks comments * Add TODO to verify rehash backward compat with resumablehashlib * Revert "[PROJQUAY-135] Fix unhashable class error" and implements __hash__ instead. This reverts commit 735e38e3c1d072bf50ea864bc7e119a55d3a8976. Instead, defines __hash__ for encryped fields class, using the parent field's implementation. * Remove some unused files ad imports Co-authored-by: Kenny Lee Sin Cheong <kenny.lee@redhat.com> Co-authored-by: Tom McKay <thomasmckay@redhat.com>
107 lines
2.9 KiB
Python
107 lines
2.9 KiB
Python
from fnmatch import fnmatch
|
|
|
|
import OpenSSL
|
|
|
|
|
|
class CertInvalidException(Exception):
|
|
"""
|
|
Exception raised when a certificate could not be parsed/loaded.
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
class KeyInvalidException(Exception):
|
|
"""
|
|
Exception raised when a key could not be parsed/loaded or successfully applied to a cert.
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
def load_certificate(cert_contents):
|
|
"""
|
|
Loads the certificate from the given contents and returns it or raises a CertInvalidException on
|
|
failure.
|
|
"""
|
|
try:
|
|
cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, cert_contents)
|
|
return SSLCertificate(cert)
|
|
except OpenSSL.crypto.Error as ex:
|
|
raise CertInvalidException(ex.args[0][0][2])
|
|
|
|
|
|
_SUBJECT_ALT_NAME = b"subjectAltName"
|
|
|
|
|
|
class SSLCertificate(object):
|
|
"""
|
|
Helper class for easier working with SSL certificates.
|
|
"""
|
|
|
|
def __init__(self, openssl_cert):
|
|
self.openssl_cert = openssl_cert
|
|
|
|
def validate_private_key(self, private_key_path):
|
|
"""
|
|
Validates that the private key found at the given file path applies to this certificate.
|
|
|
|
Raises a KeyInvalidException on failure.
|
|
"""
|
|
context = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
|
|
context.use_certificate(self.openssl_cert)
|
|
|
|
try:
|
|
context.use_privatekey_file(private_key_path)
|
|
context.check_privatekey()
|
|
except OpenSSL.SSL.Error as ex:
|
|
raise KeyInvalidException(ex.args[0][0][2])
|
|
|
|
def matches_name(self, check_name):
|
|
"""
|
|
Returns true if this SSL certificate matches the given DNS hostname.
|
|
"""
|
|
for dns_name in self.names:
|
|
if fnmatch(check_name, dns_name):
|
|
return True
|
|
|
|
return False
|
|
|
|
@property
|
|
def expired(self):
|
|
"""
|
|
Returns whether the SSL certificate has expired.
|
|
"""
|
|
return self.openssl_cert.has_expired()
|
|
|
|
@property
|
|
def common_name(self):
|
|
"""
|
|
Returns the defined common name for the certificate, if any.
|
|
"""
|
|
return self.openssl_cert.get_subject().commonName
|
|
|
|
@property
|
|
def names(self):
|
|
"""
|
|
Returns all the DNS named to which the certificate applies.
|
|
|
|
May be empty.
|
|
"""
|
|
dns_names = set()
|
|
common_name = self.common_name
|
|
if common_name is not None:
|
|
dns_names.add(common_name)
|
|
|
|
# Find the DNS extension, if any.
|
|
for i in range(0, self.openssl_cert.get_extension_count()):
|
|
ext = self.openssl_cert.get_extension(i)
|
|
if ext.get_short_name() == _SUBJECT_ALT_NAME:
|
|
value = str(ext)
|
|
for san_name in value.split(","):
|
|
san_name_trimmed = san_name.strip()
|
|
if san_name_trimmed.startswith("DNS:"):
|
|
dns_names.add(san_name_trimmed[4:])
|
|
|
|
return dns_names
|