Merge pull request #877 from yast/xml_exceptions

Xml exceptions
yast · Jul 27, 2020 · ce817af · ce817af
2 parents c35fa86 + 5242b98
commit ce817af
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 27 13:43:29 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Handle exceptions when parsing xml file (related to bsc#1170886)
+- 4.3.12
+
 -------------------------------------------------------------------
 Mon Jul 27 08:14:24 UTC 2020 - Steffen Winterfeldt <snwint@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.3.11
+Version:        4.3.12
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only

diff --git a/src/modules/ImageInstallation.rb b/src/modules/ImageInstallation.rb
@@ -678,9 +678,10 @@ def FillUpImagesDetails
         return false
       end
 
-      read_details = XML.XMLToYCPFile(filename)
-      if read_details.nil?
-        Builtins.y2error("Cannot parse imagesets details")
+      begin
+        read_details = XML.XMLToYCPFile(filename)
+      rescue XMLDeserializationError => e
+        Builtins.y2error("Cannot parse imagesets details. #{e.inspect}")
         return false
       end
 
@@ -820,12 +821,14 @@ def FindImageSet(patterns)
         return true
       end
 
-      image_descr = XML.XMLToYCPFile(filename)
-      if image_descr.nil?
+      begin
+        image_descr = XML.XMLToYCPFile(filename)
+      rescue RuntimeError => e
         @image_installation_available = false
         Installation.image_installation = false
         Installation.image_only = false
         Report.Error(_("Failed to read information about installation images"))
+        log.error "xml failed to read #{e.inspect}"
         return false
       end
 

diff --git a/test/image_installation_test.rb b/test/image_installation_test.rb
@@ -24,6 +24,8 @@
 ARCHS = ["i386", "x86_64", "ppc"].freeze
 
 describe Yast::ImageInstallation do
+  subject { described_class }
+
   before do
     stub_const("Yast::Packages", double(theSources: [0]))
   end
@@ -70,5 +72,17 @@
         end
       end
     end
+
+    it "returns true if no xml is provided" do
+      allow(Yast::Pkg).to receive(:SourceProvideDigestedFile).and_return(nil)
+
+      expect(subject.FindImageSet([])).to eq true
+    end
+
+    it "returns false if xml is not valid" do
+      allow(Yast::XML).to receive(:XMLToYCPFile).and_raise(Yast::XMLDeserializationError)
+
+      expect(subject.FindImageSet([])).to eq false
+    end
   end
 end