dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more comments in webclient.py

Browse Source
This commit is contained in:
mdipierro
2012-08-29 18:27:30 -05:00
parent 00377325f0
commit d6c34a0142
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.1 (2012-08-29 18:22:03) rc4 Version 2.00.1 (2012-08-29 18:27:27) rc4
gluon/contrib/webclient.py
+12 -3
View File
@@ -15,7 +15,8 @@ import urllib2
class WebClient(object): class WebClient(object):
regex = re.compile('\<input name\="_formkey" type\="hidden" value\="(?P<formkey>.+?)" \/\>\<input name\="_formname" type\="hidden" value\="(?P<formname>.+?)" \/\>') regex = re.compile('\<input name\="_formkey" type\="hidden" value\="(?P<formkey>.+?)" \/\>\<input name\="_formname" type\="hidden" value\="(?P<formname>.+?)" \/\>')
def __init__(self,app=''): def __init__(self,app='', postbacks=True):
self.postbacks = postbacks
self.history = [] self.history = []
self.app = app self.app = app
self.cookies = {} self.cookies = {}
@@ -25,8 +26,10 @@ class WebClient(object):
def post(self,url,data=None,cookies=None,headers=None,auth=None): def post(self,url,data=None,cookies=None,headers=None,auth=None):
self.url = self.app+url self.url = self.app+url
if data and '_formname' in data and self.history and \ if data and '_formname' in data and self.postbacks and \
self.history[-1][1]!=self.url: self.history and self.history[-1][1]!=self.url:
# to bypass the web2py CSRF need to get formkey
# before submitting the form
self.get(url,cookies=None,headers=None,auth=None) self.get(url,cookies=None,headers=None,auth=None)
if cookies is None: cookies = self.cookies if cookies is None: cookies = self.cookies
if auth: if auth:
@@ -35,14 +38,17 @@ class WebClient(object):
opener = urllib2.build_opener(auth_handler) opener = urllib2.build_opener(auth_handler)
else: else:
opener = urllib2.build_opener() opener = urllib2.build_opener()
# copy headers from dict to list of key,value
headers_list = [] headers_list = []
for key,value in (headers or {}).iteritems(): for key,value in (headers or {}).iteritems():
if isinstance(value,(list,tuple)): if isinstance(value,(list,tuple)):
for v in value: headers_list.append((key,v)) for v in value: headers_list.append((key,v))
else: else:
headers_list.append((key,value)) headers_list.append((key,value))
# move cookies to headers
for key,value in (cookies or {}).iteritems(): for key,value in (cookies or {}).iteritems():
headers_list.append(('Cookie','%s=%s' % (key,value))) headers_list.append(('Cookie','%s=%s' % (key,value)))
# add headers to request
for key,value in headers_list: for key,value in headers_list:
opener.addheaders.append((key,str(value))) opener.addheaders.append((key,str(value)))
if data is not None: if data is not None:
@@ -66,11 +72,14 @@ class WebClient(object):
self.status = self.request.getcode() self.status = self.request.getcode()
self.text = self.request.read() self.text = self.request.read()
self.headers = dict(self.request.headers) self.headers = dict(self.request.headers)
# parse headers into cookies
self.cookies = dict(item[:item.find(';')].split('=') for item in \ self.cookies = dict(item[:item.find(';')].split('=') for item in \
self.headers.get('set-cookie','').split(',')) self.headers.get('set-cookie','').split(','))
self.forms = {} self.forms = {}
# find all forms and formkeys
for match in WebClient.regex.finditer(self.text): for match in WebClient.regex.finditer(self.text):
self.forms[match.group('formname')] = match.group('formkey') self.forms[match.group('formname')] = match.group('formkey')
# log this request
self.history.append((self.method,self.url,self.status,self.time)) self.history.append((self.method,self.url,self.status,self.time))
def test_web2py_registration_and_login(): def test_web2py_registration_and_login():