aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2011-01-22 23:25:19 +0000
committerRob Austein <sra@hactrn.net>2011-01-22 23:25:19 +0000
commit82fa2940652aeb63d61ea047284afb942747be49 (patch)
tree0bb1f77e1c3a5aa9457186f912facabc108a8c48 /scripts
parente13f872df973ecc5a323088c7b44757e892dd350 (diff)
Fix typo ("passsord" instead of "password"). Reformat slightly.
svn path=/scripts/rpkidemo; revision=3637
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rpkidemo29
1 files changed, 19 insertions, 10 deletions
diff --git a/scripts/rpkidemo b/scripts/rpkidemo
index e0c9c135..ac8fad4b 100755
--- a/scripts/rpkidemo
+++ b/scripts/rpkidemo
@@ -236,25 +236,30 @@ class main(object):
handlers = []
if self.use_digest_auth:
- auth_handler = urllib2.HTTPDigestAuthHandler()
- auth_handler.add_password(
- realm = self.realm,
- uri = self.base_url,
- user = self.username,
- passwd = self.password)
+ auth_handler = urllib2.HTTPDigestAuthHandler()
- handlers.append(auth_handler)
+ auth_handler.add_password(
+ realm = self.realm,
+ uri = self.base_url,
+ user = self.username,
+ passwd = self.password)
+
+ handlers.append(auth_handler)
if self.use_cookies:
cookiejar = cookielib.CookieJar()
+
handlers.append(urllib2.HTTPCookieProcessor(cookiejar))
if have_ssl_module:
+
class HTTPSConnection(AbstractHTTPSConnection):
trust_anchor = self.trust_anchor
+
class HTTPSHandler(urllib2.HTTPSHandler):
def https_open(self, req):
return self.do_open(HTTPSConnection, req)
+
handlers.append(HTTPSHandler)
self.opener = urllib2.build_opener(*handlers)
@@ -263,14 +268,18 @@ class main(object):
resp = self.opener.open(self.auth_url) # GET
if not self.use_digest_auth:
+
# Django's login form requires the 'csrfmiddlewaretoken.' It turns out
# this is the same value as the 'csrftoken' cookie, so we don't need
# to bother parsing the form.
+
csrftoken = [c.value for c in cookiejar if c.name == 'csrftoken'][0]
- self.opener.open(self.auth_url, data=urllib.urlencode( {'username': self.username,
- 'passsord': self.password,
- 'csrfmiddlewaretoken': csrftoken })) # POST
+ self.opener.open(
+ self.auth_url,
+ data = urllib.urlencode({ "username" : self.username,
+ "password" : self.password,
+ "csrfmiddlewaretoken" : csrftoken })) # POST
return
except urllib2.URLError, e: