Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1da672e

Browse files
stamparmstamparm
committed
added default="False" to "store_true" parameters as it's a prefered way by http://docs.python.org/library/optparse.html 
1 parent 3b9fe3e commit 1da672e

1 file changed

Lines changed: 66 additions & 51 deletions

File tree

‎lib/parse/cmdline.py‎

Lines changed: 66 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ def cmdLineParser():
8181
help="HTTP Cookie header")
8282

8383
request.add_option("--cookie-urlencode", dest="cookieUrlencode",
84-
action="store_true",
84+
action="store_true", default=False,
8585
help="URL Encode generated cookie injections")
8686

8787
request.add_option("--drop-set-cookie", dest="dropSetCookie",
88-
action="store_true",
88+
action="store_true", default=False,
8989
help="Ignore Set-Cookie header from response")
9090

9191
request.add_option("--user-agent", dest="agent",
@@ -114,18 +114,17 @@ def cmdLineParser():
114114
"key_file,cert_file)")
115115

116116
request.add_option("--keep-alive", dest="keepAlive", action="store_true",
117-
help="Use persistent HTTP(s) connections")
117+
default=False, help="Use persistent HTTP(s) connections")
118118

119119
request.add_option("--proxy", dest="proxy",
120120
help="Use a HTTP proxy to connect to the target url")
121121

122122
request.add_option("--proxy-cred", dest="pCred",
123123
help="Proxy authentication credentials "
124124
"(name:password)")
125-
126-
request.add_option("--ignore-proxy", dest="ignoreProxy",
127-
action="store_true",
128-
help="Ignore system default HTTP proxy")
125+
126+
request.add_option("--ignore-proxy", dest="ignoreProxy", action="store_true",
127+
default=False, help="Ignore system default HTTP proxy")
129128

130129
request.add_option("--threads", dest="threads", type="int", default=1,
131130
help="Maximum number of concurrent HTTP "
@@ -198,7 +197,7 @@ def cmdLineParser():
198197
help="Use defined string for space instead of standard ' '")
199198

200199
injection.add_option("--use-between", dest="useBetween",
201-
action="store_true",
200+
action="store_true", default=False,
202201
help="Use operator BETWEEN instead of default '>'")
203202

204203
# Techniques options
@@ -209,12 +208,12 @@ def cmdLineParser():
209208
"the default blind SQL injection technique.")
210209

211210
techniques.add_option("--stacked-test", dest="stackedTest",
212-
action="store_true",
211+
action="store_true", default=False,
213212
help="Test for stacked queries (multiple "
214213
"statements) support")
215214

216215
techniques.add_option("--time-test", dest="timeTest",
217-
action="store_true",
216+
action="store_true", default=False,
218217
help="Test for time based blind SQL injection")
219218

220219
techniques.add_option("--time-sec", dest="timeSec",
@@ -223,14 +222,14 @@ def cmdLineParser():
223222
"(default 5)")
224223

225224
techniques.add_option("--union-test", dest="unionTest",
226-
action="store_true",
225+
action="store_true", default=False,
227226
help="Test for UNION query (inband) SQL injection")
228227

229228
techniques.add_option("--union-tech", dest="uTech",
230229
help="Technique to test for UNION query SQL injection")
231230

232231
techniques.add_option("--union-use", dest="unionUse",
233-
action="store_true",
232+
action="store_true", default=False,
234233
help="Use the UNION query (inband) SQL injection "
235234
"to retrieve the queries output. No "
236235
"need to go blind")
@@ -239,7 +238,7 @@ def cmdLineParser():
239238
fingerprint = OptionGroup(parser, "Fingerprint")
240239

241240
fingerprint.add_option("-f", "--fingerprint", dest="extensiveFp",
242-
action="store_true",
241+
action="store_true", default=False,
243242
help="Perform an extensive DBMS version fingerprint")
244243

245244
# Enumeration options
@@ -250,52 +249,52 @@ def cmdLineParser():
250249
"you can run your own SQL statements.")
251250

252251
enumeration.add_option("-b", "--banner", dest="getBanner",
253-
action="store_true", help="Retrieve DBMS banner")
252+
action="store_true", default=False, help="Retrieve DBMS banner")
254253

255254
enumeration.add_option("--current-user", dest="getCurrentUser",
256-
action="store_true",
255+
action="store_true", default=False,
257256
help="Retrieve DBMS current user")
258257

259258
enumeration.add_option("--current-db", dest="getCurrentDb",
260-
action="store_true",
259+
action="store_true", default=False,
261260
help="Retrieve DBMS current database")
262261

263262
enumeration.add_option("--is-dba", dest="isDba",
264-
action="store_true",
263+
action="store_true", default=False,
265264
help="Detect if the DBMS current user is DBA")
266265

