Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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. | |||||
| * | Bug: ask requestheaders before request body is read | Aldo Cortesi | 2016-11-12 | 2 | -2/+51 | |
| | | | | | | | | Also add the beginnings of a test suite to exercise issues like this. | |||||
| * | proxy.protocol.http: cleanups, extract request validation | Aldo Cortesi | 2016-11-12 | 1 | -28/+35 | |
| | | ||||||
| * | Remove unused protocol attribute on connections. | Aldo Cortesi | 2016-11-12 | 1 | -2/+0 | |
| | | ||||||
| * | proxy.protocol.http: flatten for refactoring | Aldo Cortesi | 2016-11-12 | 1 | -189/+150 | |
|/ | | | | Flatten all of _process_flow, so we can see what's going on in there. | |||||
* | Merge pull request #1723 from Kriechi/http2-conns | Maximilian Hils | 2016-11-09 | 1 | -47/+48 | |
|\ | | | | | http2: move h2 connection object | |||||
| * | http2: move h2 connection object | Thomas Kriechbaumer | 2016-11-05 | 1 | -47/+48 | |
| | | ||||||
* | | Merge pull request #1725 from mhils/mitmweb | Maximilian Hils | 2016-11-09 | 30 | -62130/+1079 | |
|\ \ | | | | | | | Mitmweb Improvements | |||||
| * | | mitmweb: minor fixes | Maximilian Hils | 2016-11-09 | 5 | -7/+37 | |
| | | | ||||||
| * | | web: update static assets | Maximilian Hils | 2016-11-09 | 3 | -61000/+495 | |
| | | | ||||||
| * | | web: fix header update | Maximilian Hils | 2016-11-09 | 1 | -26/+27 | |
| | | | ||||||
| * | | web: simplify flow storage | Maximilian Hils | 2016-11-08 | 17 | -573/+363 | |
| | | |