Maximilian Hils
8158349db5
Merge branch 'master' into master
2019-11-16 12:07:22 +01:00
Maximilian Hils
d1eec4d807
Merge pull request #3705 from mhils/issue-3469
...
Fix #3469
2019-11-16 12:06:13 +01:00
Maximilian Hils
2d01c81c1f
Merge pull request #3700 from Jessonsotoventura/confirm_quit
...
Ctrl-C should prompt the user before exiting
2019-11-16 12:04:59 +01:00
Maximilian Hils
5c0be1de4a
Merge pull request #3448 from cript0nauta/master
...
Fix command injection vulnerability when exporting to curl or httpie
2019-11-16 12:03:34 +01:00
Michael McKeirnan
a6e8b930c9
Adding raw_request and raw_response to export
...
This is a proposed change for
https://github.com/mitmproxy/mitmproxy/issues/3701 which alters the
behavior of a raw http export to include both the request and the
response. Additionally, this introduces two new export options
"raw_request" and "raw_response" which allow for exporting the raw HTTP
request or response individually.
2019-11-16 01:20:50 -08:00
Jesson Soto Ventura
5cb1746ef6
used getattr to select exit
2019-11-15 23:22:38 -05:00
Henrique
a244ece0e5
Removed useless else that prevented 100% code coverage
2019-11-15 18:15:56 -05:00
Maximilian Hils
248034c528
tests++
2019-11-15 21:17:29 +01:00
Maximilian Hils
8f2cee7225
fix #3469
2019-11-15 21:00:47 +01:00
Maximilian Hils
484e099eb1
test coverage++
2019-11-15 20:57:03 +01:00
Henrique
20bd33499f
Small fix for 100% coverage
2019-11-15 14:09:05 -05:00
Henrique M. D
021a141521
Merge branch 'master' into fix-command-bar-issue-3259
2019-11-15 13:59:57 -05:00
Henrique
8972250167
Removed the custom lexer in favor of using pyparsing.
2019-11-15 13:07:12 -05:00
Maximilian Hils
698f7e2e17
Merge pull request #3420 from rjt-gupta/multipart-fix
...
multipart-fix
2019-11-15 19:04:47 +01:00
Maximilian Hils
a79e0a0868
Merge pull request #3522 from peter-way/master
...
Use 'host_header' instead of 'host', to calculate 'HTTPRequest' hash in transparent mode.
2019-11-15 19:04:14 +01:00
Maximilian Hils
01ddda75e8
improve curl/httpie export
2019-11-15 19:02:59 +01:00
Maximilian Hils
0873566ff0
Merge remote-tracking branch 'origin/master' into pr-3448
2019-11-15 18:10:42 +01:00
Maximilian Hils
fbbbbb678e
Merge pull request #3612 from ccssrryy/fix-dup-resp
...
fix duplicate error response
2019-11-15 17:45:28 +01:00
Maximilian Hils
50443df340
Merge branch 'master' into master
2019-11-15 17:24:59 +01:00
Maximilian Hils
f6f9eb2c4e
Merge pull request #3425 from rjt-gupta/external-viewer
...
external-viewer-fix
2019-11-15 17:23:01 +01:00
Maximilian Hils
f8926170a5
remove superfluous option
2019-11-15 17:22:41 +01:00
Maximilian Hils
4f81f1ee41
Merge pull request #3703 from mhils/replay-ignore-port
...
allow server replay functionality to run on a different port
2019-11-15 17:13:00 +01:00
Jurriaan Bremer
a5412ab136
allow server replay functionality to run on a different port
...
By providing the "server_replay_ignore_port" configuration value we're
able to run mitmproxy in server replay mode on a different port than
the web server in the flows was originally running. This is also useful
in case multiple ports are present in a flow (I suspect).
2019-11-15 16:15:13 +01:00
Maximilian Hils
be2865cd79
Merge pull request #3699 from mhils/flowfilter2019
...
Improve flowfilter
2019-11-15 15:57:28 +01:00
Maximilian Hils
be46008b5e
disable overly strict indentation checks
2019-11-15 15:56:55 +01:00
Michael McKeirnan
dae01ad623
Adding export raw http response
...
Adding a new export type for raw http response, and changing export raw to export
raw_request to distinguish between the two. This is a proposed change for https://github.com/mitmproxy/mitmproxy/issues/3701
2019-11-15 01:21:54 -08:00
Jesson Soto Ventura
b3dac13184
ctrl-c should prompt for an exit
2019-11-14 20:43:27 -05:00
Maximilian Hils
2239c49e18
improve flowfilter
2019-11-15 02:28:57 +01:00
Maximilian Hils
cd660a035f
Merge pull request #3697 from ylmrx/issue_3639-yml_extension_allowed
...
adding config.yml as an allowed config filename
2019-11-15 00:31:19 +01:00
Maximilian Hils
c78165bd4c
simplify option file loading
...
- no need for a constant that is only used once
- if load_paths allows us to specify multiple paths, let's just do that.
2019-11-14 21:12:32 +01:00
Maximilian Hils
d38e20689e
Merge pull request #3698 from ylmrx/crash_on_empty_focus_next
...
Fixes crash upon view.focus.[next|prev] - #3694
2019-11-14 21:07:53 +01:00
Yoann L
9a1ec6b064
Fixes #3694
2019-11-14 18:59:43 +01:00
Yoann L
836e04abd6
adding config.yml as an allowed config filename
...
cf. title
as suggested in #3639
2019-11-14 18:39:06 +01:00
Henrique
f2b118817e
Added a new test to test that the issue from the previous commit won't
...
happen anymore
2019-11-13 10:32:17 -05:00
Henrique
af7088d7f3
Fixed issue introduced by change in the lexer that caused mitmproxy to
...
crash when pressing `:`.
2019-11-13 10:17:07 -05:00
Henrique
875adb2ba8
Added tests to reach 100% coverage
2019-11-13 09:32:51 -05:00
Henrique
cf6839a9d9
Removed an exception handle that can't happen anymore due to the new
...
lexer
2019-11-13 09:26:37 -05:00
Henrique
d90262ad35
Getting 100% coverage in the lexer
2019-11-12 23:16:52 -05:00
Henrique
eee4b24e98
Fixing issues reported by the linter
2019-11-12 22:50:33 -05:00
Henrique
578eb7239c
Tests for the new lexer
2019-11-12 22:09:04 -05:00
Henrique
55239a8a47
Forgot to remove the import for shlex
2019-11-12 22:08:42 -05:00
Henrique
561d6d91d1
Fixed test to use the new method to get the lexer
2019-11-12 22:08:10 -05:00
Henrique
a9596cabe3
Small fix to handle line breaks and tabs \r\n\t
2019-11-12 21:44:07 -05:00
Henrique
561415cea9
Created a lexer for the command bar
2019-11-12 21:27:02 -05:00
Henrique
b321e07279
Renamed the maybequote function to something better
2019-11-12 18:59:25 -05:00
Henrique
c7ffc22819
Fix for issues when using \ and " on the commander bar
2019-11-12 18:57:39 -05:00
Maximilian Hils
dac0bfe786
Merge pull request #3691 from mhils/sans-io-adjustments
...
Update mypy, sans-io adjustments
2019-11-12 05:04:05 +01:00
Maximilian Hils
bdc15cbe0c
update mypy
2019-11-12 04:38:13 +01:00
Thomas Kriechbaumer
e7c3975bfc
Merge pull request #3669 from jannst/add_howto_install_android_system_ca
...
Add howto insert mitmproxy CA cert into the android system certificate store
2019-11-11 19:13:15 +01:00
Maximilian Hils
f97996126f
minor improvements and sans-io adjustments
2019-11-11 18:35:06 +01:00
