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>
98 lines
2.7 KiB
Python
98 lines
2.7 KiB
Python
import re
|
|
import os.path
|
|
import hashlib
|
|
|
|
|
|
DIGEST_PATTERN = r"([A-Za-z0-9_+.-]+):([A-Fa-f0-9]+)"
|
|
REPLACE_WITH_PATH = re.compile(r"[+.]")
|
|
REPLACE_DOUBLE_SLASHES = re.compile(r"/+")
|
|
|
|
|
|
class InvalidDigestException(RuntimeError):
|
|
pass
|
|
|
|
|
|
class Digest(object):
|
|
DIGEST_REGEX = re.compile(DIGEST_PATTERN)
|
|
|
|
def __init__(self, hash_alg, hash_bytes):
|
|
self._hash_alg = hash_alg
|
|
self._hash_bytes = hash_bytes
|
|
|
|
def __str__(self):
|
|
return "{0}:{1}".format(self._hash_alg, self._hash_bytes)
|
|
|
|
def __eq__(self, rhs):
|
|
return isinstance(rhs, Digest) and str(self) == str(rhs)
|
|
|
|
def __hash__(self):
|
|
return hash((self._hash_alg, self._hash_bytes))
|
|
|
|
@staticmethod
|
|
def parse_digest(digest):
|
|
"""
|
|
Returns the digest parsed out to its components.
|
|
"""
|
|
match = Digest.DIGEST_REGEX.match(digest)
|
|
if match is None or match.end() != len(digest):
|
|
raise InvalidDigestException("Not a valid digest: %s", digest)
|
|
|
|
return Digest(match.group(1), match.group(2))
|
|
|
|
@property
|
|
def hash_alg(self):
|
|
return self._hash_alg
|
|
|
|
@property
|
|
def hash_bytes(self):
|
|
return self._hash_bytes
|
|
|
|
|
|
def content_path(digest):
|
|
"""
|
|
Returns a relative path to the parsed digest.
|
|
"""
|
|
parsed = Digest.parse_digest(digest)
|
|
components = []
|
|
|
|
# Generate a prefix which is always two characters, and which will be filled with leading zeros
|
|
# if the input does not contain at least two characters. e.g. ABC -> AB, A -> 0A
|
|
prefix = parsed.hash_bytes[0:2].zfill(2)
|
|
pathish = REPLACE_WITH_PATH.sub("/", parsed.hash_alg)
|
|
normalized = REPLACE_DOUBLE_SLASHES.sub("/", pathish).lstrip("/")
|
|
components.extend([normalized, prefix, parsed.hash_bytes])
|
|
return os.path.join(*components)
|
|
|
|
|
|
def sha256_digest(content):
|
|
"""
|
|
Returns a sha256 hash of the content bytes in digest form.
|
|
"""
|
|
assert isinstance(content, bytes)
|
|
|
|
def single_chunk_generator():
|
|
yield content
|
|
|
|
return sha256_digest_from_generator(single_chunk_generator())
|
|
|
|
|
|
def sha256_digest_from_generator(content_generator):
|
|
"""
|
|
Reads all of the data from the iterator and creates a sha256 digest from the content.
|
|
"""
|
|
digest = hashlib.sha256()
|
|
for chunk in content_generator:
|
|
digest.update(chunk)
|
|
return "sha256:{0}".format(digest.hexdigest())
|
|
|
|
|
|
def sha256_digest_from_hashlib(sha256_hash_obj):
|
|
return "sha256:{0}".format(sha256_hash_obj.hexdigest())
|
|
|
|
|
|
def digests_equal(lhs_digest_string, rhs_digest_string):
|
|
"""
|
|
Parse and compare the two digests, returns True if the digests are equal, False otherwise.
|
|
"""
|
|
return Digest.parse_digest(lhs_digest_string) == Digest.parse_digest(rhs_digest_string)
|