X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python%2Fashd-wsgi;h=d5438fabb3a08718f2ddddbfda61c2e4bd76c666;hp=e8f843544b636ec21b489d26f4339ea206cc7ce0;hb=fd0303c3260c6397b33912312af67e7a99523926;hpb=adb11d5f566968a0a12fcd225b5748bce09e0014 diff --git a/python/ashd-wsgi b/python/ashd-wsgi index e8f8435..d5438fa 100755 --- a/python/ashd-wsgi +++ b/python/ashd-wsgi @@ -1,24 +1,42 @@ #!/usr/bin/python -import sys, os, getopt, threading -import ashd.proto +import sys, os, getopt, socket, logging, time, signal +import ashd.util, ashd.serve +try: + import pdm.srv +except: + pdm = None def usage(out): - out.write("usage: ashd-wsgi [-hA] [-p MODPATH] HANDLER-MODULE [ARGS...]\n") + out.write("usage: ashd-wsgi [-hAL] [-m PDM-SPEC] [-p MODPATH] [-t REQUEST-HANDLER[:PAR[=VAL](,PAR[=VAL])...]] HANDLER-MODULE [ARGS...]\n") +hspec = "free", {} modwsgi_compat = False -opts, args = getopt.getopt(sys.argv[1:], "+hAp:") +setlog = True +opts, args = getopt.getopt(sys.argv[1:], "+hALp:t:l:m:") for o, a in opts: if o == "-h": usage(sys.stdout) sys.exit(0) elif o == "-p": sys.path.insert(0, a) + elif o == "-L": + setlog = False elif o == "-A": modwsgi_compat = True + elif o == "-l": + hspec = "free", {"max": a, "abort": "10"} + elif o == "-t": + hspec = ashd.serve.parsehspec(a) + elif o == "-m": + if pdm is not None: + pdm.srv.listen(a) if len(args) < 1: usage(sys.stderr) sys.exit(1) +if setlog: + logging.basicConfig(format="ashd-wsgi(%(name)s): %(levelname)s: %(message)s") +log = logging.getLogger("ashd-wsgi") try: handlermod = __import__(args[0], fromlist = ["dummy"]) @@ -36,7 +54,46 @@ else: sys.exit(1) handler = handlermod.application -def dowsgi(req): +cwd = os.getcwd() +def absolutify(path): + if path[0] != '/': + return os.path.join(cwd, path) + return path + +def unquoteurl(url): + buf = "" + i = 0 + while i < len(url): + c = url[i] + i += 1 + if c == '%': + if len(url) >= i + 2: + c = 0 + if '0' <= url[i] <= '9': + c |= (ord(url[i]) - ord('0')) << 4 + elif 'a' <= url[i] <= 'f': + c |= (ord(url[i]) - ord('a') + 10) << 4 + elif 'A' <= url[i] <= 'F': + c |= (ord(url[i]) - ord('A') + 10) << 4 + else: + raise ValueError("Illegal URL escape character") + if '0' <= url[i + 1] <= '9': + c |= ord(url[i + 1]) - ord('0') + elif 'a' <= url[i + 1] <= 'f': + c |= ord(url[i + 1]) - ord('a') + 10 + elif 'A' <= url[i + 1] <= 'F': + c |= ord(url[i + 1]) - ord('A') + 10 + else: + raise ValueError("Illegal URL escape character") + buf += chr(c) + i += 2 + else: + raise ValueError("Incomplete URL escape character") + else: + buf += c + return buf + +def mkenv(req): env = {} env["wsgi.version"] = 1, 0 for key, val in req.headers: @@ -46,7 +103,6 @@ def dowsgi(req): env["SERVER_PROTOCOL"] = req.ver env["REQUEST_METHOD"] = req.method env["REQUEST_URI"] = req.url - env["PATH_INFO"] = req.rest name = req.url p = name.find('?') if p >= 0: @@ -55,78 +111,93 @@ def dowsgi(req): else: env["QUERY_STRING"] = "" if name[-len(req.rest):] == req.rest: + # This is the same hack used in call*cgi. name = name[:-len(req.rest)] + try: + pi = unquoteurl(req.rest) + except: + pi = req.rest + if name == '/': + # This seems to be normal CGI behavior, but see callcgi.c for + # details. + pi = "/" + pi + name = "" env["SCRIPT_NAME"] = name + env["PATH_INFO"] = pi if "Host" in req: env["SERVER_NAME"] = req["Host"] + if "X-Ash-Server-Address" in req: env["SERVER_ADDR"] = req["X-Ash-Server-Address"] if "X-Ash-Server-Port" in req: env["SERVER_PORT"] = req["X-Ash-Server-Port"] if "X-Ash-Protocol" in req and req["X-Ash-Protocol"] == "https": env["HTTPS"] = "on" if "X-Ash-Address" in req: env["REMOTE_ADDR"] = req["X-Ash-Address"] - if "Content-Type" in req: env["CONTENT_TYPE"] = req["Content-Type"] - if "Content-Length" in req: env["CONTENT_LENGTH"] = req["Content-Length"] - if "X-Ash-File" in req: env["SCRIPT_FILENAME"] = req["X-Ash-File"] + if "X-Ash-Port" in req: env["REMOTE_PORT"] = req["X-Ash-Port"] + if "Content-Type" in req: + env["CONTENT_TYPE"] = req["Content-Type"] + # The CGI specification does not strictly require this, but + # many actualy programs and libraries seem to. + del env["HTTP_CONTENT_TYPE"] + if "Content-Length" in req: + env["CONTENT_LENGTH"] = req["Content-Length"] + del env["HTTP_CONTENT_LENGTH"] + if "X-Ash-File" in req: env["SCRIPT_FILENAME"] = absolutify(req["X-Ash-File"]) if "X-Ash-Protocol" in req: env["wsgi.url_scheme"] = req["X-Ash-Protocol"] env["wsgi.input"] = req.sk env["wsgi.errors"] = sys.stderr env["wsgi.multithread"] = True env["wsgi.multiprocess"] = False env["wsgi.run_once"] = False + return env - resp = [] - respsent = [] - - def flushreq(): - if not respsent: - if not resp: - raise Exception, "Trying to write data before starting response." - status, headers = resp - respsent[:] = [True] - req.sk.write("HTTP/1.1 %s\n" % status) - for nm, val in headers: - req.sk.write("%s: %s\n" % (nm, val)) - req.sk.write("\n") - - def write(data): - if not data: - return - flushreq() - req.sk.write(data) - req.sk.flush() - - def startreq(status, headers, exc_info = None): - if resp: - if exc_info: # Interesting, this... - try: - if respsent: - raise exc_info[0], exc_info[1], exc_info[2] - finally: - exc_info = None # CPython GC bug? - else: - raise Exception, "Can only start responding once." - resp[:] = status, headers - return write +class request(ashd.serve.wsgirequest): + def __init__(self, bkreq, **kw): + super(request, self).__init__(**kw) + self.bkreq = bkreq.dup() - respiter = handler(env, startreq) - try: - for data in respiter: - write(data) - if resp: - flushreq() - finally: - if hasattr(respiter, "close"): - respiter.close() - -class reqthread(threading.Thread): - def __init__(self, req): - super(reqthread, self).__init__(name = "Request handler") - self.req = req.dup() - - def run(self): + def mkenv(self): + return mkenv(self.bkreq) + + def handlewsgi(self, env, startreq): + return handler(env, startreq) + + def fileno(self): + return self.bkreq.bsk.fileno() + + def writehead(self, status, headers): + w = self.buffer.extend + w("HTTP/1.1 %s\n" % status) + for nm, val in headers: + w("%s: %s\n" % (nm, val)) + w("\n") + + def flush(self): try: - dowsgi(self.req) - finally: - self.req.close() - + ret = self.bkreq.bsk.send(self.buffer, socket.MSG_DONTWAIT) + self.buffer[:ret] = "" + except IOError: + raise ashd.serve.closed() + + def close(self): + self.bkreq.close() + def handle(req): - reqthread(req).start() + reqhandler.handle(request(bkreq=req, handler=reqhandler)) -ashd.proto.serveloop(handle) +if hspec[0] not in ashd.serve.names: + sys.stderr.write("ashd-wsgi: no such request handler: %s\n" % hspec[0]) + sys.exit(1) +hclass = ashd.serve.names[hspec[0]] +try: + hargs = hclass.parseargs(**hspec[1]) +except ValueError as exc: + sys.stderr.write("ashd-wsgi: %s\n" % exc) + sys.exit(1) + +def sigterm(sig, frame): + socket.fromfd(0, socket.AF_UNIX, socket.SOCK_SEQPACKET).shutdown(socket.SHUT_RDWR) # :P +for signum in [signal.SIGINT, signal.SIGTERM]: + signal.signal(signum, sigterm) + +reqhandler = hclass(**hargs) +try: + ashd.util.serveloop(handle) +finally: + reqhandler.close()