fix: loading ssh keys from disk

Author: LVivona

binding/python/py/synlink/crypto/io.py

@@ -1,16 +1,31 @@
 
 import os
 import pathlib
+
+from typing import Union
+
 from cryptography.hazmat.primitives import serialization
-from synlink.crypto.typing import KeyPair, PrivateKey
+from cryptography.hazmat.primitives.asymmetric import (
+    ed25519 as ED25519, 
+)
+
+import synlink.crypto.ed25519 as ed25519
+from synlink.crypto.typing import PrivateKey, KeyPair
+
+
 
 from typing import Optional
 
 HOME_DIR : str = pathlib.Path.home().__str__()
 SSH_DEFAULT_DIRECTORY = os.path.join(HOME_DIR, ".ssh")
 
-def load_ssh_keys(ssh_dir: str = SSH_DEFAULT_DIRECTORY, key_name: str = "id_ed25519", password : Optional[str] = None) -> KeyPair:
-    """Load SSH key pair from filesystem.
+def load_ssh_private_key(
+        ssh_dir: Union[str, os.PathLike] = SSH_DEFAULT_DIRECTORY, 
+        key_name: str = "id_ed25519", 
+        password : Optional[str] = None,
+        ) -> KeyPair:
+    """Load private key from OpenSSL custom encoding, and reconstruct
+    key pair.
     
     Args:
         ssh_dir: Path to SSH directory (default: ~/.ssh)
@@ -22,14 +37,11 @@ def load_ssh_keys(ssh_dir: str = SSH_DEFAULT_DIRECTORY, key_name: str = "id_ed25
     Raises:
         FileNotFoundError: If key files don't exist
         ValueError: If keys are malformed or incompatible
-        
+        NotImplemented: If other then ed25519
     Example:
         >>> keypair = load_ssh_keys(key_name="id_ed25519")
     """
-    file = os.path.join(ssh_dir, key_name),
-    if not os.path.isfile(file):
-        raise FileNotFoundError(f"{file} does not exist.")
-
+    file = os.path.join(ssh_dir, key_name)
     with open(
         file,
         "rb",
@@ -38,12 +50,12 @@ def load_ssh_keys(ssh_dir: str = SSH_DEFAULT_DIRECTORY, key_name: str = "id_ed25
             reader.read(-1),
             password=password,
         )
-        
-
-        seceret : PrivateKey = PrivateKey.from_bytes(
-            buffer.private_bytes_raw()    
-        )
-
-        public = seceret.get_public_key()
-        return KeyPair(seceret=seceret, public=public)
 
+        if isinstance(buffer, ED25519.Ed25519PrivateKey):
+            secret = ed25519.PrivateKey.from_bytes(
+                buffer.private_bytes_raw()    
+            )
+            public = secret.get_public_key()
+            return ed25519.KeyPair(secret=secret, public=public)
+        else:
+            raise NotImplemented

binding/python/py/synlink/crypto/typing.py

@@ -29,7 +29,7 @@ def to_bytes(self) -> bytes:
 
     @classmethod
     @abstractmethod
-    def from_bytes(cls) -> Self:
+    def from_bytes(cls, data : bytes) -> Self:
         """Return instance of the class from bytes."""
         ...