Disallow '
This commit is contained in:
parent
6f614c91d7
commit
de7ef86f52
|
@ -21,6 +21,7 @@ from .const import (
|
|||
|
||||
RE_MOUNT_NAME = re.compile(r"^\w+$")
|
||||
RE_PATH_PART = re.compile(r"^[^\\\/]+")
|
||||
RE_MOUNT_OPTION = re.compile(r"^[^']+$")
|
||||
|
||||
VALIDATE_NAME = vol.Match(RE_MOUNT_NAME)
|
||||
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_SHARE): VALIDATE_SHARE,
|
||||
vol.Inclusive(ATTR_USERNAME, "basic_auth"): str,
|
||||
vol.Inclusive(ATTR_PASSWORD, "basic_auth"): str,
|
||||
vol.Inclusive(ATTR_USERNAME, "basic_auth"): vol.Match(RE_MOUNT_OPTION),
|
||||
vol.Inclusive(ATTR_PASSWORD, "basic_auth"): vol.Match(RE_MOUNT_OPTION),
|
||||
}
|
||||
)
|
||||
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
"""Tests for mount manager validation."""
|
||||
|
||||
import re
|
||||
|
||||
import pytest
|
||||
from voluptuous import Invalid
|
||||
|
||||
|
@ -15,6 +17,8 @@ async def test_valid_mounts():
|
|||
"type": "cifs",
|
||||
"server": "test.local",
|
||||
"share": "test",
|
||||
"username": "admin",
|
||||
"password": "p@assword!,=",
|
||||
}
|
||||
)
|
||||
|
||||
|
@ -77,12 +81,39 @@ async def test_invalid_cifs():
|
|||
SCHEMA_MOUNT_CONFIG(base)
|
||||
|
||||
# Path is for NFS
|
||||
with pytest.raises(Invalid):
|
||||
SCHEMA_MOUNT_CONFIG({"path": "backups"})
|
||||
with pytest.raises(
|
||||
Invalid, match=re.escape("required key not provided @ data['share']")
|
||||
):
|
||||
SCHEMA_MOUNT_CONFIG({**base, "path": "backups"})
|
||||
|
||||
# Username and password must be together
|
||||
with pytest.raises(Invalid):
|
||||
SCHEMA_MOUNT_CONFIG({"username": "admin"})
|
||||
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", "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():
|
||||
|
|
Loading…
Reference in New Issue