Commit Graph

2425 Commits

Author SHA1 Message Date
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
Niko Kommenda
55e89865ff no longer strips Accept-Encoding as mitmproxy can handle compression 2016-01-12 22:25:42 +00:00
Niko Kommenda
25705af76d added sslstrip to inline script examples 2016-01-12 16:41:41 +00:00
Matthew Shao
181c2973e6 PollingObserver() fixed on Linux and OS X. 2016-01-12 22:24:18 +08:00
MatthewShao
201fdea6e5 Change Observer() to PollingObserver(). 2016-01-12 21:36:59 +08:00
Matthew Shao
89679bc386 Fix observer in same dir situation. 2016-01-12 20:50:33 +08:00
MatthewShao
e72663be08 Fix script reloader on OS X. 2016-01-12 11:45:03 +08:00
Michael J. Bazzinotti
e766838a1a Add Inline Script Hooks to TCP mode 2016-01-10 13:05:01 -05:00
Thomas Kriechbaumer
aea3837d4a remove code duplication 2016-01-10 11:57:39 +01:00
Chris Czub
493302d180 Support writing to outfile from mitmweb 2016-01-10 11:57:37 +01:00
Sandor Nemes
fe77dd35c6 Fixed a problem with the bind address not being used as the source address on outgoing TCP packets 2016-01-08 18:55:13 +01:00
Maximilian Hils
f07008b8a6 Merge pull request #878 from warting/patch-1
Update redirect_requests.py
2016-01-08 17:33:03 +01:00
Stefan Wärting
27b801ebe2 Update redirect_requests.py
replace http version with "HTTP/1.1"
2016-01-08 16:02:27 +01:00
Maximilian Hils
11215e46ec fix #659 2016-01-02 15:12:36 +01:00
Michael J. Bazzinotti
f8d8a80bd0 clientcert tests: fix whitespace 2015-12-29 18:14:11 +01:00
Maximilian Hils
7b093b46b6 Merge pull request #870 from bazzinotti/master
[docs/libmproxy/test] Support single client-side cert file
2015-12-29 17:51:11 +01:00
Michael J. Bazzinotti
09168e1274 client-cert: Simplify and cleanup
simplify the error message when cert path does not exist.
During tests, reset the clientcerts proxy config setting to None
Remove now-unused clientcerts code from class ProxTestBase
2015-12-29 11:48:02 -05:00
Michael J. Bazzinotti
80690b7906 [docs/libmproxy/test] Support single client-side cert file as argument to
--client-certs
2015-12-28 15:20:45 -05:00
Maximilian Hils
6391b05ef1 Merge pull request #857 from jwilk/spelling
docs: fix typos
2015-12-12 11:43:56 +01:00
Jakub Wilk
c8f9f4c17e docs: fix typos 2015-12-12 11:18:56 +01:00
Maximilian Hils
c6d849f7f5 Merge pull request #855 from jvillacorta/master
Add default ciphers to avoid issue with iOS9 App Transport Security
2015-12-11 17:13:32 +01:00
Jorge Villacorta
ba53c7c9a2 Add default ciphers to avoid issue with iOS9 App Transport Security 2015-12-11 11:09:02 -05:00
Maximilian Hils
f446dc4b83 Merge pull request #853 from dweinstein/warnings-to-stderr
TLS verification warnings write to stderr
2015-12-10 17:49:24 +01:00
David Weinstein
78fc092b94 TLS verification warnings write to stderr 2015-12-10 11:43:58 -05:00
Aldo Cortesi
3b38fd86d2 Merge commit '5db6275' 2015-12-04 11:20:18 +13:00
Aldo Cortesi
5db6275c63 Changelog 2015-12-04 11:19:24 +13:00
Maximilian Hils
37903f69a0 setup.py: document that we don't want to use '~=' 2015-12-03 19:58:35 +01:00
Maximilian Hils
47b2beb48b use latest netlib version for snapshots 2015-12-03 18:42:02 +01:00
Maximilian Hils
5272979774 remove docs directory from sdist 2015-12-03 18:19:44 +01:00
Maximilian Hils
e6bf033cbd bump version 2015-12-03 18:13:24 +01:00
Maximilian Hils
946bc05187 use version specifiers compatible with old setuptools releases 2015-12-03 17:57:29 +01:00
Maximilian Hils
46ae8b0e30 Revert "make setup.py wheel-ready"
This reverts commit 51bd98d5b1.
2015-12-03 17:28:52 +01:00