Merge pull request #249 from SUSE-Enceladus/ssh-key

Pull public ssh key from file.
SUSE-Enceladus · Jun 1, 2020 · 9646f8d · 9646f8d
2 parents 4e77cf6 + cc5aca9
commit 9646f8d
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -48,11 +48,8 @@ Requirements
 -   azure-mgmt-compute
 -   azure-mgmt-network
 -   azure-mgmt-resource
--   certifi
 -   Click
--   cryptography
 -   paramiko
--   pycryptodome
 -   pytest
 -   PyYaml
 -   testinfra

diff --git a/docs/source/start.rst b/docs/source/start.rst
@@ -61,11 +61,8 @@ Requirements
 -  azure-mgmt-compute
 -  azure-mgmt-network
 -  azure-mgmt-resource
--  certifi
 -  Click
--  cryptography
 -  paramiko
--  pycryptodome
 -  pytest
 -  PyYaml
 -  testinfra

diff --git a/img_proof/ipa_azure.py b/img_proof/ipa_azure.py
@@ -409,7 +409,7 @@ def _get_ssh_public_key(self):
         """
         Generate SSH public key from private key.
         """
-        key = ipa_utils.generate_public_ssh_key(self.ssh_private_key_file)
+        key = ipa_utils.get_public_ssh_key(self.ssh_private_key_file)
         return key.decode()
 
     def _is_instance_running(self):

