diff --git a/SOURCES/oscap-anaconda-addon-1.3.0-better_archive_handling-PR_220.patch b/SOURCES/oscap-anaconda-addon-1.3.0-better_archive_handling-PR_220.patch new file mode 100644 index 0000000..e94e689 --- /dev/null +++ b/SOURCES/oscap-anaconda-addon-1.3.0-better_archive_handling-PR_220.patch @@ -0,0 +1,372 @@ +From e8e303aa3ca9db564ea52258de15a81851c3b265 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Wed, 12 Oct 2022 11:37:04 +0200 +Subject: [PATCH 1/5] Add capability to preselect content from archives + +Users can specify content path and tailoring path in kickstarts, +and the addon should be able to assure that those files are available, +and that they have precedence over other files. +--- + org_fedora_oscap/content_discovery.py | 35 +++++++++++++++++++ + tests/test_content_discovery.py | 48 +++++++++++++++++++++++++++ + 2 files changed, 83 insertions(+) + create mode 100644 tests/test_content_discovery.py + +diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py +index 5fc7343..f654449 100644 +--- a/org_fedora_oscap/content_discovery.py ++++ b/org_fedora_oscap/content_discovery.py +@@ -11,6 +11,7 @@ + from org_fedora_oscap import data_fetch, utils + from org_fedora_oscap import common + from org_fedora_oscap import content_handling ++from org_fedora_oscap.content_handling import CONTENT_TYPES + + from org_fedora_oscap.common import _ + +@@ -167,6 +168,38 @@ def _verify_fingerprint(self, dest_filename, fingerprint=""): + msg = _(f"Integrity check of the content failed - {hash_obj.name} hash didn't match") + raise content_handling.ContentCheckError(msg) + ++ def filter_discovered_content(self, labelled_files): ++ expected_path = self._addon_data.content_path ++ categories = (CONTENT_TYPES["DATASTREAM"], CONTENT_TYPES["XCCDF_CHECKLIST"]) ++ if expected_path: ++ labelled_files = self.reduce_files(labelled_files, expected_path, categories) ++ ++ expected_path = self._addon_data.tailoring_path ++ categories = (CONTENT_TYPES["TAILORING"], ) ++ if expected_path: ++ labelled_files = self.reduce_files(labelled_files, expected_path, categories) ++ ++ expected_path = self._addon_data.cpe_path ++ categories = (CONTENT_TYPES["CPE_DICT"], ) ++ if expected_path: ++ labelled_files = self.reduce_files(labelled_files, expected_path, categories) ++ ++ return labelled_files ++ ++ def reduce_files(self, labelled_files, expected_path, categories): ++ reduced_files = dict() ++ if expected_path not in labelled_files: ++ msg = ( ++ f"Expected a file {expected_path} to be part of the supplied content, " ++ f"but it was not the case, got only {list(labelled_files.keys())}" ++ ) ++ raise RuntimeError(msg) ++ for path, label in labelled_files.items(): ++ if label in categories and path != expected_path: ++ continue ++ reduced_files[path] = label ++ return reduced_files ++ + def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_filename): + threadMgr.wait(wait_for) + actually_fetched_content = wait_for is not None +@@ -182,6 +215,8 @@ def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_file + structured_content.add_content_archive(dest_filename) + + labelled_files = content_handling.identify_files(fpaths) ++ labelled_files = self.filter_discovered_content(labelled_files) ++ + for fname, label in labelled_files.items(): + structured_content.add_file(fname, label) + +diff --git a/tests/test_content_discovery.py b/tests/test_content_discovery.py +new file mode 100644 +index 0000000..5463c9a +--- /dev/null ++++ b/tests/test_content_discovery.py +@@ -0,0 +1,48 @@ ++import pytest ++ ++import org_fedora_oscap.content_discovery as tested_module ++ ++ ++@pytest.fixture ++def labelled_files(): ++ return { ++ "dir/datastream": "D", ++ "dir/datastream2": "D", ++ "dir/dir/datastream3": "D", ++ "dir/dir/datastream3": "D", ++ "dir/XCCDF": "X", ++ "XCCDF2": "X", ++ "cpe": "C", ++ "t1": "T", ++ "dir3/t2": "T", ++ } ++ ++ ++def test_reduce(labelled_files): ++ bringer = tested_module.ContentBringer(None) ++ ++ d_count = 0 ++ x_count = 0 ++ for l in labelled_files.values(): ++ if l == "D": ++ d_count += 1 ++ elif l == "X": ++ x_count += 1 ++ ++ reduced = bringer.reduce_files(labelled_files, "dir/datastream", ["D"]) ++ assert len(reduced) == len(labelled_files) - d_count + 1 ++ assert "dir/datastream" in reduced ++ ++ reduced = bringer.reduce_files(labelled_files, "dir/datastream", ["D", "X"]) ++ assert len(reduced) == len(labelled_files) - d_count - x_count + 1 ++ assert "dir/datastream" in reduced ++ ++ reduced = bringer.reduce_files(labelled_files, "dir/XCCDF", ["D", "X"]) ++ assert len(reduced) == len(labelled_files) - d_count - x_count + 1 ++ assert "dir/XCCDF" in reduced ++ ++ with pytest.raises(RuntimeError, match="dir/datastream4"): ++ bringer.reduce_files(labelled_files, "dir/datastream4", ["D"]) ++ ++ reduced = bringer.reduce_files(labelled_files, "cpe", ["C"]) ++ assert reduced == labelled_files + +From 82c1950903fcce079cd71f021c1fde25f75f9521 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Wed, 12 Oct 2022 11:40:11 +0200 +Subject: [PATCH 2/5] Handle changes in content identification + +The code is able to handle changes in the way how oscap identifies +content much more gracefully. +--- + org_fedora_oscap/content_discovery.py | 13 +++++++++---- + org_fedora_oscap/content_handling.py | 5 +++++ + 2 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py +index f654449..b20f3a6 100644 +--- a/org_fedora_oscap/content_discovery.py ++++ b/org_fedora_oscap/content_discovery.py +@@ -2,6 +2,7 @@ + import logging + import pathlib + import shutil ++import os + from glob import glob + + from pyanaconda.core import constants +@@ -214,11 +215,15 @@ def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_file + if content_type in ("archive", "rpm"): + structured_content.add_content_archive(dest_filename) + +- labelled_files = content_handling.identify_files(fpaths) +- labelled_files = self.filter_discovered_content(labelled_files) ++ labelled_filenames = content_handling.identify_files(fpaths) ++ labelled_relative_filenames = { ++ os.path.relpath(path, self.CONTENT_DOWNLOAD_LOCATION): label ++ for path, label in labelled_filenames.items()} ++ labelled_relative_filenames = self.filter_discovered_content(labelled_relative_filenames) + +- for fname, label in labelled_files.items(): +- structured_content.add_file(fname, label) ++ for rel_fname, label in labelled_relative_filenames.items(): ++ fname = self.CONTENT_DOWNLOAD_LOCATION / rel_fname ++ structured_content.add_file(str(fname), label) + + if fingerprint and dest_filename: + structured_content.record_verification(dest_filename) +diff --git a/org_fedora_oscap/content_handling.py b/org_fedora_oscap/content_handling.py +index 65d5a28..3e2ecae 100644 +--- a/org_fedora_oscap/content_handling.py ++++ b/org_fedora_oscap/content_handling.py +@@ -122,6 +122,11 @@ def get_doc_type(file_path): + if line.startswith("Document type:"): + _prefix, _sep, type_info = line.partition(":") + content_type = type_info.strip() ++ if content_type not in CONTENT_TYPES.values(): ++ log.info( ++ f"File {file_path} labelled by oscap as {content_type}, " ++ "which is an unexpected type.") ++ content_type = f"unknown - {content_type}" + break + except OSError: + # 'oscap info' exitted with a non-zero exit code -> unknown doc + +From b6bf5a6c96f5dbbd78043455802ebc0033cf1a6a Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Wed, 12 Oct 2022 11:38:51 +0200 +Subject: [PATCH 3/5] Remove unused code + +The function is not referenced anywhere in the project +--- + org_fedora_oscap/content_handling.py | 40 ---------------------------- + 1 file changed, 40 deletions(-) + +diff --git a/org_fedora_oscap/content_handling.py b/org_fedora_oscap/content_handling.py +index 3e2ecae..5096bab 100644 +--- a/org_fedora_oscap/content_handling.py ++++ b/org_fedora_oscap/content_handling.py +@@ -141,43 +141,3 @@ def get_doc_type(file_path): + log.info("OSCAP addon: Identified {file_path} as {content_type}" + .format(file_path=file_path, content_type=content_type)) + return content_type +- +- +-def explore_content_files(fpaths): +- """ +- Function for finding content files in a list of file paths. SIMPLY PICKS +- THE FIRST USABLE CONTENT FILE OF A PARTICULAR TYPE AND JUST PREFERS DATA +- STREAMS OVER STANDALONE BENCHMARKS. +- +- :param fpaths: a list of file paths to search for content files in +- :type fpaths: [str] +- :return: ContentFiles instance containing the file names of the XCCDF file, +- CPE dictionary and tailoring file or "" in place of those items +- if not found +- :rtype: ContentFiles +- +- """ +- xccdf_file = "" +- cpe_file = "" +- tailoring_file = "" +- found_ds = False +- +- for fpath in fpaths: +- doc_type = get_doc_type(fpath) +- if not doc_type: +- continue +- +- # prefer DS over standalone XCCDF +- if doc_type == "Source Data Stream" and (not xccdf_file or not found_ds): +- xccdf_file = fpath +- found_ds = True +- elif doc_type == "XCCDF Checklist" and not xccdf_file: +- xccdf_file = fpath +- elif doc_type == "CPE Dictionary" and not cpe_file: +- cpe_file = fpath +- elif doc_type == "XCCDF Tailoring" and not tailoring_file: +- tailoring_file = fpath +- +- # TODO: raise exception if no xccdf_file is found? +- files = ContentFiles(xccdf_file, cpe_file, tailoring_file) +- return files + +From a990568ccddb2864c8daeae91fdc1f6588b3c6f3 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Thu, 13 Oct 2022 14:11:25 +0200 +Subject: [PATCH 4/5] Dont use tailoring if it is not expected + +Take tailorings into account only if it is specified in the kickstart. +Compulsive usage of tailoring may be unwanted. +--- + org_fedora_oscap/content_discovery.py | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py +index b20f3a6..e9cf34a 100644 +--- a/org_fedora_oscap/content_discovery.py ++++ b/org_fedora_oscap/content_discovery.py +@@ -169,16 +169,25 @@ def _verify_fingerprint(self, dest_filename, fingerprint=""): + msg = _(f"Integrity check of the content failed - {hash_obj.name} hash didn't match") + raise content_handling.ContentCheckError(msg) + ++ def allow_one_expected_tailoring_or_no_tailoring(self, labelled_files): ++ expected_tailoring = self._addon_data.tailoring_path ++ tailoring_label = CONTENT_TYPES["TAILORING"] ++ if expected_tailoring: ++ labelled_files = self.reduce_files(labelled_files, expected_tailoring, [tailoring_label]) ++ else: ++ labelled_files = { ++ path: label for path, label in labelled_files.items() ++ if label != tailoring_label ++ } ++ return labelled_files ++ + def filter_discovered_content(self, labelled_files): + expected_path = self._addon_data.content_path + categories = (CONTENT_TYPES["DATASTREAM"], CONTENT_TYPES["XCCDF_CHECKLIST"]) + if expected_path: + labelled_files = self.reduce_files(labelled_files, expected_path, categories) + +- expected_path = self._addon_data.tailoring_path +- categories = (CONTENT_TYPES["TAILORING"], ) +- if expected_path: +- labelled_files = self.reduce_files(labelled_files, expected_path, categories) ++ labelled_files = self.allow_one_expected_tailoring_or_no_tailoring(labelled_files) + + expected_path = self._addon_data.cpe_path + categories = (CONTENT_TYPES["CPE_DICT"], ) + +From c4cb296ca3838a0967c8258b9ed5221691884a36 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Tue, 8 Nov 2022 10:46:59 +0100 +Subject: [PATCH 5/5] Make the content RPM installation robust + +If a package manager fails to install the package, +use the rpm command directly and skip deps. +--- + org_fedora_oscap/ks/oscap.py | 41 ++++++++++++++++++++++++++++-------- + 1 file changed, 32 insertions(+), 9 deletions(-) + +diff --git a/org_fedora_oscap/ks/oscap.py b/org_fedora_oscap/ks/oscap.py +index e47d6ba..dac273d 100644 +--- a/org_fedora_oscap/ks/oscap.py ++++ b/org_fedora_oscap/ks/oscap.py +@@ -23,6 +23,7 @@ + import shutil + import re + import os ++import io + import time + import logging + import pathlib +@@ -473,6 +474,33 @@ def setup(self, storage, ksdata, payload): + if pkg not in ksdata.packages.packageList: + ksdata.packages.packageList.append(pkg) + ++ def _attempt_rpm_installation(self): ++ log.info("OSCAP addon: Installing the security content RPM to the installed system.") ++ stdout = io.StringIO() ++ ret = util.execWithRedirect( ++ "yum", ["-y", "--nogpg", "install", self.raw_postinst_content_path], ++ stdout=stdout, root=conf.target.system_root) ++ stdout.seek(0) ++ if ret != 0: ++ log.error( ++ "OSCAP addon: Error installing security content RPM using yum: {0}", ++ stdout.read()) ++ ++ stdout = io.StringIO() ++ ret = util.execWithRedirect( ++ "rpm", ["--install", "--nodeps", self.raw_postinst_content_path], ++ stdout=stdout, root=conf.target.system_root) ++ if ret != 0: ++ log.error( ++ "OSCAP addon: Error installing security content RPM using rpm: {0}", ++ stdout.read()) ++ msg = _(f"Failed to install content RPM to the target system.") ++ raise RuntimeError(msg) ++ ++ def _copy_rpm_to_target_and_install(self, target_content_dir): ++ shutil.copy2(self.raw_preinst_content_path, target_content_dir) ++ self._attempt_rpm_installation() ++ + def execute(self, storage, ksdata, users, payload): + """ + The execute method that should make changes to the installed system. It +@@ -507,15 +535,10 @@ def execute(self, storage, ksdata, users, payload): + if self.content_type == "datastream": + shutil.copy2(self.preinst_content_path, target_content_dir) + elif self.content_type == "rpm": +- # copy the RPM to the target system +- shutil.copy2(self.raw_preinst_content_path, target_content_dir) +- +- # and install it with yum +- ret = util.execInSysroot("yum", ["-y", "--nogpg", "install", +- self.raw_postinst_content_path]) +- if ret != 0: +- msg = _(f"Failed to install content RPM to the target system.") +- self._terminate(msg) ++ try: ++ self._copy_rpm_to_target_and_install(target_content_dir) ++ except Exception as exc: ++ self._terminate(str(exc)) + return + elif self.content_type == "scap-security-guide": + # nothing needed diff --git a/SOURCES/oscap-anaconda-addon-1.3.0-clicking_nocrash-PR_221.patch b/SOURCES/oscap-anaconda-addon-1.3.0-clicking_nocrash-PR_221.patch new file mode 100644 index 0000000..5495d3f --- /dev/null +++ b/SOURCES/oscap-anaconda-addon-1.3.0-clicking_nocrash-PR_221.patch @@ -0,0 +1,74 @@ +From 55cc3b685dd5a9ca6059459f41876dd9f19f900d Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Tue, 11 Oct 2022 17:07:28 +0200 +Subject: [PATCH 1/2] Remove redundant message + +The send_ready already performs what the removed call +could aim to accomplish. +--- + org_fedora_oscap/gui/spokes/oscap.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py +index c57b1cd..4f8702a 100644 +--- a/org_fedora_oscap/gui/spokes/oscap.py ++++ b/org_fedora_oscap/gui/spokes/oscap.py +@@ -150,7 +150,6 @@ def decorated(self, *args, **kwargs): + self._ready = True + # pylint: disable-msg=E1101 + hubQ.send_ready(self.__class__.__name__, True) +- hubQ.send_message(self.__class__.__name__, self.status) + + return ret + + +From 3f7c560947a17d1696899857e70ebcc8cba44019 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Thu, 13 Oct 2022 17:19:17 +0200 +Subject: [PATCH 2/2] Increase robustness of fetching state detection + +It is not completely practical to rely on locks alone, +and we can elliminate some corner cases by looking +whether well-known UI threads exist. +--- + org_fedora_oscap/gui/spokes/oscap.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py +index 4f8702a..d8e6ce2 100644 +--- a/org_fedora_oscap/gui/spokes/oscap.py ++++ b/org_fedora_oscap/gui/spokes/oscap.py +@@ -363,11 +363,14 @@ def _render_selected(self, column, renderer, model, itr, user_data=None): + else: + renderer.set_property("stock-id", None) + ++ def _still_fetching(self): ++ return self._fetching or threadMgr.get('OSCAPguiWaitForDataFetchThread') ++ + def _fetch_data_and_initialize(self): + """Fetch data from a specified URL and initialize everything.""" + + with self._fetch_flag_lock: +- if self._fetching: ++ if self._still_fetching(): + # prevent multiple fetches running simultaneously + return + self._fetching = True +@@ -894,7 +897,7 @@ def refresh(self): + + # hide the progress box, no progress now + with self._fetch_flag_lock: +- if not self._fetching: ++ if not self._still_fetching(): + really_hide(self._progress_box) + + self._content_url_entry.set_sensitive(True) +@@ -1117,7 +1120,7 @@ def on_fetch_button_clicked(self, *args): + """Handler for the Fetch button""" + + with self._fetch_flag_lock: +- if self._fetching: ++ if self._still_fetching(): + # some other fetching/pre-processing running, give up + log.warn("Clicked the fetch button, although the GUI is in the fetching mode.") + return diff --git a/SOURCES/oscap-anaconda-addon-1.3.0-fix_content_paths-PR_225.patch b/SOURCES/oscap-anaconda-addon-1.3.0-fix_content_paths-PR_225.patch new file mode 100644 index 0000000..e7c112c --- /dev/null +++ b/SOURCES/oscap-anaconda-addon-1.3.0-fix_content_paths-PR_225.patch @@ -0,0 +1,202 @@ +From 08d3da5640e5c16cda4e79cc13ac7921f1ebd964 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Tue, 15 Nov 2022 15:37:28 +0100 +Subject: [PATCH 1/2] Fix handling of content paths + +Archives and ready-to-use content use paths differently. + +Archives get unpacked into a directory, where they need to be unpacked, +analyzed, and cross-checked with e.g. the supplied content path, +whereas ready-to-use content can be used directly. + +As the current codebase doesn't untangle all possible ways how to obtain +existing content in a way of decomposing those into layers, this change +just makes the current code working at the expense of making it worse to +maintain. +--- + org_fedora_oscap/content_discovery.py | 34 ++++++++++++++++++--------- + org_fedora_oscap/ks/oscap.py | 6 ++++- + tests/test_content_discovery.py | 21 +++++++++++++++++ + 3 files changed, 49 insertions(+), 12 deletions(-) + +diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py +index e9cf34a..2b71b1f 100644 +--- a/org_fedora_oscap/content_discovery.py ++++ b/org_fedora_oscap/content_discovery.py +@@ -25,6 +25,14 @@ def is_network(scheme): + for net_prefix in data_fetch.NET_URL_PREFIXES) + + ++def path_is_present_among_paths(path, paths): ++ absolute_path = os.path.abspath(path) ++ for second_path in paths: ++ if absolute_path == os.path.abspath(second_path): ++ return True ++ return False ++ ++ + class ContentBringer: + CONTENT_DOWNLOAD_LOCATION = pathlib.Path(common.INSTALLATION_CONTENT_DIR) + DEFAULT_SSG_DATA_STREAM_PATH = f"{common.SSG_DIR}/{common.SSG_CONTENT}" +@@ -170,7 +178,7 @@ def _verify_fingerprint(self, dest_filename, fingerprint=""): + raise content_handling.ContentCheckError(msg) + + def allow_one_expected_tailoring_or_no_tailoring(self, labelled_files): +- expected_tailoring = self._addon_data.tailoring_path ++ expected_tailoring = self._addon_data.preinst_tailoring_path + tailoring_label = CONTENT_TYPES["TAILORING"] + if expected_tailoring: + labelled_files = self.reduce_files(labelled_files, expected_tailoring, [tailoring_label]) +@@ -182,7 +190,7 @@ def allow_one_expected_tailoring_or_no_tailoring(self, labelled_files): + return labelled_files + + def filter_discovered_content(self, labelled_files): +- expected_path = self._addon_data.content_path ++ expected_path = self._addon_data.preinst_content_path + categories = (CONTENT_TYPES["DATASTREAM"], CONTENT_TYPES["XCCDF_CHECKLIST"]) + if expected_path: + labelled_files = self.reduce_files(labelled_files, expected_path, categories) +@@ -198,7 +206,7 @@ def filter_discovered_content(self, labelled_files): + + def reduce_files(self, labelled_files, expected_path, categories): + reduced_files = dict() +- if expected_path not in labelled_files: ++ if not path_is_present_among_paths(expected_path, labelled_files.keys()): + msg = ( + f"Expected a file {expected_path} to be part of the supplied content, " + f"but it was not the case, got only {list(labelled_files.keys())}" +@@ -225,13 +233,9 @@ def _finish_actual_fetch(self, wait_for, fingerprint, report_callback, dest_file + structured_content.add_content_archive(dest_filename) + + labelled_filenames = content_handling.identify_files(fpaths) +- labelled_relative_filenames = { +- os.path.relpath(path, self.CONTENT_DOWNLOAD_LOCATION): label +- for path, label in labelled_filenames.items()} +- labelled_relative_filenames = self.filter_discovered_content(labelled_relative_filenames) ++ labelled_filenames = self.filter_discovered_content(labelled_filenames) + +- for rel_fname, label in labelled_relative_filenames.items(): +- fname = self.CONTENT_DOWNLOAD_LOCATION / rel_fname ++ for fname, label in labelled_filenames.items(): + structured_content.add_file(str(fname), label) + + if fingerprint and dest_filename: +@@ -274,11 +278,18 @@ def use_downloaded_content(self, content): + # We know that we have ended up with a datastream-like content, + # but if we can't convert an archive to a datastream. + # self._addon_data.content_type = "datastream" +- self._addon_data.content_path = str(preferred_content.relative_to(content.root)) ++ content_type = self._addon_data.content_type ++ if content_type in ("archive", "rpm"): ++ self._addon_data.content_path = str(preferred_content.relative_to(content.root)) ++ else: ++ self._addon_data.content_path = str(preferred_content) + + preferred_tailoring = self.get_preferred_tailoring(content) + if content.tailoring: +- self._addon_data.tailoring_path = str(preferred_tailoring.relative_to(content.root)) ++ if content_type in ("archive", "rpm"): ++ self._addon_data.tailoring_path = str(preferred_tailoring.relative_to(content.root)) ++ else: ++ self._addon_data.tailoring_path = str(preferred_tailoring) + + def use_system_content(self, content=None): + self._addon_data.clear_all() +@@ -372,6 +383,7 @@ def _xccdf_content(self): + + def find_expected_usable_content(self, relative_expected_content_path): + content_path = self.root / relative_expected_content_path ++ content_path = content_path.resolve() + eligible_main_content = (self._datastream_content(), self._xccdf_content()) + + if content_path in eligible_main_content: +diff --git a/org_fedora_oscap/ks/oscap.py b/org_fedora_oscap/ks/oscap.py +index dac273d..7d4a131 100644 +--- a/org_fedora_oscap/ks/oscap.py ++++ b/org_fedora_oscap/ks/oscap.py +@@ -179,7 +179,11 @@ def _parse_profile_id(self, value): + self.profile_id = value + + def _parse_content_path(self, value): +- # need to be checked? ++ if self.content_type in ("archive", "rpm") and os.path.isabs(self.content_path): ++ msg = ( ++ "When using archives-like content input, the corresponding content path " ++ "has to be relative, but got '{self.content_path}'.") ++ raise KickstartValueError(msg) + self.content_path = value + + def _parse_cpe_path(self, value): +diff --git a/tests/test_content_discovery.py b/tests/test_content_discovery.py +index 5463c9a..d6e14d9 100644 +--- a/tests/test_content_discovery.py ++++ b/tests/test_content_discovery.py +@@ -1,3 +1,5 @@ ++import os ++ + import pytest + + import org_fedora_oscap.content_discovery as tested_module +@@ -46,3 +48,22 @@ def test_reduce(labelled_files): + + reduced = bringer.reduce_files(labelled_files, "cpe", ["C"]) + assert reduced == labelled_files ++ ++ ++def test_path_presence_detection(): ++ list_of_paths = ["file1", os.path.abspath("file2"), os.path.abspath("dir///file3")] ++ ++ list_of_paths_in_list = [ ++ "file1", os.path.abspath("file1"), "./file1", ++ "file2", "dir/..//file2", ++ "dir/../dir/file3", "dir/file3", ++ ] ++ list_of_paths_not_in_list = [ ++ "../file1", "file3" ++ ] ++ ++ for path in list_of_paths_in_list: ++ assert tested_module.path_is_present_among_paths(path, list_of_paths) ++ ++ for path in list_of_paths_not_in_list: ++ assert not tested_module.path_is_present_among_paths(path, list_of_paths) + +From 786ec5d90d12a1321fbff86f5d8d4a534059ad22 Mon Sep 17 00:00:00 2001 +From: Matej Tyc +Date: Wed, 16 Nov 2022 15:35:09 +0100 +Subject: [PATCH 2/2] Compare paths according to their equivalence + +not according their arbitrary string form +--- + org_fedora_oscap/content_discovery.py | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/org_fedora_oscap/content_discovery.py b/org_fedora_oscap/content_discovery.py +index 2b71b1f..42c61e0 100644 +--- a/org_fedora_oscap/content_discovery.py ++++ b/org_fedora_oscap/content_discovery.py +@@ -25,10 +25,14 @@ def is_network(scheme): + for net_prefix in data_fetch.NET_URL_PREFIXES) + + ++def paths_are_equivalent(p1, p2): ++ return os.path.abspath(p1) == os.path.abspath(p2) ++ ++ + def path_is_present_among_paths(path, paths): + absolute_path = os.path.abspath(path) + for second_path in paths: +- if absolute_path == os.path.abspath(second_path): ++ if paths_are_equivalent(path, second_path): + return True + return False + +@@ -213,7 +217,7 @@ def reduce_files(self, labelled_files, expected_path, categories): + ) + raise RuntimeError(msg) + for path, label in labelled_files.items(): +- if label in categories and path != expected_path: ++ if label in categories and not paths_are_equivalent(path, expected_path): + continue + reduced_files[path] = label + return reduced_files diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec index 3dd88eb..47e308b 100644 --- a/SPECS/oscap-anaconda-addon.spec +++ b/SPECS/oscap-anaconda-addon.spec @@ -3,7 +3,7 @@ Name: oscap-anaconda-addon Version: 1.2.1 -Release: 8%{?dist} +Release: 10%{?dist} Summary: Anaconda addon integrating OpenSCAP to the installation process License: GPLv2+ @@ -22,6 +22,9 @@ Patch1: lang.patch Patch2: oscap-anaconda-addon-1.2.2-content_ident-PR_167.patch Patch3: oscap-anaconda-addon-1.2.2-deep_archives-PR_168.patch Patch4: oscap-anaconda-addon-1.2.2-absent_appstream-PR_184.patch +Patch5: oscap-anaconda-addon-1.3.0-better_archive_handling-PR_220.patch +Patch6: oscap-anaconda-addon-1.3.0-clicking_nocrash-PR_221.patch +Patch7: oscap-anaconda-addon-1.3.0-fix_content_paths-PR_225.patch BuildArch: noarch BuildRequires: make @@ -51,6 +54,9 @@ content. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 # NOTE CONCERNING TRANSLATION PATCHES # When preparing translation patches, don't consider that some languages are unsupported - # we aim to include all applicable translation texts to the appropriate patch. @@ -72,6 +78,16 @@ make install DESTDIR=%{buildroot} %doc COPYING ChangeLog README.md %changelog +* Wed Nov 23 2022 Matej Tyc - 1.2.1-10 +- Fix regression introduced when fixing content archive input + Resolves: rhbz#2129008 + +* Thu Nov 10 2022 Matej Tyc - 1.2.1-9 +- Fix problems with handling multi-datastream archives + Resolves: rhbz#2129008 +- Fix a crash when compulsively clicking in the GUI + Resolves: rhbz#2000998 + * Wed Jul 20 2022 Matej Tyc - 1.2.1-8 - Update translations Resolves: rhbz#2062707