X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/e11cdd5476f7f1a456ece94862c211a1b83b093c..874a30391973642d3ff350f977c1ac705644fbb0:/code/main.py

diff --git a/code/main.py b/code/main.py
index a9e54a8..f6f0bff 100755
--- a/code/main.py
+++ b/code/main.py
@@ -39,9 +39,8 @@ import cache_acls
 from webcommon import InvalidInput, CodeError, State
 import controls
 from getafsgroups import getAfsGroupMembers
-import sipb_xen_database
 from invirt import database
-from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
+from invirt.database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
 from invirt.config import structs as config
 
 def pathSplit(path):
@@ -85,7 +84,8 @@ def makeErrorPre(old, addition):
     else:
         return '<p>STDERR:</p><pre>' + str(addition) + '</pre>'
 
-Template.sipb_xen_database = sipb_xen_database
+Template.database = database
+Template.config = config
 Template.helppopup = staticmethod(helppopup)
 Template.err = None
 
@@ -595,14 +595,15 @@ def unauthFront(_, _2, _3, fields):
     """Information for unauth'd users."""
     return templates.unauth(searchList=[{'simple' : True}])
 
-def overlord(username, state, path, fields):
+def admin(username, state, path, fields):
     if path == '':
         return ({'Status': '303 See Other',
-                 'Location': 'overlord/'},
+                 'Location': 'admin/'},
                 "You shouldn't see this message.")
-    if not username in getAfsGroupMembers('system:xvm', 'athena.mit.edu'):
-        raise InvalidInput('username', username, 'Not an overlord.')
-    newstate = State(username, overlord=True)
+    if not username in getAfsGroupMembers(config.web.adminacl, 'athena.mit.edu'):
+        raise InvalidInput('username', username,
+                           'Not in admin group %s.' % config.web.adminacl)
+    newstate = State(username, isadmin=True)
     newstate.environ = state.environ
     return handler(username, newstate, path, fields)
 
@@ -618,7 +619,8 @@ mapping = dict(list=listVms,
                create=create,
                help=helpHandler,
                unauth=unauthFront,
-               overlord=overlord,
+               admin=admin,
+               overlord=admin,
                errortest=throwError)
 
 def printHeaders(headers):
@@ -678,7 +680,7 @@ class App:
 
     def __iter__(self):
         start_time = time.time()
-        sipb_xen_database.clear_cache()
+        database.clear_cache()
         sys.stderr = StringIO()
         fields = cgi.FieldStorage(fp=self.environ['wsgi.input'], environ=self.environ)
         operation = self.environ.get('PATH_INFO', '')