40f0193dda
remove mitmweb auth
...
9b08279c7c
2016-11-22 18:27:16 +01:00
21a03d56b5
don't set an empty ALPN, refs #1772
2016-11-22 17:02:37 +01:00
92516a3b5c
Merge pull request #1769 from mhils/update-pydivert
...
update pydivert, fix #1749
2016-11-21 14:40:11 +01:00
f644665cd9
update pydivert, fix #1749
2016-11-21 14:14:52 +01:00
ebff5f2466
Descriptive error message for SSL context initialization failure ( #1767 )
2016-11-21 09:40:09 +01:00
c90405253a
remove stickycookie example
...
The recommended way to do this is mitmproxy/addons/stickycookie.py
2016-11-21 02:46:25 +01:00
2138be8705
Merge pull request #1768 from mhils/organize-examples
...
Organize Examples
2016-11-21 02:42:15 +01:00
9af8f4bb31
organize examples
...
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.
2016-11-21 02:28:10 +01:00
f74e561524
rewrite absolute-form HTTP requests to relative form, fix #1759 ( #1765 )
2016-11-20 17:21:21 +01:00
79c753d8f8
Merge pull request #1766 from Kriechi/fix-test-race
...
tests: fix race condition
2016-11-20 17:02:49 +01:00
f45034e8f1
tests: fix race condition
2016-11-20 17:02:26 +01:00
078f36d86a
handle SIGINT with a quit prompt ( #1760 )
2016-11-20 16:40:04 +01:00
b6e419d640
Merge pull request #1751 from dwfreed/patch-1
...
proxy/protocol/base: Allow spoofing fixed source
2016-11-19 23:00:36 +01:00
3ea38e6aa4
Merge pull request #1757 from fotinakis/master
...
Remove dead run_scripthooks example reference.
2016-11-19 22:54:42 +01:00
0ff1967226
proxy/protocol/base: Allow spoofing fixed source
...
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.
2016-11-18 14:46:32 +00:00
d6cfd93357
Merge pull request #1753 from mitmproxy/update-dependencies
...
Update Dependencies
2016-11-18 13:02:58 +01:00
5ce370e2a9
lint!
2016-11-18 12:59:59 +01:00
e8067a2474
update dependencies
2016-11-18 12:59:59 +01:00
d16a3753d7
Remove dead run_scripthooks example reference.
2016-11-17 16:33:51 -08:00
83fe8b5302
Merge pull request #1729 from mhils/mitmweb-fixes
...
minor fixes
2016-11-16 22:26:17 +01:00
5601338a17
Merge pull request #1752 from dwfreed/patch-2
...
setup.py: adjust mypy-lang dependency for semver
2016-11-16 18:08:58 +01:00
2ee8bc2f1a
fix type checks
2016-11-16 17:19:38 +01:00
de6bf175e2
mitmweb: start browser on startup
2016-11-16 15:09:54 +01:00
677789a617
minor fixes
2016-11-16 15:09:53 +01:00
6b6e64e09e
setup.py: adjust mypy-lang dependency for semver
...
Looks like the previous form was a typo.
2016-11-16 13:54:10 +00:00
47ec1c9570
Merge pull request #1742 from dwfreed/patch-2
...
Make the upstream bind address a separate option
2016-11-16 13:37:12 +01:00
3d26bd4aa1
Merge pull request #1748 from Kriechi/better-onboarding
...
add macOS/OSX installation instructions to onboarding page
2016-11-16 13:04:07 +01:00
d7a22d92ec
add macOS/OSX installation instructions to onboarding page
2016-11-16 11:05:52 +01:00
92607c2109
Merge pull request #1743 from cortesi/viewsig
...
addons.view: clarify modification events
2016-11-15 10:42:23 +13:00
8065b44eed
addons.view: clarify modification events
...
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.
2016-11-15 09:53:17 +13:00
4cfda51c37
proxy/protocol/base: use upstream_bind_address
...
Use the upstream_bind_address option, instead of listen_host.
2016-11-14 12:12:48 +00:00
f89671a33b
tools/cmdline: add upstream bind address option
...
Allow specifying the upstream bind address on the command line.
2016-11-14 12:12:48 +00:00
078bd532c3
options: add upstream_bind_address
...
Add upstream_bind_address to the options object
2016-11-14 12:12:48 +00:00
055a0b7198
Merge pull request #1740 from pquentin/master
...
docs: Fix typos
2016-11-14 19:02:03 +13:00
eb7bcb37ec
docs: Fix typos
2016-11-14 08:43:32 +04:00
2d0a65a3f4
Merge pull request #1738 from Kriechi/fix-1737
...
restrict ALPN offers if host changes
2016-11-14 08:50:29 +13:00
b636e4353a
Merge pull request #1720 from cortesi/proxyrefactor
...
proxy.protocol.http-related refactoring
2016-11-14 08:03:10 +13:00
6fb706ec15
restrict ALPN offers if host changes
2016-11-13 12:11:56 +01:00
9b08279c7c
addons.proxyauth: out with the old, in with the new
...
- Strip out old auth mechanisms, and enable addon
- Disable web app auth for now - this should just use the Tornado auth stuff
2016-11-13 19:59:59 +13:00
dc88b7d110
addons.proxyauth: complete and test
2016-11-13 18:14:23 +13:00
e644d2167c
stub out proxyauth addon
...
Stub out basic workings, add and test configure event.
2016-11-13 16:22:33 +13:00
fe01b1435a
upstream_proxy_auth -> upstream_auth
...
Also clarify what this does in commandline help.
2016-11-13 11:50:28 +13:00
3b00bc339d
Complete upstream authentication module
...
- 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.
2016-11-13 11:43:27 +13:00
a9b4560187
Refine handling of HTTP CONNECT
...
- 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.
2016-11-12 18:28:37 +13:00
38f8d9e541
Add the http_connect event for HTTP CONNECT requests
2016-11-12 12:44:43 +13:00
bc01a146b0
Upstream proxy auth to addon
2016-11-12 11:58:04 +13:00
00492919e7
Add HTTPFlow.mode to record the HTTP proxy layer mode
2016-11-12 11:58:04 +13:00
5be35d258f
Use an enum for http protocol modes
2016-11-12 11:58:04 +13:00
fbaade4298
Remove promotion to raw TCP based on heuristics
...
This seems terribly dangerous to me. Let's expand explicit control instead.
2016-11-12 11:58:04 +13:00
3958940420
Test failure during 100-continue
...
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.
2016-11-12 11:58:04 +13:00
Maximilian Hils