Encrypt the session data by default

Before we just encrypted the password, now we encrypt the whole session
information by default.

1 files changed, 1 insertions, 28 deletions

diff --git a/accounts/utils/__init__.py b/accounts/utils/__init__.py
index 8f68733..1538fd6 100644
--- a/accounts/utils/__init__.py
+++ b/accounts/utils/__init__.py
@@ -6,13 +6,11 @@ import pickle
 import re
 import struct
 from base64 import urlsafe_b64encode, urlsafe_b64decode
-from Crypto.Cipher import AES
 from functools import wraps
 from flask import current_app, flash, g, redirect, render_template, request, session
 from flask import url_for as flask_url_for
 from hashlib import sha1
 from itertools import izip
-from random import randint
 from time import time
 from werkzeug.exceptions import Forbidden
 from wtforms.validators import Regexp, ValidationError
@@ -78,7 +76,7 @@ def login_user(username, password):
         return False
 
     session['username'] = username
-    session['password'] = encrypt_password(password)
+    session['password'] = password
 
     return True
 
@@ -89,31 +87,6 @@ def logout_user():
     g.user = None
 
 
-def pad(s, numbytes=32, padding='\0'):
-    return s + (numbytes - len(s) % numbytes) * padding
-
-def encrypt_password(password):
-    """
-    Encrypt the given password with `config.PASSWORD_ENCRYPTION_KEY`.
-    The key must be 32 bytes long.
-    """
-    assert len(current_app.config['PASSWORD_ENCRYPTION_KEY']) == 32
-
-    password = ensure_utf8(password)
-
-    iv = ''.join(chr(randint(0, 0xff)) for i in range(16))
-    encryptor = AES.new(current_app.config['PASSWORD_ENCRYPTION_KEY'], AES.MODE_CBC, iv)
-    return iv + encryptor.encrypt(pad(password))
-
-def decrypt_password(ciphertext):
-    """
-    Decrypt the given password with `config.PASSWORD_ENCRYPTION_KEY`.
-    """
-    iv = ciphertext[:16]
-    encryptor = AES.new(current_app.config['PASSWORD_ENCRYPTION_KEY'], AES.MODE_CBC, iv)
-    return encryptor.decrypt(ciphertext[16:]).rstrip('\0').decode('utf8')
-
-
 def make_confirmation(realm, data):
     """
     Create a confirmation token e.g. for confirmation mails.