aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | New explicit parsing HTTPFlow into proto native object. Viceversa not yet ↵madt1m2018-06-233-9/+185
| | | | | | | | | | | | implemented.
| * | Fixed a bug in protobuf loading -> no returnmadt1m2018-06-232-1/+3
| | |
| * | Hooking the view to load from new DB handlermadt1m2018-06-234-20/+23
| | |
| * | Added protobuf methods; implemented initial DB logicmadt1m2018-06-237-60/+868
| | |
| * | Added initial protobuf definitionsmadt1m2018-06-224-0/+100
| | |
* | | Merge pull request #3251 from kajojify/command_historyAldo Cortesi2018-07-213-2/+116
|\ \ \ | |_|/ |/| | Command history
| * | Some refactoring. New test case.Miroslav2018-07-193-17/+30
| | |
| * | Command history implementationMiroslav2018-07-173-2/+103
|/ /
* | Merge pull request #3243 from mhils/dns-rebindingMaximilian Hils2018-07-171-26/+41
|\ \ | | | | | | mitmweb: protect against dns rebinding
| * | mitmweb: improve dns rebinding protection, support ipv6Maximilian Hils2018-07-121-1/+12
| | |
| * | mitmweb: protect against dns rebindingMaximilian Hils2018-07-111-26/+30
|/ /
* | Merge pull request #3186 from andersonvom/masterAldo Cortesi2018-07-112-1/+16
|\ \ | | | | | | Add scripting example to intercept & change requests
| * | Add example to intercept/change specific requestsAnderson Mesquita2018-06-161-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | This example captures requests to a specific URL and returns an arbitrary response instead. It's common enough that is useful to have in the docs. It also adds links to the Request and Response classes to help developers writing scripts.
| * | Rename scripting fileAnderson Mesquita2018-06-082-1/+1
| | | | | | | | | | | | | | | In order to add the more scripting examples, it makes sense to rename this file and avoid confusion.
* | | Merge pull request #3235 from gcmurphy/issues/3230Aldo Cortesi2018-07-111-1/+1
|\ \ \ | | | | | | | | Pass option, not option name to parse_setval
| * | | Pass option, not option name to parse_setvalGrant Murphy2018-07-021-1/+1
| | | | | | | | | | | | | | | | Fixes #3230
* | | | Merge pull request #3239 from bunnyhero/patch-1Thomas Kriechbaumer2018-07-081-3/+3
|\ \ \ \ | |/ / / |/| | | Update howto-transparent.md
| * | | Update howto-transparent.mdbunnyhero2018-07-051-3/+3
|/ / / | | | | | | | | | | | | i got a syntax error on macOS high sierra with the existing example pf.conf line. based on sample pf rules i found online, i believe it was missing the `pass` keyword, which i added. also, the surrounding text refers to "two lines," when there is only one, so i've updated that too.
* | | Merge pull request #3233 from kajojify/defaultkeySamoilenko Roman2018-06-301-1/+1
|\ \ \ | | | | | | | | Command name renewing
| * | | view.create to view.flows.create for defaultkeysMiroslav2018-06-301-1/+1
|/ / /
* | | Merge pull request #3225 from amm0nite/patch-1Thomas Kriechbaumer2018-06-261-3/+3
|\ \ \ | |_|/ |/| | Update CLI usage instructions for dns_spoofing example
| * | Update CLI usage instructionsPierre Cavan2018-06-261-3/+3
|/ /
* | Merge pull request #3211 from cortesi/tcheckThomas Kriechbaumer2018-06-172-3/+10
|\ \ | | | | | | Add typechecking of Any values for state object
| * | Add typechecking of Any values for state objectAldo Cortesi2018-06-172-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | An ugly solution for an ugly little problem. This patch uses JSON's type checker to validate Any values in stateobject, in order to avoid a circular import. Fixes #3180
* | | Merge pull request #3202 from madt1m/view-cleanupAldo Cortesi2018-06-1711-122/+191
|\ \ \ | | | | | | | | View Cleanup - Initial steps
| * | | fixed exception type; full coverage on viewmadt1m2018-06-132-1/+6
| | | |
| * | | Added tests for new primitivesmadt1m2018-06-132-18/+29
| | | |
| * | | fixed linting errorsmadt1m2018-06-131-1/+3
| | | |
| * | | added return statements to commandsmadt1m2018-06-131-2/+2
| | | |
| * | | View API slightly extended; codebase cleaned in some pointsmadt1m2018-06-1310-104/+155
| | | |
* | | | Merge pull request #3207 from cortesi/postreleaseAldo Cortesi2018-06-172-6/+7
|\ \ \ \ | | | | | | | | | | CHANGELOG, release/README updates
| * | | | CHANGELOG, release/README updatesAldo Cortesi2018-06-162-6/+7
| | | | | | | | | | | | | | | | | | | | We no longer care about annotated tags.
* | | | | update release information for DockerThomas Kriechbaumer2018-06-161-1/+1
| | | | |
* | | | | Merge pull request #3205 from cortesi/ccaseAldo Cortesi2018-06-162-4/+44
|\ \ \ \ \ | |/ / / / |/| | | | cibuild: permit non-dev versions on maintenance branches
| * | | | cibuild: permit non-dev versions on maintenance branchesAldo Cortesi2018-06-162-4/+44
|/ / / / | | | | | | | | | | | | | | | | | | | | Cater for the corner case where commits are incorporated on a maintenance branch. We should be able to test these without adding a dev suffix to the tool versions.
* | | | Merge pull request #3204 from cortesi/nureleaseAldo Cortesi2018-06-164-31/+89
|\ \ \ \ | |_|/ / |/| | | cibuild: cater for tags with "v" prefix
| * | | Simpler addon clear mechanismAldo Cortesi2018-06-161-2/+3
| | | | | | | | | | | | | | | | This should improve test robustness
| * | | cibuild: Match Travis env variable behaviourAldo Cortesi2018-06-162-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever TRAVIS_TAG is non-empty, TRAVIS_BRANCH is over-ridden to match the TRAVIS_TAG value. Adjust our tests to reflect this, and add a sanity check that fails hard if this constraint is ever not met. See https://github.com/travis-ci/travis-ci/issues/4745
| * | | cibuild: refactor to handle v prefix for release tag namesAldo Cortesi2018-06-162-22/+47
| | | |
| * | | Sync CHANGELOG for v4.xAldo Cortesi2018-06-161-0/+16
|/ / /
* | | update compiled mitmweb assetsMaximilian Hils2018-06-155-207/+203
| | |
* | | Merge pull request #3188 from Kriechi/py36-checkAldo Cortesi2018-06-144-173/+200
|\ \ \ | | | | | | | | fix syntax-error on older python interpreters
| * | | fix syntax-error on older python interpretersThomas Kriechbaumer2018-06-084-173/+200
| | | |
* | | | Merge pull request #3190 from realeyes-media/masterAldo Cortesi2018-06-132-1/+56
|\ \ \ \ | |_|/ / |/| | | Adding Docker build for Raspberry Pi 3 (ARMv7 Processor Family)
| * | | Combining Docker push steps, clarifying tag namemarcymarcy2018-06-061-11/+2
| | | |
| * | | Using subprocessesmarcymarcy2018-06-061-5/+1
| | | |
| * | | Renaming function, formatting fixmarcymarcy2018-06-061-1/+2
| | | |
| * | | Adding ARMv7 into buildmarcymarcy2018-06-051-0/+22
| | | |
| * | | Dockerfile for Raspberry Pi 3marcymarcy2018-06-051-0/+45
| |/ /
* | | Merge pull request #3200 from Kriechi/websocket-frame-masking-apiThomas Kriechbaumer2018-06-113-8/+2
|\ \ \ | |_|/ |/| | improve websocket frame masking api