Skip to contentSkip to conversation

dbus: Fix name of polkit function

PATCH Superseded Petr Lautrbach 2 participants 6 messages Jan 31, 2019 – Feb 10, 2019 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dbus: Fix name of polkit function

From: Dan Walsh <[email protected]>

---
 dbus/org.selinux.policy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
dbus/org.selinux.policy +3 -3
index 01266102..9772127b 100644
@@ -70,9 +70,9 @@
 	  <allow_active>auth_admin_keep</allow_active>
         </defaults>
     </action>
-    <action id="org.selinux.change_policy_type">
-        <description>SELinux write access</description>
-        <message>System policy prevents change_policy_type access to SELinux</message>
+    <action id="org.selinux.change_default_mode">
+        <description>Change SELinux default enforcing mode</description>
+        <message>System policy prevents change_default_policy access to SELinux</message>
         <defaults>
           <allow_any>no</allow_any>
           <allow_inactive>no</allow_inactive>
Signature · 1 line
2.20.1
#1 lore raw
Quoted 4 lines · Petr Lautrbach

From: Dan Walsh <[email protected]>

Hi,
As I am unfamiliar with D-Bus code, I try to understand what is the nature of this change (is-it a bugfix, an improvement, something else?). Here are the facts:

- Currently, dbus/selinux_server.py uses « @slip.dbus.polkit.require_auth("org.selinux.change_default_mode") » for function « change_default_mode ».
- "org.selinux.change_default_mode" does not exist, and I do not know whether that means that some kind of default policykit policy gets applied.
- "org.selinux.change_policy_type" is defined in dbus/org.selinux.policy, without any user.
- The commit that introduced dbus/selinux_server.py (commit e6a1298e5421 ("These are massive changes involved in building new GUI.")) added a function named « change_default_mode », without any specific policykit access checking.
- Commit e8718ef51463 ("Make sure we do the polkit check on all dbus interfaces.") added « @slip.dbus.polkit.require_auth("org.selinux.change_default_mode") » in policycoreutils/sepolicy/selinux_server.py.

If I understand correctly, this last commit is buggy and should have added "org.selinux.change_default_mode" to policycoreutils/sepolicy/org.selinux.policy. Therefore this new patch fixes a bug and removes an unused policykit action. Is this right? If yes, I suggest adding this to the commit description:

Add missing action org.selinux.change_default_mode for
change_default_mode() and remove unused action org.selinux.change_policy_type.

