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
7,378 Commits 1 Branch 67 Tags 50 MiB
a71d050fbf
Commit Graph

7378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Shao
633bc350d2 Fix #2760 2018-01-08 21:14:35 +08:00
Samoilenko Roman
821d76df02 Fix #2767 (#2770) 2018-01-07 23:05:39 +01:00
Maximilian Hils
15f525e86b only use annotated tags for version calculation 2018-01-07 21:18:42 +01:00
Maximilian Hils
94a173ab9c
Merge pull request #2764 from Kriechi/ssl-tls 
rename attributes, function and class names: s/ssl/tls/
 2018-01-07 20:21:49 +01:00
Maximilian Hils
c1dad83b32
Merge pull request #2769 from kajojify/issue-2688 
Fix #2688
 2018-01-07 19:57:55 +01:00
Thomas Kriechbaumer
4fb894cad4 avoid TLS/SSL ambiguity for Cert class 2018-01-07 19:55:04 +01:00
Miroslav
ce5e46b668 Fix #2688 2018-01-07 16:18:58 +02:00
Thomas Kriechbaumer
d15e96dee1 rename TLS/SSL-related functions 
SSL is an outdated protocol superseeded by TLS. Although the commonly
used library is called OpenSSL, it is no reason to still use outdated
language for function names.
 2018-01-06 10:43:54 +01:00
Thomas Kriechbaumer
9aae3213b9 rename TLS/SSL-related attributes 
SSL is an outdated protocol superseeded by TLS. Although the commonly
used library is called OpenSSL, it is no reason to still use outdated
language for attributes.
 2018-01-06 10:43:47 +01:00
Samoilenko Roman
012b938254 Fix #2762 (#2763) 
s/console_order/view_order
s/console_order_reversed/view_order_reversed
 2018-01-06 08:54:38 +01:00
Maximilian Hils
1c769b0991
Merge pull request #2759 from mhils/issue-1833 
Fix #1833, clean up common.format_keyvals
 2018-01-05 20:26:57 +01:00
Maximilian Hils
a6bd53534b fix #1833 2018-01-05 16:45:53 +01:00
Maximilian Hils
2e2daeed89 refactor common.format_keyvals 
the semantics here were really quite unclear,
now it is hopefully a bit more obvious what's happening.
Once we are Python 3.6+ exclusively, we may consider changing
the signature to accept a (order-preserving) dict instead of a list.
 2018-01-05 16:45:50 +01:00
Maximilian Hils
9b03ab59ef minor fixes 2018-01-05 16:45:46 +01:00
Maximilian Hils
c2adcb58f4 fix test flow timestamps to values that don't overflow in certain timezones 2018-01-05 16:45:43 +01:00
Thomas Kriechbaumer
c1c1652082
Merge pull request #2754 from mhils/issue-2470 
fix #2470
 2018-01-04 19:03:51 +01:00
Maximilian Hils
1e03a5d31e dependency update 2018-01-04 18:55:07 +01:00
Samoilenko Roman
133dd1743d Bugs with console fixed. (#2746) 
Clicking on a tab now focuses it. Fixes #2676.
 2018-01-04 17:02:39 +01:00
Maximilian Hils
d982dd98a0
Merge pull request #2755 from mhils/fix-unfocused-pane-click 
fix #2738
 2018-01-04 16:36:23 +01:00
Maximilian Hils
dd7902cf7f fix #2470 2018-01-04 16:31:45 +01:00
Maximilian Hils
00b80b33a1
Merge pull request #2756 from mitmproxy/pyinstaller 
Update pysftp, fix wheel testing.
 2018-01-04 16:00:50 +01:00
Maximilian Hils
3b22433ca7 fix #2738 2018-01-04 15:57:07 +01:00
Maximilian Hils
d38b5e8552 do not add leading zeroes to .dev version part. 
wheel normalizes to no leading zeroes, and we don't want to special-case
that.
 2018-01-04 15:42:09 +01:00
Maximilian Hils
09f6160645 pin snapshot server hostkey, update pysftp 2018-01-04 14:12:30 +01:00
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