| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3327 from Kriechi/docker-notice | Maximilian Hils | 2018-09-20 | 5 | -6/+19 |
| |\ | | | | | add docker security warning | ||||
| | * | update docker security warning | Thomas Kriechbaumer | 2018-09-18 | 1 | -6/+10 |
| | | | |||||
| | * | add docker security warning | Thomas Kriechbaumer | 2018-09-15 | 5 | -5/+14 |
| | | | |||||
| * | | Merge pull request #3328 from bennofs/browser-chrome-unstable | Maximilian Hils | 2018-09-14 | 1 | -0/+1 |
| |\ \ | |/ |/| | addons/browser: fallback to google-chrome-unstable as last try | ||||
| | * | addons/browser: fallback to google-chrome-unstable as last try | Benno Fünfstück | 2018-09-14 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #3229 from Kriechi/py37 | Thomas Kriechbaumer | 2018-09-07 | 3 | -1/+6 |
| |\ | | | | | Python 3.7 is here | ||||
| | * | use travis workaround for py37 | Thomas Kriechbaumer | 2018-09-07 | 1 | -0/+2 |
| | | | |||||
| | * | Python 3.7 is here | Thomas Kriechbaumer | 2018-09-07 | 3 | -1/+4 |
| |/ | |||||
| * | Merge pull request #3297 from guangchao0831/feature_correct_lib_version | Maximilian Hils | 2018-09-07 | 1 | -1/+1 |
| |\ | | | | | Lib ruamel.yaml version 0.15.55 will cause typing.Sequence[str] unsupported in option. | ||||
| | * | Merge branch 'master' into feature_correct_lib_version | Maximilian Hils | 2018-09-07 | 17 | -337/+355 |
| | |\ | |/ |/| | |||||
| * | | Merge pull request #3320 from mhils/pin-ruamel | Maximilian Hils | 2018-09-07 | 1 | -1/+1 |
| |\ \ | | | | | | | Pin ruamel.yaml to working version | ||||
| | * | | pin ruamel.yaml to working version | Maximilian Hils | 2018-09-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #3319 from mhils/issue-3316 | Maximilian Hils | 2018-09-07 | 14 | -297/+310 |
| |\ \ \ | | | | | | | | | Fix #3316 | ||||
| | * | | | fix #3316 | Maximilian Hils | 2018-09-07 | 14 | -297/+310 |
| | |/ / | |||||
| * | | | Merge pull request #3294 from elijahbal/master | Maximilian Hils | 2018-09-07 | 2 | -38/+43 |
| |\ \ \ | |/ / |/| | | Fix XSS scanner failure in test_xss_scanner.py | ||||
| | * | | [test/xss_scanner] add fixtures in tests | David Kremer | 2018-08-15 | 1 | -35/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version of that script made a repetitive use of the pytest builtin fixture, with always the same arguments. This is a small refactoring and cleanup, mainly adding the 'function' scope to ensure proper cleaning and using the @pytest.fixture decorator where I could. | ||||
| | * | | [examples/xss_scanner] replace relative import | David Kremer | 2018-08-15 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_xss_scanner.py was utterly failing because of a trouble (bug?) with the `monkeypatch` fixture failing to replace `gethostbyname` with the correct mock function. Indeed, when stepping through the code, the `gethostbyname` presumably mocked was reported as a builtin python function. The problem could then come from the fact that it is hard to monkeypatch builtin function in python. Using absolute imports seems to resolve the problem. | ||||
| * | | | update installbuilder url | Maximilian Hils | 2018-09-04 | 1 | -2/+2 |
| |/ / | |||||
| | * | Lib ruamel.yaml version 0.15.55 will caused typing.Sequence[str] unsupported ↵ | Guangchao | 2018-08-17 | 1 | -1/+1 |
| |/ | | | | | | | in option. Baseed on release note of recent version 0.15.55 ruamel.yaml, it unmade CommentedSeq a subclass of list. This will cause the sequence parsed from yaml cannot be set to option whose type is typing.Sequence[str]. | ||||
| * | Merge pull request #3277 from madt1m/session-flowcap | Aldo Cortesi | 2018-08-14 | 4 | -8/+507 |
| |\ | | | | | Session - Storage Layer | ||||
| | * | session: implemented changes requested after PR review. | madt1m | 2018-08-05 | 2 | -74/+71 |
| | | | |||||
| | * | tests: Full coverage. Everything working, ready for review | madt1m | 2018-08-03 | 2 | -39/+77 |
| | | | |||||
| | * | tests: 97% coverage reached. Session opportunely patched after emerged defects. | madt1m | 2018-08-02 | 2 | -75/+296 |
| | | | |||||
| | * | session: implemented filter and refilter. Ready for testing implementation | madt1m | 2018-08-01 | 2 | -21/+69 |
| | | | |||||
| | * | protobuf: changed return type annotation in loads to enhance granularity | madt1m | 2018-08-01 | 1 | -1/+1 |
| | | | |||||
| | * | session: basic flow capture implemented | madt1m | 2018-08-01 | 1 | -11/+99 |
| | | | |||||
| | * | session: adding methods to capture and store flows | Pietro Francesco Tirenna | 2018-07-28 | 1 | -0/+107 |
| | | | |||||
| * | | Merge pull request #3293 from Eluch/master | Maximilian Hils | 2018-08-13 | 1 | -0/+1 |
| |\ \ | | | | | | | Autoformat for json-rpc calls | ||||
| | * | | Autoformat for json-rpc calls | Ferenc soós | 2018-08-13 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #3292 from MatthewShao/fix-mitmweb | Maximilian Hils | 2018-08-13 | 2 | -2/+2 |
| |\ \ | | | | | | | [web] Fixes #3228:API endpoint error | ||||
| | * | | [web] Fixes #3228:API endpoint error | Matthew Shao | 2018-08-13 | 2 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #3280 from muffl0n/ssl-insecure | Thomas Kriechbaumer | 2018-08-03 | 1 | -1/+1 |
| |\ \ | | | | | | | Suggest --ssl-insecure cause --insecure is deprecated | ||||
| | * | | Suggest --ssl-insecure cause --insecure is deprecated | [OSC] Sven Schliesing | 2018-08-03 | 1 | -1/+1 |
| |/ / | |||||
| * | | update CHANGELOG for 4.0.4 | Maximilian Hils | 2018-07-31 | 1 | -0/+8 |
| | | | |||||
| * | | Update README.md | Maximilian Hils | 2018-07-31 | 1 | -12/+12 |
| | | | |||||
| * | | Merge pull request #3274 from muffl0n/shorten_notAfter_to_90_days | Maximilian Hils | 2018-07-31 | 1 | -1/+2 |
| |\ \ | | | | | | | Add DEFAULT_EXP_DUMMY_CERT and set to two years | ||||
| | * | | Change lifetime of dummy certificate to two years | [OSC] Sven Schliesing | 2018-07-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add DEFAULT_EXP_DUMMY_CERT and set to 90 days | [OSC] Sven Schliesing | 2018-07-31 | 1 | -1/+2 |
| |/ / | | | | | | | | | Helps with Chrome's "certificates can not be valid longer than 27,5 month" Fixes #3273 | ||||
| * | | Merge pull request #3155 from mitmproxy/requires-io-master | Thomas Kriechbaumer | 2018-07-27 | 1 | -3/+3 |
| |\ \ | |/ |/| | dependency update on master branch | ||||
| | * | bump dependencies | Thomas Kriechbaumer | 2018-07-27 | 1 | -3/+3 |
| | | | |||||
| * | | Merge pull request #3252 from madt1m/session-db | Pietro Francesco Tirenna | 2018-07-24 | 4 | -0/+155 |
| |\ \ | | | | | | | Session - Hybrid DB | ||||
| | * | | session: temporary DB is now stored in temporary dir | madt1m | 2018-07-24 | 2 | -10/+12 |
| | | | | |||||
| | * | | session: modified schema. Now SessionDB uses tempfile module for temp session | madt1m | 2018-07-24 | 3 | -41/+53 |
| | | | | |||||
| | * | | test_linting: removed some unused local variables | madt1m | 2018-07-20 | 1 | -6/+6 |
| | | | | |||||
| | * | | tests: SessionDB fully tested | madt1m | 2018-07-20 | 1 | -0/+52 |
| | | | | |||||
| | * | | exceptions: new SessionLoad exception for load errors | madt1m | 2018-07-20 | 1 | -0/+4 |
| | | | | |||||
| | * | | session: load/create wrapper methods for SessionDB | madt1m | 2018-07-20 | 1 | -0/+59 |
| | | | | |||||
| | * | | session: Implemented SessionDB Schema | madt1m | 2018-07-20 | 1 | -0/+26 |
| | | | | |||||
| * | | | Merge pull request #3256 from madt1m/serialization-benchmark | Aldo Cortesi | 2018-07-24 | 1 | -0/+116 |
| |\ \ \ | |_|/ |/| | | Protobuf - Benchmark Script | ||||
| | * | | benchmark: some improvements - limit to queue size | madt1m | 2018-07-23 | 1 | -19/+33 |
| | | | | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |