Minor patch

stamparm · stamparm · commit 36b660309b65 · 2018-10-03T12:28:55.000+02:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -1198,7 +1198,7 @@ def banner():
     This function prints sqlmap banner with its version
     """
 
-    if not any(_ in sys.argv for _ in ("--version", "--api")):
+    if not any(_ in sys.argv for _ in ("--version", "--api")) and not conf.get("disableBanner"):
         _ = BANNER
 
         if not getattr(LOGGER_HANDLER, "is_tty", False) or "--disable-coloring" in sys.argv:
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -19,7 +19,7 @@
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.2.10.7"
+VERSION = "1.2.10.8"
 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/sqlmap.py b/sqlmap.py
@@ -388,6 +388,7 @@ def main():
             cmdLineOptions.clear()
             conf.clear()
             kb.clear()
+            conf.disableBanner = True
             main()
 
         if conf.get("api"):
diff --git a/thirdparty/termcolor/termcolor.py b/thirdparty/termcolor/termcolor.py
@@ -79,6 +79,8 @@
             ))
         )
 
+COLORS.update(dict(("light%s" % color, COLORS[color] + 60) for color in COLORS))
+
 
 RESET = '\033[0m'
 
diff --git a/txt/checksum.md5 b/txt/checksum.md5
@@ -29,7 +29,7 @@ c7443613a0a2505b1faec931cee2a6ef  lib/controller/handler.py
 1e5532ede194ac9c083891c2f02bca93  lib/controller/__init__.py
 8eb0a5dbd79bd58fedac4c0cc344246b  lib/core/agent.py
 c347f085bd561adfa26d3a9512e5f3b9  lib/core/bigarray.py
-2f47247892e5d558bbbe97c6cec7121f  lib/core/common.py
+6d8bda015437de6439ad93a83fa92410  lib/core/common.py
 0d082da16c388b3445e656e0760fb582  lib/core/convert.py
 9f87391b6a3395f7f50830b391264f27  lib/core/data.py
 72016ea5c994a711a262fd64572a0fcd  lib/core/datatype.py
@@ -49,7 +49,7 @@ c8c386d644d57c659d74542f5f57f632  lib/core/patch.py
 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py
 a7db43859b61569b601b97f187dd31c5  lib/core/revision.py
 fcb74fcc9577523524659ec49e2e964b  lib/core/session.py
-16e697be36101880289e6095a0978a4b  lib/core/settings.py
+68c0986d21fbc5f154c02869e371cb7e  lib/core/settings.py
 dd68a9d02fccb4fa1428b20e15b0db5d  lib/core/shell.py
 a7edc9250d13af36ac0108f259859c19  lib/core/subprocessng.py
 62bc180e3e828949ffb342a8f756c183  lib/core/target.py
@@ -227,7 +227,7 @@ ec2ba8c757ac96425dcd2b97970edd3a  shell/stagers/stager.asp_
 0c48ddb1feb7e38a951ef05a0d48e032  shell/stagers/stager.jsp_
 2f9e459a4cf6a58680978cdce5ff7971  shell/stagers/stager.php_
 cd90da0474d7b1a67d7b40d208493375  sqlmapapi.py
-c66cb57ef2d927d5e22a84413121b9ef  sqlmap.py
+c6f90d321b9ec7bff5b3be15cd4e19d8  sqlmap.py
 523dab9e1093eb59264c6beb366b255a  tamper/0x2char.py
 3a1697585ae4e7bf315e9dda97d6f321  tamper/apostrophemask.py
 d7a119a74be9b385ee3884fb5e6af041  tamper/apostrophenullencode.py
@@ -359,7 +359,7 @@ a7f735641c5b695f3d6220fe7c91b030  thirdparty/pydes/pyDes.py
 d41d8cd98f00b204e9800998ecf8427e  thirdparty/socks/__init__.py
 afd97f26bffa0532ee4eb4f5f8ec1ab7  thirdparty/socks/socks.py
 d41d8cd98f00b204e9800998ecf8427e  thirdparty/termcolor/__init__.py
-ea649aae139d8551af513769dd913dbf  thirdparty/termcolor/termcolor.py
+d97198005a387a9d23916c616620ef7f  thirdparty/termcolor/termcolor.py
 bf55909ad163b58236e44b86e8441b26  thirdparty/wininetpton/__init__.py
 a44e7cf30f2189b2fbdb635b310cdc0c  thirdparty/wininetpton/win_inet_pton.py
 855372c870a23d46683f8aa39d75f6a1  thirdparty/xdot/__init__.py

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@`
`79`	`79`	`))`
`80`	`80`	`)`
`81`	`81`
	`82`	`+COLORS.update(dict(("light%s" % color, COLORS[color] + 60) for color in COLORS))`
	`83`	`+`
`82`	`84`
`83`	`85`	`RESET = '\033[0m'`
`84`	`86`