Merge branch 'main' of github.com:roddhjav/apparmor.d

* 'main' of github.com:roddhjav/apparmor.d:
  fix(systemd-oomd): add `app.slice` and `session.slice` paths
  polkit-kde-authentication-agent update (#345)
  add multiple profiles (#341)
This commit is contained in:
Alexandre Pujol 2024-06-03 19:06:35 +01:00
commit 951bf6a840
No known key found for this signature in database
GPG Key ID: C5469996F0DF68EC
10 changed files with 104 additions and 12 deletions

View File

@ -9,7 +9,7 @@ include <tunables/global>
@{exec_path} = @{lib}/@{multiarch}/{,libexec/}polkit-kde-authentication-agent-[0-9] @{exec_path} = @{lib}/@{multiarch}/{,libexec/}polkit-kde-authentication-agent-[0-9]
@{exec_path} += @{lib}/polkit-kde-authentication-agent-[0-9] @{exec_path} += @{lib}/polkit-kde-authentication-agent-[0-9]
profile polkit-kde-authentication-agent @{exec_path} flags=(attach_disconnected) { profile polkit-kde-authentication-agent @{exec_path} flags=(attach_disconnected,mediate_deleted) {
include <abstractions/base> include <abstractions/base>
include <abstractions/consoles> include <abstractions/consoles>
include <abstractions/fontconfig-cache-read> include <abstractions/fontconfig-cache-read>
@ -34,9 +34,14 @@ profile polkit-kde-authentication-agent @{exec_path} flags=(attach_disconnected)
/var/lib/dbus/machine-id r, /var/lib/dbus/machine-id r,
owner @{user_config_dirs}/breezerc r, owner @{user_config_dirs}/breezerc r,
owner @{user_config_dirs}/kdedefaults/plasmarc r,
owner @{user_cache_dirs}/icon-cache.kcache rw, owner @{user_cache_dirs}/icon-cache.kcache rw,
owner @{user_cache_dirs}/polkit-kde-authentication-agent-@{int}/ rw,
owner @{user_cache_dirs}/polkit-kde-authentication-agent-@{int}/** rwk,
owner link @{user_cache_dirs}/polkit-kde-authentication-agent-@{int}/** -> @{user_cache_dirs}/polkit-kde-authentication-agent-@{int}/**,
owner @{user_cache_dirs}/qtshadercache-*/* r,
owner @{tmp}/#@{int} rw, owner @{tmp}/#@{int} rw,
owner @{tmp}/polkit-kde-authentication-agent-[0-9].* rwl -> /tmp/#@{int}, owner @{tmp}/polkit-kde-authentication-agent-[0-9].* rwl -> /tmp/#@{int},
# owner /tmp/xauth_@{rand6} r, # owner /tmp/xauth_@{rand6} r,

View File

@ -32,6 +32,8 @@ profile systemd-oomd @{exec_path} flags=(attach_disconnected) {
@{sys}/fs/cgroup/cgroup.controllers r, @{sys}/fs/cgroup/cgroup.controllers r,
@{sys}/fs/cgroup/memory.pressure r, @{sys}/fs/cgroup/memory.pressure r,
@{sys}/fs/cgroup/user.slice/user-@{uid}.slice/user@@{uid}.service/memory.* r, @{sys}/fs/cgroup/user.slice/user-@{uid}.slice/user@@{uid}.service/memory.* r,
@{sys}/fs/cgroup/user.slice/user-@{uid}.slice/user@@{uid}.service/app.slice/memory.* r,
@{sys}/fs/cgroup/user.slice/user-@{uid}.slice/user@@{uid}.service/session.slice/memory.* r,
@{PROC}/pressure/cpu r, @{PROC}/pressure/cpu r,
@{PROC}/pressure/io r, @{PROC}/pressure/io r,

View File

@ -0,0 +1,50 @@
# apparmor.d - Full set of apparmor profiles
# Copyright (C) 2024 valoq <valoq@mailbox.org>
# SPDX-License-Identifier: GPL-2.0-only
abi <abi/3.0>,
include <tunables/global>
@{exec_path} = @{bin}/atool
profile atool @{exec_path} {
include <abstractions/base>
include <abstractions/perl>
include <abstractions/user-write-strict>
@{exec_path} mr,
@{bin}/7z rix,
@{bin}/arc rix,
@{bin}/arj rix,
@{bin}/bzip2 rix,
@{bin}/bzip2 rix,
@{bin}/bzip rix,
@{bin}/compress rix,
@{bin}/cpio rix,
@{bin}/gunzip rix,
@{bin}/gzip rix,
@{bin}/gzip rix,
@{bin}/jar rix,
@{bin}/lha rix,
@{bin}/lrunzip rix,
@{bin}/lrzcat rix,
@{bin}/lrzip rix,
@{bin}/lrz rix,
@{bin}/lrztar rix,
@{bin}/lrzuntar rix,
@{bin}/lzip rix,
@{bin}/lzma rix,
@{bin}/lzop rix,
@{bin}/lzop rix,
@{bin}/rar rix,
@{bin}/tar rix,
@{bin}/unace rix,
@{bin}/unrar rix,
@{bin}/unxz rix,
@{bin}/unzip rix,
@{bin}/xz rix,
@{bin}/zip rix,
include if exists <local/atool>
}

View File

@ -0,0 +1,18 @@
# apparmor.d - Full set of apparmor profiles
# Copyright (C) 2024 valoq <valoq@mailbox.org>
# SPDX-License-Identifier: GPL-2.0-only
abi <abi/3.0>,
include <tunables/global>
@{exec_path} = @{bin}/vendor_perl/exiftool
profile exiftool @{exec_path} {
include <abstractions/base>
include <abstractions/perl>
include <abstractions/user-read-strict>
@{exec_path} mr,
include if exists <local/exiftool>
}

View File

@ -0,0 +1,22 @@
# apparmor.d - Full set of apparmor profiles
# Copyright (C) 2024 valoq <valoq@mailbox.org>
# SPDX-License-Identifier: GPL-2.0-only
abi <abi/3.0>,
include <tunables/global>
@{exec_path} = @{bin}/highlight
profile highlight @{exec_path} {
include <abstractions/base>
include <abstractions/nameservice-strict>
include <abstractions/user-read-strict>
@{exec_path} mr,
/etc/machine-id r,
/etc/highlight/{,**} r,
/usr/share/highlight/{,**} r,
include if exists <local/highlight>
}

View File

@ -1,5 +1,5 @@
# apparmor.d - Full set of apparmor profiles # apparmor.d - Full set of apparmor profiles
# Copyright (C) 2021-2024 Alexandre Pujol <alexandre@pujol.io> # Copyright (C) 2024 valoq <valoq@mailbox.org>
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
abi <abi/3.0>, abi <abi/3.0>,

View File

@ -10,12 +10,9 @@ include <tunables/global>
@{exec_path} = @{bin}/mediainfo @{exec_path} = @{bin}/mediainfo
profile mediainfo @{exec_path} { profile mediainfo @{exec_path} {
include <abstractions/base> include <abstractions/base>
include <abstractions/user-download-strict> include <abstractions/user-read-strict>
@{exec_path} mr, @{exec_path} mr,
owner @{user_music_dirs}/** r,
owner @{user_videos_dirs}/** r,
include if exists <local/mediainfo> include if exists <local/mediainfo>
} }

View File

@ -15,14 +15,12 @@ profile mediainfo-gui @{exec_path} {
include <abstractions/fonts> include <abstractions/fonts>
include <abstractions/freedesktop.org> include <abstractions/freedesktop.org>
include <abstractions/gtk> include <abstractions/gtk>
include <abstractions/user-download-strict> include <abstractions/user-read-strict>
@{exec_path} mr, @{exec_path} mr,
@{bin}/xdg-open rCx -> open, @{bin}/xdg-open rCx -> open,
owner @{user_music_dirs}/** r,
owner @{user_videos_dirs}/** r,
profile open { profile open {
include <abstractions/base> include <abstractions/base>

View File

@ -1,5 +1,5 @@
# apparmor.d - Full set of apparmor profiles # apparmor.d - Full set of apparmor profiles
# Copyright (C) 2021-2024 Alexandre Pujol <alexandre@pujol.io> # Copyright (C) 2024 valoq <valoq@mailbox.org>
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
abi <abi/3.0>, abi <abi/3.0>,

View File

@ -269,7 +269,7 @@ plasmashell attach_disconnected,mediate_deleted,complain
plymouth complain plymouth complain
plymouth-set-default-theme attach_disconnected,complain plymouth-set-default-theme attach_disconnected,complain
plymouthd complain plymouthd complain
polkit-kde-authentication-agent attach_disconnected,complain polkit-kde-authentication-agent attach_disconnected,complain,mediate_deleted
qdbus complain qdbus complain
realmd complain realmd complain
remmina complain remmina complain