evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Catch HTML case insensitively in "no HTML" config validation (#101181)

Browse source
This commit is contained in:
Ville Skyttä 2023-10-01 17:19:24 +03:00 • committed by GitHub
parent a3808383d5
commit f4bf8fa8f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/owntracks/strings.json
View file

@ -11,7 +11,7 @@
"single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]" "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
}, },
"create_entry": { "create_entry": {
"default": "\n\nOn Android, open [the OwnTracks app]({android_url}), go to Preferences > Connection. Change the following settings:\n - Mode: HTTP\n - Host: {webhook_url}\n - Identification:\n - Username: `'<Your name>'`\n - Device ID: `'<Your device name>'`\n\nOn iOS, open [the OwnTracks app]({ios_url}), tap (i) icon in top left > Settings. Change the following settings:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `'<Your name>'`\n\n{secret}\n\nSee [the documentation]({docs_url}) for more information." "default": "\n\nOn Android, open [the OwnTracks app]({android_url}), go to Preferences > Connection. Change the following settings:\n - Mode: HTTP\n - Host: {webhook_url}\n - Identification:\n - Username: `'(Your name)'`\n - Device ID: `'(Your device name)'`\n\nOn iOS, open [the OwnTracks app]({ios_url}), tap (i) icon in top left > Settings. Change the following settings:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `'(Your name)'`\n\n{secret}\n\nSee [the documentation]({docs_url}) for more information."
} }
} }
} }

2
homeassistant/helpers/config_validation.py
View file

@ -599,7 +599,7 @@ def string(value: Any) -> str:
def string_with_no_html(value: Any) -> str: def string_with_no_html(value: Any) -> str:
"""Validate that the value is a string without HTML.""" """Validate that the value is a string without HTML."""
value = string(value) value = string(value)
regex = re.compile(r"<[a-z][\s\S]*>") regex = re.compile(r"<[a-z].*?>", re.IGNORECASE)
if regex.search(value): if regex.search(value):
raise vol.Invalid("the string should not contain HTML") raise vol.Invalid("the string should not contain HTML")
return str(value) return str(value)

3
tests/helpers/test_config_validation.py
View file

@ -563,6 +563,9 @@ def test_string_with_no_html() -> None:
with pytest.raises(vol.Invalid): with pytest.raises(vol.Invalid):
schema("<b>Bold</b>") schema("<b>Bold</b>")
with pytest.raises(vol.Invalid):
schema("HTML element names are <EM>case-insensitive</eM>.")
for value in ( for value in (
True, True,
3, 3,