Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-30 03:14:22 +00:00
Code Issues Projects Releases Wiki Activity
3,966 Commits 1 Branch 67 Tags 50 MiB
ae61025d5d
Commit Graph

3966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
8c4d8b3785 fix #861, fix #888 2016-02-02 18:18:04 +01:00
Maximilian Hils
0336a53aa8 Merge branch 'master' of https://github.com/mitmproxy/netlib 2016-02-02 18:16:05 +01:00
Maximilian Hils
a188ae5ac5 allow creation of certs without CN 2016-02-02 18:15:55 +01:00
Maximilian Hils
5b18a355aa Merge pull request #909 from chrishamant/master 
fix crash with viewing unpacked date objects
 2016-02-02 18:12:02 +01:00
Chris Hamant
329710e6fb fix crash with viewing unpacked date objects 2016-02-02 11:48:42 -05:00
Thomas Kriechbaumer
e222858f01 bump dependency and remove deprecated fields 2016-02-02 17:39:49 +01:00
Maximilian Hils
83bd7b2603 turn script reloader off by default outside mitmdump/mitmproxy 2016-02-02 14:33:36 +01:00
Maximilian Hils
aaf82cae7d tests: use relative imports 2016-02-02 13:25:31 +01:00
Maximilian Hils
bceeb4a291 raise an ScriptException when running unloaded scripts 2016-02-02 12:27:01 +01:00
Maximilian Hils
f39e50c4db silence third-party modules 2016-02-02 12:26:28 +01:00
Thomas Kriechbaumer
81b32cf426 Merge pull request #116 from Kriechi/hyperframe 
migrate to hyperframe
 2016-02-01 20:28:14 +01:00
Thomas Kriechbaumer
1e20340126 Merge pull request #118 from mitmproxy/py3-peek 
Fix Reader.peek() on Python 3
 2016-02-01 20:25:28 +01:00
Maximilian Hils
417384d6f2 Merge pull request #906 from anantk17/master 
Added feature to intercept flows from within inline scripts
 2016-02-01 20:24:06 +01:00
Maximilian Hils
931b5459e9 remove code duplication 2016-02-01 20:19:34 +01:00
Maximilian Hils
a3af0ce71d tests++ 2016-02-01 20:10:18 +01:00
Maximilian Hils
bda49dd178 fix #113, make Reader.peek() work on Python 3 2016-02-01 19:38:14 +01:00
Maximilian Hils
7c83a709ea add test for Reader.peek() 2016-02-01 19:24:30 +01:00
Thomas Kriechbaumer
e98c729bb9 test on python3 2016-01-31 20:19:32 +01:00
Thomas Kriechbaumer
280b491ab2 migrate to hyperframe 2016-01-31 20:03:25 +01:00
Anant
34875585c0 added comments 2016-01-31 04:02:11 +05:30
Maximilian Hils
11218e0c98 fix #903 2016-01-30 22:44:08 +01:00
Thomas Kriechbaumer
d253ebc142 fix test request and response headers 2016-01-30 22:03:24 +01:00
Thomas Kriechbaumer
283c74a0ea allow pypy again on travis 2016-01-30 13:38:28 +01:00
Thomas Kriechbaumer
2145ded375 fix pypy on travis 2016-01-30 13:35:49 +01:00
Thomas Kriechbaumer
8c37538314 code formatting: fix whitespace issues 2016-01-27 10:36:28 +01:00
Thomas Kriechbaumer
c2bb29f669 cleanup imports 2016-01-27 10:36:28 +01:00
Maximilian Hils
299c7fa34c Merge pull request #884 from dufferzafar/export 
Export/Copy flow as...
 2016-01-26 21:12:08 +01:00
Maximilian Hils
ce132dc180 Merge pull request #893 from dweinstein/sni-ignore 
Add ignore based on TLS ClientHello SNI
 2016-01-26 21:07:12 +01:00
David Weinstein
4be8d148b1 Add SNI ignore docs and have code match it 2016-01-26 13:09:22 -05:00
David Weinstein
8f8c2efccd Include raw client hello in exception 2016-01-26 12:38:00 -05:00
David Weinstein
7d69c3480b remove TODO 2016-01-26 11:59:32 -05:00
David Weinstein
a2ebcfe879 Simplify check_ignore in _next_layer 2016-01-26 11:44:32 -05:00
David Weinstein
17a32d921c Log exceptions parsing TlsClientHello in TlsLayer 2016-01-26 11:40:11 -05:00
David Weinstein
11b289d3c7 remove client_tls property from TlsLayer 2016-01-26 11:28:19 -05:00
David Weinstein
21ddd5e503 Move SNI ignore check into _next_layer 2016-01-26 11:12:46 -05:00
David Weinstein
0a43cc8844 add TlsClientHello repr 2016-01-26 09:33:03 -05:00
Maximilian Hils
798bd413e8 Merge pull request #898 from lilydjwg/master 
[console] always show connection info in Details tab
 2016-01-26 11:31:37 +01:00
依云
ca0f310211 [console] always show connection info in Details tab 
Connections become false values when it's finished. Check if it's
None when trying to show address info.

Fixes #886.
 2016-01-26 18:14:19 +08:00
David Weinstein
56ef7d238b Don't store client_tls state in root context 2016-01-25 17:49:31 -05:00
Shadab Zafar
8fa16ce895 Remove restrictions based on request content 2016-01-25 22:31:22 +05:30
Thomas Kriechbaumer
dc7d41e7a5 Merge pull request #115 from Kriechi/move-tservers 
move tservers to netlib module
 2016-01-25 15:22:36 +01:00
Anant
0a6e3c88ef Added feature to intercept flows from within inline scripts 2016-01-25 19:00:33 +05:30
Thomas Kriechbaumer
1b487539b1 move tservers to netlib module 2016-01-25 09:20:44 +01:00
David Weinstein
ce0a500885 Add ignore based on TLS ClientHello SNI 
- also add some documentation about ignoring based on SNI
 2016-01-23 21:46:04 -05:00
Maximilian Hils
a60810cc2c Merge pull request #891 from ganguera/master 
Added CLI argument to enable "follow flow list" mode
 2016-01-22 23:03:47 +01:00
Guillem Anguera
b030ff090a Added CLI argument to enable "follow flow list" mode 2016-01-22 22:11:03 +01:00
Maximilian Hils
4024721c7b Merge pull request #879 from snemes/master 
Fixed a problem with the bind address not being used as the source address on outgoing TCP packets
 2016-01-18 16:07:02 +01:00
Sandor Nemes
cb3107fd0e Merge branch 'master' of https://github.com/snemes/mitmproxy 2016-01-18 15:53:34 +01:00
Sandor Nemes
61bd318622 remove unnecessary source_address from proxy modes 2016-01-18 15:52:03 +01:00
Sandor Nemes
b892957b90 Merge branch 'master' into master 2016-01-18 13:35:27 +01:00