Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add test for body (~b) | Shadab Zafar | 2016-07-16 | 2 | -6/+23 |
| | |||||
* | Add test for error (~e) | Shadab Zafar | 2016-07-16 | 1 | -1/+16 |
| | |||||
* | console: don't let messages overwrite prompts | Aldo Cortesi | 2016-07-16 | 1 | -1/+2 |
| | | | | This renders mitmproxy unresponsive and is bad UX as well. | ||||
* | Merge pull request #1362 from cortesi/errors | Aldo Cortesi | 2016-07-16 | 18 | -60/+78 |
|\ | | | | | Some work on errors and logs | ||||
| * | Make mitmdump return an error exit status if errors occurred during run | Aldo Cortesi | 2016-07-16 | 2 | -0/+6 |
| | | |||||
| * | Flash a status bar message if an error log event occurs | Aldo Cortesi | 2016-07-16 | 1 | -0/+3 |
| | | |||||
| * | Add a helper to translate a log level to a tier | Aldo Cortesi | 2016-07-16 | 3 | -4/+8 |
| | | | | | | | | This is in utils for now - we'll find a better home down the track. | ||||
| * | Trigger "start" when scripts are reloaded. | Aldo Cortesi | 2016-07-16 | 1 | -0/+1 |
| | | |||||
| * | add_event -> add_log throughout project | Aldo Cortesi | 2016-07-16 | 13 | -47/+47 |
| | | | | | | | | | | "Event" is terribly over-loaded in the project, and "log" is straight-forward and self-explanatory. | ||||
| * | Fix log level handling | Aldo Cortesi | 2016-07-16 | 6 | -9/+13 |
| | | | | | | | | We have 4: error, warn, info and debug. | ||||
| * | Add addons after initialisation in mitmproxy console | Aldo Cortesi | 2016-07-16 | 1 | -3/+3 |
|/ | | | | | The main effect of this is that we now properly capture errors on startup that were ignored before. | ||||
* | Zap unused test scripts | Aldo Cortesi | 2016-07-15 | 11 | -59/+9 |
| | |||||
* | fix #1358 | Maximilian Hils | 2016-07-15 | 2 | -11/+11 |
| | |||||
* | Merge pull request #1356 from cortesi/script | Aldo Cortesi | 2016-07-15 | 35 | -708/+676 |
|\ | | | | | Scripts to addon | ||||
| * | Script cleanups | Aldo Cortesi | 2016-07-15 | 3 | -18/+100 |
| | | | | | | | | | | | | - Preserve script order on config change - Prohibit script duplicates (i.e. identical script + args) - Various cleanups and tweaks | ||||
| * | Fix HAR extractor | Aldo Cortesi | 2016-07-15 | 2 | -6/+9 |
| | | | | | | | | Thanks to @mhils | ||||
| * | Adjust concurrent tests for start method | Aldo Cortesi | 2016-07-15 | 2 | -3/+1 |
| | | |||||
| * | Add .start for addons and scripts | Aldo Cortesi | 2016-07-15 | 14 | -21/+46 |
| | | | | | | | | Also improve error messages, fix various unit tests | ||||
| * | Fix windows parse_args test | Aldo Cortesi | 2016-07-15 | 1 | -1/+1 |
| | | |||||
| * | Always use PollingObserver | Aldo Cortesi | 2016-07-14 | 1 | -7/+2 |
| | | |||||
| * | Merge branch 'master' into script | Aldo Cortesi | 2016-07-14 | 1 | -0/+2 |
| |\ | |/ |/| | |||||
* | | Add missing mitmweb option | Aldo Cortesi | 2016-07-14 | 1 | -0/+2 |
| | | |||||
| * | Adjust for new options scheme | Aldo Cortesi | 2016-07-14 | 1 | -1/+1 |
| | | |||||
| * | Add a tick event for addons and scripts, and use it for race-free reload | Aldo Cortesi | 2016-07-14 | 3 | -14/+24 |
| | | |||||
| * | Tighten the tick loop | Aldo Cortesi | 2016-07-14 | 1 | -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 fixes | Aldo Cortesi | 2016-07-14 | 7 | -61/+38 |
| | | |||||
| * | Convert examples and example tests for new-style scripts | Aldo Cortesi | 2016-07-14 | 14 | -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 tests | Aldo Cortesi | 2016-07-14 | 9 | -216/+43 |
| | | |||||
| * | First-order integration of scripts addon | Aldo Cortesi | 2016-07-14 | 16 | -184/+379 |
|/ | |||||
* | Re-add deletion of stickycookies (#1355) | Shadab Zafar | 2016-07-14 | 2 | -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-options | Aldo Cortesi | 2016-07-14 | 14 | -135/+192 |
|\ | | | | | Make options explicit | ||||
| * | minor fixes | Maximilian Hils | 2016-07-13 | 3 | -3/+3 |
| | | |||||
| * | make options explicit | Maximilian Hils | 2016-07-13 | 13 | -134/+191 |
|/ | |||||
* | Merge pull request #1353 from cortesi/stream | Aldo Cortesi | 2016-07-14 | 8 | -118/+167 |
|\ | | | | | Streaming to file -> addon | ||||
| * | Stream to file -> addon | Aldo Cortesi | 2016-07-14 | 8 | -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/stickycookie | Aldo Cortesi | 2016-07-14 | 11 | -208/+204 |
|\| | | | | | StickyCookies to addon | ||||
| * | Fix indeterminacy in sticky cookie tests | Aldo Cortesi | 2016-07-14 | 1 | -6/+9 |
| | | | | | | | | How has this not bitten us before? | ||||
| * | Zap unused imports | Aldo Cortesi | 2016-07-14 | 1 | -3/+0 |
| | | |||||
| * | Ditch StickyCookie module | Aldo Cortesi | 2016-07-14 | 2 | -65/+2 |
| | | |||||
| * | StickyCookies to addon | Aldo Cortesi | 2016-07-14 | 9 | -140/+199 |
| | | |||||
* | | Merge pull request #1351 from cortesi/anticache | Aldo Cortesi | 2016-07-14 | 8 | -21/+43 |
|\| | | | | | AntiCache to addon | ||||
| * | Merge remote-tracking branch 'upstream/master' into anticache | Aldo Cortesi | 2016-07-14 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1350 from cortesi/addons-cleanup | Aldo Cortesi | 2016-07-14 | 8 | -19/+39 |
|\ \ | | | | | | | Addons cleanup | ||||
* \ \ | Merge pull request #1349 from cortesi/addons | Aldo Cortesi | 2016-07-14 | 12 | -85/+63 |
|\ \ \ | | | | | | | | | Addons: StickyAuth | ||||
| | | * | AntiCache to addon | Aldo Cortesi | 2016-07-14 | 8 | -21/+43 |
| | |/ | |||||
| | * | Disable OSX tests on Travis for now | Aldo Cortesi | 2016-07-14 | 1 | -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 Options | Aldo Cortesi | 2016-07-14 | 6 | -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 Cortesi | 2016-07-14 | 1 | -3/+11 |
| |/ | |||||
| * | Move StickyAuth into addon | Aldo Cortesi | 2016-07-14 | 11 | -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.5 | Aldo Cortesi | 2016-07-14 | 1 | -3/+1 |
|/ | | | | Thanks to @resam and @dwfreed for pointing this out |