Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | command: save.file flowspec path -> None | Aldo Cortesi | 2017-04-27 | 8 | -41/+89 |
| | | | | | | | | | Our first user-facing command. The following commands do the obvious things: save.file @marked /tmp/flows save.file @focus /tmp/flows save.file @hidden /tmp/flows save.file "~m get" /tmp/flows | ||||
* | addons.streamfile -> addons.save | Aldo Cortesi | 2017-04-27 | 9 | -38/+38 |
| | | | | | | | Options: streamfile -> save_stream_file streamfile_filter -> save_stream_filter | ||||
* | console: flow resolution command | Aldo Cortesi | 2017-04-27 | 9 | -20/+122 |
| | | | | | | | This is our first built-in command, which will be used by very many other commands. Also add a --commands option to dump all commands, analogous to --options. | ||||
* | console: very basic interactive command executor | Aldo Cortesi | 2017-04-27 | 7 | -5/+44 |
| | |||||
* | Basic outline of the command subsystem | Aldo Cortesi | 2017-04-27 | 7 | -42/+160 |
| | | | | | - Add a command manager - Sketch out the type system with a few simple supported types | ||||
* | Merge pull request #2265 from cortesi/addons | Aldo Cortesi | 2017-04-27 | 12 | -155/+141 |
|\ | | | | | Addons and addon testing | ||||
| * | Addons and addon testing | Aldo Cortesi | 2017-04-26 | 12 | -155/+141 |
| | | | | | | | | | | | | | | | | - Fix some loading sequence bugs affecting command-line script invocation - Allow addons to over-ride existing options (with a warning). We need this for reloading. - Convert har_dump to new-style arguments, fix and re-instate its test suite. - Covnert miscelaneous other exmples to new-style args. | ||||
* | | Merge pull request #2270 from F1ashhimself/master | Maximilian Hils | 2017-04-26 | 1 | -1/+1 |
|\ \ | | | | | | | Update readme for complex examples | ||||
| * | | Update readme for complex examples | Maksim Beloborodko | 2017-04-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2269 from mhils/issue-2250 | Maximilian Hils | 2017-04-26 | 4 | -50/+58 |
|\ \ \ | |/ / |/| | | fix #2250, add type info to cookie module | ||||
| * | | fix #2250, add type info to cookie module | Maximilian Hils | 2017-04-26 | 4 | -50/+58 |
| | | | |||||
* | | | Merge pull request #2258 from mhils/readfile | Maximilian Hils | 2017-04-26 | 10 | -152/+147 |
|\ \ \ | | | | | | | | | Integrate readstdin into readfile | ||||
| * | | | separate reading from stdin into its own addon | Maximilian Hils | 2017-04-26 | 6 | -72/+94 |
| | | | | |||||
| * | | | integrate readstdin into readfile addon | Maximilian Hils | 2017-04-26 | 5 | -127/+92 |
| | | | | |||||
| * | | | typecheck: add support for typing.Any | Maximilian Hils | 2017-04-26 | 2 | -0/+8 |
| | |/ | |/| | |||||
* | | | Merge pull request #2268 from mhils/issue-2257 | Maximilian Hils | 2017-04-26 | 4 | -79/+110 |
|\ \ \ | | | | | | | | | fix #2257 | ||||
| * | | | fix #2257 | Maximilian Hils | 2017-04-26 | 4 | -79/+110 |
| | | | | |||||
* | | | | Merge pull request #2267 from MatthewShao/jest-dev | Maximilian Hils | 2017-04-26 | 2 | -0/+164 |
|\ \ \ \ | |_|_|/ |/| | | | [web] Add coverage for js/utils.js, js/flow/utils.js | ||||
| * | | | [web] Add coverage for js/utils.js, js/flow/utils.js | Matthew Shao | 2017-04-26 | 2 | -0/+164 |
| | |/ | |/| | |||||
* | | | Merge pull request #2259 from mhils/2228 | Maximilian Hils | 2017-04-26 | 3 | -24/+20 |
|\ \ \ | |_|/ |/| | | fix #2228 | ||||
| * | | fix #2228 | Maximilian Hils | 2017-04-26 | 3 | -24/+20 |
| |/ | |||||
* / | clarify that `--cert` expects a leaf certificate | Maximilian Hils | 2017-04-26 | 1 | -1/+1 |
|/ | | | refs #2254 | ||||
* | Merge pull request #2262 from Kriechi/reduced-coverage++ | Aldo Cortesi | 2017-04-26 | 11 | -18/+16 |
|\ | | | | | improve tests (extracted from #2011) | ||||
| * | improve tests | Thomas Kriechbaumer | 2017-04-25 | 11 | -18/+16 |
| | | |||||
* | | Merge pull request #2264 from cortesi/options | Aldo Cortesi | 2017-04-26 | 44 | -518/+413 |
|\ \ | | | | | | | Change the way addons handle options | ||||
| * | | configure(options, updated) -> configure(updated) | Aldo Cortesi | 2017-04-26 | 29 | -102/+99 |
| | | | | | | | | | | | | | | | Options are now available globally on ctx, so the first argument of configure is redundant. | ||||
| * | | Move options into ctx | Aldo Cortesi | 2017-04-26 | 17 | -235/+199 |
| | | | | | | | | | | | | | | | | | | | | | Many addons currently save options on configure(), either as individual options or sometimes by saving the entire options object. The current options should simply be available on the ctx object, simplifying state management for addons considerably. | ||||
| * | | Remove watchdog, solidify script testing | Aldo Cortesi | 2017-04-26 | 9 | -184/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Remove the watchdog dependency. We now just stat the script file every 2 seconds to check for an updated mtime. - Further solidify our script testing, and in particular make the example tests nicer. These should exemplify how we want users to test their own addon scripts. More work on addon testing to follow. | ||||
* | | | Merge pull request #2261 from cortesi/addonrevamp | Aldo Cortesi | 2017-04-26 | 34 | -533/+448 |
|\| | | | | | | | | Revamp how addons work | ||||
| * | | Revamp how addons work | Aldo Cortesi | 2017-04-25 | 34 | -533/+448 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Addons now nest, which means that addons can manage addons. This has a number of salutary effects - the scripts addon no longer has to poke into the global addons list, we no longer have to replace/remove/boot-outof parent addons when we load scripts, and this paves the way for making our top-level tools into addons themselves. - All addon calls are now wrapped in a safe execution environment where exceptions are caught, and output to stdout/stderr are intercepted and turned into logs. - We no longer support script arguments in sys.argv - creating an option properly is the only way to pass arguments. This means that all scripts are always directly controllable from interctive tooling, and that arguments are type-checked. For now, I've disabled testing of the har dump example - it needs to be moved to the new argument handling, and become a class addon. I'll address that in a separate patch. | ||||
* | | Merge pull request #2219 from MatthewShao/jest-dev | Maximilian Hils | 2017-04-25 | 4 | -52/+245 |
|\ \ | |/ |/| | [web] Coverage++ for ducks/flows.js | ||||
| * | Fix the tests for flows actions. | Matthew Shao | 2017-04-25 | 2 | -169/+31 |
| | | |||||
| * | Merge branch 'jest-dev' of https://github.com/MatthewShao/mitmproxy into ↵ | Matthew Shao | 2017-04-25 | 27 | -101/+368 |
| |\ | | | | | | | | | | jest-dev | ||||
| | * | simplify selectRelative, add example for action testing | Maximilian Hils | 2017-04-24 | 4 | -98/+120 |
| | | | |||||
| | * | [web] Coverage++ for ducks/flows.js | Matthew Shao | 2017-04-24 | 1 | -3/+158 |
| |/ |/| | |||||
* | | Merge pull request #2256 from ujjwal96/ip-formatting | Thomas Kriechbaumer | 2017-04-22 | 2 | -3/+4 |
|\ \ | | | | | | | Fixed formatting in mitmdump | ||||
| * | | Fixed formatting in mitmdump | Ujjwal Verma | 2017-04-22 | 2 | -3/+4 |
|/ / | |||||
* | | [requires.io] dependency update on master branch (#2252) | Maximilian Hils | 2017-04-20 | 1 | -1/+1 |
| | | |||||
* | | [requires.io] dependency update on master branch (#2241) | Maximilian Hils | 2017-04-17 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2240 from mitmproxy/requires-io-master | Thomas Kriechbaumer | 2017-04-16 | 1 | -1/+1 |
|\ \ | | | | | | | [requires.io] dependency update on master branch | ||||
| * | | Update setup.py | Maximilian Hils | 2017-04-16 | 1 | -1/+1 |
| | | | |||||
| * | | [requires.io] dependency update | requires.io | 2017-04-16 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2239 from Kriechi/update-kaitai | Maximilian Hils | 2017-04-16 | 10 | -28/+69 |
|\ \ | | | | | | | update kaitai and recompile formats | ||||
| * | | manually fix imports | Thomas Kriechbaumer | 2017-04-16 | 2 | -7/+5 |
| | | | |||||
| * | | update kaitai and recompile formats | Thomas Kriechbaumer | 2017-04-16 | 10 | -31/+74 |
|/ / | |||||
* | | Merge pull request #2234 from ujjwal96/ip-formatting | Maximilian Hils | 2017-04-10 | 5 | -6/+32 |
|\ \ | | | | | | | Fixes IP address formatting #2109 | ||||
| * | | Fixes #2109 | Ujjwal Verma | 2017-04-09 | 5 | -6/+32 |
|/ / | |||||
* | | Merge pull request #2232 from r1b/master | Maximilian Hils | 2017-04-09 | 2 | -1/+4 |
|\ \ | | | | | | | fixes ipv6 authority form parsing in CONNECT | ||||
| * | | fixes ipv6 authority form parsing in CONNECT | Robert C Jensen | 2017-04-07 | 2 | -1/+4 |
|/ / | |||||
* | | Merge pull request #2227 from vinaydargar/grammarphrasing | Maximilian Hils | 2017-04-04 | 2 | -2/+2 |
|\ \ | | | | | | | Replace phrase 'the the' in 2 places |