From 0d9bdcf834cbe9ec4e1354bc7e912f197bf72d7b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 22 Nov 2012 00:47:00 +0000 Subject: [PATCH] web_server: Load SWAT if it is available. Reviewed-by: Matthieu Patou Autobuild-User(master): Matthieu Patou Autobuild-Date(master): Fri Nov 23 01:39:38 CET 2012 on sn-devel-104 --- .../scripting/python/samba/web_server/__init__.py | 34 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/source4/scripting/python/samba/web_server/__init__.py b/source4/scripting/python/samba/web_server/__init__.py index ed3c7dee69b..78ce953c612 100644 --- a/source4/scripting/python/samba/web_server/__init__.py +++ b/source4/scripting/python/samba/web_server/__init__.py @@ -19,9 +19,8 @@ # along with this program. If not, see . # - - def render_placeholder(environ, start_response): + """Send the user a simple placeholder about missing SWAT.""" status = '200 OK' response_headers = [('Content-type', 'text/html')] start_response(status, response_headers) @@ -41,7 +40,36 @@ def render_placeholder(environ, start_response): yield "\n" -__call__ = render_placeholder +def __call__(environ, start_response): + """Handle a HTTP request.""" + from wsgiref.util import application_uri, shift_path_info + from urlparse import urljoin + + try: + import swat + except ImportError, e: + print "NO SWAT: %r" % e + have_swat = False + else: + have_swat = True + + orig_path = environ['PATH_INFO'] + name = shift_path_info(environ) + + if name == "": + if have_swat: + start_response('301 Redirect', + [('Location', urljoin(application_uri(environ), 'swat')),]) + return [] + else: + return render_placeholder(environ, start_response) + elif have_swat and name == "swat": + return swat.__call__(environ, start_response) + else: + status = '404 Not found' + response_headers = [('Content-type', 'text/html')] + start_response(status, response_headers) + return ["The path %s (%s) was not found" % (orig_path, name)] if __name__ == '__main__': -- 2.11.4.GIT