Commit Graph

8034 Commits

Author SHA1 Message Date
Maximilian Hils
7f464b8929
Merge pull request #3243 from mhils/dns-rebinding
mitmweb: protect against dns rebinding
2018-07-17 14:19:55 +02:00
Maximilian Hils
48ff616cef mitmweb: improve dns rebinding protection, support ipv6 2018-07-12 10:40:50 +08:00
Maximilian Hils
ae91779229 mitmweb: protect against dns rebinding 2018-07-11 18:57:12 +08:00
Aldo Cortesi
9829fe150e
Merge pull request #3186 from andersonvom/master
Add scripting example to intercept & change requests
2018-07-11 10:24:52 +12:00
Aldo Cortesi
81fa45450c
Merge pull request #3235 from gcmurphy/issues/3230
Pass option, not option name to parse_setval
2018-07-11 09:29:28 +12:00
Thomas Kriechbaumer
dfb6a08bba
Merge pull request #3239 from bunnyhero/patch-1
Update howto-transparent.md
2018-07-08 22:20:36 +02:00
bunnyhero
e5121ee977
Update howto-transparent.md
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.
2018-07-05 12:35:55 -04:00
Grant Murphy
8fb5d2d482 Pass option, not option name to parse_setval
Fixes #3230
2018-07-02 16:10:03 +10:00
Samoilenko Roman
3dec4176cf
Merge pull request #3233 from kajojify/defaultkey
Command name renewing
2018-06-30 16:58:10 +03:00
Pietro Francesco Tirenna
204faa1f52 Removed test code from view 2018-06-30 15:52:48 +02:00
Miroslav
4e5551c483 view.create to view.flows.create for defaultkeys 2018-06-30 15:46:54 +03:00
madt1m
cbb6e381b9 updated exceptions in view load 2018-06-30 12:23:40 +02:00
madt1m
66aff8d2a4 view can load from both io interfaces 2018-06-30 12:20:27 +02:00
madt1m
85da4694f1 Timestamps are now double instead of float 2018-06-30 11:48:06 +02:00
madt1m
049b096cda more bug fixes in DB class 2018-06-30 11:42:16 +02:00
madt1m
9ee8f47cc6 bug fix 2018-06-30 11:30:59 +02:00
madt1m
54cae95a90 new protobuf loads has almost the same result of FlowReader stream 2018-06-30 11:16:59 +02:00
madt1m
189e2ce0d0 Loads yields now an HTTP object 2018-06-30 10:58:01 +02:00
madt1m
ea4af9ce17 Completed untested version of object loading 2018-06-30 09:27:18 +02:00
Pietro Francesco Tirenna
a325731854 Refactored naming strategy 2018-06-28 08:51:05 +02:00
Thomas Kriechbaumer
3f6147ee77
Merge pull request #3225 from amm0nite/patch-1
Update CLI usage instructions for dns_spoofing example
2018-06-26 13:19:19 +02:00
Pierre Cavan
2326f973df
Update CLI usage instructions 2018-06-26 13:09:45 +02:00
madt1m
72958e17de Improved parsing mechanism for better readability 2018-06-23 19:02:31 +02:00
madt1m
0b68597a79 Fixed bugs in parsing HTTPFlow objects 2018-06-23 18:46:06 +02:00
madt1m
c3f4f27829 New explicit parsing HTTPFlow into proto native object. Viceversa not yet implemented. 2018-06-23 13:03:35 +02:00
madt1m
265e1f9e1f Fixed a bug in protobuf loading -> no return 2018-06-23 03:52:46 +02:00
madt1m
b686073f56 Hooking the view to load from new DB handler 2018-06-23 03:36:58 +02:00
madt1m
e842aa3798 Added protobuf methods; implemented initial DB logic 2018-06-23 03:02:39 +02:00
madt1m
ba144b15bc Added initial protobuf definitions 2018-06-22 22:43:05 +02:00
Thomas Kriechbaumer
3cd3765270
Merge pull request #3211 from cortesi/tcheck
Add typechecking of Any values for state object
2018-06-17 08:45:03 +02:00
Aldo Cortesi
77b49aa8de Add typechecking of Any values for state object
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
2018-06-17 10:22:17 +12:00
Aldo Cortesi
9ff4f55614
Merge pull request #3202 from madt1m/view-cleanup
View Cleanup - Initial steps
2018-06-17 09:20:34 +12:00
Aldo Cortesi
9113dabb32
Merge pull request #3207 from cortesi/postrelease
CHANGELOG, release/README updates
2018-06-17 09:08:46 +12:00
Aldo Cortesi
58c93a233b CHANGELOG, release/README updates
We no longer care about annotated tags.
2018-06-16 23:36:39 +12:00
Thomas Kriechbaumer
62d0d3db63 update release information for Docker 2018-06-16 11:19:11 +02:00
Anderson Mesquita
ba02a0b8b9 Add example to intercept/change specific requests
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.
2018-06-16 09:16:38 +02:00
Aldo Cortesi
ba7047a9a4
Merge pull request #3205 from cortesi/ccase
cibuild: permit non-dev versions on maintenance branches
2018-06-16 15:38:27 +12:00
Aldo Cortesi
9463fee764 cibuild: permit non-dev versions on maintenance branches
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.
2018-06-16 15:09:34 +12:00
Aldo Cortesi
94a22b8795
Merge pull request #3204 from cortesi/nurelease
cibuild: cater for tags with "v" prefix
2018-06-16 11:21:22 +12:00
Aldo Cortesi
f5a6499b15 Simpler addon clear mechanism
This should improve test robustness
2018-06-16 10:59:24 +12:00
Aldo Cortesi
85526e5370 cibuild: Match Travis env variable behaviour
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
2018-06-16 10:23:33 +12:00
Aldo Cortesi
bf791ba1d5 cibuild: refactor to handle v prefix for release tag names 2018-06-16 09:48:21 +12:00
Aldo Cortesi
ff8a9f5440 Sync CHANGELOG for v4.x 2018-06-16 09:07:37 +12:00
Maximilian Hils
3227f67d88 update compiled mitmweb assets 2018-06-15 17:15:15 +02:00
Aldo Cortesi
212afebeb0
Merge pull request #3188 from Kriechi/py36-check
fix syntax-error on older python interpreters
2018-06-14 17:53:29 +12:00
madt1m
af54c26014 fixed exception type; full coverage on view 2018-06-13 17:39:46 +02:00
madt1m
40faf2c662 Added tests for new primitives 2018-06-13 15:57:21 +02:00
madt1m
da2365db4e fixed linting errors 2018-06-13 15:19:15 +02:00
madt1m
ea4ef15ebf added return statements to commands 2018-06-13 15:05:43 +02:00
madt1m
773c953514 View API slightly extended; codebase cleaned in some points 2018-06-13 11:56:14 +02:00