From 833ca4b640f60c038a6526e144f6091bb8f2cf33 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 5 Oct 2016 17:41:02 +0200 Subject: [PATCH] Minor refactoring --- lib/core/settings.py | 2 +- plugins/dbms/mssqlserver/enumeration.py | 4 ++-- plugins/generic/search.py | 8 ++++---- txt/checksum.md5 | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 657f436ce..9dce51e65 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -20,7 +20,7 @@ from lib.core.enums import OS from lib.core.revision import getRevisionNumber # sqlmap version (...) -VERSION = "1.0.10.12" +VERSION = "1.0.10.13" REVISION = getRevisionNumber() TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} diff --git a/plugins/dbms/mssqlserver/enumeration.py b/plugins/dbms/mssqlserver/enumeration.py index cd1a13b32..667581d30 100644 --- a/plugins/dbms/mssqlserver/enumeration.py +++ b/plugins/dbms/mssqlserver/enumeration.py @@ -309,8 +309,8 @@ class Enumeration(GenericEnumeration): _ = conf.db.split(",") infoMsgDb = " in database%s '%s'" % ("s" if len(_) > 1 else "", ", ".join(db for db in _)) elif conf.excludeSysDbs: - infoMsg2 = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList)) - logger.info(infoMsg2) + msg = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList)) + logger.info(msg) else: infoMsgDb = " across all databases" diff --git a/plugins/generic/search.py b/plugins/generic/search.py index 8686f9877..5d16fd5fc 100644 --- a/plugins/generic/search.py +++ b/plugins/generic/search.py @@ -181,8 +181,8 @@ class Search: infoMsg += " for database%s '%s'" % ("s" if len(_) > 1 else "", ", ".join(db for db in _)) elif conf.excludeSysDbs: whereDbsQuery = "".join(" AND '%s' != %s" % (unsafeSQLIdentificatorNaming(db), dbCond) for db in self.excludeDbsList) - infoMsg2 = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList)) - logger.info(infoMsg2) + msg = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList)) + logger.info(msg) else: whereDbsQuery = "" @@ -406,8 +406,8 @@ class Search: infoMsgDb = " in database%s '%s'" % ("s" if len(_) > 1 else "", ", ".join(unsafeSQLIdentificatorNaming(db) for db in _)) elif conf.excludeSysDbs: whereDbsQuery = "".join(" AND %s != '%s'" % (dbCond, unsafeSQLIdentificatorNaming(db)) for db in self.excludeDbsList) - infoMsg2 = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(unsafeSQLIdentificatorNaming(db) for db in self.excludeDbsList)) - logger.info(infoMsg2) + msg = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(unsafeSQLIdentificatorNaming(db) for db in self.excludeDbsList)) + logger.info(msg) else: infoMsgDb = " across all databases" diff --git a/txt/checksum.md5 b/txt/checksum.md5 index b0afd63ad..f9c86a623 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -45,7 +45,7 @@ e60456db5380840a586654344003d4e6 lib/core/readlineng.py 5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py 99a2b496b9d5b546b335653ca801153f lib/core/revision.py 7c15dd2777af4dac2c89cab6df17462e lib/core/session.py -5069537b4b81e51f38dcd370d84316cc lib/core/settings.py +fd73e93782c532b43a024a6f54a1919a lib/core/settings.py 7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py 23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py c3ace7874a536d801f308cf1fd03df99 lib/core/target.py @@ -159,7 +159,7 @@ c24f2512f13dbaff9543fe6d96cbe53b plugins/dbms/maxdb/__init__.py df0766e0f322505dcbfca2fc792fe62f plugins/dbms/maxdb/syntax.py aeec4f12950e20c46da405d23ea08dbb plugins/dbms/maxdb/takeover.py 579d582f3716c310689b4aa7317b57df plugins/dbms/mssqlserver/connector.py -8318300d92865330f5b0db5c3df29835 plugins/dbms/mssqlserver/enumeration.py +98737656b0285f3495d31f26bd1f518d plugins/dbms/mssqlserver/enumeration.py 6c249bcdef486803686a8b2f11566637 plugins/dbms/mssqlserver/filesystem.py d01229e7161a5071934fc26b48a11e8c plugins/dbms/mssqlserver/fingerprint.py 2fbe5e485bcd05511cd1d7cb8cbdbde4 plugins/dbms/mssqlserver/__init__.py @@ -209,7 +209,7 @@ e335b868f5fb1154c9f72143d602915d plugins/generic/enumeration.py 5637c508ca6348f29c2b100a3e80dddc plugins/generic/fingerprint.py cc9c82cfffd8ee9b25ba3af6284f057e plugins/generic/__init__.py 7ffeee6d232ff6b342f362a2a4d226c0 plugins/generic/misc.py -7b3e044a7fca497278d79883697089b7 plugins/generic/search.py +d509459f7662231a00ef116123c0ba5f plugins/generic/search.py 73f8d047dbbcff307d62357836e382e6 plugins/generic/syntax.py da3ebc20998af02e3d952d0417a67792 plugins/generic/takeover.py d35f994664fb7a7fcee656633dfb31ed plugins/generic/users.py