aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* use netlib.http_semantics for generic dataThomas Kriechbaumer2015-07-222-16/+10
|
* update build scriptMaximilian Hils2015-07-221-69/+97
|
* make build script amazingMaximilian Hils2015-07-225-98/+170
|
* make build script executable on *nixMaximilian Hils2015-07-221-0/+0
|
* fix text selection hintMaximilian Hils2015-07-221-1/+1
|
* bump versionMaximilian Hils2015-07-222-29/+40
|
* preliminary release scriptMaximilian Hils2015-07-212-54/+87
|
* streamline build processMaximilian Hils2015-07-214-8/+134
|
* fix slack badgeMaximilian Hils2015-07-171-1/+1
|
* Add Slack to README.Maximilian Hils2015-07-151-3/+6
|
* Merge pull request #677 from isra17/json_errorMaximilian Hils2015-07-141-1/+2
|\ | | | | Use `ensure_ascii` in wep.app#broadcast
| * Use `ensure_ascii` in wep.app#broadcastisra172015-07-131-1/+2
| | | | | | | | Otherwise, a non-unicode character in a flow cause mitmweb to crash.
* | Merge pull request #676 from isra17/masterMaximilian Hils2015-07-142-3/+35
|\ \ | |/ |/| Add source address filter
| * Add ~src ~dst REGEX filtersisra172015-07-132-3/+35
|/ | | | | | | | | This filter allow to match on the request source and destination address in the form of `<IP>:<Port>`. Also fixed the parsing grammar to add a `WordEnd` after each filter name. That way, `~src` doesn't match `~s` instead and keep the behavior consistent with `~hq` != `~h`.
* Merge pull request #673 from jlhonora/masterMaximilian Hils2015-07-084-11/+11
|\ | | | | Match g/G shortcuts to less
| * Match g/G shortcuts to less, fix #631jlhonora2015-07-084-11/+11
|/
* improve dependency management in setup.pyMaximilian Hils2015-07-041-19/+24
|
* fix #648Maximilian Hils2015-07-041-2/+2
|
* clarify docsMaximilian Hils2015-07-041-2/+3
|
* fix #653Maximilian Hils2015-07-041-10/+15
|
* fix #593, fix #656, coverage++Maximilian Hils2015-07-033-53/+83
|
* fix windows compatibilityMaximilian Hils2015-07-032-2/+28
|
* Merge pull request #661 from kyle-m/masterAldo Cortesi2015-06-309-1/+205
|\ | | | | Enabling upstream server verification.
| * Enabling upstream server verification. Added flags --verify_upstream_cert,Kyle Morton2015-06-299-1/+205
|/ | | | --upstream-trusted-cadir, and --upstream-trusted-ca.
* synchronize metadata files across projectsMaximilian Hils2015-06-261-1/+4
|
* Merge branch 'appveyor2'Maximilian Hils2015-06-261-0/+11
|\
| * add appveyorMaximilian Hils2015-06-261-0/+11
| |
* | Merge pull request #654 from mitmproxy/remove_certforwardAldo Cortesi2015-06-274-41/+19
|\| | | | | Remove Certforward Feature
| * remove certforward featureMaximilian Hils2015-06-264-41/+19
| | | | | | | | | | | | | | | | The certforward feature was implemented to support #gotofail, which only works on unpatched iOS devices. Given that many apps don't support iOS 7 anymore, jailbreak+ssl killswitch is usually the better option. By removing certforward, we can make netlib a pure python module again, which significantly simplifies distribution.
* | docs: fix certinstall image max-widthMaximilian Hils2015-06-261-1/+1
|/
* Remove stray print & massage whitespace a bitAldo Cortesi2015-06-251-9/+6
|
* Merge pull request #645 from elitest/hardfailvenvAldo Cortesi2015-06-242-2/+2
|\ | | | | Add a check to see if virtualenv is installed.
| * Merge branch 'master' into hardfailvenvJim Shaver2015-06-23206-15109/+74656
| |\ | |/ |/| | | | | Conflicts: dev
* | Merge pull request #640 from Kriechi/ssl-version-handlingAldo Cortesi2015-06-231-43/+25
|\ \ | | | | | | unify SSL version/method handling
| * | unify SSL version/method handlingThomas Kriechbaumer2015-06-231-43/+25
|/ /
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-06-238-5/+199
|\ \
| * \ Merge pull request #638 from iroiro123/http-transparentAldo Cortesi2015-06-238-5/+199
| |\ \ | | | | | | | | HTTP Transparent Proxy
| | * | changed error handling (ssl spoof mode)iroiro1232015-06-233-16/+12
| | | |
| | * | add unit tests for spoof modeiroiro1232015-06-233-0/+103
| | | |
| | * | SSL Spoof modeiroiro1232015-06-215-8/+65
| | | |
| | * | Spoof modeiroiro1232015-06-204-14/+21
| | | |
| | * | HTTP Transparent Proxyiroiro1232015-06-184-2/+33
| | | |
* | | | Travis to SlackAldo Cortesi2015-06-231-0/+5
|/ / /
* / / Update README.mkdMaximilian Hils2015-06-181-1/+0
|/ /
* | add landscape/prospector configThomas Kriechbaumer2015-06-183-21/+15
| |
* | Update README.mkdMaximilian Hils2015-06-161-4/+6
| |
* | fix pep8 configThomas Kriechbaumer2015-06-151-1/+0
| |
* | Handle invalid IDNA encoding in hostnamesAldo Cortesi2015-06-122-6/+12
| | | | | | | | Fixes #622
* | Fix typo in docs - thanks to Jim_Showalter@intuit.comAldo Cortesi2015-06-121-2/+2
| |
* | Merge pull request #624 from drahosj/masterAldo Cortesi2015-06-124-5/+63
|\ \ | | | | | | Added flow marking functionality in the console