added switch --load-cookies

This commit is contained in:
Miroslav Stampar 2012-03-07 14:48:45 +00:00
parent 4cfea96471
commit b4cf8b05b3
5 changed files with 14 additions and 2 deletions

View File

@ -148,7 +148,12 @@ def __urllib2Opener():
handlers = [proxyHandler, authHandler, redirectHandler, rangeHandler]
if not conf.dropSetCookie:
conf.cj = cookielib.LWPCookieJar()
if not conf.loC:
conf.cj = cookielib.CookieJar()
else:
conf.cj = cookielib.MozillaCookieJar()
conf.cj.load(conf.loC)
handlers.append(urllib2.HTTPCookieProcessor(conf.cj))
# Reference: http://www.w3.org/Protocols/rfc2616/rfc2616-sec8.html

View File

@ -26,6 +26,7 @@ optDict = {
"data": "string",
"pDel": "string",
"cookie": "string",
"loC": "string",
"cookieUrlencode": "boolean",
"dropSetCookie": "boolean",
"agent": "string",

View File

@ -73,6 +73,9 @@ def cmdLineParser():
request.add_option("--cookie", dest="cookie",
help="HTTP Cookie header")
request.add_option("--load-cookies", dest="loC",
help="File containing cookies in Netscape/wget format")
request.add_option("--cookie-urlencode", dest="cookieUrlencode",
action="store_true",
help="URL Encode generated cookie injections")

View File

@ -35,7 +35,7 @@ class Google:
def __init__(self, handlers):
self._matches = []
self._cj = cookielib.LWPCookieJar()
self._cj = cookielib.CookieJar()
handlers.append(urllib2.HTTPCookieProcessor(self._cj))

View File

@ -42,6 +42,9 @@ pDel =
# HTTP Cookie header.
cookie =
# File containing cookies in Netscape/wget format
loC =
# URL-encode generated cookie injections.
# Valid: True or False
cookieUrlencode = False