X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/01cd9908731ffbf23f58fde2b64153a35e950a80..1adbd730e54e17845e3f41b03d774f1a1d9b8255:/code/view.py

diff --git a/code/view.py b/code/view.py
index 6c9caf8..a3f2278 100644
--- a/code/view.py
+++ b/code/view.py
@@ -52,13 +52,10 @@ class MakoLoader(object):
                  imports=[]):
         cherrypy.request.lookup = lookup = self.get_lookup(directories, module_directory,
                                                            collection_size, imports)
-        
-        # Replace the current handler.
         cherrypy.request.template = t = lookup.get_template(filename)
         cherrypy.request.handler = MakoHandler(t, cherrypy.request.handler, content_type)
 
-main = MakoLoader()
-cherrypy.tools.mako = cherrypy.Tool('on_start_resource', main)
+cherrypy.tools.mako = cherrypy.Tool('on_start_resource', MakoLoader())
 
 def revertStandardError():
     """Move stderr to stdout, and return the contents of the old stderr."""
@@ -101,12 +98,9 @@ def jsonify_tool_callback(*args, **kwargs):
 
 cherrypy.tools.jsonify = cherrypy.Tool('before_finalize', jsonify_tool_callback, priority=30)
 
-def external_remote_user_login():
-    pass
-
 def require_login():
     """If the user isn't logged in, raise 403 with an error."""
-    if cherrypy.request.login is False:
+    if not cherrypy.request.login:
         raise cherrypy.HTTPError(403,
             "You are not authorized to access that resource")
 
@@ -125,14 +119,13 @@ def remote_user_login():
     environ = cherrypy.request.wsgi_environ
     user = environ.get('REMOTE_USER')
     if user is None:
+        cherrypy.request.login = None
         return
-    else:
-        cherrypy.request.login = None # clear what cherrypy put there
 
     if environ.get('AUTH_TYPE') == 'Negotiate':
         # Convert the krb5 principal into a krb4 username
         if not user.endswith('@%s' % config.kerberos.realm):
-            cherrypy.request.login = False # failed to login
+            cherrypy.request.login = None
         else:
             cherrypy.request.login = user.split('@')[0].replace('/', '.')
     else: