From a87f075f32e40dba06a6ad042d9d934bef04382f Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 19 Aug 2014 15:38:38 +0200 Subject: requirements.txt: use dependencies specified in setup.py --- requirements.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index c8faa9e1..cca32743 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,2 @@ -Flask>=0.10.1 -Jinja2>=2.7.1 -MarkupSafe>=0.18 -Werkzeug>=0.9.4 -itsdangerous>=0.23 -pyOpenSSL>=0.13.1 -pyasn1>=0.1.7 -requests>=2.1.0 -netlib>=0.10 \ No newline at end of file +-e --src .. git+https://github.com/mitmproxy/netlib.git#egg=netlib +-e . \ No newline at end of file -- cgit v1.2.3 From 2b9a604351124d5b85eba78f6d33b82194d64472 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 30 Aug 2014 17:40:33 +0200 Subject: fix travis --- .travis.yml | 5 ++--- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2cc19030..bf33db2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,8 @@ python: - "2.7" # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git" - - "pip install -r requirements.txt --use-mirrors" - - "pip install -r test/requirements.txt --use-mirrors" + - "pip install -r requirements.txt" + - "pip install -r test/requirements.txt" # command to run tests, e.g. python setup.py test script: - "nosetests --with-cov --cov-report term-missing" diff --git a/requirements.txt b/requirements.txt index cca32743..94ee067f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ --e --src .. git+https://github.com/mitmproxy/netlib.git#egg=netlib +--src .. -e git+https://github.com/mitmproxy/netlib.git#egg=netlib -e . \ No newline at end of file -- cgit v1.2.3 From e75f3746bbef184ff2796e448146348983c12824 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 30 Aug 2014 18:07:13 +0200 Subject: try harder to fix travis --- .travis.yml | 3 +-- requirements.txt | 4 ++-- setup.py | 61 +++++++++++++++++++++++++++++++-------------------- test/requirements.txt | 4 ---- 4 files changed, 40 insertions(+), 32 deletions(-) delete mode 100644 test/requirements.txt diff --git a/.travis.yml b/.travis.yml index bf33db2b..7c4dca92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ python: - "2.7" # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - - "pip install -r requirements.txt" - - "pip install -r test/requirements.txt" + - "pip install --src .. -r requirements.txt" # command to run tests, e.g. python setup.py test script: - "nosetests --with-cov --cov-report term-missing" diff --git a/requirements.txt b/requirements.txt index 94ee067f..32d67bf9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ ---src .. -e git+https://github.com/mitmproxy/netlib.git#egg=netlib --e . \ No newline at end of file +-e git+https://github.com/mitmproxy/netlib.git#egg=netlib +-e . [dev] \ No newline at end of file diff --git a/setup.py b/setup.py index a72cfe00..5e3a6266 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,7 @@ from distutils.core import setup import fnmatch, os.path from libpathod import version + def _fnmatch(name, patternList): for i in patternList: if fnmatch.fnmatch(name, i): @@ -65,30 +66,42 @@ def findPackages(path, dataExclude=[]): return packages, package_data -long_description = file("README.txt","rb").read() +long_description = file("README.txt", "rb").read() packages, package_data = findPackages("libpathod") setup( - name = "pathod", - version = version.VERSION, - description = "A pathological HTTP/S daemon for testing and stressing clients.", - long_description = long_description, - author = "Aldo Cortesi", - author_email = "aldo@corte.si", - url = "http://pathod.net", - packages = packages, - package_data = package_data, - scripts = ["pathod", "pathoc"], - classifiers = [ - "License :: OSI Approved :: MIT License", - "Development Status :: 5 - Production/Stable", - "Operating System :: POSIX", - "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Topic :: Internet", - "Topic :: Internet :: WWW/HTTP :: HTTP Servers", - "Topic :: Software Development :: Testing", - "Topic :: Software Development :: Testing :: Traffic Generation", - "Topic :: Internet :: WWW/HTTP", - ], - install_requires=['netlib>=%s'%version.MINORVERSION, "requests>=1.1.0", "Flask>=0.10.1"] + name="pathod", + version=version.VERSION, + description="A pathological HTTP/S daemon for testing and stressing clients.", + long_description=long_description, + author="Aldo Cortesi", + author_email="aldo@corte.si", + url="http://pathod.net", + packages=packages, + package_data=package_data, + scripts=["pathod", "pathoc"], + classifiers=[ + "License :: OSI Approved :: MIT License", + "Development Status :: 5 - Production/Stable", + "Operating System :: POSIX", + "Programming Language :: Python", + "Programming Language :: Python :: 2", + "Topic :: Internet", + "Topic :: Internet :: WWW/HTTP :: HTTP Servers", + "Topic :: Software Development :: Testing", + "Topic :: Software Development :: Testing :: Traffic Generation", + "Topic :: Internet :: WWW/HTTP", + ], + install_requires=[ + 'netlib>=%s' % version.MINORVERSION, + "requests>=1.1.0", + "Flask>=0.10.1" + ], + extra_require={ + 'dev': [ + "mock>=1.0.1", + "nose>=1.3.0", + "nose-cov>=1.6", + "coveralls>=0.4.1" + ] + } ) diff --git a/test/requirements.txt b/test/requirements.txt deleted file mode 100644 index 1bfe2b7b..00000000 --- a/test/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -mock>=1.0.1 -nose>=1.3.0 -nose-cov>=1.6 -coveralls>=0.4.1 \ No newline at end of file -- cgit v1.2.3 From 49bbc5f94147d8176f129fdc578af72f399897c1 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 30 Aug 2014 18:12:34 +0200 Subject: try harderer to fix travis --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 32d67bf9..69bd183b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -e git+https://github.com/mitmproxy/netlib.git#egg=netlib --e . [dev] \ No newline at end of file +-e .[dev] \ No newline at end of file -- cgit v1.2.3 From 198d3c88a3fde4bbf5f2b18d55853ea78c79eb17 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 30 Aug 2014 18:16:16 +0200 Subject: try hardererer to fix travis --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5e3a6266..038e816a 100644 --- a/setup.py +++ b/setup.py @@ -96,7 +96,7 @@ setup( "requests>=1.1.0", "Flask>=0.10.1" ], - extra_require={ + extras_require={ 'dev': [ "mock>=1.0.1", "nose>=1.3.0", -- cgit v1.2.3 From 658a56a1ac74f42c1dc0903d3092335a5b851382 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 31 Aug 2014 02:09:04 +0200 Subject: use setuptools entrypoints rather than scripts --- libpathod/main.py | 401 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ pathoc | 170 ----------------------- pathod | 234 ------------------------------- setup.py | 7 +- 4 files changed, 407 insertions(+), 405 deletions(-) create mode 100644 libpathod/main.py delete mode 100755 pathoc delete mode 100755 pathod diff --git a/libpathod/main.py b/libpathod/main.py new file mode 100644 index 00000000..6f53832d --- /dev/null +++ b/libpathod/main.py @@ -0,0 +1,401 @@ +#!/usr/bin/env python +import argparse, sys, logging, logging.handlers, os +from . import pathoc as _pathoc, pathod as _pathod, utils, version, language +from netlib import tcp, http_uastrings + + +def pathoc(): + preparser = argparse.ArgumentParser(add_help=False) + preparser.add_argument( + "--show-uas", dest="showua", action="store_true", default=False, + help="Print user agent shortcuts and exit." + ) + pa = preparser.parse_known_args()[0] + if pa.showua: + print "User agent strings:" + for i in http_uastrings.UASTRINGS: + print " ", i[1], i[0] + sys.exit(0) + + parser = argparse.ArgumentParser(description='A perverse HTTP client.', parents=[preparser]) + parser.add_argument('--version', action='version', version="pathoc " + version.VERSION) + parser.add_argument( + "-c", dest="connect_to", type=str, default=False, + metavar = "HOST:PORT", + help="Issue an HTTP CONNECT to connect to the specified host." + ) + parser.add_argument( + "-n", dest='repeat', default=1, type=int, metavar="N", + help='Repeat requests N times' + ) + parser.add_argument( + "-p", dest="port", type=int, default=None, + help="Port. Defaults to 80, or 443 if SSL is active" + ) + parser.add_argument( + "-t", dest="timeout", type=int, default=None, + help="Connection timeout" + ) + parser.add_argument( + 'host', type=str, + help='Host to connect to' + ) + parser.add_argument( + 'request', type=str, nargs="+", + help='Request specification' + ) + + group = parser.add_argument_group( + 'SSL', + ) + group.add_argument( + "-s", dest="ssl", action="store_true", default=False, + help="Connect with SSL" + ) + group.add_argument( + "-C", dest="clientcert", type=str, default=False, + help="Path to a file containing client certificate and private key" + ) + group.add_argument( + "-i", dest="sni", type=str, default=False, + help="SSL Server Name Indication" + ) + group.add_argument( + "--ciphers", dest="ciphers", type=str, default=False, + help="SSL cipher specification" + ) + group.add_argument( + "--sslversion", dest="sslversion", type=int, default=4, + choices=[1, 2, 3, 4], + help="Use a specified protocol - TLSv1, SSLv2, SSLv3, SSLv23. Default to SSLv23." + ) + + group = parser.add_argument_group( + 'Controlling Output', + """ + Some of these options expand generated values for logging - if + you're generating large data, use them with caution. + """ + ) + group.add_argument( + "-I", dest="ignorecodes", type=str, default="", + help="Comma-separated list of response codes to ignore" + ) + group.add_argument( + "-S", dest="showssl", action="store_true", default=False, + help="Show info on SSL connection" + ) + group.add_argument( + "-e", dest="explain", action="store_true", default=False, + help="Explain requests" + ) + group.add_argument( + "-o", dest="oneshot", action="store_true", default=False, + help="Oneshot - exit after first non-ignored response" + ) + group.add_argument( + "-q", dest="showreq", action="store_true", default=False, + help="Print full request" + ) + group.add_argument( + "-r", dest="showresp", action="store_true", default=False, + help="Print full response" + ) + group.add_argument( + "-T", dest="ignoretimeout", action="store_true", default=False, + help="Ignore timeouts" + ) + group.add_argument( + "-x", dest="hexdump", action="store_true", default=False, + help="Output in hexdump format" + ) + + args = parser.parse_args() + + if args.port is None: + port = 443 if args.ssl else 80 + else: + port = args.port + + try: + codes = [int(i) for i in args.ignorecodes.split(",") if i] + except ValueError: + parser.error("Invalid return code specification: %s"%args.ignorecodes) + + if args.connect_to: + parts = args.connect_to.split(":") + if len(parts) != 2: + parser.error("Invalid CONNECT specification: %s"%args.connect_to) + try: + parts[1] = int(parts[1]) + except ValueError: + parser.error("Invalid CONNECT specification: %s"%args.connect_to) + connect_to = parts + else: + connect_to = None + + try: + for i in range(args.repeat): + p = _pathoc.Pathoc( + (args.host, port), + ssl=args.ssl, + sni=args.sni, + sslversion=args.sslversion, + clientcert=args.clientcert, + ciphers=args.ciphers + ) + try: + p.connect(connect_to) + except (tcp.NetLibError, _pathoc.PathocError), v: + print >> sys.stderr, str(v) + sys.exit(1) + if args.timeout: + p.settimeout(args.timeout) + for spec in args.request: + ret = p.print_request( + spec, + showreq=args.showreq, + showresp=args.showresp, + explain=args.explain, + showssl=args.showssl, + hexdump=args.hexdump, + ignorecodes=codes, + ignoretimeout=args.ignoretimeout + ) + sys.stdout.flush() + if ret and args.oneshot: + sys.exit(0) + except KeyboardInterrupt: + pass + + +def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'): + try: + pid = os.fork() + if pid > 0: + sys.exit(0) + except OSError, e: + sys.stderr.write("fork #1 failed: (%d) %s\n" % (e.errno, e.strerror)) + sys.exit(1) + os.chdir("/") + os.umask(0) + os.setsid() + try: + pid = os.fork() + if pid > 0: + sys.exit(0) + except OSError, e: + sys.stderr.write("fork #2 failed: (%d) %s\n" % (e.errno, e.strerror)) + sys.exit(1) + si = open(stdin, 'rb') + so = open(stdout, 'a+b') + se = open(stderr, 'a+b', 0) + os.dup2(si.fileno(), sys.stdin.fileno()) + os.dup2(so.fileno(), sys.stdout.fileno()) + os.dup2(se.fileno(), sys.stderr.fileno()) + + +def pathod_main(parser, args): + certs = [] + for i in args.ssl_certs: + parts = i.split("=", 1) + if len(parts) == 1: + parts = ["*", parts[0]] + parts[1] = os.path.expanduser(parts[1]) + if not os.path.exists(parts[1]): + parser.error("Certificate file does not exist: %s"%parts[1]) + certs.append(parts) + + ssloptions = _pathod.SSLOptions( + cn = args.cn, + confdir = args.confdir, + not_after_connect = args.ssl_not_after_connect, + ciphers = args.ciphers, + sslversion = utils.SSLVERSIONS[args.sslversion], + certs = certs + ) + + alst = [] + for i in args.anchors: + parts = utils.parse_anchor_spec(i) + if not parts: + parser.error("Invalid anchor specification: %s"%i) + alst.append(parts) + + root = logging.getLogger() + if root.handlers: + for handler in root.handlers: + root.removeHandler(handler) + + log = logging.getLogger('pathod') + log.setLevel(logging.DEBUG) + fmt = logging.Formatter( + '%(asctime)s: %(message)s', + datefmt='%d-%m-%y %H:%M:%S', + ) + if args.logfile: + fh = logging.handlers.WatchedFileHandler(args.logfile) + fh.setFormatter(fmt) + log.addHandler(fh) + if not args.daemonize: + sh = logging.StreamHandler() + sh.setFormatter(fmt) + log.addHandler(sh) + + sizelimit = None + if args.sizelimit: + try: + sizelimit = utils.parse_size(args.sizelimit) + except ValueError, v: + parser.error(v) + + try: + pd = _pathod.Pathod( + (args.address, args.port), + craftanchor = args.craftanchor, + ssl = args.ssl, + ssloptions = ssloptions, + staticdir = args.staticdir, + anchors = alst, + sizelimit = sizelimit, + noweb = args.noweb, + nocraft = args.nocraft, + noapi = args.noapi, + nohang = args.nohang, + timeout = args.timeout, + logreq = args.logreq, + logresp = args.logresp, + hexdump = args.hexdump, + explain = args.explain, + ) + except _pathod.PathodError, v: + parser.error(str(v)) + except language.FileAccessDenied, v: + parser.error("%s You probably want to a -d argument."%str(v)) + + try: + print "%s listening on %s:%s"%(version.NAMEVERSION, pd.address.host, pd.address.port) + pd.serve_forever() + except KeyboardInterrupt: + pass + + +def pathod(): + parser = argparse.ArgumentParser(description='A pathological HTTP/S daemon.') + parser.add_argument('--version', action='version', version="pathod " + version.VERSION) + parser.add_argument("-p", dest='port', default=9999, type=int, help='Port. Specify 0 to pick an arbitrary empty port.') + parser.add_argument("-l", dest='address', default="127.0.0.1", type=str, help='Listening address.') + parser.add_argument( + "-a", dest='anchors', default=[], type=str, action="append", metavar="ANCHOR", + help='Add an anchor. Specified as a string with the form pattern=pagespec' + ) + parser.add_argument( + "-c", dest='craftanchor', default="/p/", type=str, + help='Anchorpoint for URL crafting commands.' + ) + parser.add_argument( + "--confdir", + action="store", type = str, dest="confdir", default='~/.mitmproxy', + help = "Configuration directory. (~/.mitmproxy)" + ) + parser.add_argument( + "-d", dest='staticdir', default=None, type=str, + help='Directory for static files.' + ) + parser.add_argument( + "-D", dest='daemonize', default=False, action="store_true", + help='Daemonize.' + ) + parser.add_argument( + "-t", dest="timeout", type=int, default=None, + help="Connection timeout" + ) + parser.add_argument( + "--limit-size", dest='sizelimit', default=None, type=str, + help='Size limit of served responses. Understands size suffixes, i.e. 100k.' + ) + parser.add_argument( + "--noapi", dest='noapi', default=False, action="store_true", + help='Disable API.' + ) + parser.add_argument( + "--nohang", dest='nohang', default=False, action="store_true", + help='Disable pauses during crafted response generation.' + ) + parser.add_argument( + "--noweb", dest='noweb', default=False, action="store_true", + help='Disable both web interface and API.' + ) + parser.add_argument( + "--nocraft", dest='nocraft', default=False, action="store_true", + help='Disable response crafting. If anchors are specified, they still work.' + ) + + group = parser.add_argument_group( + 'SSL', + ) + group.add_argument( + "-s", dest='ssl', default=False, action="store_true", + help='Run in HTTPS mode.' + ) + group.add_argument( + "--cn", dest="cn", type=str, default=None, + help="CN for generated SSL certs. Default: %s"%_pathod.DEFAULT_CERT_DOMAIN + ) + group.add_argument( + "-C", dest='ssl_not_after_connect', default=False, action="store_true", + help="Don't expect SSL after a CONNECT request." + ) + group.add_argument( + "--cert", dest='ssl_certs', default=[], type=str, + metavar = "SPEC", action="append", + help='Add an SSL certificate. SPEC is of the form "[domain=]path". '\ + 'The domain may include a wildcard, and is equal to "*" if not specified. '\ + 'The file at path is a certificate in PEM format. If a private key is included in the PEM, '\ + 'it is used, else the default key in the conf dir is used. Can be passed multiple times.' + ) + group.add_argument( + "--ciphers", dest="ciphers", type=str, default=False, + help="SSL cipher specification" + ) + group.add_argument( + "--sslversion", dest="sslversion", type=int, default=4, + choices=[1, 2, 3, 4], + help="Use a specified protocol - TLSv1, SSLv2, SSLv3, SSLv23. Default to SSLv23." + ) + + group = parser.add_argument_group( + 'Controlling Logging', + """ + Some of these options expand generated values for logging - if + you're generating large data, use them with caution. + """ + ) + group.add_argument( + "-e", dest="explain", action="store_true", default=False, + help="Explain responses" + ) + group.add_argument( + "-f", dest='logfile', default=None, type=str, + help='Log to file.' + ) + group.add_argument( + "-q", dest="logreq", action="store_true", default=False, + help="Log full request" + ) + group.add_argument( + "-r", dest="logresp", action="store_true", default=False, + help="Log full response" + ) + group.add_argument( + "-x", dest="hexdump", action="store_true", default=False, + help="Log request/response in hexdump format" + ) + args = parser.parse_args() + if args.daemonize: + daemonize() + pathod_main(parser, args) + + +if __name__ == "__main__": + pathoc() \ No newline at end of file diff --git a/pathoc b/pathoc deleted file mode 100755 index b1045c80..00000000 --- a/pathoc +++ /dev/null @@ -1,170 +0,0 @@ -#!/usr/bin/env python -import argparse, sys -from libpathod import pathoc, version, language -from netlib import tcp, http_uastrings - -if __name__ == "__main__": - preparser = argparse.ArgumentParser(add_help=False) - preparser.add_argument( - "--show-uas", dest="showua", action="store_true", default=False, - help="Print user agent shortcuts and exit." - ) - pa = preparser.parse_known_args()[0] - if pa.showua: - print "User agent strings:" - for i in http_uastrings.UASTRINGS: - print " ", i[1], i[0] - sys.exit(0) - - parser = argparse.ArgumentParser(description='A perverse HTTP client.', parents=[preparser]) - parser.add_argument('--version', action='version', version="pathoc " + version.VERSION) - parser.add_argument( - "-c", dest="connect_to", type=str, default=False, - metavar = "HOST:PORT", - help="Issue an HTTP CONNECT to connect to the specified host." - ) - parser.add_argument( - "-n", dest='repeat', default=1, type=int, metavar="N", - help='Repeat requests N times' - ) - parser.add_argument( - "-p", dest="port", type=int, default=None, - help="Port. Defaults to 80, or 443 if SSL is active" - ) - parser.add_argument( - "-t", dest="timeout", type=int, default=None, - help="Connection timeout" - ) - parser.add_argument( - 'host', type=str, - help='Host to connect to' - ) - parser.add_argument( - 'request', type=str, nargs="+", - help='Request specification' - ) - - - group = parser.add_argument_group( - 'SSL', - ) - group.add_argument( - "-s", dest="ssl", action="store_true", default=False, - help="Connect with SSL" - ) - group.add_argument( - "-C", dest="clientcert", type=str, default=False, - help="Path to a file containing client certificate and private key" - ) - group.add_argument( - "-i", dest="sni", type=str, default=False, - help="SSL Server Name Indication" - ) - group.add_argument( - "--ciphers", dest="ciphers", type=str, default=False, - help="SSL cipher specification" - ) - group.add_argument( - "--sslversion", dest="sslversion", type=int, default=4, - choices=[1, 2, 3, 4], - help="Use a specified protocol - TLSv1, SSLv2, SSLv3, SSLv23. Default to SSLv23." - ) - - group = parser.add_argument_group( - 'Controlling Output', - """ - Some of these options expand generated values for logging - if - you're generating large data, use them with caution. - """ - ) - group.add_argument( - "-I", dest="ignorecodes", type=str, default="", - help="Comma-separated list of response codes to ignore" - ) - group.add_argument( - "-S", dest="showssl", action="store_true", default=False, - help="Show info on SSL connection" - ) - group.add_argument( - "-e", dest="explain", action="store_true", default=False, - help="Explain requests" - ) - group.add_argument( - "-o", dest="oneshot", action="store_true", default=False, - help="Oneshot - exit after first non-ignored response" - ) - group.add_argument( - "-q", dest="showreq", action="store_true", default=False, - help="Print full request" - ) - group.add_argument( - "-r", dest="showresp", action="store_true", default=False, - help="Print full response" - ) - group.add_argument( - "-T", dest="ignoretimeout", action="store_true", default=False, - help="Ignore timeouts" - ) - group.add_argument( - "-x", dest="hexdump", action="store_true", default=False, - help="Output in hexdump format" - ) - - args = parser.parse_args() - - if args.port is None: - port = 443 if args.ssl else 80 - else: - port = args.port - - try: - codes = [int(i) for i in args.ignorecodes.split(",") if i] - except ValueError: - parser.error("Invalid return code specification: %s"%args.ignorecodes) - - if args.connect_to: - parts = args.connect_to.split(":") - if len(parts) != 2: - parser.error("Invalid CONNECT specification: %s"%args.connect_to) - try: - parts[1] = int(parts[1]) - except ValueError: - parser.error("Invalid CONNECT specification: %s"%args.connect_to) - connect_to = parts - else: - connect_to = None - - try: - for i in range(args.repeat): - p = pathoc.Pathoc( - (args.host, port), - ssl=args.ssl, - sni=args.sni, - sslversion=args.sslversion, - clientcert=args.clientcert, - ciphers=args.ciphers - ) - try: - p.connect(connect_to) - except (tcp.NetLibError, pathoc.PathocError), v: - print >> sys.stderr, str(v) - sys.exit(1) - if args.timeout: - p.settimeout(args.timeout) - for spec in args.request: - ret = p.print_request( - spec, - showreq=args.showreq, - showresp=args.showresp, - explain=args.explain, - showssl=args.showssl, - hexdump=args.hexdump, - ignorecodes=codes, - ignoretimeout=args.ignoretimeout - ) - sys.stdout.flush() - if ret and args.oneshot: - sys.exit(0) - except KeyboardInterrupt: - pass - diff --git a/pathod b/pathod deleted file mode 100755 index 2e9fafc4..00000000 --- a/pathod +++ /dev/null @@ -1,234 +0,0 @@ -#!/usr/bin/env python -import argparse, sys, logging, logging.handlers -import os -from libpathod import pathod, utils, version, language - - -def daemonize (stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'): - try: - pid = os.fork() - if pid > 0: - sys.exit(0) - except OSError, e: - sys.stderr.write ("fork #1 failed: (%d) %s\n" % (e.errno, e.strerror) ) - sys.exit(1) - os.chdir("/") - os.umask(0) - os.setsid() - try: - pid = os.fork() - if pid > 0: - sys.exit(0) - except OSError, e: - sys.stderr.write ("fork #2 failed: (%d) %s\n" % (e.errno, e.strerror) ) - sys.exit(1) - si = open(stdin, 'rb') - so = open(stdout, 'a+b') - se = open(stderr, 'a+b', 0) - os.dup2(si.fileno(), sys.stdin.fileno()) - os.dup2(so.fileno(), sys.stdout.fileno()) - os.dup2(se.fileno(), sys.stderr.fileno()) - - -def main(parser, args): - certs = [] - for i in args.ssl_certs: - parts = i.split("=", 1) - if len(parts) == 1: - parts = ["*", parts[0]] - parts[1] = os.path.expanduser(parts[1]) - if not os.path.exists(parts[1]): - parser.error("Certificate file does not exist: %s"%parts[1]) - certs.append(parts) - - ssloptions = pathod.SSLOptions( - cn = args.cn, - confdir = args.confdir, - not_after_connect = args.ssl_not_after_connect, - ciphers = args.ciphers, - sslversion = utils.SSLVERSIONS[args.sslversion], - certs = certs - ) - - alst = [] - for i in args.anchors: - parts = utils.parse_anchor_spec(i) - if not parts: - parser.error("Invalid anchor specification: %s"%i) - alst.append(parts) - - root = logging.getLogger() - if root.handlers: - for handler in root.handlers: - root.removeHandler(handler) - - log = logging.getLogger('pathod') - log.setLevel(logging.DEBUG) - fmt = logging.Formatter( - '%(asctime)s: %(message)s', - datefmt='%d-%m-%y %H:%M:%S', - ) - if args.logfile: - fh = logging.handlers.WatchedFileHandler(args.logfile) - fh.setFormatter(fmt) - log.addHandler(fh) - if not args.daemonize: - sh = logging.StreamHandler() - sh.setFormatter(fmt) - log.addHandler(sh) - - sizelimit = None - if args.sizelimit: - try: - sizelimit = utils.parse_size(args.sizelimit) - except ValueError, v: - parser.error(v) - - try: - pd = pathod.Pathod( - (args.address, args.port), - craftanchor = args.craftanchor, - ssl = args.ssl, - ssloptions = ssloptions, - staticdir = args.staticdir, - anchors = alst, - sizelimit = sizelimit, - noweb = args.noweb, - nocraft = args.nocraft, - noapi = args.noapi, - nohang = args.nohang, - timeout = args.timeout, - logreq = args.logreq, - logresp = args.logresp, - hexdump = args.hexdump, - explain = args.explain, - ) - except pathod.PathodError, v: - parser.error(str(v)) - except language.FileAccessDenied, v: - parser.error("%s You probably want to a -d argument."%str(v)) - - try: - print "%s listening on %s:%s"%(version.NAMEVERSION, pd.address.host, pd.address.port) - pd.serve_forever() - except KeyboardInterrupt: - pass - - -if __name__ == "__main__": - parser = argparse.ArgumentParser(description='A pathological HTTP/S daemon.') - parser.add_argument('--version', action='version', version="pathod " + version.VERSION) - parser.add_argument("-p", dest='port', default=9999, type=int, help='Port. Specify 0 to pick an arbitrary empty port.') - parser.add_argument("-l", dest='address', default="127.0.0.1", type=str, help='Listening address.') - parser.add_argument( - "-a", dest='anchors', default=[], type=str, action="append", metavar="ANCHOR", - help='Add an anchor. Specified as a string with the form pattern=pagespec' - ) - parser.add_argument( - "-c", dest='craftanchor', default="/p/", type=str, - help='Anchorpoint for URL crafting commands.' - ) - parser.add_argument( - "--confdir", - action="store", type = str, dest="confdir", default='~/.mitmproxy', - help = "Configuration directory. (~/.mitmproxy)" - ) - parser.add_argument( - "-d", dest='staticdir', default=None, type=str, - help='Directory for static files.' - ) - parser.add_argument( - "-D", dest='daemonize', default=False, action="store_true", - help='Daemonize.' - ) - parser.add_argument( - "-t", dest="timeout", type=int, default=None, - help="Connection timeout" - ) - parser.add_argument( - "--limit-size", dest='sizelimit', default=None, type=str, - help='Size limit of served responses. Understands size suffixes, i.e. 100k.' - ) - parser.add_argument( - "--noapi", dest='noapi', default=False, action="store_true", - help='Disable API.' - ) - parser.add_argument( - "--nohang", dest='nohang', default=False, action="store_true", - help='Disable pauses during crafted response generation.' - ) - parser.add_argument( - "--noweb", dest='noweb', default=False, action="store_true", - help='Disable both web interface and API.' - ) - parser.add_argument( - "--nocraft", dest='nocraft', default=False, action="store_true", - help='Disable response crafting. If anchors are specified, they still work.' - ) - - - group = parser.add_argument_group( - 'SSL', - ) - group.add_argument( - "-s", dest='ssl', default=False, action="store_true", - help='Run in HTTPS mode.' - ) - group.add_argument( - "--cn", dest="cn", type=str, default=None, - help="CN for generated SSL certs. Default: %s"%pathod.DEFAULT_CERT_DOMAIN - ) - group.add_argument( - "-C", dest='ssl_not_after_connect', default=False, action="store_true", - help="Don't expect SSL after a CONNECT request." - ) - group.add_argument( - "--cert", dest='ssl_certs', default=[], type=str, - metavar = "SPEC", action="append", - help='Add an SSL certificate. SPEC is of the form "[domain=]path". '\ - 'The domain may include a wildcard, and is equal to "*" if not specified. '\ - 'The file at path is a certificate in PEM format. If a private key is included in the PEM, '\ - 'it is used, else the default key in the conf dir is used. Can be passed multiple times.' - ) - group.add_argument( - "--ciphers", dest="ciphers", type=str, default=False, - help="SSL cipher specification" - ) - group.add_argument( - "--sslversion", dest="sslversion", type=int, default=4, - choices=[1, 2, 3, 4], - help="Use a specified protocol - TLSv1, SSLv2, SSLv3, SSLv23. Default to SSLv23." - ) - - group = parser.add_argument_group( - 'Controlling Logging', - """ - Some of these options expand generated values for logging - if - you're generating large data, use them with caution. - """ - ) - group.add_argument( - "-e", dest="explain", action="store_true", default=False, - help="Explain responses" - ) - group.add_argument( - "-f", dest='logfile', default=None, type=str, - help='Log to file.' - ) - group.add_argument( - "-q", dest="logreq", action="store_true", default=False, - help="Log full request" - ) - group.add_argument( - "-r", dest="logresp", action="store_true", default=False, - help="Log full response" - ) - group.add_argument( - "-x", dest="hexdump", action="store_true", default=False, - help="Log request/response in hexdump format" - ) - args = parser.parse_args() - if args.daemonize: - daemonize() - main(parser, args) - diff --git a/setup.py b/setup.py index 80eb2b06..2ff2d0be 100644 --- a/setup.py +++ b/setup.py @@ -79,7 +79,12 @@ setup( url="http://pathod.net", packages=packages, package_data=package_data, - scripts=["pathod", "pathoc"], + entry_points={ + 'console_scripts': [ + "pathod = libpathod.main:pathod", + "pathoc = libpathod.main:pathoc" + ] + }, classifiers=[ "License :: OSI Approved :: MIT License", "Development Status :: 5 - Production/Stable", -- cgit v1.2.3