aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Merge pull request #3099 from Kriechi/fix-3024Aldo Cortesi2018-05-062-15/+39
|\ \ \ | | | | | | | | fix #3024
| * | | fix #3024Thomas Kriechbaumer2018-05-052-15/+39
| | | |
* | | | Merge pull request #3098 from drzax/patch-1Thomas Kriechbaumer2018-05-051-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo in addons-overview.md
| * | | | Fix typo in addons-overview.mdSimon Elvery2018-05-051-1/+1
|/ / / /
* | | | Merge pull request #3093 from cortesi/diecustomAldo Cortesi2018-05-052-16/+21
|\ \ \ \ | | | | | | | | | | Remove custom events
| * | | | Remove custom eventsAldo Cortesi2018-05-032-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | These were always weird, and were added to support exit when processing completed to mitmdump. We now have better ways to do this.
* | | | | Merge pull request #3097 from cortesi/exampAldo Cortesi2018-05-052-4/+11
|\ \ \ \ \ | | | | | | | | | | | | Revamp dup_and_replay example
| * | | | | Revamp dup_and_replay exampleAldo Cortesi2018-05-052-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Exposes view.add as a command - Copes with cases where a view addon isn't present - Avoids infinite loop caused by replaying replays Fixes #3096
* | | | | | Merge pull request #3091 from cortesi/dietickAldo Cortesi2018-05-038-48/+16
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / Remove the tick event
| * | | | Remove the tick eventAldo Cortesi2018-05-028-48/+16
| | | | | | | | | | | | | | | | | | | | Mitmproxy: the tickless wonder.
* | | | | Merge pull request #3090 from cortesi/iflightAldo Cortesi2018-05-0216-62/+99
|\| | | | | | | | | | | | | | Redesign keepserving
| * | | | Catch some stray command.call invocationsAldo Cortesi2018-05-022-4/+4
| | | | |
| * | | | taddons: remove has_eventAldo Cortesi2018-05-022-12/+0
| | | | | | | | | | | | | | | | | | | | We no longer use this anywhere, so ditch it.
| * | | | Redesign keepservingAldo Cortesi2018-05-029-40/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Instead of listening for a pseudo-event, we periodically check whether client replay, server replay or file reading is active. - Adjust server replay not to use tick. - Adjust readfile to expose a command to check whether reading is in progress.
| * | | | console: use replay count commands in statusbarAldo Cortesi2018-05-022-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a periodic refresh every 0.5 seconds for the statusbar. This is in addition to refreshes upon event update notifications, and picks up replay status changes not linked to flow events.
| * | | | server replay: expose the replay.server.count commandAldo Cortesi2018-05-021-0/+1
| | | | |
| * | | | client replay: replaying flows in-flight should be added to count()Aldo Cortesi2018-05-022-2/+7
| | | | |
* | | | | Merge pull request #3089 from cortesi/creplayAldo Cortesi2018-05-0222-411/+386
|\| | | | | | | | | | | | | | Revamp client replay
| * | | | commands: clarify command call interface, fix web app replayAldo Cortesi2018-05-028-35/+40
| | | | |
| * | | | client replay: use count command for console statusbarAldo Cortesi2018-05-011-3/+4
| | | | |
| * | | | client replay: expad and consolidate testsAldo Cortesi2018-05-014-97/+128
| | | | |
| * | | | client replay: revert our changes if replay is abortedAldo Cortesi2018-04-301-0/+2
| | | | |
| * | | | client replay: re-designAldo Cortesi2018-04-308-209/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-design the way client replay works. Before, we would fire up a thread, replay, wait for the thread to complete, get the next flow, and repeat the procedure. Now, we have one replay thread that starts when the addon starts, which pops flows off a thread-safe queue. This is much cleaner, removes the need for busy tick, and sets the scene for optimisations like server connection reuse down the track.
| * | | | client replay: move all client replay-related code into addonAldo Cortesi2018-04-279-269/+260
|/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-21 00:35:38 +0000