From c5730ee88d35e0718efa94d17d673b942e54ee4a Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 25 Jan 2018 12:23:54 +0100 Subject: [PATCH] Update related to the #2677 --- lib/core/settings.py | 2 +- plugins/dbms/oracle/connector.py | 6 ++++-- txt/checksum.md5 | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 16c59dd31..6a4bbe402 100644 --- 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.2.1.15" +VERSION = "1.2.1.16" 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/plugins/dbms/oracle/connector.py b/plugins/dbms/oracle/connector.py index c74770d08..fc8946ada 100644 --- a/plugins/dbms/oracle/connector.py +++ b/plugins/dbms/oracle/connector.py @@ -44,8 +44,10 @@ class Connector(GenericConnector): self.connector = cx_Oracle.connect(dsn=self.__dsn, user=self.user, password=self.password, mode=cx_Oracle.SYSDBA) logger.info("successfully connected as SYSDBA") except (cx_Oracle.OperationalError, cx_Oracle.DatabaseError, cx_Oracle.InterfaceError), ex: - if "" in str(ex): - msg = re.sub(r'DPI-\d+:\s+|: "[^"]+"', "", str(ex)) + if "Oracle Client library" in str(ex): + msg = re.sub(r"DPI-\d+:\s+", "", str(ex)) + msg = re.sub(r': ("[^"]+")', r" (\g<1>)", msg) + msg = re.sub(r". See (http[^ ]+)", r'. See "\g<1>"', msg) raise SqlmapConnectionException(msg) try: diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 2bcd05943..30edc2ae4 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -46,7 +46,7 @@ ffa5f01f39b17c8d73423acca6cfe86a lib/core/readlineng.py 0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py a7db43859b61569b601b97f187dd31c5 lib/core/revision.py fcb74fcc9577523524659ec49e2e964b lib/core/session.py -7bf6ba3c580b0a956d82189140784d17 lib/core/settings.py +d623d7a3c0c977964f451ca20b0b15aa lib/core/settings.py d0adc28a38e43a787df4471f7f027413 lib/core/shell.py 63491be462c515a1a3880c27c2acc4a2 lib/core/subprocessng.py 505aaa61e1bba3c3d4567c3e667699e3 lib/core/target.py @@ -173,7 +173,7 @@ d6836e2a6a308eb3536e2e7fc74fdc8b plugins/dbms/mysql/filesystem.py 88b876f085fec2569a0697f4b69f41da plugins/dbms/mysql/__init__.py 0e2adbee217f5b94dcc124d24b8dde99 plugins/dbms/mysql/syntax.py f30009816db6a0b41342301f0d657a01 plugins/dbms/mysql/takeover.py -120637663f66cbb40f44a3a3bb2260dc plugins/dbms/oracle/connector.py +999cb8d0d52820d30bdd4b3d658a765d plugins/dbms/oracle/connector.py e1ffee36fd18f33f34bb4bac4ae43f14 plugins/dbms/oracle/enumeration.py c326b0d8bed92be67888b0242f565ac8 plugins/dbms/oracle/filesystem.py e16cbf8abda91a906ca7bafb81d8866e plugins/dbms/oracle/fingerprint.py