Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move examples tests (#2199) | Thomas Kriechbaumer | 2017-03-22 | 4 | -85/+115 |
| | |||||
* | Factor out an io module | Aldo Cortesi | 2017-03-20 | 5 | -3/+3 |
| | | | | | Include tnetstring - we've made enough changes that this no longer belongs in contrib. | ||||
* | options: reraise when there's an error with a partial update | Aldo Cortesi | 2017-03-19 | 1 | -2/+6 |
| | | | | Fixes #2174 | ||||
* | options: choices for content views and tighten console order spec | Aldo Cortesi | 2017-03-19 | 1 | -5/+3 |
| | | | | Also clean up some leftovers from filter option name change. | ||||
* | dumper, mitmdump: kill filtstr | Aldo Cortesi | 2017-03-19 | 2 | -4/+4 |
| | | | | | Dumper now also uses view_filter. Passing arguments to mitmdump is now precisely equivalent to setting both filestream_filter and view_filter. | ||||
* | streamfile: add streamfile_filter and use it instead of filtstr | Aldo Cortesi | 2017-03-19 | 1 | -3/+5 |
| | |||||
* | optmanager: test coverage | Aldo Cortesi | 2017-03-19 | 1 | -1/+8 |
| | |||||
* | console options: add an overlay grid editor for sequence options | Aldo Cortesi | 2017-03-19 | 1 | -0/+12 |
| | |||||
* | optmanager: cope with bound methods in .subscribe | Aldo Cortesi | 2017-03-19 | 1 | -0/+15 |
| | | | | Fixes #2122 | ||||
* | options cleanups | Aldo Cortesi | 2017-03-19 | 1 | -3/+3 |
| | | | | | | - Move default client ciphers - no need to have a 10-line string default. - Add some style guidance on options help - Be consistent about reflowing options help | ||||
* | Rip out master handler mechanism | Aldo Cortesi | 2017-03-17 | 1 | -1/+0 |
| | | | | | All events are now handled by addons, and we no longer support any events on master. | ||||
* | Merge pull request #2168 from cortesi/handlers | Maximilian Hils | 2017-03-16 | 17 | -160/+113 |
|\ | | | | | Rip out old handlers mechanism - all events are now handled in addons | ||||
| * | Rip out master handler mechanism | Aldo Cortesi | 2017-03-16 | 12 | -57/+43 |
| | | | | | | | | | | All events are now handled by addons, and we no longer support any events on master. | ||||
| * | Remove last handlers in test suite | Aldo Cortesi | 2017-03-16 | 1 | -35/+21 |
| | | | | | | | | | | | | While we're here, make checking that there are NO logs on the proxy more efficient by setting a short timeout. This reduces total test suite running time by 15% on my system. | ||||
| * | Remove test handlers by using taddons.RecordingMaster | Aldo Cortesi | 2017-03-16 | 8 | -68/+49 |
| | | | | | | | | | | This also means expanding and tweaking the recording master API, which we reflect through the current test suite | ||||
| * | Move dump handlers to addon | Aldo Cortesi | 2017-03-16 | 1 | -1/+1 |
| | | |||||
* | | Fix test_format_xml with dot in path | Felix Yan | 2017-03-16 | 1 | -1/+1 |
|/ | | | When the path contains dot ".", replacing all dots will generate a non-exist result and raises a FileNotFoundError. Replacing only the last dot fixes this. | ||||
* | Merge pull request #2152 from cortesi/readfile | Aldo Cortesi | 2017-03-16 | 18 | -93/+194 |
|\ | | | | | Extract flow reading into addons | ||||
| * | Add a light-weight custom event system, use it for keepserving | Aldo Cortesi | 2017-03-16 | 13 | -46/+58 |
| | | | | | | | | | | | | | | This patch implements the lightweight event system I propose in #2144, adds a custom event "processing_complete" that is triggered after file read, client replay and server replay, and introduces a KeepServing addon to handle this for mitmdump. | ||||
| * | Clean up addonmanager interface | Aldo Cortesi | 2017-03-16 | 3 | -6/+8 |
| | | | | | | | | | | Clarify the plethora of invocation methods we've sprouted, correct some usages in the codebase. | ||||
| * | Extract flow reading into addons | Aldo Cortesi | 2017-03-15 | 5 | -53/+140 |
| | | | | | | | | | | | | | | | | This patch moves the final pieces of master functionality into addons. - Add a ReadFile addon to read from file - Add a separate ReadStdin addon to read from stdin, only used by mitmdump - Remove all methods that know about io and serialization from master.Master | ||||
* | | add Request.make | Maximilian Hils | 2017-03-15 | 2 | -2/+28 |
|/ | |||||
* | stateobject: automatically change id when copying | Maximilian Hils | 2017-03-14 | 2 | -4/+16 |
| | |||||
* | add connection ids | Maximilian Hils | 2017-03-14 | 1 | -0/+24 |
| | |||||
* | Merge pull request #2149 from mhils/multidictview-copy | Maximilian Hils | 2017-03-14 | 1 | -0/+9 |
|\ | | | | | Add MultiDictView.copy() | ||||
| * | add MultiDictView.copy | Maximilian Hils | 2017-03-14 | 1 | -0/+9 |
| | | |||||
* | | Merge pull request #2145 from mhils/ne | Maximilian Hils | 2017-03-14 | 3 | -11/+1 |
|\ \ | | | | | | | py3: __ne__ delegates to __eq__ by default | ||||
| * | | py3: __ne__ delegates to __eq__ by default | Maximilian Hils | 2017-03-14 | 3 | -11/+1 |
| | | | |||||
* | | | Merge pull request #2120 from ujjwal96/replace-from-file | Maximilian Hils | 2017-03-14 | 1 | -33/+36 |
|\ \ \ | |_|/ |/| | | Replace from file through replacement editor #1458 | ||||
| * | | Merge remote-tracking branch 'origin/master' into pr-2120 | Maximilian Hils | 2017-03-12 | 16 | -319/+321 |
| |\| | | | | | | | | | | | | | Conflicts: test/mitmproxy/addons/test_replace.py | ||||
| * | | replacements: error right away when file does not exist | Maximilian Hils | 2017-03-12 | 1 | -28/+30 |
| | | | |||||
| * | | minor fixes | Maximilian Hils | 2017-03-12 | 1 | -23/+20 |
| | | | |||||
| * | | Fixed Replacement test | Ujjwal Verma | 2017-03-09 | 1 | -5/+5 |
| | | | |||||
* | | | Enable custom options in config files | Aldo Cortesi | 2017-03-14 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | We also now ignore unknown options in config files by default, and print a warning if verbosity is incremented. | ||||
* | | | Move serialization methods out of Options | Aldo Cortesi | 2017-03-14 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | | | Attributes on options share a namespace with options themselves. It's getting too crowded on our Options object, so let's shift some obvious stuff into the module. | ||||
* | | | Optmanager: handle unknown options in value sets | Aldo Cortesi | 2017-03-14 | 1 | -0/+3 |
| | | | |||||
* | | | Show custom addon options in --options output | Aldo Cortesi | 2017-03-14 | 1 | -2/+2 |
| | | | |||||
* | | | Enable custom options for addons | Aldo Cortesi | 2017-03-14 | 11 | -29/+62 |
| |/ |/| | | | | | | | | | | | | | - Add an options parameter to the start() event. This is to be used by addons on startup to add custom options. - Add a running() event that is called once the proxy is up and running. - With the new paradigm we can't log during master __init__, so add a tiny termstatus addon to print proxy status to terminal once we're running. | ||||
* | | nuke tutils.tmpdir, use pytest tmpdir | Thomas Kriechbaumer | 2017-03-12 | 12 | -329/+273 |
| | | |||||
* | | Merge pull request #2118 from lymanZerga11/patch-3 | Maximilian Hils | 2017-03-11 | 1 | -0/+1 |
|\ \ | | | | | | | Update proxyauth.py to add proxyauth metadata | ||||
| * | | add tests | lymanZerga11 | 2017-03-09 | 1 | -1/+1 |
| | | | |||||
| * | | Add tests | lymanZerga11 | 2017-03-09 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #2114 from mitmproxy/fix-websocket-serialization | Thomas Kriechbaumer | 2017-03-10 | 2 | -3/+34 |
|\ \ \ | | | | | | | | | make websocket flows serializable | ||||
| * | | | make websocket flows serializable | Thomas Kriechbaumer | 2017-03-09 | 2 | -3/+34 |
| | |/ | |/| | | | | | | | fixes #2113 | ||||
* / | | disable h2c prior knowledge connections | Thomas Kriechbaumer | 2017-03-10 | 2 | -17/+39 |
|/ / | |||||
* | | core -> core_option_validation | Maximilian Hils | 2017-03-08 | 1 | -4/+4 |
| | | | | | | | | longer, but much clearer for devs who are unfamiliar with the codebase. | ||||
* | | change add_option parameter order | Maximilian Hils | 2017-03-08 | 2 | -24/+24 |
| | | | | | | | | | | name, type, value matches natural language ($x is a bool with a default value of $y) and also matches the python type annotation order of name: type = value | ||||
* | | unify server spec parsing | Maximilian Hils | 2017-03-08 | 2 | -20/+33 |
| | | |||||
* | | Carefully re-add a small number of short flags | Aldo Cortesi | 2017-03-07 | 1 | -4/+6 |
| | | | | | | | | | | The mechanism for booleans attaches the short flag to whatever the opposite of the default is. | ||||
* | | Change the way proxy authetication is specified | Aldo Cortesi | 2017-03-07 | 2 | -20/+22 |
| | | | | | | | | | | | | We now have one option "proxyauth". If this is "any", we accept any credentials, if it starts with an @ it's treated as a path to an htpasswd file, if it is of the form username:password it's a single-user credential. |