aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix ca directory creationAldo Cortesi2016-07-191-4/+4
|
* config.parse_server_spec shouldn't pass byts to tcp.AddressAldo Cortesi2016-07-193-7/+7
|
* ProxyConfig: mode, upstream_server and upstream_auth to OptionsAldo Cortesi2016-07-1915-139/+173
|
* Handle command-line argument errors properlyAldo Cortesi2016-07-192-29/+37
| | | | At some point we stopped handling exceptions from get_common_options properly.
* ProxyConfig: --body-size-limit to OptionsAldo Cortesi2016-07-197-23/+37
|
* ProxyConfig: --cert to optionsAldo Cortesi2016-07-193-17/+30
| | | | Also incidentally improve handling of invalid certificate formats.
* Move clientcers & cadir to OptionsAldo Cortesi2016-07-195-25/+42
| | | | | Also adds a .configure mechanism to ProxyConfig, and hooks it up to the change event.
* ProxyConfig: cadir to optionsAldo Cortesi2016-07-196-21/+19
|
* ProxyConfig refactorAldo Cortesi2016-07-1910-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 optionsAldo Cortesi2016-07-196-88/+100
| | | | | This is step 1 in a gradual "boiling frog" strategy. Decorate ProxyConfig with an Options object.
* web: remove SELECT_RELATIVEMaximilian Hils2016-07-183-23/+15
|
* Merge remote-tracking branch 'jason/ui'Maximilian Hils2016-07-1816-428/+568
|\
| * [web] update buildJason2016-07-082-315/+315
| |
| * [web] add tests for main view and uiJason2016-07-083-39/+172
| |
| * [web] bug fixsJason2016-07-058-151/+88
| |\
| | * [web] set display largeJason2016-07-055-76/+70
| | |
| | * [web] listen to window.onKeyDownJason2016-07-055-75/+13
| | |
| * | [web] bug fixJason2016-07-052-3/+3
| |/
| * [web] change ducks/uiJason2016-07-057-229/+278
| |
| * [web] ui ducks for content viewJason2016-07-015-341/+362
| |
* | Merge pull request #1365 from Kriechi/fix-1333Maximilian Hils2016-07-181-1/+1
|\ \ | | | | | | add Windows py3 builds
| * | add Windows py3 buildsThomas Kriechbaumer2016-07-161-1/+1
| | | | | | | | | | | | fixes #1333
* | | Merge pull request #1378 from cortesi/cleanupsAldo Cortesi2016-07-1811-53/+56
|\ \ \ | | | | | | | | Console-related cleanups
| * | | Console options cleanupAldo Cortesi2016-07-186-39/+22
| | | | | | | | | | | | | | | | Use setters, use togglers, move more things out of master
| * | | file -> open throughout consoleAldo Cortesi2016-07-183-3/+3
| | | |
| * | | Add a toggller helper to Options, start using it in mitmproxy consoleAldo Cortesi2016-07-187-11/+31
|/ / /
* | | cleanupThomas Kriechbaumer2016-07-171-12/+12
| | |
* | | http2: coverage++Thomas Kriechbaumer2016-07-172-96/+292
| | |
* | | Merge pull request #1372 from cortesi/setheadersAldo Cortesi2016-07-1711-133/+114
|\ \ \ | | | | | | | | setheaders -> addon
| * | | setheaders -> addonAldo Cortesi2016-07-1711-133/+114
|/ / /
* | | Merge pull request #1371 from cortesi/cleancodeAldo Cortesi2016-07-172-55/+2
|\ \ \ | | | | | | | | Remove old ReplaceHooks code
| * | | Remove old ReplaceHooks codeAldo Cortesi2016-07-172-55/+2
|/ / /
* | | Merge pull request #1370 from cortesi/filestreamerAldo Cortesi2016-07-174-16/+25
|\ \ \ | | | | | | | | Some work on stream-to-file
| * | | Some work on stream-to-fileAldo Cortesi2016-07-174-16/+25
| | | | | | | | | | | | | | | | | | | | - stream -> filestreamer throughout - move active_flows set into FileStreamer addon
* | | | Merge pull request #1367 from Kriechi/fix-1366Aldo Cortesi2016-07-172-7/+24
|\ \ \ \ | | | | | | | | | | fix-1366
| * | | | fix-1366Thomas Kriechbaumer2016-07-162-7/+24
| | |/ / | |/| |
* | | | Merge pull request #1369 from cortesi/dumperAldo Cortesi2016-07-176-301/+360
|\ \ \ \ | |_|/ / |/| | | Extract console dump functionality into an addon
| * | | Merge branch 'master' into dumperAldo Cortesi2016-07-176-33/+343
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1368 from DrakeCaraker/patch-1Aldo Cortesi2016-07-171-1/+1
|\ \ \ \ | |_|/ / |/| | | Update gamecenter.rst
| * | | Update gamecenter.rstDrake Caraker2016-07-161-1/+1
|/ / / | | | | | | Typo fix: changed plist score value from '0' to '55', aligning with the subsequent explanatory text.
* | | @mhils can't mergeMaximilian Hils2016-07-161-1/+1
| | |
* | | Merge remote-tracking branch 'duffer/tcpflow-filter'Maximilian Hils2016-07-165-32/+342
|\ \ \
| * | | Allow DummyFlow to match ~e, ~src and ~dstShadab Zafar2016-07-163-18/+37
| | | |
| * | | Sort filt items alphabeticallyShadab Zafar2016-07-161-14/+14
| | | |
| * | | Add DummyFlow and its TestsShadab Zafar2016-07-161-1/+59
| | | |
| * | | Add tests for TCPFlow.matchShadab Zafar2016-07-161-1/+15
| | | |
| * | | Add ~http and ~tcp filtersShadab Zafar2016-07-162-1/+31
| | | |
| * | | Use ~bq / ~bs for messages sent from client / serverShadab Zafar2016-07-162-19/+31
| | | |
| * | | Replace http decorator with one that handles different flowtypesShadab Zafar2016-07-161-20/+29
| | | |
| * | | Add TCPFlow.matchShadab Zafar2016-07-161-0/+21
| | | |