Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity
7,504 Commits 1 Branch 67 Tags 50 MiB
9016608486
Commit Graph

7504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
d9ce4659fd
Merge pull request #2745 from bksahu/patch-1 
Add additional OSes/software specific instructions on mitm.it
 2018-01-04 13:56:46 +01:00
Maximilian Hils
05816d08cf don't use red text for informational message 2018-01-04 13:55:16 +01:00
Maximilian Hils
c6cd0872ea
Merge pull request #2742 from mhils/dataviewer-fix-edit 
Dataviewer: disable (broken) edit
 2018-01-04 12:12:03 +01:00
bksahu
94d2741b6f Added favicon and logos in /static/images 2018-01-02 22:17:23 +05:30
bksahu
fc3edd5d8b Added logos to mitm.it 2018-01-02 22:05:12 +05:30
Maximilian Hils
3858048c6d
fix broken link 2018-01-02 16:45:06 +01:00
Maximilian Hils
11429bf229 dataviewer: disable (broken) edit 
The edit functionality was previously broken due to
encoding issues, so we just replace the column type
with a generic read-only variant.
 2018-01-02 16:42:59 +01:00
Wouter Visser
828e1a87ca Fix crash when using body filters (#2744) 
fix crash when using body filters

They still don't work, but at least the web interface won't crash.
 2018-01-02 16:37:32 +01:00
bksahu
3b67f510b9 Additional OSes/software added to the list 2018-01-02 20:59:17 +05:30
Maximilian Hils
68c32d8627
docs: minor improvements 2018-01-01 17:18:30 +01:00
Thomas Kriechbaumer
e117f4d54c
Merge pull request #2741 from Kriechi/unvendor-wsproto 
unvendor wsproto
 2018-01-01 14:06:20 +01:00
Thomas Kriechbaumer
4495562f86 unvendor wsproto 2018-01-01 13:34:21 +01:00
Maximilian Hils
eb53cc7ed2 minor fixes 2017-12-31 17:44:48 +01:00
Maximilian Hils
44d97848e5
parse commands in posix mode 
If posix=False, quotes are not stripped from parsed tokens.
 2017-12-31 17:31:21 +01:00
Maximilian Hils
d9d4d15ee0
Merge pull request #2733 from mitmproxy/pyinstaller 
Update PyInstaller, add dev version info to builds.
 2017-12-30 22:29:49 +01:00
Maximilian Hils
2f150220e6 update installbuilder 2017-12-30 21:27:19 +01:00
Maximilian Hils
6245566263 fix #2470 2017-12-30 18:48:51 +01:00
Maximilian Hils
d15bdf8d03 fix appveyor build script 
we now have a module named "types",
which of course confuses Python 3.5. O:-)
 2017-12-30 18:48:49 +01:00
Maximilian Hils
9dc3d16bf2 single-source version processing 2017-12-30 18:48:47 +01:00
Maximilian Hils
afe6e587f9
Merge pull request #2703 from mhils/test-defaultkeys 
Test that default key bindings are valid commands
 2017-12-30 17:37:33 +01:00
Maximilian Hils
0b80fd00d4
Merge pull request #2732 from mitmproxy/websocket-flow-kill 
fix flow.kill
 2017-12-29 23:33:37 +01:00
Maximilian Hils
465044c373 test that defaultkeys are valid commands 2017-12-29 23:20:03 +01:00
Maximilian Hils
937a849c93 rtool: include dev version in binaries 2017-12-29 22:57:37 +01:00
Maximilian Hils
749099e292 tox.ini: python3 -> python 
"python3" points to a different binary... on Windows, at least.
 2017-12-29 22:57:01 +01:00
Maximilian Hils
6232622774 fix Flow.kill behaviour 
This now just sets a kill reply instead of committing directly.
First, this seems like the more sane thing to do.
Second, we have an iffy race condition where we call Reply.commit()
before the addonmanager finishes its invocation, the proxy thread then progresses
and sets a new flow.reply attribute, and the addonmanager then gets confused
when finishing. This commit doesn't fix that, but mitigates it for Flow.kill
which is now committed by the addonmanager.
 2017-12-29 22:56:29 +01:00
