<NME> cryptutils.py
<BEF> """Crypto related utilities."""

import base64
import time

from cryptography.fernet import Fernet
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives.twofactor import InvalidToken
from cryptography.hazmat.primitives.twofactor.totp import TOTP
from cryptography.hazmat.primitives.hashes import SHA1

from django.conf import settings
from django.utils.crypto import get_random_string
from django.utils.encoding import smart_bytes, smart_text

    :param integer l: the key's length
    :return: a string
    """
    population = string.digits + string.letters + string.punctuation
    while True:
        key = "".join(random.sample(population * l, l))
        if len(key) == l:
    """Generate a new hexadecimal key."""
    chars = "abcdefABCDEF0123456789"
    return get_random_string(length, chars)


def _get_fernet():
    """Create a Fernet instance."""
    secret_key = base64.urlsafe_b64encode(smart_bytes(settings.SECRET_KEY[:32]))
    return Fernet(secret_key)


def encrypt(clear_value):
    """Encrypt a value using secret_key."""
    return smart_text(_get_fernet().encrypt(smart_bytes(clear_value)))


def decrypt(encrypted_value):
    """Decrypt a value using secret_key."""
    return smart_text(_get_fernet().decrypt(smart_bytes(encrypted_value)))


def get_password(request):
    """
    Retrieve and decrypt the users password from session storage.

    This is used by modoboa-webmail to allow the user to send/receive e-mails
    without having to ask the user for a password on each connection to the
    postfix/dovecot server.
    """
    try:
        return decrypt(request.session["password"])
    except KeyError:
        return None

<MSG> Remove problematic characters.

fix #898

<DFF> @@ -16,7 +16,8 @@ def random_key(l=16):
     :param integer l: the key's length
     :return: a string
     """
-    population = string.digits + string.letters + string.punctuation
+    punctuation = """!#$%&'()*+,-./:;<=>?@[]^_`{|}~"""
+    population = string.digits + string.letters + punctuation
     while True:
         key = "".join(random.sample(population * l, l))
         if len(key) == l:

Remove problematic characters.