Commit Graph

7903 Commits

Author SHA1 Message Date
Pietro Francesco Tirenna
53b85d2360 session: adding methods to capture and store flows 2018-07-28 17:44:02 +02:00
Pietro Francesco Tirenna
9c949bd2f8
Merge pull request #3252 from madt1m/session-db
Session - Hybrid DB
2018-07-24 16:26:10 +02:00
madt1m
8c7793b91a session: temporary DB is now stored in temporary dir 2018-07-24 15:57:11 +02:00
madt1m
68eb07b668 session: modified schema. Now SessionDB uses tempfile module for temp session 2018-07-24 11:58:33 +02:00
Aldo Cortesi
16e07996d9
Merge pull request #3256 from madt1m/serialization-benchmark
Protobuf - Benchmark Script
2018-07-24 07:54:30 +12:00
madt1m
e727446f14 benchmark: some improvements - limit to queue size 2018-07-23 21:18:24 +02:00
Thomas Kriechbaumer
8ce963ad4c
Merge pull request #3258 from Kriechi/fix-whitespace
fix whitespace
2018-07-22 21:05:07 +02:00
Thomas Kriechbaumer
50e3bab3c5 fix whitespace 2018-07-22 20:35:40 +02:00
madt1m
8ab82ad9a3 benchmark: new protobuf serialization performance profiler 2018-07-22 12:47:54 +02:00
Aldo Cortesi
ec092fdc12
Merge pull request #3245 from madt1m/protobuf-serialization-clean
Shifting to Protobuf Serialization - Cleaned
2018-07-21 16:13:25 +12:00
Aldo Cortesi
f20d78c376
Merge pull request #3251 from kajojify/command_history
Command history
2018-07-21 16:11:00 +12:00
madt1m
3b5cdf7f67 test_linting: removed some unused local variables 2018-07-20 18:15:27 +02:00
madt1m
fad8e7c99b tests: SessionDB fully tested 2018-07-20 16:58:11 +02:00
madt1m
1a58442027 exceptions: new SessionLoad exception for load errors 2018-07-20 16:57:23 +02:00
madt1m
04b9555db8 session: load/create wrapper methods for SessionDB 2018-07-20 16:56:51 +02:00
madt1m
4cebfbabad session: Implemented SessionDB Schema 2018-07-20 16:56:26 +02:00
Miroslav
dcb3de40b1 Some refactoring. New test case. 2018-07-19 16:56:34 +03:00
Pietro Francesco Tirenna
d5da74645b protobuf: tests implemented, full coverage 2018-07-17 19:23:01 +02:00
Miroslav
ffbd7c20e5 Command history implementation 2018-07-17 18:37:45 +03:00
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