Changeset e1ae8b3 for remit

Timestamp:

Apr 20, 2010, 7:36:22 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

fe43b8a

Parents:

734ef4f

git-author:

Alex Dehnert <adehnert@…> (04/20/10 19:36:22)

git-committer:

Alex Dehnert <adehnert@…> (04/20/10 19:36:22)

Message:

Do argument-length checking in SocketAuth?

File:

• remit/util/SocketAuth.py (modified) (3 diffs)

remit/util/SocketAuth.py

@@ -20 +20 @@
     """
     def authenticate(self, username, password, ):
-        (result,) = query("AUTHENTICATE", username, password, )
+        (result,) = query(1, "AUTHENTICATE", username, password, )
         print result
         if result == 'true':
@@ -39 +39 @@
                 # Should I do more error-checking? Yes.
                 # Do I care? No.
-                (first, last, email,) = query('FINGER', username)
+                (first, last, email,) = query(3, 'FINGER', username)
                 user.first_name = first
                 user.last_name = last
@@ -53 +53 @@
             return None
 
-
-def query(*args):
+def query(length, *args):
     conn = socket.socket(socket.AF_UNIX)
     conn.connect(settings.AUTH_SOCK)
     conn.send('\n'.join(args))
     conn.shutdown(socket.SHUT_WR)
-    result = conn.makefile().read().strip().split('\n')
+    result = conn.makefile().read().split('\n')
+    if(len(result)==length+1 and result[-1] == ''):
+        result = result[:-1]
+    if len(result) != length:
+        raise ValueError("Got return value of length %d to query '%s'; needed length %d" % (len(result), args[0], length, ))
     conn.close()
     return result