2 files changed, 25 insertions, 71 deletions

diff --git a/azurelinuxagent/distro/redhat/loader.py b/azurelinuxagent/distro/redhat/distro.py
index 8d3c75b..2f128d7 100644
--- a/azurelinuxagent/distro/redhat/loader.py
+++ b/azurelinuxagent/distro/redhat/distro.py
@@ -17,12 +17,16 @@
 # Requires Python 2.4+ and Openssl 1.0+
 #
 
-from azurelinuxagent.metadata import DISTRO_NAME, DISTRO_VERSION
+from azurelinuxagent.distro.default.distro import DefaultDistro
+from azurelinuxagent.distro.redhat.osutil import RedhatOSUtil, Redhat6xOSUtil
+from azurelinuxagent.distro.coreos.deprovision import CoreOSDeprovisionHandler
 
-def get_osutil():
-    from azurelinuxagent.distro.redhat.osutil import Redhat6xOSUtil, RedhatOSUtil
-    if DISTRO_VERSION < "7":
-        return Redhat6xOSUtil()
-    else:
-        return RedhatOSUtil()
+class Redhat6xDistro(DefaultDistro):
+    def __init__(self):
+        super(Redhat6xDistro, self).__init__()
+        self.osutil = Redhat6xOSUtil()
 
+class RedhatDistro(DefaultDistro):
+    def __init__(self):
+        super(RedhatDistro, self).__init__()
+        self.osutil = RedhatOSUtil()
diff --git a/azurelinuxagent/distro/redhat/osutil.py b/azurelinuxagent/distro/redhat/osutil.py
index 7478867..7f769a5 100644
--- a/azurelinuxagent/distro/redhat/osutil.py
+++ b/azurelinuxagent/distro/redhat/osutil.py
@@ -26,20 +26,19 @@ import struct
 import fcntl
 import time
 import base64
+import azurelinuxagent.conf as conf
 import azurelinuxagent.logger as logger
-from azurelinuxagent.future import text, bytebuffer
+from azurelinuxagent.future import ustr, bytebuffer
+from azurelinuxagent.exception import OSUtilError, CryptError
 import azurelinuxagent.utils.fileutil as fileutil
 import azurelinuxagent.utils.shellutil as shellutil
 import azurelinuxagent.utils.textutil as textutil
-from azurelinuxagent.distro.default.osutil import DefaultOSUtil, OSUtilError
+from azurelinuxagent.utils.cryptutil import CryptUtil
+from azurelinuxagent.distro.default.osutil import DefaultOSUtil
 
 class Redhat6xOSUtil(DefaultOSUtil):
     def __init__(self):
         super(Redhat6xOSUtil, self).__init__()
-        self.sshd_conf_file_path = '/etc/ssh/sshd_config'
-        self.openssl_cmd = '/usr/bin/openssl'
-        self.conf_file_path = '/etc/waagent.conf'
-        self.selinux=None
 
     def start_network(self):
         return shellutil.run("/sbin/service networking start", chk_err=False)
@@ -58,63 +57,14 @@ class Redhat6xOSUtil(DefaultOSUtil):
 
     def unregister_agent_service(self):
         return shellutil.run("chkconfig --del waagent", chk_err=False)
-
-    def asn1_to_ssh_rsa(self, pubkey):
-        lines = pubkey.split("\n")
-        lines = [x for x in lines if not x.startswith("----")]
-        base64_encoded = "".join(lines)
-        try:
-            #TODO remove pyasn1 dependency
-            from pyasn1.codec.der import decoder as der_decoder
-            der_encoded = base64.b64decode(base64_encoded)
-            der_encoded = der_decoder.decode(der_encoded)[0][1]
-            key = der_decoder.decode(self.bits_to_bytes(der_encoded))[0]
-            n=key[0]
-            e=key[1]
-            keydata = bytearray()
-            keydata.extend(struct.pack('>I', len("ssh-rsa")))
-            keydata.extend(b"ssh-rsa")
-            keydata.extend(struct.pack('>I', len(self.num_to_bytes(e))))
-            keydata.extend(self.num_to_bytes(e))
-            keydata.extend(struct.pack('>I', len(self.num_to_bytes(n)) + 1))
-            keydata.extend(b"\0")
-            keydata.extend(self.num_to_bytes(n))
-            keydata_base64 = base64.b64encode(bytebuffer(keydata))
-            return text(b"ssh-rsa " +  keydata_base64 + b"\n", 
-                        encoding='utf-8')
-        except ImportError as e:
-            raise OSUtilError("Failed to load pyasn1.codec.der")
-
-    def num_to_bytes(self, num):
-        """
-        Pack number into bytes.  Retun as string.
-        """
-        result = bytearray()
-        while num:
-            result.append(num & 0xFF)
-            num >>= 8
-        result.reverse()
-        return result
-
-    def bits_to_bytes(self, bits):
-        """
-        Convert an array contains bits, [0,1] to a byte array
-        """
-        index = 7
-        byte_array = bytearray()
-        curr = 0
-        for bit in bits:
-            curr = curr | (bit << index)
-            index = index - 1
-            if index == -1:
-                byte_array.append(curr)
-                curr = 0
-                index = 7
-        return bytes(byte_array)
-
+    
     def openssl_to_openssh(self, input_file, output_file):
         pubkey = fileutil.read_file(input_file)
-        ssh_rsa_pubkey = self.asn1_to_ssh_rsa(pubkey)
+        try:
+            cryptutil = CryptUtil(conf.get_openssl_cmd())
+            ssh_rsa_pubkey = cryptutil.asn1_to_ssh(pubkey)
+        except CryptError as e:
+            raise OSUtilError(ustr(e))
         fileutil.write_file(output_file, ssh_rsa_pubkey)
 
     #Override
@@ -134,8 +84,7 @@ class Redhat6xOSUtil(DefaultOSUtil):
     def set_dhcp_hostname(self, hostname):
         ifname = self.get_if_name()
         filepath = "/etc/sysconfig/network-scripts/ifcfg-{0}".format(ifname)
-        fileutil.update_conf_file(filepath,
-                                  'DHCP_HOSTNAME',
+        fileutil.update_conf_file(filepath, 'DHCP_HOSTNAME',
                                   'DHCP_HOSTNAME={0}'.format(hostname))
 
 class RedhatOSUtil(Redhat6xOSUtil):
@@ -162,4 +111,5 @@ class RedhatOSUtil(Redhat6xOSUtil):
     def unregister_agent_service(self):
         return shellutil.run("systemctl disable waagent", chk_err=False)
 
-
+    def openssl_to_openssh(self, input_file, output_file):
+        DefaultOSUtil.openssl_to_openssh(self, input_file, output_file)