From a410f347a36393206057e5a910e86c618947094d Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Thu, 13 Feb 2025 12:46:12 -0800
Subject: [PATCH] aa-notify: rename polkit files and template info from
 com.ubuntu

We should be using apparmor controlled domains for these files.

Rename the template file from
  com.ubuntu.pkexec.aa-notify.policy
to
  net.apparmor.pkexec.aa-notify.policy

And update the template file and the install file so that the files
that are generated use net.apparmor instead of com.ubuntu

Signed-off-by: John Johansen <john.johansen@canonical.com>
---
 ...a-notify.policy => net.apparmor.pkexec.aa-notify.policy} | 6 +++---
 utils/python-tools-setup.py                                 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename utils/{com.ubuntu.pkexec.aa-notify.policy => net.apparmor.pkexec.aa-notify.policy} (91%)

diff --git a/utils/com.ubuntu.pkexec.aa-notify.policy b/utils/net.apparmor.pkexec.aa-notify.policy
similarity index 91%
rename from utils/com.ubuntu.pkexec.aa-notify.policy
rename to utils/net.apparmor.pkexec.aa-notify.policy
index 8920a2962..98aee8a76 100644
--- a/utils/com.ubuntu.pkexec.aa-notify.policy
+++ b/utils/net.apparmor.pkexec.aa-notify.policy
@@ -4,7 +4,7 @@
   "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
 <policyconfig>
 
-  <action id="com.ubuntu.pkexec.aa-notify.modify_profile">
+  <action id="net.apparmor.pkexec.aa-notify.modify_profile">
     <description>AppArmor: modifying security profile</description>
     <message>To modify an AppArmor security profile, you need to authenticate.</message>
     <defaults>
@@ -15,7 +15,7 @@
     <annotate key="org.freedesktop.policykit.exec.path">{LIB_PATH}apparmor/update_profile.py</annotate>
     <annotate key="org.freedesktop.policykit.exec.argv1">add_rule</annotate>
   </action>
-  <action id="com.ubuntu.pkexec.aa-notify.create_userns">
+  <action id="net.apparmor.pkexec.aa-notify.create_userns">
     <description>AppArmor: adding userns profile</description>
     <message>To allow a program to use unprivileged user namespaces, you need to authenticate.</message>
     <defaults>
@@ -26,7 +26,7 @@
     <annotate key="org.freedesktop.policykit.exec.path">{LIB_PATH}apparmor/update_profile.py</annotate>
     <annotate key="org.freedesktop.policykit.exec.argv1">create_userns</annotate>
   </action>
-  <action id="com.ubuntu.pkexec.aa-notify.from_file">
+  <action id="net.apparmor.pkexec.aa-notify.from_file">
     <description>AppArmor: Modifying profile from file</description>
     <message>To modify an AppArmor security profile from file, you need to authenticate.</message>
     <defaults>
diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py
index 3f42ee38a..5c3966b36 100644
--- a/utils/python-tools-setup.py
+++ b/utils/python-tools-setup.py
@@ -68,7 +68,7 @@ class Install(_install):
         print('changing mode of {} to 755'.format(update_profile_path))
         os.chmod(update_profile_path, 0o755)
 
-        pkexec_action_name = 'com.ubuntu.pkexec.aa-notify.policy'
+        pkexec_action_name = 'net.apparmor.pkexec.aa-notify.policy'
         print('Installing {} to /usr/share/polkit-1/actions/ mode 644'.format(pkexec_action_name))
         with open(pkexec_action_name, 'r') as f:
             polkit_template = f.read()