aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1738 from Kriechi/fix-1737Aldo Cortesi2016-11-141-1/+11
|\ | | | | restrict ALPN offers if host changes
| * restrict ALPN offers if host changesThomas Kriechbaumer2016-11-131-1/+11
| |
* | Merge pull request #1720 from cortesi/proxyrefactorAldo Cortesi2016-11-1424-768/+860
|\ \ | |/ |/| proxy.protocol.http-related refactoring
| * addons.proxyauth: out with the old, in with the newAldo Cortesi2016-11-1312-453/+63
| | | | | | | | | | - Strip out old auth mechanisms, and enable addon - Disable web app auth for now - this should just use the Tornado auth stuff
| * addons.proxyauth: complete and testAldo Cortesi2016-11-132-16/+205
| |
| * stub out proxyauth addonAldo Cortesi2016-11-132-0/+121
| | | | | | | | Stub out basic workings, add and test configure event.
| * upstream_proxy_auth -> upstream_authAldo Cortesi2016-11-134-8/+8
| | | | | | | | Also clarify what this does in commandline help.
| * Complete upstream authentication moduleAldo Cortesi2016-11-135-11/+62
| | | | | | | | | | | | | | - Handles upstream CONNECT and regular requests, plus HTTP Basic for reverse proxy - Add some tests to make sure we can rely on the .via attribute on server connections.
| * Refine handling of HTTP CONNECTAldo Cortesi2016-11-124-100/+124
| | | | | | | | | | | | | | - CONNECT requests do not generate the usual http events. Instead, they generate the http_connect event and handlers then have the option of setting an error response to abort the connect. - The connect handler is called for both upstream proxy and regular proxy CONNECTs.
| * Add the http_connect event for HTTP CONNECT requestsAldo Cortesi2016-11-124-20/+44
| |
| * Upstream proxy auth to addonAldo Cortesi2016-11-127-44/+86
| |
| * Add HTTPFlow.mode to record the HTTP proxy layer modeAldo Cortesi2016-11-123-4/+13
| |
| * Use an enum for http protocol modesAldo Cortesi2016-11-122-21/+23
| |
| * Remove promotion to raw TCP based on heuristicsAldo Cortesi2016-11-122-11/+2
| | | | | | | | This seems terribly dangerous to me. Let's expand explicit control instead.
| * Test failure during 100-continueAldo Cortesi2016-11-123-26/+40
| | | | | | | | | | | | | | | | | | Also: - Remove duplicate and unused code - Tighten scope of HttpReadDisconnect handler - we only want to ignore this for the initial read, not for the entire block that includes things like the expect handling.
| * Bug: ask requestheaders before request body is readAldo Cortesi2016-11-122-2/+51
| | | | | | | | Also add the beginnings of a test suite to exercise issues like this.
| * proxy.protocol.http: cleanups, extract request validationAldo Cortesi2016-11-121-28/+35
| |
| * Remove unused protocol attribute on connections.Aldo Cortesi2016-11-121-2/+0
| |
| * proxy.protocol.http: flatten for refactoringAldo Cortesi2016-11-121-189/+150
|/ | | | Flatten all of _process_flow, so we can see what's going on in there.
* Merge pull request #1723 from Kriechi/http2-connsMaximilian Hils2016-11-091-47/+48
|\ | | | | http2: move h2 connection object
| * http2: move h2 connection objectThomas Kriechbaumer2016-11-051-47/+48
| |
* | Merge pull request #1725 from mhils/mitmwebMaximilian Hils2016-11-0930-62130/+1079
|\ \ | | | | | | Mitmweb Improvements
| * | mitmweb: minor fixesMaximilian Hils2016-11-095-7/+37
| | |
| * | web: update static assetsMaximilian Hils2016-11-093-61000/+495
| | |
| * | web: fix header updateMaximilian Hils2016-11-091-26/+27
| | |
| * | web: simplify flow storageMaximilian Hils2016-11-0817-573/+363
| | |
| * | clean up mitmwebMaximilian Hils2016-11-0821-3059/+2692
| | |
| * | fix mitmwebMaximilian Hils2016-11-082-3/+3
| |/
* | Merge pull request #1724 from phackt/masterMaximilian Hils2016-11-091-0/+5
|\ \ | |/ |/| fix SNI for transparent mode - #1638
| * explain host=pretty_host assignmentMaximilian Hils2016-11-091-0/+4
| |
| * fix SNI for transparent mode - #1638phackt2016-11-081-0/+1
|/ | | | | | In transparent mode host is set with the target server ip. Attribute flow.request.host is used as SNI while mitmproxy is initiating TLS handshake, so it should be set with the pretty_host.
* http2: add push-promise metadata testThomas Kriechbaumer2016-11-051-0/+6
|
* Merge pull request #1716 from cortesi/deprecated2Aldo Cortesi2016-11-041-11/+0
|\ | | | | Remove sticky[auth,cookie] from http objects
| * Remove sticky[auth,cookie] from http objectsAldo Cortesi2016-11-041-11/+0
| | | | | | | | | | - they're unused - if we want them, they should be set by the addon in the new metadata store
* | Merge pull request #1715 from cortesi/deprecatedAldo Cortesi2016-11-046-42/+10
|\| | | | | Remove deprecated interfaces
| * Remove deprecated interfacesAldo Cortesi2016-11-046-42/+10
| |
* | Merge pull request #1714 from cortesi/justno2Aldo Cortesi2016-11-0414-45/+45
|\| | | | | Test and interface improvements
| * Let's not over-ride __bool__ on connection objectsAldo Cortesi2016-11-0412-21/+21
| | | | | | | | | | If I had a thousand years and every thesaurus in the world, I still couldn't adequately express how much I dislike this piece of interface design.
| * script.concurrent: tests to taddonsAldo Cortesi2016-11-042-24/+24
|/
* Merge pull request #1711 from navinpai/1541Aldo Cortesi2016-11-041-1/+3
|\ | | | | Allow pathoc to pause forever at end of message
| * Allow forever wait at end of message #1541Naveen Pai2016-11-041-1/+3
| |
* | Merge pull request #1712 from navinpai/docsAldo Cortesi2016-11-041-1/+4
|\ \ | |/ |/| [MINOR] fix link in documentation
| * [MINOR] fix link in documentationNaveen Pai2016-11-041-1/+4
|/
* Merge pull request #1709 from cortesi/taddons4Aldo Cortesi2016-11-049-178/+214
|\ | | | | addons.view: test suite to 100%
| * addons: convert last of the test suite to taddonsAldo Cortesi2016-11-045-94/+92
| |
| * addons.setheaders: fix configure bug, tests to taddonsAldo Cortesi2016-11-042-56/+54
| |
| * addons.view: test suite to 100%Aldo Cortesi2016-11-042-28/+68
|/ | | | This takes coverage for all of /addons to 100%
* Merge pull request #1708 from cortesi/taddons3Aldo Cortesi2016-11-045-18/+67
|\ | | | | Test suite improvements
| * addons.view: test improvementsAldo Cortesi2016-11-032-2/+52
| |
| * README.rst: recommend "tox -e lint" over using flake8 directlyAldo Cortesi2016-11-031-2/+3
| |