2291 Commits

Author	SHA1	Message	Date
Maximilian Hils	ddb8f43b87	Display "*" when listening on all interfaces ... The set of people who understand "0.0.0.0" (and/or "::") is a subset of the set of people who understand "*", so we can make things easier to understand by using the less technical notation. Empirical Evidence: - https://discourse.mitmproxy.org/t/unable-to-use-mitmproxy-on-windows/735 - https://discourse.mitmproxy.org/t/how-to-view-the-proxy-servers-url/23	2017-12-26 20:01:37 +01:00
fate0	5661b40942	@concurrent decorator works for class methods. (#2708) ... * @concurrent decorator should works for class methods * modify test for @concurrent decorator in class. * add docs	2017-12-26 18:44:43 +01:00
Aldo Cortesi	7d45d7f15e	cuts: don't crash when retrieving header of a non-existent response	2017-12-20 11:53:44 +13:00
Aldo Cortesi	79ca2c8437	commander: command argument underlay ... Display context-sensitive argument types as an "underlay" in commander.	2017-12-20 10:07:35 +13:00
Aldo Cortesi	d7ee5d8f85	commander: palette entries, highlight errors ... - Add palette entries specific to commander - Highlight errors - Introduce an Unknown type to keep track of extra unknown arguments to commands	2017-12-20 09:09:40 +13:00
Aldo Cortesi	3341edc9fa	commander: highlight commands ... Step 1 of the fancification of commander.	2017-12-20 08:21:48 +13:00
Aldo Cortesi	d98fc4f03a	commands: partial parser now returns help for remaining arguments	2017-12-19 11:50:12 +13:00
Aldo Cortesi	843bad187c	types: add validation to partial parser	2017-12-19 11:22:03 +13:00
Aldo Cortesi	6563feaf05	types: use new type validation mechanism in commands	2017-12-19 10:19:08 +13:00
Aldo Cortesi	cda14830d3	types: add validation functions	2017-12-19 10:19:08 +13:00
Aldo Cortesi	38b37ba7f5	types: cleanups and minor refactorings	2017-12-19 10:19:08 +13:00
Thomas Kriechbaumer	9faad6bc9c	Merge pull request #2702 from Kriechi/fix-2640 ... improve websocket dumps	2017-12-18 21:31:00 +01:00
Thomas Kriechbaumer	417a860f32	add tests	2017-12-18 11:20:18 +01:00
Thomas Kriechbaumer	8d836d251e	fix #2640	2017-12-18 09:19:21 +01:00
Thomas Kriechbaumer	1a7ce384da	websocket: support domain and url filters	2017-12-18 09:19:20 +01:00
Aldo Cortesi	b0b67fe2a7	commands: refactor types ... The type system was scattered over a number of places, making it hard to follow. This collects all command types in types.py, and completion, validation and parsing for each type is centralised. We should use the same mechanism for options.	2017-12-18 17:02:48 +13:00
Aldo Cortesi	7dbe4209d9	Merge pull request #2690 from cortesi/types ... mitmproxy.types -> mitmproxy.coretypes	2017-12-18 08:14:07 +13:00
Aldo Cortesi	978b8d095c	mitmproxy.types -> mitmproxy.coretypes ... The types name is valuable, and we have a better use for it in collecting and exposing types for options and commands. The coretypes module should probably be split up anyway - it contains a threading base class, a few container objects, and the defintion of our serialization protocol. I was tempted to rename it to "uncagegorized" for the sake of honesty.	2017-12-17 13:31:36 +13:00
Aldo Cortesi	a289db8d75	commands: minor refactoring and command renaming	2017-12-17 11:23:15 +13:00
Aldo Cortesi	ac335057a7	Disable implicit JS test asset generation ... The JS test assets depend in a brittle way on the details of the tflow() utility functions. We shouldn't have to fix JS tests when adjusting these. Options: - Manually generate the test assets in a script. - Define the JS assets without using tflow, so they don't unexpextedly vary.	2017-12-17 10:17:05 +13:00
Aldo Cortesi	2649e57691	minor: fix key bindings, adjust flow command presentation ... Fixes #2681	2017-12-17 10:11:02 +13:00
Aldo Cortesi	cd913d598d	command cuts: add completion ... - Remove shortcuts for request, response, etc. - we don't need them if we have completion - Restrict cuts specification to a set of prefixes - Extend cuts to add a few more items	2017-12-17 10:11:02 +13:00
Aldo Cortesi	50a94db2cc	commands: Reassess the cuts API ... Make the cuts API more transparent. Cut specifications are no longer a centrally resolved core type, and flows are now passed explicitly.	2017-12-17 10:11:02 +13:00
Aldo Cortesi	198c7b19a3	commander: test++	2017-12-15 17:51:02 +13:00
Aldo Cortesi	a8ae006f2e	command: path completion	2017-12-15 16:02:34 +13:00
Aldo Cortesi	582e6a9fa6	command: recursive command parsing ... This lets us complete commands passed to commands correctly.	2017-12-15 16:02:34 +13:00
Aldo Cortesi	a436af537a	Merge pull request #2678 from mhils/console-startup-events ... Fix console logging during startup	2017-12-15 16:02:19 +13:00
Maximilian Hils	3ff380054c	improve eventstore truncation	2017-12-15 01:36:41 +01:00
Aldo Cortesi	1c097813c1	commands: emit types from partial parser, implement choice completion	2017-12-15 11:38:37 +13:00
Aldo Cortesi	8c0ba71fd8	commander: tab completion for command names	2017-12-15 10:07:47 +13:00
Aldo Cortesi	4d358c49fb	WIP: autocompletion	2017-12-15 10:07:47 +13:00
Aldo Cortesi	0cd4a77268	commands: add a parser for partial commands ... We only return Cmd and str types for the moment.	2017-12-15 10:07:47 +13:00
Aldo Cortesi	e64d5c6bb9	commands: add a Cmd argument type ... This represents a command passed as an argument. Also split arguments from command values themselves, making the command help for meta-commands much clearer.	2017-12-15 10:07:47 +13:00
Aldo Cortesi	04e19f9171	Introduce a custom widget for command editing ... The builtin urwid.Edit widget is not sufficiently flexible for what we want to do.	2017-12-15 10:07:47 +13:00
Aldo Cortesi	dfcf62ff2b	Merge pull request #2545 from mitmproxy/wsproto ... Replace our WebSocket stack with wsproto	2017-12-15 09:49:24 +13:00
Maximilian Hils	0af6e2e97f	adjust tests	2017-12-14 15:44:47 +01:00
Aldo Cortesi	62561ed428	Merge pull request #2669 from cortesi/path ... commands: add a Path argument type	2017-12-14 07:42:12 +13:00
Maximilian Hils	5e0e08a4d6	Merge pull request #2670 from Kriechi/fix-2664 ... fix #2664	2017-12-13 13:50:43 +01:00
Thomas Kriechbaumer	488ec6f3f1	fix #2664	2017-12-13 09:45:40 +01:00
Aldo Cortesi	79cf6d2a5d	Merge pull request #2668 from cortesi/commandopts ... Command improvements	2017-12-13 14:42:56 +13:00
Aldo Cortesi	e63bb8cde5	commands: add a Path argument type ... This is just an alias for str, and in this patch is used mostly to give an appropriate type in help strings. More to come. Fixes #2198	2017-12-13 14:41:46 +13:00
Aldo Cortesi	4cee1a4f96	commands: formalise a Choice type ... This resolves as a string during MyPy checks, but at runtime has an additional attribute that is a command that returns valid options. This is very ugly and clumsy, basically because MyPy is super restrictive about what it accepts as a type. Almost any attempt to construct these types in a more sophisticated way fails in one way or another. I'm open to suggestions.	2017-12-13 11:08:14 +13:00
Maximilian Hils	1a45cf17b3	Merge pull request #2643 from Ga-ryo/master ... Fix #2594	2017-12-12 22:40:47 +01:00
Ujjwal Verma	5214f544e7	Use wsproto for websockets	2017-12-12 22:09:46 +01:00
Thomas Kriechbaumer	130021b76d	prepare WebSocket stack to move to wsproto	2017-12-12 22:09:46 +01:00
Maximilian Hils	8e9194c2b4	fix #2529	2017-12-12 16:46:35 +01:00
Maximilian Hils	0fb48bc6a7	minor improvements, add tests for ipv4-mapped addresses	2017-12-12 14:00:12 +01:00
Aldo Cortesi	4912920573	Merge branch 'master' into browser-win	2017-12-12 08:03:09 +13:00
Maximilian Hils	7654ad2d31	fix browser addon on Windows	2017-12-11 10:46:55 +01:00
Aldo Cortesi	b8cbb4dce8	commands: verify command function signatures before call (#2659) ... Fixes #2652, and many other possible crashes on user input.	2017-12-11 10:03:07 +01:00
Aldo Cortesi	aeefcd08a4	browser addon: start an isolated browser attached to the proxy ... A simple addon that starts an instance of Chrome attached to the current proxy. The instance is isolated in its own user data directory, and addons are turned off. Future work: - I wasn't able to test the Windows executable path - a Windows dev should confirm this for us. - In future it would be nice to support other browsers like Firefox.	2017-12-10 18:26:24 +13:00
Suraj Tripathi	5067438ec1	Bug in expected_http_body_size fix (#2642) ... fixes #2618	2017-11-27 19:01:32 +01:00
Maximilian Hils	4a2a718bc2	improve clientreplay addon ... - always refresh UI after flow is finished (refs #2616) - count currently active replay - make replay thread daemonic so that users can exit mitmproxy if replay hangs. This is not perfect yet, but vastly better than how it has been.	2017-11-07 11:49:12 +01:00
Maximilian Hils	e6e28c2ac3	fix revert of duplicated flows	2017-11-06 15:24:54 +01:00
Maximilian Hils	7314081b82	make safecall threadsafe.	2017-10-26 21:43:59 +02:00
Maximilian Hils	4a6d838ecc	fix #2563	2017-10-24 23:27:16 +02:00
Maximilian Hils	a5d74356dd	simplify version output	2017-10-24 14:33:56 +02:00
Maximilian Hils	f31d5dc3eb	Merge pull request #2591 from ddworken/master ... Added scanning for CSS injection and iframe injection to XSS scanner	2017-10-22 18:02:28 +02:00
Maximilian Hils	4522f15c89	skip ipv6 tests on sudo-enabled travis builds	2017-10-20 16:00:25 +02:00
David Dworken	04a06eb6b5	Added scanning for CSS injection and iframe injection	2017-10-17 23:39:33 -04:00
Maximilian Hils	289ddfe988	remove html outline contentview, fix #2572	2017-09-14 15:11:24 -07:00
Maximilian Hils	930d78b554	Merge pull request #2537 from ujjwal96/content-view ... JS beautifier	2017-09-04 19:49:42 +02:00
Maximilian Hils	68fab8bd92	Merge pull request #2560 from mhils/mitmproxy-net-tls ... Split TLS parts from net.tcp into net.tls	2017-09-04 17:32:49 +02:00
Maximilian Hils	de006ea8ad	move hostname validation into mitmproxy.net.tls	2017-09-04 14:02:43 +02:00
Maximilian Hils	0b79304e98	suppress tornado logging in tests	2017-09-03 21:22:21 +02:00
Maximilian Hils	e1877577bc	make split_special_areas more flexible, refs #2537 ... (cherry picked from commit 31ef7f149e4553eb9403634c0eec6de4d0123386)	2017-09-03 21:02:29 +02:00
Ujjwal Verma	8030f5003d	Added test	2017-09-03 21:02:29 +02:00
Ujjwal Verma	b05bf588e6	JS beautifier	2017-09-03 21:02:29 +02:00
Maximilian Hils	2b4f58eb44	split TLS parts from net.tcp into net.tls	2017-09-03 03:06:15 +02:00
Matthew Shao	a98dd1642c	[web] Update test for static viewer.	2017-08-30 21:15:04 +08:00
Maximilian Hils	e1af76e71f	fix strutils.split_special_areas	2017-08-26 17:04:56 +02:00
Maximilian Hils	8eb6558570	add new, faster css prettifier 🎉	2017-08-24 20:39:21 +02:00
Maximilian Hils	72ac89f666	add strutils.escape_special_areas	2017-08-24 18:57:32 +02:00
Maximilian Hils	721f7cc92e	Merge pull request #2540 from mhils/relatively-static ... Make it possible to run static viewer in subdirectories	2017-08-22 00:59:51 +02:00
Maximilian Hils	bf243244ce	[web] make it possible to run static viewer in subdirectories	2017-08-21 23:46:48 +02:00
Maximilian Hils	ca3e98640c	fix mitmweb master shutdown, tests++	2017-08-21 21:39:40 +02:00
Maximilian Hils	fa8bc78ca8	fix tests	2017-08-21 17:35:32 +02:00
Maximilian Hils	1e379b356f	move tests...	2017-08-21 17:34:13 +02:00
Maximilian Hils	7fcc945b4f	Merge pull request #2510 from MatthewShao/static-viewer ... [WIP][web]Static viewer converter for mitmweb	2017-08-21 15:08:25 +02:00
Matthew Shao	d008f179c3	[web] Static_viewer coverage ++.	2017-08-17 21:40:52 +08:00
Matthew Shao	af30930ae8	[web] Add tests for StaticViewer and minor fixes.	2017-08-17 11:17:15 +08:00
Maximilian Hils	a006cab5ce	Merge pull request #2489 from MatthewShao/options-into-own-addon ... Move console-related options into their own addon	2017-08-16 22:52:02 +02:00
Maximilian Hils	74a04f41ee	improve ClientHello.alpn_protocols API	2017-08-16 14:48:46 +02:00
Matthew Shao	3f497640ab	[web] Update tests.	2017-08-16 09:42:24 +08:00
Matthew Shao	56781a0b08	Add test for AddonManager.__contains__	2017-08-08 19:43:51 +08:00
Maximilian Hils	6d9b5b0c06	Merge pull request #2502 from mhils/optmanager ... Fix optmanager equality check and deepcopy	2017-08-07 16:22:33 +02:00
Maximilian Hils	cf135eab44	Merge pull request #2503 from ujjwal96/options ... Improve options UX	2017-08-07 16:22:17 +02:00
Ujjwal Verma	3d79ea4358	Improve options UX	2017-08-07 00:11:44 +05:30
Maximilian Hils	aa8969b240	Merge pull request #2492 from mhils/addon-contains ... Gracefully handle errors during script load	2017-08-05 20:04:23 +02:00
Matthew Shao	cd222ff4f9	Fix lint.	2017-08-05 09:17:38 +08:00
Maximilian Hils	e30750bf9e	fix optmanager equality check and deepcopy	2017-08-05 02:34:00 +02:00
Maximilian Hils	a9f169ca86	gracefully handle errors during script load	2017-08-05 01:40:04 +02:00
Matthew Shao	b42f5bcb9d	Update taddon and tests.	2017-08-03 18:57:54 +08:00
Thomas Kriechbaumer	0c5b56f7ce	improve proxyauth tests	2017-08-02 10:03:41 +02:00
Matthew Shao	ddffcf83ec	Update tests.	2017-08-01 23:01:58 +08:00
Maximilian Hils	e8f836425a	add LogEntry.__eq__	2017-08-01 13:42:37 +02:00
Maximilian Hils	864073f700	Merge pull request #2487 from mhils/no-option-processing ... Remove OptManager._processed	2017-08-01 02:54:33 +02:00
Matthew Shao	2ceaa5c9ef	Update tests.	2017-08-01 08:42:51 +08:00
Maximilian Hils	1b09002edc	remove OptManager._processed ... Instead of having the core addon do postprocessing on body_size_limit, we add a cache to the parsing function. First, this avoids any potential issues with options and _processed getting out of sync. As anecdotal evidence, the previous implementation did not clear _processed when body_size_limit was reset to None. Second, it achieves the same end result without introducing a new concept of a "_processed" scratch space. Third, it works even if addons aren't present, and does not require workarounds as previously present in test_http2.py. refs https://github.com/mitmproxy/mitmproxy/pull/2484#pullrequestreview-53101507	2017-07-31 01:58:31 +02:00
Maximilian Hils	018668618e	Merge pull request #2484 from mhils/options-into-own-addon ... Enable tool-specific options	2017-07-31 00:01:15 +02:00
Maximilian Hils	f844c68e2e	Merge pull request #2485 from mhils/silent-option-redeclaration ... Make option redeclaration silent if signature is the same	2017-07-30 03:47:25 +02:00
Maximilian Hils	7594dac94b	Merge pull request #2482 from mhils/pure-script-load ... Make load_script pure	2017-07-30 02:33:00 +02:00
Maximilian Hils	6a41122990	make option redeclaration silent if signature is the same	2017-07-30 02:14:44 +02:00
Maximilian Hils	ecc01b0f02	Merge pull request #2483 from mhils/ignore-imports-with-hook-names ... Gracefully ignore imports with hook names	2017-07-30 02:04:36 +02:00
Maximilian Hils	3b8e3e4aa9	make load_script pure	2017-07-30 02:03:26 +02:00
Maximilian Hils	10ef2866ca	fix tflow.js creation on Windows. ... Keep lineendings consistent so that running the tests does not produce a different file on Windows.	2017-07-30 02:01:28 +02:00
Maximilian Hils	3612e7ca76	fix tool-specific cmdline ... before this commit, all tools only exposed mitmdump cmdline arguments, as run() contained a simple `cmdline.mitmdump()` invocation. This fixes this, and also makes it possible to have cmdline arguments for tool-specific options.	2017-07-30 01:49:56 +02:00
Maximilian Hils	ed1ab3f0b1	disentangle ProxyServer and Master classes. ... The proxy server should ultimately be an addon itself and not be passed to the Master constructor. This commit already removes the server in the majority of instances, and also replaces a large number of ProxyConfig usages with the Options class..	2017-07-30 01:25:36 +02:00
Maximilian Hils	52da46640b	add option type hints	2017-07-29 21:51:36 +02:00
Maximilian Hils	c29c5dbee8	add OptManager.items	2017-07-29 21:51:26 +02:00
Maximilian Hils	d5c9f13121	gracefully ignore imports with hook names	2017-07-29 21:47:27 +02:00
Maximilian Hils	9ffd42edea	Merge pull request #2452 from mattweidner/add_intercept_toggle ... Add intercept toggle feature.	2017-07-29 19:48:42 +02:00
Maximilian Hils	e79f4049aa	Merge pull request #2480 from MatthewShao/mitmweb-options ... Fix #2448: Improve flow_detail and verbosity options	2017-07-29 16:57:37 +02:00
Maximilian Hils	7b54ef23d5	Merge pull request #2471 from ujjwal96/traceback-fix ... Fixed addon error in test suite	2017-07-29 16:54:22 +02:00
Matthew Shao	7cb14925fe	Update tests for the improved verbosity options.	2017-07-28 20:34:18 +08:00
Matt Weidner	f8c5fb3d15	Extended intercept tests to include toggle feature	2017-07-27 21:11:37 -05:00
Maximilian Hils	5fb49c3b64	add console statusbar test	2017-07-27 14:42:57 +02:00
Maximilian Hils	357928b0cd	Merge pull request #2460 from MatthewShao/mitmweb-options ... Add default value suggester in mitmweb options	2017-07-27 13:11:16 +02:00
Matthew Shao	4ab5574e18	[web] Minor Fix for backend.	2017-07-27 11:20:37 +08:00
Matthew Shao	108ef03585	[web] Fix tests.	2017-07-26 15:57:05 +08:00
Matthew Shao	4282dc1ac4	[web] Update tests.	2017-07-26 15:16:23 +08:00
Maximilian Hils	d409a6c09a	Merge pull request #2469 from Kriechi/nuke-old-openssl ... nuke old openssl	2017-07-25 21:57:54 +02:00
Maximilian Hils	3262b6e705	Squashed commit of the following: ... commit edfbd41200a854f0bb7bb99f8bb70af9dbb9b8e0 Author: Matt Weidner <matt.weidner@gmail.com> Date: Tue Jul 25 01:19:53 2017 -0500 Extended view.load test to check for unhandled IOError exception. commit a523b534bc59ea97ed1fd5a3e6f78112fee19b6f Author: requires.io <support@requires.io> Date: Mon Jul 24 21:25:04 2017 +0200 [requires.io] dependency update commit c725540c6eb92c003616b649ba43bee1f14e56ac Author: Thomas Kriechbaumer <thomas@kriechbaumer.name> Date: Mon Jul 24 21:01:25 2017 +0200 update travis commit eeb6cfb4c76e60ac1813b839f589cd489c041c6c Author: Thomas Kriechbaumer <Kriechi@users.noreply.github.com> Date: Mon Jul 24 21:03:14 2017 +0200 [requires.io] dependency update on master branch (#2435) commit 51a2672c782ee8ba8c7d5c7116073feccb4d8430 Author: Maximilian Hils <git@maximilianhils.com> Date: Mon Jul 24 19:03:01 2017 +0200 require latest mypy version (refs #2452) commit 5685a4850af6edda7100cae900487955c8b7a3ab Author: Maximilian Hils <git@maximilianhils.com> Date: Fri Jul 21 11:24:42 2017 +0200 fix addon tracebacks `.tb_next` discards the first interesting frame, this shouldn't happen. commit a2da9b6c02030293f3a412d16df819868c581a29 Author: Matt Weidner <matt.weidner@gmail.com> Date: Sat Jul 22 12:30:15 2017 -0500 Added os.path.expanduser() before open() calls with user supplied paths commit 05db6e32c7957f267e97c34aa8f5a3cd6cb7dbb2 Author: Matt Weidner <matt.weidner@gmail.com> Date: Fri Jul 21 16:25:16 2017 -0500 Added support for the ~ path shortcut when loading flows from disk. for consistency. Saving flows supports using paths with the ~ shortcut. commit b7f864b6bbd221093aeb1c384dd16038f490441a Author: Matt Weidner <matt.weidner@gmail.com> Date: Fri Jul 21 16:06:38 2017 -0500 Fixed crash when loading flows from a file that does not exist	2017-07-25 21:55:26 +02:00
Ujjwal Verma	ed0f219167	fixed addon error	2017-07-26 01:02:30 +05:30
Thomas Kriechbaumer	4855659eeb	nuke old openssl	2017-07-25 10:56:24 +02:00
Thomas Kriechbaumer	a2c2b1a9cb	update cert with too small key ... $ openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 -nodes (keep everything default, do not enter a Common Name or FQDN) $ cat key.pem cert.pem > test/mitmproxy/data/no_common_name.pem	2017-07-25 10:56:24 +02:00
Matthew Shao	5c45a90ce9	[web] Update tests.	2017-07-24 20:36:21 +08:00
Maximilian Hils	779677bcc6	fix loading scripts with same filename	2017-07-20 15:21:09 +02:00
Thomas Kriechbaumer	74708d546b	Update test_allowremote.py	2017-07-15 10:01:14 +02:00
Ujjwal Verma	fdc64be04a	Allow remote addon	2017-07-15 10:01:14 +02:00
Thomas Kriechbaumer	3814f171dd	Merge pull request #2427 from ujjwal96/protobuf ... Kaitai parser for protobuf	2017-07-10 22:58:38 +02:00
Ujjwal Verma	3f269d2b68	Kaitai parser for protobuf	2017-07-10 01:24:43 +05:30
Maximilian Hils	062a58f848	Merge pull request #2423 from MatthewShao/mitmweb-options ... [web] [WIP] Mitmweb options editor content	2017-07-05 16:25:38 +02:00
Matthew Shao	37fea267c1	Fix the test for websocket connection.	2017-07-05 18:57:19 +08:00
Matthew Shao	aa01a62df7	[web] Add keys argument for dump_dict in optmanager.	2017-07-05 08:40:21 +08:00
Ujjwal Verma	7e04ac0578	add websocket streaming option	2017-07-04 10:53:23 +02:00
Ujjwal Verma	9e1902be62	fix HTTP retry if sending a request fails once	2017-07-04 10:52:50 +02:00
Ujjwal Verma	389d37ebff	websocket streaming	2017-07-04 10:52:50 +02:00
Ujjwal Verma	d4f35d7a4a	request streaming for HTTP/2	2017-07-04 10:52:50 +02:00
Ujjwal Verma	47c9604aed	request streaming for HTTP/1	2017-07-04 10:52:50 +02:00
Ujjwal Verma	7dfa557441	Fixes #2315	2017-06-28 19:18:57 +05:30
Maximilian Hils	d58abc9200	Merge pull request #2402 from ujjwal96/request-replay ... Fixes #2197	2017-06-27 11:18:12 +02:00
Ujjwal Verma	08735ab0ae	request replay test	2017-06-26 00:53:14 +05:30
Maximilian Hils	13dac9f212	Merge pull request #2411 from ujjwal96/ico-parser ... ICO content view	2017-06-25 02:02:01 +02:00
Ujjwal Verma	8ca29679df	Added test	2017-06-25 01:05:20 +05:30
Maximilian Hils	bde64746a9	Merge pull request #2395 from MatthewShao/mitmweb-options ... [WIP] Add RESTful API for mitmweb option	2017-06-24 19:54:04 +02:00
Matthew Shao	1863326220	Minor Update for /options API of mitmweb.	2017-06-24 10:18:00 +08:00
Matthew Shao	c7ce7f84e6	Add test for POST /options API of mitmweb.	2017-06-23 10:58:59 +08:00
Matthew Shao	9687d67601	Add test for typespec_to_str.	2017-06-14 07:44:00 +08:00
Aldo Cortesi	788f0f5784	console: console.key.bind console.key.unbind commands	2017-06-14 08:34:34 +12:00
Matthew Shao	2c0f6c2023	Minor Update and add test.	2017-06-13 23:03:07 +08:00
Aldo Cortesi	4a7cafee9e	console: teach keymap to understand "space" ... Urwid uses " ", which is not a great user experience.	2017-06-13 15:36:00 +12:00
Aldo Cortesi	ba49b55684	console: key binding viewer ... Read-only for now.	2017-06-13 11:48:08 +12:00
Aldo Cortesi	88832f92a3	view: show a message if we remove more than one flow from view	2017-06-13 11:02:32 +12:00
Aldo Cortesi	56eb0441da	commands: teach parser correct annotations for variable args ... We should annotate with the base type, not the resulting sequence.	2017-06-13 10:26:03 +12:00
Aldo Cortesi	d95f28e6bf	config: don't crash with a config file containing only comments	2017-06-13 09:43:12 +12:00
Ujjwal Verma	6ca45856b4	Test for streaming	2017-06-12 23:46:43 +05:30
Matthew Shao	03bb0a09b9	Add tests for dump_dicts in optmanager.py.	2017-06-12 23:23:09 +08:00
Ujjwal Verma	4587b54aed	tests for Proxy config	2017-06-12 01:32:58 +05:30
Aldo Cortesi	7caa7e7538	console: auto-generate context key binding help	2017-06-11 17:09:52 +12:00
Maximilian Hils	9b59937e12	always pretend to have a tty in tests	2017-06-05 00:19:52 +02:00
Thomas Kriechbaumer	020e5a5c95	Merge pull request #2367 from mhils/issue-2329 ... Fix #2329	2017-06-02 14:18:56 +02:00
Ujjwal Verma	619566fc9f	Fixes #2230 (#2361)	2017-06-02 13:31:12 +02:00
Maximilian Hils	5e17b5f62e	minor improvements	2017-06-02 00:01:37 +02:00
Maximilian Hils	2ba0791810	fix #2329	2017-06-01 23:39:49 +02:00
Ujjwal Verma	33f735ef50	Increase test coverage	2017-05-31 04:05:10 +05:30
Thomas Kriechbaumer	ef1c36194e	coverage++	2017-05-26 22:58:01 +02:00
Thomas Kriechbaumer	f5eaddb12c	Merge pull request #2346 from ujjwal96/test-coverage ... Tests for wbxml	2017-05-26 18:38:24 +02:00
Thomas Kriechbaumer	47b6d1823e	remove old test file	2017-05-26 17:04:04 +02:00
Thomas Kriechbaumer	ee6ea31147	Merge pull request #2353 from ujjwal96/tls-parser ... Using kaitai struct to parse tls client hello	2017-05-26 13:58:29 +02:00
Ujjwal Verma	6637630e3e	Using kaitai struct to parse tls client hello	2017-05-26 00:41:18 +05:30
Thomas Kriechbaumer	cfed4432a0	pathod: fix leaking fds	2017-05-24 19:32:20 +02:00
Ujjwal Verma	bd8a869118	Tests for wbxml	2017-05-24 21:37:49 +05:30
Thomas Kriechbaumer	673ed5b45e	pathod: properly verify certificate in tests	2017-05-24 17:40:44 +02:00
Thomas Kriechbaumer	6214c6e185	fix openssl cipher_list bytes/str deprecation	2017-05-24 16:17:04 +02:00
Thomas Kriechbaumer	e77f07a36b	cleanup	2017-05-24 14:23:36 +02:00
Thomas Kriechbaumer	ae7e9efb5c	fix various fd/socket leaks	2017-05-24 14:09:41 +02:00
Thomas Kriechbaumer	2faaa0b2a2	connections tests: fix leaking sockets	2017-05-24 13:21:58 +02:00
Thomas Kriechbaumer	928085c597	proxy tests: fix leaking sockets	2017-05-24 12:52:13 +02:00
Thomas Kriechbaumer	c9529ffe45	http1 tests: fix leaking sockets	2017-05-24 11:43:57 +02:00
Thomas Kriechbaumer	618044c637	http2 tests: fix leaking sockets	2017-05-24 11:43:50 +02:00
Thomas Kriechbaumer	c4f028d701	websocket tests: fix leaking sockets	2017-05-24 11:35:53 +02:00
Thomas Kriechbaumer	0bd3d0ff4c	upgrade pytest and remove our pytest.raises wrapper	2017-05-24 11:35:53 +02:00
Thomas Kriechbaumer	4961d782ed	fix typo	2017-05-24 11:35:53 +02:00
Thomas Kriechbaumer	b4f65049f2	auto-close file after reading	2017-05-24 11:35:53 +02:00
Maximilian Hils	5626c384ab	Merge pull request #2342 from MatthewShao/jest-dev ... [web] Add _flow.js for component tests.	2017-05-22 10:00:35 +02:00
Matthew Shao	2935ff5f3a	[web] Set some value as constant, so _tflow.js would not change.	2017-05-22 08:53:59 +08:00
Matthew Shao	2c38fddea5	[web] TFlow minor improved.	2017-05-21 20:59:19 +08:00
Matthew Shao	369e1f1eee	[web] Fix minior lint problem.	2017-05-19 09:56:52 +08:00
Matthew Shao	50c0703424	[web] Add _tflow.js generator in test_app.py	2017-05-19 09:45:30 +08:00
Ujjwal Verma	5833b218b2	Increase net.tcp.py coverage (#2336)	2017-05-17 23:27:57 +08:00
Ujjwal Verma	37053f0efc	Increased mitmproxy.controller coverage	2017-05-17 11:06:40 +05:30
Ujjwal Verma	204d06f93f	Increased xml_html contentview coverage	2017-05-17 11:05:49 +05:30
Ujjwal Verma	8eea05fcaf	Increase contentviews api coverage	2017-05-17 11:04:43 +05:30
Ujjwal Verma	d47de94303	Increase io.compat coverage	2017-05-12 21:09:50 +05:30
Ujjwal Verma	766c5caea8	Increased net.http.cookies.py and net.http.message.py coverage	2017-05-12 21:09:50 +05:30
charlesdhdt	9f8e83259e	Fixed LDAP Auth (#2333)	2017-05-12 15:37:00 +02:00
Ujjwal Verma	3e85dfd242	Handle head request on onboarding app: Fix #2324 (#2325)	2017-05-09 20:08:42 +02:00
Maximilian Hils	d734f6bbd6	Merge pull request #2286 from charlesdhdt/master ... Added LDAP Auth	2017-05-04 16:24:57 +02:00
Charles d'Hondt	154e8ac0fc	fixed lint	2017-05-04 13:39:48 +02:00
Charles d'Hondt	f67d9adc31	Added ldap mock test	2017-05-04 13:25:15 +02:00
Maximilian Hils	315daa042a	fix #2310	2017-05-03 17:38:17 +02:00
Aldo Cortesi	2659b52209	console: add a two-pane layout ... - Replace options.console_eventlog with options.console_layout - This can be "single", "vertical" and "horizontal" - At the base of the primary pane is the flowlist. At the base of the secondary pane is the event log. - Any of the other primary windows can be opened in each of the panes. For now, I've bound "-" to the flow layout switch, "shift tab" to the layout pane switch, and "P" to open the currently focused flow in whichever pane you're in. These are just temporary - we'll reassess the default bindings carefully once the keybindings work is complete.	2017-05-03 14:55:02 +12:00
Aldo Cortesi	dcae79e017	console: various bugs ... - Action bar now correctly gets the palette background - Viewing connection details for a killed flow no longer crashes - Editing options with selections no longer crashes	2017-05-02 12:56:27 +12:00
Aldo Cortesi	4e39d387d3	commands: options control ... Use the new commands to bind the Options view in console.	2017-05-02 12:18:24 +12:00
Aldo Cortesi	9e58c36639	console: globally respected nav commands ... Use this to bind nav keys with commands throughout.	2017-05-02 12:18:24 +12:00
Aldo Cortesi	2f52d8b9ad	commands: view.setval, view.getval, view.setval.toggle ... Use these to bind the last of the key for flowview. Flow views are now 100% keybound.	2017-05-01 19:52:24 +12:00
Aldo Cortesi	7d56ec9d49	commands: flow.encode, flow.decode, flow.encode.toggle ... Use this to bind "z" in flowview.	2017-05-01 18:31:22 +12:00
Aldo Cortesi	1ea4a5a48e	keymap: keys can now bind to multiple contexts ... Use this to map the majority of the keys in flowview.	2017-05-01 16:52:58 +12:00
Aldo Cortesi	670d1e408b	command: flow.set ... Use this to replace the flow edit components of flowview entirely.	2017-05-01 14:56:57 +12:00
Aldo Cortesi	685487d33c	commands: view.order.options, view.marked.toggle, view.create ... And use these commands to remove the last hard-coded keybindings from flow list. This means the flow list is now 100% command-driven, which is very exciting.	2017-04-30 22:45:31 +12:00
Aldo Cortesi	a570caccbd	commands: view.load ... Plus replace the flow list keybinding.	2017-04-30 22:02:29 +12:00
Aldo Cortesi	3cd93567f5	commands: support *args for commands ... Use this to simplify meta-commands in console, and to create a console_choose command that prompts the user for a choice, and then executes a command with variable substitution.	2017-04-30 21:24:00 +12:00
Aldo Cortesi	bcbe87bb09	Move export to addon, kill Python and Locust export ... Also add a "raw" export format. The Python and Locust exports are hard to maintain, their tests are extremely brittle, they didn't have full test coverage, and are by my guess very rarely used. I feel the Locust export should certainly be an externally maintained addon. The Python/requests export can come back if someone cares enough, and it can be structured in a way we can maintain.	2017-04-30 17:53:30 +12:00
Aldo Cortesi	befbe88d96	commands: cut.clip copies cuts to system clipboard	2017-04-30 14:42:37 +12:00
Aldo Cortesi	ed62bbad1d	Add help text to --commands output	2017-04-30 14:20:21 +12:00
Aldo Cortesi	075d452a6d	cut: more flexible cut specification based on attribute paths ... Also support certificate types, which are converted to ASCII-encoded PEM format.	2017-04-30 14:05:45 +12:00
Aldo Cortesi	7ffb2c7981	cut: use csv module to encode multi-values for saving ... Also add q.text, q.raw_content, s.text, s.raw_content selectors	2017-04-30 11:48:32 +12:00
Aldo Cortesi	4b568f99d6	Introduce cuts: a flow dissector ... This PR introduces the cuts addon, a flow dissector that allows you to select and operate on specific components of flows. It also adds the first consumer for cuts - the cuts.save command. Save the content of the focus to /tmp/foo: cuts.save s.content|@focus /tmp/foo Save the URL and response content-type headers for all flows currently shown to file, comma-separated, one flow per line: cuts.save s.url,q.header[content-type]|@focus /tmp/foo We also use this to replace the body save shortcut in the console flowlist.	2017-04-29 23:32:31 +12:00
Aldo Cortesi	d439b34511	command: script.run ... Plus the flowlist binding adjustments.	2017-04-29 13:24:19 +12:00
Aldo Cortesi	1d5eedcc9c	command: flow.revert ... Plus matching binding in flowlist.	2017-04-29 11:48:25 +12:00
Aldo Cortesi	f908ea220f	commands: "replay.client.file" and "replay.server.file"	2017-04-29 11:34:50 +12:00
Aldo Cortesi	a92017a6c1	Rework client and server replay ... - Add client.replay [flows], client.replay.stop - Add server.replay [flows], server.replay.stop - The corresponding options for file loading are only read on startup, further changes are ignored. In interactive contexts, replay is started with the commands, not through option changes. - Deprecate flow.replay, use replay.client instead	2017-04-29 11:02:36 +12:00
Aldo Cortesi	7317ea134e	command: flow.kill, flow.replay ... Plus the matching bindings in the flow list.	2017-04-29 09:58:32 +12:00
Aldo Cortesi	f21a970f29	commands: marking ... Add "view.mark [flows] bool" and "view.mark.toggle [flows]". Use this to rebind marking keys in flowlist.	2017-04-29 09:14:44 +12:00
Aldo Cortesi	217addbf31	commands: view.go ... bind G to "view.go -1" bind g to "view.go 0"	2017-04-29 08:40:38 +12:00
Aldo Cortesi	0b090f7ae1	Commands, core update event ... This patch: - Introduces a core update() event that should be invoked whenever flows are changed outside of the normal lifecycle. - Extend view.resolve to know about @all, which matches all flows in the view. - Add a core flow.resume comand, which resumes flows and broadcasts an update event. - Define flow list bindings for: A -> flow.resume @all a -> flow.resume @focus d -> view.remove @focus z -> view.remove @all	2017-04-29 08:01:00 +12:00
Charles d'Hondt	65202f5f1c	Added ldapsss vef	2017-04-28 17:00:21 +02:00
Charles d'Hondt	6d3837fd54	fix	2017-04-28 16:44:50 +02:00
Charles d'Hondt	29c1f303d6	Fixed typo	2017-04-28 16:23:32 +02:00
Charles d'Hondt	5fb18ad275	Added LDAP Auth	2017-04-28 16:19:27 +02:00
Aldo Cortesi	6af1a49464	commands: add a command.command decorator ... Use this for our built-ins and the console commands.	2017-04-28 15:07:52 +12:00
Aldo Cortesi	7ff84673fd	Support unary flow command arguments ... Use this to add a console.view.flow command and bind "enter" in flowlist.	2017-04-28 14:05:35 +12:00
Aldo Cortesi	cfae95f5c3	console: start migrating hotkeys to keymap ... This shifts a set of flow list keys to keymaps. Much more to come.	2017-04-28 12:10:48 +12:00
Aldo Cortesi	ce01cb9c09	command: partials ... Support partial commands in console.command, use it to keybind "i" for intercept, which prompts the user with ":set intercept=".	2017-04-28 11:24:28 +12:00
Aldo Cortesi	8a07059cf4	commands: add the core command addon, and the command "set" ... The set command sets an option using the same syntax as commandline --set.	2017-04-28 10:41:44 +12:00
Aldo Cortesi	be1b76b975	console: add a keymap ... This sketches out a keymap system for consone, and adds the first few top-level commands and mappings.	2017-04-28 10:21:15 +12:00
Aldo Cortesi	18edc11145	console: interactive command browser ... Simple browser that lets users view and select commands interactively. Key binding for this is still to be sorted out.	2017-04-28 07:43:58 +12:00
Aldo Cortesi	fde1159ae3	Test coverage ++	2017-04-27 18:43:44 +12:00
Aldo Cortesi	97000aa85c	command: save.file flowspec path -> None ... Our first user-facing command. The following commands do the obvious things: save.file @marked /tmp/flows save.file @focus /tmp/flows save.file @hidden /tmp/flows save.file "~m get" /tmp/flows	2017-04-27 17:05:00 +12:00
Aldo Cortesi	b7afcb5dc2	addons.streamfile -> addons.save ... Options: streamfile -> save_stream_file streamfile_filter -> save_stream_filter	2017-04-27 15:58:54 +12:00
Aldo Cortesi	8c4810f606	console: flow resolution command ... This is our first built-in command, which will be used by very many other commands. Also add a --commands option to dump all commands, analogous to --options.	2017-04-27 15:27:51 +12:00
Aldo Cortesi	169baabcab	Basic outline of the command subsystem ... - Add a command manager - Sketch out the type system with a few simple supported types	2017-04-27 11:09:40 +12:00
Aldo Cortesi	2a46f3851a	Merge pull request #2265 from cortesi/addons ... Addons and addon testing	2017-04-27 07:40:14 +12:00
Maximilian Hils	0f9081b18d	Merge pull request #2269 from mhils/issue-2250 ... fix #2250, add type info to cookie module	2017-04-26 14:42:48 +02:00
Maximilian Hils	87610cc8b2	fix #2250, add type info to cookie module	2017-04-26 14:17:14 +02:00
Maximilian Hils	d5ea08db62	Merge pull request #2258 from mhils/readfile ... Integrate readstdin into readfile	2017-04-26 13:40:51 +02:00
Maximilian Hils	0a8e54edea	Merge pull request #2268 from mhils/issue-2257 ... fix #2257	2017-04-26 13:39:19 +02:00
Maximilian Hils	1aa6d9d324	fix #2257	2017-04-26 12:26:49 +02:00
Maximilian Hils	ca2827886a	separate reading from stdin into its own addon	2017-04-26 12:11:37 +02:00
Maximilian Hils	df7701bb6d	fix #2228	2017-04-26 11:32:24 +02:00
Maximilian Hils	b3a1143338	integrate readstdin into readfile addon	2017-04-26 10:56:32 +02:00
Maximilian Hils	2b500f234f	typecheck: add support for typing.Any	2017-04-26 10:54:36 +02:00
Aldo Cortesi	5327756377	Addons and addon testing ... - Fix some loading sequence bugs affecting command-line script invocation - Allow addons to over-ride existing options (with a warning). We need this for reloading. - Convert har_dump to new-style arguments, fix and re-instate its test suite. - Covnert miscelaneous other exmples to new-style args.	2017-04-26 19:56:33 +12:00
Aldo Cortesi	e32efcae49	Merge pull request #2262 from Kriechi/reduced-coverage++ ... improve tests (extracted from #2011)	2017-04-26 19:52:33 +12:00
Aldo Cortesi	b72f139093	configure(options, updated) -> configure(updated) ... Options are now available globally on ctx, so the first argument of configure is redundant.	2017-04-26 11:01:27 +12:00
Aldo Cortesi	f90b4c2ff0	Move options into ctx ... Many addons currently save options on configure(), either as individual options or sometimes by saving the entire options object. The current options should simply be available on the ctx object, simplifying state management for addons considerably.	2017-04-26 10:25:56 +12:00
Aldo Cortesi	7aa2081894	Remove watchdog, solidify script testing ... - Remove the watchdog dependency. We now just stat the script file every 2 seconds to check for an updated mtime. - Further solidify our script testing, and in particular make the example tests nicer. These should exemplify how we want users to test their own addon scripts. More work on addon testing to follow.	2017-04-26 09:01:40 +12:00
Thomas Kriechbaumer	a35a377cbb	improve tests	2017-04-25 20:49:49 +02:00
Aldo Cortesi	e6eeab6094	Revamp how addons work ... - Addons now nest, which means that addons can manage addons. This has a number of salutary effects - the scripts addon no longer has to poke into the global addons list, we no longer have to replace/remove/boot-outof parent addons when we load scripts, and this paves the way for making our top-level tools into addons themselves. - All addon calls are now wrapped in a safe execution environment where exceptions are caught, and output to stdout/stderr are intercepted and turned into logs. - We no longer support script arguments in sys.argv - creating an option properly is the only way to pass arguments. This means that all scripts are always directly controllable from interctive tooling, and that arguments are type-checked. For now, I've disabled testing of the har dump example - it needs to be moved to the new argument handling, and become a class addon. I'll address that in a separate patch.	2017-04-25 22:13:44 +12:00
Ujjwal Verma	742127ef7b	Fixes #2109	2017-04-09 18:55:20 +05:30
Robert C Jensen	7365f18542	fixes ipv6 authority form parsing in CONNECT	2017-04-07 15:46:21 -04:00
Nikhil Soni	442999c75c	Add tests for set_focus	2017-03-29 18:34:17 +05:30
Aldo Cortesi	65f0885bd6	addon loader: add boot_into, which replaces returning from start() ... While we're here, expand test coverage for addonmanager to 100%, and promote to individual coverage.	2017-03-25 10:48:12 +13:00
Aldo Cortesi	541c1e8b9f	addons: start -> load throughout	2017-03-25 10:48:12 +13:00
Thomas Kriechbaumer	ef9f0e22ea	bump h2	2017-03-24 21:27:14 +01:00
Aldo Cortesi	335861f490	Merge pull request #2207 from nikofil/scripts-redirect-stdout ... scripts: redirect stdout to ctx.log.warn	2017-03-24 14:58:33 +13:00
Nikos Filippakis	abf291b0f9	scripts: redirect stdout to ctx.log.warn ... Redirect messages written to stdout in scripts to ctx.log.warn. (closes #1530) Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>	2017-03-24 02:35:02 +01:00
Aldo Cortesi	0d3e2c6adf	optmanager: make serialization and loading more robust ... Also handle errors in console options manager.	2017-03-24 09:37:17 +13:00
Thomas Kriechbaumer	907825714b	move examples tests (#2199)	2017-03-22 12:02:18 +01:00
Aldo Cortesi	4ca78604af	Factor out an io module ... Include tnetstring - we've made enough changes that this no longer belongs in contrib.	2017-03-20 12:50:09 +13:00
Aldo Cortesi	04f1a4443d	options: reraise when there's an error with a partial update ... Fixes #2174	2017-03-19 14:36:23 +13:00
Aldo Cortesi	43e7b9d68c	options: choices for content views and tighten console order spec ... Also clean up some leftovers from filter option name change.	2017-03-19 13:39:28 +13:00
Aldo Cortesi	22d7c31ea8	dumper, mitmdump: kill filtstr ... Dumper now also uses view_filter. Passing arguments to mitmdump is now precisely equivalent to setting both filestream_filter and view_filter.	2017-03-19 13:21:46 +13:00
Aldo Cortesi	475a4e3eb0	streamfile: add streamfile_filter and use it instead of filtstr	2017-03-19 13:08:26 +13:00
Aldo Cortesi	21794c7bbe	optmanager: test coverage	2017-03-19 11:29:41 +13:00
Aldo Cortesi	49b0a67eb9	console options: add an overlay grid editor for sequence options	2017-03-19 10:32:22 +13:00
Aldo Cortesi	4e24c95a61	optmanager: cope with bound methods in .subscribe ... Fixes #2122	2017-03-19 10:32:22 +13:00
Aldo Cortesi	8130b9880a	options cleanups ... - Move default client ciphers - no need to have a 10-line string default. - Add some style guidance on options help - Be consistent about reflowing options help	2017-03-19 10:32:22 +13:00
Aldo Cortesi	eac210829e	Rip out master handler mechanism ... All events are now handled by addons, and we no longer support any events on master.	2017-03-17 07:56:32 +13:00
Maximilian Hils	6d66184eba	Merge pull request #2168 from cortesi/handlers ... Rip out old handlers mechanism - all events are now handled in addons	2017-03-16 14:57:26 +01:00
Felix Yan	b352557092	Fix test_format_xml with dot in path ... When the path contains dot ".", replacing all dots will generate a non-exist result and raises a FileNotFoundError. Replacing only the last dot fixes this.	2017-03-16 16:48:21 +08:00
Aldo Cortesi	c5e0dc64b9	Rip out master handler mechanism ... All events are now handled by addons, and we no longer support any events on master.	2017-03-16 18:33:24 +13:00
Aldo Cortesi	3de9829003	Remove last handlers in test suite ... While we're here, make checking that there are NO logs on the proxy more efficient by setting a short timeout. This reduces total test suite running time by 15% on my system.	2017-03-16 18:05:57 +13:00
Aldo Cortesi	1410cbb4b6	Remove test handlers by using taddons.RecordingMaster ... This also means expanding and tweaking the recording master API, which we reflect through the current test suite	2017-03-16 18:05:57 +13:00
Aldo Cortesi	b6abe96202	Move dump handlers to addon	2017-03-16 18:05:57 +13:00
Aldo Cortesi	1e6c51c698	Merge pull request #2152 from cortesi/readfile ... Extract flow reading into addons	2017-03-16 15:51:21 +13:00
Aldo Cortesi	228a22b3c0	Add a light-weight custom event system, use it for keepserving ... This patch implements the lightweight event system I propose in #2144, adds a custom event "processing_complete" that is triggered after file read, client replay and server replay, and introduces a KeepServing addon to handle this for mitmdump.	2017-03-16 11:07:00 +13:00
Aldo Cortesi	169068c7ec	Clean up addonmanager interface ... Clarify the plethora of invocation methods we've sprouted, correct some usages in the codebase.	2017-03-16 08:50:29 +13:00
Maximilian Hils	65c4a3cf1d	add Request.make	2017-03-15 14:06:00 +01:00
Aldo Cortesi	ef582333ff	Extract flow reading into addons ... This patch moves the final pieces of master functionality into addons. - Add a ReadFile addon to read from file - Add a separate ReadStdin addon to read from stdin, only used by mitmdump - Remove all methods that know about io and serialization from master.Master	2017-03-15 13:44:48 +13:00
Maximilian Hils	30797755fb	stateobject: automatically change id when copying	2017-03-14 17:08:40 +01:00
Maximilian Hils	375680a3be	add connection ids	2017-03-14 17:08:40 +01:00
Maximilian Hils	2d016775fe	Merge pull request #2149 from mhils/multidictview-copy ... Add MultiDictView.copy()	2017-03-14 14:38:38 +01:00
Maximilian Hils	0de8f46c6e	Merge pull request #2145 from mhils/ne ... py3: __ne__ delegates to __eq__ by default	2017-03-14 14:38:00 +01:00
Maximilian Hils	961747c4bc	Merge pull request #2120 from ujjwal96/replace-from-file ... Replace from file through replacement editor #1458	2017-03-14 02:23:31 +01:00
Maximilian Hils	de1de3f626	add MultiDictView.copy	2017-03-14 02:18:02 +01:00
Maximilian Hils	875ce8c9c1	py3: __ne__ delegates to __eq__ by default	2017-03-14 00:40:15 +01:00
Aldo Cortesi	b745428b5c	Enable custom options in config files ... We also now ignore unknown options in config files by default, and print a warning if verbosity is incremented.	2017-03-14 09:40:33 +13:00
Aldo Cortesi	2832e790fd	Move serialization methods out of Options ... Attributes on options share a namespace with options themselves. It's getting too crowded on our Options object, so let's shift some obvious stuff into the module.	2017-03-14 08:34:25 +13:00
Aldo Cortesi	c24f7d8e12	Optmanager: handle unknown options in value sets	2017-03-14 08:32:19 +13:00
Aldo Cortesi	75f83ba380	Show custom addon options in --options output	2017-03-14 08:32:19 +13:00
Aldo Cortesi	0c6663d0d5	Enable custom options for addons ... - Add an options parameter to the start() event. This is to be used by addons on startup to add custom options. - Add a running() event that is called once the proxy is up and running. - With the new paradigm we can't log during master __init__, so add a tiny termstatus addon to print proxy status to terminal once we're running.	2017-03-14 08:32:19 +13:00
Maximilian Hils	05e11547f5	Merge remote-tracking branch 'origin/master' into pr-2120 ... Conflicts: test/mitmproxy/addons/test_replace.py	2017-03-12 23:33:49 +01:00
Maximilian Hils	0f4b523868	replacements: error right away when file does not exist	2017-03-12 23:28:49 +01:00
Thomas Kriechbaumer	1b045d24bc	nuke tutils.tmpdir, use pytest tmpdir	2017-03-12 22:55:22 +01:00
Maximilian Hils	4684617d2c	minor fixes	2017-03-12 20:24:50 +01:00
Maximilian Hils	39154e628e	Merge pull request #2118 from lymanZerga11/patch-3 ... Update proxyauth.py to add proxyauth metadata	2017-03-11 03:04:38 +01:00
Thomas Kriechbaumer	e9746c5182	Merge pull request #2114 from mitmproxy/fix-websocket-serialization ... make websocket flows serializable	2017-03-10 21:15:46 +01:00
Thomas Kriechbaumer	45bf1ff64d	disable h2c prior knowledge connections	2017-03-10 11:37:25 +01:00
Thomas Kriechbaumer	b1dd86d7ae	make websocket flows serializable ... fixes #2113	2017-03-09 19:08:59 +01:00
Ujjwal Verma	25703f8c53	Fixed Replacement test	2017-03-09 23:33:11 +05:30
lymanZerga11	8e67c6f512	add tests	2017-03-09 09:01:37 +08:00
lymanZerga11	6d53d08b6c	Add tests	2017-03-09 09:01:04 +08:00
Maximilian Hils	63179d9751	core -> core_option_validation ... longer, but much clearer for devs who are unfamiliar with the codebase.	2017-03-08 15:17:07 +01:00
Maximilian Hils	f276c7a80d	change add_option parameter order ... name, type, value matches natural language ($x is a bool with a default value of $y) and also matches the python type annotation order of name: type = value	2017-03-08 00:52:37 +01:00
Maximilian Hils	8707928b16	unify server spec parsing	2017-03-08 00:18:34 +01:00
Aldo Cortesi	98ec3b77fe	Carefully re-add a small number of short flags ... The mechanism for booleans attaches the short flag to whatever the opposite of the default is.	2017-03-07 21:01:21 +13:00
Aldo Cortesi	aed780bf48	Change the way proxy authetication is specified ... We now have one option "proxyauth". If this is "any", we accept any credentials, if it starts with an @ it's treated as a path to an htpasswd file, if it is of the form username:password it's a single-user credential.	2017-03-07 20:18:30 +13:00
Aldo Cortesi	320d8848ab	Options tweaks ... - Regularise presentation and wording - Help is mandatory for all options - Auto-generate wording to say that sequence options can be passed multiple times on the command-line	2017-03-07 15:23:46 +13:00
Aldo Cortesi	10db254791	Remove less commonly used command-line options ... We now have --set, so only options that really deserve it get a dedicated flag. I'm inclined to strip this back even more. Feel free to argue that YOUR favourite option deserves special treatment here.	2017-03-07 14:46:28 +13:00
Aldo Cortesi	ac3b0d69cc	Add the --set option to set options directly ... The --set option is a universal flag for setting options. Some examples: Turn on a boolean: mitmdump --set onboarding=false Add a value to a sequence: mitumdupm --set setheaders=/foo/bar/voing Zero a sequence: mitumdupm --set setheaders	2017-03-07 14:27:50 +13:00
Aldo Cortesi	79f5883c2f	Option spacing and coverage	2017-03-07 13:47:39 +13:00
Aldo Cortesi	99a6b0dbc1	Add --options that dumps annotated option defaults	2017-03-07 13:16:28 +13:00
Aldo Cortesi	b51df9a0b1	Cleanups and test coverage	2017-03-07 10:28:15 +13:00
Aldo Cortesi	2312cf6fb0	Automate slurping up command-line options ... Now that options are completely regular, we can automate reading them out of arguments, rather than listing them out by hand like savages.	2017-03-07 08:49:19 +13:00
Aldo Cortesi	edfd62e42a	Replacements and setheaders are always strings ... Instead of having two representations we have one canonical specification. Fixing the editor in console is left ot a further patch.	2017-03-06 20:58:51 +13:00
Aldo Cortesi	82163a1e68	Unify mode specification ... We now have: --mode regular (the default) --mode transparent --mode socks5 --mode reverse:SPEC --mode upstream:SPEC Where SPEC is a host specification.	2017-03-06 20:30:49 +13:00
Aldo Cortesi	9b1f40da37	Options unification: streamfile ... We now have one option to control this. If the path is prefixed with a "+" we append, otherwise we overwrite.	2017-03-06 13:48:37 +13:00
Aldo Cortesi	71a830c836	Options unification: string choices	2017-03-06 13:20:17 +13:00
Aldo Cortesi	18a6b66ba4	Options unification: simple strings ... Move all simple string options to the new scheme. Also regularise some names.	2017-03-06 11:39:19 +13:00
Aldo Cortesi	201c65960e	Options unification: sizes ... Start dealing with corner cases: - Sizes are always stored in options as strings - Add a new core addon that's responsible for verifying settings that don't belong to an addon - Add a _processed scratch space on the Options object for processed core values to be stored in. This is pretty dirty, but less dirty than re-parsing values every time. We'll come up with something better down the track.	2017-03-06 09:07:16 +13:00
Aldo Cortesi	f15a628561	Start unifying options and the command-line: booleans ... This commit: - Adds a help field to options - Adds a function to generate parser definitions from options - Uses this to migrate all boolean flags over to the new system - Makes all booleans consistently follow the --foo/--not-foo convention There are a number of things left to be done here: - Argparse doesn't give us a nice way to format --foo --not-foo help. Click does, and moving to click is a goal down the track. - For now, we remove all short aliases. I want to re-evaluate these systematically once we have the new structure in place.	2017-03-05 20:16:33 +13:00
Aldo Cortesi	67381ae550	Revamp options ... - Options are now explicitly initialized with an add_option method - We have one canonical Options class - ditch dump.Options	2017-03-05 15:10:03 +13:00
Nikhil Soni	0081d9b828	Merge branch 'master' into on-issues	2017-03-03 12:58:44 +05:30
Nikhil Soni	3da8532bed	Adds test for --keep-host-header	2017-03-03 12:34:36 +05:30
Nikhil Soni	317d183ba4	Changes dns_spoofing example to use --keep-host-header	2017-03-03 12:34:36 +05:30
Thomas Kriechbaumer	a505221e1a	http2: fix h2 header normalization test (#2080)	2017-03-01 12:46:42 +01:00
David Dworken	99b584ad7d	added XSS scanner example (#1907)	2017-02-27 18:22:39 +01:00
Thomas Kriechbaumer	e0bc1109c0	do not return IP addresses in SSLCert.altnames	2017-02-26 20:54:06 +01:00
Thomas Kriechbaumer	6d228dfb9f	certs: coverage++	2017-02-26 20:54:04 +01:00
Thomas Kriechbaumer	9b6986ea87	connections: coverage++ (#2064)	2017-02-26 20:50:52 +01:00
Thomas Kriechbaumer	2aecffd39a	optmanager: coverage++ (#2062)	2017-02-25 12:12:43 +01:00
Thomas Kriechbaumer	ccd8e1e617	http: coverage++ (#2060)	2017-02-24 22:39:16 +01:00
Thomas Kriechbaumer	3c66eb5b4b	move tests around (#2059)	2017-02-24 22:00:41 +01:00
Thomas Kriechbaumer	e89c785719	move tests around (#2058)	2017-02-24 21:39:13 +01:00
Thomas Kriechbaumer	d17309eda8	flowfilter: coverage++	2017-02-24 18:47:56 +01:00
Thomas Kriechbaumer	3e9125a3c1	nuke tcp.Address and add proper IPv6 support	2017-02-24 13:39:02 +01:00
Maximilian Hils	ba76dbc672	Merge pull request #2048 from ujjwal96/ipv6-addresses ... Absolute IPv6 addresses supported	2017-02-22 13:17:53 +01:00
Matthew Shao	5fc4fc28b6	Add test for @concurrent decorator in class.	2017-02-21 16:56:48 +08:00
Ujjwal Verma	11134b669e	Absolute IPv6 addresses supported	2017-02-20 21:02:43 +05:30
Thomas Kriechbaumer	0de277c18b	improve test	2017-02-20 11:48:57 +01:00
Thomas Kriechbaumer	050245e842	Merge pull request #2017 from lymanZerga11/patch-1 ... Catch ValueErrors from url.parse()	2017-02-20 11:48:40 +01:00
Thomas Kriechbaumer	ac6915c002	improve tests	2017-02-20 11:11:10 +01:00
Thomas Kriechbaumer	51e08a5b85	Merge pull request #2041 from krsoninikhil/debug ... Adds PyInstaller build indicator to --version argument	2017-02-20 10:29:15 +01:00
Nikhil Soni	ed084f5413	Adds test for pyinstaller indicator	2017-02-19 19:15:36 +05:30
Thomas Kriechbaumer	36352c9539	protobuf: coverage++	2017-02-19 14:29:09 +01:00
Thomas Kriechbaumer	83c2de8849	http2: disable priority forwarding	2017-02-18 14:30:08 +01:00
Maximilian Hils	4158a1ae55	Merge pull request #2040 from mhils/request-host-header ... Add "Request.host_header"	2017-02-18 12:08:54 +01:00
Thomas Kriechbaumer	6ef4f094b3	Merge pull request #2038 from Kriechi/improve-http2-cov ... test forbidden HTTP/2 headers in reponses	2017-02-18 11:50:57 +01:00
Thomas Kriechbaumer	47e6f977de	test forbidden HTTP/2 headers in reponses	2017-02-18 11:26:54 +01:00
Maximilian Hils	49c8e19f80	add request.host_header, fix #2036	2017-02-17 23:31:53 +01:00
Maximilian Hils	6a1e03ac6f	tests: make full cov plugin cwd-independent	2017-02-17 23:29:10 +01:00
Maximilian Hils	33acb48c71	Merge pull request #2032 from Kriechi/individual-coverage ... add individual-coverage check	2017-02-17 22:56:13 +01:00
Thomas Kriechbaumer	4cec88fc7f	remove unneeded test module	2017-02-17 20:41:10 +01:00
mame82	ffdbccd571	Use existing urlencoding conventions when re-encoding edited form #1946 (#2022)	2017-02-16 15:03:27 +01:00
Thomas Kriechbaumer	6b22ca7a32	add individual-coverage check	2017-02-16 11:43:45 +01:00
Thomas Kriechbaumer	337b1c9399	fix wrong filename	2017-02-15 18:45:49 +01:00
Maximilian Hils	d1186eea18	Merge pull request #2029 from mhils/proxyauth ... Improve ProxyAuth	2017-02-15 16:52:20 +01:00
Thomas Kriechbaumer	94a7e99fda	Merge pull request #2028 from Kriechi/nuke-pillow ... nuke Pillow	2017-02-15 15:29:57 +01:00
Maximilian Hils	4bac850bb1	fix #1722, fix #1734, refs #2019	2017-02-15 14:20:46 +01:00
Maximilian Hils	0d9c7ce50c	image view: add fallback, catch all images but svgs	2017-02-15 14:04:24 +01:00
Thomas Kriechbaumer	8a6f8bd461	nuke Pillow	2017-02-15 00:54:14 +01:00
Thomas Kriechbaumer	24a51df9cb	extract full-coverage pytest plugin	2017-02-15 00:29:43 +01:00
Thomas Kriechbaumer	4d973e8295	fix imports	2017-02-14 23:47:33 +01:00
Thomas Kriechbaumer	a12c3d3f8e	restructure and move test files ... add empty test files to satisfy linter	2017-02-14 23:31:37 +01:00
Thomas Kriechbaumer	04748e6f3f	add filename-matching linter	2017-02-14 22:48:24 +01:00
lymanZerga11	d30ef7ee3e	Update test_flowlist.py	2017-02-14 21:17:18 +08:00
lymanZerga11	a52d8c1dab	Update test_flowlist.py	2017-02-14 21:01:01 +08:00
lymanZerga11	26a17a3d82	Update test_flowlist.py	2017-02-13 15:05:29 +08:00
lymanZerga11	a912d67c06	Update test_flowlist.py	2017-02-13 10:47:50 +08:00
lymanZerga11	577fb818b9	Update test_flowlist.py	2017-02-13 10:39:48 +08:00
lymanZerga11	f5b30b8872	Update test_flowlist.py	2017-02-12 23:36:26 +08:00
lymanZerga11	df8a5aa9be	Update test_flowlist.py	2017-02-12 23:23:23 +08:00
lymanZerga11	c622e4a649	Create test_flowlist.py	2017-02-12 23:10:49 +08:00
Maximilian Hils	3067a971f9	Merge pull request #2000 from s4chin/add-jpeg-parser ... Add jpeg parser	2017-02-11 23:00:14 +01:00
Sachin Kelkar	245e24dcf3	Add sources of images, remove copyrighted image	2017-02-12 01:19:36 +05:30
Maximilian Hils	71742654e3	Merge pull request #2005 from ujjwal96/script-reload ... Closes #1828 script reloads on py file changes	2017-02-11 01:45:14 +01:00
Thomas Kriechbaumer	c8c79cc291	coverage++	2017-02-10 22:55:15 +01:00
Sachin Kelkar	8eb1d34644	Add app1 marker and tests	2017-02-10 22:40:19 +05:30
Ujjwal Verma	809207195d	closes #1828 script reloads on py file changes	2017-02-10 22:21:12 +05:30
Sachin Kelkar	c4e141a000	Add jpeg app0 sof0 com parsing	2017-02-10 11:16:23 +05:30
Ujjwal Verma	d6465b907f	Closes #1580 Gives warning when explicit proxy configured in transparent mode (#1996)	2017-02-09 20:56:06 +01:00
Maximilian Hils	380ff50e57	Merge pull request #2003 from Kriechi/coverage++ ... test refactoring and coverage++	2017-02-09 17:45:50 +01:00
Maximilian Hils	da8444b11f	flow_count() -> len(flows)	2017-02-09 16:44:27 +01:00
Maximilian Hils	1084588103	Merge pull request #1998 from mhils/fix-change-upstream ... Fix change_upstream_proxy_server	2017-02-09 16:39:20 +01:00
Thomas Kriechbaumer	d10560d54c	improve coverage report	2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer	2ff5d72236	minor changes	2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer	0299bb5b2e	eventsequence: coverage++	2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer	5a3976c43e	coverage whitelist -> blacklist	2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer	f6cea09d5a	stateobject: coverage++	2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer	1847cf175c	websockets, tcp, version: coverage++	2017-02-09 16:08:35 +01:00
Thomas Kriechbaumer	ae94ca6fa9	remove deprecated flow_count function	2017-02-09 16:08:35 +01:00
Maximilian Hils	9b97b63891	fix change_upstream_proxy_server	2017-02-09 15:24:31 +01:00
Maximilian Hils	7a205e80aa	improve stateobject tests	2017-02-09 14:21:25 +01:00
Thomas Kriechbaumer	7a9d40817c	pytest.raises: shim new API	2017-02-08 20:04:07 +01:00
Maximilian Hils	28c0596742	Merge pull request #1997 from s4chin/add-gif-parser ... Add gif parser and tests	2017-02-08 12:09:48 +01:00
Sachin Kelkar	66ad95c330	Fix gif parsing error on some gifs and add test	2017-02-08 00:03:07 +05:30
Sachin Kelkar	4ef5de2cce	Add gif parser and tests	2017-02-06 17:57:59 +05:30
Ujjwal Verma	c622622c59	Encoding fixes and tests	2017-02-05 18:59:01 +05:30
Thomas Kriechbaumer	288f9a3857	fix flaky test	2017-02-05 10:42:47 +01:00
Thomas Kriechbaumer	966ffaa3d6	coverage++	2017-02-04 13:48:55 +01:00
Maximilian Hils	53f298ac41	Merge pull request #1967 from s4chin/remove-pillow ... Add png parser	2017-02-03 18:58:34 +01:00
Maximilian Hils	bbdb7300fd	Merge pull request #1983 from Kriechi/coverage++ ... coverage++	2017-02-03 18:56:56 +01:00
Sachin Kelkar	15548ff433	Feedback	2017-02-03 18:40:50 +05:30
Thomas Kriechbaumer	bcaaa2f40b	coverage++	2017-02-03 11:55:33 +01:00
Sachin Kelkar	0674485e76	Fix and cleanup	2017-02-03 15:02:35 +05:30
Sachin Kelkar	88dbfd5257	Add iTXt and zTXt tests	2017-02-03 14:12:54 +05:30
Sachin Kelkar	abef020e07	Fix as per feedback and add more tests	2017-02-03 14:12:54 +05:30
Sachin Kelkar	6202958048	Add png parser	2017-02-03 14:12:54 +05:30
Ujjwal Verma	e10c36fe11	Added test	2017-02-03 02:58:02 +05:30
Thomas Kriechbaumer	79aa994275	fix merge	2017-02-02 17:26:31 +01:00
Thomas Kriechbaumer	4f0b2bc4de	adapt coverage checks	2017-02-02 14:20:56 +01:00
Thomas Kriechbaumer	ae008ed80b	replace tutils.raises with pytest.raises + shim	2017-02-02 12:59:01 +01:00
Thomas Kriechbaumer	ec92d7f67e	cleanup test utils	2017-02-02 12:59:01 +01:00
Thomas Kriechbaumer	6e329595ca	add test coverage protection	2017-02-02 11:39:33 +01:00
Thomas Kriechbaumer	380d8ec370	increase test coverage	2017-02-02 10:15:01 +01:00
Thomas Kriechbaumer	3ae060f0d3	fix console test	2017-02-02 10:13:12 +01:00
Maximilian Hils	7b2a986cea	tests++ (#1976)	2017-02-01 17:52:01 +01:00
lymanZerga11	4b10212caf	Add except clause to catch script parsing errors (#1929)	2017-02-01 15:27:10 +01:00
Maximilian Hils	212d9f1b98	Merge pull request #1948 from amm0nite/fix_dns_spoofing_example ... Fix for dns_spoofing.py example	2017-02-01 15:25:51 +01:00
Aldo Cortesi	914659e888	Regularise setheaders options ... As per replacements: - Make the option type a string/tuple union - Localise parsing strictly within the addon - Adapt the console editor (we'll find a more elegant solution later)	2017-02-01 12:22:05 +13:00
Ammonite	9e3f06b7f2	Better test	2017-01-31 23:23:13 +01:00
Aldo Cortesi	4cc75a9560	Revamp replacement hooks ... - Replacement specifiers can be either strings or tuples. This lets us cope gracefully with command-line parsing (and posible quick interactive specification) without having to special-case replacement hooks, or have knowledge of hook specification leak outside the addon. We can also now use the same command-line spec format in config files. - Split replacement and replacement from file into separate addons and options. Files are now read on each replacement, so you can edit replacement files in place without restart. - Modernise the test suite to use addon test helpers. TODO: editing and displaying replace-from-file in console app	2017-02-01 11:10:28 +13:00
Aldo Cortesi	02f51d043d	Merge pull request #1965 from cortesi/optname ... Consolidate option names	2017-02-01 08:39:35 +13:00
Thomas Kriechbaumer	ff379b7665	fully test addonmanager (#1970)	2017-01-31 10:57:22 +01:00
Ammonite	e2e15df358	Add a test for the host replacement	2017-01-30 23:44:13 +01:00
Aldo Cortesi	35aff3b783	Consolidate option names ... - Onboarding app options to onboarding* - Console-specific options to console_* - Web-specific options to web_*	2017-01-30 11:15:12 +13:00
Aldo Cortesi	356c4987a2	addons: unit tests to 100% ... This patch pushes the coverage of ./tests/mitproxy/addons to 100% of the addons module.	2017-01-29 11:44:49 +13:00
Thomas Kriechbaumer	d24f76c98e	fix newlines on windows	2017-01-25 18:51:09 +01:00
Thomas Kriechbaumer	5549757268	fix alpn requirement in web tests	2017-01-25 18:18:18 +01:00
Thomas Kriechbaumer	3028e06fd2	simplify termlog outfile handling	2017-01-25 17:50:07 +01:00
nish21	ab45e4d183	write errors to stderr (#1952)	2017-01-25 17:49:56 +01:00
Maximilian Hils	2eaac31344	Merge pull request #1945 from Kriechi/ca-expired ... fix #939	2017-01-23 21:22:38 +01:00
Thomas Kriechbaumer	5792e2c483	test disable_h2c_upgrade addon	2017-01-23 18:38:27 +01:00
Thomas Kriechbaumer	d674de298c	test websocket addon	2017-01-23 15:45:53 +01:00
Thomas Kriechbaumer	006eb39cc5	fix #939	2017-01-23 15:14:56 +01:00
Thomas Kriechbaumer	127c69c3ac	nuke mock dependency ... This is already included in Python 3.3+ as unittest.mock	2017-01-22 14:11:28 +01:00
Thomas Kriechbaumer	72b753c60f	provide git information with --version ... fixes #1848	2017-01-19 20:27:29 +01:00
Maximilian Hils	88f3459c7d	stronger tests, lint	2017-01-07 23:08:50 +01:00
Maximilian Hils	b1ec7e78cd	Revert "add strutils.replace_surrogates" ... This reverts commit 15ae88db08dbf2725c8c9f945f2006c4b2a10d46.	2017-01-07 23:08:50 +01:00
Maximilian Hils	c21ee90deb	add strutils.replace_surrogates	2017-01-07 23:08:50 +01:00
Maximilian Hils	042261266f	minor encoding fixes ... - native() -> always_str() The old function name does not make sense on Python 3 only. - Inline utility functions in message.py.	2017-01-07 23:08:50 +01:00
lymanZerga11	3ea76a7f3e	Controls the length of URL displayed using the -d option (#1903)	2017-01-05 14:37:20 +01:00
chhsiao90	a5f1215eb2	Allow underscore in hostname	2016-12-30 21:03:22 +08:00
Maximilian Hils	eab360a02b	fix IO type checking	2016-12-28 14:21:19 +01:00
Maximilian Hils	0929e74b4e	fix compat with Python 3.5.0	2016-12-28 14:20:53 +01:00
Maximilian Hils	c78ffbf16d	fix url.parse tests for Python 3.6 ... This is a simpler version of @Kriechi's patch.	2016-12-27 19:09:56 +01:00
Thomas Kriechbaumer	24751965f9	remove output of dumper during tests	2016-12-21 23:22:14 +01:00
Thomas Kriechbaumer	a196493a7a	remove output of webmaster during tests	2016-12-21 23:13:53 +01:00
Maximilian Hils	77cd9224f9	Merge pull request #1880 from mhils/1877 ... Fix #1877	2016-12-19 19:04:45 +01:00
Maximilian Hils	4f3b50e417	fix io compat with previous releases	2016-12-19 16:19:37 +01:00
Maximilian Hils	fbce37054f	fix #1877	2016-12-19 16:10:41 +01:00
Maximilian Hils	c4e9000021	fix #1858	2016-12-19 01:15:10 +01:00
Aldo Cortesi	cf15a3c3ef	Merge pull request #1862 from mhils/remove-intercept-events ... Remove intercept events, update view manually	2016-12-17 09:15:11 +13:00
Maximilian Hils	388fa7e716	remove intercept events, update view manually	2016-12-16 05:43:38 +01:00
Aldo Cortesi	e387c68b38	console: mark view indiciator, fix empty flow list behaviour ... Fixes #1782	2016-12-16 11:57:45 +13:00
Aldo Cortesi	6b5673e849	Merge pull request #1845 from mhils/mitmweb-improvements ... Mitmweb Improvements	2016-12-16 10:04:12 +13:00
Maximilian Hils	727abdba44	Merge pull request #1852 from mhils/simplenamespace ... Use types.SimpleNamespace instead of custom NS class	2016-12-13 15:06:14 +01:00
Maximilian Hils	44f94c8844	use types.SimpleNamespace instead of custom NS class	2016-12-13 14:23:21 +01:00
Maximilian Hils	e5b3c8bed3	fix #1850	2016-12-13 14:12:18 +01:00
Maximilian Hils	d854e08653	[web] various fixes	2016-12-12 00:08:29 +01:00
Aldo Cortesi	a99bf0814c	console: clean path prompt handling ... - Don't trigger callback if no path is specified - Expand userdir centrally - Catch IO errors from callbacks and turn them into status messages	2016-12-12 09:13:43 +13:00
Aldo Cortesi	ca33bea296	Extend type checker validate Sequence specs	2016-12-12 07:39:59 +13:00
Maximilian Hils	3e37cbd061	minor fixes	2016-12-10 12:06:33 +01:00
Maximilian Hils	123ef043dc	add new xml/html pretty-printer 🎉	2016-12-10 11:40:07 +01:00
Maximilian Hils	293b79af91	remove lxml-dependent code	2016-12-10 10:19:05 +01:00
Maximilian Hils	a7ba2f7b46	update tests, increase coverage, add type info	2016-12-09 21:26:02 +01:00
Aldo Cortesi	e943147fc3	options: add a merge method to assimilate options ... Fixes #953	2016-12-08 16:12:40 +13:00
Aldo Cortesi	b2695dbc6a	Minor tweaks	2016-12-08 10:21:06 +13:00
Aldo Cortesi	a617e3b5f7	Amalgamate all the Options objects	2016-12-08 10:21:06 +13:00
Aldo Cortesi	d742d4fb8c	Replace configargparse with argparse, enable new options loading ... This commit ditches configargparse and enables the new config file format. The default location is ~/.mitmproxy/config.yaml. Unifying all of the various Options objects will follow in the next patch.	2016-12-08 10:21:06 +13:00
Aldo Cortesi	150372e297	options: defaults are a class attribute	2016-12-08 10:21:06 +13:00
Aldo Cortesi	00c897a185	options: save defaults, add .reset() to restore defaults ... Use .reset() in console app to clear options.	2016-12-08 10:21:06 +13:00
Aldo Cortesi	d74cac265a	Add YAML serialization of options ... This uses ruamel.yaml. The library seems well-supported, and can do in-place modification of config files that retains user comments and file structure.	2016-12-08 10:21:06 +13:00
Aldo Cortesi	c94cd512d1	options: defaults are a class attribute	2016-12-08 10:21:06 +13:00
Aldo Cortesi	c062e302e9	Add OptManager.subscribe, use it to clean up palettes in console ... .subscribe lets you subscribe a function to a specified set of options.	2016-12-08 10:21:06 +13:00
Aldo Cortesi	0c091bd92b	Options - avoid mutation, API cleanup, has_changed ... - Always return a deepcopy of options to avoid accidental mutation of options state. - Remove .get(opt, default). This is an inappropriate API for Options - trying to retrieve an option that doesn't exist should always be an error. - Add the has_changed method that checks if an option differs from the default, use it in mitmproxy console.	2016-12-08 10:21:06 +13:00
Aldo Cortesi	b231836c70	Get rid of tfile testing option ... It's weird, it's ugly, it's getting in the way of my options refactoring, and it must therefore die.	2016-12-08 10:21:05 +13:00
Aldo Cortesi	297493801d	Clean up dump tests ... - Remove tests that redundantly test addon funtionality that we've already tested more comprehensively elsewhere. - Extend to 100% coverage for tools/dump.py	2016-12-08 10:21:05 +13:00
Aldo Cortesi	b4d33aaebf	options: save defaults, add .reset() to restore defaults ... Use .reset() in console app to clear options.	2016-12-08 10:21:05 +13:00
Thomas Kriechbaumer	47196e8676	tls_parser: allow optional extensions ... fixes #1816	2016-12-06 19:51:57 +01:00
Thomas Kriechbaumer	1a36efbb6a	simplify ALPN and OpenSSL on macOS	2016-12-04 11:04:06 +01:00
Thomas Kriechbaumer	cc6aa1f542	websocket: update close handshake tests	2016-11-29 23:47:19 +01:00
Maximilian Hils	34bf3a2496	fix #1783 (#1794)	2016-11-28 13:29:06 +01:00
Maximilian Hils	3154dc87fd	fix pyinstaller ... amongst other things, fix #1746	2016-11-28 00:51:52 +01:00
Maximilian Hils	568f40c810	Fix transparent mode initialisation, refactor mitmproxy.platform (#1787)	2016-11-25 17:32:23 +01:00
Maximilian Hils	222106916e	Merge branch 'mitmweb-eventlog'	2016-11-23 22:47:50 +01:00
Maximilian Hils	45332006a3	mitmweb: 100% app test coverage, numerous fixes	2016-11-23 22:35:07 +01:00
Thomas Kriechbaumer	d3bd04dec0	disable TCP support for now	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	5dfc199086	websocket: add tests	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	4beb693c9c	websocket: change cmdline option	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	ffb3988dc9	rename WebSocket{s,} protocol	2016-11-23 10:18:45 +01:00
Maximilian Hils	f1662cbfd7	add eventstore tests	2016-11-23 01:27:51 +01:00
Yoginski	ebff5f2466	Descriptive error message for SSL context initialization failure (#1767)	2016-11-21 09:40:09 +01:00
Maximilian Hils	9af8f4bb31	organize examples ... This commit is largely based on work by Thiago Arrais (@thiagoarrais) and Shane Bradfield (@l33tLumberjack). I wasn't really able to get their PR reasonably merged onto the latest master, so I reapplied their changes manually here and did some further improvements on that.	2016-11-21 02:28:10 +01:00
Maximilian Hils	f74e561524	rewrite absolute-form HTTP requests to relative form, fix #1759 (#1765)	2016-11-20 17:21:21 +01:00
Thomas Kriechbaumer	f45034e8f1	tests: fix race condition	2016-11-20 17:02:26 +01:00
Maximilian Hils	5ce370e2a9	lint!	2016-11-18 12:59:59 +01:00
Aldo Cortesi	8065b44eed	addons.view: clarify modification events ... This adds a set of store modification events, and uses them for flow settings. This addresses a bug where settings could persist even after flows were deleted.	2016-11-15 09:53:17 +13:00
Aldo Cortesi	9b08279c7c	addons.proxyauth: out with the old, in with the new ... - Strip out old auth mechanisms, and enable addon - Disable web app auth for now - this should just use the Tornado auth stuff	2016-11-13 19:59:59 +13:00
Aldo Cortesi	dc88b7d110	addons.proxyauth: complete and test	2016-11-13 18:14:23 +13:00
Aldo Cortesi	e644d2167c	stub out proxyauth addon ... Stub out basic workings, add and test configure event.	2016-11-13 16:22:33 +13:00
Aldo Cortesi	fe01b1435a	upstream_proxy_auth -> upstream_auth ... Also clarify what this does in commandline help.	2016-11-13 11:50:28 +13:00
Aldo Cortesi	3b00bc339d	Complete upstream authentication module ... - Handles upstream CONNECT and regular requests, plus HTTP Basic for reverse proxy - Add some tests to make sure we can rely on the .via attribute on server connections.	2016-11-13 11:43:27 +13:00
Aldo Cortesi	a9b4560187	Refine handling of HTTP CONNECT ... - CONNECT requests do not generate the usual http events. Instead, they generate the http_connect event and handlers then have the option of setting an error response to abort the connect. - The connect handler is called for both upstream proxy and regular proxy CONNECTs.	2016-11-12 18:28:37 +13:00
Aldo Cortesi	38f8d9e541	Add the http_connect event for HTTP CONNECT requests	2016-11-12 12:44:43 +13:00
Aldo Cortesi	bc01a146b0	Upstream proxy auth to addon	2016-11-12 11:58:04 +13:00
Aldo Cortesi	3958940420	Test failure during 100-continue ... Also: - Remove duplicate and unused code - Tighten scope of HttpReadDisconnect handler - we only want to ignore this for the initial read, not for the entire block that includes things like the expect handling.	2016-11-12 11:58:04 +13:00
Aldo Cortesi	82ac7d05a6	Bug: ask requestheaders before request body is read ... Also add the beginnings of a test suite to exercise issues like this.	2016-11-12 11:58:04 +13:00
Thomas Kriechbaumer	184e29e119	http2: add push-promise metadata test	2016-11-05 05:13:36 +01:00
Aldo Cortesi	067198a5dd	Remove deprecated interfaces	2016-11-04 11:47:47 +13:00
Aldo Cortesi	6c8c4465d9	script.concurrent: tests to taddons	2016-11-04 10:59:41 +13:00
Aldo Cortesi	4f4db223fe	addons: convert last of the test suite to taddons	2016-11-04 09:17:56 +13:00
Aldo Cortesi	deb66d3cac	addons.setheaders: fix configure bug, tests to taddons	2016-11-04 09:09:39 +13:00
Aldo Cortesi	b51a96081a	addons.view: test suite to 100% ... This takes coverage for all of /addons to 100%	2016-11-04 08:55:01 +13:00
Aldo Cortesi	17e828b243	addons.view: test improvements	2016-11-03 20:53:06 +13:00
Aldo Cortesi	5ade93f2ad	addons.streambodies: 100% test coverage	2016-11-03 20:16:07 +13:00
Aldo Cortesi	d7d6edb3d1	addons.serverplayback: 100% test coverage	2016-11-03 20:05:21 +13:00
Aldo Cortesi	e1fc80937d	addons.serverplayback: test suite to taddons	2016-11-03 19:43:33 +13:00
Aldo Cortesi	e9a96f4d7f	addons.script: 100% test coverage	2016-11-03 19:36:34 +13:00
Aldo Cortesi	d9538637c3	addons.script: convert to test.taddons	2016-11-03 18:57:34 +13:00
Aldo Cortesi	d31f2698a5	addons.onboarding: remove duplicate code	2016-11-03 16:20:38 +13:00
Aldo Cortesi	9fc6674151	addons.intercept: 100% test coverage	2016-11-03 16:16:29 +13:00
Aldo Cortesi	77e6dfe35c	streamfile: make options less crazy ... Instead of a (file, mode) tuple, move to "streamfile" as the path, and "streamfile_append" to specify if we should append or not. Leave the command-line options intact for now.	2016-11-03 15:18:55 +13:00
Aldo Cortesi	9f77c79227	FileStreamer -> StreamFile ... options.wfile -> options.streamfile	2016-11-03 15:00:18 +13:00
Aldo Cortesi	43a8221989	addons: filestreamer test cov to 100% ... Also address a bug in taddons that caused options changes that raised errors to be retained rather than rolled back.	2016-11-03 14:50:23 +13:00
Aldo Cortesi	fbdce4b629	addons filstreamer: tests and bugfixes ... - Move tests to taddons - Fix a bug where options updates caused streaming to halt	2016-11-03 12:44:19 +13:00
Aldo Cortesi	5109fd8ecb	Change antiquated test cipher suites ... This breaks Travis, possibly due to OpenSSL version.	2016-11-03 08:23:19 +13:00
Aldo Cortesi	b867fb35a3	addons: dumper spit and polish ... - 100% test coverage - Cleanups - Add test/mitmproxy/addons/dumperview.py, a small utility for viewing dumper output variations	2016-11-02 22:47:49 +13:00
Aldo Cortesi	a75b3474a4	tests: convert test_dumper to use taddons	2016-11-02 11:17:08 +13:00
Aldo Cortesi	59b269425f	tests: client_playback coverage	2016-11-02 10:59:33 +13:00
Aldo Cortesi	7e6d014f8f	tests: pathod/tutils.py -> pathod/tservers.py ... And remove all aliases for mitmproxy.test.tutils	2016-11-02 10:06:25 +13:00
Aldo Cortesi	c55e8d8f62	tests: clean up test/mitmproxy/tutils.py ... Remove aliases, use mitmproxy/test/tutils instead.	2016-11-02 09:44:18 +13:00
Aldo Cortesi	fc7606bd98	tests: minor cleanup for tests/mitmproxy/tutils.py	2016-11-02 08:51:26 +13:00
Aldo Cortesi	83fdd82a52	addons anticom, anticache: expand tests, new truss	2016-11-01 17:38:45 +13:00
Aldo Cortesi	50deaf56bf	Remove addons.State ... - Do a first-pass port of mitmweb. Some stuff still broken. - Remove more all State tests from the test suite	2016-11-01 10:06:28 +13:00
Aldo Cortesi	9d9735dd07	Replace addons.state in test suite ... Use a super-simple flow recorder instead.	2016-11-01 09:36:24 +13:00
Aldo Cortesi	daf355bb4c	console: add caching sort keys ... This is a tad complicated. The underlying sorted list implementation expects the sort key to be stable for the lifetime of the object. However, if we sort by size, for instance, the sort order changes as the flow progresses through its lifecycle. We address this through two means: - Let order keys cache the sort value by flow ID. - Add a facility to refresh items in the list by removing and re-adding them when they are updated.	2016-10-30 21:11:30 +13:00
Aldo Cortesi	9abfb1aac2	console: re-add follow focus	2016-10-30 19:47:32 +13:00
Aldo Cortesi	f08b57fb9b	console: "v" to reverse flow order	2016-10-30 17:57:43 +13:00
Aldo Cortesi	a67a591893	console: o for flow order ... "o" shortcut and --order cmdline option to change flow order. Options is now bound to "O".	2016-10-30 17:42:34 +13:00
Aldo Cortesi	6b6c44551a	addons.view: Add first-class support for marking ... Marking now works differently - it's no longer just another filter, it's applied in addition to the filter. This means you can apply a filter, mark some flows, and then toggle between marked and unmarked flows matching the filter. I'm leaving the filter for marked flows intact - it will come in handy in other situations.	2016-10-30 15:45:36 +13:00
Aldo Cortesi	2b76db1272	console: Port from state to view ... First phase of the port - basic flow list and flow view functionality working. More to come.	2016-10-30 14:56:36 +13:00
Aldo Cortesi	b9eb1a3479	Add options.default_contentview ... This is the first step in a longer process of revamping content views. For the moment, the option is not exposed on the command line.	2016-10-30 12:05:37 +13:00
Aldo Cortesi	944dcbaaa0	Cleanups: remove intercept from addons.state, unused imports	2016-10-30 11:13:05 +13:00
Aldo Cortesi	81a00f6f76	Replace interception in mitmproxy and mitmweb with addon ... Fixes #1674	2016-10-30 11:07:09 +13:00
Aldo Cortesi	d1f14961ed	test.taddon: Add cycle() method, use it to test addons.intercept	2016-10-30 10:52:57 +13:00
Aldo Cortesi	b4904d33ba	Move test flow creators to mitmproxy.test.tflow	2016-10-30 10:12:39 +13:00
Aldo Cortesi	2dc3284fbb	Add addons.intercept ... - Add an addon to handle intercept based on a filter pattern - Start sketching out a nicer testing truss for addons in mitmproxy.test.taddon	2016-10-29 15:44:48 +13:00
Aldo Cortesi	71d2636594	Sync	2016-10-29 12:35:10 +13:00
Aldo Cortesi	005c22445b	addons.view: focus.focusflow -> focus.flow	2016-10-29 11:55:44 +13:00
Aldo Cortesi	7ecaeb0214	addons.view.focus: next and prev methods	2016-10-29 11:50:10 +13:00
Aldo Cortesi	32a0a7b860	addons.view: flow settings ... Add a flow settings mechanism, enable focus and settings unilaterally.	2016-10-29 11:37:32 +13:00
Aldo Cortesi	14df969434	addons.view.focus: Better handling of view refresh ... When we refresh and our current focus goes out of scope, we set the focus to the element nearest the old focus.	2016-10-29 11:08:35 +13:00
Aldo Cortesi	90e7142b5c	addons.View: better order reversal ... Deal with some subtleties in order reversal, add a toggle method that emits refresh.	2016-10-29 10:55:57 +13:00
Aldo Cortesi	12a70d03ad	addons.view: Add a focus tracker	2016-10-29 10:17:29 +13:00
Aldo Cortesi	9dcc3a3e20	addons.View: hook up signals	2016-10-29 08:25:19 +13:00
Aldo Cortesi	69bacee1d8	Sketch out addons.View ... The first iteration of a replacement for addons.State	2016-10-29 08:25:19 +13:00
Thomas Kriechbaumer	44ac370f08	upgrade h2 to >=2.5.0	2016-10-27 15:10:53 -07:00
Maximilian Hils	97f1236c99	Merge pull request #1670 from chhsiao90/display-cipher-#582 ... Resolved #582: display ClientConnection select cipher of TLS	2016-10-27 11:38:22 -07:00
chhsiao90	d52f35428c	Show tls version on console	2016-10-26 14:36:14 +08:00
Maximilian Hils	b1bdae3d1c	typecheck options, fix current inconsistencies	2016-10-25 20:45:48 -07:00
chhsiao90	960f2e8bf0	Resolved #582: display ClientConnection select cipher of TLS	2016-10-26 11:32:42 +08:00
Maximilian Hils	145c2892f7	Merge pull request #1664 from chhsiao90/sni-display-#1639 ... Resolved #1639: display sni on ClientConnection	2016-10-24 19:56:05 -07:00
chhsiao90	39ac29e37c	Resolved #1639: display sni on ClientConnection	2016-10-25 10:46:53 +08:00
Maximilian Hils	ef4e9b2b85	Merge pull request #1656 from mhils/improve-export-2 ... Improve Flow Export	2016-10-24 19:19:58 -07:00
Sahil Chelaramani	7b3505336a	replace mitmproxy.utils.lrucache with functools.lru_cache	2016-10-24 16:03:16 -07:00
Maximilian Hils	e87daa70f3	improve flow export	2016-10-22 20:32:39 -07:00
Maximilian Hils	ea2d6474bf	Merge pull request #1649 from cortesi/kill ... Don't call error for flow kill	2016-10-22 19:22:50 -07:00
Maximilian Hils	a1a792aeac	various encoding fixes, fix #1650	2016-10-22 18:47:12 -07:00
Aldo Cortesi	6170493615	Don't call error for flow kill ... This is now the error handler on master, so whatever the intetion was it's now definitely wrong.	2016-10-22 15:56:42 +13:00
Aldo Cortesi	cc8b422d9d	multidict: remove to_dict ... We never use it, and it is dangerously ambiguous when a key is associated with a list.	2016-10-21 11:42:21 +13:00
Aldo Cortesi	18ee6255c0	multidict: ditch ImmutableMultiDict ... A contorted class we only use for cookie attributes. We don't need it.	2016-10-21 11:40:05 +13:00
Aldo Cortesi	8430f857b5	The final piece: netlib -> mitproxy.net	2016-10-20 11:56:38 +13:00
Aldo Cortesi	853e03a5e7	netlib.tutils -> mitmproxy.test.tutils ... There's a LOT more to be done refactoring our different conflicting test utils.	2016-10-20 11:42:55 +13:00
Aldo Cortesi	01a449b5cb	netlib.exceptions.* -> mitmproxy.exceptions	2016-10-20 11:27:05 +13:00
Aldo Cortesi	301d52d9d0	netlib.encoding -> netlib.http.encoding ... Encoding is highly specific to http, and only used within this module.	2016-10-20 11:06:57 +13:00
Aldo Cortesi	f964d49853	netlib.certutils -> mitmproxy.certs	2016-10-20 11:02:52 +13:00
Aldo Cortesi	9870844b38	netlib.utils -> netlib.check ... Now only contains is_valid_[host,port] Intermediate step - this will be in mitproxy.net soon.	2016-10-20 10:46:47 +13:00
Aldo Cortesi	e0f3cce14c	netlib.utils.[get,set]bit -> mitmproxy.utils.bits	2016-10-20 10:38:57 +13:00
Aldo Cortesi	9555126585	netlib.utils.BiDi -> mitmproxy.types.bidi.BiDi	2016-10-20 10:32:09 +13:00
Aldo Cortesi	a684585e7c	netlib.debug -> mitmproxy.utils.debug	2016-10-20 10:25:36 +13:00
Aldo Cortesi	1ecb25cdc1	mitmproxy.types.[basethread,multidict,serializable]	2016-10-20 10:22:23 +13:00
Aldo Cortesi	f45f4e677e	netlib.strutils -> mitmproxy.utils.strutils	2016-10-20 10:11:58 +13:00
Aldo Cortesi	1407830280	netlib.human -> mitmproxy.utils.human	2016-10-20 09:45:18 +13:00
Aldo Cortesi	069119364d	Create mitmproxy.utils hierarchy ... - Add mitproxy.utils.lrucache, mitproxy.utils.data	2016-10-20 09:35:55 +13:00
Aldo Cortesi	e73c7fe77e	mitmproxy.protocol -> mitmproxy.proxy.protocol ... The protocols here are compltely proxy-specific, are only used from within the proxy module, and are not exposed to users.	2016-10-19 23:11:56 +13:00
Aldo Cortesi	24cf8da27e	Move all tools into mitmproxy.tools, move models/* to top level ... The primary motivation here (and for all the other moving around) is to present a clean "front of house" to library users, and to migrate primary objects to the top of the module hierarchy.	2016-10-19 20:26:05 +13:00
Aldo Cortesi	5a68d21e8c	Remove flow module entirely, move contents to top level ... mitmproxy.flow.io -> mitmproxy.io mitmproxy.flow.export -> mitmproxy.export	2016-10-19 15:08:35 +13:00