diff options
-rw-r--r-- | etc/profile-a-l/audacity.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/electron-hardened.inc.profile | 2 | ||||
-rw-r--r-- | etc/profile-a-l/frozen-bubble.profile | 2 | ||||
-rw-r--r-- | etc/profile-a-l/gnome-calculator.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/hasher-common.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/libreoffice.profile | 1 | ||||
-rw-r--r-- | etc/profile-m-z/transmission-common.profile | 1 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 7 | ||||
-rwxr-xr-x | test/sysutils/md5sum.exp | 21 | ||||
-rwxr-xr-x | test/sysutils/sha512sum.exp | 21 | ||||
-rwxr-xr-x | test/sysutils/sysutils.sh | 16 |
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 | ||
51 | private-bin audacity | 51 | private-bin audacity |
52 | private-dev | 52 | private-dev |
53 | private-etc @x11,gcrypt | ||
53 | private-tmp | 54 | private-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 |
10 | include chrome-common-hardened.inc.profile | 10 | include 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 | |||
22 | whitelist ${HOME}/.frozen-bubble | 22 | whitelist ${HOME}/.frozen-bubble |
23 | include whitelist-common.inc | 23 | include whitelist-common.inc |
24 | include whitelist-runuser-common.inc | 24 | include whitelist-runuser-common.inc |
25 | whitelist /usr/share/games | ||
25 | include whitelist-usr-share-common.inc | 26 | include whitelist-usr-share-common.inc |
26 | include whitelist-var-common.inc | 27 | include whitelist-var-common.inc |
27 | 28 | ||
@@ -42,6 +43,7 @@ tracelog | |||
42 | disable-mnt | 43 | disable-mnt |
43 | # private-bin frozen-bubble | 44 | # private-bin frozen-bubble |
44 | private-dev | 45 | private-dev |
46 | private-etc @games,@x11 | ||
45 | private-tmp | 47 | private-tmp |
46 | 48 | ||
47 | dbus-user none | 49 | dbus-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 | |||
45 | private-bin gnome-calculator | 45 | private-bin gnome-calculator |
46 | private-cache | 46 | private-cache |
47 | private-dev | 47 | private-dev |
48 | private-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.* |
49 | private-tmp | 50 | private-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 |
50 | private-dev | 50 | private-dev |
51 | private-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 |
51 | private-cache | 51 | private-cache |
52 | private-dev | 52 | private-dev |
53 | private-etc @tls-ca,@x11,cups,gnupg,libreoffice,papersize,ssh | ||
53 | private-tmp | 54 | private-tmp |
54 | 55 | ||
55 | dbus-system none | 56 | dbus-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 | ||
45 | private-cache | 45 | private-cache |
46 | private-dev | 46 | private-dev |
47 | private-etc @tls-ca,@x11 | ||
47 | private-tmp | 48 | private-tmp |
48 | 49 | ||
49 | dbus-user none | 50 | dbus-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 | |||
519 | mattermost-desktop | 519 | mattermost-desktop |
520 | mcabber | 520 | mcabber |
521 | mcomix | 521 | mcomix |
522 | md5sum | ||
522 | mediainfo | 523 | mediainfo |
523 | mediathekview | 524 | mediathekview |
524 | megaglest | 525 | megaglest |
@@ -736,6 +737,11 @@ seahorse-tool | |||
736 | seamonkey | 737 | seamonkey |
737 | seamonkey-bin | 738 | seamonkey-bin |
738 | secret-tool | 739 | secret-tool |
740 | sha1sum | ||
741 | sha224sum | ||
742 | sha256sum | ||
743 | sha348sum | ||
744 | sha512sum | ||
739 | shellcheck | 745 | shellcheck |
740 | shortwave | 746 | shortwave |
741 | shotcut | 747 | shotcut |
@@ -775,6 +781,7 @@ straw-viewer | |||
775 | strings | 781 | strings |
776 | studio.sh | 782 | studio.sh |
777 | subdownloader | 783 | subdownloader |
784 | sum | ||
778 | supertux2 | 785 | supertux2 |
779 | supertuxkart | 786 | supertuxkart |
780 | surf | 787 | surf |
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 | |||
6 | set timeout 10 | ||
7 | spawn $env(SHELL) | ||
8 | match_max 100000 | ||
9 | |||
10 | send -- "firejail md5sum ../../COPYING\r" | ||
11 | expect { | ||
12 | timeout {puts "TESTING ERROR 0\n";exit} | ||
13 | "b234ee" | ||
14 | } | ||
15 | expect { | ||
16 | timeout {puts "TESTING ERROR 1\n";exit} | ||
17 | "COPYING" | ||
18 | } | ||
19 | |||
20 | after 500 | ||
21 | puts "\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 | |||
6 | set timeout 10 | ||
7 | spawn $env(SHELL) | ||
8 | match_max 100000 | ||
9 | |||
10 | send -- "firejail sha512sum ../../COPYING\r" | ||
11 | expect { | ||
12 | timeout {puts "TESTING ERROR 0\n";exit} | ||
13 | "aee80b1f" | ||
14 | } | ||
15 | expect { | ||
16 | timeout {puts "TESTING ERROR 1\n";exit} | ||
17 | "COPYING" | ||
18 | } | ||
19 | |||
20 | after 500 | ||
21 | puts "\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 | |||
7 | export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) | 7 | export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) |
8 | export LC_ALL=C | 8 | export LC_ALL=C |
9 | 9 | ||
10 | if command -v md5sum | ||
11 | then | ||
12 | echo "TESTING: md5sum" | ||
13 | ./md5sum.exp | ||
14 | else | ||
15 | echo "TESTING SKIP: md5sum not found" | ||
16 | fi | ||
17 | |||
18 | if command -v sha512sum | ||
19 | then | ||
20 | echo "TESTING: sha512sum" | ||
21 | ./sha512sum.exp | ||
22 | else | ||
23 | echo "TESTING SKIP: sha512sum not found" | ||
24 | fi | ||
25 | |||
10 | if command -v cpio | 26 | if command -v cpio |
11 | then | 27 | then |
12 | echo "TESTING: cpio" | 28 | echo "TESTING: cpio" |