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

authorization: fix minor typing issues 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-06-17 17:07:58 -04:00
parent 58fa361c8c
commit 8266376f46
No known key found for this signature in database
GPG Key ID: 7027245FBBDDF59A
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
moonraker/components/authorization.py
View File

@ -172,6 +172,7 @@ class Authorization:
self.trusted_domains: List[str] = [] self.trusted_domains: List[str] = []
for val in config.getlist('trusted_clients', []): for val in config.getlist('trusted_clients', []):
# Check IP address # Check IP address
tc: Union[IPAddr, IPNetwork]
try: try:
tc = ipaddress.ip_address(val) tc = ipaddress.ip_address(val)
except ValueError: except ValueError:
@ -247,7 +248,7 @@ class Authorization:
self._handle_oneshot_request, transports=['http']) self._handle_oneshot_request, transports=['http'])
self.server.register_endpoint( self.server.register_endpoint(
"/access/info", ['GET'], "/access/info", ['GET'],
self._handle_default_source_request, transports=['http']) self._handle_info_request, transports=['http'])
self.server.register_notification("authorization:user_created") self.server.register_notification("authorization:user_created")
self.server.register_notification("authorization:user_deleted") self.server.register_notification("authorization:user_deleted")
@ -291,9 +292,9 @@ class Authorization:
"action": "user_logged_out" "action": "user_logged_out"
} }
async def _handle_default_source_request(self, async def _handle_info_request(
web_request: WebRequest self, web_request: WebRequest
) -> Dict[str, str | List[str]]: ) -> Dict[str, Any]:
sources = ["moonraker"] sources = ["moonraker"]
if self.ldap is not None: if self.ldap is not None:
sources.append("ldap") sources.append("ldap")
@ -689,7 +690,7 @@ class Authorization:
def _check_oneshot_token(self, def _check_oneshot_token(self,
token: str, token: str,
cur_ip: IPAddr cur_ip: Optional[IPAddr]
) -> Optional[Dict[str, Any]]: ) -> Optional[Dict[str, Any]]:
if token in self.oneshot_tokens: if token in self.oneshot_tokens:
ip_addr, user, hdl = self.oneshot_tokens.pop(token) ip_addr, user, hdl = self.oneshot_tokens.pop(token)
@ -717,7 +718,7 @@ class Authorization:
return jwt_user return jwt_user
try: try:
ip = ipaddress.ip_address(request.remote_ip) ip = ipaddress.ip_address(request.remote_ip) # type: ignore
except ValueError: except ValueError:
logging.exception( logging.exception(
f"Unable to Create IP Address {request.remote_ip}") f"Unable to Create IP Address {request.remote_ip}")