Commit Graph

8218 Commits

Author SHA1 Message Date
rjt-gupta
8948703470 separate editors 2019-02-06 03:42:07 +05:30
rjt-gupta
d08d2185ea multipart encoder and tests 2019-02-06 03:42:07 +05:30
rjt-gupta
4df325335b multipart-fix 2019-02-06 03:42:07 +05:30
rjt-gupta
ba054b15f3 url-fix 2019-02-03 00:53:05 +05:30
rjt-gupta
cec8c67465 non ascii fix and tests 2019-02-03 00:49:53 +05:30
Thomas Kriechbaumer
70777a1b6e
Merge pull request #3459 from RPigott/wsproto-update
Fix: update to wsproto 0.13 for real this time
2019-01-31 22:08:02 +01:00
rpigott
7fa209790e removed whitespace in kwargs 2019-01-31 12:34:00 -08:00
rpigott
92fc87bc4c whitespace error 2019-01-30 23:44:35 -08:00
rpigott
2af71a4486 Separate client and server PerMessageDefalte extension per #3460 2019-01-30 18:31:44 -08:00
rpigott
106948d996 update to wsproto 0.13 2019-01-29 12:09:05 -08:00
Thomas Kriechbaumer
67aa1b63f9
Merge pull request #3437 from yan12125/fix-tests-on-mojave
Fix a failing test on macOS Mojave
2019-01-26 14:57:41 +01:00
Maximilian Hils
139a385900
Merge pull request #3441 from petersmythe/patch-1
Fix spelling issues
2019-01-23 13:08:51 +01:00
Maximilian Hils
79b9e0d1bf
Merge pull request #3451 from yjh0502/openbsd-doc
openbsd: divert-to requires exact listen address
2019-01-23 13:08:25 +01:00
Maximilian Hils
5ad12e625b
Merge pull request #3453 from XZzYassin/patch-1
fixes copying on macos
2019-01-23 13:07:40 +01:00
Mumen Yassin
995d9f0f49
fixes copying on macos 2019-01-23 14:34:55 +03:00
Thomas Kriechbaumer
8b9583f19d
remove travis workaround 2019-01-18 19:52:24 +01:00
Thomas Kriechbaumer
63a5e1d3ae
remove sudo:false flag
https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
2019-01-18 19:47:45 +01:00
Jihyun Yu
c331ba91fc openbsd: divert-to requires exact listen address
divert-to does not work with '0.0.0.0' or similar listen address, so we
need to specify listen address that we provided to `pf`.
2019-01-18 15:59:58 +09:00
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
rjt-gupta
1ee54f7d73 option added 2019-01-07 23:17:11 +05:30
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
Peter Smythe
2223520403
Fix space 2019-01-03 08:48:09 +02:00
Peter Smythe
d6445fa5ba
Fix spelling 2019-01-03 07:54:57 +02:00
Chih-Hsuan Yen
cc33f40f29
Fix a failing test on macOS Mojave 2018-12-29 21:24:46 +08:00
BkPHcgQL3V
407a5d71a8
Tabular list flow 2018-12-19 17:52:32 +00: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
rjt-gupta
4bd992d63c external-viewer-fix 2018-12-17 00:08:27 +05:30
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