aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2023-02-08 17:50:44 -0500
committerLibravatar netblue30 <netblue30@protonmail.com>2023-02-08 17:50:44 -0500
commit7176e6324d444b681b822f2a29c15d61c7f92677 (patch)
tree3a86a02ba87253be99886ff0f593ae300e2f9959
parentadding machine-id to x11 group (diff)
downloadfirejail-7176e6324d444b681b822f2a29c15d61c7f92677.tar.gz
firejail-7176e6324d444b681b822f2a29c15d61c7f92677.tar.zst
firejail-7176e6324d444b681b822f2a29c15d61c7f92677.zip
private-etc: libreoffice, audacity, forzen-bubble, transmission, md5sum/sha512sum, more sysutils testing, fix electron-hardened.inc.profile
-rw-r--r--etc/profile-a-l/audacity.profile1
-rw-r--r--etc/profile-a-l/electron-hardened.inc.profile2
-rw-r--r--etc/profile-a-l/frozen-bubble.profile2
-rw-r--r--etc/profile-a-l/gnome-calculator.profile1
-rw-r--r--etc/profile-a-l/hasher-common.profile1
-rw-r--r--etc/profile-a-l/libreoffice.profile1
-rw-r--r--etc/profile-m-z/transmission-common.profile1
-rw-r--r--src/firecfg/firecfg.config7
-rwxr-xr-xtest/sysutils/md5sum.exp21
-rwxr-xr-xtest/sysutils/sha512sum.exp21
-rwxr-xr-xtest/sysutils/sysutils.sh16
11 files changed, 73 insertions, 1 deletions
diff --git a/etc/profile-a-l/audacity.profile b/etc/profile-a-l/audacity.profile
index 371054728..fcac0137e 100644
--- a/etc/profile-a-l/audacity.profile
+++ b/etc/profile-a-l/audacity.profile
@@ -50,6 +50,7 @@ tracelog
50 50
51private-bin audacity 51private-bin audacity
52private-dev 52private-dev
53private-etc @x11,gcrypt
53private-tmp 54private-tmp
54 55
55# problems on Fedora 27 56# problems on Fedora 27
diff --git a/etc/profile-a-l/electron-hardened.inc.profile b/etc/profile-a-l/electron-hardened.inc.profile
index eacf5cebe..a9e1756d9 100644
--- a/etc/profile-a-l/electron-hardened.inc.profile
+++ b/etc/profile-a-l/electron-hardened.inc.profile
@@ -7,4 +7,4 @@ include electron-hardened.inc.local
7#include globals.local 7#include globals.local
8 8
9# Redirect 9# Redirect
10include chrome-common-hardened.inc.profile 10include chromium-common-hardened.inc.profile
diff --git a/etc/profile-a-l/frozen-bubble.profile b/etc/profile-a-l/frozen-bubble.profile
index 86a8a8fc6..f162a4a31 100644
--- a/etc/profile-a-l/frozen-bubble.profile
+++ b/etc/profile-a-l/frozen-bubble.profile
@@ -22,6 +22,7 @@ mkdir ${HOME}/.frozen-bubble
22whitelist ${HOME}/.frozen-bubble 22whitelist ${HOME}/.frozen-bubble
23include whitelist-common.inc 23include whitelist-common.inc
24include whitelist-runuser-common.inc 24include whitelist-runuser-common.inc
25whitelist /usr/share/games
25include whitelist-usr-share-common.inc 26include whitelist-usr-share-common.inc
26include whitelist-var-common.inc 27include whitelist-var-common.inc
27 28
@@ -42,6 +43,7 @@ tracelog
42disable-mnt 43disable-mnt
43# private-bin frozen-bubble 44# private-bin frozen-bubble
44private-dev 45private-dev
46private-etc @games,@x11
45private-tmp 47private-tmp
46 48
47dbus-user none 49dbus-user none
diff --git a/etc/profile-a-l/gnome-calculator.profile b/etc/profile-a-l/gnome-calculator.profile
index 3926146ff..e5c6022e8 100644
--- a/etc/profile-a-l/gnome-calculator.profile
+++ b/etc/profile-a-l/gnome-calculator.profile
@@ -45,6 +45,7 @@ disable-mnt
45private-bin gnome-calculator 45private-bin gnome-calculator
46private-cache 46private-cache
47private-dev 47private-dev
48private-etc @x11
48#private-lib gdk-pixbuf-2.*,gio,girepository-1.*,gvfs,libgconf-2.so.*,libgnutls.so.*,libproxy.so.*,librsvg-2.so.*,libxml2.so.* 49#private-lib gdk-pixbuf-2.*,gio,girepository-1.*,gvfs,libgconf-2.so.*,libgnutls.so.*,libproxy.so.*,librsvg-2.so.*,libxml2.so.*
49private-tmp 50private-tmp
50 51
diff --git a/etc/profile-a-l/hasher-common.profile b/etc/profile-a-l/hasher-common.profile
index fd8246aae..96e69d6cf 100644
--- a/etc/profile-a-l/hasher-common.profile
+++ b/etc/profile-a-l/hasher-common.profile
@@ -48,6 +48,7 @@ x11 none
48# Add the next line to your hasher-common.local if you don't need to hash files in ~/.cache. 48# Add the next line to your hasher-common.local if you don't need to hash files in ~/.cache.
49#private-cache 49#private-cache
50private-dev 50private-dev
51private-etc
51# Add the next line to your hasher-common.local if you don't need to hash files in /tmp. 52# Add the next line to your hasher-common.local if you don't need to hash files in /tmp.
52#private-tmp 53#private-tmp
53 54
diff --git a/etc/profile-a-l/libreoffice.profile b/etc/profile-a-l/libreoffice.profile
index 518928876..d7144d8c3 100644
--- a/etc/profile-a-l/libreoffice.profile
+++ b/etc/profile-a-l/libreoffice.profile
@@ -50,6 +50,7 @@ tracelog
50#private-bin libreoffice,sh,uname,dirname,grep,sed,basename,ls 50#private-bin libreoffice,sh,uname,dirname,grep,sed,basename,ls
51private-cache 51private-cache
52private-dev 52private-dev
53private-etc @tls-ca,@x11,cups,gnupg,libreoffice,papersize,ssh
53private-tmp 54private-tmp
54 55
55dbus-system none 56dbus-system none
diff --git a/etc/profile-m-z/transmission-common.profile b/etc/profile-m-z/transmission-common.profile
index 0a9029c97..d80eb708b 100644
--- a/etc/profile-m-z/transmission-common.profile
+++ b/etc/profile-m-z/transmission-common.profile
@@ -44,6 +44,7 @@ tracelog
44 44
45private-cache 45private-cache
46private-dev 46private-dev
47private-etc @tls-ca,@x11
47private-tmp 48private-tmp
48 49
49dbus-user none 50dbus-user none
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 793ec9a52..db73dd1f6 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -519,6 +519,7 @@ matrix-mirage
519mattermost-desktop 519mattermost-desktop
520mcabber 520mcabber
521mcomix 521mcomix
522md5sum
522mediainfo 523mediainfo
523mediathekview 524mediathekview
524megaglest 525megaglest
@@ -736,6 +737,11 @@ seahorse-tool
736seamonkey 737seamonkey
737seamonkey-bin 738seamonkey-bin
738secret-tool 739secret-tool
740sha1sum
741sha224sum
742sha256sum
743sha348sum
744sha512sum
739shellcheck 745shellcheck
740shortwave 746shortwave
741shotcut 747shotcut
@@ -775,6 +781,7 @@ straw-viewer
775strings 781strings
776studio.sh 782studio.sh
777subdownloader 783subdownloader
784sum
778supertux2 785supertux2
779supertuxkart 786supertuxkart
780surf 787surf
diff --git a/test/sysutils/md5sum.exp b/test/sysutils/md5sum.exp
new file mode 100755
index 000000000..ab2482808
--- /dev/null
+++ b/test/sysutils/md5sum.exp
@@ -0,0 +1,21 @@
1#!/usr/bin/expect -f
2# This file is part of Firejail project
3# Copyright (C) 2014-2022 Firejail Authors
4# License GPL v2
5
6set timeout 10
7spawn $env(SHELL)
8match_max 100000
9
10send -- "firejail md5sum ../../COPYING\r"
11expect {
12 timeout {puts "TESTING ERROR 0\n";exit}
13 "b234ee"
14}
15expect {
16 timeout {puts "TESTING ERROR 1\n";exit}
17 "COPYING"
18}
19
20after 500
21puts "\nall done\n"
diff --git a/test/sysutils/sha512sum.exp b/test/sysutils/sha512sum.exp
new file mode 100755
index 000000000..2a88fef83
--- /dev/null
+++ b/test/sysutils/sha512sum.exp
@@ -0,0 +1,21 @@
1#!/usr/bin/expect -f
2# This file is part of Firejail project
3# Copyright (C) 2014-2022 Firejail Authors
4# License GPL v2
5
6set timeout 10
7spawn $env(SHELL)
8match_max 100000
9
10send -- "firejail sha512sum ../../COPYING\r"
11expect {
12 timeout {puts "TESTING ERROR 0\n";exit}
13 "aee80b1f"
14}
15expect {
16 timeout {puts "TESTING ERROR 1\n";exit}
17 "COPYING"
18}
19
20after 500
21puts "\nall done\n"
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh
index a1aaa80a7..3c035c69c 100755
--- a/test/sysutils/sysutils.sh
+++ b/test/sysutils/sysutils.sh
@@ -7,6 +7,22 @@ export MALLOC_CHECK_=3
7export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) 7export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
8export LC_ALL=C 8export LC_ALL=C
9 9
10if command -v md5sum
11then
12 echo "TESTING: md5sum"
13 ./md5sum.exp
14else
15 echo "TESTING SKIP: md5sum not found"
16fi
17
18if command -v sha512sum
19then
20 echo "TESTING: sha512sum"
21 ./sha512sum.exp
22else
23 echo "TESTING SKIP: sha512sum not found"
24fi
25
10if command -v cpio 26if command -v cpio
11then 27then
12 echo "TESTING: cpio" 28 echo "TESTING: cpio"