diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1c1c6ea42..f8fa2add2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,6 +13,8 @@ jobs: python-version: [ '2.x', '3.x', 'pypy-2.7', 'pypy-3.6', 'pypy-3.7' ] steps: - uses: actions/checkout@v2 + - name: faketty + uses: Yuri6037/Action-FakeTTY@v1.1 - name: Set up Python uses: actions/setup-python@v2 with: diff --git a/lib/core/settings.py b/lib/core/settings.py index 3afcc4813..6c7a4cf64 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -20,7 +20,7 @@ from thirdparty import six from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.5.9.14" +VERSION = "1.5.9.15" 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 be60eb099..12706246c 100644 --- a/lib/core/testing.py +++ b/lib/core/testing.py @@ -143,7 +143,7 @@ def vulnTest(): for tag, value in (("", url), ("", base), ("", direct), ("", tmpdir), ("", request), ("", log), ("", multiple), ("", config), ("", url.replace("id=1", "id=MZ=%3d"))): options = options.replace(tag, value) - cmd = "%s \"%s\" %s --batch --non-interactive --testing --debug" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "sqlmap.py")), options) + cmd = "%s \"%s\" %s --batch --non-interactive --debug" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "sqlmap.py")), options) if "" in cmd: handle, tmp = tempfile.mkstemp() @@ -153,7 +153,6 @@ def vulnTest(): if "" in cmd: cmd = re.sub(r"\s*", "", cmd) cmd = "echo %s | %s" % (url, cmd) - cmd = cmd.replace("--testing ", "") output = shellExec(cmd) diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py index 299b44d86..5dacb84b5 100644 --- a/lib/parse/cmdline.py +++ b/lib/parse/cmdline.py @@ -815,9 +815,6 @@ def cmdLineParser(argv=None): parser.add_argument("--non-interactive", dest="nonInteractive", action="store_true", help=SUPPRESS) - parser.add_argument("--testing", dest="testing", action="store_true", - help=SUPPRESS) - parser.add_argument("--gui", dest="gui", action="store_true", help=SUPPRESS) @@ -1063,7 +1060,7 @@ def cmdLineParser(argv=None): if args.dummy: args.url = args.url or DUMMY_URL - if hasattr(sys.stdin, "fileno") and not os.isatty(sys.stdin.fileno()) and '-' not in sys.argv and "--testing" not in sys.argv: + if hasattr(sys.stdin, "fileno") and not os.isatty(sys.stdin.fileno()) and '-' not in sys.argv: args.stdinPipe = iter(sys.stdin.readline, None) else: args.stdinPipe = None