Alex Lauerman
93cb73e2cd
Corrected keep_host_header usage option
...
I tested this locally to verify this change is correct.
2018-10-25 16:15:55 -05:00
Samoilenko Roman
997a20e652
Merge pull request #3356 from fghzxm/umask-keys
...
Make private keys readable only by the owner
2018-10-25 11:23:20 +03:00
Maximilian Hils
28551e9655
use skip_windows decorator consistently
2018-10-23 15:24:59 +02:00
Fred Miller
bf3570b3b9
Skip file permission test on Windows
2018-10-23 08:53:51 +08:00
Fred Miller
f16621a38b
Make private keys readable only by the owner
2018-10-22 22:53:58 +08:00
Maximilian Hils
e8d76d050d
Merge pull request #3351 from arun-94/master
...
#3312 Change colors according to the HTTP status code
2018-10-21 14:48:58 +02:00
Arun Swaminathan
a6ba88ae64
Update snapshot tests
2018-10-20 04:05:07 -04:00
Arun Swaminathan
c1184176e7
Check for null flow response when changing color
2018-10-20 04:04:55 -04:00
Maximilian Hils
0d320e778d
Merge pull request #3355 from kam800/configurable-lines-cutoff
...
Make content view lines limit configurable
2018-10-20 00:08:44 +02:00
Kamil Borzym
41cef4e9e3
Make content view lines limit configurable
2018-10-19 15:58:53 +02:00
Arun Swaminathan
028dd78291
#3312 Change colors according to HTTP status code
2018-10-15 22:43:22 -04:00
jbrule
57868ef5fa
Added link_expander.py example to simple examples ( #3348 )
2018-10-12 21:56:58 +02:00
Maximilian Hils
82797efe9f
Merge pull request #3344 from Tey/master
...
Fixed doc about domain whitelisting
2018-10-10 17:07:16 +02:00
Thomas Kriechbaumer
eace39f670
Merge pull request #3334 from artnc/patch-1
...
Fix error message for failure to start editor
2018-10-10 17:03:27 +02:00
Thomas Kriechbaumer
c30b46147e
Merge pull request #3347 from Kriechi/ws-example
...
add websocket example
2018-10-09 19:03:17 +02:00
Thomas Kriechbaumer
13e1f8b421
add websocket example
2018-10-09 18:34:57 +02:00
Tey
1752fac0d8
Fixed doc about domain whitelisting
2018-10-05 04:05:18 +02:00
Samoilenko Roman
a8b809dcbc
Merge pull request #3340 from kajojify/buttons
...
keys.yaml priority over defaultkeys.py
2018-09-29 16:21:46 +03:00
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
Art Chaidarun
769aad0515
Fix error message for failure to start editor
2018-09-23 00:20:34 -04: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
