3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

authorization: report invalid "trusted_clients" 

Add warnings that are reported to clients and logged if an
invalid trusted client is detected.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-12-20 08:37:54 -05:00
parent 828be30466
commit 7d1cf435f7
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
moonraker/components/authorization.py
View File

@ -141,9 +141,9 @@ class Authorization:
" permitted in the top level domain.") " permitted in the top level domain.")
if domain.endswith("/"): if domain.endswith("/"):
self.server.add_warning( self.server.add_warning(
f"Invalid domain '{domain}' in option 'cors_domains', " f"[authorization]: Invalid domain '{domain}' in option "
"section [authorization]. Domain's cannot contain a " "'cors_domains'. Domain's cannot contain a trailing "
"trailing slash.") "slash.")
else: else:
self.cors_domains.append( self.cors_domains.append(
domain.replace(".", "\\.").replace("*", ".*")) domain.replace(".", "\\.").replace("*", ".*"))
@ -164,13 +164,24 @@ class Authorization:
# Check ip network # Check ip network
try: try:
tc = ipaddress.ip_network(val) tc = ipaddress.ip_network(val)
except ValueError: except ValueError as e:
if "has host bits set" in str(e):
self.server.add_warning(
f"[authorization]: Invalid CIDR expression '{val}' "
"in option 'trusted_clients'")
continue
pass pass
else: else:
self.trusted_ranges.append(tc) self.trusted_ranges.append(tc)
continue continue
# Check hostname # Check hostname
self.trusted_domains.append(val.lower()) match = re.match(r"([a-z0-9]+(-[a-z0-9]+)*\.?)+[a-z]{2,}$", val)
if match is not None:
self.trusted_domains.append(val.lower())
else:
self.server.add_warning(
f"[authorization]: Invalid domain name '{val}' "
"in option 'trusted_clients'")
t_clients = "\n".join( t_clients = "\n".join(
[str(ip) for ip in self.trusted_ips] + [str(ip) for ip in self.trusted_ips] +