Merge pull request #1520 from avelichka/sslib-key

 Add Key.from_securesystemslib_key

tests/test_api.py

@@ -52,6 +52,10 @@
  Signature
 )
 
+from securesystemslib.keys import (
+ generate_ed25519_key
+)
+
 logger = logging.getLogger(__name__)
 
 
@@ -419,6 +423,14 @@ def test_metadata_verify_delegate(self):
  root.verify_delegate('snapshot', snapshot)
 
 
+ def test_key_class(self):
+ # Test if from_securesystemslib_key removes the private key from keyval
+ # of a securesystemslib key dictionary.
+ sslib_key = generate_ed25519_key()
+ key = Key.from_securesystemslib_key(sslib_key)
+ self.assertFalse('private' in key.keyval.keys())
+
+
  def test_metadata_root(self):
  root_path = os.path.join(
  self.repo_dir, 'metadata', 'root.json')

tuf/api/metadata.py

@@ -561,6 +561,24 @@ def to_securesystemslib_key(self) -> Dict[str, Any]:
  "keyval": self.keyval,
  }
 
+ @classmethod
+ def from_securesystemslib_key(cls, key_dict: Dict[str, Any]) -> "Key":
+ """
+ Creates a Key object from a securesystemlib key dict representation
+ removing the private key from keyval.
+ """
+ key_meta = sslib_keys.format_keyval_to_metadata(
+ key_dict["keytype"],
+ key_dict["scheme"],
+ key_dict["keyval"],
+ )
+ return cls(
+ key_dict["keyid"],
+ key_meta["keytype"],
+ key_meta["scheme"],
+ key_meta["keyval"],
+ )
+
  def verify_signature(
  self,
  metadata: Metadata,