PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-06 12:41:30 +00:00
Code Issues Projects Releases Wiki Activity

proper Tor settings (reverted r3915 and implemented it the right way)

Browse Source
This commit is contained in:
Miroslav Stampar
2011-05-24 11:06:58 +00:00
parent 0486d1cdaa
commit f774d8fea0
4 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/request/connect.py
View File

@@ -17,7 +17,6 @@ import urlparse
import traceback
from extra.multipart import multipartpost
from extra.socks.socks import GeneralProxyError
from lib.core.agent import agent
from lib.core.common import average
from lib.core.common import calculateDeltaSeconds
@@ -362,7 +361,7 @@ class Connect:
page = processResponse(page, responseHeaders)
return page, responseHeaders
except (urllib2.URLError, socket.error, socket.timeout, httplib.BadStatusLine, httplib.IncompleteRead, GeneralProxyError), e:
except (urllib2.URLError, socket.error, socket.timeout, httplib.BadStatusLine, httplib.IncompleteRead), e:
tbMsg = traceback.format_exc()
if "no host given" in tbMsg:
@@ -399,21 +398,10 @@ class Connect:
logger.critical(warnMsg)
if kb.originalPage is None:
if conf.tor:
warnMsg = "please make sure that you have "
warnMsg += "Tor installed and running for "
warnMsg += "you to be able to successfully use "
warnMsg += "--tor switch "
if IS_WIN:
warnMsg += "(e.g. https://www.torproject.org/download/download.html.en)"
else:
warnMsg += "(e.g. https://help.ubuntu.com/community/Tor)"
singleTimeLogMessage(warnMsg, logging.WARN, WARNFLAGS.TOR)
else:
warnMsg = "if the problem persists please try to rerun "
warnMsg += "with the --random-agent switch turned on "
warnMsg += "and/or try to use proxy switches (--ignore-proxy, --proxy,...)"
singleTimeLogMessage(warnMsg, logging.WARN, WARNFLAGS.RANDOM_AGENT)
warnMsg = "if the problem persists please try to rerun "
warnMsg += "with the --random-agent switch turned on "
warnMsg += "and/or try to use proxy switches (--ignore-proxy, --proxy,...)"
singleTimeLogMessage(warnMsg, logging.WARN, WARNFLAGS.RANDOM_AGENT)
elif conf.threads > 1:
warnMsg = "if the problem persists please try to lower "
warnMsg += "the number of used threads (--threads)"