From f73add9fe910f9f0ebc52d553de7d186907fad9f Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Mon, 11 Dec 2023 17:10:33 +0300
Subject: [PATCH] import subscription-manager-1.28.36-3.el8_8

---
 SOURCES/00001-fix-dbus-policy.patch | 99 +++++++++++++++++++++++++++++
 SPECS/subscription-manager.spec     |  8 ++-
 2 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/00001-fix-dbus-policy.patch

diff --git a/SOURCES/00001-fix-dbus-policy.patch b/SOURCES/00001-fix-dbus-policy.patch
new file mode 100644
index 0000000..ee8bc45
--- /dev/null
+++ b/SOURCES/00001-fix-dbus-policy.patch
@@ -0,0 +1,99 @@
+diff --git a/etc-conf/dbus/system.d/com.redhat.RHSM1.conf b/etc-conf/dbus/system.d/com.redhat.RHSM1.conf
+index e21c57263..11adf1d79 100644
+--- a/etc-conf/dbus/system.d/com.redhat.RHSM1.conf
++++ b/etc-conf/dbus/system.d/com.redhat.RHSM1.conf
+@@ -7,23 +7,9 @@
+     <policy user="root">
+         <allow own="com.redhat.RHSM1"/>
+ 
+-        <!-- Basic D-Bus API stuff -->
+-        <allow send_destination="com.redhat.RHSM1"
+-            send_interface="org.freedesktop.DBus.Introspectable"/>
+-        <allow send_destination="com.redhat.RHSM1"
+-            send_interface="org.freedesktop.DBus.Properties"/>
+-        <allow send_destination="com.redhat.RHSM1"
+-            send_interface="org.freedesktop.DBus.ObjectManager"/>
+-
+-        <!-- allow Config.Set from root -->
+-        <allow send_destination="com.redhat.RHSM1"
+-            send_interface="com.redhat.RHSM1.Config"
+-            send_member="Set"/>
+-    </policy>
+-
+-
+-    <policy context="default">
+-        <!-- TODO: make these read-only by default -->
++        <!--
++        Lock down the objects to root access only
++        -->
+ 
+         <allow send_destination="com.redhat.RHSM1"
+             send_interface="com.redhat.RHSM1"/>
+@@ -37,11 +23,6 @@
+         <allow send_destination="com.redhat.RHSM1"
+             send_interface="com.redhat.RHSM1.Config"/>
+ 
+-        <!-- deny Config.Set by default -->
+-        <deny send_destination="com.redhat.RHSM1"
+-            send_interface="com.redhat.RHSM1.Config"
+-            send_member="Set"/>
+-
+         <allow send_destination="com.redhat.RHSM1"
+             send_interface="com.redhat.RHSM1.RegisterServer"/>
+ 
+@@ -65,5 +46,54 @@
+         <allow send_destination="com.redhat.RHSM1"
+             send_interface="org.freedesktop.DBus.ObjectManager"/>
+     </policy>
+-</busconfig>
+ 
++
++    <policy context="default">
++
++        <!--
++        Non-root users can execute only methods providing
++        information from files readable by non-root users.
++        -->
++
++        <allow send_destination="com.redhat.RHSM1"
++            send_interface="com.redhat.RHSM1.Entitlement"
++            send_member="GetStatus"/>
++
++        <allow send_destination="com.redhat.RHSM1"
++            send_interface="com.redhat.RHSM1.Products"
++            send_member="ListInstalledProducts"/>
++
++        <allow send_destination="com.redhat.RHSM1"
++            send_interface="com.redhat.RHSM1.Syspurpose"
++            send_member="GetSyspurpose"/>
++
++        <allow send_destination="com.redhat.RHSM1"
++            send_interface="com.redhat.RHSM1.Syspurpose"
++            send_member="GetSyspurposeStatus"/>
++
++        <allow send_destination="com.redhat.RHSM1"
++            send_interface="com.redhat.RHSM1.Config"
++            send_member="GetAll"/>
++
++        <allow send_destination="com.redhat.RHSM1"
++            send_interface="com.redhat.RHSM1.Config"
++            send_member="Get"/>
++
++        <!--
++        The UUID returned by following method is read
++        from consumer cert. Only this file is not
++        readable by non-root users.
++        -->
++        <allow send_destination="com.redhat.RHSM1"
++            send_interface="com.redhat.RHSM1.Consumer"
++            send_member="GetUuid"/>
++
++        <!-- Basic D-Bus API stuff -->
++        <allow send_destination="com.redhat.RHSM1"
++            send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="com.redhat.RHSM1"
++            send_interface="org.freedesktop.DBus.Properties"/>
++        <allow send_destination="com.redhat.RHSM1"
++            send_interface="org.freedesktop.DBus.ObjectManager"/>
++    </policy>
++</busconfig>
diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec
index 73142ac..133c742 100644
--- a/SPECS/subscription-manager.spec
+++ b/SPECS/subscription-manager.spec
@@ -245,7 +245,7 @@
 
 Name: subscription-manager
 Version: 1.28.36
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tools and libraries for subscription and repository management
 %if 0%{?suse_version}
 Group:   Productivity/Networking/System
@@ -402,6 +402,8 @@ BuildRequires: systemd
 Obsoletes: subscription-manager-plugin-container
 %endif
 
+Patch00001: 00001-fix-dbus-policy.patch
+
 %description
 The Subscription Manager package provides programs and libraries to allow users
 to manage subscriptions and yum repositories from the Red Hat entitlement
@@ -758,6 +760,8 @@ cloud metadata and signatures.
 %prep
 %setup -q
 
+%autopatch -p1
+
 %build
 make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
     LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \
@@ -1483,6 +1487,8 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Tue Aug 08 2023 Jiri Hnidek <jhnidek@redhat.com> 1.28.36-3
+- 2225442: Fix D-Bus policy (jhnidek@redhat.com)
 * Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.28.36-2
 - Rebuilt for MSVSphere 8.8