Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove mitmweb auth | Maximilian Hils | 2016-11-22 | 3 | -18/+1 |
| | | | | | 9b08279c7c3384f716b66329fefbe97a368189a2 removed the actual functionality. we should not have a command line switch that does nothing. :) | ||||
* | don't set an empty ALPN, refs #1772 | Maximilian Hils | 2016-11-22 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1769 from mhils/update-pydivert | Maximilian Hils | 2016-11-21 | 2 | -42/+44 |
|\ | | | | | update pydivert, fix #1749 | ||||
| * | update pydivert, fix #1749 | Maximilian Hils | 2016-11-21 | 2 | -42/+44 |
|/ | |||||
* | Descriptive error message for SSL context initialization failure (#1767) | Yoginski | 2016-11-21 | 2 | -1/+35 |
| | |||||
* | remove stickycookie example | Maximilian Hils | 2016-11-21 | 2 | -43/+0 |
| | | | | The recommended way to do this is mitmproxy/addons/stickycookie.py | ||||
* | Merge pull request #1768 from mhils/organize-examples | Maximilian Hils | 2016-11-21 | 43 | -268/+196 |
|\ | | | | | Organize Examples | ||||
| * | organize examples | Maximilian Hils | 2016-11-21 | 43 | -268/+196 |
|/ | | | | | | | This commit is largely based on work by Thiago Arrais (@thiagoarrais) and Shane Bradfield (@l33tLumberjack). I wasn't really able to get their PR reasonably merged onto the latest master, so I reapplied their changes manually here and did some further improvements on that. | ||||
* | rewrite absolute-form HTTP requests to relative form, fix #1759 (#1765) | Maximilian Hils | 2016-11-20 | 3 | -0/+22 |
| | |||||
* | Merge pull request #1766 from Kriechi/fix-test-race | Thomas Kriechbaumer | 2016-11-20 | 1 | -5/+15 |
|\ | | | | | tests: fix race condition | ||||
| * | tests: fix race condition | Thomas Kriechbaumer | 2016-11-20 | 1 | -5/+15 |
| | | |||||
* | | handle SIGINT with a quit prompt (#1760) | Edgar Boda-Majer | 2016-11-20 | 1 | -9/+18 |
|/ | |||||
* | Merge pull request #1751 from dwfreed/patch-1 | Thomas Kriechbaumer | 2016-11-19 | 2 | -3/+6 |
|\ | | | | | proxy/protocol/base: Allow spoofing fixed source | ||||
| * | proxy/protocol/base: Allow spoofing fixed source | Doug Freed | 2016-11-18 | 2 | -3/+6 |
| | | | | | | | | | | | | Allow combining --spoof-source-address and --upstream-bind-address to spoof a fixed source address. Also update the help text for --spoof-source-address to indicate this new possibility. | ||||
* | | Merge pull request #1757 from fotinakis/master | Thomas Kriechbaumer | 2016-11-19 | 1 | -1/+1 |
|\ \ | |/ |/| | Remove dead run_scripthooks example reference. | ||||
| * | Remove dead run_scripthooks example reference. | Mike Fotinakis | 2016-11-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1753 from mitmproxy/update-dependencies | Thomas Kriechbaumer | 2016-11-18 | 14 | -3/+20 |
|\ \ | |/ |/| | Update Dependencies | ||||
| * | lint! | Maximilian Hils | 2016-11-18 | 13 | -1/+18 |
| | | |||||
| * | update dependencies | Maximilian Hils | 2016-11-18 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #1729 from mhils/mitmweb-fixes | Maximilian Hils | 2016-11-16 | 9 | -36/+76 |
|\ | | | | | minor fixes | ||||
| * | fix type checks | Maximilian Hils | 2016-11-16 | 1 | -2/+2 |
| | | |||||
| * | mitmweb: start browser on startup | Maximilian Hils | 2016-11-16 | 1 | -3/+34 |
| | | |||||
| * | minor fixes | Maximilian Hils | 2016-11-16 | 8 | -31/+40 |
| | | |||||
* | | Merge pull request #1752 from dwfreed/patch-2 | Maximilian Hils | 2016-11-16 | 1 | -1/+1 |
|\ \ | |/ |/| | setup.py: adjust mypy-lang dependency for semver | ||||
| * | setup.py: adjust mypy-lang dependency for semver | Doug Freed | 2016-11-16 | 1 | -1/+1 |
|/ | | | | Looks like the previous form was a typo. | ||||
* | Merge pull request #1742 from dwfreed/patch-2 | Maximilian Hils | 2016-11-16 | 3 | -1/+9 |
|\ | | | | | Make the upstream bind address a separate option | ||||
| * | proxy/protocol/base: use upstream_bind_address | Doug Freed | 2016-11-14 | 1 | -1/+1 |
| | | | | | | | | Use the upstream_bind_address option, instead of listen_host. | ||||
| * | tools/cmdline: add upstream bind address option | Doug Freed | 2016-11-14 | 1 | -0/+6 |
| | | | | | | | | Allow specifying the upstream bind address on the command line. | ||||
| * | options: add upstream_bind_address | Doug Freed | 2016-11-14 | 1 | -0/+2 |
| | | | | | | | | Add upstream_bind_address to the options object | ||||
* | | Merge pull request #1748 from Kriechi/better-onboarding | Thomas Kriechbaumer | 2016-11-16 | 1 | -1/+21 |
|\ \ | | | | | | | add macOS/OSX installation instructions to onboarding page | ||||
| * | | add macOS/OSX installation instructions to onboarding page | Thomas Kriechbaumer | 2016-11-16 | 1 | -1/+21 |
| | | | |||||
* | | | Merge pull request #1743 from cortesi/viewsig | Aldo Cortesi | 2016-11-15 | 4 | -44/+56 |
|\ \ \ | |_|/ |/| | | addons.view: clarify modification events | ||||
| * | | addons.view: clarify modification events | Aldo Cortesi | 2016-11-15 | 4 | -44/+56 |
|/ / | | | | | | | | | This adds a set of store modification events, and uses them for flow settings. This addresses a bug where settings could persist even after flows were deleted. | ||||
* | | Merge pull request #1740 from pquentin/master | Aldo Cortesi | 2016-11-14 | 1 | -2/+2 |
|\ \ | |/ |/| | docs: Fix typos | ||||
| * | docs: Fix typos | Quentin Pradet | 2016-11-14 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #1738 from Kriechi/fix-1737 | Aldo Cortesi | 2016-11-14 | 1 | -1/+11 |
|\ | | | | | restrict ALPN offers if host changes | ||||
| * | restrict ALPN offers if host changes | Thomas Kriechbaumer | 2016-11-13 | 1 | -1/+11 |
| | | |||||
* | | Merge pull request #1720 from cortesi/proxyrefactor | Aldo Cortesi | 2016-11-14 | 24 | -768/+860 |
|\ \ | |/ |/| | proxy.protocol.http-related refactoring | ||||
| * | addons.proxyauth: out with the old, in with the new | Aldo Cortesi | 2016-11-13 | 12 | -453/+63 |
| | | | | | | | | | | - Strip out old auth mechanisms, and enable addon - Disable web app auth for now - this should just use the Tornado auth stuff | ||||
| * | addons.proxyauth: complete and test | Aldo Cortesi | 2016-11-13 | 2 | -16/+205 |
| | | |||||
| * | stub out proxyauth addon | Aldo Cortesi | 2016-11-13 | 2 | -0/+121 |
| | | | | | | | | Stub out basic workings, add and test configure event. | ||||
| * | upstream_proxy_auth -> upstream_auth | Aldo Cortesi | 2016-11-13 | 4 | -8/+8 |
| | | | | | | | | Also clarify what this does in commandline help. | ||||
| * | Complete upstream authentication module | Aldo Cortesi | 2016-11-13 | 5 | -11/+62 |
| | | | | | | | | | | | | | | - Handles upstream CONNECT and regular requests, plus HTTP Basic for reverse proxy - Add some tests to make sure we can rely on the .via attribute on server connections. | ||||
| * | Refine handling of HTTP CONNECT | Aldo Cortesi | 2016-11-12 | 4 | -100/+124 |
| | | | | | | | | | | | | | | - CONNECT requests do not generate the usual http events. Instead, they generate the http_connect event and handlers then have the option of setting an error response to abort the connect. - The connect handler is called for both upstream proxy and regular proxy CONNECTs. | ||||
| * | Add the http_connect event for HTTP CONNECT requests | Aldo Cortesi | 2016-11-12 | 4 | -20/+44 |
| | | |||||
| * | Upstream proxy auth to addon | Aldo Cortesi | 2016-11-12 | 7 | -44/+86 |
| | | |||||
| * | Add HTTPFlow.mode to record the HTTP proxy layer mode | Aldo Cortesi | 2016-11-12 | 3 | -4/+13 |
| | | |||||
| * | Use an enum for http protocol modes | Aldo Cortesi | 2016-11-12 | 2 | -21/+23 |
| | | |||||
| * | Remove promotion to raw TCP based on heuristics | Aldo Cortesi | 2016-11-12 | 2 | -11/+2 |
| | | | | | | | | This seems terribly dangerous to me. Let's expand explicit control instead. | ||||
| * | Test failure during 100-continue | Aldo Cortesi | 2016-11-12 | 3 | -26/+40 |
| | | | | | | | | | | | | | | | | | | Also: - Remove duplicate and unused code - Tighten scope of HttpReadDisconnect handler - we only want to ignore this for the initial read, not for the entire block that includes things like the expect handling. |