Changeset 867 for trunk/packages

Timestamp:

Aug 4, 2008, 11:20:25 PM (16 years ago)

Author:

price

Message:

rename overlord -> admin mode

Location:

trunk/packages/sipb-xen-www

Files:

• code/main.py (modified) (2 diffs)
• code/validation.py (modified) (3 diffs)
• code/webcommon.py (modified) (1 diff)
• files/etc/apache2/sites-available/default (modified) (1 diff)
• files/etc/apache2/sites-available/ssl (modified) (1 diff)

trunk/packages/sipb-xen-www/code/main.py

@@ -596 +596 @@
     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)
+        raise InvalidInput('username', username,
+                           'Not in admin group %s.' % 'system:xvm')
+    newstate = State(username, isadmin=True)
     newstate.environ = state.environ
     return handler(username, newstate, path, fields)
@@ -619 +620 @@
                help=helpHandler,
                unauth=unauthFront,
-               overlord=overlord,
+               admin=admin,
                errortest=throwError)
 

trunk/packages/sipb-xen-www/code/validation.py

@@ -126 +126 @@
 def haveAccess(user, state, machine):
     """Return whether a user has administrative access to a machine"""
-    return state.overlord or user in cache_acls.accessList(machine)
+    return state.isadmin or user in cache_acls.accessList(machine)
 
 def owns(user, machine):
@@ -158 +158 @@
                            "Minimum %s MiB" % MIN_MEMORY_SINGLE)
     max_val = maxMemory(owner, g, machine, on)
-    if not g.overlord and memory > max_val:
+    if not g.isadmin and memory > max_val:
         raise InvalidInput('memory', memory,
                            'Maximum %s MiB for %s' % (max_val, owner))
@@ -167 +167 @@
     try:
         disk = float(disk)
-        if not g.overlord and disk > maxDisk(owner, machine):
+        if not g.isadmin and disk > maxDisk(owner, machine):
             raise InvalidInput('disk', disk,
                                "Maximum %s G" % maxDisk(owner, machine))

trunk/packages/sipb-xen-www/code/webcommon.py

@@ -39 +39 @@
 class State(object):
     """State for a request"""
-    def __init__(self, user, overlord=False):
+    def __init__(self, user, isadmin=False):
         self.username = user
-        self.overlord = overlord
+        self.isadmin = isadmin
 
     def getMachines(self):
-        if self.overlord:
+        if self.isadmin:
             return Machine.select()
         else:

trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/default

@@ -13 +13 @@
         RewriteEngine On
         RewriteRule ^/static(.*) - [L]
-        RewriteRule ^/overlord/static(.*) /static/$1 [L]
+        RewriteRule ^/admin/static(.*) /static/$1 [L]
         RewriteRule ^/trac.fcgi(.*) - [L]
         RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L]

trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/ssl

@@ -20 +20 @@
         RewriteRule ^/favicon.ico - [L]
         RewriteRule ^/static(.*) - [L]
-        RewriteRule ^/overlord/static(.*) /static/$1 [L]
+        RewriteRule ^/admin/static(.*) /static/$1 [L]
         RewriteRule ^/trac.fcgi(.*) - [L]
         RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L]