| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | 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 | |||||
| | * | | Replace phrase 'the the' in 2 places | Vinay Dargar | 2017-04-02 | 2 | -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-1 | Thomas Kriechbaumer | 2017-03-29 | 1 | -4/+4 | |
| |\ \ | | | | | | | Replace phrase "an TLS" with "a TLS" | |||||
| | * | | Replace phrase "an TLS" with "a TLS" | jonathanrfisher1 | 2017-03-29 | 1 | -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-logbuffer | Thomas Kriechbaumer | 2017-03-29 | 1 | -0/+16 | |
| |\ \ | | | | | | | Add tests for set_focus | |||||
| | * | | Add tests for set_focus | Nikhil Soni | 2017-03-29 | 1 | -0/+16 | |
| | | | | ||||||
| * | | | Merge pull request #2222 from BasThomas/patch-1 | Thomas Kriechbaumer | 2017-03-29 | 1 | -6/+6 | |
| |\ \ \ | | | | | | | | | Add syntax highlighting to Readme | |||||
| | * | | | Add syntax highlighting to Readme | Bas Broek | 2017-03-29 | 1 | -6/+6 | |
| |/ / / | ||||||
| * | | | Merge pull request #2220 from krsoninikhil/empty-logbuffer | Thomas Kriechbaumer | 2017-03-28 | 1 | -0/+4 | |
| |\| | | | | | | | | eventlog: Override set_focus to check for index error | |||||
| | * | | Override set_focus to check for index error | Nikhil Soni | 2017-03-29 | 1 | -0/+4 | |
| |/ / | ||||||
| | * | [web] Coverage++ for ducks/flows.js | Matthew Shao | 2017-03-28 | 1 | -3/+158 | |
| |/ | ||||||
| * | Merge pull request #2212 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-27 | 3 | -2/+35 | |
| |\ | | | | | [web] Update Jest config and coverage ++ | |||||
| | * | [web] Minor fixes for the test. | Matthew Shao | 2017-03-26 | 2 | -7/+10 | |
| | | | ||||||
| | * | [web] Exclude src/js/filt/filt.js from coverage report. | Matthew Shao | 2017-03-26 | 1 | -1/+4 | |
| | | | ||||||
| | * | [web] Add JS coverage to codecov. | Matthew Shao | 2017-03-26 | 2 | -3/+7 | |
| | | | ||||||
| | * | [web] Reach 100% coverage for ducks/settings.js | Matthew Shao | 2017-03-26 | 1 | -0/+23 | |
| | | | ||||||
| * | | Merge pull request #2215 from mitmproxy/proxapp.local-1 | Maximilian Hils | 2017-03-26 | 1 | -2/+2 | |
| |\ \ | | | | | | | proxapp -> proxapp.local | |||||
| | * | | proxapp -> proxapp.local | Maximilian Hils | 2017-03-26 | 1 | -2/+2 | |
| |/ / | | | | | Chrome doesn't like it if there's no TLD. | |||||
| * | | Merge pull request #2213 from Kriechi/concurrent-coverage | Maximilian Hils | 2017-03-25 | 1 | -4/+4 | |
| |\ \ | |/ |/| | fix #2201 | |||||
| | * | fix #2201 | Thomas Kriechbaumer | 2017-03-25 | 1 | -4/+4 | |
| |/ | ||||||
| * | Merge pull request #2206 from cortesi/addonload | Aldo Cortesi | 2017-03-25 | 28 | -70/+209 | |
| |\ | | | | | addon refactoring | |||||
| | * | addon loader: add boot_into, which replaces returning from start() | Aldo Cortesi | 2017-03-25 | 23 | -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() event | Aldo Cortesi | 2017-03-25 | 2 | -3/+32 | |
| | | | ||||||
| | * | addons: start -> load throughout | Aldo Cortesi | 2017-03-25 | 25 | -49/+49 | |
| |/ | ||||||
| * | Merge pull request #2208 from Kriechi/bump-h2 | Maximilian Hils | 2017-03-24 | 3 | -8/+16 | |
| |\ | | | | | bump h2 | |||||
| | * | bump h2 | Thomas Kriechbaumer | 2017-03-24 | 3 | -8/+16 | |
| |/ | ||||||
| * | Merge pull request #2207 from nikofil/scripts-redirect-stdout | Aldo Cortesi | 2017-03-24 | 3 | -7/+38 | |
| |\ | | | | | scripts: redirect stdout to ctx.log.warn | |||||
| | * | scripts: redirect stdout to ctx.log.warn | Nikos Filippakis | 2017-03-24 | 3 | -7/+38 | |
| | | | | | | | | | | | | | | | Redirect messages written to stdout in scripts to ctx.log.warn. (closes #1530) Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch> | |||||
| * | | Merge pull request #2204 from cortesi/consoleopts | Aldo Cortesi | 2017-03-24 | 3 | -11/+64 | |
| |\ \ | | | | | | | console options: load and save options to and from file | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |