aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix mergeThomas Kriechbaumer2017-02-023-10/+11
|
* Merge pull request #1979 from 0neblock/masterMaximilian Hils2017-02-021-1/+1
|\ | | | | Fixed following on flowlist
| * Fixed following on flowlistAidan Cyr2017-02-021-1/+1
| | | | | | Fixed a focus_follow was missed when options were cleaned up.
* | Merge pull request #1980 from Kriechi/improve-testsThomas Kriechbaumer2017-02-0259-620/+533
|\ \ | |/ |/| improve tests
| * adapt coverage checksThomas Kriechbaumer2017-02-022-8/+4
| |
| * replace tutils.raises with pytest.raises + shimThomas Kriechbaumer2017-02-0252-516/+465
| |
| * cleanup test utilsThomas Kriechbaumer2017-02-0211-99/+67
|/
* Merge pull request #1959 from Kriechi/coverage-failThomas Kriechbaumer2017-02-0216-23/+275
|\ | | | | add test coverage protection
| * add test coverage protectionThomas Kriechbaumer2017-02-025-6/+131
| |
| * increase test coverageThomas Kriechbaumer2017-02-0211-17/+144
|/
* fix console testThomas Kriechbaumer2017-02-021-1/+1
|
* fix linting errorThomas Kriechbaumer2017-02-021-1/+0
|
* tests++ (#1976)Maximilian Hils2017-02-011-1/+9
|
* Add except clause to catch script parsing errors (#1929)lymanZerga112017-02-014-11/+23
|
* Merge pull request #1948 from amm0nite/fix_dns_spoofing_exampleMaximilian Hils2017-02-012-19/+54
|\ | | | | Fix for dns_spoofing.py example
| * Better testAmmonite2017-01-311-1/+7
| |
| * Add a test for the host replacementAmmonite2017-01-301-0/+16
| |
| * Reset the host header to the correct destinationAmmonite2017-01-301-0/+1
| |
| * Store original host in flow metadataAmmonite2017-01-291-7/+5
| |
| * Fix host extractionAmmonite2017-01-221-1/+1
| |
| * Follow PEP-8 and add commentAmmonite2017-01-221-5/+8
| |
| * Add blank lines for lintAmmonite2017-01-211-0/+2
| |
| * Change class nameAmmonite2017-01-201-2/+2
| |
| * Get the the original header in requestheaders instead of requestAmmonite2017-01-201-19/+28
| |
* | Merge pull request #1974 from cortesi/setheadersAldo Cortesi2017-02-016-93/+73
|\ \ | | | | | | Regularise setheaders options
| * | Regularise setheaders optionsAldo Cortesi2017-02-016-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/replaceAldo Cortesi2017-02-017-169/+159
|\| | | | | | | | Revamp replacement hooks
| * | Revamp replacement hooksAldo Cortesi2017-02-017-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/optnameAldo Cortesi2017-02-0113-179/+189
|\ \ | | | | | | Consolidate option names
| * | Consolidate option namesAldo Cortesi2017-01-3013-179/+189
| | | | | | | | | | | | | | | | | | - Onboarding app options to onboarding* - Console-specific options to console_* - Web-specific options to web_*
* | | fully test addonmanager (#1970)Thomas Kriechbaumer2017-01-311-0/+12
| | |
* | | Merge pull request #1964 from mhils/new-contribution-docsMaximilian Hils2017-01-3112-129/+62
|\ \ \ | | | | | | | | New contribution docs
| * | | README: py.test -> pytestMaximilian Hils2017-01-301-4/+4
| | | |
| * | | always use 'venv' as virtualenv folderMaximilian Hils2017-01-303-18/+15
| | | |
| * | | add contributing section to README, remove autoenvMaximilian Hils2017-01-302-14/+12
| | | |
| * | | rework README dev sectionsMaximilian Hils2017-01-291-36/+25
| | | |
| * | | add contributing section that redirects to READMEMaximilian Hils2017-01-293-3/+15
| | | |
| * | | remove outdated testing section from docsMaximilian Hils2017-01-292-48/+0
| | | |
| * | | remove outdated architecture section from docsMaximilian Hils2017-01-295-15/+0
| | | |
* | | | Update shim path (#1968)Markus Unterwaditzer2017-01-301-1/+1
| | | |
* | | | :see_no_evil:Maximilian Hils2017-01-301-0/+2
|/ / /
* | | Merge pull request #1963 from cortesi/coverAldo Cortesi2017-01-295-20/+73
|\| | | | | | | | addons: unit tests to 100%
| * | addons: unit tests to 100%Aldo Cortesi2017-01-295-20/+73
|/ / | | | | | | | | This patch pushes the coverage of ./tests/mitproxy/addons to 100% of the addons module.
* | fix newlines on windowsThomas Kriechbaumer2017-01-251-5/+5
| |
* | fix alpn requirement in web testsThomas Kriechbaumer2017-01-251-1/+1
| |
* | simplify termlog outfile handlingThomas Kriechbaumer2017-01-252-22/+28
| |
* | write errors to stderr (#1952)nish212017-01-252-7/+17
| |
* | Merge pull request #1957 from s4chin/add-body-filtersMaximilian Hils2017-01-242-276/+453
|\ \ | | | | | | web: Add body filters
| * | web: Add body filtersSachin Kelkar2017-01-242-276/+453
|/ /
* | Merge pull request #1956 from Kriechi/version-stringThomas Kriechbaumer2017-01-232-1/+19
|\ \ | | | | | | improve version specifiers
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 14:26:17 +0000