[Pybridge-commits] SF.net SVN: pybridge: [361] trunk/pybridge/pybridge/server/checker.py

[<umg...@us...>]

Revision: 361
          http://svn.sourceforge.net/pybridge/?rev=361&view=rev
Author:   umgangee
Date:     2007-03-13 05:27:29 -0700 (Tue, 13 Mar 2007)

Log Message:
-----------
Added checking of user account enabled flag.

Modified Paths:
--------------
    trunk/pybridge/pybridge/server/checker.py

Modified: trunk/pybridge/pybridge/server/checker.py
===================================================================
--- trunk/pybridge/pybridge/server/checker.py	2007-03-01 17:29:38 UTC (rev 360)
+++ trunk/pybridge/pybridge/server/checker.py	2007-03-13 12:27:29 UTC (rev 361)
@@ -25,7 +25,7 @@
 
 
 class Checker:
-    """"""
+    """A database-driven implementation of ICredentialsChecker."""
 
     implements(checkers.ICredentialsChecker)
 
@@ -45,11 +45,7 @@
 
         def passwordMatch(matched):
             if matched:
-                if credentials.username in self.users:
-                    # TODO: delete old session and use this one instead?
-                    return unauthorized("User is already logged in")
-                else:
-                    return credentials.username
+                return credentials.username
             else:
                 return unauthorized("Incorrect password for user")
 
@@ -59,6 +55,11 @@
         users = db.UserAccount.selectBy(username=credentials.username)
         if users.count() is 0:
             return unauthorized("User not known on server")
+        elif users[0].allowLogin is False:
+            return unauthorized("User account is disabled")
+        elif credentials.username in self.users:
+            # TODO: delete old session and use this one instead?
+            return unauthorized("User is already logged in")
 
         d = defer.maybeDeferred(credentials.checkPassword, users[0].password)
         d.addCallback(passwordMatch)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.