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
2,466 Commits 1 Branch 67 Tags 50 MiB
9efda4d138
Commit Graph

2466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shadab Zafar
9efda4d138 Refactor copy_as_python_code 
Make it easier to support other HTTP request types
 2016-02-06 00:41:01 +05:30
Maximilian Hils
ae4a1dd6de Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-02-02 21:49:03 +01:00
Maximilian Hils
cc68e6bcb2 add appveyor slack integration 2016-02-02 21:48:48 +01:00
Thomas Kriechbaumer
3bf2a3fb99 move travis-slack notification to different channel 2016-02-02 19:28:20 +01:00
Maximilian Hils
8c4d8b3785 fix #861, fix #888 2016-02-02 18:18:04 +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
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
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
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
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
Anant
0a6e3c88ef Added feature to intercept flows from within inline scripts 2016-01-25 19:00:33 +05:30
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
Maximilian Hils
7eb9bf818c Merge pull request #881 from MatthewShao/Fix#846 
Fix #846
 2016-01-18 12:21:21 +01:00
Matthew Shao
8aeed2032d Update reloader.py 2016-01-18 19:12:43 +08:00
Sandor Nemes
918a457f5a Minor aesthetic fixes. 2016-01-18 09:55:46 +01:00
Matthew Shao
98cee0e147 Update reloader.py 2016-01-18 10:15:09 +08:00
MatthewShao
7f2b17d0ef Use RegexMatchingEventHandler() instead. 2016-01-18 09:57:58 +08:00
Sandor Nemes
192f033967 Merge branch 'master' into master 2016-01-17 21:24:47 +01:00
Maximilian Hils
0f54f2990c Merge pull request #872 from bazzinotti/inline-tcp 
Add "tcp_message" Inline Script Hook
 2016-01-17 19:54:59 +01:00
Thomas Kriechbaumer
add33f8733 Merge pull request #887 from felixonmars/pillow-31 
Allow Pillow 3.1
 2016-01-14 09:42:25 +01:00
Felix Yan
cbf9418072 Allow Pillow 3.1 
Tested with Pillow 3.1.0, all tests passed and the functionality is working correctly here.
 2016-01-14 14:59:51 +08:00
Matthew Shao
5b442a8947 Use PollingObserver() only on OS X. 2016-01-14 09:30:06 +08:00
Maximilian Hils
0882457b17 Merge pull request #882 from tinius/sslstrip 
added sslstrip to inline script examples
 2016-01-13 15:46:31 +01:00
Sandor Nemes
2753af0ec7 Merge branch 'master' into master 2016-01-13 15:05:57 +01:00