Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | fix merge | Thomas Kriechbaumer | 2017-02-02 | 3 | -10/+11 | |
| | ||||||
* | Merge pull request #1979 from 0neblock/master | Maximilian Hils | 2017-02-02 | 1 | -1/+1 | |
|\ | | | | | Fixed following on flowlist | |||||
| * | Fixed following on flowlist | Aidan Cyr | 2017-02-02 | 1 | -1/+1 | |
| | | | | | | Fixed a focus_follow was missed when options were cleaned up. | |||||
* | | Merge pull request #1980 from Kriechi/improve-tests | Thomas Kriechbaumer | 2017-02-02 | 59 | -620/+533 | |
|\ \ | |/ |/| | improve tests | |||||
| * | adapt coverage checks | Thomas Kriechbaumer | 2017-02-02 | 2 | -8/+4 | |
| | | ||||||
| * | replace tutils.raises with pytest.raises + shim | Thomas Kriechbaumer | 2017-02-02 | 52 | -516/+465 | |
| | | ||||||
| * | cleanup test utils | Thomas Kriechbaumer | 2017-02-02 | 11 | -99/+67 | |
|/ | ||||||
* | Merge pull request #1959 from Kriechi/coverage-fail | Thomas Kriechbaumer | 2017-02-02 | 16 | -23/+275 | |
|\ | | | | | add test coverage protection | |||||
| * | add test coverage protection | Thomas Kriechbaumer | 2017-02-02 | 5 | -6/+131 | |
| | | ||||||
| * | increase test coverage | Thomas Kriechbaumer | 2017-02-02 | 11 | -17/+144 | |
|/ | ||||||
* | fix console test | Thomas Kriechbaumer | 2017-02-02 | 1 | -1/+1 | |
| | ||||||
* | fix linting error | Thomas Kriechbaumer | 2017-02-02 | 1 | -1/+0 | |
| | ||||||
* | tests++ (#1976) | Maximilian Hils | 2017-02-01 | 1 | -1/+9 | |
| | ||||||
* | Add except clause to catch script parsing errors (#1929) | lymanZerga11 | 2017-02-01 | 4 | -11/+23 | |
| | ||||||
* | Merge pull request #1948 from amm0nite/fix_dns_spoofing_example | Maximilian Hils | 2017-02-01 | 2 | -19/+54 | |
|\ | | | | | Fix for dns_spoofing.py example | |||||
| * | Better test | Ammonite | 2017-01-31 | 1 | -1/+7 | |
| | | ||||||
| * | Add a test for the host replacement | Ammonite | 2017-01-30 | 1 | -0/+16 | |
| | | ||||||
| * | Reset the host header to the correct destination | Ammonite | 2017-01-30 | 1 | -0/+1 | |
| | | ||||||
| * | Store original host in flow metadata | Ammonite | 2017-01-29 | 1 | -7/+5 | |
| | | ||||||
| * | Fix host extraction | Ammonite | 2017-01-22 | 1 | -1/+1 | |
| | | ||||||
| * | Follow PEP-8 and add comment | Ammonite | 2017-01-22 | 1 | -5/+8 | |
| | | ||||||
| * | Add blank lines for lint | Ammonite | 2017-01-21 | 1 | -0/+2 | |
| | | ||||||
| * | Change class name | Ammonite | 2017-01-20 | 1 | -2/+2 | |
| | | ||||||
| * | Get the the original header in requestheaders instead of request | Ammonite | 2017-01-20 | 1 | -19/+28 | |
| | | ||||||
* | | Merge pull request #1974 from cortesi/setheaders | Aldo Cortesi | 2017-02-01 | 6 | -93/+73 | |
|\ \ | | | | | | | Regularise setheaders options | |||||
| * | | Regularise setheaders options | Aldo Cortesi | 2017-02-01 | 6 | -93/+73 | |
| | | | | | | | | | | | | | | | | | | | | | | | | As per replacements: - Make the option type a string/tuple union - Localise parsing strictly within the addon - Adapt the console editor (we'll find a more elegant solution later) | |||||
* | | | Merge pull request #1973 from cortesi/replace | Aldo Cortesi | 2017-02-01 | 7 | -169/+159 | |
|\| | | | | | | | | Revamp replacement hooks | |||||
| * | | Revamp replacement hooks | Aldo Cortesi | 2017-02-01 | 7 | -169/+159 | |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replacement specifiers can be either strings or tuples. This lets us cope gracefully with command-line parsing (and posible quick interactive specification) without having to special-case replacement hooks, or have knowledge of hook specification leak outside the addon. We can also now use the same command-line spec format in config files. - Split replacement and replacement from file into separate addons and options. Files are now read on each replacement, so you can edit replacement files in place without restart. - Modernise the test suite to use addon test helpers. TODO: editing and displaying replace-from-file in console app | |||||
* | | Merge pull request #1965 from cortesi/optname | Aldo Cortesi | 2017-02-01 | 13 | -179/+189 | |
|\ \ | | | | | | | Consolidate option names | |||||
| * | | Consolidate option names | Aldo Cortesi | 2017-01-30 | 13 | -179/+189 | |
| | | | | | | | | | | | | | | | | | | - Onboarding app options to onboarding* - Console-specific options to console_* - Web-specific options to web_* | |||||
* | | | fully test addonmanager (#1970) | Thomas Kriechbaumer | 2017-01-31 | 1 | -0/+12 | |
| | | | ||||||
* | | | Merge pull request #1964 from mhils/new-contribution-docs | Maximilian Hils | 2017-01-31 | 12 | -129/+62 | |
|\ \ \ | | | | | | | | | New contribution docs | |||||
| * | | | README: py.test -> pytest | Maximilian Hils | 2017-01-30 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | always use 'venv' as virtualenv folder | Maximilian Hils | 2017-01-30 | 3 | -18/+15 | |
| | | | | ||||||
| * | | | add contributing section to README, remove autoenv | Maximilian Hils | 2017-01-30 | 2 | -14/+12 | |
| | | | | ||||||
| * | | | rework README dev sections | Maximilian Hils | 2017-01-29 | 1 | -36/+25 | |
| | | | | ||||||
| * | | | add contributing section that redirects to README | Maximilian Hils | 2017-01-29 | 3 | -3/+15 | |
| | | | | ||||||
| * | | | remove outdated testing section from docs | Maximilian Hils | 2017-01-29 | 2 | -48/+0 | |
| | | | | ||||||
| * | | | remove outdated architecture section from docs | Maximilian Hils | 2017-01-29 | 5 | -15/+0 | |
| | | | | ||||||
* | | | | Update shim path (#1968) | Markus Unterwaditzer | 2017-01-30 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | :see_no_evil: | Maximilian Hils | 2017-01-30 | 1 | -0/+2 | |
|/ / / | ||||||
* | | | Merge pull request #1963 from cortesi/cover | Aldo Cortesi | 2017-01-29 | 5 | -20/+73 | |
|\| | | | | | | | | addons: unit tests to 100% | |||||
| * | | addons: unit tests to 100% | Aldo Cortesi | 2017-01-29 | 5 | -20/+73 | |
|/ / | | | | | | | | | This patch pushes the coverage of ./tests/mitproxy/addons to 100% of the addons module. | |||||
* | | fix newlines on windows | Thomas Kriechbaumer | 2017-01-25 | 1 | -5/+5 | |
| | | ||||||
* | | fix alpn requirement in web tests | Thomas Kriechbaumer | 2017-01-25 | 1 | -1/+1 | |
| | | ||||||
* | | simplify termlog outfile handling | Thomas Kriechbaumer | 2017-01-25 | 2 | -22/+28 | |
| | | ||||||
* | | write errors to stderr (#1952) | nish21 | 2017-01-25 | 2 | -7/+17 | |
| | | ||||||
* | | Merge pull request #1957 from s4chin/add-body-filters | Maximilian Hils | 2017-01-24 | 2 | -276/+453 | |
|\ \ | | | | | | | web: Add body filters | |||||
| * | | web: Add body filters | Sachin Kelkar | 2017-01-24 | 2 | -276/+453 | |
|/ / | ||||||
* | | Merge pull request #1956 from Kriechi/version-string | Thomas Kriechbaumer | 2017-01-23 | 2 | -1/+19 | |
|\ \ | | | | | | | improve version specifiers |