Clemens
f578bf5122
file upload updates contentview, editable contentloader, diffs on upload
2016-07-22 19:07:53 +02:00
Clemens
70ca10b423
moved editor to raw_view mode, add content_file_upload
2016-07-21 19:13:16 +02:00
Clemens
61f192434f
moved editor to raw_view mode
2016-07-21 11:50:02 +02:00
Maximilian Hils
6ffeaaebed
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-07-21 01:16:35 -07:00
Maximilian Hils
8a3a21bba1
web: fix ValueEditor, clean up code
2016-07-21 01:14:55 -07:00
Maximilian Hils
427fffbcb8
web: fix flow content update
2016-07-21 00:43:31 -07:00
Aldo Cortesi
c090e02848
Merge pull request #1385 from mitmproxy/console
...
console: nopop, rheaders into Options
2016-07-21 17:06:38 +12:00
Aldo Cortesi
e15cf968c2
console: nopop, rheaders into Options
2016-07-21 15:51:12 +12:00
Aldo Cortesi
33ffbc28ed
console: share one ActionBar instance
...
This fixes an issues where popping a view off the stack caused stale ActionBar
contents to be displayed.
2016-07-21 15:41:43 +12:00
Aldo Cortesi
6750ab899a
Merge branch 'flow-export' of https://github.com/dufferzafar/mitmproxy into dufferzafar-flow-export
2016-07-21 13:53:41 +12:00
Aldo Cortesi
02acfb1242
Fix netlib.utils.is_valid_host
...
- Don't crash when passed an empty string. This translated into an actual core
crash, discovered while fuzzing with afl.
- Taking a slice of length one out of bytes returns an integer, so the check
for trailing period in this function never worked on Python3.
- Add unit tests.
2016-07-21 10:38:37 +12:00
Maximilian Hils
8b2a5cad2d
Merge remote-tracking branch 'origin/flow_editing'
2016-07-20 14:35:20 -07:00
Shadab Zafar
2b58e153b9
Fix hotkey kerfuffle
...
`z` (instead of `C`) to "clear flow list or eventlog"
`C` to "export flow to clipboard"
`E` to "export flow to file"
2016-07-20 14:44:20 +05:30
Shadab Zafar
a933b82064
Make necessary changes in flowview
2016-07-20 14:41:21 +05:30
Shadab Zafar
3321e7bef3
Refactor exporters
2016-07-20 10:03:00 +05:30
Shadab Zafar
c84d0bd10b
Add a url exporter
2016-07-20 10:03:00 +05:30
Shadab Zafar
0d478e71ee
Ask for scope when called from flowlist
2016-07-20 10:03:00 +05:30
Shadab Zafar
e3670f9d9b
Integrate ask_copy_part into exporters
...
This introduces some duplication but that'll be refactored later.
2016-07-20 10:03:00 +05:30
Shadab Zafar
8f4d49e22a
Remove raw_request exporter
...
This functionality will be handled by headers+content
2016-07-20 10:03:00 +05:30
Shadab Zafar
3ae28f1c31
s/part/key
2016-07-20 10:03:00 +05:30
Shadab Zafar
e56df1b706
Don't send master and state parameters
2016-07-20 10:03:00 +05:30
Shadab Zafar
5377d5a61d
Refactor
2016-07-20 10:03:00 +05:30
Shadab Zafar
4f04dd618c
Common function for both file and clipboard
2016-07-20 10:03:00 +05:30
Shadab Zafar
5cf2228250
Export to file (p) or clipboard (P)
2016-07-20 10:03:00 +05:30
Shadab Zafar
6119f0f16a
Exporters list
2016-07-20 10:03:00 +05:30
Maximilian Hils
b27db1fc81
minor fixes
2016-07-19 18:09:33 -07:00
Aldo Cortesi
1ff800598a
Merge pull request #1383 from cortesi/options
...
mitmproxy.flow.options -> mitmproxy.options
2016-07-20 11:46:24 +12:00
Aldo Cortesi
8317772377
mitproxy.options -> mitmproxy.optmanager, mitmproxy.flow.options -> mitmproxy.options
...
It might be slightly more felicitous to move optmanager into netlib at some
point, especially if we can also use it in pathod.
This also consolidates our constants in mitmproxy.options, removing some duplicates.
2016-07-20 11:28:53 +12:00
Aldo Cortesi
aa3b866e1d
Merge pull request #1382 from cortesi/cleanup
...
[wip] ProxyConf-related refactoring
2016-07-20 09:28:18 +12:00
Clemens
281f20ef1e
added flow_content update
2016-07-19 16:13:26 +02:00
Aldo Cortesi
6000136b01
Merge branch 'master' into cleanup
2016-07-19 23:35:42 +12:00
Clemens
698fb11132
Merge remote-tracking branch 'origin/master' into flow_editing
2016-07-19 12:32:36 +02:00
Maximilian Hils
18dd84b908
web: fix flow selection
2016-07-19 03:23:40 -07:00
Clemens
48728af43a
moved flow editor state to redux
2016-07-19 12:23:20 +02:00
Maximilian Hils
518c28fff9
update web assets
2016-07-19 03:14:35 -07:00
Maximilian Hils
f356a84430
simplify web ui ducks
2016-07-19 03:13:39 -07:00
Maximilian Hils
4ea6e61ea8
fix web master options leftovers
2016-07-19 03:11:17 -07:00
Thomas Kriechbaumer
329909c514
update README about Python support
2016-07-19 10:43:57 +02:00
Aldo Cortesi
09fbebf42a
Test suite: get_proxy_config -> get_options
2016-07-19 19:36:40 +12:00
Aldo Cortesi
29eecd5d66
Simplify common initilization in cmdline.py
2016-07-19 17:15:10 +12:00
Aldo Cortesi
ecd01ce7c6
Merge pull request #1379 from cortesi/proxyconfig
...
Unify ProxyConfig and Options
2016-07-19 16:59:23 +12:00
Aldo Cortesi
9c9d28d068
Remove proxy.config.process_proxy_options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
ef380917a8
ProxyConf: adapt mitmproxy console, ditch tcp|host filter attrs on flow.master
2016-07-19 16:25:09 +12:00
Aldo Cortesi
be081a24bc
ProxyConf: auth_* into Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
5cfe783b6c
ProxyConfig: http2, rawtcp, no_upstream_cert -> Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
fb6e9c44c8
ProxyConfig: ciphers_client and ciphers_server -> Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
26fa88a338
ProxyConfig: Refactor to move verification mode checks into configure
2016-07-19 16:25:09 +12:00
Aldo Cortesi
77bf092bcd
ProxyConfig: tcp_hosts and ignore_hosts to Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
98bf544664
Regularize naming of upstream_trusted_ca* options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
0a3839375d
ProxyConfig: various SSL options to Options
2016-07-19 16:25:09 +12:00
