Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Fix test_format_xml with dot in path | Felix Yan | 2017-03-16 | 1 | -1/+1 | |
| | |/ | |/| | | | | When the path contains dot ".", replacing all dots will generate a non-exist result and raises a FileNotFoundError. Replacing only the last dot fixes this. | |||||
* | | | Merge pull request #2172 from Kriechi/bump-h2 | Thomas Kriechbaumer | 2017-03-16 | 1 | -2/+2 | |
|\ \ \ | |/ / |/| | | bump h2 and hyperframe | |||||
| * | | bump h2 and hyperframe | Thomas Kriechbaumer | 2017-03-16 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #2167 from mhils/update-dependencies | Aldo Cortesi | 2017-03-16 | 4 | -2/+7 | |
|\ \ | | | | | | | update mypy | |||||
| * | | update mypy | Maximilian Hils | 2017-03-15 | 4 | -2/+7 | |
| | | | ||||||
* | | | Merge pull request #2166 from Kriechi/bump-sphinx | Aldo Cortesi | 2017-03-16 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | bump sphinx | |||||
| * | | | bump sphinx | Thomas Kriechbaumer | 2017-03-15 | 1 | -2/+2 | |
| |/ / | ||||||
* | | | Merge pull request #2152 from cortesi/readfile | Aldo Cortesi | 2017-03-16 | 35 | -212/+354 | |
|\ \ \ | |/ / |/| | | Extract flow reading into addons | |||||
| * | | Add a light-weight custom event system, use it for keepserving | Aldo Cortesi | 2017-03-16 | 22 | -75/+102 | |
| | | | | | | | | | | | | | | | | | | | | | This patch implements the lightweight event system I propose in #2144, adds a custom event "processing_complete" that is triggered after file read, client replay and server replay, and introduces a KeepServing addon to handle this for mitmdump. | |||||
| * | | Clean up addonmanager interface | Aldo Cortesi | 2017-03-16 | 8 | -43/+46 | |
| | | | | | | | | | | | | | | | Clarify the plethora of invocation methods we've sprouted, correct some usages in the codebase. | |||||
| * | | Extract flow reading into addons | Aldo Cortesi | 2017-03-15 | 13 | -123/+235 | |
| |/ | | | | | | | | | | | | | | | This patch moves the final pieces of master functionality into addons. - Add a ReadFile addon to read from file - Add a separate ReadStdin addon to read from stdin, only used by mitmdump - Remove all methods that know about io and serialization from master.Master | |||||
* | | update release instructions | Thomas Kriechbaumer | 2017-03-15 | 1 | -10/+19 | |
| | | ||||||
* | | update release instructions | Thomas Kriechbaumer | 2017-03-15 | 1 | -2/+4 | |
| | | ||||||
* | | Merge pull request #2161 from mhils/make-request | Thomas Kriechbaumer | 2017-03-15 | 5 | -24/+84 | |
|\ \ | | | | | | | Add Request.make | |||||
| * | | add Request.make | Maximilian Hils | 2017-03-15 | 5 | -24/+84 | |
|/ / | ||||||
* | | Merge pull request #2159 from Kriechi/bump-pyparsing | Thomas Kriechbaumer | 2017-03-15 | 1 | -1/+1 | |
|\ \ | | | | | | | bump pyparsing | |||||
| * | | bump pyparsing | Thomas Kriechbaumer | 2017-03-15 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #2155 from Kriechi/bump-cryptography | Thomas Kriechbaumer | 2017-03-15 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | bump cryptography | |||||
| * | | bump cryptography | Thomas Kriechbaumer | 2017-03-15 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge pull request #2098 from iharsh234/bug-2086-2 | Aldo Cortesi | 2017-03-15 | 1 | -0/+2 | |
|\ \ | | | | | | | Fix crash when duplicating flow | |||||
| * | | Fix crash when duplicating flow | harsh vijay | 2017-03-13 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fix crash when duplicating flow (#2) | harsh vijay | 2017-03-13 | 1 | -1/+3 | |
| | | | ||||||
* | | | Merge pull request #2147 from mhils/connection-ids | Aldo Cortesi | 2017-03-15 | 8 | -8/+93 | |
|\ \ \ | | | | | | | | | Add client/server connection ids | |||||
| * | | | stateobject: automatically change id when copying | Maximilian Hils | 2017-03-14 | 5 | -16/+21 | |
| | | | | ||||||
| * | | | add connection ids | Maximilian Hils | 2017-03-14 | 5 | -2/+82 | |
|/ / / | ||||||
* | | | Merge pull request #2151 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-14 | 1 | -1/+3 | |
|\ \ \ | | | | | | | | | Update .travis.yml to fix the failure about yarn | |||||
| * | | | Update .travis.yml to fix the failure about yarn | Matthew Shao | 2017-03-14 | 1 | -1/+3 | |
|/ / / | ||||||
* | | | Merge pull request #2149 from mhils/multidictview-copy | Maximilian Hils | 2017-03-14 | 2 | -12/+24 | |
|\ \ \ | | | | | | | | | Add MultiDictView.copy() | |||||
| * | | | multidictviews should not be serializable | Maximilian Hils | 2017-03-14 | 1 | -12/+12 | |
| | | | | ||||||
| * | | | add MultiDictView.copy | Maximilian Hils | 2017-03-14 | 2 | -0/+12 | |
| | | | | ||||||
* | | | | Merge pull request #2145 from mhils/ne | Maximilian Hils | 2017-03-14 | 6 | -23/+1 | |
|\ \ \ \ | | | | | | | | | | | py3: __ne__ delegates to __eq__ by default | |||||
| * | | | | py3: __ne__ delegates to __eq__ by default | Maximilian Hils | 2017-03-14 | 6 | -23/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #2150 from dequis/pretty-host-filter | Maximilian Hils | 2017-03-14 | 2 | -3/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | Match ~d and ~u filters against pretty_host too | |||||
| * | | | | | Match ~d and ~u filters against pretty_host too | dequis | 2017-03-14 | 2 | -3/+7 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Changed the ~u filter in the console UI to match the behavior of mitmweb, which only matches against pretty_url, never against url. | |||||
* | | | | | Merge pull request #2142 from mhils/2140 | Aldo Cortesi | 2017-03-14 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix #2140 | |||||
| * | | | | | fix #2140 | Maximilian Hils | 2017-03-13 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2120 from ujjwal96/replace-from-file | Maximilian Hils | 2017-03-14 | 7 | -69/+66 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Replace from file through replacement editor #1458 | |||||
| * | | | | | Merge remote-tracking branch 'origin/master' into pr-2120 | Maximilian Hils | 2017-03-12 | 33 | -689/+417 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Conflicts: test/mitmproxy/addons/test_replace.py | |||||
| * | | | | | replacements: error right away when file does not exist | Maximilian Hils | 2017-03-12 | 2 | -28/+34 | |
| | | | | | | ||||||
| * | | | | | minor fixes | Maximilian Hils | 2017-03-12 | 3 | -32/+30 | |
| | | | | | | ||||||
| * | | | | | Removed ReplaceBase | Ujjwal Verma | 2017-03-12 | 1 | -5/+2 | |
| | | | | | | ||||||
| * | | | | | minor fixes | Maximilian Hils | 2017-03-11 | 1 | -4/+3 | |
| | | | | | | ||||||
| * | | | | | Changed docs | Ujjwal Verma | 2017-03-11 | 1 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Fixed Replacement test | Ujjwal Verma | 2017-03-09 | 3 | -6/+6 | |
| | | | | | | ||||||
| * | | | | | Removed replace-from-file option.Made requested changes | Ujjwal Verma | 2017-03-09 | 5 | -22/+15 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2129 from cortesi/addonopts | Aldo Cortesi | 2017-03-14 | 35 | -204/+321 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Custom options for addons | |||||
| * | | | | | Move running() in to .tick() method to make sure it's called consistently | Aldo Cortesi | 2017-03-14 | 1 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Enable custom options in config files | Aldo Cortesi | 2017-03-14 | 4 | -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 Options | Aldo Cortesi | 2017-03-14 | 4 | -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 sets | Aldo Cortesi | 2017-03-14 | 3 | -1/+6 | |
| | | | | | |