Ticket #4309: sage-4309_2.patch

sage/server/notebook/avatars.py

@@ -12 +12 @@
 from   random import randint, choice
 
 import twist
-import kerberos
 from twisted.cred import portal, checkers, credentials, error as credError
 from twisted.internet import protocol, defer
 from zope.interface import Interface, implements
 from twisted.web2 import iweb
 from twisted.python import log
+
+krb_data = [None, None]
+try:
+    import kerberos
+except ImportError:
+    if krb_data[0] and krb_data[1]:
+        raise ImportError, 'Must have kerberos installed in order to use kerberos authentification.'
+    pass
 
 def user_type(avatarId):
     """
@@ -83 +90 @@
         self.failure_type = failure_type
 
 class PasswordChecker(object):
-    krb_data = []
     implements(checkers.ICredentialsChecker)
     credentialInterfaces = (credentials.IUsernamePassword,)
 
@@ -106 +112 @@
         if username == 'COOKIESDISABLED':
             return defer.succeed(FailedLogin(username, failure_type = 'cookies'))
 
-        if self.krb_data[0] and self.krb_data[1]:
+        if krb_data[0] and krb_data[1]:
             try:
                 kerberos.checkPassword(username,password,
                                        self.krb_data[0], self.krb_data[1])

sage/server/notebook/run_notebook.py

@@ -224 +224 @@
 startup_checker = avatars.OneTimeTokenChecker()
 startup_checker.token = startup_token
 p.registerChecker(startup_checker)
-avatars.PasswordChecker.krb_data=%s 
+avatars.krb_data=%s 
 password_checker = avatars.PasswordChecker()
 p.registerChecker(password_checker)
 p.registerChecker(checkers.AllowAnonymousAccess())