Minor update for #3540

This commit is contained in:
Miroslav Stampar 2019-03-21 16:35:48 +01:00
parent 5a71210c8a
commit 7d807bfdee
3 changed files with 10 additions and 9 deletions

View File

@ -2575,7 +2575,7 @@ def extractErrorMessage(page):
if isinstance(page, basestring):
for regex in ERROR_PARSING_REGEXES:
match = re.search(regex, page, re.DOTALL | re.IGNORECASE)
match = re.search(regex, page, re.IGNORECASE)
if match:
retVal = htmlunescape(match.group("result")).replace("<br>", "\n").strip()

View File

@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
from lib.core.enums import OS
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.3.41"
VERSION = "1.3.3.42"
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)
@ -341,10 +341,11 @@ ERROR_PARSING_REGEXES = (
r"<b>[^<]*(fatal|error|warning|exception)[^<]*</b>:?\s*(?P<result>[^<]+)",
r"(?m)^\s*(fatal|error|warning|exception):?\s*(?P<result>[^\n]+?)$",
r"(?P<result>[^\n>]*SQL Syntax[^\n<]+)",
r"<li>Error Type:<br>(?P<result>.+?)</li>",
r"(?s)<li>Error Type:<br>(?P<result>.+?)</li>",
r"CDbCommand (?P<result>[^<>\n]*SQL[^<>\n]+)",
r"error '[0-9a-f]{8}'((<[^>]+>)|\s)+(?P<result>[^<>]+)",
r"\[[^\n\]]+(ODBC|JDBC)[^\n\]]+\](\[[^\]]+\])?(?P<result>[^\n]+(in query expression|\(SQL| at /[^ ]+pdo)[^\n<]+)"
r"\[[^\n\]]+(ODBC|JDBC)[^\n\]]+\](\[[^\]]+\])?(?P<result>[^\n]+(in query expression|\(SQL| at /[^ ]+pdo)[^\n<]+)",
r"(?P<result>query error: SELECT[^<>]+)"
)
# Regular expression used for parsing charset info from meta html headers

View File

@ -30,7 +30,7 @@ d2f16a0c90b0ecb243546a1fce32ba96 lib/controller/action.py
cdf3f6e677253f1c85e0b12d9d0d0ac3 lib/controller/__init__.py
e008d08816bc6e0292a047f1b616ebf4 lib/core/agent.py
feeb75a68f33dcff51444c099cbbe3b6 lib/core/bigarray.py
1940b15d77ecbbb4a5966f6eac79268d lib/core/common.py
65a6761adc87f2814e3d76d51c952bf8 lib/core/common.py
bff6edec052a332cf7c3a25de2292be5 lib/core/convert.py
fc68e9a9a74f4669f1529a4adafe54ba lib/core/data.py
04f31ac8b246702b56e57e14faada990 lib/core/datatype.py
@ -50,7 +50,7 @@ f9261e266cab488e2cef15ff7e84ac48 lib/core/profiling.py
63d062fc8c56aac57482a1f3426ae7e0 lib/core/replication.py
66562a9b10fcbce0fffb59e135488bd8 lib/core/revision.py
8a7e4504d993fe48f8e4f7eba13a3872 lib/core/session.py
9186e4d5de340f691fdfa316db3c499e lib/core/settings.py
9e54b182f04dda451e24dde4a92f8594 lib/core/settings.py
58ab4b664a302ae2dd8c5e0b260e6721 lib/core/shell.py
e183a665408f58c916a35515e12db1bc lib/core/subprocessng.py
f44f690e595b4643be7cbad5b73ef1ec lib/core/target.py
@ -84,7 +84,7 @@ f96905845038af6fd080a8ffa839ae55 lib/request/pkihandler.py
0d1bb5a48658c4486d79849dea5ed269 lib/request/rangehandler.py
3c9dd1d1e5c8318d8eb8475c77272b66 lib/request/redirecthandler.py
208fe0d13147116c0f245456128916fc lib/request/templates.py
e834f25ac9df5d132d1f98c15e0906d2 lib/takeover/abstraction.py
c503e17d168625484f5658c0b64ad704 lib/takeover/abstraction.py
a2c7cf0b4dfb19eab7e93811d03bc9d2 lib/takeover/icmpsh.py
cdf3f6e677253f1c85e0b12d9d0d0ac3 lib/takeover/__init__.py
ce852eb7d5a8cd66b377a84a0815a6c7 lib/takeover/metasploit.py
@ -199,7 +199,7 @@ d601ec89d64e2e211f4b0d15c5bf22d5 plugins/dbms/oracle/fingerprint.py
719c131fbc4f74796d6dae2b7333b197 plugins/dbms/postgresql/fingerprint.py
99f0e899c15d3c01cbc266d9d4448df5 plugins/dbms/postgresql/__init__.py
49c98c39248a0adcc31875967f99dbfb plugins/dbms/postgresql/syntax.py
432351a251e25d12b82f9b63810c27a3 plugins/dbms/postgresql/takeover.py
499078b1a420d00fb5e8dbe584bf511d plugins/dbms/postgresql/takeover.py
a065feb709bc13bdf2fe706a3c7e543c plugins/dbms/sqlite/connector.py
d7440da70f6ac8dbffb48ae8fcdfbc15 plugins/dbms/sqlite/enumeration.py
0dd7e4738edaabf4e196a8872cab9749 plugins/dbms/sqlite/filesystem.py
@ -225,7 +225,7 @@ cdf3f6e677253f1c85e0b12d9d0d0ac3 plugins/generic/__init__.py
1d619413aa8675327948b2d3db8bc5f1 plugins/generic/misc.py
ef814300e06a5e964b9b9a7e0a947df8 plugins/generic/search.py
f5dbeb862d3aaeab758c23673fb2e77b plugins/generic/syntax.py
d59d8400cceadcbebbfc6e1eb527cf4e plugins/generic/takeover.py
f6ecac1f817e10dd9edc0b8bd61695a1 plugins/generic/takeover.py
a90f0eb5c931c812023f10dca0fc73ec plugins/generic/users.py
cdf3f6e677253f1c85e0b12d9d0d0ac3 plugins/__init__.py
5dc693e22f5d020c5c568d7325bd4226 shell/backdoors/backdoor.asp_