Changeset 2484

Timestamp:

Sep 28, 2009, 3:04:32 AM (15 years ago)

Author:

quentin

Message:

Unauthenticated front page

Location:

package_branches/invirt-web/cherrypy/code

Files:

• main.fcgi (modified) (3 diffs)
• main.py (modified) (2 diffs)
• templates/unauth.mako (moved) (moved from package_branches/invirt-web/cherrypy/code/templates/unauth.tmpl) (3 diffs)

package_branches/invirt-web/cherrypy/code/main.fcgi

@@ -5 +5 @@
 import os
 import sys
-from main import InvirtWeb
+from main import InvirtWeb, InvirtUnauthWeb
 
 dev = False
@@ -26 +26 @@
          })
     app.merge(conf_file)
+    unauthApp = cherrypy.tree.mount(InvirtUnauthWeb(),
+                                    '/unauth',
+                                    {'/': {'tools.invirtwebstate.on': True}})
+    unauthApp.merge(conf_file)
     cherrypy.config.update(conf_file)
 
@@ -35 +39 @@
         cherrypy.engine.start(blocking=False)
         from flup.server.fcgi import WSGIServer
-        server = WSGIServer(app)
+        server = WSGIServer(cherrypy.tree)
         server.run()

package_branches/invirt-web/cherrypy/code/main.py

@@ -53 +53 @@
 from view import View
 import ajaxterm
+
+class InvirtUnauthWeb(View):
+    @cherrypy.expose
+    @cherrypy.tools.mako(filename="/unauth.mako")
+    def index(self):
+        return {'simple': True}
 
 class InvirtWeb(View):
@@ -710 +716 @@
     return d
 
-def unauthFront(_, _2, _3, fields):
-    """Information for unauth'd users."""
-    return templates.unauth(searchList=[{'simple' : True, 
-            'hostname' : socket.getfqdn()}])
-
-mapping = dict(
-               unauth=unauthFront)
+mapping = dict()
 
 def printHeaders(headers):

package_branches/invirt-web/cherrypy/code/templates/unauth.mako

@@ -1 @@
-#from skeleton import skeleton
-#extends skeleton
+<%page expression_filter="h"/>
+<%inherit file="skeleton.mako" />
 
+<%def name="title()">
+Intro
+</%def>
 
-#def title
-Intro
-#end def
-
-#def body
 <h1>XVM &mdash; Virtual Servers for MIT </h1>
 
@@ -19 +17 @@
 <p>MIT users:</p>
 <blockquote><big><a
-href="https://$hostname/"><strong><font color="green">&rarr;</font> Log in to XVM now</strong>
+href="https://${config.web.hostname}/"><strong><font color="green">&rarr;</font> Log in to XVM now</strong>
 </a></big></blockquote>
 <p>You'll need an <a href="http://ca.mit.edu/">MIT personal
@@ -57 +55 @@
 <p>Questions and feedback welcome at <a
 href="mailto:xvm@mit.edu">xvm@mit.edu</a>.</p>
-
-#end def