pcs-0.10.18-1

- Rebased to the latest sources (see CHANGELOG.md)
  Resolves: RHEL-7741
- Removed remnants of previously removed workarounds

.gitignore

@@ -39,3 +39,4 @@
 /tilt-2.3.0.gem
 /pcs-bfeff6d16605a7274e7b99bb751e98856e8eae1f.tar.gz
 /pcs-1fa11fa39029896939a5545968ed60ede714b992.tar.gz
+/pcs-0.10.18.tar.gz

RHEL-17280-01-disable-new-webui-routes.patch

@@ -1,4 +1,4 @@
-From ea7c7eea0dab84d8dc37da412f8d18e9b1c32af5 Mon Sep 17 00:00:00 2001
+From 957856a556f5ed92129ce602538c3df3aebce7a3 Mon Sep 17 00:00:00 2001
 From: Ivan Devat <idevat@redhat.com>
 Date: Tue, 5 Dec 2023 15:18:35 +0100
 Subject: [PATCH 2/2] disable alternative webui routes
@@ -51,5 +51,5 @@ index 7fdeda2a..0a6b1b21 100644
                      session_storage, ruby_pcsd_wrapper, public_dir
                  )
 -- 
-2.41.0
+2.43.0
 

bz2218841-01-fix-displaying-duplicate-records-in-property-command.patch

