jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-10 18:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disallow '

Browse Source
This commit is contained in:
ludeeus 2023-06-16 12:33:04 +00:00
parent 6f614c91d7
commit de7ef86f52
No known key found for this signature in database
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
supervisor/mounts/validate.py
View File

@ -21,6 +21,7 @@ from .const import (
RE_MOUNT_NAME = re.compile(r"^\w+$") RE_MOUNT_NAME = re.compile(r"^\w+$")
RE_PATH_PART = re.compile(r"^[^\\\/]+") RE_PATH_PART = re.compile(r"^[^\\\/]+")
RE_MOUNT_OPTION = re.compile(r"^[^']+$")
VALIDATE_NAME = vol.Match(RE_MOUNT_NAME) VALIDATE_NAME = vol.Match(RE_MOUNT_NAME)
VALIDATE_SERVER = vol.Match(RE_PATH_PART) VALIDATE_SERVER = vol.Match(RE_PATH_PART)
@ -47,8 +48,8 @@ SCHEMA_MOUNT_CIFS = _SCHEMA_MOUNT_NETWORK.extend(
{ {
vol.Required(ATTR_TYPE): MountType.CIFS.value, vol.Required(ATTR_TYPE): MountType.CIFS.value,
vol.Required(ATTR_SHARE): VALIDATE_SHARE, vol.Required(ATTR_SHARE): VALIDATE_SHARE,
vol.Inclusive(ATTR_USERNAME, "basic_auth"): str, vol.Inclusive(ATTR_USERNAME, "basic_auth"): vol.Match(RE_MOUNT_OPTION),
vol.Inclusive(ATTR_PASSWORD, "basic_auth"): str, vol.Inclusive(ATTR_PASSWORD, "basic_auth"): vol.Match(RE_MOUNT_OPTION),
} }
) )

39
tests/mounts/test_validate.py
View File

@ -1,5 +1,7 @@
"""Tests for mount manager validation.""" """Tests for mount manager validation."""
import re
import pytest import pytest
from voluptuous import Invalid from voluptuous import Invalid
@ -15,6 +17,8 @@ async def test_valid_mounts():
"type": "cifs", "type": "cifs",
"server": "test.local", "server": "test.local",
"share": "test", "share": "test",
"username": "admin",
"password": "p@assword!,=",
} }
) )
@ -77,12 +81,39 @@ async def test_invalid_cifs():
SCHEMA_MOUNT_CONFIG(base) SCHEMA_MOUNT_CONFIG(base)
# Path is for NFS # Path is for NFS
with pytest.raises(Invalid): with pytest.raises(
SCHEMA_MOUNT_CONFIG({"path": "backups"}) Invalid, match=re.escape("required key not provided @ data['share']")
):
SCHEMA_MOUNT_CONFIG({**base, "path": "backups"})
# Username and password must be together # Username and password must be together
with pytest.raises(Invalid): with pytest.raises(
SCHEMA_MOUNT_CONFIG({"username": "admin"}) Invalid,
match=re.escape(
"some but not all values in the same group of inclusion 'basic_auth' @ data[<basic_auth>]"
),
):
SCHEMA_MOUNT_CONFIG({**base, "share": "test", "username": "admin"})
# Username and password must be together
with pytest.raises(
Invalid,
match=re.escape(
"some but not all values in the same group of inclusion 'basic_auth' @ data[<basic_auth>]"
),
):
SCHEMA_MOUNT_CONFIG({**base, "share": "test", "password": "my=!pass"})
# Invalid password
with pytest.raises(
Invalid,
match=re.escape(
"does not match regular expression ^[^']+$ for dictionary value @ data['password']"
),
):
SCHEMA_MOUNT_CONFIG(
{**base, "share": "test", "username": "admin", "password": "my=!pa'ss,"}
)
async def test_invalid_nfs(): async def test_invalid_nfs():