Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Test suite: get_proxy_config -> get_options | Aldo Cortesi | 2016-07-19 | 3 | -41/+57 |
| | |||||
* | Simplify common initilization in cmdline.py | Aldo Cortesi | 2016-07-19 | 2 | -20/+15 |
| | |||||
* | Merge pull request #1379 from cortesi/proxyconfig | Aldo Cortesi | 2016-07-19 | 26 | -534/+626 |
|\ | | | | | Unify ProxyConfig and Options | ||||
| * | Remove proxy.config.process_proxy_options | Aldo Cortesi | 2016-07-19 | 3 | -7/+3 |
| | | |||||
| * | ProxyConf: adapt mitmproxy console, ditch tcp|host filter attrs on flow.master | Aldo Cortesi | 2016-07-19 | 4 | -59/+27 |
| | | |||||
| * | ProxyConf: auth_* into Options | Aldo Cortesi | 2016-07-19 | 7 | -61/+73 |
| | | |||||
| * | ProxyConfig: http2, rawtcp, no_upstream_cert -> Options | Aldo Cortesi | 2016-07-19 | 10 | -27/+23 |
| | | |||||
| * | ProxyConfig: ciphers_client and ciphers_server -> Options | Aldo Cortesi | 2016-07-19 | 4 | -22/+21 |
| | | |||||
| * | ProxyConfig: Refactor to move verification mode checks into configure | Aldo Cortesi | 2016-07-19 | 2 | -24/+33 |
| | | |||||
| * | ProxyConfig: tcp_hosts and ignore_hosts to Options | Aldo Cortesi | 2016-07-19 | 3 | -9/+14 |
| | | |||||
| * | Regularize naming of upstream_trusted_ca* options | Aldo Cortesi | 2016-07-19 | 4 | -13/+11 |
| | | |||||
| * | ProxyConfig: various SSL options to Options | Aldo Cortesi | 2016-07-19 | 6 | -28/+33 |
| | | |||||
| * | Fix ca directory creation | Aldo Cortesi | 2016-07-19 | 1 | -4/+4 |
| | | |||||
| * | config.parse_server_spec shouldn't pass byts to tcp.Address | Aldo Cortesi | 2016-07-19 | 3 | -7/+7 |
| | | |||||
| * | ProxyConfig: mode, upstream_server and upstream_auth to Options | Aldo Cortesi | 2016-07-19 | 15 | -139/+173 |
| | | |||||
| * | Handle command-line argument errors properly | Aldo Cortesi | 2016-07-19 | 2 | -29/+37 |
| | | | | | | | | At some point we stopped handling exceptions from get_common_options properly. | ||||
| * | ProxyConfig: --body-size-limit to Options | Aldo Cortesi | 2016-07-19 | 7 | -23/+37 |
| | | |||||
| * | ProxyConfig: --cert to options | Aldo Cortesi | 2016-07-19 | 3 | -17/+30 |
| | | | | | | | | Also incidentally improve handling of invalid certificate formats. | ||||
| * | Move clientcers & cadir to Options | Aldo Cortesi | 2016-07-19 | 5 | -25/+42 |
| | | | | | | | | | | Also adds a .configure mechanism to ProxyConfig, and hooks it up to the change event. | ||||
| * | ProxyConfig: cadir to options | Aldo Cortesi | 2016-07-19 | 6 | -21/+19 |
| | | |||||
| * | ProxyConfig refactor | Aldo Cortesi | 2016-07-19 | 10 | -74/+82 |
| | | | | | | | | | | 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. | ||||
| * | Unify proxy config and options | Aldo Cortesi | 2016-07-19 | 6 | -88/+100 |
|/ | | | | | This is step 1 in a gradual "boiling frog" strategy. Decorate ProxyConfig with an Options object. | ||||
* | web: remove SELECT_RELATIVE | Maximilian Hils | 2016-07-18 | 3 | -23/+15 |
| | |||||
* | Merge remote-tracking branch 'jason/ui' | Maximilian Hils | 2016-07-18 | 16 | -428/+568 |
|\ | |||||
| * | [web] update build | Jason | 2016-07-08 | 2 | -315/+315 |
| | | |||||
| * | [web] add tests for main view and ui | Jason | 2016-07-08 | 3 | -39/+172 |
| | | |||||
| * | [web] bug fixs | Jason | 2016-07-05 | 8 | -151/+88 |
| |\ | |||||
| | * | [web] set display large | Jason | 2016-07-05 | 5 | -76/+70 |
| | | | |||||
| | * | [web] listen to window.onKeyDown | Jason | 2016-07-05 | 5 | -75/+13 |
| | | | |||||
| * | | [web] bug fix | Jason | 2016-07-05 | 2 | -3/+3 |
| |/ | |||||
| * | [web] change ducks/ui | Jason | 2016-07-05 | 7 | -229/+278 |
| | | |||||
| * | [web] ui ducks for content view | Jason | 2016-07-01 | 5 | -341/+362 |
| | | |||||
* | | Merge pull request #1365 from Kriechi/fix-1333 | Maximilian Hils | 2016-07-18 | 1 | -1/+1 |
|\ \ | | | | | | | add Windows py3 builds | ||||
| * | | add Windows py3 builds | Thomas Kriechbaumer | 2016-07-16 | 1 | -1/+1 |
| | | | | | | | | | | | | fixes #1333 | ||||
* | | | Merge pull request #1378 from cortesi/cleanups | Aldo Cortesi | 2016-07-18 | 11 | -53/+56 |
|\ \ \ | | | | | | | | | Console-related cleanups | ||||
| * | | | Console options cleanup | Aldo Cortesi | 2016-07-18 | 6 | -39/+22 |
| | | | | | | | | | | | | | | | | Use setters, use togglers, move more things out of master | ||||
| * | | | file -> open throughout console | Aldo Cortesi | 2016-07-18 | 3 | -3/+3 |
| | | | | |||||
| * | | | Add a toggller helper to Options, start using it in mitmproxy console | Aldo Cortesi | 2016-07-18 | 7 | -11/+31 |
|/ / / | |||||
* | | | cleanup | Thomas Kriechbaumer | 2016-07-17 | 1 | -12/+12 |
| | | | |||||
* | | | http2: coverage++ | Thomas Kriechbaumer | 2016-07-17 | 2 | -96/+292 |
| | | | |||||
* | | | Merge pull request #1372 from cortesi/setheaders | Aldo Cortesi | 2016-07-17 | 11 | -133/+114 |
|\ \ \ | | | | | | | | | setheaders -> addon | ||||
| * | | | setheaders -> addon | Aldo Cortesi | 2016-07-17 | 11 | -133/+114 |
|/ / / | |||||
* | | | Merge pull request #1371 from cortesi/cleancode | Aldo Cortesi | 2016-07-17 | 2 | -55/+2 |
|\ \ \ | | | | | | | | | Remove old ReplaceHooks code | ||||
| * | | | Remove old ReplaceHooks code | Aldo Cortesi | 2016-07-17 | 2 | -55/+2 |
|/ / / | |||||
* | | | Merge pull request #1370 from cortesi/filestreamer | Aldo Cortesi | 2016-07-17 | 4 | -16/+25 |
|\ \ \ | | | | | | | | | Some work on stream-to-file | ||||
| * | | | Some work on stream-to-file | Aldo Cortesi | 2016-07-17 | 4 | -16/+25 |
| | | | | | | | | | | | | | | | | | | | | - stream -> filestreamer throughout - move active_flows set into FileStreamer addon | ||||
* | | | | Merge pull request #1367 from Kriechi/fix-1366 | Aldo Cortesi | 2016-07-17 | 2 | -7/+24 |
|\ \ \ \ | | | | | | | | | | | fix-1366 | ||||
| * | | | | fix-1366 | Thomas Kriechbaumer | 2016-07-16 | 2 | -7/+24 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1369 from cortesi/dumper | Aldo Cortesi | 2016-07-17 | 6 | -301/+360 |
|\ \ \ \ | |_|/ / |/| | | | Extract console dump functionality into an addon | ||||
| * | | | Merge branch 'master' into dumper | Aldo Cortesi | 2016-07-17 | 6 | -33/+343 |
| |\ \ \ | |/ / / |/| | | |