fixes #9551 - checking the encryption format so osx doesn't fail

theforeman · Feb 26, 2015 · c8c0617 · c8c0617
1 parent 8647e5e
commit c8c0617
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/app/models/concerns/host_common.rb b/app/models/concerns/host_common.rb
@@ -114,9 +114,18 @@ def crypt_root_pass
                        end
 
     if unencrypted_pass.present?
-      self.root_pass = !!(unencrypted_pass.match('^\$\d+\$.+\$.+')) ? unencrypted_pass :
-          (operatingsystem.nil? ? PasswordCrypt.passw_crypt(unencrypted_pass) : PasswordCrypt.passw_crypt(unencrypted_pass, operatingsystem.password_hash))
-      self.grub_pass = !!(unencrypted_pass.match('^\$\d+\$.+\$.+')) ? unencrypted_pass : PasswordCrypt.grub2_passw_crypt(unencrypted_pass)
+      is_actually_encrypted = if PasswordCrypt.nix?
+         unencrypted_pass.match('^\$\d+\$.+\$.+')
+      else
+        unencrypted_pass.starts_with?("$")
+      end
+
+      if is_actually_encrypted
+        self.root_pass =  self.grub_pass = unencrypted_pass
+      else
+        self.root_pass = operatingsystem.nil? ? PasswordCrypt.passw_crypt(unencrypted_pass) : PasswordCrypt.passw_crypt(unencrypted_pass, operatingsystem.password_hash)
+        self.grub_pass = PasswordCrypt.grub2_passw_crypt(unencrypted_pass)
+      end
     end
   end
 

diff --git a/app/services/password_crypt.rb b/app/services/password_crypt.rb
@@ -9,4 +9,8 @@ def self.passw_crypt(passwd, hash_alg = 'MD5')
   def self.grub2_passw_crypt(passw)
     self.passw_crypt(passw, 'MD5')
   end
+
+  def self.nix?
+    @nix ||= passw_crypt("test_this").match('^\$\d+\$.+\$.+')
+  end
 end