Maximilian Hils
7075f4dfec remove rtool's setup.py, embrace tox 2017-12-29 22:56:11 +01:00
Thomas Kriechbaumer
59c277effd websocket: add flow kill test 2017-12-29 22:51:13 +01:00
Thomas Kriechbaumer
43c74ff1ef
Merge pull request #2728 from Kriechi/websocket++ 
websocket: docs++ and kill messages
 2017-12-29 10:55:29 +01:00
Thomas Kriechbaumer
a35716a3a7 websocket: test killable 2017-12-28 19:50:31 +01:00
Thomas Kriechbaumer
f123fb600d websocket: docs++ and kill messages 
fixes #2724
 2017-12-27 22:01:28 +01:00
Maximilian Hils
ddb8f43b87 Display "*" when listening on all interfaces 
The set of people who understand "0.0.0.0" (and/or "::") is a subset of
the set of people who understand "*", so we can make things easier to understand
by using the less technical notation.

Empirical Evidence:
 - https://discourse.mitmproxy.org/t/unable-to-use-mitmproxy-on-windows/735
 - https://discourse.mitmproxy.org/t/how-to-view-the-proxy-servers-url/23
 2017-12-26 20:01:37 +01:00
Maximilian Hils
f6a308d31a update rtool dependencies 2017-12-26 19:27:21 +01:00
Maximilian Hils
127cfa689a make sure that mitmproxy/rtool dependencies don't clash 2017-12-26 19:21:43 +01:00
Maximilian Hils
f37bd89433 update pyinstaller 🙏 2017-12-26 18:47:42 +01:00
fate0
5661b40942 @concurrent decorator works for class methods. (#2708) 
* @concurrent decorator should works for class methods
* modify test for @concurrent decorator in class.
* add docs
 2017-12-26 18:44:43 +01:00
Thomas Kriechbaumer
e1f4d17ea7 cleanup transparent linux docs 2017-12-21 10:47:41 +01:00
Jim Higson
907ef4a02c Update linux.rst 2017-12-21 10:47:41 +01:00
Thomas Kriechbaumer
19268d5666
Merge pull request #2710 from jimhigson/update-ios-instructions 
Move trust instructions for ios
 2017-12-21 10:09:02 +01:00
Aldo Cortesi
a6a4b1c33b
Merge pull request #2716 from cortesi/cmdfixes 
various command-related fixes
 2017-12-20 19:49:02 +13:00
Aldo Cortesi
7d45d7f15e cuts: don't crash when retrieving header of a non-existent response 2017-12-20 11:53:44 +13:00
Aldo Cortesi
2fd5bbe1e7 console: ignore non-nav keys in chooser 
Awkward, but works

Fixes #2417
 2017-12-20 11:44:47 +13:00
Aldo Cortesi
4a9deb350d console options: retain focus position after edit 
Fixes #2622
 2017-12-20 10:59:04 +13:00
Aldo Cortesi
1e85345c00 "Commands" title -> "Command Reference" 2017-12-20 10:49:29 +13:00
Aldo Cortesi
6efff27be4 commands: don't try to view flow returns as data 
Fixes #2704
 2017-12-20 10:35:53 +13:00
Aldo Cortesi
91b9ca8675
Merge pull request #2715 from cortesi/fancycommander2 
commander: palette entries, highlight errors
 2017-12-20 10:32:38 +13:00
Aldo Cortesi
c19b229608 console: add console.bodyview.options 
This may be "request" or "response".
 2017-12-20 10:31:49 +13:00
Aldo Cortesi
79ca2c8437 commander: command argument underlay 
Display context-sensitive argument types as an "underlay" in commander.
 2017-12-20 10:07:35 +13:00
Aldo Cortesi
4f32b835f7
Merge pull request #2714 from cortesi/commander1 
commander: highlight commands
 2017-12-20 09:11:19 +13:00
Aldo Cortesi
d7ee5d8f85 commander: palette entries, highlight errors 
- Add palette entries specific to commander
- Highlight errors
- Introduce an Unknown type to keep track of extra unknown arguments to
commands
 2017-12-20 09:09:40 +13:00
Aldo Cortesi
3341edc9fa commander: highlight commands 
Step 1 of the fancification of commander.
 2017-12-20 08:21:48 +13:00