From a3100ff069c0500b251ca0f9da09379d31172f93 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 8 Oct 2021 16:24:54 +0200 Subject: [PATCH] Trivial refactoring of #4657 --- lib/core/settings.py | 2 +- lib/parse/cmdline.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index c210c632e..6b6365081 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.10.10" +VERSION = "1.5.10.11" 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/parse/cmdline.py b/lib/parse/cmdline.py index bd1c37dd1..3cbc2ffac 100644 --- a/lib/parse/cmdline.py +++ b/lib/parse/cmdline.py @@ -1057,12 +1057,10 @@ def cmdLineParser(argv=None): if args.dummy: args.url = args.url or DUMMY_URL - args.stdinPipe = None - if hasattr(sys.stdin, "fileno") and not os.isatty(sys.stdin.fileno()) and '-' not in sys.argv: - if args.api: - logger.info("Ignoring STDIN in API mode") - else: - args.stdinPipe = iter(sys.stdin.readline, None) + if hasattr(sys.stdin, "fileno") and not os.isatty(sys.stdin.fileno()) and '-' not in sys.argv and not args.api: + args.stdinPipe = iter(sys.stdin.readline, None) + else: + args.stdinPipe = None if not any((args.direct, args.url, args.logFile, args.bulkFile, args.googleDork, args.configFile, args.requestFile, args.updateAll, args.smokeTest, args.vulnTest, args.wizard, args.dependencies, args.purge, args.listTampers, args.hashFile, args.stdinPipe)): errMsg = "missing a mandatory option (-d, -u, -l, -m, -r, -g, -c, --wizard, --shell, --update, --purge, --list-tampers or --dependencies). "