Maximilian Hils
70e3871fdb
pin pyopenssl to fix builds, refs #3692
2019-11-18 17:11:15 +01:00
Maximilian Hils
ac22aee2f5
cleanup mypy usage
2019-11-16 15:14:30 +01:00
Maximilian Hils
d17b9d6230
make mypy happy
2019-11-16 13:54:44 +01:00
Maximilian Hils
a799fddee1
Merge pull request #3702 from mckeimic/master
...
Adding export raw http response
2019-11-16 13:20:28 +01:00
Maximilian Hils
ee92477c1b
fix lint
2019-11-16 13:20:17 +01:00
Maximilian Hils
bccee15dcb
minor type fixes
2019-11-16 12:09:38 +01:00
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
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
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
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
Thomas Kriechbaumer
d9572ef4a7
Merge pull request #3686 from mitmproxy/github-issue-templates
...
Update issue templates
2019-11-07 20:20:38 +01:00
Maximilian Hils
8e64ac0575
Merge pull request #3679 from tomlabaude/pf_ipv6
...
Added support for IPv6 in pf.py for macOS
2019-11-07 18:32:26 +01:00
Maximilian Hils
6cbadf0808
Merge pull request #3688 from mitmproxy/sans-io-adjustments
...
make duration formatting more forgiving
2019-11-07 18:30:58 +01:00
Maximilian Hils
80963966b2
make duration formatting more forgiving
2019-11-07 18:19:50 +01:00
Tom
ff628e783e
pfctl state output always have 2 lines for each socket. Adding outgoing lines in data which matches lines before incoming ones. Also adding IPv6 data and tests
2019-11-05 20:27:00 +01:00
Tom
93c103a2a2
Fixed lint
2019-11-05 20:27:00 +01:00
Tom
d35c00ee65
Added support for IPv6 in pf.py for macOS
2019-11-05 20:27:00 +01:00
Maximilian Hils
3af4647804
squash remaining forum reference
2019-11-04 16:05:43 +01:00
Maximilian Hils
0a197af6a2
update badges
2019-11-04 16:03:04 +01:00
Maximilian Hils
3fc648a6d2
Update issue_template.md
2019-11-04 15:45:18 +01:00
Maximilian Hils
9c9cfdd7ec
Update issue templates
2019-11-04 15:43:39 +01:00