Fixes e8718ef51463 ("Make sure we do the polkit check on all dbus

interfaces.")

Would this be acceptable?

Thanks,
Nicolas

Quoted 24 lines
---
 dbus/org.selinux.policy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
dbus/org.selinux.policy +3 -4
index 01266102..9772127b 100644
@@ -70,9 +70,9 @@
          <allow_active>auth_admin_keep</allow_active>
         </defaults>
     </action>
-    <action id="org.selinux.change_policy_type">
-        <description>SELinux write access</description>
-        <message>System policy prevents change_policy_type access to SELinux</message>
+    <action id="org.selinux.change_default_mode">
+        <description>Change SELinux default enforcing mode</description>
+        <message>System policy prevents change_default_policy access to SELinux</message>
         <defaults>
           <allow_any>no</allow_any>
           <allow_inactive>no</allow_inactive>
--

2.20.1

#2 lore raw
Quoted 42 lines · Nicolas Iooss
Quoted 4 lines · Petr Lautrbach

From: Dan Walsh <[email protected]>

Hi,
As I am unfamiliar with D-Bus code, I try to understand what is the nature of this change (is-it a bugfix, an improvement, something else?). Here are the facts:

- Currently, dbus/selinux_server.py uses « @slip.dbus.polkit.require_auth("org.selinux.change_default_mode") »
for function « change_default_mode ».
- "org.selinux.change_default_mode" does not exist, and I do not know
whether that means that some kind of default policykit policy gets applied.
- "org.selinux.change_policy_type" is defined in dbus/org.selinux.policy, without any user.
- The commit that introduced dbus/selinux_server.py (commit e6a1298e5421 ("These are massive changes involved in building new GUI.")) added a function named « change_default_mode », without any specific policykit access checking.
- Commit e8718ef51463 ("Make sure we do the polkit check on all dbus
interfaces.") added « @slip.dbus.polkit.require_auth("org.selinux.change_default_mode") » in
policycoreutils/sepolicy/selinux_server.py.

If I understand correctly, this last commit is buggy and should have added "org.selinux.change_default_mode" to policycoreutils/sepolicy/org.selinux.policy. Therefore this new patch fixes a bug and removes an unused policykit action. Is this right? If yes, I suggest adding this to the commit description:

Add missing action org.selinux.change_default_mode for
change_default_mode() and remove unused action org.selinux.change_policy_type.

Quoted 5 lines
Fixes e8718ef51463 ("Make sure we do the polkit check on

all dbus
interfaces.")

Would this be acceptable?

You are completely right and the new message makes sense. I'll resend the patch with updated commit message.

Thanks!

Quoted 28 lines
Quoted 28 lines
---
 dbus/org.selinux.policy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
dbus/org.selinux.policy +0 -3
index 01266102..9772127b 100644
@@ -70,9 +70,9 @@
          <allow_active>auth_admin_keep</allow_active>
         </defaults>
     </action>
-    <action id="org.selinux.change_policy_type">
-        <description>SELinux write access</description>
-        <message>System policy prevents change_policy_type 

access to SELinux</message>

dbus/org.selinux.policy +2 -0
+    <action id="org.selinux.change_default_mode">
+        <description>Change SELinux default enforcing 

mode</description>
+ <message>System policy prevents change_default_policy
access to SELinux</message>

         <defaults>
           <allow_any>no</allow_any>
           <allow_inactive>no</allow_inactive>

--
2.20.1

#3 lore raw

PATCH v2 1/1 dbus: Fix name of polkit function

From: Dan Walsh <[email protected]>

Add missing action org.selinux.change_default_mode for change_default_mode() and remove unused action org.selinux.change_policy_type.

Fixes e8718ef51463 ("Make sure we do the polkit check on all dbus interfaces.")
---
 dbus/org.selinux.policy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
dbus/org.selinux.policy +3 -3
index 01266102..9772127b 100644
@@ -70,9 +70,9 @@
 	  <allow_active>auth_admin_keep</allow_active>
         </defaults>
     </action>
-    <action id="org.selinux.change_policy_type">
-        <description>SELinux write access</description>
-        <message>System policy prevents change_policy_type access to SELinux</message>
+    <action id="org.selinux.change_default_mode">
+        <description>Change SELinux default enforcing mode</description>
+        <message>System policy prevents change_default_policy access to SELinux</message>
         <defaults>
           <allow_any>no</allow_any>
           <allow_inactive>no</allow_inactive>
Signature · 1 line
2.20.1
Acked-by on v2 1/1
#4 lore raw
Quoted 9 lines · Petr Lautrbach

From: Dan Walsh <[email protected]>

Add missing action org.selinux.change_default_mode for change_default_mode() and remove unused action org.selinux.change_policy_type.

Fixes e8718ef51463 ("Make sure we do the polkit check on all dbus interfaces.")
Quoted 24 lines
---
 dbus/org.selinux.policy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
dbus/org.selinux.policy +3 -4
index 01266102..9772127b 100644
@@ -70,9 +70,9 @@
          <allow_active>auth_admin_keep</allow_active>
         </defaults>
     </action>
-    <action id="org.selinux.change_policy_type">
-        <description>SELinux write access</description>
-        <message>System policy prevents change_policy_type access to SELinux</message>
+    <action id="org.selinux.change_default_mode">
+        <description>Change SELinux default enforcing mode</description>
+        <message>System policy prevents change_default_policy access to SELinux</message>
         <defaults>
           <allow_any>no</allow_any>
           <allow_inactive>no</allow_inactive>
--

2.20.1

#5 lore raw
Quoted 5 lines · Nicolas Iooss
Quoted 3 lines · Petr Lautrbach

From: Dan Walsh <[email protected]>

Quoted 8 lines
Quoted 6 lines

Add missing action org.selinux.change_default_mode for change_default_mode() and remove unused action org.selinux.change_policy_type.

Fixes e8718ef51463 ("Make sure we do the polkit check on all dbus interfaces.")

Merged.

Nicolas

Quoted 24 lines
Quoted 24 lines
---
 dbus/org.selinux.policy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
dbus/org.selinux.policy +3 -4
index 01266102..9772127b 100644
@@ -70,9 +70,9 @@
          <allow_active>auth_admin_keep</allow_active>
         </defaults>
     </action>
-    <action id="org.selinux.change_policy_type">
-        <description>SELinux write access</description>
-        <message>System policy prevents change_policy_type access to SELinux</message>
+    <action id="org.selinux.change_default_mode">
+        <description>Change SELinux default enforcing mode</description>
+        <message>System policy prevents change_default_policy access to SELinux</message>
         <defaults>
           <allow_any>no</allow_any>
           <allow_inactive>no</allow_inactive>
--

2.20.1