derivepassphrase.git

@@ -1101,7 +1101,7 @@ class BuiltinSSHAgentSocketProvider(str, enum.Enum):

     ) -> bool:  # pragma: no cover [external]

         """Return true if this SSH agent socket provider is available.

-        This works by actually attempting to connet to an agent via the

+        This works by actually attempting to connect to an agent via the

         socket provider.

         """

@@ -1166,7 +1166,7 @@ class SSHAgentSocket(Protocol):

     def sendall(self, data: Buffer, flags: int = 0, /) -> None: ...

-    def recv(self, data: int, flags: int = 0, /) -> bytes: ...

+    def recv(self, bufsize: int, flags: int = 0, /) -> bytes: ...

 SSHAgentSocketProvider: TypeAlias = "Callable[[], SSHAgentSocket]"

@@ -329,7 +329,13 @@ class Parametrize(types.SimpleNamespace):

         ],

     )

     KEY_INDEX = pytest.mark.parametrize(

-        "key_index", [1, 2, 3], ids=lambda i: f"index{i}"

+        "key_index",

+        [

+            i

+            for i, x in enumerate(data.ALL_KEYS.values(), start=1)

+            if x.is_suitable()

+        ],

+        ids=lambda i: f"index{i}",

     )

     EXPLICIT_SSH_AGENT_SOCKET_PROVIDER = pytest.mark.parametrize(

         ["on_command_line", "in_config"],

@@ -363,7 +369,7 @@ class Parametrize(types.SimpleNamespace):

         ],

     )

     OPTION_COMBINATIONS_SERVICE_NEEDED = pytest.mark.parametrize(

-        ["options", "service", "input", "check_success"],

+        ["options", "needs_service", "input", "check_success"],

         [

             pytest.param(

                 o.options,

@@ -975,7 +981,7 @@ class TestInvalidCommandLines:

     def test_service_needed(

         self,

         options: list[str],

-        service: bool | None,

+        needs_service: bool | None,

         input: str | None,

         check_success: bool,

     ) -> None:

@@ -985,14 +991,14 @@ class TestInvalidCommandLines:

             "services": {},

         }

         result = self._call(

-            options if service else [*options, "--", DUMMY_SERVICE],

+            options if needs_service else [*options, "--", DUMMY_SERVICE],

             config=config,

             input=input,

         )

-        if service is not None:

+        if needs_service is not None:

             err_msg = (

                 " requires a SERVICE"

-                if service

+                if needs_service

                 else " does not take a SERVICE argument"

             )

             assert result.error_exit(error=err_msg), (

@@ -1000,7 +1006,9 @@ class TestInvalidCommandLines:

             )

             if check_success:

                 result = self._call(

-                    [*options, "--", DUMMY_SERVICE] if service else options,

+                    [*options, "--", DUMMY_SERVICE]

+                    if needs_service

+                    else options,

                     config=config,

                     input=input,

                 )

@@ -161,13 +161,12 @@ class Parametrize(types.SimpleNamespace):

         ],

     )

     SSH_UNSTRING_EXCEPTIONS = pytest.mark.parametrize(

-        ["input", "exc_type", "exc_pattern", "has_trailer", "parts"],

+        ["input", "exc_type", "exc_pattern", "parts"],

         [

             pytest.param(

                 b"ssh",

                 ValueError,

                 "malformed SSH byte string",

-                False,

                 None,

                 id="unencoded",

             ),

@@ -175,7 +174,6 @@ class Parametrize(types.SimpleNamespace):

                 b"\x00\x00\x00\x08ssh-rsa",

                 ValueError,

                 "malformed SSH byte string",

-                False,

                 None,

                 id="truncated",

             ),

@@ -183,7 +181,6 @@ class Parametrize(types.SimpleNamespace):

                 b"\x00\x00\x00\x04XXX trailing text",

                 ValueError,

                 "malformed SSH byte string",

-                True,

                 (b"XXX ", b"trailing text"),

                 id="trailing-data",

             ),

@@ -691,19 +688,18 @@ class TestSSHProtocolDatatypes(TestStaticFunctionality):

     @Parametrize.SSH_UNSTRING_EXCEPTIONS

     def test_unstring_exceptions(

         self,

-        input: bytes | bytearray,

+        input: bytes,

         exc_type: type[Exception],

         exc_pattern: str,

-        has_trailer: bool,

-        parts: tuple[bytes | bytearray, bytes | bytearray] | None,

+        parts: tuple[bytes, bytes] | None,

     ) -> None:

         """SSH string decoding fails for invalid values."""

         unstring = ssh_agent.SSHAgentClient.unstring

         unstring_prefix = ssh_agent.SSHAgentClient.unstring_prefix

         with pytest.raises(exc_type, match=exc_pattern):

             unstring(input)

-        if has_trailer:

-            assert tuple(bytes(x) for x in unstring_prefix(input)) == parts

+        if parts is not None:

+            assert unstring_prefix(input) == parts

         else:

             with pytest.raises(exc_type, match=exc_pattern):

                 unstring_prefix(input)

@@ -862,12 +862,9 @@ class TestUtilities(TestVault):

     def test_binary_strings(self, s: str | bytes | bytearray) -> None:

         """Byte string conversion is idempotent."""

         binstr = vault.Vault._get_binary_string

-        if isinstance(s, str):

-            assert binstr(s) == s.encode("UTF-8")

-            assert binstr(binstr(s)) == s.encode("UTF-8")

-        else:

-            assert binstr(s) == bytes(s)

-            assert binstr(binstr(s)) == bytes(s)

+        expected = s.encode("UTF-8") if isinstance(s, str) else bytes(s)

+        assert binstr(s) == expected

+        assert binstr(binstr(s)) == binstr(s)

     def test_too_many_symbols(self) -> None:

         """Deriving short passphrases with large length constraints fails."""