Handle nil root/user passwords from AutoYaST

Author: imobachgs

service/lib/agama/autoyast/root_reader.rb

@@ -38,11 +38,19 @@ def read
         root_user = config.users.find { |u| u.name == "root" }
         return {} unless root_user
 
-        hsh = { "password" => root_user.password.value.to_s }
-        hsh["hashedPassword"] = true if root_user.password.value.encrypted?
+        hsh = {}
+        password = root_user.password
+
+        if password
+          hsh["password"] = password.value.to_s
+          hsh["hashedPassword"] = true if password.value.encrypted?
+        end
 
         public_key = root_user.authorized_keys.first
         hsh["sshPublicKey"] = public_key if public_key
+
+        return {} if hsh.empty?
+
         { "root" => hsh }
       end
 

service/lib/agama/autoyast/user_reader.rb

@@ -39,11 +39,14 @@ def read
 
         hsh = {
           "userName" => user.name,
-          "fullName" => user.gecos.first.to_s,
-          "password" => user.password.value.to_s
+          "fullName" => user.gecos.first.to_s
         }
 
-        hsh["hashedPassword"] = true if user.password.value.encrypted?
+        password = user.password
+        if password
+          hsh["password"] = password.value.to_s
+          hsh["hashedPassword"] = true if password.value.encrypted?
+        end
 
         { "user" => hsh }
       end

service/test/agama/autoyast/root_reader_test.rb

@@ -74,6 +74,20 @@
           "password" => "123456", "sshPublicKey" => "ssh-key 1"
         )
       end
+
+      context "but does not contain password or SSH public key" do
+        let(:root) do
+          {
+            "username"      => "root",
+            "user_password" => nil,
+            "encrypted"     => nil
+          }
+        end
+
+        it "returns an empty hash" do
+          expect(subject.read).to be_empty
+        end
+      end
     end
   end
 end

service/test/agama/autoyast/user_reader_test.rb

@@ -77,5 +77,24 @@
         )
       end
     end
+
+    context "when the password is nil" do
+      let(:user) do
+        {
+          "username"      => "suse",
+          "fullname"      => "SUSE",
+          "user_password" => nil,
+          "encrypted"     => nil
+        }
+      end
+
+      it "does not include password information" do
+        user = subject.read["user"]
+        expect(user).to eq(
+          "userName" => "suse",
+          "fullName" => "SUSE"
+        )
+      end
+    end
   end
 end