aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* introduce @command.argumentMaximilian Hils2017-12-144-44/+40
| | | | | | This makes it possible to specify more specific type annotations at runtime, so that both mypy and our command system are happy. The .argument(name, type=) syntax is similar to click's, so it should be fairly extensible if we need it.
* Merge pull request #2669 from cortesi/pathAldo Cortesi2017-12-148-17/+31
|\ | | | | commands: add a Path argument type
| * commands: add a Path argument typeAldo Cortesi2017-12-138-17/+31
| | | | | | | | | | | | | | This is just an alias for str, and in this patch is used mostly to give an appropriate type in help strings. More to come. Fixes #2198
* | Merge pull request #2670 from Kriechi/fix-2664Maximilian Hils2017-12-131-1/+8
|\ \ | | | | | | fix #2664
| * | fix #2664Thomas Kriechbaumer2017-12-131-1/+8
| | |
* | | Merge pull request #2668 from cortesi/commandoptsAldo Cortesi2017-12-138-38/+109
|\ \ \ | | |/ | |/| Command improvements
| * | commands: formalise a Choice typeAldo Cortesi2017-12-137-25/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves as a string during MyPy checks, but at runtime has an additional attribute that is a command that returns valid options. This is very ugly and clumsy, basically because MyPy is super restrictive about what it accepts as a type. Almost any attempt to construct these types in a more sophisticated way fails in one way or another. I'm open to suggestions.
| * | console: refactor console.flowview.modeAldo Cortesi2017-12-122-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have: console.flowview.mode gets the current mode console.flowview.mode.options gets the possible options for the mode console.flowview.mode.set sets the flowview mode This is quite a common pattern in our commands, to the point where we should formalise it. Fixes #2655
| * | minor: clarify docs for command.edit.focus*Aldo Cortesi2017-12-121-1/+4
| | | | | | | | | | | | Fixes #2653
* | | Merge pull request #2643 from Ga-ryo/masterMaximilian Hils2017-12-122-0/+5
|\ \ \ | |_|/ |/| | Fix #2594
| * | minor improvements, add tests for ipv4-mapped addressesMaximilian Hils2017-12-123-4/+5
| | |
| * | Fix #2594@Ga_ryo_2017-12-121-0/+4
| | |
* | | fix #2529Maximilian Hils2017-12-122-2/+13
| | |
* | | fix #2651Maximilian Hils2017-12-121-2/+2
| | |
* | | Merge pull request #2662 from mhils/pathod-connect-hostAldo Cortesi2017-12-121-0/+1
|\ \ \ | | | | | | | | Add host header to pathoc's CONNECT requests
| * | | add host header to pathoc's CONNECT requestsMaximilian Hils2017-12-111-0/+1
| | | | | | | | | | | | | | | | This is required by the new HTTP RFCs.
* | | | Merge pull request #2661 from mhils/browser-winAldo Cortesi2017-12-122-10/+33
|\ \ \ \ | |_|_|/ |/| | | Fix browser addon on Windows
| * | | Merge branch 'master' into browser-winAldo Cortesi2017-12-123-2/+18
| |\ \ \ | |/ / / |/| | |
* | | | [requires.io] dependency update on master branch (#2637)Thomas Kriechbaumer2017-12-111-2/+2
| |/ / |/| |
* | | commands: verify command function signatures before call (#2659)Aldo Cortesi2017-12-112-0/+16
| | | | | | | | | Fixes #2652, and many other possible crashes on user input.
| * | fix browser addon on WindowsMaximilian Hils2017-12-112-10/+33
|/ /
* | Merge pull request #2656 from cortesi/browseraddonAldo Cortesi2017-12-114-1/+86
|\ \ | |/ |/| browser addon: start an isolated browser attached to the proxy
| * browser addon: start an isolated browser attached to the proxyAldo Cortesi2017-12-104-1/+86
|/ | | | | | | | | | | | A simple addon that starts an instance of Chrome attached to the current proxy. The instance is isolated in its own user data directory, and addons are turned off. Future work: - I wasn't able to test the Windows executable path - a Windows dev should confirm this for us. - In future it would be nice to support other browsers like Firefox.
* Bug in expected_http_body_size fix (#2642)Suraj Tripathi2017-11-272-1/+16
| | | fixes #2618
* Fix #2635, mitmdump does not apply filter to saved data. (#2636)Matthew Shao2017-11-221-1/+1
|
* Merge pull request #2621 from mhils/clientreplayMaximilian Hils2017-11-166-14/+35
|\ | | | | Improve Clientreplay
| * improve clientreplay addonMaximilian Hils2017-11-073-14/+22
| | | | | | | | | | | | | | | | - always refresh UI after flow is finished (refs #2616) - count currently active replay - make replay thread daemonic so that users can exit mitmproxy if replay hangs. This is not perfect yet, but vastly better than how it has been.
| * fix revert of duplicated flowsMaximilian Hils2017-11-063-0/+13
| |
* | [requires.io] dependency update on master branch (#2629)Thomas Kriechbaumer2017-11-151-1/+1
| |
* | Merge pull request #2626 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-11-111-1/+1
|\ \ | | | | | | [requires.io] dependency update on master branch
| * | [requires.io] dependency updaterequires.io2017-11-101-1/+1
|/ /
* / [requires.io] dependency update on master branch (#2623)Thomas Kriechbaumer2017-11-101-1/+1
|/
* Merge pull request #2619 from mhils/issue-2617Maximilian Hils2017-11-062-18/+16
|\ | | | | Fix #2617
| * fix re-use of serverconnection source addressMaximilian Hils2017-11-031-14/+12
| | | | | | | | | | this previously made it impossible to redirect requests from example.com to localhost, as we still tried to bind to the external interface.
| * fix #2617Maximilian Hils2017-11-031-4/+4
| |
* | Merge pull request #2615 from Kriechi/bump-flakeThomas Kriechbaumer2017-10-312-2/+2
|\ \ | | | | | | bump flake8
| * | bump flake8Thomas Kriechbaumer2017-10-312-2/+2
|/ / | | | | | | closes #2601
* | Merge pull request #2608 from mhils/webMaximilian Hils2017-10-2923-1075/+1371
|\ \ | |/ |/| [web] minor improvements, move options editor
| * [web] adjust testsMaximilian Hils2017-10-2610-180/+80
| |
| * [web] move options editor from file menu to options menuMaximilian Hils2017-10-252-59/+34
| | | | | | | | | | | | | | | | | | | | | | | | ultimately we probably want to open the options editor immediately if someone presses "Options". This still requires us to 1. have a nicer editors for common settings. 2. Add a "view event log" button somewhere else, for example in the footer. For now, the options editor is marked as beta, as there are some options you clearly do not want to edit (e.g. wfile).
| * [web] minor fixes and cleanupMaximilian Hils2017-10-256-170/+60
| |
| * [web] remove promptMaximilian Hils2017-10-255-100/+4
| |
| * [web] minor fixesMaximilian Hils2017-10-252-2/+2
| |
| * [web] update to react 16.0Maximilian Hils2017-10-252-586/+1213
| |
* | Merge pull request #2610 from mhils/log-threadsafeMaximilian Hils2017-10-262-3/+11
|\ \ | | | | | | Make master.add_log threadsafe
| * | make safecall threadsafe.Maximilian Hils2017-10-262-3/+11
|/ /
* | re-add discourse link in issue templateMaximilian Hils2017-10-251-0/+3
| |
* | Merge pull request #2606 from mhils/issue-2563Maximilian Hils2017-10-254-63/+29
|\ \ | |/ |/| Fix #2563
| * fix #2563Maximilian Hils2017-10-244-23/+29
| |
| * remove old dntree implementationMaximilian Hils2017-10-241-40/+0
|/