aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove mitmweb authMaximilian Hils2016-11-223-18/+1
| | | | | 9b08279c7c3384f716b66329fefbe97a368189a2 removed the actual functionality. we should not have a command line switch that does nothing. :)
* don't set an empty ALPN, refs #1772Maximilian Hils2016-11-221-1/+1
|
* Merge pull request #1769 from mhils/update-pydivertMaximilian Hils2016-11-212-42/+44
|\ | | | | update pydivert, fix #1749
| * update pydivert, fix #1749Maximilian Hils2016-11-212-42/+44
|/
* Descriptive error message for SSL context initialization failure (#1767)Yoginski2016-11-212-1/+35
|
* remove stickycookie exampleMaximilian Hils2016-11-212-43/+0
| | | | The recommended way to do this is mitmproxy/addons/stickycookie.py
* Merge pull request #1768 from mhils/organize-examplesMaximilian Hils2016-11-2143-268/+196
|\ | | | | Organize Examples
| * organize examplesMaximilian Hils2016-11-2143-268/+196
|/ | | | | | | This commit is largely based on work by Thiago Arrais (@thiagoarrais) and Shane Bradfield (@l33tLumberjack). I wasn't really able to get their PR reasonably merged onto the latest master, so I reapplied their changes manually here and did some further improvements on that.
* rewrite absolute-form HTTP requests to relative form, fix #1759 (#1765)Maximilian Hils2016-11-203-0/+22
|
* Merge pull request #1766 from Kriechi/fix-test-raceThomas Kriechbaumer2016-11-201-5/+15
|\ | | | | tests: fix race condition
| * tests: fix race conditionThomas Kriechbaumer2016-11-201-5/+15
| |
* | handle SIGINT with a quit prompt (#1760)Edgar Boda-Majer2016-11-201-9/+18
|/
* Merge pull request #1751 from dwfreed/patch-1Thomas Kriechbaumer2016-11-192-3/+6
|\ | | | | proxy/protocol/base: Allow spoofing fixed source
| * proxy/protocol/base: Allow spoofing fixed sourceDoug Freed2016-11-182-3/+6
| | | | | | | | | | | | Allow combining --spoof-source-address and --upstream-bind-address to spoof a fixed source address. Also update the help text for --spoof-source-address to indicate this new possibility.
* | Merge pull request #1757 from fotinakis/masterThomas Kriechbaumer2016-11-191-1/+1
|\ \ | |/ |/| Remove dead run_scripthooks example reference.
| * Remove dead run_scripthooks example reference.Mike Fotinakis2016-11-171-1/+1
| |
* | Merge pull request #1753 from mitmproxy/update-dependenciesThomas Kriechbaumer2016-11-1814-3/+20
|\ \ | |/ |/| Update Dependencies
| * lint!Maximilian Hils2016-11-1813-1/+18
| |
| * update dependenciesMaximilian Hils2016-11-181-2/+2
|/
* Merge pull request #1729 from mhils/mitmweb-fixesMaximilian Hils2016-11-169-36/+76
|\ | | | | minor fixes
| * fix type checksMaximilian Hils2016-11-161-2/+2
| |
| * mitmweb: start browser on startupMaximilian Hils2016-11-161-3/+34
| |
| * minor fixesMaximilian Hils2016-11-168-31/+40
| |
* | Merge pull request #1752 from dwfreed/patch-2Maximilian Hils2016-11-161-1/+1
|\ \ | |/ |/| setup.py: adjust mypy-lang dependency for semver
| * setup.py: adjust mypy-lang dependency for semverDoug Freed2016-11-161-1/+1
|/ | | | Looks like the previous form was a typo.
* Merge pull request #1742 from dwfreed/patch-2Maximilian Hils2016-11-163-1/+9
|\ | | | | Make the upstream bind address a separate option
| * proxy/protocol/base: use upstream_bind_addressDoug Freed2016-11-141-1/+1
| | | | | | | | Use the upstream_bind_address option, instead of listen_host.
| * tools/cmdline: add upstream bind address optionDoug Freed2016-11-141-0/+6
| | | | | | | | Allow specifying the upstream bind address on the command line.
| * options: add upstream_bind_addressDoug Freed2016-11-141-0/+2
| | | | | | | | Add upstream_bind_address to the options object
* | Merge pull request #1748 from Kriechi/better-onboardingThomas Kriechbaumer2016-11-161-1/+21
|\ \ | | | | | | add macOS/OSX installation instructions to onboarding page
| * | add macOS/OSX installation instructions to onboarding pageThomas Kriechbaumer2016-11-161-1/+21
| | |
* | | Merge pull request #1743 from cortesi/viewsigAldo Cortesi2016-11-154-44/+56
|\ \ \ | |_|/ |/| | addons.view: clarify modification events
| * | addons.view: clarify modification eventsAldo Cortesi2016-11-154-44/+56
|/ / | | | | | | | | This adds a set of store modification events, and uses them for flow settings. This addresses a bug where settings could persist even after flows were deleted.
* | Merge pull request #1740 from pquentin/masterAldo Cortesi2016-11-141-2/+2
|\ \ | |/ |/| docs: Fix typos
| * docs: Fix typosQuentin Pradet2016-11-141-2/+2
|/
* 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 06:12:23 +0000