X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python%2Fashd%2Fwsgidir.py;h=6bf00b65f58f0656c966c21d03910d2309670af1;hp=77f41fb3971a1ca5c6fe6ca743593f484eab2cde;hb=58ee5c4ab4ce9be692277b520de72735494bd9f7;hpb=e9817feefe4f2ed35ded74f0ec2323ed3d0c09e4 diff --git a/python/ashd/wsgidir.py b/python/ashd/wsgidir.py index 77f41fb..6bf00b6 100644 --- a/python/ashd/wsgidir.py +++ b/python/ashd/wsgidir.py @@ -1,46 +1,44 @@ """WSGI handler for serving chained WSGI modules from physical files -The WSGI handler in this module examines the SCRIPT_FILENAME variable -of the requests it handles -- that is, the physical file corresponding -to the request, as determined by the webserver -- determining what to -do with the request based on the extension of that file. - -By default, it handles files named `.wsgi' by compiling them into -Python modules and using them, in turn, as chained WSGI handlers, but -handlers for other extensions can be installed as well. - -When handling `.wsgi' files, the compiled modules are cached and -reused until the file is modified, in which case the previous module -is discarded and the new file contents are loaded into a new module in -its place. When chaining such modules, an object named `wmain' is -first looked for and called with no arguments if found. The object it -returns is then used as the WSGI application object for that module, -which is reused until the module is reloaded. If `wmain' is not found, -an object named `application' is looked for instead. If found, it is -used directly as the WSGI application object. +The WSGI handler in this module ensures that the SCRIPT_FILENAME +variable is properly set in every request and points out a file that +exists and is readable. It then dispatches the request in one of two +ways: If the header X-Ash-Python-Handler is set in the request, its +value is used as the name of a handler object to dispatch the request +to; otherwise, the file extension of the SCRIPT_FILENAME is used to +determine the handler object. + +The name of a handler object is specified as a string, which is split +along its last constituent dot. The part left of the dot is the name +of a module, which is imported; and the part right of the dot is the +name of an object in that module, which should be a callable adhering +to the WSGI specification. Alternatively, the module part may be +omitted (such that the name is a string with no dots), in which case +the handler object is looked up from this module. + +By default, this module will handle files with the extensions `.wsgi' +or `.wsgi2' using the `chain' handler, which chainloads such files and +runs them as independent WSGI applications. See its documentation for +details. This module itself contains both an `application' and a `wmain' object. If this module is used by ashd-wsgi(1) or scgi-wsgi(1) so that its wmain function is called, arguments can be specified to it to install handlers for other file extensions. Such arguments take the -form `.EXT=MODULE.HANDLER', where EXT is the file extension to be -handled, and the MODULE.HANDLER string is treated by splitting it -along its last constituent dot. The part left of the dot is the name -of a module which is imported, and the part right of the dot is the -name of an object in that module, which should be a callable adhering -to the WSGI specification. When called, this module will have made -sure that the WSGI environment contains the SCRIPT_FILENAME parameter -and that it is properly working. For example, the argument -`.fpy=my.module.foohandler' can be given to pass requests for `.fpy' -files to the function `foohandler' in the module `my.module' (which -must, of course, be importable). When writing such handler functions, -you will probably want to use the getmod() function in this module. +form `.EXT=HANDLER', where EXT is the file extension to be handled, +and HANDLER is a handler name, as described above. For example, the +argument `.fpy=my.module.foohandler' can be given to pass requests for +`.fpy' files to the function `foohandler' in the module `my.module' +(which must, of course, be importable). When writing such handler +functions, you may want to use the getmod() function in this module. """ -import os, threading, types +import sys, os, threading, types, logging, getopt import wsgiutil -__all__ = ["application", "wmain", "getmod", "cachedmod"] +__all__ = ["application", "wmain", "getmod", "cachedmod", "chain"] + +log = logging.getLogger("wsgidir") class cachedmod(object): """Cache entry for modules loaded by getmod() @@ -91,13 +89,13 @@ def getmod(path): if path in modcache: entry = modcache[path] else: - entry = cachedmod() + entry = [threading.Lock(), None] modcache[path] = entry finally: cachelock.release() - entry.lock.acquire() + entry[0].acquire() try: - if entry.mod is None or sb.st_mtime > entry.mtime: + if entry[1] is None or sb.st_mtime > entry[1].mtime: f = open(path, "r") try: text = f.read() @@ -107,11 +105,10 @@ def getmod(path): mod = types.ModuleType(mangle(path)) mod.__file__ = path exec code in mod.__dict__ - entry.mod = mod - entry.mtime = sb.st_mtime - return entry + entry[1] = cachedmod(mod, sb.st_mtime) + return entry[1] finally: - entry.lock.release() + entry[0].release() class handler(object): def __init__(self): @@ -145,14 +142,20 @@ class handler(object): if not "SCRIPT_FILENAME" in env: return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") path = env["SCRIPT_FILENAME"] - base = os.path.basename(path) - p = base.rfind('.') - if p < 0 or not os.access(path, os.R_OK): - return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") - ext = base[p + 1:] - if not ext in self.exts: + if not os.access(path, os.R_OK): return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") - return(self.exts[ext](env, startreq)) + if "HTTP_X_ASH_PYTHON_HANDLER" in env: + handler = self.resolve(env["HTTP_X_ASH_PYTHON_HANDLER"]) + else: + base = os.path.basename(path) + p = base.rfind('.') + if p < 0: + return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") + ext = base[p + 1:] + if not ext in self.exts: + return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") + handler = self.exts[ext] + return handler(env, startreq) def wmain(*argv): """Main function for ashd(7)-compatible WSGI handlers @@ -160,16 +163,42 @@ def wmain(*argv): Returns the `application' function. If any arguments are given, they are parsed according to the module documentation. """ - ret = handler() - for arg in argv: + hnd = handler() + ret = hnd.handle + + opts, args = getopt.getopt(argv, "V") + for o, a in opts: + if o == "-V": + import wsgiref.validate + ret = wsgiref.validate.validator(ret) + + for arg in args: if arg[0] == '.': p = arg.index('=') - ret.addext(arg[1:p], arg[p + 1:]) - return ret.handle + hnd.addext(arg[1:p], arg[p + 1:]) + return ret def chain(env, startreq): + """Chain-loading WSGI handler + + This handler loads requested files, compiles them and loads them + into their own modules. The compiled modules are cached and reused + until the file is modified, in which case the previous module is + discarded and the new file contents are loaded into a new module + in its place. When chaining such modules, an object named `wmain' + is first looked for and called with no arguments if found. The + object it returns is then used as the WSGI application object for + that module, which is reused until the module is reloaded. If + `wmain' is not found, an object named `application' is looked for + instead. If found, it is used directly as the WSGI application + object. + """ path = env["SCRIPT_FILENAME"] - mod = getmod(path) + try: + mod = getmod(path) + except Exception: + log.error("Exception occurred when loading %s" % path, exc_info=sys.exc_info()) + return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "Could not load WSGI handler.") entry = None if mod is not None: mod.lock.acquire()