diff --git a/extra/vulnserver/vulnserver.py b/extra/vulnserver/vulnserver.py index 17f8b8008..3106eafeb 100644 --- a/extra/vulnserver/vulnserver.py +++ b/extra/vulnserver/vulnserver.py @@ -133,7 +133,7 @@ class ReqHandler(BaseHTTPRequestHandler): self.send_header("Content-type", "text/html; charset=%s" % UNICODE_ENCODING) self.send_header("Connection", "close") self.end_headers() - self.wfile.write(b"

GET:

link

POST:

ID:

") + self.wfile.write(b"vulnserver

GET:

link

POST:

ID:
") else: code, output = OK, "" @@ -228,7 +228,7 @@ def run(address=LISTEN_ADDRESS, port=LISTEN_PORT): global _server try: _server = ThreadingServer((address, port), ReqHandler) - print("[i] running HTTP server at '%s:%d'" % (address, port)) + print("[i] running HTTP server at 'http://%s:%d'" % (address, port)) _server.serve_forever() except KeyboardInterrupt: _server.socket.close() diff --git a/lib/controller/checks.py b/lib/controller/checks.py index 883767ae0..a78b9fd21 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -17,6 +17,7 @@ import time from extra.beep.beep import beep from lib.core.agent import agent from lib.core.common import Backend +from lib.core.common import dataToStdout from lib.core.common import extractRegexResult from lib.core.common import extractTextTagContent from lib.core.common import filterNone @@ -1594,7 +1595,10 @@ def checkConnection(suppressOutput=False): def checkInternet(): content = Request.getPage(url=CHECK_INTERNET_ADDRESS, checking=True)[0] - return CHECK_INTERNET_VALUE in (content or "") + result = CHECK_INTERNET_VALUE in (content or "") + if not result and conf.nonInteractive: + dataToStdout(repr(content)) + return result def setVerbosity(): # Cross-referenced function raise NotImplementedError diff --git a/lib/core/settings.py b/lib/core/settings.py index 33f03357f..cca17ba7d 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.4.5.32" +VERSION = "1.4.5.33" 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/core/testing.py b/lib/core/testing.py index da3b4b260..133f27047 100644 --- a/lib/core/testing.py +++ b/lib/core/testing.py @@ -39,9 +39,9 @@ def vulnTest(): TESTS = ( ("-h", ("to see full list of options run with '-hh'",)), - ("-u --flush-session --wizard --check-internet", ("Please choose:", "back-end DBMS: SQLite", "current user is DBA: True", "banner: '3.", "~no connection detected")), ("--dependencies", ("sqlmap requires", "third-party library")), - (u"-c --flush-session --roles --statements --hostname --privileges --sql-query=\"SELECT '\u0161u\u0107uraj'\" --technique=U", (u": '\u0161u\u0107uraj'", "on SQLite it is not possible")), + ("-u --flush-session --wizard", ("Please choose:", "back-end DBMS: SQLite", "current user is DBA: True", "banner: '3.")), + (u"-c --flush-session --roles --statements --hostname --privileges --sql-query=\"SELECT '\u0161u\u0107uraj'\" --technique=U --check-internet", (u": '\u0161u\u0107uraj'", "on SQLite it is not possible", "~no connection detected", "~please check your Internet connection")), (u"-u --flush-session --sql-query=\"SELECT '\u0161u\u0107uraj'\" --technique=B --no-escape --string=luther --unstable", (u": '\u0161u\u0107uraj'",)), ("--dummy", ("all tested parameters do not appear to be injectable", "does not seem to be injectable", "there is not at least one", "~might be injectable")), ("--list-tampers", ("between", "MySQL", "xforwardedfor")), @@ -87,7 +87,7 @@ def vulnTest(): try: s.connect((address, port)) s.send(b"GET / HTTP/1.0\r\n\r\n") - if s.recv(4096): + if b"vulnserver" in s.recv(4096): break except: time.sleep(1)