Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity
7,945 Commits 1 Branch 67 Tags 50 MiB
ed9e3d5137
Commit Graph

7945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miroslav
ed9e3d5137 keys.yaml priority over defaultkeys.py. Test for this. 2018-09-29 15:54:17 +03:00
Thomas Kriechbaumer
7f5d8d0997
Merge pull request #3335 from Kriechi/bump-wsproto 
bump wsproto
 2018-09-23 14:09:04 +02:00
Thomas Kriechbaumer
afdcb944e1 bump wsproto 2018-09-23 13:46:45 +02:00
Maximilian Hils
4be387d654
Merge pull request #3327 from Kriechi/docker-notice 
add docker security warning
 2018-09-20 17:34:10 +02:00
Thomas Kriechbaumer
73577eb607 update docker security warning 2018-09-18 20:42:48 +02:00
Thomas Kriechbaumer
cf15da1ed5 add docker security warning 2018-09-15 14:01:34 +02:00
Maximilian Hils
97244a7e0e
Merge pull request #3328 from bennofs/browser-chrome-unstable 
addons/browser: fallback to google-chrome-unstable as last try
 2018-09-14 18:19:24 +02:00
Benno Fünfstück
2cf29f1060 addons/browser: fallback to google-chrome-unstable as last try 2018-09-14 18:15:42 +02:00
Thomas Kriechbaumer
6c0849aa46
Merge pull request #3229 from Kriechi/py37 
Python 3.7 is here
 2018-09-07 18:14:01 +02:00
Thomas Kriechbaumer
a2e6c47a2b use travis workaround for py37 2018-09-07 17:48:06 +02:00
Thomas Kriechbaumer
925bba4c3c Python 3.7 is here 2018-09-07 17:48:06 +02:00
Maximilian Hils
6c2e15fce3
Merge pull request #3297 from guangchao0831/feature_correct_lib_version 
Lib ruamel.yaml version 0.15.55 will cause typing.Sequence[str] unsupported in option.
 2018-09-07 14:46:58 +02:00
Maximilian Hils
03cb77a5e0
Merge branch 'master' into feature_correct_lib_version 2018-09-07 14:46:19 +02:00
Maximilian Hils
9564b7a0b2
Merge pull request #3320 from mhils/pin-ruamel 
Pin ruamel.yaml to working version
 2018-09-07 13:59:15 +02:00
Maximilian Hils
34e35f5e5a pin ruamel.yaml to working version 2018-09-07 13:41:34 +02:00
Maximilian Hils
e15619f34e
Merge pull request #3319 from mhils/issue-3316 
Fix #3316
 2018-09-07 10:34:55 +02:00
Maximilian Hils
53e7761876
Merge pull request #3294 from elijahbal/master 
Fix XSS scanner failure in test_xss_scanner.py
 2018-09-07 10:32:40 +02:00
Maximilian Hils
1b6a8d6acd fix #3316 2018-09-07 10:24:28 +02:00
Maximilian Hils
b7aa325bfe
update installbuilder url 2018-09-04 19:47:47 +02:00
Guangchao
3f14a485d3 Lib ruamel.yaml version 0.15.55 will caused typing.Sequence[str] unsupported 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].
 2018-08-17 15:19:29 +08:00
David Kremer
dcd8ba34ab [test/xss_scanner] add fixtures in tests 
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.
 2018-08-15 19:47:55 +02:00
David Kremer
e46e064df3 [examples/xss_scanner] replace relative import 
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.
 2018-08-15 19:47:55 +02:00
Aldo Cortesi
a945b0cf11
Merge pull request #3277 from madt1m/session-flowcap 
Session - Storage Layer
 2018-08-14 20:40:32 +12:00
Maximilian Hils
b53c1d5862
Merge pull request #3293 from Eluch/master 
Autoformat for json-rpc calls
 2018-08-13 13:24:50 +02:00
Ferenc soós
ee74f82786 Autoformat for json-rpc calls 2018-08-13 13:16:19 +02:00
Maximilian Hils
4b19c68dc5
Merge pull request #3292 from MatthewShao/fix-mitmweb 
[web] Fixes #3228:API endpoint error
 2018-08-13 10:11:28 +02:00
Matthew Shao
e9e2b7f443 [web] Fixes #3228:API endpoint error 2018-08-13 15:20:08 +08:00
madt1m
a52451900c session: implemented changes requested after PR review. 2018-08-05 21:57:55 +02:00
madt1m
e9c2b12dab tests: Full coverage. Everything working, ready for review 2018-08-03 16:32:50 +02:00
Thomas Kriechbaumer
e74e97bcd9
Merge pull request #3280 from muffl0n/ssl-insecure 
Suggest --ssl-insecure cause --insecure is deprecated
 2018-08-03 09:40:55 +02:00
[OSC] Sven Schliesing
ec9b8bf1eb Suggest --ssl-insecure cause --insecure is deprecated 2018-08-03 08:31:54 +02:00
madt1m
4e0c10b88b tests: 97% coverage reached. Session opportunely patched after emerged defects. 2018-08-02 05:55:35 +02:00
madt1m
a839d2ee2a session: implemented filter and refilter. Ready for testing implementation 2018-08-01 12:08:28 +02:00
madt1m
afe41eb75c protobuf: changed return type annotation in loads to enhance granularity 2018-08-01 12:00:07 +02:00
madt1m
ccb5fd7c99 session: basic flow capture implemented 2018-08-01 02:16:35 +02:00
Maximilian Hils
22347d48e9 update CHANGELOG for 4.0.4 2018-07-31 14:18:07 +02:00
Maximilian Hils
6e41507d62
Update README.md 2018-07-31 14:11:37 +02:00
Maximilian Hils
ace0275b35
Merge pull request #3274 from muffl0n/shorten_notAfter_to_90_days 
Add DEFAULT_EXP_DUMMY_CERT and set to two years
 2018-07-31 13:34:02 +02:00
[OSC] Sven Schliesing
01e052be6a Change lifetime of dummy certificate to two years 2018-07-31 13:33:08 +02:00
[OSC] Sven Schliesing
a081ba6430 Add DEFAULT_EXP_DUMMY_CERT and set to 90 days 
Helps with Chrome's "certificates can not be valid longer than 27,5 month"
Fixes #3273
 2018-07-31 11:38:11 +02:00
Pietro Francesco Tirenna
53b85d2360 session: adding methods to capture and store flows 2018-07-28 17:44:02 +02:00
Thomas Kriechbaumer
5f3cbbb3cd
Merge pull request #3155 from mitmproxy/requires-io-master 
dependency update on master branch
 2018-07-27 10:38:14 +02:00
Thomas Kriechbaumer
f3169da3eb bump dependencies 2018-07-27 10:02:52 +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