[arch-commits] Commit in mitmproxy/trunk (2 files)
Felix Yan
felixonmars at archlinux.org
Wed Feb 12 07:29:53 UTC 2020
Date: Wednesday, February 12, 2020 @ 07:29:49
Author: felixonmars
Revision: 569078
upgpkg: mitmproxy 5.0.0-1
Modified:
mitmproxy/trunk/PKGBUILD
Deleted:
mitmproxy/trunk/move-onboardingapp-from-tornado-to-flask-backport.patch
---------------------------------------------------------+
PKGBUILD | 53 -
move-onboardingapp-from-tornado-to-flask-backport.patch | 406 --------------
2 files changed, 21 insertions(+), 438 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-12 07:28:02 UTC (rev 569077)
+++ PKGBUILD 2020-02-12 07:29:49 UTC (rev 569078)
@@ -5,29 +5,24 @@
# Contributor: Dobroslaw Kijowski
pkgname=mitmproxy
-pkgver=4.0.4
-pkgrel=9
+pkgver=5.0.0
+pkgrel=1
pkgdesc='SSL-capable man-in-the-middle HTTP proxy'
arch=('any')
url='https://mitmproxy.org'
license=('MIT')
-depends=('python-blinker' 'python-brotlipy' 'python-click' 'python-cryptography' 'python-h2'
- 'python-hyperframe' 'python-kaitaistruct' 'python-ldap3' 'python-passlib' 'python-protobuf'
- 'python-pyasn1' 'python-pyopenssl' 'python-pyparsing' 'python-pyperclip'
- 'python-ruamel-yaml' 'python-setuptools' 'python-sortedcontainers' 'python-flask'
- 'python-urwid' 'python-wsproto')
-checkdepends=('python-asynctest' 'python-beautifulsoup4' 'python-tornado' 'python-parver'
- 'python-pytest-runner' 'python-pytest-asyncio' 'python-requests')
-optdepends=('python-tornado: mitmweb')
+depends=('python-blinker' 'python-brotli' 'python-click' 'python-cryptography' 'python-flask'
+ 'python-h2' 'python-hyperframe' 'python-kaitaistruct' 'python-ldap3' 'python-passlib'
+ 'python-protobuf' 'python-pyasn1' 'python-pyopenssl' 'python-pyparsing' 'python-pyperclip'
+ 'python-ruamel-yaml' 'python-setuptools' 'python-sortedcontainers' 'python-tornado'
+ 'python-urwid' 'python-wsproto' 'python-publicsuffix2' 'python-zstandard')
+checkdepends=('python-asynctest' 'python-beautifulsoup4' 'python-parver' 'python-pytest-runner'
+ 'python-pytest-asyncio' 'python-requests')
provides=('pathod')
conflicts=('pathod')
replaces=('pathod')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/mitmproxy/mitmproxy/archive/v$pkgver.tar.gz"
- 'https://github.com/mitmproxy/mitmproxy/commit/70777a1b6ed64af9cafcdef223a8a260ecc96864.patch'
- 'move-onboardingapp-from-tornado-to-flask-backport.patch')
-sha512sums=('e08ea8b1c75a95b822c463625509037bbc8a979161cacaa1f0185f98df8d6d7e5400925365dbbe70d18751251b1005824f739a8cd035c0389f7b4aea562adfb3'
- '8e88f36e6ca8e5a245617ecd419dcaf7ee890a88283bd71d6b866e11e9ee51128d643c5c1d764b105d580fe44bc26ad8212ee676e46403d48bebe4c080552e2a'
- 'ad48bfbe4ae53b0b40f386aaaff43e012ab9978ad74ae325096c565ca0a329d8257f9c0913a9266c5bb5969f0f6a1414eb9c9053a9ed2c7d38422e8c75fa6d07')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/mitmproxy/mitmproxy/archive/v$pkgver.tar.gz")
+sha512sums=('89de1e40cf7b78e04c575f8db2583c720c47492f6330e6a24819f27b580cd1fc1feb4c1b547de1213361d53ca08b16dae24d7fa9f3faa615fb9917769c1d10cb')
prepare() {
cd $pkgname-$pkgver
@@ -35,25 +30,11 @@
# Let's remove all the upper bounds and use system ca-certificatescate store
sed -e '/certifi/d' \
-e 's/, *<[0-9=.]*//' \
+ -e 's/==/>=/' \
-i setup.py
sed -e '/import certifi/d' \
-e 's|certifi.where()|"/etc/ssl/certs/ca-certificates.crt"|' \
-i mitmproxy/net/tls.py
-
- # Fix wsproto
- sed '176,188d' \
- -i ../70777a1b6ed64af9cafcdef223a8a260ecc96864.patch
- patch -p1 < ../70777a1b6ed64af9cafcdef223a8a260ecc96864.patch
-
- # Fix outdated tornado
- patch -p1 < ../move-onboardingapp-from-tornado-to-flask-backport.patch
- sed -i '/tornado/d' setup.py
-
- # Remove failing tests
- rm test/mitmproxy/addons/test_readfile.py \
- test/mitmproxy/net/{test_tcp.py,test_tls.py} \
- test/mitmproxy/proxy/test_server.py \
- test/examples/test_xss_scanner.py
}
build() {
@@ -63,7 +44,15 @@
check() {
cd $pkgname-$pkgver
- python setup.py pytest
+ # test/mitmproxy/proxy/test_server.py::*::test_tcp hangs: https://github.com/mitmproxy/mitmproxy/issues/3666
+ # test/mitmproxy/net/test_tcp.py::* fails due to TLS 1.3
+ python setup.py pytest --addopts "--deselect test/mitmproxy/proxy/test_server.py::TestHTTPS::test_tcp \
+ --deselect test/mitmproxy/proxy/test_server.py::TestReverseSSL::test_tcp \
+ --deselect test/mitmproxy/proxy/test_server.py::TestTransparentSSL::test_tcp \
+ --deselect test/mitmproxy/proxy/test_server.py::TestUpstreamProxySSL::test_tcp \
+ --deselect test/mitmproxy/net/test_tcp.py::TestServerCipherList::test_echo \
+ --deselect test/mitmproxy/net/test_tcp.py::TestServerCurrentCipher::test_echo \
+ --deselect test/mitmproxy/net/test_tcp.py::TestDHParams::test_dhparams"
}
package() {
Deleted: move-onboardingapp-from-tornado-to-flask-backport.patch
===================================================================
--- move-onboardingapp-from-tornado-to-flask-backport.patch 2020-02-12 07:28:02 UTC (rev 569077)
+++ move-onboardingapp-from-tornado-to-flask-backport.patch 2020-02-12 07:29:49 UTC (rev 569078)
@@ -1,406 +0,0 @@
-commit cc61c6223b18fbf82258031431eb28048089b829
-Author: Maximilian Hils <git at maximilianhils.com>
-Date: Sun Oct 6 14:41:46 2019 +0200
-
- Move onboardingapp from tornado to flask (#3661)
-
-diff --git a/mitmproxy/addons/onboarding.py b/mitmproxy/addons/onboarding.py
-index 900acb08..94ca7c49 100644
---- a/mitmproxy/addons/onboarding.py
-+++ b/mitmproxy/addons/onboarding.py
-@@ -10,7 +10,7 @@ class Onboarding(wsgiapp.WSGIApp):
- name = "onboarding"
-
- def __init__(self):
-- super().__init__(app.Adapter(app.application), None, None)
-+ super().__init__(app, None, None)
-
- def load(self, loader):
- loader.add_option(
-@@ -32,6 +32,7 @@ class Onboarding(wsgiapp.WSGIApp):
- def configure(self, updated):
- self.host = ctx.options.onboarding_host
- self.port = ctx.options.onboarding_port
-+ app.config["CONFDIR"] = ctx.options.confdir
-
- def request(self, f):
- if ctx.options.onboarding:
-diff --git a/mitmproxy/addons/onboardingapp/__init__.py b/mitmproxy/addons/onboardingapp/__init__.py
-index e69de29b..722fed03 100644
---- a/mitmproxy/addons/onboardingapp/__init__.py
-+++ b/mitmproxy/addons/onboardingapp/__init__.py
-@@ -0,0 +1,37 @@
-+import os
-+
-+from flask import Flask, render_template
-+
-+from mitmproxy.options import CONF_BASENAME, CONF_DIR
-+
-+app = Flask(__name__)
-+# will be overridden in the addon, setting this here so that the Flask app can be run standalone.
-+app.config["CONFDIR"] = CONF_DIR
-+
-+
-+ at app.route('/')
-+def index():
-+ return render_template("index.html")
-+
-+
-+ at app.route('/cert/pem')
-+def pem():
-+ return read_cert("pem", "application/x-x509-ca-cert")
-+
-+
-+ at app.route('/cert/p12')
-+def p12():
-+ return read_cert("p12", "application/x-pkcs12")
-+
-+
-+def read_cert(ext, content_type):
-+ filename = CONF_BASENAME + f"-ca-cert.{ext}"
-+ p = os.path.join(app.config["CONFDIR"], filename)
-+ p = os.path.expanduser(p)
-+ with open(p, "rb") as f:
-+ cert = f.read()
-+
-+ return cert, {
-+ "Content-Type": content_type,
-+ "Content-Disposition": f"inline; filename={filename}",
-+ }
-diff --git a/mitmproxy/addons/onboardingapp/app.py b/mitmproxy/addons/onboardingapp/app.py
-deleted file mode 100644
-index ab136778..00000000
---- a/mitmproxy/addons/onboardingapp/app.py
-+++ /dev/null
-@@ -1,118 +0,0 @@
--import os
--
--import tornado.template
--import tornado.web
--import tornado.wsgi
--
--from mitmproxy.utils import data
--from mitmproxy.proxy import config
--
--loader = tornado.template.Loader(data.pkg_data.path("addons/onboardingapp/templates"))
--
--
--class Adapter(tornado.wsgi.WSGIAdapter):
-- # Tornado doesn't make the WSGI environment available to pages, so this
-- # hideous monkey patch is the easiest way to get to the mitmproxy.master
-- # variable.
--
-- def __init__(self, application):
-- self._application = application
--
-- def application(self, request):
-- request.master = self.environ["mitmproxy.master"]
-- return self._application(request)
--
-- def __call__(self, environ, start_response):
-- self.environ = environ
-- return tornado.wsgi.WSGIAdapter.__call__(
-- self,
-- environ,
-- start_response
-- )
--
--
--class Index(tornado.web.RequestHandler):
--
-- def get(self):
-- t = loader.load("index.html")
-- self.write(t.generate())
--
--
--class PEM(tornado.web.RequestHandler):
--
-- @property
-- def filename(self):
-- return config.CONF_BASENAME + "-ca-cert.pem"
--
-- def head(self):
-- p = os.path.join(self.request.master.options.confdir, self.filename)
-- p = os.path.expanduser(p)
-- content_length = os.path.getsize(p)
--
-- self.set_header("Content-Type", "application/x-x509-ca-cert")
-- self.set_header(
-- "Content-Disposition",
-- "inline; filename={}".format(
-- self.filename))
-- self.set_header("Content-Length", content_length)
--
-- def get(self):
-- p = os.path.join(self.request.master.options.confdir, self.filename)
-- p = os.path.expanduser(p)
-- self.set_header("Content-Type", "application/x-x509-ca-cert")
-- self.set_header(
-- "Content-Disposition",
-- "inline; filename={}".format(
-- self.filename))
--
-- with open(p, "rb") as f:
-- self.write(f.read())
--
--
--class P12(tornado.web.RequestHandler):
--
-- @property
-- def filename(self):
-- return config.CONF_BASENAME + "-ca-cert.p12"
--
-- def head(self):
-- p = os.path.join(self.request.master.options.confdir, self.filename)
-- p = os.path.expanduser(p)
-- content_length = os.path.getsize(p)
--
-- self.set_header("Content-Type", "application/x-pkcs12")
-- self.set_header(
-- "Content-Disposition",
-- "inline; filename={}".format(
-- self.filename))
--
-- self.set_header("Content-Length", content_length)
--
-- def get(self):
-- p = os.path.join(self.request.master.options.confdir, self.filename)
-- p = os.path.expanduser(p)
-- self.set_header("Content-Type", "application/x-pkcs12")
-- self.set_header(
-- "Content-Disposition",
-- "inline; filename={}".format(
-- self.filename))
--
-- with open(p, "rb") as f:
-- self.write(f.read())
--
--
--application = tornado.web.Application(
-- [
-- (r"/", Index),
-- (r"/cert/pem", PEM),
-- (r"/cert/p12", P12),
-- (
-- r"/static/(.*)",
-- tornado.web.StaticFileHandler,
-- {
-- "path": data.pkg_data.path("addons/onboardingapp/static")
-- }
-- ),
-- ],
-- # debug=True
--)
-diff --git a/mitmproxy/addons/onboardingapp/static/mitmproxy.css b/mitmproxy/addons/onboardingapp/static/mitmproxy.css
-index 969bd62b..e654d56b 100644
---- a/mitmproxy/addons/onboardingapp/static/mitmproxy.css
-+++ b/mitmproxy/addons/onboardingapp/static/mitmproxy.css
-@@ -15,7 +15,7 @@
- height: 300px;
- }
-
--.bigtitle>div {
-+.bigtitle > div {
- display: table-cell;
- vertical-align: middle;
- }
-@@ -31,7 +31,7 @@ section {
-
- .innerlink {
- text-decoration: none;
-- border-bottom:1px dotted;
-+ border-bottom: 1px dotted;
- margin-bottom: 15px;
- }
-
-diff --git a/mitmproxy/addons/onboardingapp/templates/frame.html b/mitmproxy/addons/onboardingapp/templates/frame.html
-index f00e1a66..13003f3c 100644
---- a/mitmproxy/addons/onboardingapp/templates/frame.html
-+++ b/mitmproxy/addons/onboardingapp/templates/frame.html
-@@ -3,7 +3,7 @@
- <div class="row">
- <div class="span12">
- {% block body %}
-- {% end %}
-+ {% endblock %}
- </div>
- </div>
--{% end %}
-+{% endblock %}
-diff --git a/mitmproxy/addons/onboardingapp/templates/index.html b/mitmproxy/addons/onboardingapp/templates/index.html
-index 38aa27ed..aa471668 100644
---- a/mitmproxy/addons/onboardingapp/templates/index.html
-+++ b/mitmproxy/addons/onboardingapp/templates/index.html
-@@ -135,19 +135,19 @@ function changeTo(device) {
- <h2 class="text-center"> Click to install your mitmproxy certificate </h2>
- <div id="certbank" class="row">
- <div class="col-md-3">
-- <a onclick="changeTo('apple')" href="/cert/pem"><i class="fa fa-apple fa-5x"></i></a>
-+ <a target="_blank" onclick="changeTo('apple')" href="/cert/pem"><i class="fa fa-apple fa-5x"></i></a>
- <p>Apple</p>
- </div>
- <div class="col-md-3">
-- <a onclick="changeTo('windows')" href="/cert/p12"><i class="fa fa-windows fa-5x"></i></a>
-+ <a target="_blank" onclick="changeTo('windows')" href="/cert/p12"><i class="fa fa-windows fa-5x"></i></a>
- <p>Windows</p>
- </div>
- <div class="col-md-3">
-- <a onclick="changeTo('android')" href="/cert/pem"><i class="fa fa-android fa-5x"></i></a>
-+ <a target="_blank" onclick="changeTo('android')" href="/cert/pem"><i class="fa fa-android fa-5x"></i></a>
- <p>Android</p>
- </div>
- <div class="col-md-3">
-- <a onclick="changeTo('asterisk')" href="/cert/pem"><i class="fa fa-asterisk fa-5x"></i></a>
-+ <a target="_blank" onclick="changeTo('asterisk')" href="/cert/pem"><i class="fa fa-asterisk fa-5x"></i></a>
- <p>Other</p>
- </div>
- </div>
-@@ -167,4 +167,4 @@ function changeTo(device) {
- between mitmproxy installations.
- </div>
-
--{% end %}
-+{% endblock %}
-diff --git a/mitmproxy/addons/onboardingapp/templates/layout.html b/mitmproxy/addons/onboardingapp/templates/layout.html
-index f6e1b286..cea8373b 100644
---- a/mitmproxy/addons/onboardingapp/templates/layout.html
-+++ b/mitmproxy/addons/onboardingapp/templates/layout.html
-@@ -28,7 +28,7 @@
-
- <div class="container">
- {% block content %}
-- {% end %}
-+ {% endblock %}
- </div>
-
- </body>
-diff --git a/mitmproxy/options.py b/mitmproxy/options.py
-index 047a44cd..99cc9cb9 100644
---- a/mitmproxy/options.py
-+++ b/mitmproxy/options.py
-@@ -5,6 +5,7 @@ from mitmproxy.net import tls
-
-
- CONF_DIR = "~/.mitmproxy"
-+CONF_BASENAME = "mitmproxy"
- LISTEN_PORT = 8080
-
-
-diff --git a/mitmproxy/proxy/config.py b/mitmproxy/proxy/config.py
-index f32d3086..e512c004 100644
---- a/mitmproxy/proxy/config.py
-+++ b/mitmproxy/proxy/config.py
-@@ -4,13 +4,11 @@ import typing
-
- from OpenSSL import crypto
-
-+from mitmproxy import certs
- from mitmproxy import exceptions
- from mitmproxy import options as moptions
--from mitmproxy import certs
- from mitmproxy.net import server_spec
-
--CONF_BASENAME = "mitmproxy"
--
-
- class HostMatcher:
-
-@@ -57,7 +55,7 @@ class ProxyConfig:
- )
- self.certstore = certs.CertStore.from_store(
- certstore_path,
-- CONF_BASENAME
-+ moptions.CONF_BASENAME,
- )
-
- for c in options.certs:
-diff --git a/mitmproxy/tools/web/app.py b/mitmproxy/tools/web/app.py
-index b72e0d77..20d4e7c8 100644
---- a/mitmproxy/tools/web/app.py
-+++ b/mitmproxy/tools/web/app.py
-@@ -1,24 +1,25 @@
-+import asyncio
- import hashlib
- import json
- import logging
- import os.path
- import re
- from io import BytesIO
--import asyncio
-
--import mitmproxy.flow
- import tornado.escape
- import tornado.web
- import tornado.websocket
-+
-+import mitmproxy.flow
-+import mitmproxy.tools.web.master # noqa
- from mitmproxy import contentviews
- from mitmproxy import exceptions
- from mitmproxy import flowfilter
- from mitmproxy import http
- from mitmproxy import io
- from mitmproxy import log
--from mitmproxy import version
- from mitmproxy import optmanager
--import mitmproxy.tools.web.master # noqa
-+from mitmproxy import version
-
-
- def flow_to_json(flow: mitmproxy.flow.Flow) -> dict:
-@@ -108,6 +109,8 @@ class APIError(tornado.web.HTTPError):
-
-
- class RequestHandler(tornado.web.RequestHandler):
-+ application: "Application"
-+
- def write(self, chunk):
- # Writing arrays on the top level is ok nowadays.
- # http://flask.pocoo.org/docs/0.11/security/#json-security
-@@ -473,7 +476,9 @@ class DnsRebind(RequestHandler):
-
-
- class Application(tornado.web.Application):
-- def __init__(self, master, debug):
-+ master: "mitmproxy.tools.web.master.WebMaster"
-+
-+ def __init__(self, master: "mitmproxy.tools.web.master.WebMaster", debug: bool) -> None:
- self.master = master
- super().__init__(
- default_host="dns-rebind-protection",
-diff --git a/setup.cfg b/setup.cfg
-index 32b6aac3..df327ef3 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -22,6 +22,9 @@ exclude_lines =
- [mypy-mitmproxy.contrib.*]
- ignore_errors = True
-
-+[mypy-tornado.*]
-+ignore_errors = True
-+
- [tool:full_coverage]
- exclude =
- mitmproxy/proxy/protocol/base.py
-diff --git a/setup.py b/setup.py
-index f315e2e5..764d4277 100644
---- a/setup.py
-+++ b/setup.py
-@@ -64,6 +64,7 @@ setup(
- "brotlipy>=0.7.0",
- "click>=6.2",
- "cryptography>=2.1.4",
-+ "flask>=1.1.1",
- "h2>=3.0.1",
- "hyperframe>=5.1.0",
- "kaitaistruct>=0.7",
-diff --git a/test/mitmproxy/addons/onboardingapp/__init__.py b/test/mitmproxy/addons/onboardingapp/__init__.py
-deleted file mode 100644
-index e69de29b..00000000
-diff --git a/test/mitmproxy/addons/onboardingapp/test_app.py b/test/mitmproxy/addons/onboardingapp/test_app.py
-deleted file mode 100644
-index 777ab4dd..00000000
---- a/test/mitmproxy/addons/onboardingapp/test_app.py
-+++ /dev/null
-@@ -1 +0,0 @@
--# TODO: write tests
More information about the arch-commits
mailing list