Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,178 Commits 9 Branches 108 Tags 92 MiB
Commit Graph

5178 Commits

Author SHA1 Message Date
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
Aldo Cortesi f81c53f9bb Fix ca directory creation 2016-07-19 16:25:09 +12:00
Aldo Cortesi 78e8159007 config.parse_server_spec shouldn't pass byts to tcp.Address 2016-07-19 16:25:09 +12:00
Aldo Cortesi f9622074cc ProxyConfig: mode, upstream_server and upstream_auth to Options 2016-07-19 16:25:09 +12:00
Aldo Cortesi bd733e1232 Handle command-line argument errors properly 
At some point we stopped handling exceptions from get_common_options properly.
 2016-07-19 16:25:09 +12:00
Aldo Cortesi d2268ddb1e ProxyConfig: --body-size-limit to Options 2016-07-19 16:25:09 +12:00
Aldo Cortesi f24f8ce971 ProxyConfig: --cert to options 
Also incidentally improve handling of invalid certificate formats.
 2016-07-19 16:25:09 +12:00
Aldo Cortesi 856e1c2ba9 Move clientcers & cadir to Options 
Also adds a .configure mechanism to ProxyConfig, and hooks it up to the change
event.
 2016-07-19 16:25:09 +12:00
Aldo Cortesi b1b1a1b9cf ProxyConfig: cadir to options 2016-07-19 16:25:09 +12:00
Aldo Cortesi 6908dc4d90 ProxyConfig refactor 
Step two of frog boiling: move listening address and port into options. This is
the hard bit, because it touches the test suite so deeply.
 2016-07-19 16:25:09 +12:00
Aldo Cortesi 9bc1514aef Unify proxy config and options 
This is step 1 in a gradual "boiling frog" strategy. Decorate ProxyConfig
with an Options object.
 2016-07-19 16:25:09 +12:00
Maximilian Hils 5034a6232c web: remove SELECT_RELATIVE 2016-07-18 21:23:50 -07:00
Maximilian Hils 859bb8c99f Merge remote-tracking branch 'jason/ui' 2016-07-18 20:59:17 -07:00
Maximilian Hils 00b0d47db6 Merge pull request #1365 from Kriechi/fix-1333 
add Windows py3 builds
 2016-07-18 20:48:46 -07:00
Aldo Cortesi 9869cb617e Merge pull request #1378 from cortesi/cleanups 
Console-related cleanups
 2016-07-18 11:29:18 +12:00
Aldo Cortesi e9865800a8 Console options cleanup 
Use setters, use togglers, move more things out of master
 2016-07-18 10:31:34 +12:00
Aldo Cortesi ff80c7b618 file -> open throughout console 2016-07-18 10:08:05 +12:00
Aldo Cortesi f9e4249499 Add a toggller helper to Options, start using it in mitmproxy console 2016-07-18 10:03:10 +12:00
Thomas Kriechbaumer 7b57c2948e cleanup 2016-07-17 18:17:35 +02:00