aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fixing TyposJoaquin2018-05-133-3/+3
|/
* Merge pull request #3117 from cortesi/morefixesAldo Cortesi2018-05-124-10/+10
|\ | | | | More misc fixes
| * command: handle string without terminal escaped charAldo Cortesi2018-05-122-1/+6
| | | | | | | | Fixes #2810
| * controller: add mysteriously missing comment portionAldo Cortesi2018-05-121-2/+2
| | | | | | | | Thanks to @tran-tien-dat
| * clientreplay: don't restrict outbound replay address to listen hostAldo Cortesi2018-05-121-7/+2
| | | | | | | | Fixes #2647
* | Merge pull request #3116 from cortesi/fixesAldo Cortesi2018-05-125-15/+39
|\| | | | | Misc fixes
| * script: tweak explicit command invocationAldo Cortesi2018-05-122-8/+5
| |
| * tcp: handle EINVAL from closed connectionsAldo Cortesi2018-05-121-0/+8
| | | | | | | | Fixes #2771
| * script: revamp ephemeral script runningAldo Cortesi2018-05-122-13/+21
| | | | | | | | Fixes 2838
| * Commit taken messages on killAldo Cortesi2018-05-121-0/+2
| | | | | | | | Fixes 2879
| * script: invoke addons as script with exception handlerAldo Cortesi2018-05-121-1/+2
| | | | | | | | Fixes #2837
| * console: implement positions for flow list walkerAldo Cortesi2018-05-121-0/+8
| | | | | | | | | | | | This papers over an urwid bug until they fix it. fixes #2973
* | Merge pull request #3115 from cortesi/cmdsAldo Cortesi2018-05-123-8/+63
|\| | | | | commands fixes and improvements
| * commands: handle type errors on startupAldo Cortesi2018-05-122-6/+41
| | | | | | | | | | fixes #3088 fixes #2787
| * commands: if no explicit return type is specified, assume NoneAldo Cortesi2018-05-122-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 listAldo Cortesi2018-05-111-4/+8
| |
* | Merge pull request #3028 from madt1m/Fix#3011Aldo Cortesi2018-05-122-1/+2
|\ \ | | | | | | Fix buggy keybindings in Data Viewer overlays
| * | New context for dataviewer overlaysmadt1m2018-04-012-1/+2
| | |
* | | Merge pull request #3114 from Kriechi/fix-tcp-exampleAldo Cortesi2018-05-121-12/+11
|\ \ \ | | | | | | | | fix tcp example
| * | | fix tcp exampleThomas Kriechbaumer2018-05-111-12/+11
| | | |
* | | | Merge pull request #3110 from cortesi/miscAldo Cortesi2018-05-124-11/+37
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| Changelog, change meaning of --conf flag
| * | Remove MANIFEST.inAldo Cortesi2018-05-101-3/+0
| | | | | | | | | | | | We don't use sdist.
| * | cmdline: --conf -> --confdir, which specifies the config directory, not the ↵Aldo Cortesi2018-05-103-8/+12
| | | | | | | | | | | | | | | | | | yaml options file This is a much more sensible behaviour for the flag.
| * | Initial changelog for 4.0Aldo Cortesi2018-05-101-0/+25
| | |
* | | Merge pull request #3109 from cortesi/kmapAldo Cortesi2018-05-1019-35/+231
|\| | | | | | | | console keybindings: define a yaml format, load CONFDIR/keys.yaml on startup
| * | keymap: read keys from CONFDIR/keys.yaml by defaultAldo Cortesi2018-05-104-5/+16
| | |
| * | cadir -> confdirAldo Cortesi2018-05-1016-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 Cortesi2018-05-102-0/+185
|/ / | | | | | | persistence
* | Merge pull request #3106 from cortesi/noprintMaximilian Hils2018-05-089-45/+11
|\ \ | | | | | | Ditch the addon stdout wrapper
| * | clientplayback: try to fix flaky replay testAldo Cortesi2018-05-081-0/+2
| | |
| * | Ditch the addon stdout wrapperAldo Cortesi2018-05-088-45/+9
| | | | | | | | | | | | | | | | | | This results in a 30% improvement in our core request throughput. Fixes #3102
* | | Merge pull request #3107 from 0xHJK/masterThomas Kriechbaumer2018-05-081-0/+6
|\ \ \ | | | | | | | | add har_dump example cmdline invocation
| * | | har_dump example cmdline invocation0xHJK2018-05-081-0/+6
|/ / /
* | | Merge pull request #3105 from cortesi/optsAldo Cortesi2018-05-088-28/+84
|\| | | | | | | | Add deferred options, tweak benchmarks, document done event
| * | optmanager: refactor for coverage and clarityAldo Cortesi2018-05-082-10/+6
| | |
| * | events: document behaviour of done() more fullyAldo Cortesi2018-05-081-2/+6
| | |
| * | benchmarks: quick-run scripts for mitmproxy and mitmdumpAldo Cortesi2018-05-082-0/+4
| | |
| * | benchmark: keep track of requests/responses seen by proxyAldo Cortesi2018-05-081-0/+10
| | |
| * | options: add the concept of deferred settingsAldo Cortesi2018-05-084-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/cmdcallAldo Cortesi2018-05-072-6/+6
|\ \ | | | | | | Zap some commands.call invocations that were missed in the rename
| * | Zap some commands.call invocations that were missed in the renameAldo Cortesi2018-05-072-6/+6
|/ /
* | Merge pull request #3103 from mhils/fix-processingThomas Kriechbaumer2018-05-062-4/+1
|\ \ | | | | | | Remove leftover processing_complete
| * | remove leftover processing_completeMaximilian Hils2018-05-062-4/+1
|/ /
* | Merge pull request #2986 from miheerdew/patch-1Thomas Kriechbaumer2018-05-061-2/+36
|\ \ | | | | | | Workaround for MacOS transparent proxy
| * \ Merge masterMiheer Dewaskar2018-03-2440-213/+416
| |\ \
| * | | SpellingMiheer Dewaskar2018-03-111-2/+2
| | | |
| * | | Extrac comment and typoMiheer Dewaskar2018-03-111-1/+2
| | | |
| * | | Workaround for MacOS transparent proxyMiheer Dewaskar2018-03-111-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/blockThomas Kriechbaumer2018-05-065-94/+102
|\ \ \ \ | | | | | | | | | | Remove allowremote addon, add an improved take called block
| * | | | Remove allowremote addon, add an improved take called blockAldo Cortesi2018-05-065-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.