Changeset 5020:4f005301c820

Timestamp:

06/17/07 16:20:56 (6 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Message:

more clean ups.

Location:

sage/server/notebook

Files:

• avatars.py (modified) (3 diffs)
• guard.py (modified) (1 diff)
• twist.py (modified) (3 diffs)

sage/server/notebook/avatars.py

@@ -69 +69 @@
             log.msg("=== Returning anonymous credentials.")
             return defer.succeed(checkers.ANONYMOUS)
-            #return defer.fail(credError.UnauthorizedLogin("No such user"))
-
 
 class PasswordFileChecker(PasswordDictChecker):
@@ -84 +82 @@
         
         self.password_file = password_file
+        self.load_passwords()
         
+    def load_passwords(self):
         passwords = {}
-        if not os.path.exists(password_file):
-            open(password_file,'w').close()
-        f = open(password_file).readlines()
+        if not os.path.exists(self.password_file):
+            open(self.password_file,'w').close()
+        f = open(self.password_file).readlines()
         for line in f:
             username, password, email, account_type = line.split(':')
@@ -113 +113 @@
         else:
             return True
-            
+    
+    def requestAvatarId(self, credentials):
+        self.load_passwords()
+        log.msg("=== requestAvatarId ===")
+        username = credentials.username
+        log.msg("un: %s, pw: %s"%(credentials.username, credentials.password))
+        if self.passwords.has_key(username):
+            log.msg("password.has_key(%s)"%username)
+            password = self.passwords[username]
+            if credentials.password == password:
+                return defer.succeed(username)
+            else:
+                log.msg("=== %s entered the wrong password" % username)
+                log.msg("=== Returning anonymous credentials.")
+                return defer.succeed(checkers.ANONYMOUS)
+        else:
+            log.msg("=== Returning anonymous credentials.")
+            return defer.succeed(checkers.ANONYMOUS)
+
 class LoginSystem(object):
     implements(portal.IRealm)

sage/server/notebook/guard.py

@@ -271 +271 @@
     
     def _loginFailure(self, *x): #TODO    
+        log.msg("=== _loginFailure ===")
+        
         print x
                  

sage/server/notebook/twist.py

@@ -10 +10 @@
 
 from sage.misc.misc import SAGE_EXTCODE, DOT_SAGE, walltime
+from sage.server.notebook.avatars import PasswordFileChecker
 
 p = os.path.join
@@ -729 +730 @@
     
 class AnonymousToplevel(Toplevel):
-    from sage.server.notebook.avatars import PasswordFileChecker
     addSlash = True
     child_register = RegistrationPage(PasswordFileChecker('passwords.txt'))
@@ -748 +748 @@
     child_upload = Upload()
     child_upload_worksheet = UploadWorksheet()
+    child_register = RegistrationPage(PasswordFileChecker('passwords.txt'))
     
     def render(self, ctx):