From cccb565859d18b38af12ff917384f203244001bb Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 16 Nov 2010 14:11:32 +0000 Subject: [PATCH] cosmetics --- lib/core/optiondict.py | 22 ++++++------- lib/parse/cmdline.py | 74 +++++++++++++++++++++--------------------- sqlmap.conf | 60 +++++++++++++++++----------------- 3 files changed, 78 insertions(+), 78 deletions(-) diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py index 62fc1a752..e21c262ad 100644 --- a/lib/core/optiondict.py +++ b/lib/core/optiondict.py @@ -21,17 +21,6 @@ optDict = { "configFile": "string" }, - "General": { - "xmlFile": "string", - "sessionFile": "string", - "trafficFile": "string", - "flushSession": "boolean", - "forms": "boolean", - "eta": "boolean", - "updateAll": "boolean", - "batch": "boolean" - }, - "Request": { "method": "string", "data": "string", @@ -162,6 +151,17 @@ optDict = { "regType": "string" }, + "General": { + "xmlFile": "string", + "sessionFile": "string", + "trafficFile": "string", + "flushSession": "boolean", + "forms": "boolean", + "eta": "boolean", + "updateAll": "boolean", + "batch": "boolean" + }, + "Miscellaneous": { "beep": "boolean", "checkPayload": "boolean", diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py index 59805547c..def721859 100644 --- a/lib/parse/cmdline.py +++ b/lib/parse/cmdline.py @@ -52,42 +52,6 @@ def cmdLineParser(): target.add_option("-c", dest="configFile", help="Load options from a configuration INI file") - # General options - general = OptionGroup(parser, "General", "These options can be used " - "to set some general working parameters. " ) - - general.add_option("-x", dest="xmlFile", - help="Dump the data into an XML file") - - general.add_option("-s", dest="sessionFile", - help="Save and resume all data retrieved " - "on a session file") - - general.add_option("-t", dest="trafficFile", - help="Log all HTTP traffic into a " - "textual file") - - general.add_option("--flush-session", dest="flushSession", - action="store_true", default=False, - help="Flush session file for current target") - - general.add_option("--eta", dest="eta", - action="store_true", default=False, - help="Display for each output the " - "estimated time of arrival") - - general.add_option("--update", dest="updateAll", - action="store_true", default=False, - help="Update sqlmap") - - general.add_option("--save", dest="saveCmdline", - action="store_true", default=False, - help="Save options on a configuration INI file") - - general.add_option("--batch", dest="batch", - action="store_true", default=False, - help="Never ask for user input, use the default behaviour") - # Request options request = OptionGroup(parser, "Request", "These options can be used " "to specify how to connect to the target url.") @@ -490,6 +454,42 @@ def cmdLineParser(): windows.add_option("--reg-type", dest="regType", help="Windows registry key value type") + # General options + general = OptionGroup(parser, "General", "These options can be used " + "to set some general working parameters. " ) + + general.add_option("-x", dest="xmlFile", + help="Dump the data into an XML file") + + general.add_option("-s", dest="sessionFile", + help="Save and resume all data retrieved " + "on a session file") + + general.add_option("-t", dest="trafficFile", + help="Log all HTTP traffic into a " + "textual file") + + general.add_option("--flush-session", dest="flushSession", + action="store_true", default=False, + help="Flush session file for current target") + + general.add_option("--eta", dest="eta", + action="store_true", default=False, + help="Display for each output the " + "estimated time of arrival") + + general.add_option("--update", dest="updateAll", + action="store_true", default=False, + help="Update sqlmap") + + general.add_option("--save", dest="saveCmdline", + action="store_true", default=False, + help="Save options on a configuration INI file") + + general.add_option("--batch", dest="batch", + action="store_true", default=False, + help="Never ask for user input, use the default behaviour") + # Miscellaneous options miscellaneous = OptionGroup(parser, "Miscellaneous") @@ -535,7 +535,6 @@ def cmdLineParser(): default=False, help=SUPPRESS_HELP) parser.add_option_group(target) - parser.add_option_group(general) parser.add_option_group(request) parser.add_option_group(optimization) parser.add_option_group(injection) @@ -548,6 +547,7 @@ def cmdLineParser(): parser.add_option_group(filesystem) parser.add_option_group(takeover) parser.add_option_group(windows) + parser.add_option_group(general) parser.add_option_group(miscellaneous) args = [] diff --git a/sqlmap.conf b/sqlmap.conf index 406bd6d44..bb5246eb4 100644 --- a/sqlmap.conf +++ b/sqlmap.conf @@ -30,36 +30,6 @@ requestFile = googleDork = -# These options can be used to set some general working parameters. -[General] - -# Dump the data into an XML file. -xmlFile = - -# Save and resume all data retrieved on a session file. -sessionFile = - -# Log all HTTP traffic into a textual file. -trafficFile = - -# Flush session file for current target. -# Valid: True or False -flushSession = False - -# Retrieve each query output length and calculate the estimated time of -# arrival in real time. -# Valid: True or False -eta = False - -# Update sqlmap. -# Valid: True or False -updateAll = False - -# Never ask for user input, use the default behaviour. -# Valid: True or False -batch = False - - # These options can be used to specify how to connect to the target url. [Request] @@ -532,6 +502,36 @@ regData = regType = +# These options can be used to set some general working parameters. +[General] + +# Dump the data into an XML file. +xmlFile = + +# Save and resume all data retrieved on a session file. +sessionFile = + +# Log all HTTP traffic into a textual file. +trafficFile = + +# Flush session file for current target. +# Valid: True or False +flushSession = False + +# Retrieve each query output length and calculate the estimated time of +# arrival in real time. +# Valid: True or False +eta = False + +# Update sqlmap. +# Valid: True or False +updateAll = False + +# Never ask for user input, use the default behaviour. +# Valid: True or False +batch = False + + [Miscellaneous] # Alert with audio beep when sql injection found.