a pass on some explicit encode calls that are obviously wrong in python3; some may...

[plcapi.git] / PLC / Auth.py

diff --git a/PLC/Auth.py b/PLC/Auth.py
index 33f60c2..927850e 100644 (file)
--- a/PLC/Auth.py
+++ b/PLC/Auth.py
@@ -6,10 +6,7 @@
 #
 
 import crypt
-try:
-    from hashlib import sha1 as sha
-except ImportError:
-    import sha
+from hashlib import sha1 as sha
 import hmac
 import time
 import os
@@ -23,7 +20,7 @@ from PLC.Sessions import Session, Sessions
 from PLC.Peers import Peer, Peers
 from PLC.Keys import Keys
 from PLC.Boot import notify_owners
-
+from PLC.Logger import logger
 
 class Auth(Parameter):
     """
@@ -184,12 +181,6 @@ class BootAuth(Auth):
     PlanetLab version 3.x node authentication structure. Used by the
     Boot Manager to make authenticated calls to the API based on a
     unique node key or boot nonce value.
-
-    The original parameter serialization code did not define the byte
-    encoding of strings, or the string encoding of all other types. We
-    define the byte encoding to be UTF-8, and the string encoding of
-    all other types to be however Python version 2.3 unicode() encodes
-    them.
     """
 
     def __init__(self):
@@ -245,10 +236,7 @@ class BootAuth(Auth):
             args.sort()
             msg = "[" + "".join(args) + "]"
 
-            # We encode in UTF-8 before calculating the HMAC, which is
-            # an 8-bit algorithm.
-            # python 2.6 insists on receiving a 'str' as opposed to a 'unicode'
-            digest = hmac.new(str(key), msg.encode('utf-8'), sha).hexdigest()
+            digest = hmac.new(key.encode('utf-8'), msg.encode('utf-8'), sha).hexdigest()
 
             if digest != auth['value']:
                 raise PLCAuthenticationFailure(
@@ -299,9 +287,11 @@ class PasswordAuth(Auth):
         assert 'Username' in auth
 
         # Get record (must be enabled)
+        normalized = auth['Username'].lower()
         persons = Persons(method.api, {
-                          'email': auth['Username'].lower(), 'enabled': True, 'peer_id': None})
+                          'email': normalized, 'enabled': True, 'peer_id': None})
         if len(persons) != 1:
+            logger.info(f"PasswordAuth failed with {normalized}, got {len(persons)} matches")
             raise PLCAuthenticationFailure("PasswordAuth: No such account")
 
         person = persons[0]