aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
|/ / / / /
* | | | | Merge pull request #3082 from p1uymi/patch-2Aldo Cortesi2018-04-271-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Changed syntax of two options (from v2 to v3)
| * | | | | Changed syntax from v2 to v3p1uymi2018-04-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | --client-certs = v2 syntax --> --set client_certs=value = v3 syntax --cadir = v2 syntax --> --set cadir=value = v3 syntax
* | | | | | Merge pull request #3083 from mitmproxy/requires-io-masterAldo Cortesi2018-04-271-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [requires.io] dependency update on master branch
| * | | | | [requires.io] dependency updaterequires.io2018-04-270-0/+0
| | | | | |
| * | | | | [requires.io] dependency updaterequires.io2018-04-261-1/+1
|/ / / / /
* | | | | Merge pull request #3078 from kajojify/expanduserAldo Cortesi2018-04-264-5/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix #3002. Auto-expanding for tilda.
| * | | | | Incompatible typesMiroslav2018-04-261-2/+2
| | | | | |
| * | | | | LintMiroslav2018-04-261-1/+0
| | | | | |
| * | | | | Fix #3002. Auto-expandingMiroslav2018-04-264-4/+10
| | | | | |
* | | | | | Merge pull request #3076 from clyfish/keepaliveAldo Cortesi2018-04-261-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | add SO_KEEPALIVE
| * | | | | | add SO_KEEPALIVECheng Liangyu2018-04-251-0/+2
| | | | | | |
* | | | | | | Merge pull request #3071 from cortesi/ticklessAldo Cortesi2018-04-2643-327/+348
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | asyncio: shift script reloading out of the tick event
| * | | | | | test: shift test_data out of our public APIAldo Cortesi2018-04-2333-229/+216
| | | | | | |
| * | | | | | addons/script: improve relability of reload testAldo Cortesi2018-04-234-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The granularity of mtime is surprisingly bad. Make the tests more robust against this, and promote has_log back to a public method, now that we have a few legitimate examples.
| * | | | | | asyncio: shift script reloading out of the tick eventAldo Cortesi2018-04-2313-105/+133
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tick event is a nasty compromise, left over from when we didn't have an event loop. This is the first patch in a series that explores moving our built-in addons to managing coroutines on the eventloop directly for periodic tasks.
* | | | | | Merge pull request #3077 from mhils/pytest-fixMaximilian Hils2018-04-253-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix pytest invocation errors
| * | | | | fix pytest invocation errorsMaximilian Hils2018-04-253-3/+3
|/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:12:03 +0000