aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [test/xss_scanner] add fixtures in testsDavid Kremer2018-08-151-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 importDavid Kremer2018-08-151-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.
* Merge pull request #3277 from madt1m/session-flowcapAldo Cortesi2018-08-144-8/+507
|\ | | | | Session - Storage Layer
| * session: implemented changes requested after PR review.madt1m2018-08-052-74/+71
| |
| * tests: Full coverage. Everything working, ready for reviewmadt1m2018-08-032-39/+77
| |
| * tests: 97% coverage reached. Session opportunely patched after emerged defects.madt1m2018-08-022-75/+296
| |
| * session: implemented filter and refilter. Ready for testing implementationmadt1m2018-08-012-21/+69
| |
| * protobuf: changed return type annotation in loads to enhance granularitymadt1m2018-08-011-1/+1
| |
| * session: basic flow capture implementedmadt1m2018-08-011-11/+99
| |
| * session: adding methods to capture and store flowsPietro Francesco Tirenna2018-07-281-0/+107
| |
* | Merge pull request #3293 from Eluch/masterMaximilian Hils2018-08-131-0/+1
|\ \ | | | | | | Autoformat for json-rpc calls
| * | Autoformat for json-rpc callsFerenc soós2018-08-131-0/+1
|/ /
* | Merge pull request #3292 from MatthewShao/fix-mitmwebMaximilian Hils2018-08-132-2/+2
|\ \ | | | | | | [web] Fixes #3228:API endpoint error
| * | [web] Fixes #3228:API endpoint errorMatthew Shao2018-08-132-2/+2
|/ /
* | Merge pull request #3280 from muffl0n/ssl-insecureThomas Kriechbaumer2018-08-031-1/+1
|\ \ | | | | | | Suggest --ssl-insecure cause --insecure is deprecated
| * | Suggest --ssl-insecure cause --insecure is deprecated[OSC] Sven Schliesing2018-08-031-1/+1
|/ /
* | update CHANGELOG for 4.0.4Maximilian Hils2018-07-311-0/+8
| |
* | Update README.mdMaximilian Hils2018-07-311-12/+12
| |
* | Merge pull request #3274 from muffl0n/shorten_notAfter_to_90_daysMaximilian Hils2018-07-311-1/+2
|\ \ | | | | | | Add DEFAULT_EXP_DUMMY_CERT and set to two years
| * | Change lifetime of dummy certificate to two years[OSC] Sven Schliesing2018-07-311-1/+1
| | |
| * | Add DEFAULT_EXP_DUMMY_CERT and set to 90 days[OSC] Sven Schliesing2018-07-311-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-masterThomas Kriechbaumer2018-07-271-3/+3
|\ \ | |/ |/| dependency update on master branch
| * bump dependenciesThomas Kriechbaumer2018-07-271-3/+3
| |
* | Merge pull request #3252 from madt1m/session-dbPietro Francesco Tirenna2018-07-244-0/+155
|\ \ | | | | | | Session - Hybrid DB
| * | session: temporary DB is now stored in temporary dirmadt1m2018-07-242-10/+12
| | |
| * | session: modified schema. Now SessionDB uses tempfile module for temp sessionmadt1m2018-07-243-41/+53
| | |
| * | test_linting: removed some unused local variablesmadt1m2018-07-201-6/+6
| | |
| * | tests: SessionDB fully testedmadt1m2018-07-201-0/+52
| | |
| * | exceptions: new SessionLoad exception for load errorsmadt1m2018-07-201-0/+4
| | |
| * | session: load/create wrapper methods for SessionDBmadt1m2018-07-201-0/+59
| | |
| * | session: Implemented SessionDB Schemamadt1m2018-07-201-0/+26
| | |
* | | Merge pull request #3256 from madt1m/serialization-benchmarkAldo Cortesi2018-07-241-0/+116
|\ \ \ | |_|/ |/| | Protobuf - Benchmark Script
| * | benchmark: some improvements - limit to queue sizemadt1m2018-07-231-19/+33
| | |
| * | benchmark: new protobuf serialization performance profilermadt1m2018-07-221-0/+102
| | |
* | | Merge pull request #3258 from Kriechi/fix-whitespaceThomas Kriechbaumer2018-07-221-1/+1
|\ \ \ | |/ / |/| | fix whitespace
| * | fix whitespaceThomas Kriechbaumer2018-07-221-1/+1
| |/
* | Merge pull request #3245 from madt1m/protobuf-serialization-cleanAldo Cortesi2018-07-2111-3/+1263
|\ \ | | | | | | Shifting to Protobuf Serialization - Cleaned
| * | protobuf: tests implemented, full coveragePietro Francesco Tirenna2018-07-1711-64/+200
| | |
| * | Removed test code from viewPietro Francesco Tirenna2018-06-301-13/+6
| | |
| * | updated exceptions in view loadmadt1m2018-06-301-0/+2
| | |
| * | view can load from both io interfacesmadt1m2018-06-301-3/+11
| | |
| * | Timestamps are now double instead of floatmadt1m2018-06-302-25/+25
| | |
| * | more bug fixes in DB classmadt1m2018-06-301-4/+0
| | |
| * | bug fixmadt1m2018-06-301-0/+1
| | |
| * | new protobuf loads has almost the same result of FlowReader streammadt1m2018-06-301-1/+8
| | |
| * | Loads yields now an HTTP objectmadt1m2018-06-301-14/+25
| | |
| * | Completed untested version of object loadingmadt1m2018-06-301-99/+93
| | |
| * | Refactored naming strategyPietro Francesco Tirenna2018-06-281-18/+18
| | |
| * | Improved parsing mechanism for better readabilitymadt1m2018-06-231-12/+26
| | |
| * | Fixed bugs in parsing HTTPFlow objectsmadt1m2018-06-231-19/+28
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 12:01:54 +0000