aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2302 from cortesi/flowviewAldo Cortesi2017-05-015-233/+109
|\ | | | | commands: view.setval, view.getval, view.setval.toggle
| * commands: view.setval, view.getval, view.setval.toggleAldo Cortesi2017-05-015-233/+109
| | | | | | | | | | Use these to bind the last of the key for flowview. Flow views are now 100% keybound.
* | Merge pull request #2301 from cortesi/encodingAldo Cortesi2017-05-014-38/+93
|\| | | | | commands: flow.encode, flow.decode, flow.encode.toggle
| * commands: flow.encode, flow.decode, flow.encode.toggleAldo Cortesi2017-05-014-38/+93
| | | | | | | | Use this to bind "z" in flowview.
* | Merge pull request #2300 from cortesi/consolerevampAldo Cortesi2017-05-0123-681/+664
|\| | | | | Console revamp
| * commands: console.bodyview, console.chooseAldo Cortesi2017-05-012-14/+60
| | | | | | | | Use this to replace the "v" for view shortcut key in flowview.
| * keymap: keys can now bind to multiple contextsAldo Cortesi2017-05-019-187/+136
| | | | | | | | Use this to map the majority of the keys in flowview.
| * command: flow.setAldo Cortesi2017-05-014-134/+123
| | | | | | | | Use this to replace the flow edit components of flowview entirely.
| * Refactor consoleAldo Cortesi2017-05-0117-366/+365
|/ | | | | | | | - All top-level window objects are now persistent. It turns out that urwid keeps a reference to these even after they're no longer used, so they were leaking before. - Revamp editors to work with console commands, and start reworking bindings for flowview.
* Merge pull request #2285 from MatthewShao/jest-devMaximilian Hils2017-04-304-5/+110
|\ | | | | [web] Add coverage for js/urlState.js
| * [web] Export updateUrlFromStore and updateStoreFromUrlMatthew Shao2017-04-302-25/+46
| |
| * [web] Introduce redux-mock-store and minor fix.Matthew Shao2017-04-304-44/+64
| |
| * [web] Add coverage for js/urlState.jsMatthew Shao2017-04-281-0/+66
| |
* | Merge pull request #2271 from mhils/mitmweb-connection-indicatorMaximilian Hils2017-04-3014-4658/+5128
|\ \ | | | | | | [web] add connection indicator [WIP]
| * | [web] add connection testsMaximilian Hils2017-04-294-16/+63
| | |
| * | [web] add connection indicatorMaximilian Hils2017-04-2912-4655/+5078
| | |
* | | Merge pull request #2297 from cortesi/flowcmdAldo Cortesi2017-05-017-91/+52
|\ \ \ | | | | | | | | commands: view.order.options, view.marked.toggle, view.create
| * | | commands: view.order.options, view.marked.toggle, view.createAldo Cortesi2017-04-307-91/+52
| | | | | | | | | | | | | | | | | | | | | | | | And use these commands to remove the last hard-coded keybindings from flow list. This means the flow list is now 100% command-driven, which is very exciting.
* | | | Merge pull request #2296 from cortesi/viewloadAldo Cortesi2017-04-3028-653/+385
|\| | | | | | | | | | | commands: view.load
| * | | commands: view.loadAldo Cortesi2017-04-307-27/+39
| | | | | | | | | | | | | | | | Plus replace the flow list keybinding.
| * | | commands: support *args for commandsAldo Cortesi2017-04-306-47/+122
| | | | | | | | | | | | | | | | | | | | | | | | Use this to simplify meta-commands in console, and to create a console_choose command that prompts the user for a choice, and then executes a command with variable substitution.
| * | | Move export to addon, kill Python and Locust exportAldo Cortesi2017-04-3023-586/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a "raw" export format. The Python and Locust exports are hard to maintain, their tests are extremely brittle, they didn't have full test coverage, and are by my guess very rarely used. I feel the Locust export should certainly be an externally maintained addon. The Python/requests export can come back if someone cares enough, and it can be structured in a way we can maintain.
* | | | fix markdownThomas Kriechbaumer2017-04-301-4/+4
| | | |
* | | | update docker-release tags during releaseThomas Kriechbaumer2017-04-301-0/+4
| | | |
* | | | Merge pull request #2293 from cortesi/clipAldo Cortesi2017-04-303-0/+47
|\| | | | | | | | | | | commands: cut.clip copies cuts to system clipboard
| * | | commands: cut.clip copies cuts to system clipboardAldo Cortesi2017-04-303-0/+47
| | | |
* | | | Merge pull request #2291 from cortesi/cutsAldo Cortesi2017-04-3013-13/+351
|\| | | | | | | | | | | Introduce cuts: a flow dissector
| * | | Add help text to --commands outputAldo Cortesi2017-04-303-5/+16
| | | |
| * | | cut: more flexible cut specification based on attribute pathsAldo Cortesi2017-04-304-50/+79
| | | | | | | | | | | | | | | | Also support certificate types, which are converted to ASCII-encoded PEM format.
| * | | cut: use csv module to encode multi-values for savingAldo Cortesi2017-04-302-27/+60
| | | | | | | | | | | | | | | | Also add q.text, q.raw_content, s.text, s.raw_content selectors
| * | | Introduce cuts: a flow dissectorAldo Cortesi2017-04-2910-5/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR introduces the cuts addon, a flow dissector that allows you to select and operate on specific components of flows. It also adds the first consumer for cuts - the cuts.save command. Save the content of the focus to /tmp/foo: cuts.save s.content|@focus /tmp/foo Save the URL and response content-type headers for all flows currently shown to file, comma-separated, one flow per line: cuts.save s.url,q.header[content-type]|@focus /tmp/foo We also use this to replace the body save shortcut in the console flowlist.
* | | | Merge pull request #2276 from mitmproxy/add-examples-to-script-docsMaximilian Hils2017-04-291-0/+6
|\ \ \ \ | | | | | | | | | | Prominently link to examples in script docs
| * | | | prominently link to examples in script docsMaximilian Hils2017-04-271-0/+6
| | | | |
* | | | | Merge pull request #2221 from iharsh234/mypy-master-example/simpleAldo Cortesi2017-04-2913-19/+34
|\ \ \ \ \ | | | | | | | | | | | | Extend mypy example/simple (#2194)
| * | | | | Fixed lint errorharsh vijay2017-04-291-1/+1
| | | | | |
| * | | | | lint error fixedharsh vijay2017-04-291-1/+1
| | | | | |
| * | | | | extend mypy example/simpleharsh vijay2017-04-2913-19/+34
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2290 from cortesi/scriptrunAldo Cortesi2017-04-294-90/+70
|\ \ \ \ \ | | |_|/ / | |/| | | command: script.run
| * | | | command: script.runAldo Cortesi2017-04-294-90/+70
| | | | | | | | | | | | | | | | | | | | Plus the flowlist binding adjustments.
* | | | | Merge pull request #2289 from cortesi/flowrevertAldo Cortesi2017-04-294-8/+28
|\| | | | | | | | | | | | | | command: flow.revert
| * | | | command: flow.revertAldo Cortesi2017-04-294-8/+28
| | | | | | | | | | | | | | | | | | | | Plus matching binding in flowlist.
* | | | | Merge pull request #2288 from cortesi/replayfilesAldo Cortesi2017-04-294-0/+37
|\| | | | | | | | | | | | | | commands: "replay.client.file" and "replay.server.file"
| * | | | commands: "replay.client.file" and "replay.server.file"Aldo Cortesi2017-04-294-0/+37
| | | | |
* | | | | Merge pull request #2287 from cortesi/cmdmarkAldo Cortesi2017-04-2910-82/+152
|\| | | | | | | | | | | | | | commands: marking
| * | | | Rework client and server replayAldo Cortesi2017-04-298-81/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add client.replay [flows], client.replay.stop - Add server.replay [flows], server.replay.stop - The corresponding options for file loading are only read on startup, further changes are ignored. In interactive contexts, replay is started with the commands, not through option changes. - Deprecate flow.replay, use replay.client instead
| * | | | command: flow.kill, flow.replayAldo Cortesi2017-04-294-15/+48
| | | | | | | | | | | | | | | | | | | | Plus the matching bindings in the flow list.
| * | | | commands: markingAldo Cortesi2017-04-296-11/+58
| | | | | | | | | | | | | | | | | | | | | | | | | Add "view.mark [flows] bool" and "view.mark.toggle [flows]". Use this to rebind marking keys in flowlist.
* | | | | Merge pull request #2283 from cortesi/cmdallAldo Cortesi2017-04-2911-158/+251
|\| | | | | |/ / / |/| | | Commands, core update event
| * | | commands: view.goAldo Cortesi2017-04-299-75/+153
| | | | | | | | | | | | | | | | | | | | bind G to "view.go -1" bind g to "view.go 0"
| * | | Commands, core update eventAldo Cortesi2017-04-2910-89/+104
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch: - Introduces a core update() event that should be invoked whenever flows are changed outside of the normal lifecycle. - Extend view.resolve to know about @all, which matches all flows in the view. - Add a core flow.resume comand, which resumes flows and broadcasts an update event. - Define flow list bindings for: A -> flow.resume @all a -> flow.resume @focus d -> view.remove @focus z -> view.remove @all