267266
enumeration.add_option("--users", dest="getUsers", action="store_true",
268-
help="Enumerate DBMS users")
267+
default=False, help="Enumerate DBMS users")
269268

270269
enumeration.add_option("--passwords", dest="getPasswordHashes",
271-
action="store_true",
270+
action="store_true", default=False,
272271
help="Enumerate DBMS users password hashes")
273272

274273
enumeration.add_option("--privileges", dest="getPrivileges",
275-
action="store_true",
274+
action="store_true", default=False,
276275
help="Enumerate DBMS users privileges")
277276

278277
enumeration.add_option("--roles", dest="getRoles",
279-
action="store_true",
278+
action="store_true", default=False,
280279
help="Enumerate DBMS users roles")
281280

282281
enumeration.add_option("--dbs", dest="getDbs", action="store_true",
283-
help="Enumerate DBMS databases")
282+
default=False, help="Enumerate DBMS databases")
284283

285284
enumeration.add_option("--tables", dest="getTables", action="store_true",
286-
help="Enumerate DBMS database tables")
285+
default=False, help="Enumerate DBMS database tables")
287286

288287
enumeration.add_option("--columns", dest="getColumns", action="store_true",
289-
help="Enumerate DBMS database table columns")
288+
default=False, help="Enumerate DBMS database table columns")
290289

291290
enumeration.add_option("--dump", dest="dumpTable", action="store_true",
292-
help="Dump DBMS database table entries")
291+
default=False, help="Dump DBMS database table entries")
293292

294293
enumeration.add_option("--dump-all", dest="dumpAll", action="store_true",
295-
help="Dump all DBMS databases tables entries")
294+
default=False, help="Dump all DBMS databases tables entries")
296295

297296
enumeration.add_option("--search", dest="search", action="store_true",
298-
help="Search column(s), table(s) and/or database name(s)")
297+
default=False, help="Search column(s), table(s) and/or database name(s)")
299298

300299
enumeration.add_option("-D", dest="db",
301300
help="DBMS database to enumerate")
@@ -310,7 +309,7 @@ def cmdLineParser():
310309
help="DBMS user to enumerate")
311310

312311
enumeration.add_option("--exclude-sysdbs", dest="excludeSysDbs",
313-
action="store_true",
312+
action="store_true", default=False,
314313
help="Exclude DBMS system databases when "
315314
"enumerating tables")
316315

@@ -330,7 +329,7 @@ def cmdLineParser():
330329
help="SQL statement to be executed")
331330

332331
enumeration.add_option("--sql-shell", dest="sqlShell",
333-
action="store_true",
332+
action="store_true", default=False,
334333
help="Prompt for an interactive SQL shell")
335334

336335
# User-defined function options
@@ -339,7 +338,7 @@ def cmdLineParser():
339338
"functions.")
340339

341340
udf.add_option("--udf-inject", dest="udfInject", action="store_true",
342-
help="Inject custom user-defined functions")
341+
default=False, help="Inject custom user-defined functions")
343342

344343
udf.add_option("--shared-lib", dest="shLib",
345344
help="Local path of the shared library")
@@ -370,23 +369,28 @@ def cmdLineParser():
370369
takeover.add_option("--os-cmd", dest="osCmd",
371370
help="Execute an operating system command")
372371

