aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #2925 from mhils/clientcert-from-sniAldo Cortesi2018-02-261-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use sni to select clientcerts
| * | | | | | use sni to select clientcertsMaximilian Hils2018-02-251-1/+2
| | | | | | |
* | | | | | | Merge pull request #2924 from cortesi/dumperfiltAldo Cortesi2018-02-265-20/+18
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | Split dumper_filter off from view_filter
| * | | | | | Split dumper_filter off from view_filterAldo Cortesi2018-02-265-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These don't even do the same thing.
* | | | | | | Merge pull request #2923 from cortesi/moreoptsAldo Cortesi2018-02-2613-35/+44
|\| | | | | | | | | | | | | | | | | | | | Options: split verbosity, add some docs to Loader.add_option
| * | | | | | Revamp verbosity optionsAldo Cortesi2018-02-2612-28/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Shift option help styling admonition into the appropriate Loader docstringAldo Cortesi2018-02-262-7/+8
|/ / / / / /
* | | | | | Merge pull request #2921 from fristonio/Fix-2899Aldo Cortesi2018-02-261-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove h11 from dependencies and move requests to dev dependencies
| * | | | | | Remove h11 from dependencies and move requests to dev dependenciesDeepesh Pathak2018-02-261-2/+1
| | | | | | |
* | | | | | | Merge pull request #2922 from kajojify/new_exampleAldo Cortesi2018-02-263-18/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Replaces upsidedown with mirror reflection
| * | | | | | Getting rid of PillowMiroslav2018-02-251-2/+1
| | | | | | |
| * | | | | | Replace upsidedown with mirror reflectionMiroslav2018-02-252-16/+9
| | | | | | |
* | | | | | | update doc locationThomas Kriechbaumer2018-02-251-2/+2
| | | | | | |
* | | | | | | Merge pull request #2920 from kira0204/docs-2913Maximilian Hils2018-02-259-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Docs updates
| * | | | | | | trans-1 updatekira02042018-02-251-0/+0
| | | | | | | |
| * | | | | | | few more fixes,picture modkira02042018-02-259-8/+8
| | | | | | | |
* | | | | | | | improve release instructionsThomas Kriechbaumer2018-02-251-0/+5
| | | | | | | |
* | | | | | | | improve release instructionsThomas Kriechbaumer2018-02-252-6/+19
| | | | | | | |
* | | | | | | | update release instructionsThomas Kriechbaumer2018-02-251-0/+12
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #2919 from fristonio/Fix-2906Maximilian Hils2018-02-251-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix --socks option deprecated info in command line args check.
| * | | | | | | Fix --socks option deprecated info in command line args check.Deepesh Pathak2018-02-251-2/+3
| | | | | | | |
* | | | | | | | Merge pull request #2909 from fristonio/Fix-2867Aldo Cortesi2018-02-251-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 Pathak2018-02-241-0/+9
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections. - Add mock implementation for gethostbyname in test_xss_scanner. - Fix failed tests when running tox without internet connection. - Fixes #2867
* | | | | | | | Merge pull request #2917 from luzpaz/misc-typosAldo Cortesi2018-02-2523-38/+38
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Misc. typos
| * | | | | | | Misc. typosluz.paz2018-02-2423-38/+38
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/optionscompAldo Cortesi2018-02-2514-89/+70
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Start moving more complicated options over to /addons
| * | | | | | | addon options: proxyauth to /addonsAldo Cortesi2018-02-244-18/+20
| | | | | | | |
| * | | | | | | Split default_contentview into dumper_* and console_* varietiesAldo Cortesi2018-02-245-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 addonAldo Cortesi2018-02-246-38/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/dumperAldo Cortesi2018-02-244-21/+20
| | | | | | | |
* | | | | | | | Merge pull request #2880 from kira0204/update-readmeAldo Cortesi2018-02-251-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Updating Readme for better testing
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/kira0204/mitmproxy into ↵kira02042018-02-24258-4409/+13438
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | update-readme
| * | | | | | | | Better languagekira02042018-02-241-1/+1
| | | | | | | | |
| * | | | | | | | Extensive testingkira02042018-02-191-0/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #2914 from kira0204/docs-2913Aldo Cortesi2018-02-251-4/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | Updating docs
| * | | | | | | | Fixing #2913kira02042018-02-241-4/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2912 from smonami/patch-1Maximilian Hils2018-02-241-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Spelling corrected for think*
| * | | | | | | Spelling corrected for think*Monami Sharma2018-02-241-1/+1
|/ / / / / / / | | | | | | | | | | | | | | Replaced "You should thin* of the mitmproxy" to "You should think* of the mitmproxy"
* | | | | | | Merge pull request #2905 from cortesi/optsAldo Cortesi2018-02-2444-311/+313
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Start migrating addon options into /addons
| * \ \ \ \ \ \ Merge branch 'master' into optsAldo Cortesi2018-02-247-28/+98
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2886 from tran-tien-dat/set-cookieAldo Cortesi2018-02-242-5/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Parse Set-Cookie header more permissively. Fix #2829
| * | | | | | | Fix #2829Tran Tien Dat2018-02-212-5/+30
| | | | | | | |
* | | | | | | | Merge pull request #2904 from cortesi/bumpAldo Cortesi2018-02-241-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump version
| * | | | | | | | Bump versionAldo Cortesi2018-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-bump after tag
* | | | | | | | | Merge pull request #2903 from cortesi/3.0.2Aldo Cortesi2018-02-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Tag 3.0.2
| * | | | | | | | Tag 3.0.2Aldo Cortesi2018-02-241-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #2902 from cortesi/spawnfixAldo Cortesi2018-02-241-19/+28
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Fix loss of keyboard control after spawn
| * | | | | | | Fix loss of keyboard control after spawnAldo Cortesi2018-02-241-19/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were stepping on this Urwid bug: https://github.com/urwid/urwid/issues/285 The guys from pazz/alot found a fix, which I cribbed: https://github.com/pazz/alot/pull/1204 Fix #2901
* | | | | | | bump version againMaximilian Hils2018-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | we may have to figure out something smarter here, maybe set the version for tagged commits to whatever the tag is.
* | | | | | | Merge pull request #2898 from yan12125/patch-1Maximilian Hils2018-02-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Explicitly declare pyperclip requirement
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 16:02:34 +0000