traipse_dev: plugins/cherrypy/_cphttptools.py annotate

annotate plugins/cherrypy/_cphttptools.py @ 87:eb1b275699c4 alpha

Traipse Alpha 'OpenRPG' {090917-01} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc''s main goal is to offer more advanced features and enhance the productivity of the user. Update Summary: 00: Adds menu changes to draw attention to important updates, errors, or other events. (image info coming soon) Traipse URL is not included in the repos tab and is set as default. 01: Fixes Copy for Windows and Linux (finally!!) users. Fixes incomplete update to Grid and List nodes. Fixes incomplete update to Chat Commands.

author	sirebral
date	Thu, 17 Sep 2009 03:23:03 -0500
parents	78407d627cba
children

rev	line source
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1 """
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	2 Copyright (c) 2004, CherryPy Team (team@cherrypy.org)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	3 All rights reserved.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	4
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	5 Redistribution and use in source and binary forms, with or without modification,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	6 are permitted provided that the following conditions are met:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	7
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	8 * Redistributions of source code must retain the above copyright notice,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	9 this list of conditions and the following disclaimer.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	10 * Redistributions in binary form must reproduce the above copyright notice,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	11 this list of conditions and the following disclaimer in the documentation
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	12 and/or other materials provided with the distribution.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	13 * Neither the name of the CherryPy Team nor the names of its contributors
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	14 may be used to endorse or promote products derived from this software
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	15 without specific prior written permission.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	16
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	17 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	18 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	19 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	20 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	21 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	22 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	23 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	24 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	25 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	26 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	27 """
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	28
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	29 import cpg, urllib, sys, time, traceback, types, StringIO, cgi, os
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	30 import mimetypes, hashlib, random, string, _cputil, cperror, Cookie, urlparse
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	31 from lib.filter import basefilter
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	32
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	33 """
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	34 Common Service Code for CherryPy
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	35 """
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	36
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	37 mimetypes.types_map['.dwg']='image/x-dwg'
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	38 mimetypes.types_map['.ico']='image/x-icon'
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	39
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	40 weekdayname = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	41 monthname = [None, 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	42
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	43 class IndexRedirect(Exception): pass
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	44
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	45 def parseFirstLine(data):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	46 cpg.request.path = data.split()[1]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	47 cpg.request.queryString = ""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	48 cpg.request.browserUrl = cpg.request.path
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	49 cpg.request.paramMap = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	50 cpg.request.paramList = [] # Only used for Xml-Rpc
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	51 cpg.request.filenameMap = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	52 cpg.request.fileTypeMap = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	53 i = cpg.request.path.find('?')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	54 if i != -1:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	55 # Parse parameters from URL
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	56 if cpg.request.path[i+1:]:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	57 k = cpg.request.path[i+1:].find('?')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	58 if k != -1:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	59 j = cpg.request.path[:k].rfind('=')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	60 if j != -1:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	61 cpg.request.path = cpg.request.path[:j+1] + \
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	62 urllib.quote_plus(cpg.request.path[j+1:])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	63 for paramStr in cpg.request.path[i+1:].split('&'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	64 sp = paramStr.split('=')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	65 if len(sp) > 2:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	66 j = paramStr.find('=')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	67 sp = (paramStr[:j], paramStr[j+1:])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	68 if len(sp) == 2:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	69 key, value = sp
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	70 value = urllib.unquote_plus(value)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	71 if cpg.request.paramMap.has_key(key):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	72 # Already has a value: make a list out of it
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	73 if type(cpg.request.paramMap[key]) == type([]):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	74 # Already is a list: append the new value to it
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	75 cpg.request.paramMap[key].append(value)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	76 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	77 # Only had one value so far: start a list
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	78 cpg.request.paramMap[key] = [cpg.request.paramMap[key], value]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	79 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	80 cpg.request.paramMap[key] = value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	81 cpg.request.queryString = cpg.request.path[i+1:]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	82 cpg.request.path = cpg.request.path[:i]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	83
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	84 def cookHeaders(clientAddress, remoteHost, headers, requestLine):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	85 """Process the headers into the request.headerMap"""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	86 cpg.request.headerMap = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	87 cpg.request.requestLine = requestLine
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	88 cpg.request.simpleCookie = Cookie.SimpleCookie()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	89
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	90 # Build headerMap
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	91 for item in headers.items():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	92 # Warning: if there is more than one header entry for cookies (AFAIK, only Konqueror does that)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	93 # only the last one will remain in headerMap (but they will be correctly stored in request.simpleCookie)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	94 insertIntoHeaderMap(item[0],item[1])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	95
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	96 # Handle cookies differently because on Konqueror, multiple cookies come on different lines with the same key
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	97 cookieList = headers.getallmatchingheaders('cookie')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	98 for cookie in cookieList:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	99 cpg.request.simpleCookie.load(cookie)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	100
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	101 cpg.request.remoteAddr = clientAddress
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	102 cpg.request.remoteHost = remoteHost
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	103
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	104 # Set peer_certificate (in SSL mode) so the web app can examinate the client certificate
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	105 try: cpg.request.peerCertificate = self.request.get_peer_certificate()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	106 except: pass
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	107
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	108 _cputil.getSpecialFunction('_cpLogMessage')("%s - %s" % (cpg.request.remoteAddr, requestLine[:-2]), "HTTP")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	109
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	110
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	111 def parsePostData(rfile):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	112 # Read request body and put it in data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	113 len = int(cpg.request.headerMap.get("Content-Length","0"))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	114 if len: data = rfile.read(len)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	115 else: data=""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	116
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	117 # Put data in a StringIO so FieldStorage can read it
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	118 newRfile = StringIO.StringIO(data)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	119 # Create a copy of headerMap with lowercase keys because
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	120 # FieldStorage doesn't work otherwise
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	121 lowerHeaderMap = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	122 for key, value in cpg.request.headerMap.items():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	123 lowerHeaderMap[key.lower()] = value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	124 forms = cgi.FieldStorage(fp = newRfile, headers = lowerHeaderMap, environ = {'REQUEST_METHOD':'POST'}, keep_blank_values = 1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	125 for key in forms.keys():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	126 # Check if it's a list or not
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	127 valueList = forms[key]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	128 if type(valueList) == type([]):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	129 # It's a list of values
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	130 cpg.request.paramMap[key] = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	131 cpg.request.filenameMap[key] = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	132 cpg.request.fileTypeMap[key] = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	133 for item in valueList:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	134 cpg.request.paramMap[key].append(item.value)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	135 cpg.request.filenameMap[key].append(item.filename)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	136 cpg.request.fileTypeMap[key].append(item.type)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	137 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	138 # It's a single value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	139 # In case it's a file being uploaded, we save the filename in a map (user might need it)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	140 cpg.request.paramMap[key] = valueList.value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	141 cpg.request.filenameMap[key] = valueList.filename
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	142 cpg.request.fileTypeMap[key] = valueList.type
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	143
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	144 def applyFilterList(methodName):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	145 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	146 filterList = _cputil.getSpecialFunction('_cpFilterList')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	147 for filter in filterList:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	148 method = getattr(filter, methodName, None)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	149 if method:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	150 method()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	151 except basefilter.InternalRedirect:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	152 # If we get an InternalRedirect, we start the filter list
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	153 # from scratch. Is cpg.request.path or cpg.request.objectPath
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	154 # has been modified by the hook, then a new filter list
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	155 # will be applied.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	156 # We use recursion so if there is an infinite loop, we'll
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	157 # get the regular python "recursion limit exceeded" exception.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	158 applyFilterList(methodName)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	159
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	160
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	161 def insertIntoHeaderMap(key,value):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	162 normalizedKey = '-'.join([s.capitalize() for s in key.split('-')])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	163 cpg.request.headerMap[normalizedKey] = value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	164
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	165 def initRequest(clientAddress, remoteHost, requestLine, headers, rfile, wfile):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	166 parseFirstLine(requestLine)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	167 cookHeaders(clientAddress, remoteHost, headers, requestLine)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	168
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	169 cpg.request.base = "http://" + cpg.request.headerMap['Host']
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	170 cpg.request.browserUrl = cpg.request.base + cpg.request.browserUrl
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	171 cpg.request.isStatic = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	172 cpg.request.parsePostData = True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	173 cpg.request.rfile = rfile
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	174
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	175 # Change objectPath in filters to change the object that will get rendered
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	176 cpg.request.objectPath = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	177
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	178 applyFilterList('afterRequestHeader')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	179
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	180 if cpg.request.method == 'POST' and cpg.request.parsePostData:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	181 parsePostData(rfile)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	182
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	183 applyFilterList('afterRequestBody')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	184
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	185 def doRequest(clientAddress, remoteHost, requestLine, headers, rfile, wfile):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	186 # creates some attributes on cpg.response so filters can use them
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	187 cpg.response.wfile = wfile
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	188 cpg.response.sendResponse = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	189 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	190 initRequest(clientAddress, remoteHost, requestLine, headers, rfile, wfile)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	191 except basefilter.RequestHandled:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	192 # request was already fully handled; it may be a cache hit
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	193 return
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	194
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	195 # Prepare response variables
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	196 now = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	197 year, month, day, hh, mm, ss, wd, y, z = time.gmtime(now)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	198 date = "%s, %02d %3s %4d %02d:%02d:%02d GMT" % (weekdayname[wd], day, monthname[month], year, hh, mm, ss)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	199 cpg.response.headerMap = {
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	200 "protocolVersion": cpg.configOption.protocolVersion,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	201 "Status": "200 OK",
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	202 "Content-Type": "text/html",
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	203 "Server": "CherryPy/" + cpg.__version__,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	204 "Date": date,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	205 "Set-Cookie": [],
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	206 "Content-Length": 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	207 }
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	208 cpg.response.simpleCookie = Cookie.SimpleCookie()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	209
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	210 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	211 handleRequest(cpg.response.wfile)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	212 except:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	213 # TODO: in some cases exceptions and filters are conflicting;
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	214 # error reporting seems to be broken in some cases. This code is
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	215 # a helper to check it
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	216 err = ""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	217 exc_info_1 = sys.exc_info()[1]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	218 if hasattr(exc_info_1, 'args') and len(exc_info_1.args) >= 1:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	219 err = exc_info_1.args[0]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	220
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	221 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	222 _cputil.getSpecialFunction('_cpOnError')()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	223
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	224 # Still save session data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	225 if cpg.configOption.sessionStorageType and not cpg.request.isStatic:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	226 sessionId = cpg.response.simpleCookie[cpg.configOption.sessionCookieName].value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	227 expirationTime = time.time() + cpg.configOption.sessionTimeout * 60
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	228 _cputil.getSpecialFunction('_cpSaveSessionData')(sessionId, cpg.request.sessionMap, expirationTime)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	229
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	230 wfile.write('%s %s\r\n' % (cpg.response.headerMap['protocolVersion'], cpg.response.headerMap['Status']))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	231
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	232 if (cpg.response.headerMap.has_key('Content-Length') and
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	233 cpg.response.headerMap['Content-Length']==0):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	234 buf = StringIO.StringIO()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	235 [buf.write(x) for x in cpg.response.body]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	236 buf.seek(0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	237 cpg.response.body = [buf.read()]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	238 cpg.response.headerMap['Content-Length'] = len(cpg.response.body[0])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	239
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	240 for key, valueList in cpg.response.headerMap.items():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	241 if key not in ('Status', 'protocolVersion'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	242 if type(valueList) != type([]): valueList = [valueList]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	243 for value in valueList:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	244 wfile.write('%s: %s\r\n'%(key, value))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	245 wfile.write('\r\n')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	246 for line in cpg.response.body:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	247 wfile.write(line)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	248 except:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	249 bodyFile = StringIO.StringIO()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	250 traceback.print_exc(file = bodyFile)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	251 body = bodyFile.getvalue()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	252 wfile.write('%s 200 OK\r\n' % cpg.configOption.protocolVersion)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	253 wfile.write('Content-Type: text/plain\r\n')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	254 wfile.write('Content-Length: %s\r\n' % len(body))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	255 wfile.write('\r\n')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	256 wfile.write(body)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	257
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	258 def sendResponse(wfile):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	259 applyFilterList('beforeResponse')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	260
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	261 # Set the content-length
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	262 if (cpg.response.headerMap.has_key('Content-Length') and
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	263 cpg.response.headerMap['Content-Length']==0):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	264 buf = StringIO.StringIO()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	265 [buf.write(x) for x in cpg.response.body]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	266 buf.seek(0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	267 cpg.response.body = [buf.read()]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	268 cpg.response.headerMap['Content-Length'] = len(cpg.response.body[0])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	269
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	270 # Save session data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	271 if cpg.configOption.sessionStorageType and not cpg.request.isStatic:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	272 sessionId = cpg.response.simpleCookie[cpg.configOption.sessionCookieName].value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	273 expirationTime = time.time() + cpg.configOption.sessionTimeout * 60
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	274 _cputil.getSpecialFunction('_cpSaveSessionData')(sessionId, cpg.request.sessionMap, expirationTime)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	275
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	276 wfile.write('%s %s\r\n' % (cpg.response.headerMap['protocolVersion'], cpg.response.headerMap['Status']))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	277 for key, valueList in cpg.response.headerMap.items():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	278 if key not in ('Status', 'protocolVersion'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	279 if type(valueList) != type([]): valueList = [valueList]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	280 for value in valueList:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	281 wfile.write('%s: %s\r\n' % (key, value))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	282
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	283 # Send response cookies
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	284 cookie = cpg.response.simpleCookie.output()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	285 if cookie:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	286 wfile.write(cookie+'\r\n')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	287 wfile.write('\r\n')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	288
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	289 for line in cpg.response.body:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	290 wfile.write(line)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	291
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	292 # finalization hook for filter cleanup & logging purposes
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	293 applyFilterList('afterResponse')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	294
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	295 def handleRequest(wfile):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	296 # Clean up expired sessions if needed:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	297 now = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	298 if cpg.configOption.sessionStorageType and cpg.configOption.sessionCleanUpDelay and cpg._lastSessionCleanUpTime + cpg.configOption.sessionCleanUpDelay * 60 <= now:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	299 cpg._lastSessionCleanUpTime = now
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	300 _cputil.getSpecialFunction('_cpCleanUpOldSessions')()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	301
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	302 # Save original values (in case they get modified by filters)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	303 cpg.request.originalPath = cpg.request.path
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	304 cpg.request.originalParamMap = cpg.request.paramMap
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	305 cpg.request.originalParamList = cpg.request.paramList
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	306
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	307 path = cpg.request.path
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	308 if path.startswith('/'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	309 # Remove leading slash
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	310 path = path[1:]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	311 if path.endswith('/'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	312 # Remove trailing slash
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	313 path = path[:-1]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	314 path = urllib.unquote(path) # Replace quoted chars (eg %20) from url
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	315
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	316 # Handle static directories
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	317 for urlDir, fsDir in cpg.configOption.staticContentList:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	318 if path == urlDir or path[:len(urlDir)+1]==urlDir+'/':
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	319
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	320 cpg.request.isStatic = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	321
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	322 fname = fsDir + path[len(urlDir):]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	323 start_url_var = cpg.request.browserUrl.find('?')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	324 if start_url_var != -1: fname = fname + cpg.request.browserUrl[start_url_var:]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	325 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	326 stat = os.stat(fname)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	327 except OSError:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	328 raise cperror.NotFound
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	329 modifTime = stat.st_mtime
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	330
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	331 strModifTime = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime(modifTime))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	332
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	333 # Check if browser sent "if-modified-since" in request header
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	334 if cpg.request.headerMap.has_key('If-Modified-Since'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	335 # Check if if-modified-since date is the same as strModifTime
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	336 if cpg.request.headerMap['If-Modified-Since'] == strModifTime:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	337 cpg.response.headerMap = {
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	338 'Status': 304,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	339 'protocolVersion': cpg.configOption.protocolVersion,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	340 'Date': cpg.response.headerMap['Date']}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	341 cpg.response.body = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	342 sendResponse(wfile)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	343 return
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	344
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	345 cpg.response.headerMap['Last-Modified'] = strModifTime
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	346 # Set Content-Length and use an iterable (file object)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	347 # this way CP won't load the whole file in memory
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	348 cpg.response.headerMap['Content-Length'] = stat[6]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	349 cpg.response.body = open(fname, 'rb')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	350 # Set content-type based on filename extension
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	351 i = path.rfind('.')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	352 if i != -1: ext = path[i:]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	353 else: ext = ""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	354 contentType = mimetypes.types_map.get(ext, "text/plain")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	355 cpg.response.headerMap['Content-Type'] = contentType
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	356 sendResponse(wfile)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	357 return
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	358
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	359 # Get session data
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	360 if cpg.configOption.sessionStorageType and not cpg.request.isStatic:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	361 now = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	362 # First, get sessionId from cookie
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	363 try: sessionId = cpg.request.simpleCookie[cpg.configOption.sessionCookieName].value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	364 except: sessionId=None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	365 if sessionId:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	366 # Load session data from wherever it was stored
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	367 sessionData = _cputil.getSpecialFunction('_cpLoadSessionData')(sessionId)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	368 if sessionData == None:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	369 sessionId = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	370 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	371 cpg.request.sessionMap, expirationTime = sessionData
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	372 # Check that is hasn't expired
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	373 if now > expirationTime:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	374 # Session expired
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	375 sessionId = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	376
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	377 # Create a new sessionId if needed
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	378 if not sessionId:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	379 cpg.request.sessionMap = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	380 sessionId = generateSessionId()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	381 cpg.request.sessionMap['_sessionId'] = sessionId
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	382
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	383 cpg.response.simpleCookie[cpg.configOption.sessionCookieName] = sessionId
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	384 cpg.response.simpleCookie[cpg.configOption.sessionCookieName]['path'] = '/'
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	385 cpg.response.simpleCookie[cpg.configOption.sessionCookieName]['version'] = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	386
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	387 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	388 func, objectPathList, virtualPathList = mapPathToObject()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	389 except IndexRedirect, inst:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	390 # For an IndexRedirect, we don't go through the regular
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	391 # mechanism: we return the redirect immediately
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	392 newUrl = urlparse.urljoin(cpg.request.base, inst.args[0])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	393 wfile.write('%s 302\r\n' % (cpg.response.headerMap['protocolVersion']))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	394 cpg.response.headerMap['Location'] = newUrl
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	395 for key, valueList in cpg.response.headerMap.items():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	396 if key not in ('Status', 'protocolVersion'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	397 if type(valueList) != type([]): valueList = [valueList]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	398 for value in valueList:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	399 wfile.write('%s: %s\r\n'%(key, value))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	400 wfile.write('\r\n')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	401 return
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	402
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	403 # Remove "root" from objectPathList and join it to get objectPath
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	404 cpg.request.objectPath = '/' + '/'.join(objectPathList[1:])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	405 body = func((virtualPathList + cpg.request.paramList), *(cpg.request.paramMap))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	406
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	407 # builds a uniform return type
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	408 if not isinstance(body, types.GeneratorType):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	409 cpg.response.body = [body]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	410 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	411 cpg.response.body = body
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	412
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	413 if cpg.response.sendResponse:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	414 sendResponse(wfile)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	415
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	416 def generateSessionId():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	417 s = ''
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	418 for i in range(50):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	419 s += random.choice(string.letters+string.digits)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	420 s += '%s'%time.time()
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 0 diff changeset	421 return hashlib.shal(s).hexdigest()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	422
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	423 def getObjFromPath(objPathList, objCache):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	424 """ For a given objectPathList (like ['root', 'a', 'b', 'index']),
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	425 return the object (or None if it doesn't exist).
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	426 Also keep a cache for maximum efficiency
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	427 """
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	428 # Let cpg be the first valid object.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	429 validObjects = ["cpg"]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	430
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	431 # Scan the objPathList in order from left to right
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	432 for index, obj in enumerate(objPathList):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	433 # maps virtual filenames to Python identifiers (substitutes '.' for '_')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	434 obj = obj.replace('.', '_')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	435
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	436 # currentObjStr holds something like 'cpg.root.something.else'
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	437 currentObjStr = ".".join(validObjects)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	438
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	439 #---------------
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	440 # Cache check
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	441 #---------------
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	442 # Generate a cacheKey from the first 'index' elements of objPathList
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	443 cacheKey = tuple(objPathList[:index+1])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	444 # Is this cacheKey in the objCache?
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	445 if cacheKey in objCache:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	446 # And is its value not None?
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	447 if objCache[cacheKey]:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	448 # Yes, then add it to the list of validObjects
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	449 validObjects.append(obj)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	450 # OK, go to the next iteration
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	451 continue
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	452 # Its value is None, so we stop
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	453 # (This means it is not a valid object)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	454 break
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	455
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	456 #-----------------
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	457 # Attribute check
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	458 #-----------------
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	459 if getattr(eval(currentObjStr), obj, None):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	460 # obj is a valid attribute of the current object
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	461 validObjects.append(obj)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	462 # Store it in the cache
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	463 objCache[cacheKey] = eval(".".join(validObjects))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	464 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	465 # obj is not a valid attribute
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	466 # Store None in the cache
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	467 objCache[cacheKey] = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	468 # Stop, we won't process the remaining objPathList
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	469 break
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	470
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	471 # Return the last cached object (even if its None)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	472 return objCache[cacheKey]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	473
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	474 def mapPathToObject(path = None):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	475 # Traverse path:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	476 # for /a/b?arg=val, we'll try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	477 # root.a.b.index -> redirect to /a/b/?arg=val
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	478 # root.a.b.default(arg='val') -> redirect to /a/b/?arg=val
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	479 # root.a.b(arg='val')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	480 # root.a.default('b', arg='val')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	481 # root.default('a', 'b', arg='val')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	482
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	483 # Also, we ignore trailing slashes
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	484 # Also, a method has to have ".exposed = True" in order to be exposed
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	485
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	486 if path is None:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	487 path = cpg.request.objectPath or cpg.request.path
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	488 if path.startswith('/'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	489 path = path[1:] # Remove leading slash
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	490 if path.endswith('/'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	491 path = path[:-1] # Remove trailing slash
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	492
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	493 if not path:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	494 objectPathList = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	495 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	496 objectPathList = path.split('/')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	497 objectPathList = ['root'] + objectPathList + ['index']
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	498
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	499 # Try successive objects... (and also keep the remaining object list)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	500 objCache = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	501 isFirst = True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	502 isSecond = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	503 isDefault = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	504 foundIt = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	505 virtualPathList = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	506 while objectPathList:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	507 if isFirst or isSecond:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	508 # Only try this for a.b.index() or a.b()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	509 candidate = getObjFromPath(objectPathList, objCache)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	510 if callable(candidate) and getattr(candidate, 'exposed', False):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	511 foundIt = True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	512 break
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	513 # Couldn't find the object: pop one from the list and try "default"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	514 lastObj = objectPathList.pop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	515 if (not isFirst) or (not path):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	516 virtualPathList.insert(0, lastObj)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	517 objectPathList.append('default')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	518 candidate = getObjFromPath(objectPathList, objCache)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	519 if callable(candidate) and getattr(candidate, 'exposed', False):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	520 foundIt = True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	521 isDefault = True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	522 break
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	523 objectPathList.pop() # Remove "default"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	524 if isSecond:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	525 isSecond = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	526 if isFirst:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	527 isFirst = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	528 isSecond = True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	529
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	530 # Check results of traversal
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	531 if not foundIt:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	532 raise cperror.NotFound # We didn't find anything
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	533
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	534 if isFirst:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	535 # We found the extra ".index"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	536 # Check if the original path had a trailing slash (otherwise, do
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	537 # a redirect)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	538 if cpg.request.path[-1] != '/':
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	539 newUrl = cpg.request.path + '/'
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	540 if cpg.request.queryString: newUrl += cpg.request.queryString
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	541 raise IndexRedirect(newUrl)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	542
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	543 return candidate, objectPathList, virtualPathList

Mercurial > traipse_dev

annotate plugins/cherrypy/_cphttptools.py @ 87:eb1b275699c4 alpha