Combine the salt and pepper

Author: rhettinger

pubsub/pubsub.py

@@ -74,8 +74,7 @@ def search(phrase: str, limit: Optional[int] = None) -> List[Post]:
 def hash_password(password: str, salt: Optional[bytes] = None) -> HashAndSalt:
     pepper = b'alchemists discovered that gold came from earth air fire and water'
     salt = salt or secrets.token_bytes(16)
-    salted_pass = salt + password.encode('utf-8')
-    return hashlib.pbkdf2_hmac('sha512', salted_pass, pepper, 100000), salt
+    return hashlib.pbkdf2_hmac('sha512', password.encode(), salt+pepper, 100000), salt
 
 def set_user(user: User, displayname: str, email: str, password: str, bio: Optional[str]=None, photo: Optional[str]=None) -> None:
     user = intern(user)

pubsub/webapp.py

@@ -93,4 +93,4 @@ def fetch_static(filename):
     return static_file(filename, root='static')
 
 if __name__ == '__main__':
-    run(host='localhost', port=8080)
+    run(host='localhost', port=8081)