From f1417dd8593e1bcfd4f1621520f3953e771e3f05 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 2 Mar 2017 19:24:48 +0100 Subject: [PATCH 1/5] pathoc: fix documentation for headers --- docs/pathod/language.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/pathod/language.rst b/docs/pathod/language.rst index 672e21b67..fe4ef6ca0 100644 --- a/docs/pathod/language.rst +++ b/docs/pathod/language.rst @@ -23,7 +23,7 @@ HTTP Request mode if the server responds correctly. Apart from that, websocket requests are just like any other, and all aspects of the request can be over-ridden. - * - h\:\ :ref:`VALUE`\ =\ :ref:`VALUE`\ + * - h\ :ref:`VALUE`\ =\ :ref:`VALUE`\ - Set a header. * - r - Set the **raw** flag on this response. Pathod will not calculate a @@ -73,7 +73,7 @@ HTTP Response * - m\ :ref:`VALUE` - HTTP Reason message. Automatically chosen according to the response code if not specified. (HTTP/1 only) - * - h\:\ :ref:`VALUE`\ =\ :ref:`VALUE`\ + * - h\ :ref:`VALUE`\ =\ :ref:`VALUE`\ - Set a header. * - r - Set the **raw** flag on this response. Pathod will not calculate a From 7ff48b8bec5c28c9a886a3651e3eb55f7bb9ed8d Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Wed, 8 Mar 2017 09:57:38 +0800 Subject: [PATCH 2/5] Add javascript tests to Travis CI. (#2093) --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4c85c46d9..237ff3965 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,17 @@ env: global: - CI_DEPS=codecov>=2.0.5 - CI_COMMANDS=codecov + - MITMWEB_DIR=web git: depth: 10000 matrix: fast_finish: true + allow_failures: + - language: node_js + node_js: + - "6" + - "iojs" include: - python: 3.5 env: TOXENV=lint @@ -47,6 +53,15 @@ matrix: env: TOXENV=individual_coverage - python: 3.5 env: TOXENV=docs + - language: node_js + node_js: + - "6" + - "iojs" + install: cd $MITMWEB_DIR && npm install + script: npm test + cache: + directories: + - $MITMWEB_DIR/node_modules install: - | From dae7435135998a74b81bcd8e9ad3b0856d82f0da Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Wed, 8 Mar 2017 13:00:09 +0800 Subject: [PATCH 3/5] Update .travis.yml --- .travis.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 237ff3965..3542a5923 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ env: global: - CI_DEPS=codecov>=2.0.5 - CI_COMMANDS=codecov - - MITMWEB_DIR=web git: depth: 10000 @@ -13,9 +12,7 @@ matrix: fast_finish: true allow_failures: - language: node_js - node_js: - - "6" - - "iojs" + node_js: "node" include: - python: 3.5 env: TOXENV=lint @@ -54,14 +51,14 @@ matrix: - python: 3.5 env: TOXENV=docs - language: node_js - node_js: - - "6" - - "iojs" - install: cd $MITMWEB_DIR && npm install + node_js: "node" + before_install: npm install -g yarn + install: cd web && yarn script: npm test cache: + yarn: true directories: - - $MITMWEB_DIR/node_modules + - web/node_modules install: - | From 927b5707fe80582fc7867e59a9b8c70a11bb8fe0 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 8 Mar 2017 16:18:34 +0100 Subject: [PATCH 4/5] fix tcp.Address leftovers this fixes the issue described in https://github.com/mitmproxy/mitmproxy/issues/2119#issuecomment-285067292 --- examples/complex/har_dump.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/complex/har_dump.py b/examples/complex/har_dump.py index 51983b54f..86a336847 100644 --- a/examples/complex/har_dump.py +++ b/examples/complex/har_dump.py @@ -147,7 +147,7 @@ def response(flow): } if flow.server_conn.connected(): - entry["serverIPAddress"] = str(flow.server_conn.ip_address.address[0]) + entry["serverIPAddress"] = str(flow.server_conn.ip_address[0]) HAR["log"]["entries"].append(entry) From ca819fb9239f22c8ed21a2f93c531bc8ff225b44 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 8 Mar 2017 17:42:19 +0100 Subject: [PATCH 5/5] add install docs for openSUSE --- docs/install.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/install.rst b/docs/install.rst index cf93cc58e..b37d9c915 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -110,6 +110,20 @@ libraries. This was tested on a fully patched installation of Fedora 24. Make sure to have an up-to-date version of pip by running ``pip3 install -U pip``. +.. _install-source-opensuse: + +Installation from Source on openSUSE +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This was tested on a fully patched installation of openSUSE Tumbleweed. +Please note that openSUSE Leap 42.2 only comes with Python 3.4.x, whereas mitmproxy requires Python 3.5 or above. +You can check you Python version by running ``python3 --version``. + +.. code:: bash + + sudo zypper install python3-pip python3-devel libffi-devel openssl-devel gcc-c++ + sudo pip3 install mitmproxy + .. _install-source-windows: