aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enable custom options in config filesAldo Cortesi2017-03-144-23/+45
| | | | | We also now ignore unknown options in config files by default, and print a warning if verbosity is incremented.
* Move serialization methods out of OptionsAldo Cortesi2017-03-144-94/+100
| | | | | | Attributes on options share a namespace with options themselves. It's getting too crowded on our Options object, so let's shift some obvious stuff into the module.
* Optmanager: handle unknown options in value setsAldo Cortesi2017-03-143-1/+6
|
* Show custom addon options in --options outputAldo Cortesi2017-03-144-8/+9
|
* Enable custom options for addonsAldo Cortesi2017-03-1432-87/+170
| | | | | | | | - Add an options parameter to the start() event. This is to be used by addons on startup to add custom options. - Add a running() event that is called once the proxy is up and running. - With the new paradigm we can't log during master __init__, so add a tiny termstatus addon to print proxy status to terminal once we're running.
* Merge pull request #2141 from mhils/decouple-file-format-versionMaximilian Hils2017-03-133-9/+34
|\ | | | | Decouple mitmproxy and file format version
| * decouple mitmproxy and file format versionMaximilian Hils2017-03-133-9/+34
| |
* | Merge pull request #2137 from MatthewShao/jest-devMaximilian Hils2017-03-131-0/+86
|\ \ | |/ |/| [web] Add tests for ducks/utils/store.js
| * [web] Improve the code style on testsMatthew Shao2017-03-131-36/+45
| |
| * [web] Add tests for ducks/utils/store.jsMatthew Shao2017-03-131-0/+77
| |
* | Merge pull request #2138 from MatthewShao/fix#2133Maximilian Hils2017-03-131-4/+4
|\ \ | |/ |/| [web] Fixes the flaw in #2133
| * [web] Fixes the flaw in #2133Matthew Shao2017-03-131-4/+4
|/
* Merge pull request #2136 from Kriechi/nuke-custom-tmpdirThomas Kriechbaumer2017-03-1213-346/+274
|\ | | | | nuke tutils.tmpdir, use pytest tmpdir
| * nuke tutils.tmpdir, use pytest tmpdirThomas Kriechbaumer2017-03-1213-346/+274
|/
* Merge pull request #2133 from MatthewShao/jest-devMaximilian Hils2017-03-114-11/+11
|\ | | | | [web] Fixes all existed tests
| * [web] remove node tests on travisMatthew Shao2017-03-111-3/+0
| |
| * [web] Fixes all existed testsMatthew Shao2017-03-112-5/+7
| |
| * [web] Fixes stopEdit action in ducks/ui/flow.jsMatthew Shao2017-03-111-3/+4
|/
* Merge pull request #2118 from lymanZerga11/patch-3Maximilian Hils2017-03-112-3/+5
|\ | | | | Update proxyauth.py to add proxyauth metadata
| * fix type hintsMaximilian Hils2017-03-101-2/+2
| |
| * add testslymanZerga112017-03-091-1/+1
| |
| * Add testslymanZerga112017-03-091-0/+1
| |
| * add type hintsMaximilian Hils2017-03-081-2/+2
| |
| * Update proxyauth.pylymanZerga112017-03-081-1/+1
| |
| * Update proxyauth.pylymanZerga112017-03-081-2/+3
| |
* | Merge pull request #2114 from mitmproxy/fix-websocket-serializationThomas Kriechbaumer2017-03-107-32/+71
|\ \ | | | | | | make websocket flows serializable
| * | use flow.id to link websocket + handshake flowsThomas Kriechbaumer2017-03-101-1/+2
| | |
| * | make websocket flows serializableThomas Kriechbaumer2017-03-097-31/+69
| | | | | | | | | | | | fixes #2113
* | | Merge pull request #2128 from Kriechi/disable-more-h2cThomas Kriechbaumer2017-03-105-40/+82
|\ \ \ | | | | | | | | disable h2c prior knowledge connections
| * | | disable h2c prior knowledge connectionsThomas Kriechbaumer2017-03-105-40/+82
| |/ /
* | | Merge pull request #2131 from MatthewShao/jest-devMaximilian Hils2017-03-103-287/+0
|\ \ \ | |/ / |/| | [web] remove the tests for abandoned files.
| * | [web] remove the tests for abandoned files.Matthew Shao2017-03-103-287/+0
|/ /
* | Merge pull request #2100 from cortesi/optionsAldo Cortesi2017-03-0952-1459/+1334
|\ \ | | | | | | Options revamp
| * | Send change event when options are resetAldo Cortesi2017-03-091-0/+1
| | |
| * | Merge remote-tracking branch 'upstream/master' into optionsAldo Cortesi2017-03-094-3/+29
| |\ \ | |/ / |/| |
* | | Merge pull request #2124 from mitmproxy/opensuse-docsMaximilian Hils2017-03-081-0/+14
|\ \ \ | | | | | | | | Add install docs for openSUSE
| * | | add install docs for openSUSEMaximilian Hils2017-03-081-0/+14
| | | |
* | | | Merge pull request #2121 from mitmproxy/address-leftoversMaximilian Hils2017-03-081-1/+1
|\ \ \ \ | | | | | | | | | | fix tcp.Address leftovers
| * | | | fix tcp.Address leftoversMaximilian Hils2017-03-081-1/+1
| | |_|/ | |/| | | | | | this fixes the issue described in https://github.com/mitmproxy/mitmproxy/issues/2119#issuecomment-285067292
* | | | Merge pull request #2090 from mitmproxy/fix-pathod-header-docThomas Kriechbaumer2017-03-081-2/+2
|\ \ \ \ | |_|/ / |/| | | pathoc: fix documentation for headers
| * | | pathoc: fix documentation for headersMaximilian Hils2017-03-021-2/+2
| | | |
* | | | Merge pull request #2117 from MatthewShao/jest-devMaximilian Hils2017-03-081-0/+12
|\ \ \ \ | |_|/ / |/| | | Add Javascript tests to Travis CI. (#2093)
| * | | Update .travis.ymlMatthew Shao2017-03-081-9/+6
| | | |
| * | | Add javascript tests to Travis CI. (#2093)Matthew Shao2017-03-081-0/+15
|/ / /
| | * typing.Type -> typeMaximilian Hils2017-03-081-2/+2
| | | | | | | | | | | | | | | `typing.Type` should have been `typing.Type[Any]`, which in turn is equivalent to `type`
| | * core -> core_option_validationMaximilian Hils2017-03-083-7/+7
| | | | | | | | | | | | longer, but much clearer for devs who are unfamiliar with the codebase.
| | * change add_option parameter orderMaximilian Hils2017-03-084-110/+111
| | | | | | | | | | | | | | | name, type, value matches natural language ($x is a bool with a default value of $y) and also matches the python type annotation order of name: type = value
| | * unify server spec parsingMaximilian Hils2017-03-087-54/+118
| | |
| | * Merge remote-tracking branch 'upstream/master' into optionsAldo Cortesi2017-03-0818-102/+142
| | |\ | |_|/ |/| |
* | | Merge pull request #2108 from ayamamori/patch-1Maximilian Hils2017-03-079-11/+11
|\ \ \ | | | | | | | | Update tcpproxy.rst
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 23:22:26 +0000