diff --git a/img_proof/ipa_cloud.py b/img_proof/ipa_cloud.py
@@ -223,7 +223,7 @@ def _get_user_data(self):
         to the instance. The public key is generated from the
         private key file.
         """
-        key = ipa_utils.generate_public_ssh_key(
+        key = ipa_utils.get_public_ssh_key(
             self.ssh_private_key_file
         ).decode()
 

diff --git a/img_proof/ipa_gce.py b/img_proof/ipa_gce.py
@@ -213,7 +213,7 @@ def _get_instance(self):
 
     def _get_ssh_public_key(self):
         """Generate SSH public key from private key."""
-        key = ipa_utils.generate_public_ssh_key(self.ssh_private_key_file)
+        key = ipa_utils.get_public_ssh_key(self.ssh_private_key_file)
         return '{user}:{key} {user}'.format(
             user=self.ssh_user,
             key=key.decode()

diff --git a/img_proof/ipa_oci.py b/img_proof/ipa_oci.py
@@ -407,7 +407,7 @@ def _is_instance_running(self):
 
     def _get_ssh_public_key(self):
         """Generate SSH public key from private key."""
-        key = ipa_utils.generate_public_ssh_key(self.ssh_private_key_file)
+        key = ipa_utils.get_public_ssh_key(self.ssh_private_key_file)
         return key.decode()
 
     def get_console_log(self):

diff --git a/img_proof/ipa_utils.py b/img_proof/ipa_utils.py
@@ -38,9 +38,6 @@
 from img_proof.ipa_constants import SYNC_POINTS
 from img_proof.ipa_exceptions import IpaSSHException, IpaUtilsException
 
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives import serialization
-
 CLIENT_CACHE = {}
 
 
@@ -193,32 +190,21 @@ def generate_instance_name(name):
     return '%s-%s' % (name, get_random_string(length=5))
 
 
-def generate_public_ssh_key(ssh_private_key_file):
-    """Generate SSH public key from private key file."""
+def get_public_ssh_key(ssh_private_key_file):
+    """Get SSH public key from private key file."""
+    pub_key = ssh_private_key_file + '.pub'
+
     try:
-        with open(ssh_private_key_file, "rb") as key_file:
+        with open(pub_key, "rb") as key_file:
             key = key_file.read()
     except FileNotFoundError:
         raise IpaUtilsException(
-            'SSH private key file: %s cannot be found.' % ssh_private_key_file
-        )
-
-    try:
-        private_key = serialization.load_pem_private_key(
-            key,
-            password=None,
-            backend=default_backend()
-        )
-    except ValueError:
-        raise IpaUtilsException(
-            'SSH private key file: %s is not a valid key file.'
-            % ssh_private_key_file
+            'SSH public key file: {key_path} cannot be found.'.format(
+                key_path=pub_key
+            )
         )
 
-    return private_key.public_key().public_bytes(
-        serialization.Encoding.OpenSSH,
-        serialization.PublicFormat.OpenSSH
-    )
+    return key
 
 
 def get_config_values(config_path, section, default='default'):

diff --git a/package/python3-img-proof.spec b/package/python3-img-proof.spec
@@ -34,14 +34,11 @@ BuildRequires:  python3-azure-mgmt-compute
 BuildRequires:  python3-azure-mgmt-network
 BuildRequires:  python3-azure-mgmt-resource
 BuildRequires:  python3-boto3
-BuildRequires:  python3-certifi
 BuildRequires:  python3-click
-BuildRequires:  python3-cryptography
 BuildRequires:  python3-google-api-python-client
 BuildRequires:  python3-google-auth
 BuildRequires:  python3-oci-sdk
 BuildRequires:  python3-paramiko
-BuildRequires:  python3-pycryptodome
 BuildRequires:  python3-pytest
 BuildRequires:  python3-testinfra
 %if %{with test}
@@ -54,14 +51,11 @@ Requires:       python3-azure-mgmt-compute
 Requires:       python3-azure-mgmt-network
 Requires:       python3-azure-mgmt-resource
 Requires:       python3-boto3
-Requires:       python3-certifi
 Requires:       python3-click
-Requires:       python3-cryptography
 Requires:       python3-google-api-python-client
 Requires:       python3-google-auth
 Requires:       python3-oci-sdk
 Requires:       python3-paramiko
-Requires:       python3-pycryptodome
 Requires:       python3-pytest
 Requires:       python3-testinfra
 BuildArch:      noarch

diff --git a/requirements.txt b/requirements.txt
@@ -3,11 +3,8 @@ azure-common
 azure-mgmt-compute
 azure-mgmt-network
 azure-mgmt-resource
-certifi
 Click
-cryptography
 paramiko
-pycryptodome
 pytest
 PyYAML
 testinfra

diff --git a/tests/data/ida_test.pub b/tests/data/ida_test.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjo9ZkUp/dKKVButD+yaDkcWt4goSysXqibMoMedCp1GiKBXA6aeCY8eaenGTxo0fhIVyDX6QyNpE6OP5TYb7emrf7ze7OW2TvtxNZJOoGeT6e7rE/GzvM7UKxUVOl/h1TQ6oASD8nFQgVqjxpaALfouk0lPyBDS0WgvIGUYffYYHQaxzwebhs4ZpcBU3VYJTRFdecw0QzAakSOsUZyMWZUS7GzGR9NfoBf7H3AYp5rcbVOncFnFDZGAZxMJ65I18yU7RsLzaSzBgpUGmhEGaUHhRwGsLT+y+0oO2ftiIGgnYWa1cMDsrWypTm1gSI8+ivHZkmHI9PUDlDzrAQ4FmP
diff --git a/tests/test_ipa_azure.py b/tests/test_ipa_azure.py
@@ -119,9 +119,9 @@ def test_get_management_client_exception(self, mock_get_client):
         assert str(error.value) == 'Unable to create resource management ' \
             'client: Not valid.'
 
-    @patch('img_proof.ipa_azure.ipa_utils.generate_public_ssh_key')
-    def test_get_ssh_public_key(self, mock_generate_pub_key):
-        mock_generate_pub_key.return_value = b'pub-key'
+    @patch('img_proof.ipa_azure.ipa_utils.get_public_ssh_key')
+    def test_get_ssh_public_key(self, mock_get_pub_key):
+        mock_get_pub_key.return_value = b'pub-key'
         provider = self.helper_get_provider()
         key = provider._get_ssh_public_key()
 

diff --git a/tests/test_ipa_cloud.py b/tests/test_ipa_cloud.py
@@ -127,9 +127,9 @@ def test_cloud_get_ssh_client(self, mock_get_ssh_client):
 
         ipa_utils.clear_cache()
 
-    @patch('img_proof.ipa_cloud.ipa_utils.generate_public_ssh_key')
-    def test_cloud_get_user_data(self, mock_generate_ssh_key):
-        mock_generate_ssh_key.return_value = b'testkey12345'
+    @patch('img_proof.ipa_cloud.ipa_utils.get_public_ssh_key')
+    def test_cloud_get_user_data(self, mock_get_ssh_key):
+        mock_get_ssh_key.return_value = b'testkey12345'
 
         provider = IpaCloud(*args, **self.kwargs)
 

diff --git a/tests/test_ipa_oci.py b/tests/test_ipa_oci.py
@@ -437,12 +437,12 @@ def test_oci_get_vnic_attachments(self, mock_init, mock_oci):
 
         cloud._get_vnic_attachments(compartment_id, instance_id)
 
-    @patch('img_proof.ipa_utils.generate_public_ssh_key')
+    @patch('img_proof.ipa_utils.get_public_ssh_key')
     @patch.object(OCICloud, '__init__')
-    def test_get_ssh_public_key(self, mock_init, mock_generate_public_ssh_key):
+    def test_get_ssh_public_key(self, mock_init, mock_get_public_ssh_key):
         """Test oci get ssh public key method."""
         mock_init.return_value = None
-        mock_generate_public_ssh_key.return_value = b'key123'
+        mock_get_public_ssh_key.return_value = b'key123'
 
         cloud = OCICloud(**self.kwargs)
         cloud.ssh_private_key_file = 'tests/oci/api_key.pem'