diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py index 472690076..d546469c5 100644 --- a/lib/core/optiondict.py +++ b/lib/core/optiondict.py @@ -201,6 +201,7 @@ optDict = { "trafficFile": "string", "answers": "string", "batch": "boolean", + "base64Parameter": "string", "binaryFields": "string", "charset": "string", "checkInternet": "boolean", diff --git a/lib/core/settings.py b/lib/core/settings.py index 32d05e916..e20b1e2df 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.4.2" +VERSION = "1.4.4.3" 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 51460e840..fc4933d67 100644 --- a/lib/parse/cmdline.py +++ b/lib/parse/cmdline.py @@ -616,6 +616,9 @@ def cmdLineParser(argv=None): general.add_argument("--answers", dest="answers", help="Set predefined answers (e.g. \"quit=N,follow=N\")") + general.add_argument("--base64", dest="base64Parameter", + help="Parameter(s) containing Base64 encoded data") + general.add_argument("--batch", dest="batch", action="store_true", help="Never ask for user input, use the default behavior") @@ -746,9 +749,6 @@ def cmdLineParser(argv=None): help="Simple wizard interface for beginner users") # Hidden and/or experimental options - parser.add_argument("--base64", dest="base64Parameter", - help=SUPPRESS) # "Parameter(s) containing Base64 encoded values" - parser.add_argument("--crack", dest="hashFile", help=SUPPRESS) # "Load and crack hashes from a file (standalone)" diff --git a/sqlmap.conf b/sqlmap.conf index e9e7d015c..cbef1f005 100644 --- a/sqlmap.conf +++ b/sqlmap.conf @@ -693,6 +693,9 @@ trafficFile = # Set predefined answers (e.g. "quit=N,follow=N"). answers = +# Parameter(s) containing Base64 encoded data +base64Parameter = + # Never ask for user input, use the default behaviour. # Valid: True or False batch = False