From 7ea524800ad0d1df172896a19b85d25dfd7a2945 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 27 Feb 2017 22:03:15 +0100 Subject: [PATCH] Taking couple of suggestions from #2417 --- .gitignore | 3 ++- lib/core/common.py | 2 +- lib/core/settings.py | 2 +- lib/request/connect.py | 2 +- lib/techniques/brute/use.py | 4 ++-- txt/checksum.md5 | 8 ++++---- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ff18ea796..81f587778 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ output/ .sqlmap_history traffic.txt -*~ \ No newline at end of file +*~ +.idea/ \ No newline at end of file diff --git a/lib/core/common.py b/lib/core/common.py index 47c72c573..5bf9d9411 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -2329,7 +2329,7 @@ def wasLastResponseDBMSError(): def wasLastResponseHTTPError(): """ - Returns True if the last web request resulted in an errornous HTTP code (like 500) + Returns True if the last web request resulted in an erroneous HTTP code (like 500) """ threadData = getCurrentThreadData() diff --git a/lib/core/settings.py b/lib/core/settings.py index faae68792..b3330add3 100755 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.1.2.17" +VERSION = "1.1.2.18" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) diff --git a/lib/request/connect.py b/lib/request/connect.py index 5ea9bf837..0328e3d54 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -148,7 +148,7 @@ class Connect(object): # if the injectable piece of code is some kind of JOIN-like query warnMsg = "most probably web server instance hasn't recovered yet " warnMsg += "from previous timed based payload. If the problem " - warnMsg += "persists please wait for few minutes and rerun " + warnMsg += "persists please wait for a few minutes and rerun " warnMsg += "without flag 'T' in option '--technique' " warnMsg += "(e.g. '--flush-session --technique=BEUS') or try to " warnMsg += "lower the value of option '--time-sec' (e.g. '--time-sec=2')" diff --git a/lib/techniques/brute/use.py b/lib/techniques/brute/use.py index d4a7b8c94..426b5df18 100644 --- a/lib/techniques/brute/use.py +++ b/lib/techniques/brute/use.py @@ -71,7 +71,7 @@ def tableExists(tableFile, regex=None): if result: errMsg = "can't use table existence check because of detected invalid results " errMsg += "(most probably caused by inability of the used injection " - errMsg += "to distinguish errornous results)" + errMsg += "to distinguish erroneous results)" raise SqlmapDataException(errMsg) tables = getFileItems(tableFile, lowercase=Backend.getIdentifiedDbms() in (DBMS.ACCESS,), unique=True) @@ -179,7 +179,7 @@ def columnExists(columnFile, regex=None): if result: errMsg = "can't use column existence check because of detected invalid results " errMsg += "(most probably caused by inability of the used injection " - errMsg += "to distinguish errornous results)" + errMsg += "to distinguish erroneous results)" raise SqlmapDataException(errMsg) infoMsg = "checking column existence using items from '%s'" % columnFile diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 56a35a8d9..26f4b7823 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -26,7 +26,7 @@ dc386321e8813788f155dc557a78be8d lib/controller/controller.py 310efc965c862cfbd7b0da5150a5ad36 lib/controller/__init__.py 19905ecb4437b94512cf21d5f1720091 lib/core/agent.py 6cc95a117fbd34ef31b9aa25520f0e31 lib/core/bigarray.py -901d4c3dba4aa1248b394e546fc5533e lib/core/common.py +987c70c04e4847b9b5528ddf68373134 lib/core/common.py 5065a4242a8cccf72f91e22e1007ae63 lib/core/convert.py a8143dab9d3a27490f7d49b6b29ea530 lib/core/data.py 7936d78b1a7f1f008ff92bf2f88574ba lib/core/datatype.py @@ -45,7 +45,7 @@ a8143dab9d3a27490f7d49b6b29ea530 lib/core/data.py d8e9250f3775119df07e9070eddccd16 lib/core/replication.py 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py -9a6d263b4f3c37fe9a2b0c2575331f74 lib/core/settings.py +48d1d13ed1a008fbe0067a9d8bfd5656 lib/core/settings.py d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py afd0636d2e93c23f4f0a5c9b6023ea17 lib/core/target.py @@ -67,7 +67,7 @@ a0444cc351cd6d29015ad16d9eb46ff4 lib/parse/sitemap.py 403d873f1d2fd0c7f73d83f104e41850 lib/request/basicauthhandler.py 0035612a620934d7ebe6d18426cfb065 lib/request/basic.py ef48de622b0a6b4a71df64b0d2785ef8 lib/request/comparison.py -d57655ea924108989a235a7fa02a45f0 lib/request/connect.py +a75e2c97bb8b2a092239fa0571240d36 lib/request/connect.py fb6b788d0016ab4ec5e5f661f0f702ad lib/request/direct.py cc1163d38e9b7ee5db2adac6784c02bb lib/request/dns.py 5dcdb37823a0b5eff65cd1018bcf09e4 lib/request/httpshandler.py @@ -89,7 +89,7 @@ e5a82481947e798d0c11f3acf3e9db60 lib/takeover/xp_cmdshell.py cae752650755c706272a45ae84519a4b lib/techniques/blind/inference.py 310efc965c862cfbd7b0da5150a5ad36 lib/techniques/blind/__init__.py 310efc965c862cfbd7b0da5150a5ad36 lib/techniques/brute/__init__.py -b24fa5fe58828e00a84991015c561f59 lib/techniques/brute/use.py +ad9087c1fa1f4854e103fd86841d1b8c lib/techniques/brute/use.py 310efc965c862cfbd7b0da5150a5ad36 lib/techniques/dns/__init__.py ab1601a7f429b47637c4fb8af703d0f1 lib/techniques/dns/test.py d3da4c7ceaf57c4687a052d58722f6bb lib/techniques/dns/use.py