Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2945 from kajojify/shortening | Aldo Cortesi | 2018-03-05 | 1 | -0/+28 |
|\ | | | | | Polite shortening of statusbar messages. Fix #1433 | ||||
| * | Minor fixes. | Miroslav | 2018-03-03 | 1 | -12/+11 |
| | | | | | | | | | | | | | | Renaming prep_message method to shorten_message. Docstring. \u2026 instead of .... max_width parameter. | ||||
| * | Finalization of tests. Conditions rewritten again. | Miroslav | 2018-03-02 | 1 | -19/+23 |
| | | |||||
| * | Initial tests. New conditions. | Miroslav | 2018-03-01 | 1 | -0/+25 |
| | | |||||
* | | Merge pull request #2868 from kira0204/data-crash | Maximilian Hils | 2018-03-04 | 1 | -2/+2 |
|\ \ | | | | | | | Fix crashing when editing form with random data, fix #2794 | ||||
| * | | Testing | kira0204 | 2018-02-19 | 1 | -1/+1 |
| | | | |||||
| * | | Adding test | kira0204 | 2018-02-16 | 1 | -1/+1 |
| | | | |||||
* | | | clean up ProxyConfig | Maximilian Hils | 2018-02-27 | 3 | -24/+20 |
| |/ |/| | | | | | | | some of these options weren't even used anymore, others only in one place where it makes sense to use options directly. | ||||
* | | Start consolidating core options | Aldo Cortesi | 2018-02-26 | 10 | -98/+59 |
| | | | | | | | | | | | | | | | | | | | | This is a preparatory patch that paves the way to consolidating our core options in the core addon. It amalgamates the core_option_validation and core addons, prepares the test suite for a world where options live in core, and moves over two trivial options as a trial balloon. From here, things will get harder, but at the end of the process we'll have a core that's responsive to options. | ||||
* | | Split dumper_filter off from view_filter | Aldo Cortesi | 2018-02-26 | 2 | -6/+6 |
| | | | | | | | | These don't even do the same thing. | ||||
* | | Revamp verbosity options | Aldo Cortesi | 2018-02-26 | 5 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | Split verbosity into termlog_verbosity and console_eventlog_verbosity. This patch also removes printing to console if there are unknown options in the command-line. Options now live in separate addons, so having uknown options remaining is common and expected. We definitely shoould have some other way for users to see what was ignored so they can catch typos and the like, but that's a different patch. | ||||
* | | Merge pull request #2909 from fristonio/Fix-2867 | Aldo Cortesi | 2018-02-25 | 1 | -0/+9 |
|\ \ | | | | | | | Fix test fails in test_xss_scanner when running tox without internet connection. | ||||
| * | | Fix test fails in test_xss_scanner when running tox without internet ↵ | Deepesh Pathak | 2018-02-24 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | connections. - Add mock implementation for gethostbyname in test_xss_scanner. - Fix failed tests when running tox without internet connection. - Fixes #2867 | ||||
* | | | Misc. typos | luz.paz | 2018-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found via `codespell -q 3 -I ../mitmproxy-word-whitelist.txt` Where whitelist contains: ``` cas doubleclick nd ot seeked statics te thru ``` | ||||
* | | | Merge pull request #2907 from cortesi/optionscomp | Aldo Cortesi | 2018-02-25 | 7 | -32/+18 |
|\ \ \ | |/ / |/| | | Start moving more complicated options over to /addons | ||||
| * | | addon options: proxyauth to /addons | Aldo Cortesi | 2018-02-24 | 2 | -7/+8 |
| | | | |||||
| * | | Split default_contentview into dumper_* and console_* varieties | Aldo Cortesi | 2018-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Then move the new options into their respective addons. This was a shared option, and things are much much simpler if it isn't. | ||||
| * | | Move intercept options to addon | Aldo Cortesi | 2018-02-24 | 2 | -16/+1 |
| | | | | | | | | | | | | | | | | | | | | | As part of this, we zap an un-needed console command and use a boolean toggle setter instead. Also remove an ancient regression test that breaks encapsulation. | ||||
| * | | flow_detail option to /addons/dumper | Aldo Cortesi | 2018-02-24 | 2 | -8/+8 |
| | | | |||||
* | | | Merge branch 'master' into opts | Aldo Cortesi | 2018-02-24 | 2 | -0/+37 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge pull request #2886 from tran-tien-dat/set-cookie | Aldo Cortesi | 2018-02-24 | 1 | -0/+21 |
| |\ \ | | | | | | | | | Parse Set-Cookie header more permissively. Fix #2829 | ||||
| | * | | Fix #2829 | Tran Tien Dat | 2018-02-21 | 1 | -0/+21 |
| | | | | |||||
| * | | | Fix an issue with quoting and commands | Aldo Cortesi | 2018-02-23 | 1 | -0/+16 |
| |/ / | | | | | | | | | | | | | Previously, quotes would disappear during editing, making it impossible to enter command arguments with spaces. | ||||
* | | | Resolve some left-over cross-addon dependencies | Aldo Cortesi | 2018-02-24 | 2 | -6/+3 |
| | | | |||||
* | | | addon options: upstream_auth | Aldo Cortesi | 2018-02-24 | 1 | -2/+2 |
| | | | | | | | | | | | | Also the last "easy" option to shift. | ||||
* | | | addon options: stickycookie, streambodies | Aldo Cortesi | 2018-02-24 | 2 | -9/+9 |
| | | | |||||
* | | | addon options: setheaders, stickyauth | Aldo Cortesi | 2018-02-24 | 4 | -22/+16 |
| | | | |||||
* | | | addon options: readfile, save, script | Aldo Cortesi | 2018-02-24 | 1 | -5/+5 |
| | | | |||||
* | | | addon options: migrate replace, simplify taddons.context | Aldo Cortesi | 2018-02-24 | 1 | -5/+5 |
| | | | |||||
* | | | addon options: shift server_replay options | Aldo Cortesi | 2018-02-24 | 1 | -16/+16 |
| | | | |||||
* | | | addon options: shift keepserving and onboarding options | Aldo Cortesi | 2018-02-24 | 3 | -12/+13 |
| | | | |||||
* | | | client options: migrate allowremote and clientplayback | Aldo Cortesi | 2018-02-24 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | Also triage options, and categorize them into core options (won't be migrated), options that are hard to migrate for various reasons, and easy migrations. | ||||
* | | | Clean up un-necessary arguments to taddons.context | Aldo Cortesi | 2018-02-24 | 5 | -16/+15 |
| | | | | | | | | | | | | Also test coverage ++ | ||||
* | | | Start moving addon options into /addons | Aldo Cortesi | 2018-02-24 | 5 | -12/+13 |
|/ / | | | | | | | | | | | | | | | | | This takes the first few steps: - Extends taddons to make loading addon options easier - Removes dependencies in the test suite on options in addons - Tweaks command-line parser autocreation to ignore nonexistent options. This lets us load common options without over-depending on loaded addons. | ||||
* | | Flake, be happy | Miroslav | 2018-02-20 | 1 | -2/+0 |
| | | |||||
* | | one more cleanup | Miroslav | 2018-02-20 | 1 | -1/+0 |
| | | |||||
* | | Hotkeys cleanup | Miroslav | 2018-02-20 | 1 | -10/+0 |
| | | |||||
* | | Merge pull request #2881 from cortesi/refreshopt | Maximilian Hils | 2018-02-19 | 3 | -6/+6 |
|\ \ | |/ |/| | option refresh_server_playback -> server_replay_refresh | ||||
| * | option replay_kill_extra -> server_replay_kill_extra | Aldo Cortesi | 2018-02-20 | 3 | -3/+3 |
| | | | | | | | | Continuing effort to collect all sever replay options under a commmon prefix. | ||||
| * | option refresh_server_playback -> server_replay_refresh | Aldo Cortesi | 2018-02-20 | 2 | -3/+3 |
| | | | | | | | | All other server playback options have this form. | ||||
* | | Merge pull request #2847 from kira0204/key-cookie-issue | Maximilian Hils | 2018-02-12 | 2 | -6/+26 |
|\ \ | | | | | | | Handling empty key with value for cookies, fix #2827 | ||||
| * | | keeping consistency, better testing | kira0204 | 2018-02-11 | 2 | -6/+22 |
| | | | |||||
| * | | fixing logic | kira0204 | 2018-02-07 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #2851 from mhils/always-use-tls-settings | Maximilian Hils | 2018-02-10 | 1 | -5/+4 |
|\ \ \ | | | | | | | | | Use TLS options also for request replay | ||||
| * | | | use TLS options also for request replay, refs #2840 | Maximilian Hils | 2018-02-08 | 1 | -5/+4 |
| | | | | |||||
* | | | | Excess return was deleted | Miroslav | 2018-02-08 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Extend mypy checking, fix #2194 (#2819) | Arushit Mudgal | 2018-02-03 | 1 | -4/+4 |
| | | | |||||
* | | | don't raise when pyperclip doesn't find a clipboard, fix #2816 | Samoilenko Roman | 2018-02-03 | 2 | -2/+19 |
|/ / | |||||
* | | remove quotes around filename | Maximilian Hils | 2018-02-01 | 1 | -0/+12 |
| | | |||||
* | | Fix for #2750 and #2783 (#2809) | Samoilenko Roman | 2018-01-25 | 2 | -0/+34 |
| | |