X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/c5de4def3ee8581b5fdafe9bc34f1520e4bc8252..aea62528d39fcdeaf94b440ef3e14992cb79f704:/code/main.py?ds=inline

diff --git a/code/main.py b/code/main.py
index e119e0e..5c30714 100755
--- a/code/main.py
+++ b/code/main.py
@@ -13,8 +13,8 @@ import sys
 import time
 import urllib
 import socket
+import cherrypy
 from StringIO import StringIO
-
 def revertStandardError():
     """Move stderr to stdout, and return the contents of the old stderr."""
     errio = sys.stderr
@@ -45,6 +45,17 @@ from invirt.database import Machine, CDROM, session, connect, MachineAccess, Typ
 from invirt.config import structs as config
 from invirt.common import InvalidInput, CodeError
 
+from view import View
+
+class InvirtWeb(View):
+    def __init__(self):
+        super(self.__class__,self).__init__()
+        connect()
+
+    @cherrypy.expose
+    def helloworld(self):
+        return "Hello world!"
+
 def pathSplit(path):
     if path.startswith('/'):
         path = path[1:]
@@ -615,9 +626,9 @@ def admin(username, state, path, fields):
         return ({'Status': '303 See Other',
                  'Location': 'admin/'},
                 "You shouldn't see this message.")
-    if not username in getAfsGroupMembers(config.web.adminacl, 'athena.mit.edu'):
+    if not username in getAfsGroupMembers(config.adminacl, 'athena.mit.edu'):
         raise InvalidInput('username', username,
-                           'Not in admin group %s.' % config.web.adminacl)
+                           'Not in admin group %s.' % config.adminacl)
     newstate = State(username, isadmin=True)
     newstate.environ = state.environ
     return handler(username, newstate, path, fields)