Update for a last update

This commit is contained in:
Miroslav Stampar 2013-02-12 12:58:15 +01:00
parent 72984a578d
commit c67b39d14d

View File

@ -3355,15 +3355,21 @@ def resetCookieJar(cookieJar):
cookieJar.clear() cookieJar.clear()
else: else:
try: try:
content = readCachedFileContent(conf.loadCookies) if not cookieJar.filename:
lines = filter(None, (line.strip() for line in content.split("\n") if not line.startswith('#'))) content = readCachedFileContent(conf.loadCookies)
handle, filename = tempfile.mkstemp() lines = filter(None, (line.strip() for line in content.split("\n") if not line.startswith('#')))
os.close(handle) handle, filename = tempfile.mkstemp()
with open(filename, "w+b") as f: os.close(handle)
f.write("%s\n" % NETSCAPE_FORMAT_HEADER_COOKIES) with open(filename, "w+b") as f:
for line in lines: f.write("%s\n" % NETSCAPE_FORMAT_HEADER_COOKIES)
f.write("\n%s" % "\t".join(line.split())) for line in lines:
cookieJar.load(filename) f.write("\n%s" % "\t".join(line.split()))
cookieJar.filename = filename
cookieJar.load(cookieJar.filename)
if not cookieJar._cookies:
errMsg = "no valid cookies found. Please "
errMsg += "make sure that cookies aren't expired"
raise SqlmapGenericException(errMsg)
except cookielib.LoadError, msg: except cookielib.LoadError, msg:
errMsg = "there was a problem loading " errMsg = "there was a problem loading "
errMsg += "cookies file ('%s')" % msg errMsg += "cookies file ('%s')" % msg