removed action name from schema, added PolicyKit policy to IPA role policy converter

2 files changed, 46 insertions, 71 deletions

diff --git a/policykit_roles/PKpolicy2IPArole.xslt b/policykit_roles/PKpolicy2IPArole.xslt
new file mode 100644
index 0000000..6fdf44f
--- /dev/null
+++ b/policykit_roles/PKpolicy2IPArole.xslt
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+
+  <xsl:param name="role_name"/>
+
+  <xsl:output method="xml" indent="yes"/>
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+    <xsl:apply-templates select="policyconfig"/>
+  </xsl:template>
+
+  <xsl:template match="policyconfig">
+    <iparole>
+    <role>
+    <name>
+    <xsl:value-of select="$role_name"/>
+    </name>
+    <xsl:apply-templates select="action"/>
+    </role>
+    </iparole>
+  </xsl:template>
+
+  <xsl:template match="action">
+    <action>
+    <action_id>
+    <xsl:value-of select="@id"/>
+    </action_id>
+    <allow_any>
+    <xsl:value-of select="allow_any"/>
+    </allow_any>
+    <allow_inactive>
+    <xsl:value-of select="allow_inactive"/>
+    </allow_inactive>
+    <allow_active>
+    <xsl:value-of select="allow_active"/>
+    </allow_active>
+    </action>
+  </xsl:template>
+   
+</xsl:stylesheet>
diff --git a/policykit_roles/policykit_roles.rng b/policykit_roles/policykit_roles.rng
index 204e9a9..aa8897d 100644
--- a/policykit_roles/policykit_roles.rng
+++ b/policykit_roles/policykit_roles.rng
@@ -34,77 +34,9 @@ xmlns:pa="http://freeipa.org/xml/rng/ns/plugable_architecture/1.0">
               <element name="action">
                 <choice>
                   <element name="action_id">
-                    <choice>
-                      <value>org.freedesktop.consolekit.system.stop</value>
-                      <value>org.freedesktop.consolekit.system.stop-multiple-users</value>
-                      <value>org.freedesktop.consolekit.system.restart</value>
-                      <value>org.freedesktop.consolekit.system.restart-multiple-users</value>
-                      <value>org.freedesktop.hal.device-access.sound</value>
-                      <value>org.freedesktop.hal.device-access.video4linux</value>
-                      <value>org.freedesktop.hal.device-access.cdrom</value>
-                      <value>org.freedesktop.hal.device-access.dvb</value>
-                      <value>org.freedesktop.hal.device-access.camera</value>
-                      <value>org.freedesktop.hal.device-access.scanner</value>
-                      <value>org.freedesktop.hal.device-access.audio-player</value>
-                      <value>org.freedesktop.hal.device-access.ieee1394-iidc</value>
-                      <value>org.freedesktop.hal.device-access.ieee1394-avc</value>
-                      <value>org.freedesktop.hal.device-access.pda</value>
-                      <value>org.freedesktop.hal.dockstation.undock</value>
-                      <value>org.freedesktop.hal.killswitch.bluetooth</value>
-                      <value>org.freedesktop.hal.killswitch.wlan</value>
-                      <value>org.freedesktop.hal.killswitch.wwan</value>
-                      <value>org.freedesktop.hal.lock</value>
-                      <value>org.freedesktop.hal.power-management.shutdown</value>
-                      <value>org.freedesktop.hal.power-management.shutdown-multiple-sessions</value>
-                      <value>org.freedesktop.hal.power-management.reboot</value>
-                      <value>org.freedesktop.hal.power-management.reboot-multiple-sessions</value>
-                      <value>org.freedesktop.hal.power-management.set-powersave</value>
-                      <value>org.freedesktop.hal.power-management.suspend</value>
-                      <value>org.freedesktop.hal.power-management.hibernate</value>
-                      <value>org.freedesktop.hal.power-management.cpufreq</value>
-                      <value>org.freedesktop.hal.power-management.lcd-panel</value>
-                      <value>org.freedesktop.hal.power-management.light-sensor</value>
-                      <value>org.freedesktop.hal.power-management.keyboard-backlight</value>
-                      <value>org.freedesktop.hal.storage.mount-fixed</value>
-                      <value>org.freedesktop.hal.storage.mount-removable</value>
-                      <value>org.freedesktop.hal.storage.unmount-others</value>
-                      <value>org.freedesktop.hal.storage.eject</value>
-                      <value>org.freedesktop.hal.storage.crypto-setup-fixed</value>
-                      <value>org.freedesktop.hal.storage.crypto-setup-removable</value>
-                      <value>org.freedesktop.hal.wol.enabled</value>
-                      <value>org.freedesktop.hal.wol.enable</value>
-                      <value>org.freedesktop.hal.wol.supported</value>
-                      <value>org.freedesktop.network-manager-settings.system.modify</value>
-                      <value>org.freedesktop.packagekit.install</value>
-                      <value>org.freedesktop.packagekit.localinstall-untrusted</value>
-                      <value>org.freedesktop.packagekit.localinstall-trusted</value>
-                      <value>org.freedesktop.packagekit.install-signature</value>
-                      <value>org.freedesktop.packagekit.accept-eula</value>
-                      <value>org.freedesktop.packagekit.update-package</value>
-                      <value>org.freedesktop.packagekit.remove</value>
-                      <value>org.freedesktop.packagekit.update-system</value>
-                      <value>org.freedesktop.packagekit.rollback</value>
-                      <value>org.freedesktop.packagekit.repo-change</value>
-                      <value>org.freedesktop.packagekit.refresh-cache</value>
-                      <value>org.freedesktop.packagekit.set-proxy</value>
-                      <value>org.freedesktop.policykit.read</value>
-                      <value>org.freedesktop.policykit.revoke</value>
-                      <value>org.freedesktop.policykit.grant</value>
-                      <value>org.freedesktop.policykit.modify-defaults</value>
-                      <value>org.gnome.clockapplet.mechanism.settimezone</value>
-                      <value>org.gnome.clockapplet.mechanism.settime</value>
-                      <value>org.gnome.clockapplet.mechanism.configurehwclock</value>
-                      <value>org.gnome.system-monitor.change-priority</value>
-                      <value>org.gnome.system-monitor.increase-own-priority</value>
-                      <value>org.gnome.system-monitor.kill</value>
-                      <value>org.libvirt.unix.monitor</value>
-                      <value>org.libvirt.unix.manage</value>
-                      <value>org.pulseaudio.acquire-real-time</value>
-                      <value>org.pulseaudio.acquire-high-priority</value>
-                    </choice>
-                  </element>
-                  <element name="action_id_free">
-                    <text/>
+                    <data type="string">
+                      <param name="pattern">[a-z][a-z0-9.-]*</param>
+                    </data>
                   </element>
                 </choice>
                 <element name="allow_any">