373-
takeover.add_option("--os-shell", dest="osShell", action="store_true",
372+
takeover.add_option("--os-shell", dest="osShell",
373+
action="store_true", default=False,
374374
help="Prompt for an interactive operating "
375375
"system shell")
376376

377-
takeover.add_option("--os-pwn", dest="osPwn", action="store_true",
377+
takeover.add_option("--os-pwn", dest="osPwn",
378+
action="store_true", default=False,
378379
help="Prompt for an out-of-band shell, "
379380
"meterpreter or VNC")
380381

381-
takeover.add_option("--os-smbrelay", dest="osSmb", action="store_true",
382+
takeover.add_option("--os-smbrelay", dest="osSmb",
383+
action="store_true", default=False,
382384
help="One click prompt for an OOB shell, "
383385
"meterpreter or VNC")
384386

385-
takeover.add_option("--os-bof", dest="osBof", action="store_true",
387+
takeover.add_option("--os-bof", dest="osBof",
388+
action="store_true", default=False,
386389
help="Stored procedure buffer overflow "
387390
"exploitation")
388391

389-
takeover.add_option("--priv-esc", dest="privEsc", action="store_true",
392+
takeover.add_option("--priv-esc", dest="privEsc",
393+
action="store_true", default=False,
390394
help="Database process' user privilege escalation")
391395

392396
takeover.add_option("--msf-path", dest="msfPath",
@@ -403,13 +407,16 @@ def cmdLineParser():
403407
"database management system Windows "
404408
"registry.")
405409

406-
windows.add_option("--reg-read", dest="regRead", action="store_true",
410+
windows.add_option("--reg-read", dest="regRead",
411+
action="store_true", default=False,
407412
help="Read a Windows registry key value")
408413

409-
windows.add_option("--reg-add", dest="regAdd", action="store_true",
414+
windows.add_option("--reg-add", dest="regAdd",
415+
action="store_true", default=False,
410416
help="Write a Windows registry key value data")
411417

412-
windows.add_option("--reg-del", dest="regDel", action="store_true",
418+
windows.add_option("--reg-del", dest="regDel",
419+
action="store_true", default=False,
413420
help="Delete a Windows registry key value")
414421

415422
windows.add_option("--reg-key", dest="regKey",
@@ -427,7 +434,8 @@ def cmdLineParser():
427434
# Miscellaneous options
428435
miscellaneous = OptionGroup(parser, "Miscellaneous")
429436

430-
miscellaneous.add_option("-o", dest="optimize", action="store_true",
437+
miscellaneous.add_option("-o", dest="optimize",
438+
action="store_true", default=False,
431439
help="General optimization switch")
432440

433441
miscellaneous.add_option("-x", dest="xmlFile",
@@ -437,50 +445,57 @@ def cmdLineParser():
437445
help="Save and resume all data retrieved "
438446
"on a session file")
439447

440-
miscellaneous.add_option("--flush-session", dest="flushSession", action="store_true",
448+
miscellaneous.add_option("--flush-session", dest="flushSession",
449+
action="store_true", default=False,
441450
help="Flush session file for current target")
442451

443-
miscellaneous.add_option("--eta", dest="eta", action="store_true",
452+
miscellaneous.add_option("--eta", dest="eta",
453+
action="store_true", default=False,
444454
help="Display for each output the "
445455
"estimated time of arrival")
446456

447457
miscellaneous.add_option("--gpage", dest="googlePage", type="int",
448458
help="Use google dork results from specified page number")
449459

450-
miscellaneous.add_option("--update", dest="updateAll", action="store_true",
460+
miscellaneous.add_option("--update", dest="updateAll",
461+
action="store_true", default=False,
451462
help="Update sqlmap")
452463

453-
miscellaneous.add_option("--save", dest="saveCmdline", action="store_true",
464+
miscellaneous.add_option("--save", dest="saveCmdline",
465+
action="store_true", default=False,
454466
help="Save options on a configuration INI file")
455467

456-
miscellaneous.add_option("--batch", dest="batch", action="store_true",
468+
miscellaneous.add_option("--batch", dest="batch",
469+
action="store_true", default=False,
457470
help="Never ask for user input, use the default behaviour")
458471

459-
miscellaneous.add_option("--cleanup", dest="cleanup", action="store_true",
472+
miscellaneous.add_option("--cleanup", dest="cleanup",
473+
action="store_true", default=False,
460474
help="Clean up the DBMS by sqlmap specific "
461475
"UDF and tables")
462476

463-
miscellaneous.add_option("--replicate", dest="replicate", action="store_true",
477+
miscellaneous.add_option("--replicate", dest="replicate",
478+
action="store_true", default=False,
464479
help="Replicate dumped data into a sqlite3 database")
465480

466481
# Hidden and/or experimental options
467482
parser.add_option("--profile", dest="profile", action="store_true",
468-
help=SUPPRESS_HELP)
483+
default=False, help=SUPPRESS_HELP)
469484

470485
parser.add_option("--cpu-throttle", dest="cpuThrottle", type="int", default=10,
471486
help=SUPPRESS_HELP)
472487

473488
parser.add_option("--common-prediction", dest="useCommonPrediction", action="store_true",
474-
help=SUPPRESS_HELP)
489+
default=False, help=SUPPRESS_HELP)
475490

476491
parser.add_option("--null-connection", dest="useNullConnection", action="store_true",
477-
help=SUPPRESS_HELP)
492+
default=False, help=SUPPRESS_HELP)
478493

479494
parser.add_option("--smoke-test", dest="smokeTest", action="store_true",
480-
help=SUPPRESS_HELP)
495+
default=False, help=SUPPRESS_HELP)
481496

482497
parser.add_option("--live-test", dest="liveTest", action="store_true",
483-
help=SUPPRESS_HELP)
498+
default=False, help=SUPPRESS_HELP)
484499

485500
parser.add_option_group(target)
486501
parser.add_option_group(request)

0 commit comments

Comments
 (0)