mirror of
https://github.com/quay/quay.git
synced 2026-01-27 18:42:52 +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>
48 lines
1.4 KiB
Python
48 lines
1.4 KiB
Python
import base64
|
|
|
|
from cryptography.fernet import Fernet, InvalidToken
|
|
|
|
|
|
def encrypt_string(string, key):
|
|
"""
|
|
Encrypts a string with the specified key.
|
|
|
|
The key must be 32 raw bytes.
|
|
"""
|
|
f = Fernet(key)
|
|
|
|
# Fernet() works only on byte objects. Convert the string to bytes.
|
|
unencrypted_bytes = string.encode()
|
|
encrypted_bytes = f.encrypt(unencrypted_bytes)
|
|
|
|
# Fernet() returns a byte object. Convert it to a string before returning.
|
|
encrypted_string = encrypted_bytes.decode()
|
|
return encrypted_string
|
|
|
|
|
|
def decrypt_string(string, key, ttl=None):
|
|
"""
|
|
Decrypts an encrypted string with the specified key.
|
|
|
|
The key must be 32 raw bytes.
|
|
"""
|
|
f = Fernet(key)
|
|
|
|
# Fernet() works only on byte objects. Convert the string to bytes before decrypting.
|
|
encrypted_bytes = string.encode() # str -> bytes
|
|
|
|
try:
|
|
decrypted_bytes = f.decrypt(encrypted_bytes, ttl=ttl)
|
|
except InvalidToken:
|
|
"""
|
|
From the the Cryptography's library documentation:
|
|
|
|
If the token is in any way invalid, this exception is raised.
|
|
A token may be invalid for a number of reasons: it is older than the
|
|
ttl, it is malformed, or it does not have a valid signature.
|
|
"""
|
|
return None # TODO(kmullins): Shall we log this case? Is it expected?
|
|
|
|
decrypted_string = decrypted_bytes.decode() # bytes -> str
|
|
return decrypted_string
|