2 files changed, 38 insertions, 1 deletions

diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index e997598af..e8ec20273 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -57,6 +57,7 @@ atril-previewer
 atril-thumbnailer
 audacious
 audacity
+audio-recorder
 authenticator
 autokey-gtk
 autokey-qt
@@ -82,6 +83,10 @@ brackets
 brasero
 brave
 brave-browser
+brave-browser-beta
+brave-browser-dev
+brave-browser-nightly
+brave-browser-stable
 bunzip2
 bzcat
 bzflag
@@ -96,6 +101,7 @@ calligraplanwork
 calligrasheets
 calligrastage
 calligrawords
+cameramonitor
 cantata
 catfish
 celluloid
@@ -132,6 +138,7 @@ cvlc
 cyberfox
 darktable
 dconf-editor
+ddgtk
 deadbeef
 deluge
 devhelp
@@ -151,10 +158,12 @@ dooble
 dooble-qt4
 dosbox
 dragon
+drawio
 dropbox
 d-feet
 easystroke
 ebook-viewer
+electron-mail
 electrum
 elinks
 empathy
@@ -167,6 +176,7 @@ enox
 enpass
 eog
 eom
+ephemeral
 #epiphany
 etr
 evince
@@ -222,16 +232,20 @@ geary
 gedit
 geekbench
 geeqie
+gfeeds
 ghb
 ghostwriter
 gimp
 gimp-2.10
 gimp-2.8
+gist
+gist-paste
 gitg
 github-desktop
 gitter
 gjs
 globaltime
+gmpc
 gnome-2048
 gnome-books
 gnome-builder
@@ -445,9 +459,12 @@ odt2txt
 oggsplt
 okular
 onionshare-gui
+ooffice
+ooviewdoc
 open-invaders
 openarena
 opencity
+openoffice.org
 openshot
 openshot-qt
 openttd
@@ -482,6 +499,7 @@ pngquant
 polari
 ppsspp
 pragha
+profanity
 psi-plus
 pybitmessage
 # pycharm-community - FB note: may enable later
@@ -627,6 +645,7 @@ udiskie
 uefitool
 uget-gtk
 unbound
+unf
 unknown-horizons
 unzstd
 utox
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 3f5921322..9a2efebd2 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -443,15 +443,33 @@ int main(int argc, char **argv) {
         // set new symlinks based on /usr/lib/firejail/firecfg.cfg
         set_links_firecfg();
 
-        // add user to firejail access database - only for root
         if (getuid() == 0) {
+                // add user to firejail access database - only for root
                 printf("\nAdding user %s to Firejail access database in %s/firejail.users\n", user, SYSCONFDIR);
                 // temporarily set the umask, access database must be world-readable
                 mode_t orig_umask = umask(022);
                 firejail_user_add(user);
                 umask(orig_umask);
+
+#ifdef HAVE_APPARMOR
+                // enable firejail apparmor profile
+                struct stat s;
+                if (stat("/sbin/apparmor_parser", &s) == 0) {
+                        char *cmd;
+
+                        // SYSCONFDIR points to /etc/firejail, we have to go on level up (..)
+                        printf("\nLoading AppArmor profile\n");
+                        if (asprintf(&cmd, "/sbin/apparmor_parser -r /etc/apparmor.d/firejail-default %s/../apparmor.d/firejail-default", SYSCONFDIR) == -1)
+                                errExit("asprintf");
+                        int rv = system(cmd);
+                        (void) rv;
+                        free(cmd);
+                }
+#endif
         }
 
+
+
         // set new symlinks based on ~/.config/firejail directory
         set_links_homedir(home);