minor update

This commit is contained in:
Miroslav Stampar 2011-02-10 19:51:34 +00:00
parent 394ccb5cc5
commit 4295a78c5f
3 changed files with 10 additions and 0 deletions

View File

@ -69,6 +69,7 @@ from lib.core.settings import IS_WIN
from lib.core.settings import PLATFORM
from lib.core.settings import PYVERSION
from lib.core.settings import SITE
from lib.core.settings import DEFAULT_TOR_PROXY
from lib.core.settings import SUPPORTED_DBMS
from lib.core.settings import SUPPORTED_OS
from lib.core.settings import VERSION_STRING
@ -1129,6 +1130,9 @@ def __cleanupOptions():
conf.nullConnection = not conf.textOnly
conf.threads = 4 if conf.threads < 4 else conf.threads
if conf.tor:
conf.proxy = DEFAULT_TOR_PROXY
def __setConfAttributes():
"""
This function set some needed attributes into the configuration

View File

@ -226,6 +226,9 @@ UNICODE_ENCODING = "utf8"
# Reference: http://www.w3.org/Protocols/HTTP/Object_Headers.html#uri
URI_HTTP_HEADER = "URI"
# Default Tor proxy settings
DEFAULT_TOR_PROXY = "http://127.0.0.1:8118"
# Uri format which could be injectable (e.g. www.site.com/id82)
URI_INJECTABLE_REGEX = r".*/([^\.*?]+)\Z"

View File

@ -518,6 +518,9 @@ def cmdLineParser():
parser.add_option("--technique", dest="technique", type="int",
default=0, help=SUPPRESS_HELP)
parser.add_option("--tor", dest="tor", action="store_true",
default=False, help=SUPPRESS_HELP)
parser.add_option_group(target)
parser.add_option_group(request)
parser.add_option_group(optimization)