aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #2169 from cortesi/mypyAldo Cortesi2017-03-1719-106/+116
|\ | | | | mypy without skipping imports
| * Make mypy succeed with imports on master.pyAldo Cortesi2017-03-1718-105/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We get little benefit from our mypy QA checks at the moment, because we skip imports. This patch is what's needed to make mypy succeed with imports on a single file: master.py It also updates mypy to the current version, and enables a QA check. Mypy bugs I encountered: dict.update with kwargs not supported: https://github.com/python/mypy/issues/1031 property setters and getters must be adjacent: https://github.com/python/mypy/issues/1465
| * Rip out master handler mechanismAldo Cortesi2017-03-171-1/+0
|/ | | | | All events are now handled by addons, and we no longer support any events on master.
* Merge pull request #2156 from syahn/pretty-popupMaximilian Hils2017-03-161-0/+8
|\ | | | | [web] Adjust pop-up docs position
| * Adjust pop-up docs positionFrank Ahn2017-03-151-0/+8
| | | | | | | | - Shift pop-up docs to the right position according to responsiveness
* | Merge pull request #2168 from cortesi/handlersMaximilian Hils2017-03-1627-444/+251
|\ \ | | | | | | Rip out old handlers mechanism - all events are now handled in addons
| * | Rip out master handler mechanismAldo Cortesi2017-03-1617-246/+116
| | | | | | | | | | | | | | | All events are now handled by addons, and we no longer support any events on master.
| * | Remove last handlers in test suiteAldo Cortesi2017-03-161-35/+21
| | | | | | | | | | | | | | | | | | While we're here, make checking that there are NO logs on the proxy more efficient by setting a short timeout. This reduces total test suite running time by 15% on my system.
| * | Remove test handlers by using taddons.RecordingMasterAldo Cortesi2017-03-1613-120/+65
| | | | | | | | | | | | | | | This also means expanding and tweaking the recording master API, which we reflect through the current test suite
| * | Move mitmproxy console handlers to addonAldo Cortesi2017-03-161-32/+30
| | |
| * | Move dump handlers to addonAldo Cortesi2017-03-163-13/+21
| | |
* | | Merge pull request #2153 from MatthewShao/jest-devMaximilian Hils2017-03-161-1/+34
|\ \ \ | | | | | | | | [web] Reach 100% coverage for ducks/ui/flow.js
| * | | [web] Reach 100% coverage for ducks/ui/flow.jsMatthew Shao2017-03-151-1/+34
| | |/ | |/|
* | | Merge pull request #2170 from felixonmars/patch-1Maximilian Hils2017-03-161-1/+1
|\ \ \ | | | | | | | | Fix test_format_xml with dot in path
| * | | Fix test_format_xml with dot in pathFelix Yan2017-03-161-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-h2Thomas Kriechbaumer2017-03-161-2/+2
|\ \ \ | |/ / |/| | bump h2 and hyperframe
| * | bump h2 and hyperframeThomas Kriechbaumer2017-03-161-2/+2
|/ /
* | Merge pull request #2167 from mhils/update-dependenciesAldo Cortesi2017-03-164-2/+7
|\ \ | | | | | | update mypy
| * | update mypyMaximilian Hils2017-03-154-2/+7
| | |
* | | Merge pull request #2166 from Kriechi/bump-sphinxAldo Cortesi2017-03-161-2/+2
|\ \ \ | | | | | | | | bump sphinx
| * | | bump sphinxThomas Kriechbaumer2017-03-151-2/+2
| |/ /
* | | Merge pull request #2152 from cortesi/readfileAldo Cortesi2017-03-1635-212/+354
|\ \ \ | |/ / |/| | Extract flow reading into addons
| * | Add a light-weight custom event system, use it for keepservingAldo Cortesi2017-03-1622-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 interfaceAldo Cortesi2017-03-168-43/+46
| | | | | | | | | | | | | | | Clarify the plethora of invocation methods we've sprouted, correct some usages in the codebase.
| * | Extract flow reading into addonsAldo Cortesi2017-03-1513-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 instructionsThomas Kriechbaumer2017-03-151-10/+19
| |
* | update release instructionsThomas Kriechbaumer2017-03-151-2/+4
| |
* | Merge pull request #2161 from mhils/make-requestThomas Kriechbaumer2017-03-155-24/+84
|\ \ | | | | | | Add Request.make
| * | add Request.makeMaximilian Hils2017-03-155-24/+84
|/ /
* | Merge pull request #2159 from Kriechi/bump-pyparsingThomas Kriechbaumer2017-03-151-1/+1
|\ \ | | | | | | bump pyparsing
| * | bump pyparsingThomas Kriechbaumer2017-03-151-1/+1
| | |
* | | Merge pull request #2155 from Kriechi/bump-cryptographyThomas Kriechbaumer2017-03-151-1/+1
|\ \ \ | |_|/ |/| | bump cryptography
| * | bump cryptographyThomas Kriechbaumer2017-03-151-1/+1
| |/
* | Merge pull request #2098 from iharsh234/bug-2086-2Aldo Cortesi2017-03-151-0/+2
|\ \ | | | | | | Fix crash when duplicating flow
| * | Fix crash when duplicating flowharsh vijay2017-03-131-2/+2
| | |
| * | Fix crash when duplicating flow (#2)harsh vijay2017-03-131-1/+3
| | |
* | | Merge pull request #2147 from mhils/connection-idsAldo Cortesi2017-03-158-8/+93
|\ \ \ | | | | | | | | Add client/server connection ids
| * | | stateobject: automatically change id when copyingMaximilian Hils2017-03-145-16/+21
| | | |
| * | | add connection idsMaximilian Hils2017-03-145-2/+82
|/ / /
* | | Merge pull request #2151 from MatthewShao/jest-devMaximilian Hils2017-03-141-1/+3
|\ \ \ | | | | | | | | Update .travis.yml to fix the failure about yarn
| * | | Update .travis.yml to fix the failure about yarnMatthew Shao2017-03-141-1/+3
|/ / /
* | | Merge pull request #2149 from mhils/multidictview-copyMaximilian Hils2017-03-142-12/+24
|\ \ \ | | | | | | | | Add MultiDictView.copy()
| * | | multidictviews should not be serializableMaximilian Hils2017-03-141-12/+12
| | | |
| * | | add MultiDictView.copyMaximilian Hils2017-03-142-0/+12
| | | |
* | | | Merge pull request #2145 from mhils/neMaximilian Hils2017-03-146-23/+1
|\ \ \ \ | | | | | | | | | | py3: __ne__ delegates to __eq__ by default
| * | | | py3: __ne__ delegates to __eq__ by defaultMaximilian Hils2017-03-146-23/+1
| | | | |
* | | | | Merge pull request #2150 from dequis/pretty-host-filterMaximilian Hils2017-03-142-3/+7
|\ \ \ \ \ | | | | | | | | | | | | Match ~d and ~u filters against pretty_host too
| * | | | | Match ~d and ~u filters against pretty_host toodequis2017-03-142-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/2140Aldo Cortesi2017-03-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix #2140
| * | | | | fix #2140Maximilian Hils2017-03-131-1/+1
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-07 06:21:27 +0000