Changeset 510 for trunk

Timestamp:

May 9, 2008, 2:10:57 AM (17 years ago)

Author:

price

Message:

front page for non-MIT users (and other unath'd)

Location:

trunk/packages/sipb-xen-www/code

Files:

• main.py (modified) (4 diffs)
• templates/__init__.py (modified) (1 diff)
• templates/unauth.tmpl (added)

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

@@ -601 +601 @@
     return templates.info(searchList=[d])
 
+def unauthFront(_, fields):
+    """Information for unauth'd users."""
+    return templates.unauth(searchList=[{'simple' : True}])
+
 mapping = dict(list=listVms,
                vnc=vnc,
@@ -607 +611 @@
                info=info,
                create=create,
-               help=helpHandler)
+               help=helpHandler,
+               unauth=unauthFront)
 
 def printHeaders(headers):
@@ -618 +623 @@
 def getUser():
     """Return the current user based on the SSL environment variables"""
-    username = os.environ['SSL_CLIENT_S_DN_Email'].split("@")[0]
-    return username
+    email = os.environ.get('SSL_CLIENT_S_DN_Email', None)
+    if email is None:
+        return None
+    return email.split("@")[0]
 
 def main(operation, user, fields):
@@ -675 +682 @@
         sys.exit(0)
 
+    if u is None:
+        operation = 'unauth'
+
     if operation.startswith('/'):
         operation = operation[1:]

trunk/packages/sipb-xen-www/code/templates/__init__.py

@@ -1 @@
-__all__ = 'info command error help invalid list vnc'.split()
+__all__ = 'info command error help invalid list unauth vnc'.split()
 for _name in __all__:
     try: