From 6a1e0fb497dbe61573fc882e057a55a32f691fc6 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 27 May 2020 18:39:48 +0200 Subject: [PATCH] Travis CI patch (no more --check-internet) --- lib/controller/checks.py | 6 +----- lib/core/settings.py | 2 +- lib/core/testing.py | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/controller/checks.py b/lib/controller/checks.py index a78b9fd21..883767ae0 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -17,7 +17,6 @@ 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 @@ -1595,10 +1594,7 @@ def checkConnection(suppressOutput=False): def checkInternet(): content = Request.getPage(url=CHECK_INTERNET_ADDRESS, checking=True)[0] - result = CHECK_INTERNET_VALUE in (content or "") - if not result and conf.nonInteractive: - dataToStdout(repr(content)) - return result + return CHECK_INTERNET_VALUE in (content or "") def setVerbosity(): # Cross-referenced function raise NotImplementedError diff --git a/lib/core/settings.py b/lib/core/settings.py index cca17ba7d..ba685d0ac 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.33" +VERSION = "1.4.5.34" 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 133f27047..cb9fe70d9 100644 --- a/lib/core/testing.py +++ b/lib/core/testing.py @@ -41,7 +41,7 @@ def vulnTest(): ("-h", ("to see full list of options run with '-hh'",)), ("--dependencies", ("sqlmap requires", "third-party library")), ("-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"-c --flush-session --roles --statements --hostname --privileges --sql-query=\"SELECT '\u0161u\u0107uraj'\" --technique=U", (u": '\u0161u\u0107uraj'", "on SQLite it is not possible")), (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")),