7993 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matías Lang	d852f292c9	Fix flake8 warning in curl_command ... There was an unused variable (I redefined its value below). It didn't affect the behavior of the function	2019-01-14 02:02:07 -03:00
Matías Lang	e6da62a50a	Merge branch 'master' of https://github.com/mitmproxy/mitmproxy	2019-01-13 23:55:27 -03:00
Matías Lang	674f92a7c1	Refactor curl_command and httpie_command ... To avoid calling to shlex.quote many times	2019-01-13 23:53:51 -03:00
Matías Lang	eab4174b87	Fix command injection when exporting to httpie ... The command generated by `export.clip httpie @focus` or `export.file httpie @focus /path/to/file` wasn't being properly escaped so it could contain a malicious command instead of just a simple httpie call.	2019-01-13 23:45:28 -03:00
Matías Lang	d027891cec	Fix command injection when exporting to curl ... The command generated by `export.clip curl @focus` or `export.file curl @focus /path/to/file` wasn't being properly escaped so it could contain a malicious command instead of just a simple curl.	2019-01-13 23:39:50 -03:00
Maximilian Hils	82bc8c7ca2	Merge pull request #3444 from BoboTiG/fix-resource-leaks ... Fix ResourceWarning: unclosed file, prevent resource leaks	2019-01-06 17:43:47 +01:00
Mickaël Schoentgen	c03b07930c	Fix ResourceWarning: unclosed file, prevent resource leaks ... Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>	2019-01-06 15:06:30 +01:00
Maximilian Hils	4f270b5506	Merge pull request #3443 from BoboTiG/fix-invalid-seq-warnings ... Fix several DeprecationWarning: invalid escape sequence	2019-01-06 14:19:45 +01:00
Mickaël Schoentgen	3a2d7bb119	Fix several DeprecationWarning: invalid escape sequence ... Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>	2019-01-05 23:37:48 +01:00
BkPHcgQL3V	889987aa0a	Fix Flow being part of raw_format_flow cache key ... raw_format_flow is annotated with the @lru_cache decorator, which creates a cache of the function's return value based on its parameters. Thus, assuming that the first argument (f) contains all the information needed to compute the urwid control for the flow, this effectively caches results. To make most use of this, remove the second parameter representing the real Flow object to improve @lru_cache's efficiency.	2018-12-17 18:25:14 +01:00
Rajat Gupta	e2bcca47b1	charset in meta tags (#3411) ... original contribution from @0xHJK in https://github.com/mitmproxy/mitmproxy/pull/3150	2018-12-13 15:34:12 +01:00
Rajat Gupta	db658b12ed	fix query array ... fixes #3072 closes #3254	2018-12-03 22:05:59 +01:00
Thomas Kriechbaumer	ce28721458	Merge pull request #3403 from Kriechi/bump-deps ... bump dependencies	2018-12-02 16:18:56 +01:00
Thomas Kriechbaumer	2fb2b48a06	bump dependencies	2018-12-02 15:48:20 +01:00
Thomas Kriechbaumer	544f859925	Merge pull request #3401 from rjt-gupta/fix-replay-timestamps ... client-replay-fix	2018-12-01 16:35:40 +01:00
rjt-gupta	39e5ceb6cf	client-replay-fix	2018-12-01 18:23:10 +05:30
Thomas Kriechbaumer	6f893a83c0	Merge pull request #3382 from abhigyank/org ... Change variable o to organization for generated certficates.	2018-11-12 09:34:16 +01:00
Abhigyan Khaund	cda4248610	Change variable o to organization for generated certficates.	2018-11-11 10:58:14 +05:30
Abcdefghijklmnopqrstuvwxyzxyz	d4f4cfe225	Add Organization field for the generated certificate (#3376) ... add organization field for the generated certificate	2018-11-09 09:06:04 +01:00
Maximilian Hils	3f3ed4743a	Merge pull request #3371 from JessicaFavin/proper-display-on-stderr ... Display errors on sys.stderr	2018-11-09 08:58:41 +01:00
Maximilian Hils	ef485fa5cc	Merge pull request #3374 from abhigyank/docs ... docs: Add mitm.it link in the certificates docs.	2018-11-09 08:57:05 +01:00
Maximilian Hils	08f2459cbd	docs: don't make links extra bold	2018-11-09 08:56:48 +01:00
Abhigyan Khaund	80f5cf5437	docs: Add mitm.it link in the certificates docs.	2018-11-05 02:15:48 +05:30
JessicaFavin	fd1efc8852	Remove indent on echo_error	2018-11-04 19:18:32 +01:00
Jessica Favin	0cbbcffd89	test_dumper.py - Add sio_err everywhere + adjust test_simple	2018-11-04 17:24:34 +01:00
Jessica Favin	312f922316	Fix test_dumper.py - Dumper constructor	2018-11-04 16:26:51 +01:00
Jessica Favin	ade136dc4d	Update test_dumper.py	2018-11-04 16:06:17 +01:00
Jessica Favin	2e9a34faa9	Display errors on sys.stderr	2018-11-01 19:53:37 +01:00
Maximilian Hils	c2e2fd1751	Merge pull request #3366 from alexlauerman/patch-3 ... Corrected keep_host_header usage option	2018-10-26 16:52:31 +02:00
Alex Lauerman	93cb73e2cd	Corrected keep_host_header usage option ... I tested this locally to verify this change is correct.	2018-10-25 16:15:55 -05:00
Samoilenko Roman	997a20e652	Merge pull request #3356 from fghzxm/umask-keys ... Make private keys readable only by the owner	2018-10-25 11:23:20 +03:00
Maximilian Hils	28551e9655	use skip_windows decorator consistently	2018-10-23 15:24:59 +02:00
Fred Miller	bf3570b3b9	Skip file permission test on Windows	2018-10-23 08:53:51 +08:00
Fred Miller	f16621a38b	Make private keys readable only by the owner	2018-10-22 22:53:58 +08:00
Maximilian Hils	e8d76d050d	Merge pull request #3351 from arun-94/master ... #3312 Change colors according to the HTTP status code	2018-10-21 14:48:58 +02:00
Arun Swaminathan	a6ba88ae64	Update snapshot tests	2018-10-20 04:05:07 -04:00
Arun Swaminathan	c1184176e7	Check for null flow response when changing color	2018-10-20 04:04:55 -04:00
Maximilian Hils	0d320e778d	Merge pull request #3355 from kam800/configurable-lines-cutoff ... Make content view lines limit configurable	2018-10-20 00:08:44 +02:00
Kamil Borzym	41cef4e9e3	Make content view lines limit configurable	2018-10-19 15:58:53 +02:00
Arun Swaminathan	028dd78291	#3312 Change colors according to HTTP status code	2018-10-15 22:43:22 -04:00
jbrule	57868ef5fa	Added link_expander.py example to simple examples (#3348)	2018-10-12 21:56:58 +02:00
Maximilian Hils	82797efe9f	Merge pull request #3344 from Tey/master ... Fixed doc about domain whitelisting	2018-10-10 17:07:16 +02:00
Thomas Kriechbaumer	eace39f670	Merge pull request #3334 from artnc/patch-1 ... Fix error message for failure to start editor	2018-10-10 17:03:27 +02:00
Thomas Kriechbaumer	c30b46147e	Merge pull request #3347 from Kriechi/ws-example ... add websocket example	2018-10-09 19:03:17 +02:00
Thomas Kriechbaumer	13e1f8b421	add websocket example	2018-10-09 18:34:57 +02:00
Tey	1752fac0d8	Fixed doc about domain whitelisting	2018-10-05 04:05:18 +02:00
Samoilenko Roman	a8b809dcbc	Merge pull request #3340 from kajojify/buttons ... keys.yaml priority over defaultkeys.py	2018-09-29 16:21:46 +03:00
Miroslav	ed9e3d5137	keys.yaml priority over defaultkeys.py. Test for this.	2018-09-29 15:54:17 +03:00
Thomas Kriechbaumer	7f5d8d0997	Merge pull request #3335 from Kriechi/bump-wsproto ... bump wsproto	2018-09-23 14:09:04 +02:00
Thomas Kriechbaumer	afdcb944e1	bump wsproto	2018-09-23 13:46:45 +02:00