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
5,999 Commits 1 Branch 67 Tags 50 MiB
6a7eeef0ee
Commit Graph

5999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maximilian Hils
85476d9915 clean up mitmweb 2016-11-08 17:54:27 +01:00
Maximilian Hils
62ca896492 fix mitmweb 2016-11-08 17:43:46 +01:00
phackt
dc44465c92 fix SNI for transparent mode - #1638 
In transparent mode host is set with the target server ip.
Attribute flow.request.host is used as SNI while mitmproxy is
initiating TLS handshake, so it should be set with the pretty_host.
 2016-11-08 15:39:24 +01:00
Thomas Kriechbaumer
f140b1d84f http2: move h2 connection object 2016-11-05 20:39:42 +01:00
Thomas Kriechbaumer
184e29e119 http2: add push-promise metadata test 2016-11-05 05:13:36 +01:00
Aldo Cortesi
d4071d3337 Merge pull request #1716 from cortesi/deprecated2 
Remove sticky[auth,cookie] from http objects
 2016-11-04 16:00:50 +13:00
Aldo Cortesi
4b5ed2c84e Merge pull request #1715 from cortesi/deprecated 
Remove deprecated interfaces
 2016-11-04 14:58:05 +13:00
Aldo Cortesi
86b7661456 Remove sticky[auth,cookie] from http objects 
- they're unused
- if we want them, they should be set by the addon in the new metadata store
 2016-11-04 11:50:19 +13:00
Aldo Cortesi
067198a5dd Remove deprecated interfaces 2016-11-04 11:47:47 +13:00
Aldo Cortesi
fd56a7b3ad Merge pull request #1714 from cortesi/justno2 
Test and interface improvements
 2016-11-04 11:35:10 +13:00
Aldo Cortesi
4eb2b56dec Let's not over-ride __bool__ on connection objects 
If I had a thousand years and every thesaurus in the world, I still couldn't
adequately express how much I dislike this piece of interface design.
 2016-11-04 10:59:41 +13:00
Aldo Cortesi
6c8c4465d9 script.concurrent: tests to taddons 2016-11-04 10:59:41 +13:00
Aldo Cortesi
c2c44889bb Merge pull request #1711 from navinpai/1541 
Allow pathoc to pause forever at end of message
 2016-11-04 10:59:18 +13:00
Aldo Cortesi
8d9fdc416a Merge pull request #1712 from navinpai/docs 
[MINOR] fix link in documentation
 2016-11-04 10:57:28 +13:00
Naveen Pai
a43e2047b0 [MINOR] fix link in documentation 2016-11-04 03:04:55 +05:30
Naveen Pai
eef97555d7 Allow forever wait at end of message #1541 2016-11-04 02:12:20 +05:30
Aldo Cortesi
d51b8933b2 Merge pull request #1709 from cortesi/taddons4 
addons.view: test suite to 100%
 2016-11-04 09:33:48 +13:00