Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 02:10:59 +00:00
Code Issues Projects Releases Wiki Activity
5,854 Commits 1 Branch 67 Tags 50 MiB
782c66eac2
Commit Graph

5854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
0386740404 mitmweb: include console logging 2016-11-25 17:20:14 +01:00
Maximilian Hils
1d3cb9eeb8 mitmweb: add --no-browser 2016-11-25 17:20:14 +01:00
Maximilian Hils
e3dc46a8cd fix pyinstaller (#1788) 2016-11-25 16:46:49 +01:00
Maximilian Hils
de9e724a66 update dependencies (#1789) 2016-11-25 16:46:00 +01:00
Maximilian Hils
222106916e Merge branch 'mitmweb-eventlog' 2016-11-23 22:47:50 +01:00
Maximilian Hils
d15ddfad14 fix contentview attributes 2016-11-23 22:47:36 +01:00
Maximilian Hils
5d209e5040 Merge commit '9bc5adf' 2016-11-23 22:45:21 +01:00
Maximilian Hils
45332006a3 mitmweb: 100% app test coverage, numerous fixes 2016-11-23 22:35:07 +01:00
Thomas Kriechbaumer
48d54e2d4a bump cryptography dependency 2016-11-23 11:55:11 +01:00
Thomas Kriechbaumer
9bc5adfb03 add more websocket indicators to mitmproxy and mitmdump 2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
4b04566a34 add metadata info to flow detail view 2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
ea97f62975 websocket: show messages in the eventlog 2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
3353aa3cfd fix docs 2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
d3bd04dec0 disable TCP support for now 2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
5dfc199086 websocket: add tests 2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
4beb693c9c websocket: change cmdline option 2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
aaa4ccc284 websocket: add event documentation 2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
3d8f3d4c23 add WebSocket flows and messages 2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
ffb3988dc9 rename WebSocket{s,} protocol 2016-11-23 10:18:45 +01:00
Maximilian Hils
dc75605e46 minor fixes 2016-11-23 01:27:52 +01:00
Maximilian Hils
f1662cbfd7 add eventstore tests 2016-11-23 01:27:51 +01:00
Maximilian Hils
72dcf70db2 mitmweb: fix event display 2016-11-23 01:27:51 +01:00
Maximilian Hils
fea6041cde mitmweb: cleanup, reimplement eventlog 2016-11-23 01:27:50 +01:00
Maximilian Hils
a6c608e085 make the new mypy release happy 2016-11-23 01:27:23 +01:00
Maximilian Hils
8ba5f40d76 Update README.md 2016-11-22 23:30:57 +01:00
Maximilian Hils
39b24a5bab Update README.md 2016-11-22 23:11:57 +01:00
Maximilian Hils
40f0193dda remove mitmweb auth 
9b08279c7c removed the actual functionality.
we should not have a command line switch that does nothing. :)
 2016-11-22 18:27:16 +01:00
Maximilian Hils
21a03d56b5 don't set an empty ALPN, refs #1772 2016-11-22 17:02:37 +01:00
Maximilian Hils
92516a3b5c Merge pull request #1769 from mhils/update-pydivert 
update pydivert, fix #1749
 2016-11-21 14:40:11 +01:00
Maximilian Hils
f644665cd9 update pydivert, fix #1749 2016-11-21 14:14:52 +01:00
Yoginski
ebff5f2466 Descriptive error message for SSL context initialization failure (#1767) 2016-11-21 09:40:09 +01:00
Maximilian Hils
c90405253a remove stickycookie example 
The recommended way to do this is mitmproxy/addons/stickycookie.py
 2016-11-21 02:46:25 +01:00
Maximilian Hils
2138be8705 Merge pull request #1768 from mhils/organize-examples 
Organize Examples
 2016-11-21 02:42:15 +01:00
Maximilian Hils
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
Maximilian Hils
f74e561524 rewrite absolute-form HTTP requests to relative form, fix #1759 (#1765) 2016-11-20 17:21:21 +01:00
Thomas Kriechbaumer
79c753d8f8 Merge pull request #1766 from Kriechi/fix-test-race 
tests: fix race condition
 2016-11-20 17:02:49 +01:00
Thomas Kriechbaumer
f45034e8f1 tests: fix race condition 2016-11-20 17:02:26 +01:00
Edgar Boda-Majer
078f36d86a handle SIGINT with a quit prompt (#1760) 2016-11-20 16:40:04 +01:00
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