aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into message-body-encodingMaximilian Hils2016-07-15162-2901/+3176
|\
| * console: don't let messages overwrite promptsAldo Cortesi2016-07-161-1/+2
| | | | | | | | This renders mitmproxy unresponsive and is bad UX as well.
| * Merge pull request #1362 from cortesi/errorsAldo Cortesi2016-07-1618-60/+78
| |\ | | | | | | Some work on errors and logs
| | * Make mitmdump return an error exit status if errors occurred during runAldo Cortesi2016-07-162-0/+6
| | |
| | * Flash a status bar message if an error log event occursAldo Cortesi2016-07-161-0/+3
| | |
| | * Add a helper to translate a log level to a tierAldo Cortesi2016-07-163-4/+8
| | | | | | | | | | | | This is in utils for now - we'll find a better home down the track.
| | * Trigger "start" when scripts are reloaded.Aldo Cortesi2016-07-161-0/+1
| | |
| | * add_event -> add_log throughout projectAldo Cortesi2016-07-1613-47/+47
| | | | | | | | | | | | | | | "Event" is terribly over-loaded in the project, and "log" is straight-forward and self-explanatory.
| | * Fix log level handlingAldo Cortesi2016-07-166-9/+13
| | | | | | | | | | | | We have 4: error, warn, info and debug.
| | * Add addons after initialisation in mitmproxy consoleAldo Cortesi2016-07-161-3/+3
| |/ | | | | | | | | The main effect of this is that we now properly capture errors on startup that were ignored before.
| * Zap unused test scriptsAldo Cortesi2016-07-1511-59/+9
| |
| * fix #1358Maximilian Hils2016-07-152-11/+11
| |
| * Merge pull request #1356 from cortesi/scriptAldo Cortesi2016-07-1535-708/+676
| |\ | | | | | | Scripts to addon
| | * Script cleanupsAldo Cortesi2016-07-153-18/+100
| | | | | | | | | | | | | | | | | | - Preserve script order on config change - Prohibit script duplicates (i.e. identical script + args) - Various cleanups and tweaks
| | * Fix HAR extractorAldo Cortesi2016-07-152-6/+9
| | | | | | | | | | | | Thanks to @mhils
| | * Adjust concurrent tests for start methodAldo Cortesi2016-07-152-3/+1
| | |
| | * Add .start for addons and scriptsAldo Cortesi2016-07-1514-21/+46
| | | | | | | | | | | | Also improve error messages, fix various unit tests
| | * Fix windows parse_args testAldo Cortesi2016-07-151-1/+1
| | |
| | * Always use PollingObserverAldo Cortesi2016-07-141-7/+2
| | |
| | * Merge branch 'master' into scriptAldo Cortesi2016-07-141-0/+2
| | |\ | | |/ | |/|
| * | Add missing mitmweb optionAldo Cortesi2016-07-141-0/+2
| | |
| | * Adjust for new options schemeAldo Cortesi2016-07-141-1/+1
| | |
| | * Add a tick event for addons and scripts, and use it for race-free reloadAldo Cortesi2016-07-143-14/+24
| | |
| | * Tighten the tick loopAldo Cortesi2016-07-141-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | In the past, we consumed from the event queue until we were idle for a certain amount of time (0.1s). This would cause hangs in interactive tools when there was a stream of events, hurting responsiveness. We now wait for a maximum of 0.1s before triggering the tick loop, will be able to reduce this further down the track.
| | * Script cleanup: editing in console, Python3 compatibility fixesAldo Cortesi2016-07-147-61/+38
| | |
| | * Convert examples and example tests for new-style scriptsAldo Cortesi2016-07-1414-261/+120
| | | | | | | | | | | | | | | Remove the test that just loads all the example scripts for now - it's a very low-value test, and we need to think of something better.
| | * Zap old scripts infrastructure, fix concurrency testsAldo Cortesi2016-07-149-216/+43
| | |
| | * First-order integration of scripts addonAldo Cortesi2016-07-1416-184/+379
| |/
| * Re-add deletion of stickycookies (#1355)Shadab Zafar2016-07-142-4/+24
| | | | | | | | This was originally added in #1324 (fixing issue #1096) but got lost during "the big refactor" (#1352)
| * Merge pull request #1354 from mhils/explicit-optionsAldo Cortesi2016-07-1414-135/+192
| |\ | | | | | | Make options explicit
| | * minor fixesMaximilian Hils2016-07-133-3/+3
| | |
| | * make options explicitMaximilian Hils2016-07-1313-134/+191
| |/
| * Merge pull request #1353 from cortesi/streamAldo Cortesi2016-07-148-118/+167
| |\ | | | | | | Streaming to file -> addon
| | * Stream to file -> addonAldo Cortesi2016-07-148-118/+167
| | | | | | | | | | | | | | | This commit also clarifies a confusion about the "outfile" attribute and its use in testing in the mitmdump master.
| * | Merge pull request #1352 from cortesi/stickycookieAldo Cortesi2016-07-1411-208/+204
| |\| | | | | | | StickyCookies to addon
| | * Fix indeterminacy in sticky cookie testsAldo Cortesi2016-07-141-6/+9
| | | | | | | | | | | | How has this not bitten us before?
| | * Zap unused importsAldo Cortesi2016-07-141-3/+0
| | |
| | * Ditch StickyCookie moduleAldo Cortesi2016-07-142-65/+2
| | |
| | * StickyCookies to addonAldo Cortesi2016-07-149-140/+199
| | |
| * | Merge pull request #1351 from cortesi/anticacheAldo Cortesi2016-07-148-21/+43
| |\| | | | | | | AntiCache to addon
| | * Merge remote-tracking branch 'upstream/master' into anticacheAldo Cortesi2016-07-140-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #1350 from cortesi/addons-cleanupAldo Cortesi2016-07-148-19/+39
| |\ \ | | | | | | | | Addons cleanup
| * \ \ Merge pull request #1349 from cortesi/addonsAldo Cortesi2016-07-1412-85/+63
| |\ \ \ | | | | | | | | | | Addons: StickyAuth
| | | | * AntiCache to addonAldo Cortesi2016-07-148-21/+43
| | | |/
| | | * Disable OSX tests on Travis for nowAldo Cortesi2016-07-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | We'll re-enable as soon as this is sorted out: https://github.com/travis-ci/travis-ci/issues/6303
| | | * Add a .setter helper to OptionsAldo Cortesi2016-07-146-12/+24
| | | | | | | | | | | | | | | | | | | | This returns a function that sets a named attribute, and is handy for event-driven code like mitmproxy console.
| | | * Handle OptionsError for command-line args.Aldo Cortesi2016-07-141-3/+11
| | |/
| | * Move StickyAuth into addonAldo Cortesi2016-07-1411-82/+62
| | | | | | | | | | | | | | | This is the first addon that handles an OptionsError, so this commit also demos how this works in console. Handling of command-line erorrs is on its way.
| | * func.__name__ works in both 2.7 and 3.5Aldo Cortesi2016-07-141-3/+1
| |/ | | | | | | Thanks to @resam and @dwfreed for pointing this out
| * Merge pull request #1348 from cortesi/addonsAldo Cortesi2016-07-1418-51/+194
| |\ | | | | | | Addons
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-16 11:41:18 +0000