@@ -1,331 +0,0 @@
-From 13efdd334514daeff8a2f7c3e89c3ed6a64a9bef Mon Sep 17 00:00:00 2001
-From: Miroslav Lisik <mlisik@redhat.com>
-Date: Tue, 27 Jun 2023 11:59:00 +0200
-Subject: [PATCH 1/2] fix displaying duplicate records in property commands
-
----
- CHANGELOG.md                                  |  9 +++
- pcs/cli/cluster_property/output.py            | 65 +++++++++----------
- .../cli/cluster_property/test_command.py      | 15 +++++
- .../tier0/cli/cluster_property/test_output.py | 33 ++++++----
- .../lib/commands/test_cluster_property.py     | 28 ++++++++
- 5 files changed, 103 insertions(+), 47 deletions(-)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index 0ca054e1..a1a4277f 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -1,5 +1,14 @@
- # Change Log
- 
-+## [Unreleased]
-+
-+### Fixed
-+- Do not display duplicate records in commands `pcs property [config] --all`
-+  and `pcs property describe` ([rhbz#2217850])
-+
-+[rhbz#2217850]: https://bugzilla.redhat.com/show_bug.cgi?id=2217850
-+
-+
- ## [0.10.17] - 2023-06-19
- 
- ### Added
-diff --git a/pcs/cli/cluster_property/output.py b/pcs/cli/cluster_property/output.py
-index 12d626f1..1af93ea3 100644
---- a/pcs/cli/cluster_property/output.py
-+++ b/pcs/cli/cluster_property/output.py
-@@ -34,21 +34,15 @@ class PropertyConfigurationFacade:
-         readonly_properties: StringCollection,
-     ) -> None:
-         self._properties = properties
-+        self._first_nvpair_set = (
-+            self._properties[0].nvpairs if self._properties else []
-+        )
-         self._properties_metadata = properties_metadata
-         self._readonly_properties = readonly_properties
--        self._defaults_map = {
--            metadata.name: metadata.default
--            for metadata in self._properties_metadata
--            if metadata.default is not None
-+        self._defaults_map = self.get_defaults(include_advanced=True)
-+        self._name_nvpair_dto_map = {
-+            nvpair_dto.name: nvpair_dto for nvpair_dto in self._first_nvpair_set
-         }
--        self._name_nvpair_dto_map = (
--            {
--                nvpair_dto.name: nvpair_dto
--                for nvpair_dto in self._properties[0].nvpairs
--            }
--            if self._properties
--            else {}
--        )
- 
-     @classmethod
-     def from_properties_dtos(
-@@ -108,17 +102,6 @@ class PropertyConfigurationFacade:
-             return value
-         return self._defaults_map.get(property_name, custom_default)
- 
--    @staticmethod
--    def _filter_names_advanced(
--        metadata: ResourceAgentParameterDto,
--        property_names: Optional[StringSequence] = None,
--        include_advanced: bool = False,
--    ) -> bool:
--        return bool(
--            (not property_names and (include_advanced or not metadata.advanced))
--            or (property_names and metadata.name in property_names)
--        )
--
-     def get_defaults(
-         self,
-         property_names: Optional[StringSequence] = None,
-@@ -126,11 +109,10 @@ class PropertyConfigurationFacade:
-     ) -> Dict[str, str]:
-         return {
-             metadata.name: metadata.default
--            for metadata in self._properties_metadata
--            if metadata.default is not None
--            and self._filter_names_advanced(
--                metadata, property_names, include_advanced
-+            for metadata in self.get_properties_metadata(
-+                property_names, include_advanced
-             )
-+            if metadata.default is not None
-         }
- 
-     def get_properties_metadata(
-@@ -138,23 +120,34 @@ class PropertyConfigurationFacade:
-         property_names: Optional[StringSequence] = None,
-         include_advanced: bool = False,
-     ) -> Sequence[ResourceAgentParameterDto]:
--        return [
--            metadata
--            for metadata in self._properties_metadata
--            if self._filter_names_advanced(
--                metadata, property_names, include_advanced
--            )
--        ]
-+        if property_names:
-+            filtered_metadata = [
-+                metadata
-+                for metadata in self._properties_metadata
-+                if metadata.name in property_names
-+            ]
-+        else:
-+            filtered_metadata = [
-+                metadata
-+                for metadata in self._properties_metadata
-+                if include_advanced or not metadata.advanced
-+            ]
-+        deduplicated_metadata = {
-+            metadata.name: metadata for metadata in filtered_metadata
-+        }
-+        return list(deduplicated_metadata.values())
- 
-     def get_name_value_default_list(self) -> List[Tuple[str, str, bool]]:
-         name_value_default_list = [
-             (nvpair_dto.name, nvpair_dto.value, False)
--            for nvpair_dto in self._name_nvpair_dto_map.values()
-+            for nvpair_dto in self._first_nvpair_set
-         ]
-         name_value_default_list.extend(
-             [
-                 (metadata_dto.name, metadata_dto.default, True)
--                for metadata_dto in self._properties_metadata
-+                for metadata_dto in self.get_properties_metadata(
-+                    include_advanced=True
-+                )
-                 if metadata_dto.name not in self._name_nvpair_dto_map
-                 and metadata_dto.default is not None
-             ]
-diff --git a/pcs_test/tier0/cli/cluster_property/test_command.py b/pcs_test/tier0/cli/cluster_property/test_command.py
-index 14c8f6c1..702266f0 100644
---- a/pcs_test/tier0/cli/cluster_property/test_command.py
-+++ b/pcs_test/tier0/cli/cluster_property/test_command.py
-@@ -21,6 +21,21 @@ from pcs_test.tools.misc import dict_to_modifiers
- 
- FIXTURE_PROPERTY_METADATA = ClusterPropertyMetadataDto(
-     properties_metadata=[
-+        ResourceAgentParameterDto(
-+            name="property_name",
-+            shortdesc="Duplicate property",
-+            longdesc=None,
-+            type="string",
-+            default="duplicate_default",
-+            enum_values=None,
-+            required=False,
-+            advanced=False,
-+            deprecated=False,
-+            deprecated_by=[],
-+            deprecated_desc=None,
-+            unique_group=None,
-+            reloadable=False,
-+        ),
-         ResourceAgentParameterDto(
-             name="property_name",
-             shortdesc=None,
-diff --git a/pcs_test/tier0/cli/cluster_property/test_output.py b/pcs_test/tier0/cli/cluster_property/test_output.py
-index a4281a74..f10b0492 100644
---- a/pcs_test/tier0/cli/cluster_property/test_output.py
-+++ b/pcs_test/tier0/cli/cluster_property/test_output.py
-@@ -21,6 +21,7 @@ FIXTURE_TWO_PROPERTY_SETS = [
-             CibNvpairDto(id="", name="readonly2", value="ro_val2"),
-             CibNvpairDto(id="", name="property2", value="val2"),
-             CibNvpairDto(id="", name="property1", value="val1"),
-+            CibNvpairDto(id="", name="property1", value="duplicate_val1"),
-         ],
-     ),
-     CibNvsetDto(
-@@ -39,6 +40,7 @@ FIXTURE_READONLY_PROPERTIES_LIST = ["readonly1", "readonly2"]
- FIXTURE_TEXT_OUTPUT_FIRST_SET = dedent(
-     """\
-     Cluster Properties: id1 score=150
-+      property1=duplicate_val1
-       property1=val1
-       property2=val2
-       readonly1=ro_val1
-@@ -49,7 +51,7 @@ FIXTURE_TEXT_OUTPUT_FIRST_SET = dedent(
- FIXTURE_LEGACY_TEXT_OUTPUT_FIRST_SET = dedent(
-     """\
-     Cluster Properties:
--     property1: val1
-+     property1: duplicate_val1
-      property2: val2
-      readonly1: ro_val1
-      readonly2: ro_val2
-@@ -85,6 +87,7 @@ def fixture_property_metadata(
- 
- 
- FIXTURE_PROPERTY_METADATA_LIST = [
-+    fixture_property_metadata(name="property1", default="duplicate_default1"),
-     fixture_property_metadata(name="property1", default="default1"),
-     fixture_property_metadata(name="property2", default="default2"),
-     fixture_property_metadata(
-@@ -164,7 +167,7 @@ class TestPropertyConfigurationFacadeGetPropertyValue(TestCase):
-         )
- 
-     def test_property_value_from_first_set(self):
--        self.assertEqual(self.facade.get_property_value("property1"), "val1")
-+        self.assertEqual(self.facade.get_property_value("property2"), "val2")
- 
-     def test_property_value_from_second_set(self):
-         self.assertEqual(self.facade.get_property_value("property3"), None)
-@@ -180,6 +183,11 @@ class TestPropertyConfigurationFacadeGetPropertyValue(TestCase):
-             "custom",
-         )
- 
-+    def test_property_with_multiple_values(self):
-+        self.assertEqual(
-+            self.facade.get_property_value("property1"), "duplicate_val1"
-+        )
-+
- 
- class TestPropertyConfigurationFacadeGetPropertyValueOrDefault(TestCase):
-     def setUp(self):
-@@ -191,7 +199,7 @@ class TestPropertyConfigurationFacadeGetPropertyValueOrDefault(TestCase):
- 
-     def test_property_value_from_first_set(self):
-         self.assertEqual(
--            self.facade.get_property_value_or_default("property1"), "val1"
-+            self.facade.get_property_value_or_default("property2"), "val2"
-         )
- 
-     def test_property_value_not_in_set(self):
-@@ -267,21 +275,22 @@ class TestPropertyConfigurationFacadeGetPropertiesMetadata(TestCase):
-         )
- 
-     def test_metadata_without_advanced(self):
--        metadata = FIXTURE_PROPERTY_METADATA_LIST[0:2]
--        self.assertEqual(self.facade.get_properties_metadata(), metadata)
-+        metadata = FIXTURE_PROPERTY_METADATA_LIST[1:3]
-+        self.assertCountEqual(self.facade.get_properties_metadata(), metadata)
- 
-     def test_metadata_with_advanced(self):
--        metadata = FIXTURE_PROPERTY_METADATA_LIST
--        self.assertEqual(
--            self.facade.get_properties_metadata(include_advanced=True), metadata
-+        metadata = FIXTURE_PROPERTY_METADATA_LIST[1:]
-+        self.assertCountEqual(
-+            self.facade.get_properties_metadata(include_advanced=True),
-+            metadata,
-         )
- 
-     def test_metadata_specified(self):
-         metadata = (
--            FIXTURE_PROPERTY_METADATA_LIST[0:1]
-+            FIXTURE_PROPERTY_METADATA_LIST[1:2]
-             + FIXTURE_PROPERTY_METADATA_LIST[-1:]
-         )
--        self.assertEqual(
-+        self.assertCountEqual(
-             self.facade.get_properties_metadata(
-                 property_names=["property4", "property1"]
-             ),
-@@ -303,6 +312,7 @@ class TestPropertyConfigurationFacadeGetNameValueDefaultList(TestCase):
-             ("readonly2", "ro_val2", False),
-             ("property2", "val2", False),
-             ("property1", "val1", False),
-+            ("property1", "duplicate_val1", False),
-             ("property3", "default3", True),
-             ("property4", "default4", True),
-         ]
-@@ -531,7 +541,8 @@ class TestPropertiesToCmd(TestCase):
-             """\
-             pcs property set --force -- \\
-               property2=val2 \\
--              property1=val1
-+              property1=val1 \\
-+              property1=duplicate_val1
-             """
-         )
-         self.assert_lines(facade, output)
-diff --git a/pcs_test/tier0/lib/commands/test_cluster_property.py b/pcs_test/tier0/lib/commands/test_cluster_property.py
-index 4a985b5d..92486703 100644
---- a/pcs_test/tier0/lib/commands/test_cluster_property.py
-+++ b/pcs_test/tier0/lib/commands/test_cluster_property.py
-@@ -890,6 +890,10 @@ class TestGetProperties(TestCase):
-         )
-         self.env_assist.assert_reports([])
- 
-+    @mock.patch(
-+        "pcs.lib.cib.rule.in_effect.has_rule_in_effect_status_tool",
-+        lambda: True,
-+    )
-     def test_evaluate_expired_but_no_set_rule(self):
-         self.config.runner.cib.load(
-             crm_config=fixture_crm_config_properties([("set_id", {})])
-@@ -903,6 +907,30 @@ class TestGetProperties(TestCase):
-             ),
-         )
- 
-+    @mock.patch(
-+        "pcs.lib.cib.rule.in_effect.has_rule_in_effect_status_tool",
-+        lambda: False,
-+    )
-+    def test_evaluate_expired_no_status_tool(self):
-+        self.config.runner.cib.load(
-+            crm_config=fixture_crm_config_properties([("set_id", {})])
-+        )
-+        self.assertEqual(
-+            self.command(evaluate_expired=True),
-+            ListCibNvsetDto(
-+                nvsets=[
-+                    CibNvsetDto(id="set_id", options={}, rule=None, nvpairs=[])
-+                ]
-+            ),
-+        )
-+        self.env_assist.assert_reports(
-+            [
-+                fixture.warn(
-+                    reports.codes.RULE_IN_EFFECT_STATUS_DETECTION_NOT_SUPPORTED,
-+                )
-+            ]
-+        )
-+
- 
- class TestGetPropertiesMetadata(MetadataErrorMixin, TestCase):
-     _load_cib_when_metadata_error = False
--- 
-2.41.0
-

bz2219388-01-use-a-filter-when-extracting-a-config-backup-tarball.patch

@@ -1,77 +0,0 @@
-From 592f79d7e6885b7b82275dc22961009d31b6ad52 Mon Sep 17 00:00:00 2001
-From: Tomas Jelinek <tojeline@redhat.com>
-Date: Tue, 11 Jul 2023 14:09:17 +0200
-Subject: [PATCH 2/2] use a filter when extracting a config backup tarball
-
----
- CHANGELOG.md  |  5 +++++
- pcs/config.py | 26 ++++++++++++++++++++++++--
- 2 files changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index a1a4277f..4c3b44d8 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -2,11 +2,16 @@
- 
- ## [Unreleased]
- 
-+### Security
-+- Make use of filters when extracting tarballs to enhance security if provided
-+  by Python (`pcs config restore` command) ([rhbz#2219388])
-+
- ### Fixed
- - Do not display duplicate records in commands `pcs property [config] --all`
-   and `pcs property describe` ([rhbz#2217850])
- 
- [rhbz#2217850]: https://bugzilla.redhat.com/show_bug.cgi?id=2217850
-+[rhbz#2219388]: https://bugzilla.redhat.com/show_bug.cgi?id=2219388
- 
- 
- ## [0.10.17] - 2023-06-19
-diff --git a/pcs/config.py b/pcs/config.py
-index 39adbc76..26d467a5 100644
---- a/pcs/config.py
-+++ b/pcs/config.py
-@@ -516,14 +516,36 @@ def config_restore_local(infile_name, infile_obj):
-                 if "rename" in extract_info and extract_info["rename"]:
-                     if tmp_dir is None:
-                         tmp_dir = tempfile.mkdtemp()
--                    tarball.extractall(tmp_dir, [tar_member_info])
-+                    if hasattr(tarfile, "data_filter"):
-+                        # Safe way of extraction is available since Python 3.12,
-+                        # hasattr above checks if it's available.
-+                        # It's also backported to 3.11.4, 3.10.12, 3.9.17.
-+                        # It may be backported to older versions in downstream.
-+                        tarball.extractall(
-+                            tmp_dir, [tar_member_info], filter="data"
-+                        )
-+                    else:
-+                        # Unsafe way of extraction
-+                        # Remove once we don't support Python 3.8 and older
-+                        tarball.extractall(tmp_dir, [tar_member_info])
-                     path_full = extract_info["path"]
-                     shutil.move(
-                         os.path.join(tmp_dir, tar_member_info.name), path_full
-                     )
-                 else:
-                     dir_path = os.path.dirname(extract_info["path"])
--                    tarball.extractall(dir_path, [tar_member_info])
-+                    if hasattr(tarfile, "data_filter"):
-+                        # Safe way of extraction is available since Python 3.12,
-+                        # hasattr above checks if it's available.
-+                        # It's also backported to 3.11.4, 3.10.12, 3.9.17.
-+                        # It may be backported to older versions in downstream.
-+                        tarball.extractall(
-+                            dir_path, [tar_member_info], filter="data"
-+                        )
-+                    else:
-+                        # Unsafe way of extracting
-+                        # Remove once we don't support Python 3.8 and older
-+                        tarball.extractall(dir_path, [tar_member_info])
-                     path_full = os.path.join(dir_path, tar_member_info.name)
-                 file_attrs = extract_info["attrs"]
-                 os.chmod(path_full, file_attrs["mode"])
--- 
-2.41.0
-

do-not-support-cluster-setup-with-udp-u-transport.patch

@@ -1,4 +1,4 @@
-From f6481d591edcd2c0a8c4026c1444bf28374a7eff Mon Sep 17 00:00:00 2001
+From 854efcf148c82e5a5e4f0afd71cc3333ea4a8ce4 Mon Sep 17 00:00:00 2001
 From: Ivan Devat <idevat@redhat.com>
 Date: Tue, 20 Nov 2018 15:03:56 +0100
 Subject: [PATCH 1/2] do not support cluster setup with udp(u) transport
@@ -49,5 +49,5 @@ index 2f26e831..a7702ac4 100644
  #csetup-transport-options.knet .without-knet
  {
 -- 
-2.41.0
+2.43.0
 

pcs.spec

@@ -1,6 +1,6 @@
 Name: pcs
-Version: 0.10.17
+Version: 0.10.18
-Release: 6%{?dist}
+Release: 1%{?dist}
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
 # GPL-2.0-only: pcs
@@ -21,8 +21,8 @@ Summary: Pacemaker/Corosync Configuration System
 ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 
 # When specifying a commit, use its long hash
-# %%global version_or_commit %%{version}
+%global version_or_commit %{version}
-%global version_or_commit 1fa11fa39029896939a5545968ed60ede714b992
+# %%global version_or_commit 1fa11fa39029896939a5545968ed60ede714b992
 %global pcs_source_name %{name}-%{version_or_commit}
 
 %global pcs_snmp_pkg_name  pcs-snmp
@@ -560,6 +560,10 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Mon Jan 8 2024 Michal Pospisil <mpospisi@redhat.com> - 0.10.18-1
+- Rebased to the latest sources (see CHANGELOG.md)
+  Resolves: RHEL-7741
+
 * Fri Dec 8 2023 Michal Pospisil <mpospisi@redhat.com> - 0.10.17-6
 - Rebased to the latest upstream sources (see CHANGELOG.md)
 - Remove the preview of the new pcs web interface

prepare-env.sh

@@ -2,10 +2,8 @@ set -eo xtrace
 # Rpmbuild expects patches in the _sourcedir
 mv *.patch $TMT_SOURCE_DIR
 mkdir builddir
-# Workaround for tmt not downloading rubygems, there is a spec macro that skips
-# copying them during prep phase
 rpmbuild -bp pcs.spec --nodeps --define "_sourcedir $TMT_SOURCE_DIR" \
-  --define "_builddir $(pwd)/builddir" --define="skip_bundle_prep 1"
+  --define "_builddir $(pwd)/builddir"
 # Remove pcs-web-ui in builddir for "cd pcs-*" to have exactly one match
 rm -rf builddir/pcs-web-ui-*
 cd builddir/pcs-*
@@ -13,7 +11,6 @@ cd builddir/pcs-*
 export PYTHONPATH=/usr/lib64/pcs/pcs_bundled/packages/
 export GEM_HOME=/usr/lib64/pcsd/vendor/bundle/
 ./autogen.sh
-# Workaround until configure.ac is prepared for centos-stream-*
 ./configure --enable-tests-only
 # Remove pcs sources to make sure tests are not using any of those files
 rm -rf pcs

sources

@@ -18,4 +18,4 @@ SHA512 (puma-6.4.0.gem) = 3f481bd2bd34ed0d66d86f61d7522a48b4d8bfd36b807a1c47bb3b
 SHA512 (rack-2.2.8.gem) = 8d12f6ce307f0474529218086c25d9f043b7787c65fab919bf9d706c00b3d61e2460e2fef02134e6e76b721b97cc86d80fa1a22d8adda89b19fc29b21694c15d
 SHA512 (rexml-3.2.6.gem) = 6e4539f6de381be6a90e236cee7ef65622e18c88e4c4f3ee0b2c7501623b92bba046c22cd4de5f50a3067527fbe90a57f28fb4a5206754e957368a5d330b5458
 SHA512 (tilt-2.3.0.gem) = 78a3de34e3d096e40cb245807bad07cc3ebfa192986addbd228c25153166808b379f3ce086ff68fa5959997946187fe8923e84100653b2b109007390969875b3
-SHA512 (pcs-1fa11fa39029896939a5545968ed60ede714b992.tar.gz) = 5397b094cfa1da57dcb45d7f74d37e5660aaa32bc5e108fe0652c48f9082b2dca770d5a93b5dc7da971580ff36abcd074f6e08ef4f17ddf25eecf49547a64d4f
+SHA512 (pcs-0.10.18.tar.gz) = 5cadb8158bd97e6f20fdf5fc492e85febf596e813b2e64a6dfb13da803ef3d2a3c1fe63d8e26d9b18279f23bfab9a8ff40fab10c9a87fa84b1da302648533ba0