9389 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maximilian Hils	ff264eb309	add functionality to change the destination server	2014-02-06 22:16:26 +01:00
Maximilian Hils	134c7795f8	remove LEGACY switches, always update flow.server_conn	2014-02-06 01:19:51 +01:00
Maximilian Hils	cb397ec788	fix bugs, expose timestamp information to console ui	2014-02-06 00:53:39 +01:00
Maximilian Hils	80683e77bc	mock urwid to run console tests on windows, push failing testcases down to 0. :-)	2014-02-05 23:17:26 +01:00
Maximilian Hils	7fc544bc7f	adjust netlib.wsgi to reflect changes in mitmproxys flow format	2014-02-05 21:34:14 +01:00
Maximilian Hils	f26d91cb81	add skeleton to change destinatin server during intercept, fix all testcases on windows	2014-02-05 20:26:47 +01:00
Mikhail Korobov	3e0e4b7dec	remove upper bound for Pillow in setup.py	2014-02-05 19:43:08 +06:00
Maximilian Hils	9a55cd7332	Merge branch 'master' into tcp_proxy	2014-02-05 14:33:44 +01:00
Maximilian Hils	d864a326d2	fix all tests except those using set_url and get_url	2014-02-05 14:33:17 +01:00
Maximilian Hils	6d9b28f2ea	add example to show how to read mitmproxy dump files, refs #207	2014-02-04 19:10:55 +01:00
Maximilian Hils	fd828bf959	shutdown properly if we dont keep serving	2014-02-04 18:40:12 +01:00
Steven Van Acker	66da73d8a9	fixing bug: AttributeError: DumpMaster instance has no attribute 'unload_script'	2014-02-04 14:49:51 +01:00
Maximilian Hils	6a53ae5fd3	push failing tests down to 43	2014-02-04 05:02:17 +01:00
Maximilian Hils	0bbc40dc33	store used sni in TCPClient, add equality check for tcp.Address	2014-02-04 04:51:41 +01:00
Maximilian Hils	f6253a80ff	add priorities for the destination server address	2014-02-04 02:56:59 +01:00
Maximilian Hils	2db5f9de26	bring failing tests back into the double-digit range	2014-01-31 04:45:39 +01:00
Maximilian Hils	7d96ff00ef	remove _flow_map from state, improve logging	2014-01-31 03:01:51 +01:00
Maximilian Hils	30a44cbb41	fix server reconnect	2014-01-31 01:44:55 +01:00
Maximilian Hils	dc45b4bf19	move StateObject back into libmproxy	2014-01-31 01:06:53 +01:00
Maximilian Hils	6ce1470631	move StateObject back into libmproxy	2014-01-31 01:06:35 +01:00
Maximilian Hils	5fce7be592	complete state handling	2014-01-30 20:11:01 +01:00
Maximilian Hils	ff9656be80	remove subclassing of tuple in tcp.Address, move StateObject into netlib	2014-01-30 20:07:30 +01:00
Maximilian Hils	b64e1ccf91	adjust for netlib.tcp.Address changes	2014-01-30 20:06:33 +01:00
Maximilian Hils	8544a5ba4b	add generic TCP handler with SSL support, move StateObject into netlib	2014-01-30 18:56:23 +01:00
Maximilian Hils	179c3ae8aa	polish SimpleStateObject	2014-01-30 06:03:41 +01:00
Maximilian Hils	e00bbccfd6	remove old classes	2014-01-30 05:21:53 +01:00
Maximilian Hils	40bf42f14a	merge flow classes. current status: basic mitmdump working	2014-01-30 05:00:13 +01:00
Maximilian Hils	607f777811	fix most testsuite errors, improve proxy error handling	2014-01-29 02:49:11 +01:00
Maximilian Hils	e18ac4b672	re-add server attribute to BaseHandler	2014-01-28 20:30:16 +01:00
Aldo Cortesi	1572d14cc3	Merge branch 'master' of ssh.github.com:mitmproxy/pathod	2014-01-29 08:19:25 +13:00
Maximilian Hils	b994fb5a27	adjust to signature changes in netlib.tcp	2014-01-28 19:28:20 +01:00
Maximilian Hils	1b566869de	Merge branch 'master' into tcp_proxy	2014-01-28 17:44:55 +01:00
Maximilian Hils	1e3e0dd127	merge master	2014-01-28 17:29:28 +01:00
Maximilian Hils	17f09aa0af	unify ipv4/ipv6 address handling	2014-01-28 17:28:20 +01:00
Maximilian Hils	763cb90b66	add tcp.Address to unify ipv4/ipv6 address handling	2014-01-28 17:26:35 +01:00
Aldo Cortesi	dc6d573d39	Adjust docs for inclusion of content-length header by default.	2014-01-28 15:31:30 +13:00
Maximilian Hils	ea894282f3	move test requirements out of main requirements.txt	2014-01-28 03:21:59 +01:00
Aldo Cortesi	3aa78f9ff3	Merge branch 'master' of ssh.github.com:cortesi/mitmproxy	2014-01-28 15:20:10 +13:00
Aldo Cortesi	e5d2829364	docs: fix spacing of page headers	2014-01-28 15:19:53 +13:00
Maximilian Hils	36930a6e1d	actually remove test dependencies from requirements.txt	2014-01-28 03:17:27 +01:00
Aldo Cortesi	404d4bbc69	Merge branch 'master' of ssh.github.com:cortesi/netlib	2014-01-28 15:14:01 +13:00
Aldo Cortesi	9c9e4a5295	travis irc notifications	2014-01-28 15:13:31 +13:00
Aldo Cortesi	fcb569b7d7	Merge branch 'master' of ssh.github.com:cortesi/mitmproxy	2014-01-28 15:12:57 +13:00
Aldo Cortesi	0b7a7ffcb1	Changelog.	2014-01-28 15:12:44 +13:00
Maximilian Hils	125166020b	move test requirements out of main requirements.txt	2014-01-28 03:09:21 +01:00
Aldo Cortesi	5ce9c2eb65	Update contributors.	2014-01-28 15:04:20 +13:00
Aldo Cortesi	7815b3fb41	travis: unbreak, and add irc notifications	2014-01-28 15:02:34 +13:00
Maximilian Hils	9759ec7c29	move test requirements out of main requirements.txt	2014-01-28 02:57:46 +01:00
Aldo Cortesi	647a11c900	travis: irc notifications	2014-01-28 14:52:41 +13:00
Aldo Cortesi	732932e8bb	Try even harderer to fix travis.	2014-01-28 14:42:39 +13:00