X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fproto.py;h=80e24197843c4b71f2ea04c7de826998a169eab2;hp=6b433961915082fa5d8e0668c6ec35ca266cf00f;hb=51a13716668cc48bf87e0d0296f8b9900fafe83b;hpb=bb80acbd0ceb6333da8a1cace1655968b9f17403 diff --git a/wrw/proto.py b/wrw/proto.py index 6b43396..80e2419 100644 --- a/wrw/proto.py +++ b/wrw/proto.py @@ -1,8 +1,14 @@ +import time, calendar, collections, binascii, base64 + statusinfo = { - 400: ("Bad Request", "Your issued HTTP request is invalid."), - 403: ("Forbidden", "You are not authorized to view the requested resource."), + 400: ("Bad Request", "Invalid HTTP request."), + 401: ("Unauthorized", "Authentication must be provided for the requested resource."), + 403: ("Forbidden", "You are not authorized to request the requested resource."), 404: ("Not Found", "The requested resource was not found."), - 500: ("Server Error", "An internal error occurred.") + 405: ("Method Not Allowed", "The request method is not recognized or permitted by the requested resource."), + 500: ("Server Error", "An internal error occurred."), + 501: ("Not Implemented", "The requested functionality has not been implemented."), + 503: ("Service Unavailable", "Service is being denied at this time."), } def httpdate(ts): @@ -15,7 +21,56 @@ def phttpdate(dstr): return None tz = int(tz[1:]) tz = (((tz / 100) * 60) + (tz % 100)) * 60 - return time.mktime(time.strptime(dstr, "%a, %d %b %Y %H:%M:%S")) - tz - time.altzone + return calendar.timegm(time.strptime(dstr, "%a, %d %b %Y %H:%M:%S")) - tz + +def pmimehead(hstr): + def pws(p): + while p < len(hstr) and hstr[p].isspace(): + p += 1 + return p + def token(p, sep): + buf = "" + p = pws(p) + if p >= len(hstr): + return "", p + if hstr[p] == '"': + p += 1 + while p < len(hstr): + if hstr[p] == '\\': + p += 1 + if p < len(hstr): + buf += hstr[p] + p += 1 + else: + break + elif hstr[p] == '"': + p += 1 + break + else: + buf += hstr[p] + p += 1 + return buf, pws(p) + else: + while p < len(hstr): + if hstr[p] in sep: + break + buf += hstr[p] + p += 1 + return buf.strip(), pws(p) + p = 0 + val, p = token(p, ";") + pars = {} + while p < len(hstr): + if hstr[p] != ';': + break + p += 1 + k, p = token(p, "=") + if k == "" or hstr[p:p + 1] != '=': + break + p += 1 + v, p = token(p, ';') + pars[k.lower()] = v + return val, pars def htmlq(html): ret = "" @@ -30,13 +85,33 @@ def htmlq(html): ret += c return ret +def simpleerror(env, startreq, code, title, msg): + buf = """ + + + +%s + + +

%s

+ + +""" % (title, title, htmlq(msg)) + buf = buf.encode("us-ascii") + startreq("%i %s" % (code, title), [("Content-Type", "text/html"), ("Content-Length", str(len(buf)))]) + return [buf] + def urlq(url): + if isinstance(url, str): + url = url.encode("utf-8") ret = "" + invalid = b"%;&=#?/\"'" for c in url: - if c == "&" or c == "=" or c == "#" or c == "?" or c == "/" or (ord(c) <= 32): - ret += "%%%02X" % ord(c) + if c in invalid or (c <= 32) or (c >= 128): + ret += "%%%02X" % c else: - ret += c + ret += chr(c) return ret class urlerror(ValueError): @@ -60,7 +135,7 @@ def parseurl(url): local = local[:q] return proto, host, local, query -def consurl(proto, host, local, query = ""): +def consurl(proto, host, local, query=""): if len(local) < 1 and local[0] != '/': raise urlerror("Local part of URL must begin with a slash") ret = "%s://%s%s" % (proto, host, local) @@ -78,18 +153,33 @@ def appendurl(url, other): p = local.rfind('/') return consurl(proto, host, local[:p + 1] + other) -def requrl(req): +def siteurl(req): host = req.ihead.get("Host", None) if host is None: raise Exception("Could not reconstruct URL because no Host header was sent") proto = "http" if req.https: proto = "https" + return "%s://%s/" % (proto, host) + +def scripturl(req): + s = siteurl(req) + if req.uriname[0] != '/': + raise Exception("Malformed local part when reconstructing URL") + return siteurl(req) + req.uriname[1:] + +def requrl(req, qs=True): + s = siteurl(req) if req.uri[0] != '/': raise Exception("Malformed local part when reconstructing URL") - return "%s://%s%s" % (proto, host, req.uri) + pf = req.uri[1:] + if not qs: + p = pf.find('?') + if not p < 0: + pf = pf[:p] + return siteurl(req) + pf -def parstring(pars = {}, **augment): +def parstring(pars={}, **augment): buf = "" for key in pars: if key in augment: @@ -103,3 +193,44 @@ def parstring(pars = {}, **augment): if buf != "": buf += "&" buf += urlq(key) + "=" + urlq(str(augment[key])) return buf + +def parurl(url, pars={}, **augment): + qs = parstring(pars, **augment) + if qs != "": + return url + ("&" if "?" in url else "?") + qs + else: + return url + +# Wrap these, since binascii is a bit funky. :P +def enhex(bs): + return base64.b16encode(bs).decode("us-ascii") +def unhex(es): + if not isinstance(es, collections.ByteString): + try: + es = es.encode("us-ascii") + except UnicodeError: + raise binascii.Error("non-ascii character in hex-string") + return base64.b16decode(es) +def enb32(bs): + return base64.b32encode(bs).decode("us-ascii") +def unb32(es): + if not isinstance(es, collections.ByteString): + try: + es = es.encode("us-ascii") + except UnicodeError: + raise binascii.Error("non-ascii character in base32-string") + if (len(es) % 8) != 0: + es += b"=" * (8 - (len(es) % 8)) + es = es.upper() # The whole point of Base32 is that it's case-insensitive :P + return base64.b32decode(es) +def enb64(bs): + return base64.b64encode(bs).decode("us-ascii") +def unb64(es): + if not isinstance(es, collections.ByteString): + try: + es = es.encode("us-ascii") + except UnicodeError: + raise binascii.Error("non-ascii character in base64-string") + if (len(es) % 4) != 0: + es += b"=" * (4 - (len(es) % 4)) + return base64.b64decode(es)