Merge 9cc98b9 into 0fa8527

package/autoyast2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Dec  1 09:36:51 UTC 2022 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Avoid a potential crash when autoinst.ycp file is empty or
+  missing (bsc#1205732).
+- 4.5.11
+
 -------------------------------------------------------------------
 Tue Nov 22 15:50:38 UTC 2022 - Martin Vidner <mvidner@suse.com>
 

package/autoyast2.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.5.10
+Version:        4.5.11
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

src/modules/Profile.rb

@@ -113,7 +113,7 @@ def main
       Yast.include self, "autoinstall/xml.rb"
 
       # The Complete current Profile
-      @current = {}
+      @current = Yast::ProfileHash.new
 
       @changed = false
 
@@ -352,7 +352,7 @@ def create(modules, target: :default)
     # @return [void]
     def Reset
       Builtins.y2milestone("Resetting profile contents")
-      @current = {}
+      @current = Yast::ProfileHash.new
       nil
     end
 
@@ -430,18 +430,19 @@ def SaveProfileStructure(parsedControlFile)
     end
 
     # Read YCP data as the control file
-    # @param parsedControlFile [Hash] ycp file
-    # @return [Boolean]
+    # @param parsedControlFile [String] path of the ycp file
+    # @return [Boolean] false when the file is empty or missing; true otherwise
     def ReadProfileStructure(parsedControlFile)
-      @current = Convert.convert(
+      contents = Convert.convert(
         SCR.Read(path(".target.ycp"), [parsedControlFile, {}]),
         from: "any",
         to:   "map <string, any>"
       )
-      if @current == {}
+      if contents == {}
+        @current = Yast::ProfileHash.new(contents)
         return false
       else
-        Import(@current)
+        Import(contents)
       end
 
       true

test/fixtures/autoconf.ycp

@@ -0,0 +1,7 @@
+$[
+  "general" : $[
+    "mode" : $[
+      "confirm" : false
+    ]
+  ]
+]

test/fixtures/empty-autoconf.ycp

@@ -0,0 +1,2 @@
+$[
+]

test/profile_test.rb

@@ -734,4 +734,50 @@ def reboot_scripts
       end
     end
   end
+
+  describe "#ReadProfileStructure" do
+    context "when the file does not exist" do
+      let(:file_path) { FIXTURES_PATH.join("missing.ycp").to_s }
+
+      it "returns false" do
+        expect(subject.ReadProfileStructure(file_path)).to eq(false)
+      end
+
+      it "resets Profile.current" do
+        subject.Import("general" => { "self_update" => false })
+        subject.ReadProfileStructure(file_path)
+        expect(subject.current).to eq(Yast::ProfileHash.new)
+      end
+    end
+
+    context "when the structure is empty" do
+      let(:file_path) { FIXTURES_PATH.join("empty-autoconf.ycp").to_s }
+
+      it "returns false" do
+        expect(subject.ReadProfileStructure(file_path)).to eq(false)
+      end
+
+      it "resets Profile.current" do
+        subject.Import("general" => { "self_update" => false })
+        subject.ReadProfileStructure(file_path)
+        expect(subject.current).to eq(Yast::ProfileHash.new)
+      end
+    end
+
+    context "when there is some valid YCP content" do
+      let(:file_path) { FIXTURES_PATH.join("autoconf.ycp").to_s }
+
+      it "returns true" do
+        expect(subject.ReadProfileStructure(file_path)).to eq(true)
+      end
+
+      it "imports the file contents" do
+        subject.Import("general" => { "self_update" => false })
+        expect(subject).to receive(:Import).with(
+          Yast::ProfileHash.new("general" => { "mode" => { "confirm" => false } })
+        )
+        subject.ReadProfileStructure(file_path)
+      end
+    end
+  end
 end