Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity
6,016 Commits 1 Branch 67 Tags 50 MiB
356c4987a2
Commit Graph

6016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kriechbaumer
b6e419d640 Merge pull request #1751 from dwfreed/patch-1 
proxy/protocol/base: Allow spoofing fixed source
 2016-11-19 23:00:36 +01:00
Thomas Kriechbaumer
3ea38e6aa4 Merge pull request #1757 from fotinakis/master 
Remove dead run_scripthooks example reference.
 2016-11-19 22:54:42 +01:00
Doug Freed
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
Thomas Kriechbaumer
d6cfd93357 Merge pull request #1753 from mitmproxy/update-dependencies 
Update Dependencies
 2016-11-18 13:02:58 +01:00
Maximilian Hils
5ce370e2a9 lint! 2016-11-18 12:59:59 +01:00
Maximilian Hils
e8067a2474 update dependencies 2016-11-18 12:59:59 +01:00
Mike Fotinakis
d16a3753d7 Remove dead run_scripthooks example reference. 2016-11-17 16:33:51 -08:00
Maximilian Hils
83fe8b5302 Merge pull request #1729 from mhils/mitmweb-fixes 
minor fixes
 2016-11-16 22:26:17 +01:00
Maximilian Hils
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
Maximilian Hils
2ee8bc2f1a fix type checks 2016-11-16 17:19:38 +01:00
Maximilian Hils
de6bf175e2 mitmweb: start browser on startup 2016-11-16 15:09:54 +01:00
Maximilian Hils
677789a617 minor fixes 2016-11-16 15:09:53 +01:00
Doug Freed
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
Maximilian Hils
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
Thomas Kriechbaumer
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
Thomas Kriechbaumer
d7a22d92ec add macOS/OSX installation instructions to onboarding page 2016-11-16 11:05:52 +01:00
Aldo Cortesi
92607c2109 Merge pull request #1743 from cortesi/viewsig 
addons.view: clarify modification events
 2016-11-15 10:42:23 +13:00
Aldo Cortesi
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
Doug Freed
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
Doug Freed
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
Doug Freed
078bd532c3 options: add upstream_bind_address 
Add upstream_bind_address to the options object
 2016-11-14 12:12:48 +00:00
Aldo Cortesi
055a0b7198 Merge pull request #1740 from pquentin/master 
docs: Fix typos
 2016-11-14 19:02:03 +13:00
Quentin Pradet
eb7bcb37ec
docs: Fix typos 2016-11-14 08:43:32 +04:00
Aldo Cortesi
2d0a65a3f4 Merge pull request #1738 from Kriechi/fix-1737 
restrict ALPN offers if host changes
 2016-11-14 08:50:29 +13:00
Aldo Cortesi
b636e4353a Merge pull request #1720 from cortesi/proxyrefactor 
proxy.protocol.http-related refactoring
 2016-11-14 08:03:10 +13:00
Thomas Kriechbaumer
6fb706ec15 restrict ALPN offers if host changes 2016-11-13 12:11:56 +01:00
Aldo Cortesi
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
Aldo Cortesi
dc88b7d110 addons.proxyauth: complete and test 2016-11-13 18:14:23 +13:00
Aldo Cortesi
e644d2167c stub out proxyauth addon 
Stub out basic workings, add and test configure event.
 2016-11-13 16:22:33 +13:00
Aldo Cortesi
fe01b1435a upstream_proxy_auth -> upstream_auth 
Also clarify what this does in commandline help.
 2016-11-13 11:50:28 +13:00
Aldo Cortesi
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
Aldo Cortesi
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
Aldo Cortesi
38f8d9e541 Add the http_connect event for HTTP CONNECT requests 2016-11-12 12:44:43 +13:00
Aldo Cortesi
bc01a146b0 Upstream proxy auth to addon 2016-11-12 11:58:04 +13:00
Aldo Cortesi
00492919e7 Add HTTPFlow.mode to record the HTTP proxy layer mode 2016-11-12 11:58:04 +13:00
Aldo Cortesi
5be35d258f Use an enum for http protocol modes 2016-11-12 11:58:04 +13:00
Aldo Cortesi
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
Aldo Cortesi
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
Aldo Cortesi
82ac7d05a6 Bug: ask requestheaders before request body is read 
Also add the beginnings of a test suite to exercise issues like this.
 2016-11-12 11:58:04 +13:00
Aldo Cortesi
53b77fc475 proxy.protocol.http: cleanups, extract request validation 2016-11-12 11:58:04 +13:00
Aldo Cortesi
4eea265925 Remove unused protocol attribute on connections. 2016-11-12 11:58:04 +13:00
Aldo Cortesi
a653f314ff proxy.protocol.http: flatten for refactoring 
Flatten all of _process_flow, so we can see what's going on in there.
 2016-11-12 11:58:04 +13:00
Maximilian Hils
afa124a9f6 Merge pull request #1723 from Kriechi/http2-conns 
http2: move h2 connection object
 2016-11-09 15:19:55 +01:00
Maximilian Hils
f0783a0874 Merge pull request #1725 from mhils/mitmweb 
Mitmweb Improvements
 2016-11-09 15:19:14 +01:00
Maximilian Hils
564e56c262 Merge pull request #1724 from phackt/master 
fix SNI for transparent mode - #1638
 2016-11-09 13:25:37 +01:00
Maximilian Hils
2a2387fb32 explain host=pretty_host assignment 2016-11-09 13:11:31 +01:00
Maximilian Hils
77f05178ad mitmweb: minor fixes 2016-11-09 13:01:25 +01:00
Maximilian Hils
a0ddedff6f web: update static assets 2016-11-09 10:09:00 +01:00
Maximilian Hils
d9597add76 web: fix header update 2016-11-09 10:04:51 +01:00
Maximilian Hils
c2a130dced web: simplify flow storage 2016-11-08 17:55:22 +01:00