chore: Fix some issues with static analysis

synapse_token_authenticator/auth_headers.py

@@ -0,0 +1,70 @@
+from __future__ import annotations
+
+from base64 import b64encode
+from dataclasses import dataclass
+from typing import Protocol
+
+
+class HttpAuth(Protocol):
+    def header_map(self) -> dict[bytes, list[bytes]]:
+        """Retrieve the mapping for the authorization for Header generation"""
+        ...
+
+
+@dataclass
+class NoAuth:
+    def header_map(self) -> dict[bytes, list[bytes]]:
+        return {}
+
+
+@dataclass
+class BasicAuth:
+    username: str
+    password: str
+
+    def header_map(self) -> dict[bytes, list[bytes]]:
+        return basic_auth(self.username, self.password)
+
+
+@dataclass
+class BearerAuth:
+    token: str
+
+    def header_map(self) -> dict[bytes, list[bytes]]:
+        return bearer_auth(self.token)
+
+
+def parse_auth(d: dict | list) -> HttpAuth:
+    if isinstance(d, dict):
+        _type = d.pop("type")
+        if _type is None:
+            return NoAuth()
+        elif _type == "basic":
+            return BasicAuth(**d)
+        elif _type == "bearer":
+            return BearerAuth(**d)
+        else:
+            raise Exception(f"Unknown HttpAuth type {_type}")
+    elif isinstance(d, list):
+        _type = d.pop(0)
+        if _type is None:
+            return NoAuth()
+        elif _type == "basic":
+            return BasicAuth(*d)
+        elif _type == "bearer":
+            return BearerAuth(*d)
+        else:
+            raise Exception(f"Unknown HttpAuth type {_type}")
+    else:
+        raise Exception("HttpAuth parsing failed, expected list or dict")
+
+
+def basic_auth(username: str, password: str) -> dict[bytes, list[bytes]]:
+    authorization = b64encode(
+        b":".join((username.encode("utf8"), password.encode("utf8")))
+    )
+    return {b"Authorization": [b"Basic " + authorization]}
+
+
+def bearer_auth(token: str) -> dict[bytes, list[bytes]]:
+    return {b"Authorization": [b"Bearer " + token.encode("utf8")]}

synapse_token_authenticator/claims_validator.py

@@ -35,7 +35,7 @@
 ]
 
 
-def parse_validator(d: dict) -> Validator:
+def parse_validator(d: dict | list) -> Validator:
     if isinstance(d, dict):
         type = d.pop("type")
         if type == "exist":
@@ -94,7 +94,7 @@ def validate(self, x: Any) -> bool:
 class Not:
     validator: Validator
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self.validator = parse_validator(self.validator)
 
     def validate(self, x: Any) -> bool:
@@ -114,7 +114,7 @@ class MatchesRegex:
     regex: str
     full_match: bool | None = True
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self.regex_prog = re.compile(self.regex)
 
     def validate(self, s: Any) -> bool:
@@ -130,7 +130,7 @@ def validate(self, s: Any) -> bool:
 class AnyOf:
     validators: List[Validator]
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self.validators = list(map(lambda v: parse_validator(v), self.validators))
 
     def validate(self, x: Any) -> bool:
@@ -141,7 +141,7 @@ def validate(self, x: Any) -> bool:
 class AllOf:
     validators: List[Validator]
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self.validators = list(map(lambda v: parse_validator(v), self.validators))
 
     def validate(self, x: Any) -> bool:
@@ -153,7 +153,7 @@ class In:
     path: str | List[str]
     validator: Optional[Validator] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         if not self.path:
             raise Exception("Path list is empty")
         if self.validator:
@@ -172,7 +172,7 @@ def validate(self, x: Any) -> bool:
 class ListAllOf:
     validator: Validator
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         if self.validator:
             self.validator = parse_validator(self.validator)
 
@@ -186,7 +186,7 @@ def validate(self, list_: Any) -> bool:
 class ListAnyOf:
     validator: Validator
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         if self.validator:
             self.validator = parse_validator(self.validator)