Another minor update

This commit is contained in:
stamparm 2013-04-30 14:11:56 +02:00
parent 08fbfda5d2
commit 16866119b8
3 changed files with 34 additions and 34 deletions

View File

@ -38,6 +38,10 @@ optDict = {
"proxy": "string", "proxy": "string",
"pCred": "string", "pCred": "string",
"ignoreProxy": "boolean", "ignoreProxy": "boolean",
"tor": "boolean",
"torPort": "integer",
"torType": "string",
"checkTor": "boolean",
"delay": "float", "delay": "float",
"timeout": "float", "timeout": "float",
"retries": "integer", "retries": "integer",
@ -173,7 +177,6 @@ optDict = {
"trafficFile": "string", "trafficFile": "string",
"batch": "boolean", "batch": "boolean",
"charset": "string", "charset": "string",
"checkTor": "boolean",
"crawlDepth": "integer", "crawlDepth": "integer",
"csvDel": "string", "csvDel": "string",
"dumpFormat": "string", "dumpFormat": "string",
@ -187,9 +190,6 @@ optDict = {
"pivotColumn": "string", "pivotColumn": "string",
"saveCmdline": "boolean", "saveCmdline": "boolean",
"updateAll": "boolean", "updateAll": "boolean",
"tor": "boolean",
"torPort": "integer",
"torType": "string",
}, },
"Miscellaneous": { "Miscellaneous": {

View File

@ -127,6 +127,20 @@ def cmdLineParser():
request.add_option("--ignore-proxy", dest="ignoreProxy", action="store_true", request.add_option("--ignore-proxy", dest="ignoreProxy", action="store_true",
help="Ignore system default HTTP proxy") help="Ignore system default HTTP proxy")
request.add_option("--tor", dest="tor",
action="store_true",
help="Use Tor anonymity network")
request.add_option("--tor-port", dest="torPort",
help="Set Tor proxy port other than default")
request.add_option("--tor-type", dest="torType",
help="Set Tor proxy type (HTTP (default), SOCKS4 or SOCKS5)")
request.add_option("--check-tor", dest="checkTor",
action="store_true",
help="Check to see if Tor is used properly")
request.add_option("--delay", dest="delay", type="float", request.add_option("--delay", dest="delay", type="float",
help="Delay in seconds between each HTTP request") help="Delay in seconds between each HTTP request")
@ -541,10 +555,6 @@ def cmdLineParser():
general.add_option("--charset", dest="charset", general.add_option("--charset", dest="charset",
help="Force character encoding used for data retrieval") help="Force character encoding used for data retrieval")
general.add_option("--check-tor", dest="checkTor",
action="store_true",
help="Check to see if Tor is used properly")
general.add_option("--crawl", dest="crawlDepth", type="int", general.add_option("--crawl", dest="crawlDepth", type="int",
help="Crawl the website starting from the target URL") help="Crawl the website starting from the target URL")
@ -591,16 +601,6 @@ def cmdLineParser():
action="store_true", action="store_true",
help="Save options to a configuration INI file") help="Save options to a configuration INI file")
general.add_option("--tor", dest="tor",
action="store_true",
help="Use Tor anonymity network")
general.add_option("--tor-port", dest="torPort",
help="Set Tor proxy port other than default")
general.add_option("--tor-type", dest="torType",
help="Set Tor proxy type (HTTP (default), SOCKS4 or SOCKS5)")
general.add_option("--update", dest="updateAll", general.add_option("--update", dest="updateAll",
action="store_true", action="store_true",
help="Update sqlmap") help="Update sqlmap")

View File

@ -98,6 +98,22 @@ pCred =
# Valid: True or False # Valid: True or False
ignoreProxy = False ignoreProxy = False
# Use Tor anonymity network.
# Valid: True or False
tor = False
# Set Tor proxy port other than default.
# Valid: integer
# torPort =
# Set Tor proxy type.
# Valid: HTTP, SOCKS4, SOCKS5
torType = HTTP
# Check to see if Tor is used properly.
# Valid: True or False
checkTor = False
# Delay in seconds between each HTTP request. # Delay in seconds between each HTTP request.
# Valid: float # Valid: float
# Default: 0 # Default: 0
@ -591,10 +607,6 @@ batch = False
# Force character encoding used for data retrieval. # Force character encoding used for data retrieval.
charset = charset =
# Check to see if Tor is used properly.
# Valid: True or False
checkTor = False
# Crawl the website starting from the target URL. # Crawl the website starting from the target URL.
# Valid: integer # Valid: integer
# Default: 0 # Default: 0
@ -639,18 +651,6 @@ parseErrors = False
# Pivot column name. # Pivot column name.
pivotColumn = pivotColumn =
# Use Tor anonymity network.
# Valid: True or False
tor = False
# Set Tor proxy port other than default.
# Valid: integer
# torPort =
# Set Tor proxy type.
# Valid: HTTP, SOCKS4, SOCKS5
torType = HTTP
# Update sqlmap. # Update sqlmap.
# Valid: True or False # Valid: True or False
updateAll = False updateAll = False