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

authorization: use extended confighelper methods 

Signed-off-by: Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-11-20 08:58:23 -05:00
parent 845689fde1
commit 22807ee393
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moonraker/components/authorization.py
View File

@ -134,9 +134,7 @@ class Authorization:
# Get allowed cors domains # Get allowed cors domains
self.cors_domains: List[str] = [] self.cors_domains: List[str] = []
cors_cfg = config.get('cors_domains', "").strip() for domain in config.getlist('cors_domains', []):
cds = [d.strip() for d in cors_cfg.split('\n') if d.strip()]
for domain in cds:
bad_match = re.search(r"^.+\.[^:]*\*", domain) bad_match = re.search(r"^.+\.[^:]*\*", domain)
if bad_match is not None: if bad_match is not None:
raise config.error( raise config.error(
@ -155,9 +153,7 @@ class Authorization:
self.trusted_ips: List[IPAddr] = [] self.trusted_ips: List[IPAddr] = []
self.trusted_ranges: List[IPNetwork] = [] self.trusted_ranges: List[IPNetwork] = []
self.trusted_domains: List[str] = [] self.trusted_domains: List[str] = []
tcs = config.get('trusted_clients', "") for val in config.getlist('trusted_clients', []):
trusted_clients = [c.strip() for c in tcs.split('\n') if c.strip()]
for val in trusted_clients:
# Check IP address # Check IP address
try: try:
tc = ipaddress.ip_address(val) tc = ipaddress.ip_address(val)