1682 Commits

Author	SHA1	Message	Date
依云	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
Guillem Anguera	b030ff090a	Added CLI argument to enable "follow flow list" mode	2016-01-22 22:11:03 +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
Matthew Shao	5b442a8947	Use PollingObserver() only on OS X.	2016-01-14 09:30:06 +08:00
Sandor Nemes	2753af0ec7	Merge branch 'master' into master	2016-01-13 15:05:57 +01: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	11215e46ec	fix #659	2016-01-02 15:12:36 +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
Jorge Villacorta	ba53c7c9a2	Add default ciphers to avoid issue with iOS9 App Transport Security	2015-12-11 11:09:02 -05:00
David Weinstein	78fc092b94	TLS verification warnings write to stderr	2015-12-10 11:43:58 -05:00
Maximilian Hils	e6bf033cbd	bump version	2015-12-03 18:13:24 +01:00
Maximilian Hils	46ae8b0e30	Revert "make setup.py wheel-ready" ... This reverts commit 51bd98d5b1.	2015-12-03 17:28:52 +01:00
Maximilian Hils	51bd98d5b1	make setup.py wheel-ready	2015-12-03 16:25:49 +01:00
Maximilian Hils	1619af1486	flow format compat: 0.14 -> 0.15	2015-12-03 14:45:26 +01:00
Maximilian Hils	d1ce1aa993	fix #839	2015-12-02 21:19:41 +01:00
Maximilian Hils	3963a2191b	add import capability for old flows, fix #840	2015-12-02 19:50:08 +01:00
Maximilian Hils	43ed82062f	fix #847	2015-11-27 21:21:04 +01:00
Maximilian Hils	a88004f1ce	fix #831	2015-11-26 23:20:31 +01:00
Maximilian Hils	6a239526e5	http: catch all exceptions	2015-11-26 23:19:43 +01:00
Maximilian Hils	a9f64c22f8	simplify Client/ServerConnection.__repr__	2015-11-26 23:15:21 +01:00
Maximilian Hils	89013eb7af	establish tls with client even if server connection fails	2015-11-26 23:13:06 +01:00
Maximilian Hils	3eea7f1216	script reloader: minor fixes	2015-11-26 14:59:54 +01:00
Maximilian Hils	5d332e7218	fix #842	2015-11-26 14:58:08 +01:00
Maximilian Hils	d2f69da235	disable script reloader ... This currently throws some errors on OSX.	2015-11-24 18:54:16 +01:00
Matthew Shao	b7bea03c68	fix #835 , can display unicode character correctly	2015-11-16 20:47:58 +08:00
Maximilian Hils	d6bd1cb4a6	fix HTTPS Proxy-Authentication, refs #824	2015-11-14 21:55:02 +01:00
Maximilian Hils	0d98b9dcc5	finalize script reloading 🎉	2015-11-14 05:57:02 +01:00
Maximilian Hils	4499ab61c0	structure libmproxy.script	2015-11-14 04:21:38 +01:00
Maximilian Hils	247f27d821	minor stylistic fixes	2015-11-14 03:46:34 +01:00
Chris Czub	e72a9a62a1	Feedback from PR #832	2015-11-13 16:55:27 -05:00
Chris Czub	d3feaa3bc6	Add custom content view plugin support for mitmproxy/mitmdump	2015-11-13 15:09:05 -05:00
Chris Czub	d7239d665e	Add new contentviews' content type mappings	2015-11-13 15:08:52 -05:00
Chris Czub	82a90511bc	Add "add" ContentView method & test	2015-11-13 15:07:56 -05:00