From 57511ac9df53b65489b56891493f412d955c8190 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 4 Oct 2019 14:12:15 +0200 Subject: [PATCH] Trivial update --- lib/core/settings.py | 2 +- lib/request/basicauthhandler.py | 1 + lib/takeover/metasploit.py | 4 ++-- thirdparty/identywaf/data.json | 10 ++++++++++ thirdparty/identywaf/identYwaf.py | 8 +++++--- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index ca50518b8..d4f532865 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.3.10.4" +VERSION = "1.3.10.5" 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/basicauthhandler.py b/lib/request/basicauthhandler.py index b24bfaa2b..58eec7d4e 100644 --- a/lib/request/basicauthhandler.py +++ b/lib/request/basicauthhandler.py @@ -12,6 +12,7 @@ class SmartHTTPBasicAuthHandler(_urllib.request.HTTPBasicAuthHandler): Reference: http://selenic.com/hg/rev/6c51a5056020 Fix for a: http://bugs.python.org/issue8797 """ + def __init__(self, *args, **kwargs): _urllib.request.HTTPBasicAuthHandler.__init__(self, *args, **kwargs) self.retried_req = set() diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py index 83762aaca..48fe9e305 100644 --- a/lib/takeover/metasploit.py +++ b/lib/takeover/metasploit.py @@ -692,9 +692,9 @@ class Metasploit(object): self._runMsfCliSmbrelay() if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.PGSQL): - self.uncPath = "\\\\\\\\%s\\\\%s" % (self.lhostStr, self._randFile) + self.uncPath = r"\\\\%s\\%s" % (self.lhostStr, self._randFile) else: - self.uncPath = "\\\\%s\\%s" % (self.lhostStr, self._randFile) + self.uncPath = r"\\%s\%s" % (self.lhostStr, self._randFile) debugMsg = "Metasploit Framework console exited with return " debugMsg += "code %s" % self._controlMsfCmd(self._msfCliProc, self.uncPathRequest) diff --git a/thirdparty/identywaf/data.json b/thirdparty/identywaf/data.json index 88b73aa67..dd0d6f4a2 100644 --- a/thirdparty/identywaf/data.json +++ b/thirdparty/identywaf/data.json @@ -356,6 +356,16 @@ "regex": "The (ISA Server|server) denied the specified Uniform Resource Locator \\(URL\\)", "signatures": [] }, + "ithemes": { + "company": "iThemes", + "name": "iThemes Security", + "regex": "", + "signatures": [ + "c70f:RVZXum60OEhCWKpAYKYPkoJyWOpohM4IiUYMr2RWg1uQJLX3uhZOnthtOj+hXrAA16FcPhJOdLoXomtKaK59nui7c4RmkgI2FZjxtDtAeq+c36A4chW1XaTC", + "71ee:RVZXum60OEhCWKpAYKYPkoJyWOpohM4IiUYMr2RWg1qQJLX2uhZOnthtOj+hXrAA16FcPhJOdLoXomtKaK59nui7c4RmkgI2FZjxtDtAeq+c36A4chW1XaTC" + ], + "note": "Formerly Better WP Security" + }, "janusec": { "company": "Janusec", "name": "Janusec Application Gateway", diff --git a/thirdparty/identywaf/identYwaf.py b/thirdparty/identywaf/identYwaf.py index 11cf811a2..80f0d71ce 100755 --- a/thirdparty/identywaf/identYwaf.py +++ b/thirdparty/identywaf/identYwaf.py @@ -27,7 +27,9 @@ import sys import time import zlib -if sys.version_info >= (3, 0): +PY3 = sys.version_info >= (3, 0) + +if PY3: import http.cookiejar import http.client as httplib import urllib.request @@ -58,7 +60,7 @@ else: HTTPCookieProcessor = urllib2.HTTPCookieProcessor NAME = "identYwaf" -VERSION = "1.0.114" +VERSION = "1.0.122" BANNER = r""" ` __ __ ` ____ ___ ___ ____ ______ `| T T` __ __ ____ _____ @@ -356,7 +358,7 @@ def init(): os.chdir(os.path.abspath(os.path.dirname(__file__))) # Reference: http://blog.mathieu-leplatre.info/python-utf-8-print-fails-when-redirecting-stdout.html - if IS_TTY: + if not PY3 and not IS_TTY: sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.stdout) print(colorize("[o] initializing handlers..."))