Fix typing issues

nmariz · nmariz · commit e47d0dff9841 · 2023-08-31T16:13:55.000+01:00
Change-Id: I9605d51bc3560384db5d9cf0483bff5716e6ae90
diff --git a/lib/mysql/connector/plugins/authentication_kerberos_client.py b/lib/mysql/connector/plugins/authentication_kerberos_client.py
@@ -202,7 +202,7 @@ def get_store() -> dict:
         """
         krb5ccname = os.environ.get(
             "KRB5CCNAME",
-            f"/tmp/krb5cc_{os.getuid()}"  # type: ignore[attr-defined]
+            f"/tmp/krb5cc_{os.getuid()}"
             if os.name == "posix"
             else Path("%TEMP%").joinpath("krb5cc"),
         )
diff --git a/lib/mysql/connector/plugins/authentication_webauthn_client.py b/lib/mysql/connector/plugins/authentication_webauthn_client.py
@@ -97,7 +97,7 @@ def requires_ssl(self) -> bool:
 
     def get_assertion_response(
         self, credential_id: Optional[bytearray] = None
-    ) -> bytearray:
+    ) -> bytes:
         """Get assertion from authenticator and return the response.
 
         Args:
@@ -165,7 +165,7 @@ def get_assertion_response(
         logger.debug("WebAuthn - payload response packet: %s", packet)
         return packet
 
-    def auth_response(self, auth_data: bytes, **kwargs: Any) -> int:
+    def auth_response(self, auth_data: bytes, **kwargs: Any) -> Optional[bytes]:
         """Find authenticator device and check if supports resident keys.
 
         It also creates a Fido2Client using the relying party ID from the server.
@@ -194,7 +194,7 @@ def auth_response(self, auth_data: bytes, **kwargs: Any) -> int:
         if device is not None:
             logger.debug("WebAuthn - Use USB HID channel")
         elif CTAP_PCSC_DEVICE_AVAILABLE:
-            device = next(CtapPcscDevice.list_devices(), None)  # type: ignore[arg-type]
+            device = next(CtapPcscDevice.list_devices(), None)
 
         if device is None:
             raise errors.InterfaceError("No FIDO device found")
@@ -208,10 +208,10 @@ def auth_response(self, auth_data: bytes, **kwargs: Any) -> int:
 
         if not self.client.info.options.get("rk"):
             logger.debug("WebAuthn - Authenticator doesn't support resident keys")
-            return 1
+            return b"1"
 
         logger.debug("WebAuthn - Authenticator with support for resident key found")
-        return 2
+        return b"2"
 
     def auth_more_response(
         self, sock: "MySQLSocket", auth_data: bytes, **kwargs: Any
@@ -271,10 +271,10 @@ def auth_switch_response(
         response = self.auth_response(auth_data)
         credential_id = None
 
-        if response == 1:
+        if response == b"1":
             # Authenticator doesn't support resident keys, request credential_id
             logger.debug("WebAuthn - request credential_id")
-            sock.send(utils.lc_int(response))
+            sock.send(utils.lc_int(int(response)))
 
             # return a packet representing an `auth more data` response
             return bytes(sock.recv())

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ def get_store() -> dict:`
`202`	`202`	`"""`
`203`	`203`	`krb5ccname = os.environ.get(`
`204`	`204`	`"KRB5CCNAME",`
`205`		`- f"/tmp/krb5cc_{os.getuid()}" # type: ignore[attr-defined]`
	`205`	`+ f"/tmp/krb5cc_{os.getuid()}"`
`206`	`206`	`if os.name == "posix"`
`207`	`207`	`else Path("%TEMP%").joinpath("krb5cc"),`
`208`	`208`	`)`