Fix issues with AppArmor profile

MilesBHuff · May 2, 2021 · f1818e5 · f1818e5
1 parent 6701177
commit f1818e5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/application/Cargo.toml b/application/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ambient-kb"
-version = "1.4.1"
+version = "1.4.2"
 license = "LAGPL3"
 authors = ["Miles B Huff <MilesBHuff@Users.NoReply.Github.com>"]
 description = "Calculates the average color of the display, and sets the keyboard to that color."

diff --git a/configuration/apparmor/get-capabilities.sh b/configuration/apparmor/get-capabilities.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec capsh --print | grep Bounding | sed 's/^Bounding set *= */,/' | sed 's/,cap_/\ncapability /g' | grep capability | sort | sed 's/$/,/gm'
diff --git a/configuration/apparmor/usr.bin.ambient-kb b/configuration/apparmor/usr.bin.ambient-kb
@@ -1,5 +1,6 @@
 # AppArmor policy for `ambient-kb`
 # Copyright © from 2021 by Miles B Huff per the terms of the GNU LAGPL 3.
+include <tunables/home>
 
 /usr/bin/ambient-kb {
 
@@ -12,9 +13,12 @@
 
   # Needed to access X display
   capability dac_read_search,
-  /home/*/.Xauthority r,
+  @{HOME}/.Xauthority r,
   /sys/devices/** rw, #WARN: Not a great setting;  but there's no way around this...
 
+  # Needed to set negative NICE levels
+  # capability sys_nice,
+
   # Keyboard controllers
   /sys/class/leds/system76_acpi::kbd_backlight/color w,
 }