aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2264 from cortesi/optionsAldo Cortesi2017-04-2644-518/+413
|\ | | | | Change the way addons handle options
| * configure(options, updated) -> configure(updated)Aldo Cortesi2017-04-2629-102/+99
| | | | | | | | | | Options are now available globally on ctx, so the first argument of configure is redundant.
| * Move options into ctxAldo Cortesi2017-04-2617-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 testingAldo Cortesi2017-04-269-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/addonrevampAldo Cortesi2017-04-2634-533/+448
|\| | | | | Revamp how addons work
| * Revamp how addons workAldo Cortesi2017-04-2534-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-devMaximilian Hils2017-04-254-52/+245
|\ \ | |/ |/| [web] Coverage++ for ducks/flows.js
| * Fix the tests for flows actions.Matthew Shao2017-04-252-169/+31
| |
| * Merge branch 'jest-dev' of https://github.com/MatthewShao/mitmproxy into ↵Matthew Shao2017-04-2527-101/+368
| |\ | | | | | | | | | jest-dev
| | * simplify selectRelative, add example for action testingMaximilian Hils2017-04-244-98/+120
| | |
| | * [web] Coverage++ for ducks/flows.jsMatthew Shao2017-04-241-3/+158
| |/ |/|
* | Merge pull request #2256 from ujjwal96/ip-formattingThomas Kriechbaumer2017-04-222-3/+4
|\ \ | | | | | | Fixed formatting in mitmdump
| * | Fixed formatting in mitmdumpUjjwal Verma2017-04-222-3/+4
|/ /
* | [requires.io] dependency update on master branch (#2252)Maximilian Hils2017-04-201-1/+1
| |
* | [requires.io] dependency update on master branch (#2241)Maximilian Hils2017-04-171-2/+2
| |
* | Merge pull request #2240 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-04-161-1/+1
|\ \ | | | | | | [requires.io] dependency update on master branch
| * | Update setup.pyMaximilian Hils2017-04-161-1/+1
| | |
| * | [requires.io] dependency updaterequires.io2017-04-161-1/+1
|/ /
* | Merge pull request #2239 from Kriechi/update-kaitaiMaximilian Hils2017-04-1610-28/+69
|\ \ | | | | | | update kaitai and recompile formats
| * | manually fix importsThomas Kriechbaumer2017-04-162-7/+5
| | |
| * | update kaitai and recompile formatsThomas Kriechbaumer2017-04-1610-31/+74
|/ /
* | Merge pull request #2234 from ujjwal96/ip-formattingMaximilian Hils2017-04-105-6/+32
|\ \ | | | | | | Fixes IP address formatting #2109
| * | Fixes #2109Ujjwal Verma2017-04-095-6/+32
|/ /
* | Merge pull request #2232 from r1b/masterMaximilian Hils2017-04-092-1/+4
|\ \ | | | | | | fixes ipv6 authority form parsing in CONNECT
| * | fixes ipv6 authority form parsing in CONNECTRobert C Jensen2017-04-072-1/+4
|/ /
* | Merge pull request #2227 from vinaydargar/grammarphrasingMaximilian Hils2017-04-042-2/+2
|\ \ | | | | | | Replace phrase 'the the' in 2 places
| * | Replace phrase 'the the' in 2 placesVinay Dargar2017-04-022-2/+2
|/ / | | | | | | Replaced with the appropriate "in the" and "to the". There are multiple other occurences of this but they are in upstream python modules.
* | Merge pull request #2224 from jonathanrfisher1/patch-1Thomas Kriechbaumer2017-03-291-4/+4
|\ \ | | | | | | Replace phrase "an TLS" with "a TLS"
| * | Replace phrase "an TLS" with "a TLS"jonathanrfisher12017-03-291-4/+4
|/ / | | | | Updating usage of 'a' or 'an' to be more consistent with general English grammatical rules. TLS is pronounced with a consonant sound for both the expanded and abbreviated versions.
* | Merge pull request #2223 from krsoninikhil/empty-logbufferThomas Kriechbaumer2017-03-291-0/+16
|\ \ | | | | | | Add tests for set_focus
| * | Add tests for set_focusNikhil Soni2017-03-291-0/+16
| | |
* | | Merge pull request #2222 from BasThomas/patch-1Thomas Kriechbaumer2017-03-291-6/+6
|\ \ \ | | | | | | | | Add syntax highlighting to Readme
| * | | Add syntax highlighting to ReadmeBas Broek2017-03-291-6/+6
|/ / /
* | | Merge pull request #2220 from krsoninikhil/empty-logbufferThomas Kriechbaumer2017-03-281-0/+4
|\| | | | | | | | eventlog: Override set_focus to check for index error
| * | Override set_focus to check for index errorNikhil Soni2017-03-291-0/+4
|/ /
| * [web] Coverage++ for ducks/flows.jsMatthew Shao2017-03-281-3/+158
|/
* Merge pull request #2212 from MatthewShao/jest-devMaximilian Hils2017-03-273-2/+35
|\ | | | | [web] Update Jest config and coverage ++
| * [web] Minor fixes for the test.Matthew Shao2017-03-262-7/+10
| |
| * [web] Exclude src/js/filt/filt.js from coverage report.Matthew Shao2017-03-261-1/+4
| |
| * [web] Add JS coverage to codecov.Matthew Shao2017-03-262-3/+7
| |
| * [web] Reach 100% coverage for ducks/settings.jsMatthew Shao2017-03-261-0/+23
| |
* | Merge pull request #2215 from mitmproxy/proxapp.local-1Maximilian Hils2017-03-261-2/+2
|\ \ | | | | | | proxapp -> proxapp.local
| * | proxapp -> proxapp.localMaximilian Hils2017-03-261-2/+2
|/ / | | | | Chrome doesn't like it if there's no TLD.
* | Merge pull request #2213 from Kriechi/concurrent-coverageMaximilian Hils2017-03-251-4/+4
|\ \ | |/ |/| fix #2201
| * fix #2201Thomas Kriechbaumer2017-03-251-4/+4
|/
* Merge pull request #2206 from cortesi/addonloadAldo Cortesi2017-03-2528-70/+209
|\ | | | | addon refactoring
| * addon loader: add boot_into, which replaces returning from start()Aldo Cortesi2017-03-2523-48/+158
| | | | | | | | | | While we're here, expand test coverage for addonmanager to 100%, and promote to individual coverage.
| * addons: an addonmanager.Loader is now passed to the load() eventAldo Cortesi2017-03-252-3/+32
| |
| * addons: start -> load throughoutAldo Cortesi2017-03-2525-49/+49
|/
* Merge pull request #2208 from Kriechi/bump-h2Maximilian Hils2017-03-243-8/+16
|\ | | | | bump h2
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 00:04:12 +0000