Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fixing Typos | Joaquin | 2018-05-13 | 3 | -3/+3 | |
|/ | ||||||
* | Merge pull request #3117 from cortesi/morefixes | Aldo Cortesi | 2018-05-12 | 4 | -10/+10 | |
|\ | | | | | More misc fixes | |||||
| * | command: handle string without terminal escaped char | Aldo Cortesi | 2018-05-12 | 2 | -1/+6 | |
| | | | | | | | | Fixes #2810 | |||||
| * | controller: add mysteriously missing comment portion | Aldo Cortesi | 2018-05-12 | 1 | -2/+2 | |
| | | | | | | | | Thanks to @tran-tien-dat | |||||
| * | clientreplay: don't restrict outbound replay address to listen host | Aldo Cortesi | 2018-05-12 | 1 | -7/+2 | |
| | | | | | | | | Fixes #2647 | |||||
* | | Merge pull request #3116 from cortesi/fixes | Aldo Cortesi | 2018-05-12 | 5 | -15/+39 | |
|\| | | | | | Misc fixes | |||||
| * | script: tweak explicit command invocation | Aldo Cortesi | 2018-05-12 | 2 | -8/+5 | |
| | | ||||||
| * | tcp: handle EINVAL from closed connections | Aldo Cortesi | 2018-05-12 | 1 | -0/+8 | |
| | | | | | | | | Fixes #2771 | |||||
| * | script: revamp ephemeral script running | Aldo Cortesi | 2018-05-12 | 2 | -13/+21 | |
| | | | | | | | | Fixes 2838 | |||||
| * | Commit taken messages on kill | Aldo Cortesi | 2018-05-12 | 1 | -0/+2 | |
| | | | | | | | | Fixes 2879 | |||||
| * | script: invoke addons as script with exception handler | Aldo Cortesi | 2018-05-12 | 1 | -1/+2 | |
| | | | | | | | | Fixes #2837 | |||||
| * | console: implement positions for flow list walker | Aldo Cortesi | 2018-05-12 | 1 | -0/+8 | |
| | | | | | | | | | | | | This papers over an urwid bug until they fix it. fixes #2973 | |||||
* | | Merge pull request #3115 from cortesi/cmds | Aldo Cortesi | 2018-05-12 | 3 | -8/+63 | |
|\| | | | | | commands fixes and improvements | |||||
| * | commands: handle type errors on startup | Aldo Cortesi | 2018-05-12 | 2 | -6/+41 | |
| | | | | | | | | | | fixes #3088 fixes #2787 | |||||
| * | commands: if no explicit return type is specified, assume None | Aldo Cortesi | 2018-05-12 | 2 | -1/+17 | |
| | | | | | | | | | | This is going to be a super common error for addon authors, so we might as well handle it. | |||||
| * | console: fix bug that caused addon commands not to appear in command list | Aldo Cortesi | 2018-05-11 | 1 | -4/+8 | |
| | | ||||||
* | | Merge pull request #3028 from madt1m/Fix#3011 | Aldo Cortesi | 2018-05-12 | 2 | -1/+2 | |
|\ \ | | | | | | | Fix buggy keybindings in Data Viewer overlays | |||||
| * | | New context for dataviewer overlays | madt1m | 2018-04-01 | 2 | -1/+2 | |
| | | | ||||||
* | | | Merge pull request #3114 from Kriechi/fix-tcp-example | Aldo Cortesi | 2018-05-12 | 1 | -12/+11 | |
|\ \ \ | | | | | | | | | fix tcp example | |||||
| * | | | fix tcp example | Thomas Kriechbaumer | 2018-05-11 | 1 | -12/+11 | |
| | | | | ||||||
* | | | | Merge pull request #3110 from cortesi/misc | Aldo Cortesi | 2018-05-12 | 4 | -11/+37 | |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | Changelog, change meaning of --conf flag | |||||
| * | | Remove MANIFEST.in | Aldo Cortesi | 2018-05-10 | 1 | -3/+0 | |
| | | | | | | | | | | | | We don't use sdist. | |||||
| * | | cmdline: --conf -> --confdir, which specifies the config directory, not the ↵ | Aldo Cortesi | 2018-05-10 | 3 | -8/+12 | |
| | | | | | | | | | | | | | | | | | | yaml options file This is a much more sensible behaviour for the flag. | |||||
| * | | Initial changelog for 4.0 | Aldo Cortesi | 2018-05-10 | 1 | -0/+25 | |
| | | | ||||||
* | | | Merge pull request #3109 from cortesi/kmap | Aldo Cortesi | 2018-05-10 | 19 | -35/+231 | |
|\| | | | | | | | | console keybindings: define a yaml format, load CONFDIR/keys.yaml on startup | |||||
| * | | keymap: read keys from CONFDIR/keys.yaml by default | Aldo Cortesi | 2018-05-10 | 4 | -5/+16 | |
| | | | ||||||
| * | | cadir -> confdir | Aldo Cortesi | 2018-05-10 | 16 | -34/+34 | |
| | | | | | | | | | | | | | | | We store a lot more than just the CAs in our configuration directory. Clarify the option name. | |||||
| * | | console keybindings: define YAML-based format for console key binding ↵ | Aldo Cortesi | 2018-05-10 | 2 | -0/+185 | |
|/ / | | | | | | | persistence | |||||
* | | Merge pull request #3106 from cortesi/noprint | Maximilian Hils | 2018-05-08 | 9 | -45/+11 | |
|\ \ | | | | | | | Ditch the addon stdout wrapper | |||||
| * | | clientplayback: try to fix flaky replay test | Aldo Cortesi | 2018-05-08 | 1 | -0/+2 | |
| | | | ||||||
| * | | Ditch the addon stdout wrapper | Aldo Cortesi | 2018-05-08 | 8 | -45/+9 | |
| | | | | | | | | | | | | | | | | | | This results in a 30% improvement in our core request throughput. Fixes #3102 | |||||
* | | | Merge pull request #3107 from 0xHJK/master | Thomas Kriechbaumer | 2018-05-08 | 1 | -0/+6 | |
|\ \ \ | | | | | | | | | add har_dump example cmdline invocation | |||||
| * | | | har_dump example cmdline invocation | 0xHJK | 2018-05-08 | 1 | -0/+6 | |
|/ / / | ||||||
* | | | Merge pull request #3105 from cortesi/opts | Aldo Cortesi | 2018-05-08 | 8 | -28/+84 | |
|\| | | | | | | | | Add deferred options, tweak benchmarks, document done event | |||||
| * | | optmanager: refactor for coverage and clarity | Aldo Cortesi | 2018-05-08 | 2 | -10/+6 | |
| | | | ||||||
| * | | events: document behaviour of done() more fully | Aldo Cortesi | 2018-05-08 | 1 | -2/+6 | |
| | | | ||||||
| * | | benchmarks: quick-run scripts for mitmproxy and mitmdump | Aldo Cortesi | 2018-05-08 | 2 | -0/+4 | |
| | | | ||||||
| * | | benchmark: keep track of requests/responses seen by proxy | Aldo Cortesi | 2018-05-08 | 1 | -0/+10 | |
| | | | ||||||
| * | | options: add the concept of deferred settings | Aldo Cortesi | 2018-05-08 | 4 | -18/+60 | |
|/ / | | | | | | | | | | | | | | | | | | | | | We've had a perpetual sequencing problem with addon startup. Users need to be able to specify options to addons on the command-line, before addons are actually loaded. This is only exacerbated with the new async core, where load order can't be relied on. This patch introduces deferred options. Options passed with "--set" on the command line are deferred if they are unknown, and are automatically applied by the addon manager once matching addons are registered and their options are defined. | |||||
* | | Merge pull request #3104 from cortesi/cmdcall | Aldo Cortesi | 2018-05-07 | 2 | -6/+6 | |
|\ \ | | | | | | | Zap some commands.call invocations that were missed in the rename | |||||
| * | | Zap some commands.call invocations that were missed in the rename | Aldo Cortesi | 2018-05-07 | 2 | -6/+6 | |
|/ / | ||||||
* | | Merge pull request #3103 from mhils/fix-processing | Thomas Kriechbaumer | 2018-05-06 | 2 | -4/+1 | |
|\ \ | | | | | | | Remove leftover processing_complete | |||||
| * | | remove leftover processing_complete | Maximilian Hils | 2018-05-06 | 2 | -4/+1 | |
|/ / | ||||||
* | | Merge pull request #2986 from miheerdew/patch-1 | Thomas Kriechbaumer | 2018-05-06 | 1 | -2/+36 | |
|\ \ | | | | | | | Workaround for MacOS transparent proxy | |||||
| * \ | Merge master | Miheer Dewaskar | 2018-03-24 | 40 | -213/+416 | |
| |\ \ | ||||||
| * | | | Spelling | Miheer Dewaskar | 2018-03-11 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Extrac comment and typo | Miheer Dewaskar | 2018-03-11 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Workaround for MacOS transparent proxy | Miheer Dewaskar | 2018-03-11 | 1 | -2/+37 | |
| | | | | | | | | | | | | This workaround (adopted from #1261) allows MacOS users to redirect their machine's outgoing traffic to mitmproxy transparently. | |||||
* | | | | Merge pull request #3100 from cortesi/block | Thomas Kriechbaumer | 2018-05-06 | 5 | -94/+102 | |
|\ \ \ \ | | | | | | | | | | | Remove allowremote addon, add an improved take called block | |||||
| * | | | | Remove allowremote addon, add an improved take called block | Aldo Cortesi | 2018-05-06 | 5 | -94/+102 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have two options: block_global blocks global networks, block_private blocks private networks. The block_global option is true by default, and block_private is false by default. The addon name is "block" so the options are correctly prefixed. Also make option documentation precise, reduce verbosity of logs. |