From 2a88436417ab50711179462ed35cdc0bf4a21611 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 16 Jun 2014 09:51:24 +0200 Subject: [PATCH] Patch for an Issue #724 --- lib/controller/checks.py | 6 +++--- lib/request/connect.py | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/controller/checks.py b/lib/controller/checks.py index ffdcd19ae..10e9dab82 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -1230,9 +1230,6 @@ def checkConnection(suppressOutput=False): kb.errorIsNone = True except SqlmapConnectionException, errMsg: - errMsg = getUnicode(errMsg) - logger.critical(errMsg) - if conf.ipv6: warnMsg = "check connection to a provided " warnMsg += "IPv6 address with a tool like ping6 " @@ -1242,6 +1239,9 @@ def checkConnection(suppressOutput=False): singleTimeWarnMessage(warnMsg) if any(code in kb.httpErrorCodes for code in (httplib.NOT_FOUND, )): + errMsg = getUnicode(errMsg) + logger.critical(errMsg) + if conf.multipleTargets: return False diff --git a/lib/request/connect.py b/lib/request/connect.py index da5d9373c..f3d404885 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -537,8 +537,10 @@ class Connect(object): warnMsg = "unable to connect to the target URL" elif "BadStatusLine" in tbMsg: warnMsg = "connection dropped or unknown HTTP " - warnMsg += "status code received. Try to force the HTTP User-Agent " - warnMsg += "header with option '--user-agent' or switch '--random-agent'" + warnMsg += "status code received" + if not conf.agent and not conf.randomAgent: + warnMsg += ". Try to force the HTTP User-Agent " + warnMsg += "header with option '--user-agent' or switch '--random-agent'" elif "IncompleteRead" in tbMsg: warnMsg = "there was an incomplete read error while retrieving data " warnMsg += "from the target URL"