Increased robustness of content handling.

- Multiple OVAL files in an archive cause no longer an error.
- Multiple instances of other filetypes result in a content-related error.
- Unexpected errors don't crash the addon.

org_fedora_oscap/content_discovery.py

@@ -261,7 +261,7 @@ def __init__(self, root):
         self.labelled_files = dict()
         self.datastream = ""
         self.xccdf = ""
-        self.oval = ""
+        self.ovals = []
         self.tailoring = ""
         self.archive = ""
         self.verified = ""
@@ -289,7 +289,7 @@ def _assign_content_type(self, attribute_name, new_value):
             msg = (
                 f"When dealing with {attribute_name}, "
                 f"there was already the {old_value.name} when setting the new {new_value.name}")
-            raise RuntimeError(msg)
+            raise content_handling.ContentHandlingError(msg)
         setattr(self, attribute_name, new_value)
 
     def add_file(self, fname, label):
@@ -299,7 +299,7 @@ def add_file(self, fname, label):
         elif label == content_handling.CONTENT_TYPES["DATASTREAM"]:
             self._assign_content_type("datastream", path)
         elif label == content_handling.CONTENT_TYPES["OVAL"]:
-            self._assign_content_type("oval", path)
+            self.ovals.append(path)
         elif label == content_handling.CONTENT_TYPES["XCCDF_CHECKLIST"]:
             self._assign_content_type("xccdf", path)
         self.labelled_files[path] = label
@@ -312,9 +312,10 @@ def _datastream_content(self):
         return self.datastream
 
     def _xccdf_content(self):
-        if not self.xccdf or not self.oval:
+        if not self.xccdf or not self.ovals:
             return None
-        if not (self.xccdf.exists() and self.oval.exists()):
+        some_ovals_exist = any([path.exists() for path in self.ovals])
+        if not (self.xccdf.exists() and some_ovals_exist):
             return None
         return self.xccdf
 

org_fedora_oscap/gui/spokes/oscap.py

@@ -352,7 +352,7 @@ def _handle_error(self, exception):
         elif isinstance(exception, content_handling.ContentCheckError):
             self._integrity_check_failed()
         else:
-            raise exception
+            self._general_content_problem()
 
     def _end_fetching(self, fetched_content):
         # stop the spinner in any case
@@ -762,6 +762,12 @@ def _set_error(self, msg):
             self._error = None
             self.clear_info()
 
+    @async_action_wait
+    def _general_content_problem(self):
+        msg = _("There was an unexpected problem with the supplied content.")
+        self._progress_label.set_markup("<b>%s</b>" % msg)
+        self._wrong_content(msg)
+
     @async_action_wait
     def _invalid_content(self):
         """Callback for informing user about provided content invalidity."""

org_fedora_oscap/ks/oscap.py

@@ -406,7 +406,8 @@ def _handle_error(self, exception):
             self._terminate(msg)
 
         else:
-            raise exception
+            msg = _("There was an unexpected problem with the supplied content.")
+            self._terminate(msg)
 
     def setup(self, storage, ksdata, payload):
         """