From c1062db9fd19a3f5ff8468f8db8a6f29d65cc392 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 5 Nov 2014 09:58:07 +1300 Subject: Add a pip requirement to pathod to work around a pip/requests screwup --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index b756dbfe..302b2db6 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,9 @@ setup( install_requires=[ 'netlib>=%s' % version.MINORVERSION, + # It's INSANE that we have to do this, but... + # FIXME: Requirement to be removed at next release + "pip>=1.5.6", "requests>=2.4.1", "Flask>=0.10.1" ], -- cgit v1.2.3 From 1a9ba295ce9653635169b7b2f4acacc35dadfe9b Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 8 Nov 2014 14:42:10 +1300 Subject: Changelog, remove entry points in favor of scripts --- CHANGELOG | 9 +++++++++ setup.py | 9 +-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 55b11342..2de445b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,12 @@ +7 November 2014: pathod 0.11: + + * Hugely improved SSL support, including dynamic generation of certificates + using the mitproxy cacert + * pathoc -S dumps information on the remote SSL certificate chain + * Big improvements to fuzzing, including random spec selection and memoization to avoid repeating randomly generated patterns + * Reflected patterns, allowing you to embed a pathod server response specification in a pathoc request, resolving both on client side. This makes fuzzing proxies and other intermediate systems much better. + + 25 August 2013: pathod 0.9.2: * Adapt to interface changes in netlib diff --git a/setup.py b/setup.py index 302b2db6..fc350ae2 100644 --- a/setup.py +++ b/setup.py @@ -35,14 +35,7 @@ setup( packages=find_packages(), include_package_data=True, - - entry_points={ - 'console_scripts': [ - "pathod = libpathod.main:pathod", - "pathoc = libpathod.main:pathoc" - ] - }, - + scripts = ["pathod", "pathoc"], install_requires=[ 'netlib>=%s' % version.MINORVERSION, # It's INSANE that we have to do this, but... -- cgit v1.2.3 From 27c7e9e9345bbc458e7efc4093c2074e19011d12 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 11 Nov 2014 13:34:02 +1300 Subject: Fix unit tests --- test/test_pathod.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_pathod.py b/test/test_pathod.py index 158f3bda..8b37b545 100644 --- a/test/test_pathod.py +++ b/test/test_pathod.py @@ -153,7 +153,7 @@ class CommonTests(tutils.DaemonTests): assert l["type"] == "error" assert "foo" in l["msg"] - def test_invalid_body(self): + def test_invalid_content_length(self): tutils.raises( http.HttpError, self.pathoc, @@ -161,7 +161,7 @@ class CommonTests(tutils.DaemonTests): ) l = self.d.last_log() assert l["type"] == "error" - assert "Invalid" in l["msg"] + assert "Content-Length unknown" in l["msg"] def test_invalid_headers(self): tutils.raises(http.HttpError, self.pathoc, "get:/:h'\t'='foo'") -- cgit v1.2.3 From b917b61e6aead4f353ef15838315ecc0df721e29 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 11 Nov 2014 12:28:08 +0100 Subject: be more explicit about requirements --- libpathod/version.py | 6 +++++- setup.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libpathod/version.py b/libpathod/version.py index ad539392..7022c843 100644 --- a/libpathod/version.py +++ b/libpathod/version.py @@ -2,4 +2,8 @@ IVERSION = (0, 11) VERSION = ".".join(str(i) for i in IVERSION) MINORVERSION = ".".join(str(i) for i in IVERSION[:2]) NAME = "pathod" -NAMEVERSION = NAME + " " + VERSION \ No newline at end of file +NAMEVERSION = NAME + " " + VERSION + +NEXT_MINORVERSION = list(IVERSION) +NEXT_MINORVERSION[1] += 1 +NEXT_MINORVERSION = ".".join(str(i) for i in NEXT_MINORVERSION[:2]) \ No newline at end of file diff --git a/setup.py b/setup.py index b756dbfe..02ec25b2 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ setup( }, install_requires=[ - 'netlib>=%s' % version.MINORVERSION, + "netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION), "requests>=2.4.1", "Flask>=0.10.1" ], -- cgit v1.2.3 From 1b41b9bb9b12a4ac3ce56f6c3abe3bbbf4e7bfa4 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 15 Nov 2014 12:41:44 +1300 Subject: Use current version for download links Fixes #19 --- libpathod/app.py | 11 +++++++++-- libpathod/templates/index.html | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libpathod/app.py b/libpathod/app.py index 1910e80e..d23d26a0 100644 --- a/libpathod/app.py +++ b/libpathod/app.py @@ -1,4 +1,6 @@ -import logging, pprint, cStringIO +import logging +import pprint +import cStringIO from flask import Flask, jsonify, render_template, request, abort, make_response import version, language, utils from netlib import http_uastrings @@ -39,7 +41,12 @@ def make_app(noapi): @app.route('/') @app.route('/index.html') def index(): - return render("index.html", True, section="main") + return render( + "index.html", + True, + section="main", + version=version.VERSION + ) @app.route('/download') @app.route('/download.html') diff --git a/libpathod/templates/index.html b/libpathod/templates/index.html index 5e4bd842..337f361c 100644 --- a/libpathod/templates/index.html +++ b/libpathod/templates/index.html @@ -56,7 +56,7 @@

source

    -
  • Current release: pathod 0.9.2
    • +
  • Current release: pathod {{version}}
  • GitHub: github.com/cortesi/pathod
    • -- cgit v1.2.3 From 295c8340a39f48652f77d74f3f65bfcec19a5c34 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 15 Nov 2014 12:44:26 +1300 Subject: Bump to 0.11.1 --- libpathod/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpathod/version.py b/libpathod/version.py index 7022c843..5f7675e2 100644 --- a/libpathod/version.py +++ b/libpathod/version.py @@ -1,4 +1,4 @@ -IVERSION = (0, 11) +IVERSION = (0, 11, 1) VERSION = ".".join(str(i) for i in IVERSION) MINORVERSION = ".".join(str(i) for i in IVERSION[:2]) NAME = "pathod" @@ -6,4 +6,4 @@ NAMEVERSION = NAME + " " + VERSION NEXT_MINORVERSION = list(IVERSION) NEXT_MINORVERSION[1] += 1 -NEXT_MINORVERSION = ".".join(str(i) for i in NEXT_MINORVERSION[:2]) \ No newline at end of file +NEXT_MINORVERSION = ".".join(str(i) for i in NEXT_MINORVERSION[:2]) -- cgit v1.2.3