Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| | | | ||||||
| * | | benchmark: new protobuf serialization performance profiler | madt1m | 2018-07-22 | 1 | -0/+102 | |
| | | | ||||||
* | | | Merge pull request #3258 from Kriechi/fix-whitespace | Thomas Kriechbaumer | 2018-07-22 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | fix whitespace | |||||
| * | | fix whitespace | Thomas Kriechbaumer | 2018-07-22 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge pull request #3245 from madt1m/protobuf-serialization-clean | Aldo Cortesi | 2018-07-21 | 11 | -3/+1263 | |
|\ \ | | | | | | | Shifting to Protobuf Serialization - Cleaned | |||||
| * | | protobuf: tests implemented, full coverage | Pietro Francesco Tirenna | 2018-07-17 | 11 | -64/+200 | |
| | | | ||||||
| * | | Removed test code from view | Pietro Francesco Tirenna | 2018-06-30 | 1 | -13/+6 | |
| | | | ||||||
| * | | updated exceptions in view load | madt1m | 2018-06-30 | 1 | -0/+2 | |
| | | | ||||||
| * | | view can load from both io interfaces | madt1m | 2018-06-30 | 1 | -3/+11 | |
| | | | ||||||
| * | | Timestamps are now double instead of float | madt1m | 2018-06-30 | 2 | -25/+25 | |
| | | | ||||||
| * | | more bug fixes in DB class | madt1m | 2018-06-30 | 1 | -4/+0 | |
| | | | ||||||
| * | | bug fix | madt1m | 2018-06-30 | 1 | -0/+1 | |
| | | | ||||||
| * | | new protobuf loads has almost the same result of FlowReader stream | madt1m | 2018-06-30 | 1 | -1/+8 | |
| | | | ||||||
| * | | Loads yields now an HTTP object | madt1m | 2018-06-30 | 1 | -14/+25 | |
| | | | ||||||
| * | | Completed untested version of object loading | madt1m | 2018-06-30 | 1 | -99/+93 | |
| | | | ||||||
| * | | Refactored naming strategy | Pietro Francesco Tirenna | 2018-06-28 | 1 | -18/+18 | |
| | | | ||||||
| * | | Improved parsing mechanism for better readability | madt1m | 2018-06-23 | 1 | -12/+26 | |
| | | | ||||||
| * | | Fixed bugs in parsing HTTPFlow objects | madt1m | 2018-06-23 | 1 | -19/+28 | |
| | | | ||||||
| * | | New explicit parsing HTTPFlow into proto native object. Viceversa not yet ↵ | madt1m | 2018-06-23 | 3 | -9/+185 | |
| | | | | | | | | | | | | implemented. | |||||
| * | | Fixed a bug in protobuf loading -> no return | madt1m | 2018-06-23 | 2 | -1/+3 | |
| | | | ||||||
| * | | Hooking the view to load from new DB handler | madt1m | 2018-06-23 | 4 | -20/+23 | |
| | | | ||||||
| * | | Added protobuf methods; implemented initial DB logic | madt1m | 2018-06-23 | 7 | -60/+868 | |
| | | | ||||||
| * | | Added initial protobuf definitions | madt1m | 2018-06-22 | 4 | -0/+100 | |
| | | | ||||||
* | | | Merge pull request #3251 from kajojify/command_history | Aldo Cortesi | 2018-07-21 | 3 | -2/+116 | |
|\ \ \ | |_|/ |/| | | Command history | |||||
| * | | Some refactoring. New test case. | Miroslav | 2018-07-19 | 3 | -17/+30 | |
| | | | ||||||
| * | | Command history implementation | Miroslav | 2018-07-17 | 3 | -2/+103 | |
|/ / | ||||||
* | | Merge pull request #3243 from mhils/dns-rebinding | Maximilian Hils | 2018-07-17 | 1 | -26/+41 | |
|\ \ | | | | | | | mitmweb: protect against dns rebinding | |||||
| * | | mitmweb: improve dns rebinding protection, support ipv6 | Maximilian Hils | 2018-07-12 | 1 | -1/+12 | |
| | | | ||||||
| * | | mitmweb: protect against dns rebinding | Maximilian Hils | 2018-07-11 | 1 | -26/+30 | |
|/ / | ||||||
* | | Merge pull request #3186 from andersonvom/master | Aldo Cortesi | 2018-07-11 | 2 | -1/+16 | |
|\ \ | | | | | | | Add scripting example to intercept & change requests | |||||
| * | | Add example to intercept/change specific requests | Anderson Mesquita | 2018-06-16 | 1 | -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 file | Anderson Mesquita | 2018-06-08 | 2 | -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/3230 | Aldo Cortesi | 2018-07-11 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Pass option, not option name to parse_setval | |||||
| * | | | Pass option, not option name to parse_setval | Grant Murphy | 2018-07-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Fixes #3230 | |||||
* | | | | Merge pull request #3239 from bunnyhero/patch-1 | Thomas Kriechbaumer | 2018-07-08 | 1 | -3/+3 | |
|\ \ \ \ | |/ / / |/| | | | Update howto-transparent.md | |||||
| * | | | Update howto-transparent.md | bunnyhero | 2018-07-05 | 1 | -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. |