diff options
426 files changed, 790 insertions, 820 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 555643b6f..c08d3b2e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -1,11 +1,12 @@ | |||
1 | # Basic notes: builds firejail on 5 different systems for 2 package systems: | 1 | # Basic notes: builds firejail on 5 different systems for 2 package systems: |
2 | # 1. Debian-based systems. Use debian:jessie to ensure reasonable backwards | 2 | # 1. Debian-based systems. Use debian:jessie to ensure reasonable backwards |
3 | # compat and ubuntu:latest for new setups | 3 | # compat and ubuntu:rolling for new setups |
4 | # 2. Redhat-based systems. Use centos:latest for reasonable backwards compat | 4 | # 2. Redhat-based systems. Use centos:latest for reasonable backwards compat |
5 | # and fedora:latest for new setups | 5 | # and fedora:latest for new setups |
6 | # 3. Alpine for installing directly from source | 6 | # 3. Alpine for installing directly from source |
7 | # Also builds apparmor package for Ubuntu LTS | ||
7 | build_ubuntu_package: | 8 | build_ubuntu_package: |
8 | image: ubuntu:latest | 9 | image: ubuntu:rolling |
9 | script: | 10 | script: |
10 | - apt-get update -qq | 11 | - apt-get update -qq |
11 | - apt-get install -y -qq build-essential lintian | 12 | - apt-get install -y -qq build-essential lintian |
@@ -39,3 +40,10 @@ build_src_package: | |||
39 | - apk upgrade | 40 | - apk upgrade |
40 | - apk add build-base linux-headers | 41 | - apk add build-base linux-headers |
41 | - ./configure --prefix=/usr && make && make install-strip | 42 | - ./configure --prefix=/usr && make && make install-strip |
43 | |||
44 | build_apparmor: | ||
45 | image: ubuntu:latest | ||
46 | script: | ||
47 | - apt-get update -qq | ||
48 | - apt-get install -y -qq build-essential lintian libapparmor-dev | ||
49 | - ./configure --prefix=/usr && make deb-apparmor && dpkg -i firejail-apparmor*.deb | ||
diff --git a/Makefile.in b/Makefile.in index cbcf252df..0cbbb374c 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -134,7 +134,8 @@ ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) | |||
134 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" | 134 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" |
135 | install -c -m 0644 etc/firejail-default $(DESTDIR)/$(sysconfdir)/apparmor.d/. | 135 | install -c -m 0644 etc/firejail-default $(DESTDIR)/$(sysconfdir)/apparmor.d/. |
136 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d/local ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d/local; fi;" | 136 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d/local ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d/local; fi;" |
137 | install -c -m 0644 etc/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/. | 137 | # install apparmor profile customization file |
138 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-local ]; then install -c -m 0644 etc/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/.; fi;" | ||
138 | endif | 139 | endif |
139 | # man pages | 140 | # man pages |
140 | install -m 0755 -d $(DESTDIR)/$(mandir)/man1 | 141 | install -m 0755 -d $(DESTDIR)/$(mandir)/man1 |
@@ -190,7 +191,7 @@ uninstall: | |||
190 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon | 191 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon |
191 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg | 192 | rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg |
192 | 193 | ||
193 | DISTFILES = "src etc platform contrib configure configure.ac dummy.c Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh COPYING README RELNOTES" | 194 | DISTFILES = "src etc platform contrib configure configure.ac dummy.c Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkdeb-apparmor.sh COPYING README RELNOTES" |
194 | DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils test/chroot" | 195 | DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils test/chroot" |
195 | 196 | ||
196 | dist: | 197 | dist: |
@@ -211,6 +212,9 @@ asc:; ./mkasc.sh $(VERSION) | |||
211 | deb: dist | 212 | deb: dist |
212 | ./mkdeb.sh $(NAME) $(VERSION) | 213 | ./mkdeb.sh $(NAME) $(VERSION) |
213 | 214 | ||
215 | deb-apparmor: dist | ||
216 | ./mkdeb-apparmor.sh $(NAME) $(VERSION) | ||
217 | |||
214 | snap: all | 218 | snap: all |
215 | cd platform/snap; ./snap.sh | 219 | cd platform/snap; ./snap.sh |
216 | 220 | ||
@@ -534,6 +534,7 @@ rusty-snake (https://github.com/rusty-snake) | |||
534 | - added ghostwriter profle | 534 | - added ghostwriter profle |
535 | - fix gajim profile, added gajim-history-manager profile | 535 | - fix gajim profile, added gajim-history-manager profile |
536 | - updates for ~/.cargo | 536 | - updates for ~/.cargo |
537 | - added klavaro profile | ||
537 | Salvo 'LtWorf' Tomaselli (https://github.com/ltworf) | 538 | Salvo 'LtWorf' Tomaselli (https://github.com/ltworf) |
538 | - fixed ktorrent profile | 539 | - fixed ktorrent profile |
539 | sarneaud (https://github.com/sarneaud) | 540 | sarneaud (https://github.com/sarneaud) |
@@ -743,4 +744,4 @@ Zack Weinberg (https://github.com/zackw) | |||
743 | with firejail --x11 | 744 | with firejail --x11 |
744 | - support for xpra-extra-params in firejail.config | 745 | - support for xpra-extra-params in firejail.config |
745 | 746 | ||
746 | Copyright (C) 2014-2017 Firejail Authors | 747 | Copyright (C) 2014-2019 Firejail Authors |
@@ -99,61 +99,6 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe | |||
99 | ````` | 99 | ````` |
100 | 100 | ||
101 | ````` | 101 | ````` |
102 | ## Current development version: 0.9.57 | 102 | ## Current development version: 0.9.59 |
103 | |||
104 | ## New Long Term Support (0.9.56-LTS) version released | ||
105 | |||
106 | The new version updates the code base to 0.9.56. We target a reduction of approx. 40% of the code by removing rarely | ||
107 | used features (chroot, overlay, rlimits, cgroups), incomplete features (private-bin, private-lib), | ||
108 | and a lot of instrumentation (build profile feature, tracing, auditing, etc). Sandbox-specific security features such as | ||
109 | seccomp, capabilities, filesystem whitelist/blacklist and networking are updated and hardened. | ||
110 | |||
111 | ````` | ||
112 | firejail (0.9.56-LTS) baseline; urgency=low | ||
113 | * code based on Firejail version 0.9.56 | ||
114 | * much smaller code base for SUID executable | ||
115 | * command line options removed: | ||
116 | --audit, --build, --cgroup, --chroot, --get, --ls, --output, | ||
117 | --output-stderr, --overlay, --overlay-named, --overlay-tmpfs, | ||
118 | --overlay-clean, --private-home, --private-bin, --private-etc, | ||
119 | --private-opt, --private-srv, --put, --rlimit*, --trace, --tracelog, | ||
120 | --x11*, --xephyr* | ||
121 | * compile-time options: --enable-apparmor, --disable-seccomp, | ||
122 | --disable-globalcfg, --disable-network, --disable-userns, | ||
123 | --disable-whitelist, --disable-suid, --enable-fatal-warnings, | ||
124 | --enable-busybox-workaround | ||
125 | -- netblue30 <netblue30@yahoo.com> Sun, 21 Oct 2018 08:00:00 -0500 | ||
126 | ````` | ||
127 | |||
128 | The new LTS branch is here: https://github.com/netblue30/firejail/tree/LTSbase | ||
129 | |||
130 | ## New commands: | ||
131 | ````` | ||
132 | --net.print=name|pid | ||
133 | If a new network namespace is enabled, print network interface | ||
134 | configuration for the sandbox specified by name or PID. Exam‐ | ||
135 | ple: | ||
136 | |||
137 | $ firejail --net.print=browser | ||
138 | Switching to pid 1853, the first child process inside the | ||
139 | sandbox | ||
140 | Interface MAC IP Mask Status | ||
141 | lo 127.0.0.1 255.0.0.0 UP | ||
142 | eth0-1852 5e:fb:8e:27:29:26 192.168.1.186 255.255.255.0 UP | ||
143 | ````` | ||
144 | 103 | ||
145 | ## New profiles: | 104 | ## New profiles: |
146 | |||
147 | ````` | ||
148 | $ ls etc/*.profile | wc -l | ||
149 | 608 | ||
150 | ````` | ||
151 | We have more than 600 application profiles on mainline! | ||
152 | |||
153 | |||
154 | QMediathekView, aria2c, Authenticator, checkbashisms, devilspie, devilspie2, easystroke, github-desktop, min, | ||
155 | bsdcat, bsdcpio, bsdtar, lzmadec, lbunzip2, lbzcat, lbzip2, lzcat, lzcmp, lzdiff, lzegrep, lzfgrep, lzgrep, | ||
156 | lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat, xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore, | ||
157 | lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh, nirtoshare-send, nitroshare-ui, mencoder, gnome-pie, | ||
158 | masterpdfeditor, QOwnNotes, aisleriot, Mendeley, feedreader, ocenaudio, mpsyt, | ||
159 | thunderbird-wayland, supertuxkart, ghostwriter, gajim-history-manager | ||
@@ -1,5 +1,13 @@ | |||
1 | firejail (0.9.58~rc1) baseline; urgency=low | 1 | firejail (0.9.58,2) baseline; urgency=low |
2 | * work in progress | 2 | * cgroup flag in /etc/firejail/firejail.config file |
3 | * name-change flag in /etc/firejail.config file | ||
4 | * --name rework | ||
5 | * new profiles: klavaro, vscodium | ||
6 | * browser profiles fixes | ||
7 | * various other bugfixes | ||
8 | -- netblue30 <netblue30@yahoo.com> Fri, 8 Feb 2019 08:00:00 -0500 | ||
9 | |||
10 | firejail (0.9.58) baseline; urgency=low | ||
3 | * --disable-mnt rework | 11 | * --disable-mnt rework |
4 | * --net.print command | 12 | * --net.print command |
5 | * GitLab CI/CD integration: disto specific builds | 13 | * GitLab CI/CD integration: disto specific builds |
@@ -18,7 +26,8 @@ firejail (0.9.58~rc1) baseline; urgency=low | |||
18 | * new profiles: masterpdfeditor, QOwnNotes, aisleriot, Mendeley | 26 | * new profiles: masterpdfeditor, QOwnNotes, aisleriot, Mendeley |
19 | * new profiles: feedreader, ocenaudio, mpsyt, thunderbird-wayland | 27 | * new profiles: feedreader, ocenaudio, mpsyt, thunderbird-wayland |
20 | * new profiles: supertuxkart, ghostwriter, gajim-history-manager | 28 | * new profiles: supertuxkart, ghostwriter, gajim-history-manager |
21 | -- netblue30 <netblue30@yahoo.com> Mon, 21 Jan 2019 08:00:00 -0500 | 29 | * bugfixes |
30 | -- netblue30 <netblue30@yahoo.com> Sat, 26 Jan 2019 08:00:00 -0500 | ||
22 | 31 | ||
23 | firejail (0.9.56) baseline; urgency=low | 32 | firejail (0.9.56) baseline; urgency=low |
24 | * modif: removed CFG_CHROOT_DESKTOP configuration option | 33 | * modif: removed CFG_CHROOT_DESKTOP configuration option |
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
3 | # Generated by GNU Autoconf 2.69 for firejail 0.9.58~rc1. | 3 | # Generated by GNU Autoconf 2.69 for firejail 0.9.59. |
4 | # | 4 | # |
5 | # Report bugs to <netblue30@yahoo.com>. | 5 | # Report bugs to <netblue30@yahoo.com>. |
6 | # | 6 | # |
@@ -580,8 +580,8 @@ MAKEFLAGS= | |||
580 | # Identity of this package. | 580 | # Identity of this package. |
581 | PACKAGE_NAME='firejail' | 581 | PACKAGE_NAME='firejail' |
582 | PACKAGE_TARNAME='firejail' | 582 | PACKAGE_TARNAME='firejail' |
583 | PACKAGE_VERSION='0.9.58~rc1' | 583 | PACKAGE_VERSION='0.9.59' |
584 | PACKAGE_STRING='firejail 0.9.58~rc1' | 584 | PACKAGE_STRING='firejail 0.9.59' |
585 | PACKAGE_BUGREPORT='netblue30@yahoo.com' | 585 | PACKAGE_BUGREPORT='netblue30@yahoo.com' |
586 | PACKAGE_URL='https://firejail.wordpress.com' | 586 | PACKAGE_URL='https://firejail.wordpress.com' |
587 | 587 | ||
@@ -1275,7 +1275,7 @@ if test "$ac_init_help" = "long"; then | |||
1275 | # Omit some internal or obsolete options to make the list less imposing. | 1275 | # Omit some internal or obsolete options to make the list less imposing. |
1276 | # This message is too long to be a string in the A/UX 3.1 sh. | 1276 | # This message is too long to be a string in the A/UX 3.1 sh. |
1277 | cat <<_ACEOF | 1277 | cat <<_ACEOF |
1278 | \`configure' configures firejail 0.9.58~rc1 to adapt to many kinds of systems. | 1278 | \`configure' configures firejail 0.9.59 to adapt to many kinds of systems. |
1279 | 1279 | ||
1280 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1280 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1281 | 1281 | ||
@@ -1337,7 +1337,7 @@ fi | |||
1337 | 1337 | ||
1338 | if test -n "$ac_init_help"; then | 1338 | if test -n "$ac_init_help"; then |
1339 | case $ac_init_help in | 1339 | case $ac_init_help in |
1340 | short | recursive ) echo "Configuration of firejail 0.9.58~rc1:";; | 1340 | short | recursive ) echo "Configuration of firejail 0.9.59:";; |
1341 | esac | 1341 | esac |
1342 | cat <<\_ACEOF | 1342 | cat <<\_ACEOF |
1343 | 1343 | ||
@@ -1442,7 +1442,7 @@ fi | |||
1442 | test -n "$ac_init_help" && exit $ac_status | 1442 | test -n "$ac_init_help" && exit $ac_status |
1443 | if $ac_init_version; then | 1443 | if $ac_init_version; then |
1444 | cat <<\_ACEOF | 1444 | cat <<\_ACEOF |
1445 | firejail configure 0.9.58~rc1 | 1445 | firejail configure 0.9.59 |
1446 | generated by GNU Autoconf 2.69 | 1446 | generated by GNU Autoconf 2.69 |
1447 | 1447 | ||
1448 | Copyright (C) 2012 Free Software Foundation, Inc. | 1448 | Copyright (C) 2012 Free Software Foundation, Inc. |
@@ -1744,7 +1744,7 @@ cat >config.log <<_ACEOF | |||
1744 | This file contains any messages produced by compilers while | 1744 | This file contains any messages produced by compilers while |
1745 | running configure, to aid debugging if configure makes a mistake. | 1745 | running configure, to aid debugging if configure makes a mistake. |
1746 | 1746 | ||
1747 | It was created by firejail $as_me 0.9.58~rc1, which was | 1747 | It was created by firejail $as_me 0.9.59, which was |
1748 | generated by GNU Autoconf 2.69. Invocation command line was | 1748 | generated by GNU Autoconf 2.69. Invocation command line was |
1749 | 1749 | ||
1750 | $ $0 $@ | 1750 | $ $0 $@ |
@@ -4379,7 +4379,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
4379 | # report actual input values of CONFIG_FILES etc. instead of their | 4379 | # report actual input values of CONFIG_FILES etc. instead of their |
4380 | # values after options handling. | 4380 | # values after options handling. |
4381 | ac_log=" | 4381 | ac_log=" |
4382 | This file was extended by firejail $as_me 0.9.58~rc1, which was | 4382 | This file was extended by firejail $as_me 0.9.59, which was |
4383 | generated by GNU Autoconf 2.69. Invocation command line was | 4383 | generated by GNU Autoconf 2.69. Invocation command line was |
4384 | 4384 | ||
4385 | CONFIG_FILES = $CONFIG_FILES | 4385 | CONFIG_FILES = $CONFIG_FILES |
@@ -4433,7 +4433,7 @@ _ACEOF | |||
4433 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 4433 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4434 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 4434 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4435 | ac_cs_version="\\ | 4435 | ac_cs_version="\\ |
4436 | firejail config.status 0.9.58~rc1 | 4436 | firejail config.status 0.9.59 |
4437 | configured by $0, generated by GNU Autoconf 2.69, | 4437 | configured by $0, generated by GNU Autoconf 2.69, |
4438 | with options \\"\$ac_cs_config\\" | 4438 | with options \\"\$ac_cs_config\\" |
4439 | 4439 | ||
diff --git a/configure.ac b/configure.ac index 25d559035..17faf5b30 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | AC_PREREQ([2.68]) | 1 | AC_PREREQ([2.68]) |
2 | AC_INIT(firejail, 0.9.58~rc1, netblue30@yahoo.com, , https://firejail.wordpress.com) | 2 | AC_INIT(firejail, 0.9.59, netblue30@yahoo.com, , https://firejail.wordpress.com) |
3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | 3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) |
4 | #AC_CONFIG_HEADERS([config.h]) | 4 | #AC_CONFIG_HEADERS([config.h]) |
5 | 5 | ||
diff --git a/etc-fixes/0.9.52/firefox.profile b/etc-fixes/0.9.52/firefox.profile index 6b19b14df..e3efada2c 100644 --- a/etc-fixes/0.9.52/firefox.profile +++ b/etc-fixes/0.9.52/firefox.profile | |||
@@ -24,6 +24,7 @@ noblacklist ${HOME}/.local/share/okular | |||
24 | noblacklist ${HOME}/.local/share/qpdfview | 24 | noblacklist ${HOME}/.local/share/qpdfview |
25 | noblacklist ${HOME}/.mozilla | 25 | noblacklist ${HOME}/.mozilla |
26 | noblacklist ${HOME}/.pki | 26 | noblacklist ${HOME}/.pki |
27 | noblacklist ${HOME}/.local/share/pki | ||
27 | 28 | ||
28 | include /etc/firejail/disable-common.inc | 29 | include /etc/firejail/disable-common.inc |
29 | include /etc/firejail/disable-devel.inc | 30 | include /etc/firejail/disable-devel.inc |
@@ -32,6 +33,7 @@ include /etc/firejail/disable-programs.inc | |||
32 | mkdir ${HOME}/.cache/mozilla/firefox | 33 | mkdir ${HOME}/.cache/mozilla/firefox |
33 | mkdir ${HOME}/.mozilla | 34 | mkdir ${HOME}/.mozilla |
34 | mkdir ${HOME}/.pki | 35 | mkdir ${HOME}/.pki |
36 | mkdir ${HOME}/.local/share/pki | ||
35 | whitelist ${DOWNLOADS} | 37 | whitelist ${DOWNLOADS} |
36 | whitelist ${HOME}/.cache/gnome-mplayer/plugin | 38 | whitelist ${HOME}/.cache/gnome-mplayer/plugin |
37 | whitelist ${HOME}/.cache/mozilla/firefox | 39 | whitelist ${HOME}/.cache/mozilla/firefox |
@@ -60,6 +62,7 @@ whitelist ${HOME}/.mozilla | |||
60 | whitelist ${HOME}/.pentadactyl | 62 | whitelist ${HOME}/.pentadactyl |
61 | whitelist ${HOME}/.pentadactylrc | 63 | whitelist ${HOME}/.pentadactylrc |
62 | whitelist ${HOME}/.pki | 64 | whitelist ${HOME}/.pki |
65 | whitelist ${HOME}/.local/share/pki | ||
63 | whitelist ${HOME}/.vimperator | 66 | whitelist ${HOME}/.vimperator |
64 | whitelist ${HOME}/.vimperatorrc | 67 | whitelist ${HOME}/.vimperatorrc |
65 | whitelist ${HOME}/.wine-pipelight | 68 | whitelist ${HOME}/.wine-pipelight |
diff --git a/etc/QMediathekView.profile b/etc/QMediathekView.profile index f969cd855..d988fd41a 100644 --- a/etc/QMediathekView.profile +++ b/etc/QMediathekView.profile | |||
@@ -17,12 +17,14 @@ noblacklist ${HOME}/.config/xplayer | |||
17 | noblacklist ${HOME}/.local/share/totem | 17 | noblacklist ${HOME}/.local/share/totem |
18 | noblacklist ${HOME}/.local/share/xplayer | 18 | noblacklist ${HOME}/.local/share/xplayer |
19 | noblacklist ${HOME}/.mplayer | 19 | noblacklist ${HOME}/.mplayer |
20 | noblacklist ${VIDEOS} | ||
20 | 21 | ||
21 | include disable-common.inc | 22 | include disable-common.inc |
22 | include disable-devel.inc | 23 | include disable-devel.inc |
23 | include disable-interpreters.inc | 24 | include disable-interpreters.inc |
24 | include disable-passwdmgr.inc | 25 | include disable-passwdmgr.inc |
25 | include disable-programs.inc | 26 | include disable-programs.inc |
27 | include disable-xdg.inc | ||
26 | 28 | ||
27 | include whitelist-var-common.inc | 29 | include whitelist-var-common.inc |
28 | 30 | ||
@@ -36,7 +38,7 @@ nonewprivs | |||
36 | noroot | 38 | noroot |
37 | notv | 39 | notv |
38 | nou2f | 40 | nou2f |
39 | protocol unix,inet,inet6 | 41 | protocol unix,inet,inet6,netlink |
40 | seccomp | 42 | seccomp |
41 | shell none | 43 | shell none |
42 | tracelog | 44 | tracelog |
diff --git a/etc/audacious.profile b/etc/audacious.profile index 93a2f4b3e..590d3ffa3 100644 --- a/etc/audacious.profile +++ b/etc/audacious.profile | |||
@@ -22,7 +22,7 @@ include whitelist-var-common.inc | |||
22 | apparmor | 22 | apparmor |
23 | caps.drop all | 23 | caps.drop all |
24 | netfilter | 24 | netfilter |
25 | nodbus | 25 | #nodbus - dbus needed for MPRIS |
26 | nogroups | 26 | nogroups |
27 | nonewprivs | 27 | nonewprivs |
28 | noroot | 28 | noroot |
@@ -35,6 +35,7 @@ shell none | |||
35 | tracelog | 35 | tracelog |
36 | 36 | ||
37 | # private-bin audacious | 37 | # private-bin audacious |
38 | private-cache | ||
38 | private-dev | 39 | private-dev |
39 | private-tmp | 40 | private-tmp |
40 | 41 | ||
diff --git a/etc/baloo_file.profile b/etc/baloo_file.profile index e094945b7..0d108ac13 100644 --- a/etc/baloo_file.profile +++ b/etc/baloo_file.profile | |||
@@ -26,6 +26,7 @@ include disable-programs.inc | |||
26 | include whitelist-var-common.inc | 26 | include whitelist-var-common.inc |
27 | 27 | ||
28 | caps.drop all | 28 | caps.drop all |
29 | netfilter | ||
29 | no3d | 30 | no3d |
30 | nodvd | 31 | nodvd |
31 | nogroups | 32 | nogroups |
@@ -42,6 +43,7 @@ shell none | |||
42 | # x11 xorg | 43 | # x11 xorg |
43 | 44 | ||
44 | private-bin baloo_file,baloo_file_extractor,baloo_filemetadata_temp_extractor,kbuildsycoca4 | 45 | private-bin baloo_file,baloo_file_extractor,baloo_filemetadata_temp_extractor,kbuildsycoca4 |
46 | private-cache | ||
45 | private-dev | 47 | private-dev |
46 | private-tmp | 48 | private-tmp |
47 | 49 | ||
diff --git a/etc/calligra.profile b/etc/calligra.profile index 84a60a196..7054739c8 100644 --- a/etc/calligra.profile +++ b/etc/calligra.profile | |||
@@ -15,6 +15,7 @@ include disable-programs.inc | |||
15 | caps.drop all | 15 | caps.drop all |
16 | ipc-namespace | 16 | ipc-namespace |
17 | # net none | 17 | # net none |
18 | netfilter | ||
18 | # nodbus | 19 | # nodbus |
19 | nodvd | 20 | nodvd |
20 | nogroups | 21 | nogroups |
diff --git a/etc/chromium-common.profile b/etc/chromium-common.profile index 13ed13058..a182e5d20 100644 --- a/etc/chromium-common.profile +++ b/etc/chromium-common.profile | |||
@@ -7,6 +7,7 @@ include chromium-common.local | |||
7 | #include globals.local | 7 | #include globals.local |
8 | 8 | ||
9 | noblacklist ${HOME}/.pki | 9 | noblacklist ${HOME}/.pki |
10 | noblacklist ${HOME}/.local/share/pki | ||
10 | 11 | ||
11 | include disable-common.inc | 12 | include disable-common.inc |
12 | include disable-devel.inc | 13 | include disable-devel.inc |
@@ -14,8 +15,10 @@ include disable-interpreters.inc | |||
14 | include disable-programs.inc | 15 | include disable-programs.inc |
15 | 16 | ||
16 | mkdir ${HOME}/.pki | 17 | mkdir ${HOME}/.pki |
18 | mkdir ${HOME}/.local/share/pki | ||
17 | whitelist ${DOWNLOADS} | 19 | whitelist ${DOWNLOADS} |
18 | whitelist ${HOME}/.pki | 20 | whitelist ${HOME}/.pki |
21 | whitelist ${HOME}/.local/share/pki | ||
19 | include whitelist-common.inc | 22 | include whitelist-common.inc |
20 | include whitelist-var-common.inc | 23 | include whitelist-var-common.inc |
21 | 24 | ||
@@ -34,7 +37,8 @@ disable-mnt | |||
34 | private-dev | 37 | private-dev |
35 | # private-tmp - problems with multiple browser sessions | 38 | # private-tmp - problems with multiple browser sessions |
36 | 39 | ||
37 | noexec ${HOME} | 40 | # breaks DRM binaries |
41 | #noexec ${HOME} | ||
38 | noexec /tmp | 42 | noexec /tmp |
39 | 43 | ||
40 | # the file dialog needs to work without d-bus | 44 | # the file dialog needs to work without d-bus |
diff --git a/etc/cliqz.profile b/etc/cliqz.profile index 70277f1ce..d0b8cc0ef 100644 --- a/etc/cliqz.profile +++ b/etc/cliqz.profile | |||
@@ -6,11 +6,14 @@ include cliqz.local | |||
6 | include globals.local | 6 | include globals.local |
7 | 7 | ||
8 | noblacklist ${HOME}/.cache/cliqz | 8 | noblacklist ${HOME}/.cache/cliqz |
9 | noblacklist ${HOME}/.cliqz | ||
9 | noblacklist ${HOME}/.config/cliqz | 10 | noblacklist ${HOME}/.config/cliqz |
10 | 11 | ||
11 | mkdir ${HOME}/.cache/cliqz | 12 | mkdir ${HOME}/.cache/cliqz |
13 | mkdir ${HOME}/.cliqz | ||
12 | mkdir ${HOME}/.config/cliqz | 14 | mkdir ${HOME}/.config/cliqz |
13 | whitelist ${HOME}/.cache/cliqz | 15 | whitelist ${HOME}/.cache/cliqz |
16 | whitelist ${HOME}/.cliqz | ||
14 | whitelist ${HOME}/.config/cliqz | 17 | whitelist ${HOME}/.config/cliqz |
15 | 18 | ||
16 | # private-etc must first be enabled in firefox-common.profile | 19 | # private-etc must first be enabled in firefox-common.profile |
diff --git a/etc/code.profile b/etc/code.profile index 6528b63ff..293308187 100644 --- a/etc/code.profile +++ b/etc/code.profile | |||
@@ -6,6 +6,7 @@ include code.local | |||
6 | include globals.local | 6 | include globals.local |
7 | 7 | ||
8 | noblacklist ${HOME}/.vscode | 8 | noblacklist ${HOME}/.vscode |
9 | noblacklist ${HOME}/.vscode-oss | ||
9 | noblacklist ${HOME}/.config/Code | 10 | noblacklist ${HOME}/.config/Code |
10 | 11 | ||
11 | include disable-common.inc | 12 | include disable-common.inc |
diff --git a/etc/disable-common.inc b/etc/disable-common.inc index 89c029a61..80ea918df 100644 --- a/etc/disable-common.inc +++ b/etc/disable-common.inc | |||
@@ -11,12 +11,15 @@ blacklist ${HOME}/.local/share/Trash | |||
11 | blacklist-nolog ${HOME}/.*_history | 11 | blacklist-nolog ${HOME}/.*_history |
12 | blacklist-nolog ${HOME}/.adobe | 12 | blacklist-nolog ${HOME}/.adobe |
13 | blacklist-nolog ${HOME}/.cache/greenclip* | 13 | blacklist-nolog ${HOME}/.cache/greenclip* |
14 | blacklist-nolog ${HOME}/.histfile | ||
14 | blacklist-nolog ${HOME}/.history | 15 | blacklist-nolog ${HOME}/.history |
15 | blacklist-nolog ${HOME}/.kde/share/apps/klipper | 16 | blacklist-nolog ${HOME}/.kde/share/apps/klipper |
16 | blacklist-nolog ${HOME}/.kde4/share/apps/klipper | 17 | blacklist-nolog ${HOME}/.kde4/share/apps/klipper |
17 | blacklist-nolog ${HOME}/.local/share/fish/fish_history | 18 | blacklist-nolog ${HOME}/.local/share/fish/fish_history |
18 | blacklist-nolog ${HOME}/.local/share/klipper | 19 | blacklist-nolog ${HOME}/.local/share/klipper |
19 | blacklist-nolog ${HOME}/.macromedia | 20 | blacklist-nolog ${HOME}/.macromedia |
21 | blacklist-nolog ${HOME}/.python-history | ||
22 | blacklist-nolog ${HOME}/.pythonhist | ||
20 | blacklist-nolog /tmp/clipmenu* | 23 | blacklist-nolog /tmp/clipmenu* |
21 | 24 | ||
22 | # X11 session autostart | 25 | # X11 session autostart |
@@ -304,6 +307,7 @@ blacklist ${HOME}/.muttrc | |||
304 | blacklist ${HOME}/.netrc | 307 | blacklist ${HOME}/.netrc |
305 | blacklist ${HOME}/.nyx | 308 | blacklist ${HOME}/.nyx |
306 | blacklist ${HOME}/.pki | 309 | blacklist ${HOME}/.pki |
310 | blacklist ${HOME}/.local/share/pki | ||
307 | blacklist ${HOME}/.smbcredentials | 311 | blacklist ${HOME}/.smbcredentials |
308 | blacklist ${HOME}/.ssh | 312 | blacklist ${HOME}/.ssh |
309 | blacklist ${HOME}/.vaults | 313 | blacklist ${HOME}/.vaults |
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc index 08438a165..32c3ddb07 100644 --- a/etc/disable-programs.inc +++ b/etc/disable-programs.inc | |||
@@ -28,6 +28,7 @@ blacklist ${HOME}/.Steampid | |||
28 | blacklist ${HOME}/.TelegramDesktop | 28 | blacklist ${HOME}/.TelegramDesktop |
29 | blacklist ${HOME}/.ViberPC | 29 | blacklist ${HOME}/.ViberPC |
30 | blacklist ${HOME}/.VirtualBox | 30 | blacklist ${HOME}/.VirtualBox |
31 | blacklist ${HOME}/.VSCodium | ||
31 | blacklist ${HOME}/.WebStorm* | 32 | blacklist ${HOME}/.WebStorm* |
32 | blacklist ${HOME}/.Wolfram Research | 33 | blacklist ${HOME}/.Wolfram Research |
33 | blacklist ${HOME}/.ZAP | 34 | blacklist ${HOME}/.ZAP |
@@ -46,6 +47,7 @@ blacklist ${HOME}/.audacity-data | |||
46 | blacklist ${HOME}/.bcast5 | 47 | blacklist ${HOME}/.bcast5 |
47 | blacklist ${HOME}/.bibletime | 48 | blacklist ${HOME}/.bibletime |
48 | blacklist ${HOME}/.claws-mail | 49 | blacklist ${HOME}/.claws-mail |
50 | blacklist ${HOME}/.cliqz | ||
49 | blacklist ${HOME}/.config/0ad | 51 | blacklist ${HOME}/.config/0ad |
50 | blacklist ${HOME}/.config/2048-qt | 52 | blacklist ${HOME}/.config/2048-qt |
51 | blacklist ${HOME}/.config/Atom | 53 | blacklist ${HOME}/.config/Atom |
@@ -175,6 +177,7 @@ blacklist ${HOME}/.config/katesyntaxhighlightingrc | |||
175 | blacklist ${HOME}/.config/katevirc | 177 | blacklist ${HOME}/.config/katevirc |
176 | blacklist ${HOME}/.config/kdenliverc | 178 | blacklist ${HOME}/.config/kdenliverc |
177 | blacklist ${HOME}/.config/kgetrc | 179 | blacklist ${HOME}/.config/kgetrc |
180 | blacklist ${HOME}/.config/klavaro | ||
178 | blacklist ${HOME}/.config/klipperrc | 181 | blacklist ${HOME}/.config/klipperrc |
179 | blacklist ${HOME}/.config/kmail2rc | 182 | blacklist ${HOME}/.config/kmail2rc |
180 | blacklist ${HOME}/.config/kmailsearchindexingrc | 183 | blacklist ${HOME}/.config/kmailsearchindexingrc |
@@ -376,6 +379,7 @@ blacklist ${HOME}/.kodi | |||
376 | blacklist ${HOME}/.linphone-history.db | 379 | blacklist ${HOME}/.linphone-history.db |
377 | blacklist ${HOME}/.linphonerc | 380 | blacklist ${HOME}/.linphonerc |
378 | blacklist ${HOME}/.lmmsrc.xml | 381 | blacklist ${HOME}/.lmmsrc.xml |
382 | blacklist ${HOME}/.local/lib/vivaldi | ||
379 | blacklist ${HOME}/.local/share/0ad | 383 | blacklist ${HOME}/.local/share/0ad |
380 | blacklist ${HOME}/.local/share/3909/PapersPlease | 384 | blacklist ${HOME}/.local/share/3909/PapersPlease |
381 | blacklist ${HOME}/.local/share/Empathy | 385 | blacklist ${HOME}/.local/share/Empathy |
@@ -430,6 +434,7 @@ blacklist ${HOME}/.local/share/kaffeine | |||
430 | blacklist ${HOME}/.local/share/kate | 434 | blacklist ${HOME}/.local/share/kate |
431 | blacklist ${HOME}/.local/share/kdenlive | 435 | blacklist ${HOME}/.local/share/kdenlive |
432 | blacklist ${HOME}/.local/share/kget | 436 | blacklist ${HOME}/.local/share/kget |
437 | blacklist ${HOME}/.local/share/klavaro | ||
433 | blacklist ${HOME}/.local/share/kmail2 | 438 | blacklist ${HOME}/.local/share/kmail2 |
434 | blacklist ${HOME}/.local/share/knotes | 439 | blacklist ${HOME}/.local/share/knotes |
435 | blacklist ${HOME}/.local/share/krita | 440 | blacklist ${HOME}/.local/share/krita |
@@ -538,6 +543,7 @@ blacklist ${HOME}/.w3m | |||
538 | blacklist ${HOME}/.warzone2100-3.* | 543 | blacklist ${HOME}/.warzone2100-3.* |
539 | blacklist ${HOME}/.waterfox | 544 | blacklist ${HOME}/.waterfox |
540 | blacklist ${HOME}/.weechat | 545 | blacklist ${HOME}/.weechat |
546 | blacklist ${HOME}/.wget-hsts | ||
541 | blacklist ${HOME}/.wgetrc | 547 | blacklist ${HOME}/.wgetrc |
542 | blacklist ${HOME}/.wine | 548 | blacklist ${HOME}/.wine |
543 | blacklist ${HOME}/.wireshark | 549 | blacklist ${HOME}/.wireshark |
diff --git a/etc/emacs.profile b/etc/emacs.profile index 06f1a6c53..0d87507df 100644 --- a/etc/emacs.profile +++ b/etc/emacs.profile | |||
@@ -10,6 +10,7 @@ noblacklist ${HOME}/.emacs | |||
10 | noblacklist ${HOME}/.emacs.d | 10 | noblacklist ${HOME}/.emacs.d |
11 | # uncomment the following line if you need gpg | 11 | # uncomment the following line if you need gpg |
12 | #noblacklist ${HOME}/.gnupg | 12 | #noblacklist ${HOME}/.gnupg |
13 | noblacklist ${HOME}/.python-history | ||
13 | 14 | ||
14 | include disable-common.inc | 15 | include disable-common.inc |
15 | include disable-passwdmgr.inc | 16 | include disable-passwdmgr.inc |
diff --git a/etc/evolution.profile b/etc/evolution.profile index 1cce0656c..96f7e0eb5 100644 --- a/etc/evolution.profile +++ b/etc/evolution.profile | |||
@@ -14,6 +14,7 @@ noblacklist ${HOME}/.config/evolution | |||
14 | noblacklist ${HOME}/.gnupg | 14 | noblacklist ${HOME}/.gnupg |
15 | noblacklist ${HOME}/.local/share/evolution | 15 | noblacklist ${HOME}/.local/share/evolution |
16 | noblacklist ${HOME}/.pki | 16 | noblacklist ${HOME}/.pki |
17 | noblacklist ${HOME}/.local/share/pki | ||
17 | 18 | ||
18 | include disable-common.inc | 19 | include disable-common.inc |
19 | include disable-devel.inc | 20 | include disable-devel.inc |
diff --git a/etc/firefox-common.profile b/etc/firefox-common.profile index ad8a0a0b7..7c65be7cb 100644 --- a/etc/firefox-common.profile +++ b/etc/firefox-common.profile | |||
@@ -10,6 +10,7 @@ include firefox-common.local | |||
10 | #include firefox-common-addons.inc | 10 | #include firefox-common-addons.inc |
11 | 11 | ||
12 | noblacklist ${HOME}/.pki | 12 | noblacklist ${HOME}/.pki |
13 | noblacklist ${HOME}/.local/share/pki | ||
13 | 14 | ||
14 | include disable-common.inc | 15 | include disable-common.inc |
15 | include disable-devel.inc | 16 | include disable-devel.inc |
@@ -17,8 +18,10 @@ include disable-interpreters.inc | |||
17 | include disable-programs.inc | 18 | include disable-programs.inc |
18 | 19 | ||
19 | mkdir ${HOME}/.pki | 20 | mkdir ${HOME}/.pki |
21 | mkdir ${HOME}/.local/share/pki | ||
20 | whitelist ${DOWNLOADS} | 22 | whitelist ${DOWNLOADS} |
21 | whitelist ${HOME}/.pki | 23 | whitelist ${HOME}/.pki |
24 | whitelist ${HOME}/.local/share/pki | ||
22 | include whitelist-common.inc | 25 | include whitelist-common.inc |
23 | include whitelist-var-common.inc | 26 | include whitelist-var-common.inc |
24 | 27 | ||
@@ -51,5 +54,6 @@ private-dev | |||
51 | #private-etc ca-certificates,ssl,machine-id,dconf,selinux,passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,xdg,gtk-2.0,gtk-3.0,X11,pango,fonts,mime.types,mailcap,asound.conf,pulse,pki,crypto-policies,ld.so.cache | 54 | #private-etc ca-certificates,ssl,machine-id,dconf,selinux,passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,xdg,gtk-2.0,gtk-3.0,X11,pango,fonts,mime.types,mailcap,asound.conf,pulse,pki,crypto-policies,ld.so.cache |
52 | private-tmp | 55 | private-tmp |
53 | 56 | ||
54 | noexec ${HOME} | 57 | # breaks DRM binaries |
58 | #noexec ${HOME} | ||
55 | noexec /tmp | 59 | noexec /tmp |
diff --git a/etc/firejail-default b/etc/firejail-default index 88bf9aa44..02a241c34 100644 --- a/etc/firejail-default +++ b/etc/firejail-default | |||
@@ -21,10 +21,13 @@ profile firejail-default flags=(attach_disconnected,mediate_deleted) { | |||
21 | dbus, | 21 | dbus, |
22 | 22 | ||
23 | ########## | 23 | ########## |
24 | # With ptrace it is possible to inspect and hijack running programs. Usually this | 24 | # With ptrace it is possible to inspect and hijack running programs. |
25 | # is needed only for debugging. To allow ptrace, uncomment the following line. | 25 | # Some browsers are also using ptrace for their sandboxing. |
26 | ########## | 26 | ########## |
27 | # Uncomment this line to allow all ptrace access | ||
27 | #ptrace, | 28 | #ptrace, |
29 | # Allow obtaining some process information, but not ptrace(2) | ||
30 | ptrace (read,readby) peer=firejail-default, | ||
28 | 31 | ||
29 | ########## | 32 | ########## |
30 | # Allow read access to whole filesystem and control it from firejail. | 33 | # Allow read access to whole filesystem and control it from firejail. |
diff --git a/etc/firejail-local b/etc/firejail-local index cddf44f13..f086653f8 100644 --- a/etc/firejail-local +++ b/etc/firejail-local | |||
@@ -1 +1,2 @@ | |||
1 | # Site-specific additions and overrides for 'firejail-default' | 1 | # Site-specific additions and overrides for 'firejail-default'. |
2 | # For more details, please see /etc/apparmor.d/local/README. | ||
diff --git a/etc/firejail.config b/etc/firejail.config index 00f2c1b5d..b37edf7a5 100644 --- a/etc/firejail.config +++ b/etc/firejail.config | |||
@@ -18,6 +18,9 @@ | |||
18 | # Enable or disable bind support, default enabled. | 18 | # Enable or disable bind support, default enabled. |
19 | # bind yes | 19 | # bind yes |
20 | 20 | ||
21 | # Enable or disable cgroup support, default enabled. | ||
22 | # cgroup yes | ||
23 | |||
21 | # Enable or disable chroot support, default enabled. | 24 | # Enable or disable chroot support, default enabled. |
22 | # chroot yes | 25 | # chroot yes |
23 | 26 | ||
@@ -51,6 +54,9 @@ | |||
51 | # root user can always join sandboxes. | 54 | # root user can always join sandboxes. |
52 | # join yes | 55 | # join yes |
53 | 56 | ||
57 | # Enable or disable sandbox name change, default enabled. | ||
58 | # name-change yes | ||
59 | |||
54 | # Enable or disable networking features, default enabled. | 60 | # Enable or disable networking features, default enabled. |
55 | # network yes | 61 | # network yes |
56 | 62 | ||
diff --git a/etc/franz.profile b/etc/franz.profile index 5ce8954c4..d6445ff8e 100644 --- a/etc/franz.profile +++ b/etc/franz.profile | |||
@@ -8,6 +8,7 @@ include globals.local | |||
8 | noblacklist ${HOME}/.cache/Franz | 8 | noblacklist ${HOME}/.cache/Franz |
9 | noblacklist ${HOME}/.config/Franz | 9 | noblacklist ${HOME}/.config/Franz |
10 | noblacklist ${HOME}/.pki | 10 | noblacklist ${HOME}/.pki |
11 | noblacklist ${HOME}/.local/share/pki | ||
11 | 12 | ||
12 | include disable-common.inc | 13 | include disable-common.inc |
13 | include disable-devel.inc | 14 | include disable-devel.inc |
@@ -17,10 +18,12 @@ include disable-programs.inc | |||
17 | mkdir ${HOME}/.cache/Franz | 18 | mkdir ${HOME}/.cache/Franz |
18 | mkdir ${HOME}/.config/Franz | 19 | mkdir ${HOME}/.config/Franz |
19 | mkdir ${HOME}/.pki | 20 | mkdir ${HOME}/.pki |
21 | mkdir ${HOME}/.local/share/pki | ||
20 | whitelist ${DOWNLOADS} | 22 | whitelist ${DOWNLOADS} |
21 | whitelist ${HOME}/.cache/Franz | 23 | whitelist ${HOME}/.cache/Franz |
22 | whitelist ${HOME}/.config/Franz | 24 | whitelist ${HOME}/.config/Franz |
23 | whitelist ${HOME}/.pki | 25 | whitelist ${HOME}/.pki |
26 | whitelist ${HOME}/.local/share/pki | ||
24 | include whitelist-common.inc | 27 | include whitelist-common.inc |
25 | 28 | ||
26 | caps.drop all | 29 | caps.drop all |
diff --git a/etc/geany.profile b/etc/geany.profile index a236ea2c5..a21e19329 100644 --- a/etc/geany.profile +++ b/etc/geany.profile | |||
@@ -7,6 +7,7 @@ include geany.local | |||
7 | include globals.local | 7 | include globals.local |
8 | 8 | ||
9 | noblacklist ${HOME}/.config/geany | 9 | noblacklist ${HOME}/.config/geany |
10 | noblacklist ${HOME}/.python-history | ||
10 | 11 | ||
11 | include disable-common.inc | 12 | include disable-common.inc |
12 | include disable-passwdmgr.inc | 13 | include disable-passwdmgr.inc |
diff --git a/etc/gedit.profile b/etc/gedit.profile index d537f1294..af0a3da56 100644 --- a/etc/gedit.profile +++ b/etc/gedit.profile | |||
@@ -9,6 +9,7 @@ include globals.local | |||
9 | noblacklist ${HOME}/.config/enchant | 9 | noblacklist ${HOME}/.config/enchant |
10 | noblacklist ${HOME}/.config/gedit | 10 | noblacklist ${HOME}/.config/gedit |
11 | noblacklist ${HOME}/.gitconfig | 11 | noblacklist ${HOME}/.gitconfig |
12 | noblacklist ${HOME}/.python-history | ||
12 | 13 | ||
13 | include disable-common.inc | 14 | include disable-common.inc |
14 | # include disable-devel.inc | 15 | # include disable-devel.inc |
diff --git a/etc/gnome-builder.profile b/etc/gnome-builder.profile index d497440f0..05ebea80c 100644 --- a/etc/gnome-builder.profile +++ b/etc/gnome-builder.profile | |||
@@ -8,6 +8,7 @@ include globals.local | |||
8 | 8 | ||
9 | noblacklist ${HOME}/.cargo/config | 9 | noblacklist ${HOME}/.cargo/config |
10 | noblacklist ${HOME}/.cargo/registry | 10 | noblacklist ${HOME}/.cargo/registry |
11 | noblacklist ${HOME}/.python-history | ||
11 | 12 | ||
12 | include disable-common.inc | 13 | include disable-common.inc |
13 | include disable-passwdmgr.inc | 14 | include disable-passwdmgr.inc |
diff --git a/etc/gnome-maps.profile b/etc/gnome-maps.profile index d27d90d29..2d2f5aa6d 100644 --- a/etc/gnome-maps.profile +++ b/etc/gnome-maps.profile | |||
@@ -9,6 +9,7 @@ include globals.local | |||
9 | # when gjs apps are started via gnome-shell, firejail is not applied because systemd will start them | 9 | # when gjs apps are started via gnome-shell, firejail is not applied because systemd will start them |
10 | 10 | ||
11 | noblacklist ${HOME}/.cache/champlain | 11 | noblacklist ${HOME}/.cache/champlain |
12 | noblacklist ${HOME}/.local/share/flatpak | ||
12 | 13 | ||
13 | include disable-common.inc | 14 | include disable-common.inc |
14 | include disable-devel.inc | 15 | include disable-devel.inc |
diff --git a/etc/gwenview.profile b/etc/gwenview.profile index 6deabbd8b..e90578333 100644 --- a/etc/gwenview.profile +++ b/etc/gwenview.profile | |||
@@ -28,6 +28,7 @@ include whitelist-var-common.inc | |||
28 | apparmor | 28 | apparmor |
29 | caps.drop all | 29 | caps.drop all |
30 | # net none | 30 | # net none |
31 | netfilter | ||
31 | # nodbus | 32 | # nodbus |
32 | nodvd | 33 | nodvd |
33 | nogroups | 34 | nogroups |
diff --git a/etc/k3b.profile b/etc/k3b.profile index 8c599d0ca..60da458ab 100644 --- a/etc/k3b.profile +++ b/etc/k3b.profile | |||
@@ -21,6 +21,7 @@ include disable-xdg.inc | |||
21 | include whitelist-var-common.inc | 21 | include whitelist-var-common.inc |
22 | 22 | ||
23 | caps.drop all | 23 | caps.drop all |
24 | netfilter | ||
24 | no3d | 25 | no3d |
25 | nonewprivs | 26 | nonewprivs |
26 | noroot | 27 | noroot |
diff --git a/etc/keepassxc.profile b/etc/keepassxc.profile index 053344cc2..448f5455f 100644 --- a/etc/keepassxc.profile +++ b/etc/keepassxc.profile | |||
@@ -36,7 +36,7 @@ nosound | |||
36 | notv | 36 | notv |
37 | nou2f | 37 | nou2f |
38 | novideo | 38 | novideo |
39 | protocol unix | 39 | protocol netlink,unix |
40 | seccomp | 40 | seccomp |
41 | shell none | 41 | shell none |
42 | 42 | ||
@@ -46,9 +46,9 @@ private-etc fonts,ld.so.cache,machine-id | |||
46 | private-tmp | 46 | private-tmp |
47 | 47 | ||
48 | # 2.2.4 crashes on database open | 48 | # 2.2.4 crashes on database open |
49 | #memory-deny-write-execute | 49 | # memory-deny-write-execute |
50 | noexec ${HOME} | 50 | noexec ${HOME} |
51 | noexec /tmp | 51 | # noexec /tmp |
52 | 52 | ||
53 | # Mutex is stored in /tmp by default, which is broken by private-tmp | 53 | # Mutex is stored in /tmp by default, which is broken by private-tmp |
54 | join-or-start keepassxc | 54 | join-or-start keepassxc |
diff --git a/etc/klavaro.profile b/etc/klavaro.profile new file mode 100644 index 000000000..890cde3db --- /dev/null +++ b/etc/klavaro.profile | |||
@@ -0,0 +1,55 @@ | |||
1 | # Firejail profile for klavaro | ||
2 | # Description: Yet another touch typing tutor | ||
3 | # This file is overwritten after every install/update | ||
4 | # Persistent local customizations | ||
5 | include klavaro.local | ||
6 | # Persistent global definitions | ||
7 | include globals.local | ||
8 | |||
9 | noblacklist ${HOME}/.config/klavaro | ||
10 | noblacklist ${HOME}/.local/share/klavaro | ||
11 | |||
12 | include disable-common.inc | ||
13 | include disable-devel.inc | ||
14 | include disable-interpreters.inc | ||
15 | include disable-passwdmgr.inc | ||
16 | include disable-programs.inc | ||
17 | include disable-xdg.inc | ||
18 | |||
19 | mkdir ${HOME}/.local/share/klavaro | ||
20 | mkdir ${HOME}/.config/klavaro | ||
21 | whitelist ${HOME}/.local/share/klavaro | ||
22 | whitelist ${HOME}/.config/klavaro | ||
23 | include whitelist-common.inc | ||
24 | include whitelist-var-common.inc | ||
25 | |||
26 | apparmor | ||
27 | caps.drop all | ||
28 | machine-id | ||
29 | net none | ||
30 | no3d | ||
31 | nodbus | ||
32 | nodvd | ||
33 | nogroups | ||
34 | nonewprivs | ||
35 | noroot | ||
36 | notv | ||
37 | nou2f | ||
38 | novideo | ||
39 | protocol unix | ||
40 | seccomp | ||
41 | shell none | ||
42 | tracelog | ||
43 | |||
44 | disable-mnt | ||
45 | private-bin klavaro,tclsh,tclsh*,bash | ||
46 | private-cache | ||
47 | private-dev | ||
48 | private-etc fonts | ||
49 | private-tmp | ||
50 | private-opt none | ||
51 | private-srv none | ||
52 | |||
53 | memory-deny-write-execute | ||
54 | noexec ${HOME} | ||
55 | noexec /tmp | ||
diff --git a/etc/kodi.profile b/etc/kodi.profile index 197f70bfd..303310591 100644 --- a/etc/kodi.profile +++ b/etc/kodi.profile | |||
@@ -34,12 +34,13 @@ nonewprivs | |||
34 | noroot | 34 | noroot |
35 | nou2f | 35 | nou2f |
36 | protocol unix,inet,inet6,netlink | 36 | protocol unix,inet,inet6,netlink |
37 | seccomp.drop _sysctl,acct,add_key,adjtimex,afs_syscall,bdflush,bpf,break,chroot,clock_adjtime,clock_settime,create_module,delete_module,fanotify_init,finit_module,ftime,get_kernel_syms,getpmsg,gtty,init_module,io_cancel,io_destroy,io_getevents,io_setup,io_submit,ioperm,iopl,ioprio_set,kcmp,kexec_file_load,kexec_load,keyctl,lock,lookup_dcookie,mbind,migrate_pages,modify_ldt,mount,move_pages,mpx,name_to_handle_at,nfsservctl,ni_syscall,open_by_handle_at,pciconfig_iobase,pciconfig_read,pciconfig_write,perf_event_open,personality,pivot_root,process_vm_readv,process_vm_writev,prof,profil,ptrace,putpmsg,query_module,reboot,remap_file_pages,request_key,rtas,s390_mmio_read,s390_mmio_write,s390_runtime_instr,security,set_mempolicy,setdomainname,sethostname,settimeofday,sgetmask,ssetmask,stime,stty,subpage_prot,swapoff,swapon,switch_endian,sys_debug_setcontext,sysfs,syslog,tuxcall,ulimit,umount,umount2,uselib,userfaultfd,ustat,vhangup,vm86,vm86old,vmsplice,vserver | 37 | seccomp |
38 | shell none | 38 | shell none |
39 | tracelog | 39 | tracelog |
40 | 40 | ||
41 | private-dev | 41 | private-dev |
42 | private-tmp | 42 | private-tmp |
43 | 43 | ||
44 | noexec ${HOME} | 44 | # breaks plugins |
45 | #noexec ${HOME} | ||
45 | noexec /tmp | 46 | noexec /tmp |
diff --git a/etc/konversation.profile b/etc/konversation.profile index aead198b0..03c51ccce 100644 --- a/etc/konversation.profile +++ b/etc/konversation.profile | |||
@@ -15,6 +15,7 @@ include disable-devel.inc | |||
15 | include disable-interpreters.inc | 15 | include disable-interpreters.inc |
16 | include disable-passwdmgr.inc | 16 | include disable-passwdmgr.inc |
17 | include disable-programs.inc | 17 | include disable-programs.inc |
18 | include disable-xdg.inc | ||
18 | 19 | ||
19 | include whitelist-var-common.inc | 20 | include whitelist-var-common.inc |
20 | 21 | ||
@@ -33,6 +34,7 @@ shell none | |||
33 | tracelog | 34 | tracelog |
34 | 35 | ||
35 | private-bin konversation,kbuildsycoca4 | 36 | private-bin konversation,kbuildsycoca4 |
37 | private-cache | ||
36 | private-dev | 38 | private-dev |
37 | private-tmp | 39 | private-tmp |
38 | 40 | ||
diff --git a/etc/krita.profile b/etc/krita.profile index bd02522f6..3313106a2 100644 --- a/etc/krita.profile +++ b/etc/krita.profile | |||
@@ -28,6 +28,7 @@ apparmor | |||
28 | caps.drop all | 28 | caps.drop all |
29 | ipc-namespace | 29 | ipc-namespace |
30 | # net none | 30 | # net none |
31 | netfilter | ||
31 | # nodbus | 32 | # nodbus |
32 | nodvd | 33 | nodvd |
33 | nogroups | 34 | nogroups |
diff --git a/etc/kwin_x11.profile b/etc/kwin_x11.profile index 4cb489577..653283150 100644 --- a/etc/kwin_x11.profile +++ b/etc/kwin_x11.profile | |||
@@ -15,6 +15,7 @@ include disable-devel.inc | |||
15 | include disable-interpreters.inc | 15 | include disable-interpreters.inc |
16 | include disable-passwdmgr.inc | 16 | include disable-passwdmgr.inc |
17 | include disable-programs.inc | 17 | include disable-programs.inc |
18 | include disable-xdg.inc | ||
18 | 19 | ||
19 | include whitelist-var-common.inc | 20 | include whitelist-var-common.inc |
20 | 21 | ||
diff --git a/etc/mediathekview.profile b/etc/mediathekview.profile index 06e140990..a438634f3 100644 --- a/etc/mediathekview.profile +++ b/etc/mediathekview.profile | |||
@@ -16,6 +16,7 @@ noblacklist ${HOME}/.local/share/totem | |||
16 | noblacklist ${HOME}/.local/share/xplayer | 16 | noblacklist ${HOME}/.local/share/xplayer |
17 | noblacklist ${HOME}/.mediathek3 | 17 | noblacklist ${HOME}/.mediathek3 |
18 | noblacklist ${HOME}/.mplayer | 18 | noblacklist ${HOME}/.mplayer |
19 | noblacklist ${VIDEOS} | ||
19 | 20 | ||
20 | # Allow access to java | 21 | # Allow access to java |
21 | noblacklist ${PATH}/java | 22 | noblacklist ${PATH}/java |
@@ -28,6 +29,7 @@ include disable-devel.inc | |||
28 | include disable-interpreters.inc | 29 | include disable-interpreters.inc |
29 | include disable-passwdmgr.inc | 30 | include disable-passwdmgr.inc |
30 | include disable-programs.inc | 31 | include disable-programs.inc |
32 | include disable-xdg.inc | ||
31 | 33 | ||
32 | include whitelist-var-common.inc | 34 | include whitelist-var-common.inc |
33 | 35 | ||
@@ -44,6 +46,7 @@ protocol unix,inet,inet6 | |||
44 | seccomp | 46 | seccomp |
45 | tracelog | 47 | tracelog |
46 | 48 | ||
49 | private-cache | ||
47 | private-dev | 50 | private-dev |
48 | private-tmp | 51 | private-tmp |
49 | 52 | ||
diff --git a/etc/mendeleydesktop.profile b/etc/mendeleydesktop.profile index 280baebdc..3a5edc364 100644 --- a/etc/mendeleydesktop.profile +++ b/etc/mendeleydesktop.profile | |||
@@ -12,7 +12,8 @@ noblacklist ${HOME}/.cache/Mendeley Ltd. | |||
12 | noblacklist ${HOME}/.config/Mendeley Ltd. | 12 | noblacklist ${HOME}/.config/Mendeley Ltd. |
13 | noblacklist ${HOME}/.local/share/Mendeley Ltd. | 13 | noblacklist ${HOME}/.local/share/Mendeley Ltd. |
14 | noblacklist ${HOME}/.local/share/data/Mendeley Ltd. | 14 | noblacklist ${HOME}/.local/share/data/Mendeley Ltd. |
15 | noblacklist ${HOME}/.pki/nssdb | 15 | noblacklist ${HOME}/.pki |
16 | noblacklist ${HOME}/.local/share/pki | ||
16 | 17 | ||
17 | # Allow python (blacklisted by disable-interpreters.inc) | 18 | # Allow python (blacklisted by disable-interpreters.inc) |
18 | noblacklist ${PATH}/python2* | 19 | noblacklist ${PATH}/python2* |
diff --git a/etc/midori.profile b/etc/midori.profile index 6a69f2282..4e9a6c63d 100644 --- a/etc/midori.profile +++ b/etc/midori.profile | |||
@@ -11,6 +11,7 @@ noblacklist ${HOME}/.local/share/midori | |||
11 | # noblacklist ${HOME}/.local/share/webkit | 11 | # noblacklist ${HOME}/.local/share/webkit |
12 | # noblacklist ${HOME}/.local/share/webkitgtk | 12 | # noblacklist ${HOME}/.local/share/webkitgtk |
13 | noblacklist ${HOME}/.pki | 13 | noblacklist ${HOME}/.pki |
14 | noblacklist ${HOME}/.local/share/pki | ||
14 | 15 | ||
15 | include disable-common.inc | 16 | include disable-common.inc |
16 | include disable-devel.inc | 17 | include disable-devel.inc |
@@ -23,6 +24,7 @@ mkdir ${HOME}/.local/share/midori | |||
23 | mkdir ${HOME}/.local/share/webkit | 24 | mkdir ${HOME}/.local/share/webkit |
24 | mkdir ${HOME}/.local/share/webkitgtk | 25 | mkdir ${HOME}/.local/share/webkitgtk |
25 | mkdir ${HOME}/.pki | 26 | mkdir ${HOME}/.pki |
27 | mkdir ${HOME}/.local/share/pki | ||
26 | whitelist ${DOWNLOADS} | 28 | whitelist ${DOWNLOADS} |
27 | whitelist ${HOME}/.cache/gnome-mplayer/plugin | 29 | whitelist ${HOME}/.cache/gnome-mplayer/plugin |
28 | whitelist ${HOME}/.cache/midori | 30 | whitelist ${HOME}/.cache/midori |
@@ -33,6 +35,7 @@ whitelist ${HOME}/.local/share/midori | |||
33 | whitelist ${HOME}/.local/share/webkit | 35 | whitelist ${HOME}/.local/share/webkit |
34 | whitelist ${HOME}/.local/share/webkitgtk | 36 | whitelist ${HOME}/.local/share/webkitgtk |
35 | whitelist ${HOME}/.pki | 37 | whitelist ${HOME}/.pki |
38 | whitelist ${HOME}/.local/share/pki | ||
36 | include whitelist-common.inc | 39 | include whitelist-common.inc |
37 | 40 | ||
38 | caps.drop all | 41 | caps.drop all |
diff --git a/etc/min.profile b/etc/min.profile index 3029c2952..80baedff7 100644 --- a/etc/min.profile +++ b/etc/min.profile | |||
@@ -9,6 +9,7 @@ include globals.local | |||
9 | noblacklist ${HOME}/.config/Min | 9 | noblacklist ${HOME}/.config/Min |
10 | 10 | ||
11 | noblacklist ${HOME}/.pki | 11 | noblacklist ${HOME}/.pki |
12 | noblacklist ${HOME}/.local/share/pki | ||
12 | 13 | ||
13 | include disable-common.inc | 14 | include disable-common.inc |
14 | include disable-devel.inc | 15 | include disable-devel.inc |
@@ -16,8 +17,10 @@ include disable-interpreters.inc | |||
16 | include disable-programs.inc | 17 | include disable-programs.inc |
17 | 18 | ||
18 | mkdir ${HOME}/.pki | 19 | mkdir ${HOME}/.pki |
20 | mkdir ${HOME}/.local/share/pki | ||
19 | whitelist ${DOWNLOADS} | 21 | whitelist ${DOWNLOADS} |
20 | whitelist ${HOME}/.pki | 22 | whitelist ${HOME}/.pki |
23 | whitelist ${HOME}/.local/share/pki | ||
21 | include whitelist-common.inc | 24 | include whitelist-common.inc |
22 | include whitelist-var-common.inc | 25 | include whitelist-var-common.inc |
23 | 26 | ||
diff --git a/etc/pybitmessage.profile b/etc/pybitmessage.profile index eea0d9e9f..c98f34e77 100644 --- a/etc/pybitmessage.profile +++ b/etc/pybitmessage.profile | |||
@@ -45,6 +45,5 @@ private-dev | |||
45 | private-etc PyBitmessage,PyBitmessage.conf,Trolltech.conf,fonts,gtk-2.0,hosts,ld.so.cache,ld.so.preload,localtime,pki,resolv.conf,selinux,sni-qt.conf,system-fips,xdg,ca-certificates,ssl,pki,crypto-policies | 45 | private-etc PyBitmessage,PyBitmessage.conf,Trolltech.conf,fonts,gtk-2.0,hosts,ld.so.cache,ld.so.preload,localtime,pki,resolv.conf,selinux,sni-qt.conf,system-fips,xdg,ca-certificates,ssl,pki,crypto-policies |
46 | private-tmp | 46 | private-tmp |
47 | 47 | ||
48 | memory-deny-write-execute | ||
49 | noexec ${HOME} | 48 | noexec ${HOME} |
50 | noexec /tmp | 49 | noexec /tmp |
diff --git a/etc/pycharm-community.profile b/etc/pycharm-community.profile index 32fdc750f..bb948a971 100644 --- a/etc/pycharm-community.profile +++ b/etc/pycharm-community.profile | |||
@@ -7,6 +7,7 @@ include globals.local | |||
7 | 7 | ||
8 | noblacklist ${HOME}/snap | 8 | noblacklist ${HOME}/snap |
9 | noblacklist ${HOME}/.PyCharmCE* | 9 | noblacklist ${HOME}/.PyCharmCE* |
10 | noblacklist ${HOME}/.python-history | ||
10 | noblacklist ${HOME}/.java | 11 | noblacklist ${HOME}/.java |
11 | 12 | ||
12 | # Allow access to java | 13 | # Allow access to java |
diff --git a/etc/qtox.profile b/etc/qtox.profile index 450e005f7..b6cb9772a 100644 --- a/etc/qtox.profile +++ b/etc/qtox.profile | |||
@@ -36,7 +36,7 @@ tracelog | |||
36 | 36 | ||
37 | disable-mnt | 37 | disable-mnt |
38 | private-bin qtox | 38 | private-bin qtox |
39 | private-etc fonts,resolv.conf,ld.so.cache,localtime,ca-certificates,ssl,pki,crypto-policies | 39 | private-etc fonts,resolv.conf,ld.so.cache,localtime,ca-certificates,ssl,pki,crypto-policies,machine-id,pulse |
40 | private-dev | 40 | private-dev |
41 | private-tmp | 41 | private-tmp |
42 | 42 | ||
diff --git a/etc/rambox.profile b/etc/rambox.profile index 6c65f869b..6f7f37aaf 100644 --- a/etc/rambox.profile +++ b/etc/rambox.profile | |||
@@ -7,6 +7,7 @@ include globals.local | |||
7 | 7 | ||
8 | noblacklist ${HOME}/.config/Rambox | 8 | noblacklist ${HOME}/.config/Rambox |
9 | noblacklist ${HOME}/.pki | 9 | noblacklist ${HOME}/.pki |
10 | noblacklist ${HOME}/.local/share/pki | ||
10 | 11 | ||
11 | include disable-common.inc | 12 | include disable-common.inc |
12 | include disable-devel.inc | 13 | include disable-devel.inc |
@@ -15,9 +16,11 @@ include disable-programs.inc | |||
15 | 16 | ||
16 | mkdir ${HOME}/.config/Rambox | 17 | mkdir ${HOME}/.config/Rambox |
17 | mkdir ${HOME}/.pki | 18 | mkdir ${HOME}/.pki |
19 | mkdir ${HOME}/.local/share/pki | ||
18 | whitelist ${DOWNLOADS} | 20 | whitelist ${DOWNLOADS} |
19 | whitelist ${HOME}/.config/Rambox | 21 | whitelist ${HOME}/.config/Rambox |
20 | whitelist ${HOME}/.pki | 22 | whitelist ${HOME}/.pki |
23 | whitelist ${HOME}/.local/share/pki | ||
21 | include whitelist-common.inc | 24 | include whitelist-common.inc |
22 | 25 | ||
23 | caps.drop all | 26 | caps.drop all |
diff --git a/etc/seamonkey.profile b/etc/seamonkey.profile index 9c38414bb..8cb291ba6 100644 --- a/etc/seamonkey.profile +++ b/etc/seamonkey.profile | |||
@@ -9,6 +9,7 @@ include globals.local | |||
9 | noblacklist ${HOME}/.cache/mozilla | 9 | noblacklist ${HOME}/.cache/mozilla |
10 | noblacklist ${HOME}/.mozilla | 10 | noblacklist ${HOME}/.mozilla |
11 | noblacklist ${HOME}/.pki | 11 | noblacklist ${HOME}/.pki |
12 | noblacklist ${HOME}/.local/share/pki | ||
12 | 13 | ||
13 | include disable-common.inc | 14 | include disable-common.inc |
14 | include disable-devel.inc | 15 | include disable-devel.inc |
@@ -29,6 +30,7 @@ whitelist ${HOME}/.mozilla | |||
29 | whitelist ${HOME}/.pentadactyl | 30 | whitelist ${HOME}/.pentadactyl |
30 | whitelist ${HOME}/.pentadactylrc | 31 | whitelist ${HOME}/.pentadactylrc |
31 | whitelist ${HOME}/.pki | 32 | whitelist ${HOME}/.pki |
33 | whitelist ${HOME}/.local/share/pki | ||
32 | whitelist ${HOME}/.vimperator | 34 | whitelist ${HOME}/.vimperator |
33 | whitelist ${HOME}/.vimperatorrc | 35 | whitelist ${HOME}/.vimperatorrc |
34 | whitelist ${HOME}/.wine-pipelight | 36 | whitelist ${HOME}/.wine-pipelight |
diff --git a/etc/snap.profile b/etc/snap.profile deleted file mode 100644 index 1c6d750e4..000000000 --- a/etc/snap.profile +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | # Firejail profile for snap | ||
2 | # Description: Location of genes from DNA sequence with hidden markov model | ||
3 | # This file is overwritten after every install/update | ||
4 | # Persistent local customizations | ||
5 | include snap.local | ||
6 | # Persistent global definitions | ||
7 | include globals.local | ||
8 | |||
9 | # Generic Ubuntu snap application profile | ||
10 | |||
11 | include disable-common.inc | ||
12 | include disable-passwdmgr.inc | ||
13 | include disable-programs.inc | ||
14 | |||
15 | whitelist ${DOWNLOADS} | ||
16 | whitelist ${HOME}/snap | ||
17 | include whitelist-common.inc | ||
diff --git a/etc/spotify.profile b/etc/spotify.profile index f6f31028f..14f9f5228 100644 --- a/etc/spotify.profile +++ b/etc/spotify.profile | |||
@@ -31,7 +31,7 @@ include whitelist-var-common.inc | |||
31 | 31 | ||
32 | caps.drop all | 32 | caps.drop all |
33 | netfilter | 33 | netfilter |
34 | nodbus | 34 | #nodbus - dbus needed for MPRIS |
35 | nodvd | 35 | nodvd |
36 | nogroups | 36 | nogroups |
37 | nonewprivs | 37 | nonewprivs |
diff --git a/etc/vim.profile b/etc/vim.profile index e4e759b86..55fa22a54 100644 --- a/etc/vim.profile +++ b/etc/vim.profile | |||
@@ -6,6 +6,7 @@ include vim.local | |||
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include globals.local | 7 | include globals.local |
8 | 8 | ||
9 | noblacklist ${HOME}/.python-history | ||
9 | noblacklist ${HOME}/.vim | 10 | noblacklist ${HOME}/.vim |
10 | noblacklist ${HOME}/.viminfo | 11 | noblacklist ${HOME}/.viminfo |
11 | noblacklist ${HOME}/.vimrc | 12 | noblacklist ${HOME}/.vimrc |
diff --git a/etc/vivaldi.profile b/etc/vivaldi.profile index 96f1bd99d..b62cc6df0 100644 --- a/etc/vivaldi.profile +++ b/etc/vivaldi.profile | |||
@@ -7,11 +7,14 @@ include globals.local | |||
7 | 7 | ||
8 | noblacklist ${HOME}/.cache/vivaldi | 8 | noblacklist ${HOME}/.cache/vivaldi |
9 | noblacklist ${HOME}/.config/vivaldi | 9 | noblacklist ${HOME}/.config/vivaldi |
10 | noblacklist ${HOME}/.local/lib/vivaldi | ||
10 | 11 | ||
11 | mkdir ${HOME}/.cache/vivaldi | 12 | mkdir ${HOME}/.cache/vivaldi |
12 | mkdir ${HOME}/.config/vivaldi | 13 | mkdir ${HOME}/.config/vivaldi |
14 | mkdir ${HOME}/.local/lib/vivaldi | ||
13 | whitelist ${HOME}/.cache/vivaldi | 15 | whitelist ${HOME}/.cache/vivaldi |
14 | whitelist ${HOME}/.config/vivaldi | 16 | whitelist ${HOME}/.config/vivaldi |
17 | whitelist ${HOME}/.local/lib/vivaldi | ||
15 | 18 | ||
16 | # nodbus breaks vivaldi sync | 19 | # nodbus breaks vivaldi sync |
17 | ignore nodbus | 20 | ignore nodbus |
diff --git a/etc/vlc.profile b/etc/vlc.profile index 0395a5a59..370180b6b 100644 --- a/etc/vlc.profile +++ b/etc/vlc.profile | |||
@@ -24,7 +24,7 @@ include whitelist-var-common.inc | |||
24 | #apparmor - on Ubuntu 18.04 it refuses to start without dbus access | 24 | #apparmor - on Ubuntu 18.04 it refuses to start without dbus access |
25 | caps.drop all | 25 | caps.drop all |
26 | netfilter | 26 | netfilter |
27 | #nodbus | 27 | #nodbus - dbus needed for MPRIS |
28 | nogroups | 28 | nogroups |
29 | nonewprivs | 29 | nonewprivs |
30 | noroot | 30 | noroot |
diff --git a/etc/vscodium.profile b/etc/vscodium.profile new file mode 100644 index 000000000..954510113 --- /dev/null +++ b/etc/vscodium.profile | |||
@@ -0,0 +1,8 @@ | |||
1 | # Firejail profile alias for Visual Studio Code | ||
2 | # This file is overwritten after every install/update | ||
3 | |||
4 | |||
5 | noblacklist ${HOME}/.VSCodium | ||
6 | |||
7 | # Redirect | ||
8 | include code.profile | ||
diff --git a/etc/wget.profile b/etc/wget.profile index 213840726..87c0501da 100644 --- a/etc/wget.profile +++ b/etc/wget.profile | |||
@@ -9,6 +9,7 @@ include globals.local | |||
9 | 9 | ||
10 | blacklist /tmp/.X11-unix | 10 | blacklist /tmp/.X11-unix |
11 | 11 | ||
12 | noblacklist ${HOME}/.wget-hsts | ||
12 | noblacklist ${HOME}/.wgetrc | 13 | noblacklist ${HOME}/.wgetrc |
13 | 14 | ||
14 | include disable-common.inc | 15 | include disable-common.inc |
diff --git a/etc/youtube-dl.profile b/etc/youtube-dl.profile index e0a79498e..0878c91ef 100644 --- a/etc/youtube-dl.profile +++ b/etc/youtube-dl.profile | |||
@@ -47,5 +47,6 @@ tracelog | |||
47 | 47 | ||
48 | private-dev | 48 | private-dev |
49 | 49 | ||
50 | noexec ${HOME} | 50 | # breaks when installed via pip |
51 | #noexec ${HOME} | ||
51 | noexec /tmp | 52 | noexec /tmp |
diff --git a/etc/zoom.profile b/etc/zoom.profile index 4fbf7ca01..456b197f3 100644 --- a/etc/zoom.profile +++ b/etc/zoom.profile | |||
@@ -6,6 +6,7 @@ include zoom.local | |||
6 | include globals.local | 6 | include globals.local |
7 | 7 | ||
8 | noblacklist ${HOME}/.config/zoomus.conf | 8 | noblacklist ${HOME}/.config/zoomus.conf |
9 | noblacklist ${HOME}/.zoom | ||
9 | 10 | ||
10 | include disable-common.inc | 11 | include disable-common.inc |
11 | include disable-devel.inc | 12 | include disable-devel.inc |
@@ -14,6 +15,7 @@ include disable-programs.inc | |||
14 | 15 | ||
15 | mkdir ${HOME}/.zoom | 16 | mkdir ${HOME}/.zoom |
16 | whitelist ${HOME}/.cache/zoom | 17 | whitelist ${HOME}/.cache/zoom |
18 | whitelist ${HOME}/.config/zoomus.conf | ||
17 | whitelist ${HOME}/.zoom | 19 | whitelist ${HOME}/.zoom |
18 | include whitelist-common.inc | 20 | include whitelist-common.inc |
19 | 21 | ||
diff --git a/mkdeb-apparmor.sh b/mkdeb-apparmor.sh new file mode 100755 index 000000000..f6c223c46 --- /dev/null +++ b/mkdeb-apparmor.sh | |||
@@ -0,0 +1,50 @@ | |||
1 | #!/bin/sh | ||
2 | # based on http://tldp.org/HOWTO/html_single/Debian-Binary-Package-Building-HOWTO/ | ||
3 | # a code archive should already be available | ||
4 | |||
5 | TOP=`pwd` | ||
6 | CODE_ARCHIVE="$1-$2.tar.xz" | ||
7 | CODE_DIR="$1-$2" | ||
8 | INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" | ||
9 | DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN" | ||
10 | |||
11 | echo "*****************************************" | ||
12 | echo "code archive: $CODE_ARCHIVE" | ||
13 | echo "code directory: $CODE_DIR" | ||
14 | echo "install directory: $INSTALL_DIR" | ||
15 | echo "debian control directory: $DEBIAN_CTRL_DIR" | ||
16 | echo "*****************************************" | ||
17 | |||
18 | tar -xJvf $CODE_ARCHIVE | ||
19 | #mkdir -p $INSTALL_DIR | ||
20 | cd $CODE_DIR | ||
21 | ./configure --prefix=/usr --enable-apparmor | ||
22 | make -j2 | ||
23 | mkdir debian | ||
24 | DESTDIR=debian make install-strip | ||
25 | |||
26 | cd .. | ||
27 | echo "*****************************************" | ||
28 | SIZE=`du -s $INSTALL_DIR` | ||
29 | echo "install size $SIZE" | ||
30 | echo "*****************************************" | ||
31 | |||
32 | mv $INSTALL_DIR/usr/share/doc/firejail/RELNOTES $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian | ||
33 | gzip -9 -n $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian | ||
34 | rm $INSTALL_DIR/usr/share/doc/firejail/COPYING | ||
35 | install -m644 platform/debian/copyright $INSTALL_DIR/usr/share/doc/firejail/. | ||
36 | mkdir -p $DEBIAN_CTRL_DIR | ||
37 | sed "s/FIREJAILVER/$2/g" platform/debian/control.$(dpkg-architecture -qDEB_HOST_ARCH) > $DEBIAN_CTRL_DIR/control | ||
38 | |||
39 | mkdir -p $INSTALL_DIR/usr/share/lintian/overrides/ | ||
40 | install -m644 platform/debian/firejail.lintian-overrides $INSTALL_DIR/usr/share/lintian/overrides/firejail | ||
41 | |||
42 | find $INSTALL_DIR/etc -type f | sed "s,^$INSTALL_DIR,," | LC_ALL=C sort > $DEBIAN_CTRL_DIR/conffiles | ||
43 | chmod 644 $DEBIAN_CTRL_DIR/conffiles | ||
44 | find $INSTALL_DIR -type d | xargs chmod 755 | ||
45 | cd $CODE_DIR | ||
46 | fakeroot dpkg-deb --build debian | ||
47 | lintian debian.deb | ||
48 | mv debian.deb ../firejail-apparmor_$2_1_$(dpkg-architecture -qDEB_HOST_ARCH).deb | ||
49 | cd .. | ||
50 | rm -fr $CODE_DIR | ||
diff --git a/platform/debian/copyright b/platform/debian/copyright index e144ccd8b..2c15356c4 100644 --- a/platform/debian/copyright +++ b/platform/debian/copyright | |||
@@ -7,7 +7,7 @@ This is the Debian/Ubuntu prepackaged version of firejail. | |||
7 | and networking stack isolation, and it runs on any recent Linux system. It | 7 | and networking stack isolation, and it runs on any recent Linux system. It |
8 | includes a sandbox profile for Mozilla Firefox. | 8 | includes a sandbox profile for Mozilla Firefox. |
9 | 9 | ||
10 | Copyright (C) 2014-2017 Firejail Authors (see README file for more details) | 10 | Copyright (C) 2014-2019 Firejail Authors (see README file for more details) |
11 | 11 | ||
12 | This program is free software; you can redistribute it and/or modify | 12 | This program is free software; you can redistribute it and/or modify |
13 | it under the terms of the GNU General Public License as published by | 13 | it under the terms of the GNU General Public License as published by |
diff --git a/src/faudit/caps.c b/src/faudit/caps.c index e0fb38488..644a69b82 100644 --- a/src/faudit/caps.c +++ b/src/faudit/caps.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/faudit/dbus.c b/src/faudit/dbus.c index cb08b9b0b..2971ea55b 100644 --- a/src/faudit/dbus.c +++ b/src/faudit/dbus.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/faudit/dev.c b/src/faudit/dev.c index 7bf4b279c..3b5921aee 100644 --- a/src/faudit/dev.c +++ b/src/faudit/dev.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/faudit/faudit.h b/src/faudit/faudit.h index e940a9dbf..ec01dde32 100644 --- a/src/faudit/faudit.h +++ b/src/faudit/faudit.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/faudit/files.c b/src/faudit/files.c index 1ba18f2ab..33d68efbf 100644 --- a/src/faudit/files.c +++ b/src/faudit/files.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/faudit/main.c b/src/faudit/main.c index d73986843..06dcbece0 100644 --- a/src/faudit/main.c +++ b/src/faudit/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/faudit/network.c b/src/faudit/network.c index 54eef2b2a..214cb972c 100644 --- a/src/faudit/network.c +++ b/src/faudit/network.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/faudit/pid.c b/src/faudit/pid.c index 22bb68c1a..6be2483ae 100644 --- a/src/faudit/pid.c +++ b/src/faudit/pid.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/faudit/seccomp.c b/src/faudit/seccomp.c index 85a883618..346b4b457 100644 --- a/src/faudit/seccomp.c +++ b/src/faudit/seccomp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -27,8 +27,8 @@ static int extract_seccomp(int *val) { | |||
27 | 27 | ||
28 | char buf[MAXBUF]; | 28 | char buf[MAXBUF]; |
29 | while (fgets(buf, MAXBUF, fp)) { | 29 | while (fgets(buf, MAXBUF, fp)) { |
30 | if (strncmp(buf, "Seccomp:\t", 8) == 0) { | 30 | if (strncmp(buf, "Seccomp:\t", 9) == 0) { |
31 | char *ptr = buf + 8; | 31 | char *ptr = buf + 9; |
32 | int tmp; | 32 | int tmp; |
33 | sscanf(ptr, "%d", &tmp); | 33 | sscanf(ptr, "%d", &tmp); |
34 | *val = tmp; | 34 | *val = tmp; |
diff --git a/src/faudit/syscall.c b/src/faudit/syscall.c index 3650590f3..3cdbf7407 100644 --- a/src/faudit/syscall.c +++ b/src/faudit/syscall.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/faudit/x11.c b/src/faudit/x11.c index bb763b110..d41c3698d 100644 --- a/src/faudit/x11.c +++ b/src/faudit/x11.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fbuilder/build_bin.c b/src/fbuilder/build_bin.c index 1230fb780..d62ec3f17 100644 --- a/src/fbuilder/build_bin.c +++ b/src/fbuilder/build_bin.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c index 4919a594c..c865ee929 100644 --- a/src/fbuilder/build_fs.c +++ b/src/fbuilder/build_fs.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fbuilder/build_home.c b/src/fbuilder/build_home.c index 7470a8d10..1f30fe5be 100644 --- a/src/fbuilder/build_home.c +++ b/src/fbuilder/build_home.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -111,7 +111,7 @@ void process_home(const char *fname, char *home, int home_len) { | |||
111 | // skip files handled automatically by firejail | 111 | // skip files handled automatically by firejail |
112 | if (strcmp(ptr, ".Xauthority") == 0 || | 112 | if (strcmp(ptr, ".Xauthority") == 0 || |
113 | strcmp(ptr, ".Xdefaults-debian") == 0 || | 113 | strcmp(ptr, ".Xdefaults-debian") == 0 || |
114 | strncmp(ptr, ".config/pulse/", 13) == 0 || | 114 | strncmp(ptr, ".config/pulse/", 14) == 0 || |
115 | strncmp(ptr, ".pulse/", 7) == 0 || | 115 | strncmp(ptr, ".pulse/", 7) == 0 || |
116 | strncmp(ptr, ".bash_hist", 10) == 0 || | 116 | strncmp(ptr, ".bash_hist", 10) == 0 || |
117 | strcmp(ptr, ".bashrc") == 0) | 117 | strcmp(ptr, ".bashrc") == 0) |
@@ -196,4 +196,4 @@ void build_home(const char *fname, FILE *fp) { | |||
196 | else | 196 | else |
197 | fprintf(fp, "private\n"); | 197 | fprintf(fp, "private\n"); |
198 | 198 | ||
199 | } \ No newline at end of file | 199 | } |
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c index d9cb1f568..f11e37057 100644 --- a/src/fbuilder/build_profile.c +++ b/src/fbuilder/build_profile.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fbuilder/build_seccomp.c b/src/fbuilder/build_seccomp.c index fbc0e06f4..8a2268b3b 100644 --- a/src/fbuilder/build_seccomp.c +++ b/src/fbuilder/build_seccomp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -131,9 +131,9 @@ static void process_protocol(const char *fname) { | |||
131 | inet = 1; | 131 | inet = 1; |
132 | else if (strncmp(ptr, "AF_INET6 ", 9) == 0) | 132 | else if (strncmp(ptr, "AF_INET6 ", 9) == 0) |
133 | inet6 = 1; | 133 | inet6 = 1; |
134 | else if (strncmp(ptr, "AF_NETLINK ", 9) == 0) | 134 | else if (strncmp(ptr, "AF_NETLINK ", 11) == 0) |
135 | netlink = 1; | 135 | netlink = 1; |
136 | else if (strncmp(ptr, "AF_PACKET ", 9) == 0) | 136 | else if (strncmp(ptr, "AF_PACKET ", 10) == 0) |
137 | packet = 1; | 137 | packet = 1; |
138 | } | 138 | } |
139 | 139 | ||
diff --git a/src/fbuilder/fbuilder.h b/src/fbuilder/fbuilder.h index f0d16eb26..811750bd0 100644 --- a/src/fbuilder/fbuilder.h +++ b/src/fbuilder/fbuilder.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fbuilder/filedb.c b/src/fbuilder/filedb.c index 7af3724e8..ac2837373 100644 --- a/src/fbuilder/filedb.c +++ b/src/fbuilder/filedb.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fbuilder/main.c b/src/fbuilder/main.c index ef5dee7d9..159af9ae8 100644 --- a/src/fbuilder/main.c +++ b/src/fbuilder/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fbuilder/utils.c b/src/fbuilder/utils.c index 1d490b07e..c1cd05f39 100644 --- a/src/fbuilder/utils.c +++ b/src/fbuilder/utils.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fcopy/main.c b/src/fcopy/main.c index e93cd1cb8..9fca2a39b 100644 --- a/src/fcopy/main.c +++ b/src/fcopy/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c index f09a23977..7a4df83dd 100644 --- a/src/firecfg/desktop_files.c +++ b/src/firecfg/desktop_files.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index 8a0d3625b..041ff1256 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -247,6 +247,7 @@ keepassx2 | |||
247 | keepassxc | 247 | keepassxc |
248 | kget | 248 | kget |
249 | kino | 249 | kino |
250 | klavaro | ||
250 | kmail | 251 | kmail |
251 | knotes | 252 | knotes |
252 | kodi | 253 | kodi |
@@ -458,6 +459,7 @@ vivaldi-beta | |||
458 | vivaldi-snapshot | 459 | vivaldi-snapshot |
459 | vivaldi-stable | 460 | vivaldi-stable |
460 | vlc | 461 | vlc |
462 | vscodium | ||
461 | vym | 463 | vym |
462 | w3m | 464 | w3m |
463 | warzone2100 | 465 | warzone2100 |
diff --git a/src/firecfg/firecfg.h b/src/firecfg/firecfg.h index 5f377bc25..2b1c45d40 100644 --- a/src/firecfg/firecfg.h +++ b/src/firecfg/firecfg.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firecfg/main.c b/src/firecfg/main.c index 29407561e..ff66dea08 100644 --- a/src/firecfg/main.c +++ b/src/firecfg/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firecfg/sound.c b/src/firecfg/sound.c index 38b43af62..c54394c22 100644 --- a/src/firecfg/sound.c +++ b/src/firecfg/sound.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firecfg/util.c b/src/firecfg/util.c index 7ed86c36e..00dbad073 100644 --- a/src/firecfg/util.c +++ b/src/firecfg/util.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/appimage.c b/src/firejail/appimage.c index 7adf31eb6..7c60d9189 100644 --- a/src/firejail/appimage.c +++ b/src/firejail/appimage.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/appimage_size.c b/src/firejail/appimage_size.c index b277553e3..2868a1f88 100644 --- a/src/firejail/appimage_size.c +++ b/src/firejail/appimage_size.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/arp.c b/src/firejail/arp.c index a8818c960..06a619ba9 100644 --- a/src/firejail/arp.c +++ b/src/firejail/arp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/bandwidth.c b/src/firejail/bandwidth.c index 112afff69..30f387765 100644 --- a/src/firejail/bandwidth.c +++ b/src/firejail/bandwidth.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/caps.c b/src/firejail/caps.c index bd3b5e229..71dd9430b 100644 --- a/src/firejail/caps.c +++ b/src/firejail/caps.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/cgroup.c b/src/firejail/cgroup.c index 8eb61bf78..21eee6b45 100644 --- a/src/firejail/cgroup.c +++ b/src/firejail/cgroup.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c index 45e28fe40..54f6ea023 100644 --- a/src/firejail/checkcfg.c +++ b/src/firejail/checkcfg.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -71,146 +71,48 @@ int checkcfg(int val) { | |||
71 | if (*buf == '#' || *buf == '\n') | 71 | if (*buf == '#' || *buf == '\n') |
72 | continue; | 72 | continue; |
73 | 73 | ||
74 | #define PARSE_YESNO(key, string) \ | ||
75 | else if (strncmp(ptr, string " ", strlen(string)+1) == 0) { \ | ||
76 | if (strcmp(ptr + strlen(string) + 1, "yes") == 0) \ | ||
77 | cfg_val[key] = 1; \ | ||
78 | else if (strcmp(ptr + strlen(string) + 1, "no") == 0) \ | ||
79 | cfg_val[key] = 0; \ | ||
80 | else \ | ||
81 | goto errout; \ | ||
82 | } | ||
83 | |||
74 | // parse line | 84 | // parse line |
75 | ptr = line_remove_spaces(buf); | 85 | ptr = line_remove_spaces(buf); |
76 | if (!ptr) | 86 | if (!ptr) |
77 | continue; | 87 | continue; |
88 | PARSE_YESNO(CFG_FILE_TRANSFER, "file-transfer") | ||
89 | PARSE_YESNO(CFG_DBUS, "dbus") | ||
90 | PARSE_YESNO(CFG_JOIN, "join") | ||
91 | PARSE_YESNO(CFG_X11, "x11") | ||
92 | PARSE_YESNO(CFG_APPARMOR, "apparmor") | ||
93 | PARSE_YESNO(CFG_BIND, "bind") | ||
94 | PARSE_YESNO(CFG_CGROUP, "cgroup") | ||
95 | PARSE_YESNO(CFG_NAME_CHANGE, "name-change") | ||
96 | PARSE_YESNO(CFG_USERNS, "userns") | ||
97 | PARSE_YESNO(CFG_CHROOT, "chroot") | ||
98 | PARSE_YESNO(CFG_FIREJAIL_PROMPT, "firejail-prompt") | ||
99 | PARSE_YESNO(CFG_FOLLOW_SYMLINK_AS_USER, "follow-symlink-as-user") | ||
100 | PARSE_YESNO(CFG_FORCE_NONEWPRIVS, "force-nonewprivs") | ||
101 | PARSE_YESNO(CFG_SECCOMP, "seccomp") | ||
102 | PARSE_YESNO(CFG_WHITELIST, "whitelist") | ||
103 | PARSE_YESNO(CFG_NETWORK, "network") | ||
104 | PARSE_YESNO(CFG_RESTRICTED_NETWORK, "restricted-network") | ||
105 | PARSE_YESNO(CFG_XEPHYR_WINDOW_TITLE, "xephyr-window-title") | ||
106 | PARSE_YESNO(CFG_OVERLAYFS, "overlayfs") | ||
107 | PARSE_YESNO(CFG_PRIVATE_HOME, "private-home") | ||
108 | PARSE_YESNO(CFG_PRIVATE_CACHE, "private-cache") | ||
109 | PARSE_YESNO(CFG_PRIVATE_LIB, "private-lib") | ||
110 | PARSE_YESNO(CFG_PRIVATE_BIN_NO_LOCAL, "private-bin-no-local") | ||
111 | PARSE_YESNO(CFG_DISABLE_MNT, "disable-mnt") | ||
112 | PARSE_YESNO(CFG_XPRA_ATTACH, "xpra-attach") | ||
113 | PARSE_YESNO(CFG_BROWSER_DISABLE_U2F, "browser-disable-u2f") | ||
114 | #undef PARSE_YESNO | ||
78 | 115 | ||
79 | // file transfer | ||
80 | else if (strncmp(ptr, "file-transfer ", 14) == 0) { | ||
81 | if (strcmp(ptr + 14, "yes") == 0) | ||
82 | cfg_val[CFG_FILE_TRANSFER] = 1; | ||
83 | else if (strcmp(ptr + 14, "no") == 0) | ||
84 | cfg_val[CFG_FILE_TRANSFER] = 0; | ||
85 | else | ||
86 | goto errout; | ||
87 | } | ||
88 | // dbus | ||
89 | else if (strncmp(ptr, "dbus ", 5) == 0) { | ||
90 | if (strcmp(ptr + 5, "yes") == 0) | ||
91 | cfg_val[CFG_DBUS] = 1; | ||
92 | else if (strcmp(ptr + 5, "no") == 0) | ||
93 | cfg_val[CFG_DBUS] = 0; | ||
94 | else | ||
95 | goto errout; | ||
96 | } | ||
97 | // join | ||
98 | else if (strncmp(ptr, "join ", 5) == 0) { | ||
99 | if (strcmp(ptr + 5, "yes") == 0) | ||
100 | cfg_val[CFG_JOIN] = 1; | ||
101 | else if (strcmp(ptr + 5, "no") == 0) | ||
102 | cfg_val[CFG_JOIN] = 0; | ||
103 | else | ||
104 | goto errout; | ||
105 | } | ||
106 | // x11 | ||
107 | else if (strncmp(ptr, "x11 ", 4) == 0) { | ||
108 | if (strcmp(ptr + 4, "yes") == 0) | ||
109 | cfg_val[CFG_X11] = 1; | ||
110 | else if (strcmp(ptr + 4, "no") == 0) | ||
111 | cfg_val[CFG_X11] = 0; | ||
112 | else | ||
113 | goto errout; | ||
114 | } | ||
115 | // apparmor | ||
116 | else if (strncmp(ptr, "apparmor ", 9) == 0) { | ||
117 | if (strcmp(ptr + 9, "yes") == 0) | ||
118 | cfg_val[CFG_APPARMOR] = 1; | ||
119 | else if (strcmp(ptr + 9, "no") == 0) | ||
120 | cfg_val[CFG_APPARMOR] = 0; | ||
121 | else | ||
122 | goto errout; | ||
123 | } | ||
124 | // bind | ||
125 | else if (strncmp(ptr, "bind ", 5) == 0) { | ||
126 | if (strcmp(ptr + 5, "yes") == 0) | ||
127 | cfg_val[CFG_BIND] = 1; | ||
128 | else if (strcmp(ptr + 5, "no") == 0) | ||
129 | cfg_val[CFG_BIND] = 0; | ||
130 | else | ||
131 | goto errout; | ||
132 | } | ||
133 | // user namespace | ||
134 | else if (strncmp(ptr, "userns ", 7) == 0) { | ||
135 | if (strcmp(ptr + 7, "yes") == 0) | ||
136 | cfg_val[CFG_USERNS] = 1; | ||
137 | else if (strcmp(ptr + 7, "no") == 0) | ||
138 | cfg_val[CFG_USERNS] = 0; | ||
139 | else | ||
140 | goto errout; | ||
141 | } | ||
142 | // chroot | ||
143 | else if (strncmp(ptr, "chroot ", 7) == 0) { | ||
144 | if (strcmp(ptr + 7, "yes") == 0) | ||
145 | cfg_val[CFG_CHROOT] = 1; | ||
146 | else if (strcmp(ptr + 7, "no") == 0) | ||
147 | cfg_val[CFG_CHROOT] = 0; | ||
148 | else | ||
149 | goto errout; | ||
150 | } | ||
151 | // prompt | ||
152 | else if (strncmp(ptr, "firejail-prompt ", 16) == 0) { | ||
153 | if (strcmp(ptr + 16, "yes") == 0) | ||
154 | cfg_val[CFG_FIREJAIL_PROMPT] = 1; | ||
155 | else if (strcmp(ptr + 16, "no") == 0) | ||
156 | cfg_val[CFG_FIREJAIL_PROMPT] = 0; | ||
157 | else | ||
158 | goto errout; | ||
159 | } | ||
160 | // follow symlink as user | ||
161 | else if (strncmp(ptr, "follow-symlink-as-user ", 23) == 0) { | ||
162 | if (strcmp(ptr + 23, "yes") == 0) | ||
163 | cfg_val[CFG_FOLLOW_SYMLINK_AS_USER] = 1; | ||
164 | else if (strcmp(ptr + 23, "no") == 0) | ||
165 | cfg_val[CFG_FOLLOW_SYMLINK_AS_USER] = 0; | ||
166 | else | ||
167 | goto errout; | ||
168 | } | ||
169 | // nonewprivs | ||
170 | else if (strncmp(ptr, "force-nonewprivs ", 17) == 0) { | ||
171 | if (strcmp(ptr + 17, "yes") == 0) | ||
172 | cfg_val[CFG_FORCE_NONEWPRIVS] = 1; | ||
173 | else if (strcmp(ptr + 17, "no") == 0) | ||
174 | cfg_val[CFG_FORCE_NONEWPRIVS] = 0; | ||
175 | else | ||
176 | goto errout; | ||
177 | } | ||
178 | // seccomp | ||
179 | else if (strncmp(ptr, "seccomp ", 8) == 0) { | ||
180 | if (strcmp(ptr + 8, "yes") == 0) | ||
181 | cfg_val[CFG_SECCOMP] = 1; | ||
182 | else if (strcmp(ptr + 8, "no") == 0) | ||
183 | cfg_val[CFG_SECCOMP] = 0; | ||
184 | else | ||
185 | goto errout; | ||
186 | } | ||
187 | // whitelist | ||
188 | else if (strncmp(ptr, "whitelist ", 10) == 0) { | ||
189 | if (strcmp(ptr + 10, "yes") == 0) | ||
190 | cfg_val[CFG_WHITELIST] = 1; | ||
191 | else if (strcmp(ptr + 10, "no") == 0) | ||
192 | cfg_val[CFG_WHITELIST] = 0; | ||
193 | else | ||
194 | goto errout; | ||
195 | } | ||
196 | // network | ||
197 | else if (strncmp(ptr, "network ", 8) == 0) { | ||
198 | if (strcmp(ptr + 8, "yes") == 0) | ||
199 | cfg_val[CFG_NETWORK] = 1; | ||
200 | else if (strcmp(ptr + 8, "no") == 0) | ||
201 | cfg_val[CFG_NETWORK] = 0; | ||
202 | else | ||
203 | goto errout; | ||
204 | } | ||
205 | // network | ||
206 | else if (strncmp(ptr, "restricted-network ", 19) == 0) { | ||
207 | if (strcmp(ptr + 19, "yes") == 0) | ||
208 | cfg_val[CFG_RESTRICTED_NETWORK] = 1; | ||
209 | else if (strcmp(ptr + 19, "no") == 0) | ||
210 | cfg_val[CFG_RESTRICTED_NETWORK] = 0; | ||
211 | else | ||
212 | goto errout; | ||
213 | } | ||
214 | // netfilter | 116 | // netfilter |
215 | else if (strncmp(ptr, "netfilter-default ", 18) == 0) { | 117 | else if (strncmp(ptr, "netfilter-default ", 18) == 0) { |
216 | char *fname = ptr + 18; | 118 | char *fname = ptr + 18; |
@@ -248,16 +150,6 @@ int checkcfg(int val) { | |||
248 | errExit("asprintf"); | 150 | errExit("asprintf"); |
249 | } | 151 | } |
250 | 152 | ||
251 | // xephyr window title | ||
252 | else if (strncmp(ptr, "xephyr-window-title ", 20) == 0) { | ||
253 | if (strcmp(ptr + 20, "yes") == 0) | ||
254 | cfg_val[CFG_XEPHYR_WINDOW_TITLE] = 1; | ||
255 | else if (strcmp(ptr + 20, "no") == 0) | ||
256 | cfg_val[CFG_XEPHYR_WINDOW_TITLE] = 0; | ||
257 | else | ||
258 | goto errout; | ||
259 | } | ||
260 | |||
261 | // Xephyr command extra parameters | 153 | // Xephyr command extra parameters |
262 | else if (strncmp(ptr, "xephyr-extra-params ", 20) == 0) { | 154 | else if (strncmp(ptr, "xephyr-extra-params ", 20) == 0) { |
263 | if (*xephyr_extra_params != '\0') | 155 | if (*xephyr_extra_params != '\0') |
@@ -277,7 +169,7 @@ int checkcfg(int val) { | |||
277 | } | 169 | } |
278 | 170 | ||
279 | // Xvfb screen size | 171 | // Xvfb screen size |
280 | else if (strncmp(ptr, "xvfb-screen ", 12) == 0) { | 172 | else if (strncmp(ptr, "xvfb-screen ", 12) == 0) { |
281 | // expecting three numbers separated by x's | 173 | // expecting three numbers separated by x's |
282 | unsigned int n1; | 174 | unsigned int n1; |
283 | unsigned int n2; | 175 | unsigned int n2; |
@@ -307,54 +199,6 @@ int checkcfg(int val) { | |||
307 | else | 199 | else |
308 | goto errout; | 200 | goto errout; |
309 | } | 201 | } |
310 | else if (strncmp(ptr, "overlayfs ", 10) == 0) { | ||
311 | if (strcmp(ptr + 10, "yes") == 0) | ||
312 | cfg_val[CFG_OVERLAYFS] = 1; | ||
313 | else if (strcmp(ptr + 10, "no") == 0) | ||
314 | cfg_val[CFG_OVERLAYFS] = 0; | ||
315 | else | ||
316 | goto errout; | ||
317 | } | ||
318 | else if (strncmp(ptr, "private-home ", 13) == 0) { | ||
319 | if (strcmp(ptr + 13, "yes") == 0) | ||
320 | cfg_val[CFG_PRIVATE_HOME] = 1; | ||
321 | else if (strcmp(ptr + 13, "no") == 0) | ||
322 | cfg_val[CFG_PRIVATE_HOME] = 0; | ||
323 | else | ||
324 | goto errout; | ||
325 | } | ||
326 | else if (strncmp(ptr, "private-cache ", 14) == 0) { | ||
327 | if (strcmp(ptr + 14, "yes") == 0) | ||
328 | cfg_val[CFG_PRIVATE_CACHE] = 1; | ||
329 | else if (strcmp(ptr + 14, "no") == 0) | ||
330 | cfg_val[CFG_PRIVATE_CACHE] = 0; | ||
331 | else | ||
332 | goto errout; | ||
333 | } | ||
334 | else if (strncmp(ptr, "private-lib ", 12) == 0) { | ||
335 | if (strcmp(ptr + 12, "yes") == 0) | ||
336 | cfg_val[CFG_PRIVATE_LIB] = 1; | ||
337 | else if (strcmp(ptr + 12, "no") == 0) | ||
338 | cfg_val[CFG_PRIVATE_LIB] = 0; | ||
339 | else | ||
340 | goto errout; | ||
341 | } | ||
342 | else if (strncmp(ptr, "private-bin-no-local ", 21) == 0) { | ||
343 | if (strcmp(ptr + 21, "yes") == 0) | ||
344 | cfg_val[CFG_PRIVATE_BIN_NO_LOCAL] = 1; | ||
345 | else if (strcmp(ptr + 21, "no") == 0) | ||
346 | cfg_val[CFG_PRIVATE_BIN_NO_LOCAL] = 0; | ||
347 | else | ||
348 | goto errout; | ||
349 | } | ||
350 | else if (strncmp(ptr, "disable-mnt ", 12) == 0) { | ||
351 | if (strcmp(ptr + 12, "yes") == 0) | ||
352 | cfg_val[CFG_DISABLE_MNT] = 1; | ||
353 | else if (strcmp(ptr + 12, "no") == 0) | ||
354 | cfg_val[CFG_DISABLE_MNT] = 0; | ||
355 | else | ||
356 | goto errout; | ||
357 | } | ||
358 | // arp probes | 202 | // arp probes |
359 | else if (strncmp(ptr, "arp-probes ", 11) == 0) { | 203 | else if (strncmp(ptr, "arp-probes ", 11) == 0) { |
360 | int arp_probes = atoi(ptr + 11); | 204 | int arp_probes = atoi(ptr + 11); |
@@ -362,24 +206,6 @@ int checkcfg(int val) { | |||
362 | goto errout; | 206 | goto errout; |
363 | cfg_val[CFG_ARP_PROBES] = arp_probes; | 207 | cfg_val[CFG_ARP_PROBES] = arp_probes; |
364 | } | 208 | } |
365 | // xpra-attach | ||
366 | else if (strncmp(ptr, "xpra-attach ", 12) == 0) { | ||
367 | if (strcmp(ptr + 12, "yes") == 0) | ||
368 | cfg_val[CFG_XPRA_ATTACH] = 1; | ||
369 | else if (strcmp(ptr + 12, "no") == 0) | ||
370 | cfg_val[CFG_XPRA_ATTACH] = 0; | ||
371 | else | ||
372 | goto errout; | ||
373 | } | ||
374 | // browser-disable-u2f | ||
375 | else if (strncmp(ptr, "browser-disable-u2f ", 20) == 0) { | ||
376 | if (strcmp(ptr + 20, "yes") == 0) | ||
377 | cfg_val[CFG_BROWSER_DISABLE_U2F] = 1; | ||
378 | else if (strcmp(ptr + 20, "no") == 0) | ||
379 | cfg_val[CFG_BROWSER_DISABLE_U2F] = 0; | ||
380 | else | ||
381 | goto errout; | ||
382 | } | ||
383 | else | 209 | else |
384 | goto errout; | 210 | goto errout; |
385 | 211 | ||
diff --git a/src/firejail/cmdline.c b/src/firejail/cmdline.c index d616f3599..134000a3d 100644 --- a/src/firejail/cmdline.c +++ b/src/firejail/cmdline.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/cpu.c b/src/firejail/cpu.c index e2517ddd7..7a0807257 100644 --- a/src/firejail/cpu.c +++ b/src/firejail/cpu.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/dbus.c b/src/firejail/dbus.c index 6c122c6d0..baa41e85e 100644 --- a/src/firejail/dbus.c +++ b/src/firejail/dbus.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/env.c b/src/firejail/env.c index fd4bfbd57..2e9f516ba 100644 --- a/src/firejail/env.c +++ b/src/firejail/env.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index 03ad25f75..1372c3ca3 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -272,7 +272,6 @@ typedef struct config_t { | |||
272 | int nice; | 272 | int nice; |
273 | char *cgroup; | 273 | char *cgroup; |
274 | 274 | ||
275 | |||
276 | // command line | 275 | // command line |
277 | char *command_line; | 276 | char *command_line; |
278 | char *window_title; | 277 | char *window_title; |
@@ -781,6 +780,8 @@ enum { | |||
781 | CFG_APPARMOR, | 780 | CFG_APPARMOR, |
782 | CFG_DBUS, | 781 | CFG_DBUS, |
783 | CFG_PRIVATE_CACHE, | 782 | CFG_PRIVATE_CACHE, |
783 | CFG_CGROUP, | ||
784 | CFG_NAME_CHANGE, | ||
784 | CFG_MAX // this should always be the last entry | 785 | CFG_MAX // this should always be the last entry |
785 | }; | 786 | }; |
786 | extern char *xephyr_screen; | 787 | extern char *xephyr_screen; |
diff --git a/src/firejail/fs.c b/src/firejail/fs.c index 184875f58..f9d968427 100644 --- a/src/firejail/fs.c +++ b/src/firejail/fs.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c index 168ecacfb..17db45bf1 100644 --- a/src/firejail/fs_bin.c +++ b/src/firejail/fs_bin.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c index ff525f0b9..4872d6cd9 100644 --- a/src/firejail/fs_dev.c +++ b/src/firejail/fs_dev.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c index af22e4c29..228df4399 100644 --- a/src/firejail/fs_etc.c +++ b/src/firejail/fs_etc.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c index 10232fa6e..7746aa44b 100644 --- a/src/firejail/fs_home.c +++ b/src/firejail/fs_home.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c index 1fbb073f4..9da01b24c 100644 --- a/src/firejail/fs_hostname.c +++ b/src/firejail/fs_hostname.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c index d2e9da022..808ead240 100644 --- a/src/firejail/fs_lib.c +++ b/src/firejail/fs_lib.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_lib2.c b/src/firejail/fs_lib2.c index 2c21e5dc7..7c50dd5e2 100644 --- a/src/firejail/fs_lib2.c +++ b/src/firejail/fs_lib2.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_logger.c b/src/firejail/fs_logger.c index 02e2ba5d7..31e0147ca 100644 --- a/src/firejail/fs_logger.c +++ b/src/firejail/fs_logger.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_mkdir.c b/src/firejail/fs_mkdir.c index 913f7502d..09e5c3200 100644 --- a/src/firejail/fs_mkdir.c +++ b/src/firejail/fs_mkdir.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_trace.c b/src/firejail/fs_trace.c index 235e09291..26dd5cb27 100644 --- a/src/firejail/fs_trace.c +++ b/src/firejail/fs_trace.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_var.c b/src/firejail/fs_var.c index 8c53e6161..5b872ad75 100644 --- a/src/firejail/fs_var.c +++ b/src/firejail/fs_var.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c index 74b9449be..6cd445433 100644 --- a/src/firejail/fs_whitelist.c +++ b/src/firejail/fs_whitelist.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/join.c b/src/firejail/join.c index 60980fb2e..3d5006236 100644 --- a/src/firejail/join.c +++ b/src/firejail/join.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/ls.c b/src/firejail/ls.c index 164dc465a..08cf5f16a 100644 --- a/src/firejail/ls.c +++ b/src/firejail/ls.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/macros.c b/src/firejail/macros.c index 7e08ab340..9ed6b9715 100644 --- a/src/firejail/macros.c +++ b/src/firejail/macros.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/main.c b/src/firejail/main.c index 61f507f36..e186002af 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -733,26 +733,30 @@ static void run_cmd_and_exit(int i, int argc, char **argv) { | |||
733 | else if (strncmp(argv[i], "--join-or-start=", 16) == 0) { | 733 | else if (strncmp(argv[i], "--join-or-start=", 16) == 0) { |
734 | // NOTE: this is first part of option handler, | 734 | // NOTE: this is first part of option handler, |
735 | // sandbox name is set in other part | 735 | // sandbox name is set in other part |
736 | logargs(argc, argv); | 736 | if (checkcfg(CFG_JOIN) || getuid() == 0) { |
737 | logargs(argc, argv); | ||
737 | 738 | ||
738 | if (arg_shell_none) { | 739 | if (arg_shell_none) { |
739 | if (argc <= (i+1)) { | 740 | if (argc <= (i+1)) { |
740 | fprintf(stderr, "Error: --shell=none set, but no command specified\n"); | 741 | fprintf(stderr, "Error: --shell=none set, but no command specified\n"); |
741 | exit(1); | 742 | exit(1); |
743 | } | ||
744 | cfg.original_program_index = i + 1; | ||
742 | } | 745 | } |
743 | cfg.original_program_index = i + 1; | ||
744 | } | ||
745 | 746 | ||
746 | // try to join by name only | 747 | // try to join by name only |
747 | pid_t pid; | 748 | pid_t pid; |
748 | if (!read_pid(argv[i] + 16, &pid)) { | 749 | if (!read_pid(argv[i] + 16, &pid)) { |
749 | if (!cfg.shell && !arg_shell_none) | 750 | if (!cfg.shell && !arg_shell_none) |
750 | cfg.shell = guess_shell(); | 751 | cfg.shell = guess_shell(); |
751 | 752 | ||
752 | join(pid, argc, argv, i + 1); | 753 | join(pid, argc, argv, i + 1); |
753 | exit(0); | 754 | exit(0); |
755 | } | ||
756 | // if there no such sandbox continue argument processing | ||
754 | } | 757 | } |
755 | // if there no such sandbox continue argument processing | 758 | else |
759 | exit_err_feature("join"); | ||
756 | } | 760 | } |
757 | #ifdef HAVE_NETWORK | 761 | #ifdef HAVE_NETWORK |
758 | else if (strncmp(argv[i], "--join-network=", 15) == 0) { | 762 | else if (strncmp(argv[i], "--join-network=", 15) == 0) { |
@@ -1286,16 +1290,20 @@ int main(int argc, char **argv) { | |||
1286 | arg_nice = 1; | 1290 | arg_nice = 1; |
1287 | } | 1291 | } |
1288 | else if (strncmp(argv[i], "--cgroup=", 9) == 0) { | 1292 | else if (strncmp(argv[i], "--cgroup=", 9) == 0) { |
1289 | if (option_cgroup) { | 1293 | if (checkcfg(CFG_CGROUP)) { |
1290 | fprintf(stderr, "Error: only a cgroup can be defined\n"); | 1294 | if (option_cgroup) { |
1291 | exit(1); | 1295 | fprintf(stderr, "Error: only a cgroup can be defined\n"); |
1292 | } | 1296 | exit(1); |
1297 | } | ||
1293 | 1298 | ||
1294 | option_cgroup = 1; | 1299 | option_cgroup = 1; |
1295 | cfg.cgroup = strdup(argv[i] + 9); | 1300 | cfg.cgroup = strdup(argv[i] + 9); |
1296 | if (!cfg.cgroup) | 1301 | if (!cfg.cgroup) |
1297 | errExit("strdup"); | 1302 | errExit("strdup"); |
1298 | set_cgroup(cfg.cgroup); | 1303 | set_cgroup(cfg.cgroup); |
1304 | } | ||
1305 | else | ||
1306 | exit_err_feature("cgroup"); | ||
1299 | } | 1307 | } |
1300 | 1308 | ||
1301 | //************************************* | 1309 | //************************************* |
diff --git a/src/firejail/mountinfo.c b/src/firejail/mountinfo.c index 02c28cc5e..0717b2044 100644 --- a/src/firejail/mountinfo.c +++ b/src/firejail/mountinfo.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/netfilter.c b/src/firejail/netfilter.c index 22c8392a0..bec32cfde 100644 --- a/src/firejail/netfilter.c +++ b/src/firejail/netfilter.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/network.c b/src/firejail/network.c index fed7539ca..3e6b9d29d 100644 --- a/src/firejail/network.c +++ b/src/firejail/network.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/network_main.c b/src/firejail/network_main.c index 4dee07219..4867e6e54 100644 --- a/src/firejail/network_main.c +++ b/src/firejail/network_main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c index 78322807b..9ad4e8ba1 100644 --- a/src/firejail/no_sandbox.c +++ b/src/firejail/no_sandbox.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/output.c b/src/firejail/output.c index 61c89992d..bd7e44788 100644 --- a/src/firejail/output.c +++ b/src/firejail/output.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/paths.c b/src/firejail/paths.c index 121cbeb4a..6317d4db8 100644 --- a/src/firejail/paths.c +++ b/src/firejail/paths.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/preproc.c b/src/firejail/preproc.c index 236f7f427..160d6245f 100644 --- a/src/firejail/preproc.c +++ b/src/firejail/preproc.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index 83caef199..c163133c3 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -241,6 +241,9 @@ error: | |||
241 | // return 1 if the command is to be added to the linked list of profile commands | 241 | // return 1 if the command is to be added to the linked list of profile commands |
242 | // return 0 if the command was already executed inside the function | 242 | // return 0 if the command was already executed inside the function |
243 | int profile_check_line(char *ptr, int lineno, const char *fname) { | 243 | int profile_check_line(char *ptr, int lineno, const char *fname) { |
244 | #ifdef HAVE_WHITELIST | ||
245 | static int whitelist_warning_printed = 0; | ||
246 | #endif | ||
244 | EUID_ASSERT(); | 247 | EUID_ASSERT(); |
245 | 248 | ||
246 | // check and process conditional profile lines | 249 | // check and process conditional profile lines |
@@ -868,7 +871,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
868 | } | 871 | } |
869 | 872 | ||
870 | // nice value | 873 | // nice value |
871 | if (strncmp(ptr, "nice ", 4) == 0) { | 874 | if (strncmp(ptr, "nice ", 5) == 0) { |
872 | cfg.nice = atoi(ptr + 5); | 875 | cfg.nice = atoi(ptr + 5); |
873 | if (getuid() != 0 &&cfg.nice < 0) | 876 | if (getuid() != 0 &&cfg.nice < 0) |
874 | cfg.nice = 0; | 877 | cfg.nice = 0; |
@@ -878,7 +881,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
878 | 881 | ||
879 | // cgroup | 882 | // cgroup |
880 | if (strncmp(ptr, "cgroup ", 7) == 0) { | 883 | if (strncmp(ptr, "cgroup ", 7) == 0) { |
881 | set_cgroup(ptr + 7); | 884 | if (checkcfg(CFG_CGROUP)) |
885 | set_cgroup(ptr + 7); | ||
886 | else | ||
887 | warning_feature_disabled("cgroup"); | ||
882 | return 0; | 888 | return 0; |
883 | } | 889 | } |
884 | 890 | ||
@@ -1123,8 +1129,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
1123 | } | 1129 | } |
1124 | cfg.overlay_dir = fs_check_overlay_dir(subdirname, arg_overlay_reuse); | 1130 | cfg.overlay_dir = fs_check_overlay_dir(subdirname, arg_overlay_reuse); |
1125 | } | 1131 | } |
1126 | 1132 | else | |
1133 | warning_feature_disabled("overlayfs"); | ||
1127 | return 0; | 1134 | return 0; |
1135 | |||
1128 | } else if (strcmp(ptr, "overlay-tmpfs") == 0) { | 1136 | } else if (strcmp(ptr, "overlay-tmpfs") == 0) { |
1129 | if (checkcfg(CFG_OVERLAYFS)) { | 1137 | if (checkcfg(CFG_OVERLAYFS)) { |
1130 | if (arg_overlay) { | 1138 | if (arg_overlay) { |
@@ -1141,9 +1149,11 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
1141 | exit(1); | 1149 | exit(1); |
1142 | } | 1150 | } |
1143 | arg_overlay = 1; | 1151 | arg_overlay = 1; |
1144 | |||
1145 | return 0; | ||
1146 | } | 1152 | } |
1153 | else | ||
1154 | warning_feature_disabled("overlayfs"); | ||
1155 | return 0; | ||
1156 | |||
1147 | } else if (strcmp(ptr, "overlay") == 0) { | 1157 | } else if (strcmp(ptr, "overlay") == 0) { |
1148 | if (checkcfg(CFG_OVERLAYFS)) { | 1158 | if (checkcfg(CFG_OVERLAYFS)) { |
1149 | if (arg_overlay) { | 1159 | if (arg_overlay) { |
@@ -1168,9 +1178,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
1168 | cfg.overlay_dir = fs_check_overlay_dir(subdirname, arg_overlay_reuse); | 1178 | cfg.overlay_dir = fs_check_overlay_dir(subdirname, arg_overlay_reuse); |
1169 | 1179 | ||
1170 | free(subdirname); | 1180 | free(subdirname); |
1171 | |||
1172 | return 0; | ||
1173 | } | 1181 | } |
1182 | else | ||
1183 | warning_feature_disabled("overlayfs"); | ||
1184 | return 0; | ||
1174 | } | 1185 | } |
1175 | #endif | 1186 | #endif |
1176 | 1187 | ||
@@ -1257,26 +1268,30 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
1257 | } | 1268 | } |
1258 | 1269 | ||
1259 | if (strncmp(ptr, "join-or-start ", 14) == 0) { | 1270 | if (strncmp(ptr, "join-or-start ", 14) == 0) { |
1260 | // try to join by name only | 1271 | if (checkcfg(CFG_JOIN) || getuid() == 0) { |
1261 | pid_t pid; | 1272 | // try to join by name only |
1262 | if (!name2pid(ptr + 14, &pid)) { | 1273 | pid_t pid; |
1263 | if (!cfg.shell && !arg_shell_none) | 1274 | if (!name2pid(ptr + 14, &pid)) { |
1264 | cfg.shell = guess_shell(); | 1275 | if (!cfg.shell && !arg_shell_none) |
1265 | 1276 | cfg.shell = guess_shell(); | |
1266 | // find first non-option arg | 1277 | |
1267 | int i; | 1278 | // find first non-option arg |
1268 | for (i = 1; i < cfg.original_argc && strncmp(cfg.original_argv[i], "--", 2) != 0; i++); | 1279 | int i; |
1269 | 1280 | for (i = 1; i < cfg.original_argc && strncmp(cfg.original_argv[i], "--", 2) != 0; i++); | |
1270 | join(pid, cfg.original_argc,cfg.original_argv, i + 1); | 1281 | |
1271 | exit(0); | 1282 | join(pid, cfg.original_argc,cfg.original_argv, i + 1); |
1272 | } | 1283 | exit(0); |
1284 | } | ||
1273 | 1285 | ||
1274 | // set sandbox name and start normally | 1286 | // set sandbox name and start normally |
1275 | cfg.name = ptr + 14; | 1287 | cfg.name = ptr + 14; |
1276 | if (strlen(cfg.name) == 0) { | 1288 | if (strlen(cfg.name) == 0) { |
1277 | fprintf(stderr, "Error: invalid sandbox name\n"); | 1289 | fprintf(stderr, "Error: invalid sandbox name\n"); |
1278 | exit(1); | 1290 | exit(1); |
1291 | } | ||
1279 | } | 1292 | } |
1293 | else | ||
1294 | warning_feature_disabled("join"); | ||
1280 | return 0; | 1295 | return 0; |
1281 | } | 1296 | } |
1282 | 1297 | ||
@@ -1298,8 +1313,13 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
1298 | arg_whitelist = 1; | 1313 | arg_whitelist = 1; |
1299 | ptr += 10; | 1314 | ptr += 10; |
1300 | } | 1315 | } |
1301 | else | 1316 | else { |
1317 | if (!whitelist_warning_printed) { | ||
1318 | warning_feature_disabled("whitelist"); | ||
1319 | whitelist_warning_printed = 1; | ||
1320 | } | ||
1302 | return 0; | 1321 | return 0; |
1322 | } | ||
1303 | #else | 1323 | #else |
1304 | return 0; | 1324 | return 0; |
1305 | #endif | 1325 | #endif |
diff --git a/src/firejail/protocol.c b/src/firejail/protocol.c index 9989ddb68..72d29c671 100644 --- a/src/firejail/protocol.c +++ b/src/firejail/protocol.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c index c683eea3a..26beaf35a 100644 --- a/src/firejail/pulseaudio.c +++ b/src/firejail/pulseaudio.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/restrict_users.c b/src/firejail/restrict_users.c index 4ffec4c7f..7778d7ed8 100644 --- a/src/firejail/restrict_users.c +++ b/src/firejail/restrict_users.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/restricted_shell.c b/src/firejail/restricted_shell.c index 9beb01655..ce809c697 100644 --- a/src/firejail/restricted_shell.c +++ b/src/firejail/restricted_shell.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/rlimit.c b/src/firejail/rlimit.c index 8d62a5b6b..ea9fb2d6b 100644 --- a/src/firejail/rlimit.c +++ b/src/firejail/rlimit.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/run_files.c b/src/firejail/run_files.c index 361ad1414..521a8aa02 100644 --- a/src/firejail/run_files.c +++ b/src/firejail/run_files.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -76,28 +76,19 @@ void delete_run_files(pid_t pid) { | |||
76 | } | 76 | } |
77 | 77 | ||
78 | static char *newname(char *name) { | 78 | static char *newname(char *name) { |
79 | char *rv; | 79 | char *rv = name; |
80 | pid_t pid; | 80 | pid_t pid; |
81 | 81 | ||
82 | // try the name | 82 | if (checkcfg(CFG_NAME_CHANGE)) { |
83 | if (name2pid(name, &pid)) | 83 | // try the name |
84 | return name; | 84 | if (name2pid(name, &pid)) |
85 | return name; | ||
85 | 86 | ||
86 | // try name-1 to 9 | 87 | // return name-pid |
87 | int i; | 88 | if (asprintf(&rv, "%s-%d", name, getpid()) == -1) |
88 | for (i = 1; i < 10; i++) { | ||
89 | if (asprintf(&rv, "%s-%d", name, i) == -1) | ||
90 | errExit("asprintf"); | 89 | errExit("asprintf"); |
91 | if (name2pid(rv, &pid)) { | ||
92 | fwarning("Sandbox name changed to %s\n", rv); | ||
93 | return rv; | ||
94 | } | ||
95 | free(rv); | ||
96 | } | 90 | } |
97 | 91 | ||
98 | // return name-pid | ||
99 | if (asprintf(&rv, "%s-%d", name, getpid()) == -1) | ||
100 | errExit("asprintf"); | ||
101 | return rv; | 92 | return rv; |
102 | } | 93 | } |
103 | 94 | ||
diff --git a/src/firejail/run_symlink.c b/src/firejail/run_symlink.c index ec8e0f1e5..ee62bba32 100644 --- a/src/firejail/run_symlink.c +++ b/src/firejail/run_symlink.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index 735bab684..9bb8e545c 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c index 10c96225a..7dca9aa99 100644 --- a/src/firejail/sbox.c +++ b/src/firejail/sbox.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/seccomp.c b/src/firejail/seccomp.c index 1cdd96025..81ab18aa1 100644 --- a/src/firejail/seccomp.c +++ b/src/firejail/seccomp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/shutdown.c b/src/firejail/shutdown.c index 743a256a4..b70394bc8 100644 --- a/src/firejail/shutdown.c +++ b/src/firejail/shutdown.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/usage.c b/src/firejail/usage.c index 7c0c0d075..993ba92bb 100644 --- a/src/firejail/usage.c +++ b/src/firejail/usage.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/util.c b/src/firejail/util.c index b1fba4226..0e869ef7a 100644 --- a/src/firejail/util.c +++ b/src/firejail/util.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firejail/x11.c b/src/firejail/x11.c index a59ee3ffb..63b36053b 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/apparmor.c b/src/firemon/apparmor.c index 0b921f8a2..cf5808b00 100644 --- a/src/firemon/apparmor.c +++ b/src/firemon/apparmor.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/arp.c b/src/firemon/arp.c index 9f3e50e94..9c8cb9f52 100644 --- a/src/firemon/arp.c +++ b/src/firemon/arp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/caps.c b/src/firemon/caps.c index 0df338439..c3e1aa5f1 100644 --- a/src/firemon/caps.c +++ b/src/firemon/caps.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/cgroup.c b/src/firemon/cgroup.c index 8dbf85824..f2020eafb 100644 --- a/src/firemon/cgroup.c +++ b/src/firemon/cgroup.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/cpu.c b/src/firemon/cpu.c index e552959e8..6186ff3f0 100644 --- a/src/firemon/cpu.c +++ b/src/firemon/cpu.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c index 147b5073b..e5f1b6f9a 100644 --- a/src/firemon/firemon.c +++ b/src/firemon/firemon.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/firemon.h b/src/firemon/firemon.h index e5a528254..2e5647c2f 100644 --- a/src/firemon/firemon.h +++ b/src/firemon/firemon.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/interface.c b/src/firemon/interface.c index 3e0f10d0b..0a0801fee 100644 --- a/src/firemon/interface.c +++ b/src/firemon/interface.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/list.c b/src/firemon/list.c index cc1a871c6..68a066604 100644 --- a/src/firemon/list.c +++ b/src/firemon/list.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/netstats.c b/src/firemon/netstats.c index 04c47d747..e7a4354d1 100644 --- a/src/firemon/netstats.c +++ b/src/firemon/netstats.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/procevent.c b/src/firemon/procevent.c index 64d7d8f2d..b79f12362 100644 --- a/src/firemon/procevent.c +++ b/src/firemon/procevent.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/route.c b/src/firemon/route.c index 6db212831..105814434 100644 --- a/src/firemon/route.c +++ b/src/firemon/route.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/seccomp.c b/src/firemon/seccomp.c index c361ec76d..099ac8819 100644 --- a/src/firemon/seccomp.c +++ b/src/firemon/seccomp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/top.c b/src/firemon/top.c index b8dd92b3c..514b9710e 100644 --- a/src/firemon/top.c +++ b/src/firemon/top.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/tree.c b/src/firemon/tree.c index 07680d6d5..9e9900c53 100644 --- a/src/firemon/tree.c +++ b/src/firemon/tree.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/usage.c b/src/firemon/usage.c index 5714643cc..3b9fe96c0 100644 --- a/src/firemon/usage.c +++ b/src/firemon/usage.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/firemon/x11.c b/src/firemon/x11.c index 09eb3cd06..3eb06390a 100644 --- a/src/firemon/x11.c +++ b/src/firemon/x11.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fldd/main.c b/src/fldd/main.c index d9adcdcf6..d085ea59b 100644 --- a/src/fldd/main.c +++ b/src/fldd/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -297,7 +297,7 @@ printf("\n"); | |||
297 | } | 297 | } |
298 | 298 | ||
299 | 299 | ||
300 | if (strcmp(argv[1], "--help") == 0) { | 300 | if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0) { |
301 | usage(); | 301 | usage(); |
302 | return 0; | 302 | return 0; |
303 | } | 303 | } |
@@ -312,11 +312,6 @@ printf("\n"); | |||
312 | if (quiet && strcmp(quiet, "yes") == 0) | 312 | if (quiet && strcmp(quiet, "yes") == 0) |
313 | arg_quiet = 1; | 313 | arg_quiet = 1; |
314 | 314 | ||
315 | if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") ==0) { | ||
316 | usage(); | ||
317 | return 0; | ||
318 | } | ||
319 | |||
320 | int fd = STDOUT_FILENO; | 315 | int fd = STDOUT_FILENO; |
321 | // attempt to open the file | 316 | // attempt to open the file |
322 | if (argc == 3) { | 317 | if (argc == 3) { |
diff --git a/src/fnet/arp.c b/src/fnet/arp.c index 3c2a2361b..a4fe02987 100644 --- a/src/fnet/arp.c +++ b/src/fnet/arp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fnet/fnet.h b/src/fnet/fnet.h index fcbb3cd84..4900967f7 100644 --- a/src/fnet/fnet.h +++ b/src/fnet/fnet.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fnet/interface.c b/src/fnet/interface.c index 283c6d312..7e7cceeed 100644 --- a/src/fnet/interface.c +++ b/src/fnet/interface.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fnet/main.c b/src/fnet/main.c index ec8b2cade..890f842f6 100644 --- a/src/fnet/main.c +++ b/src/fnet/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fnet/veth.c b/src/fnet/veth.c index e4d3db21a..7a32da2d1 100644 --- a/src/fnet/veth.c +++ b/src/fnet/veth.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | /* | 28 | /* |
29 | * Copyright (C) 2014-2018 Firejail Authors | 29 | * Copyright (C) 2014-2019 Firejail Authors |
30 | * | 30 | * |
31 | * This file is part of firejail project | 31 | * This file is part of firejail project |
32 | * | 32 | * |
diff --git a/src/fnetfilter/main.c b/src/fnetfilter/main.c index 34ebf5926..7be6390e5 100644 --- a/src/fnetfilter/main.c +++ b/src/fnetfilter/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fsec-optimize/fsec_optimize.h b/src/fsec-optimize/fsec_optimize.h index 7a19b318b..76126d734 100644 --- a/src/fsec-optimize/fsec_optimize.h +++ b/src/fsec-optimize/fsec_optimize.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fsec-optimize/main.c b/src/fsec-optimize/main.c index 80ca098cb..b968bd5f3 100644 --- a/src/fsec-optimize/main.c +++ b/src/fsec-optimize/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fsec-optimize/optimizer.c b/src/fsec-optimize/optimizer.c index 98e4aaa34..f9e4b6a6c 100644 --- a/src/fsec-optimize/optimizer.c +++ b/src/fsec-optimize/optimizer.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fsec-print/fsec_print.h b/src/fsec-print/fsec_print.h index 10c7d8f3d..0a40c09ed 100644 --- a/src/fsec-print/fsec_print.h +++ b/src/fsec-print/fsec_print.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fsec-print/main.c b/src/fsec-print/main.c index 5a1e34080..ed942c806 100644 --- a/src/fsec-print/main.c +++ b/src/fsec-print/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fsec-print/print.c b/src/fsec-print/print.c index 1042f0c3e..d58ce2df9 100644 --- a/src/fsec-print/print.c +++ b/src/fsec-print/print.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -206,7 +206,7 @@ static void bpf_decode_args(const struct sock_filter *bpf, unsigned int line) { | |||
206 | printf("data.syscall-number"); | 206 | printf("data.syscall-number"); |
207 | syscall_loaded = 1; | 207 | syscall_loaded = 1; |
208 | } | 208 | } |
209 | else if (bpf->k == offsetof(struct seccomp_data, nr)) | 209 | else if (bpf->k == offsetof(struct seccomp_data, instruction_pointer)) |
210 | printf("data.instruction_pointer"); | 210 | printf("data.instruction_pointer"); |
211 | else { | 211 | else { |
212 | int index = bpf->k - offsetof(struct seccomp_data, args); | 212 | int index = bpf->k - offsetof(struct seccomp_data, args); |
diff --git a/src/fsec-print/syscall_list.c b/src/fsec-print/syscall_list.c index 8ea53e74e..db443f5e2 100644 --- a/src/fsec-print/syscall_list.c +++ b/src/fsec-print/syscall_list.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fseccomp/errno.c b/src/fseccomp/errno.c index 78d219c9e..d4c2b9249 100644 --- a/src/fseccomp/errno.c +++ b/src/fseccomp/errno.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fseccomp/fseccomp.h b/src/fseccomp/fseccomp.h index 22b02cd16..593963e76 100644 --- a/src/fseccomp/fseccomp.h +++ b/src/fseccomp/fseccomp.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fseccomp/main.c b/src/fseccomp/main.c index 7fd96bc43..faf38ade1 100644 --- a/src/fseccomp/main.c +++ b/src/fseccomp/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fseccomp/protocol.c b/src/fseccomp/protocol.c index 18e81f633..cdd9f3a40 100644 --- a/src/fseccomp/protocol.c +++ b/src/fseccomp/protocol.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fseccomp/seccomp.c b/src/fseccomp/seccomp.c index 777c38c43..fc0299a34 100644 --- a/src/fseccomp/seccomp.c +++ b/src/fseccomp/seccomp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fseccomp/seccomp_file.c b/src/fseccomp/seccomp_file.c index fd89fc8d5..2e1f317ed 100644 --- a/src/fseccomp/seccomp_file.c +++ b/src/fseccomp/seccomp_file.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fseccomp/seccomp_secondary.c b/src/fseccomp/seccomp_secondary.c index e398f94d0..fd0bc5a50 100644 --- a/src/fseccomp/seccomp_secondary.c +++ b/src/fseccomp/seccomp_secondary.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/fseccomp/syscall.c b/src/fseccomp/syscall.c index 3f5fbbbfa..3b698d2dd 100644 --- a/src/fseccomp/syscall.c +++ b/src/fseccomp/syscall.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -546,7 +546,7 @@ static void syscall_in_list(int fd, int syscall, int arg, void *ptrarg) { | |||
546 | } | 546 | } |
547 | else { // no problem, add to pre-exec list | 547 | else { // no problem, add to pre-exec list |
548 | // build syscall:error_no | 548 | // build syscall:error_no |
549 | char *newcall; | 549 | char *newcall = NULL; |
550 | if (arg != 0) { | 550 | if (arg != 0) { |
551 | if (asprintf(&newcall, "%s:%s", syscall_find_nr(syscall), errno_find_nr(arg)) == -1) | 551 | if (asprintf(&newcall, "%s:%s", syscall_find_nr(syscall), errno_find_nr(arg)) == -1) |
552 | errExit("asprintf"); | 552 | errExit("asprintf"); |
@@ -560,6 +560,7 @@ static void syscall_in_list(int fd, int syscall, int arg, void *ptrarg) { | |||
560 | if (ptr->prelist) { | 560 | if (ptr->prelist) { |
561 | if (asprintf(&ptr->prelist, "%s,%s", ptr->prelist, newcall) == -1) | 561 | if (asprintf(&ptr->prelist, "%s,%s", ptr->prelist, newcall) == -1) |
562 | errExit("asprintf"); | 562 | errExit("asprintf"); |
563 | free(newcall); | ||
563 | } | 564 | } |
564 | else | 565 | else |
565 | ptr->prelist = newcall; | 566 | ptr->prelist = newcall; |
diff --git a/src/ftee/ftee.h b/src/ftee/ftee.h index 68c4201c7..0b026aa7f 100644 --- a/src/ftee/ftee.h +++ b/src/ftee/ftee.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/ftee/main.c b/src/ftee/main.c index 0e37f0b72..f488c10a2 100644 --- a/src/ftee/main.c +++ b/src/ftee/main.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/include/common.h b/src/include/common.h index a80ad4688..699ed765d 100644 --- a/src/include/common.h +++ b/src/include/common.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/include/euid_common.h b/src/include/euid_common.h index b31c3e760..9975c72bf 100644 --- a/src/include/euid_common.h +++ b/src/include/euid_common.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/include/firejail_user.h b/src/include/firejail_user.h index 66e618fbe..21311bc5d 100644 --- a/src/include/firejail_user.h +++ b/src/include/firejail_user.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/include/ldd_utils.h b/src/include/ldd_utils.h index 28f5be7bf..e5ec67171 100644 --- a/src/include/ldd_utils.h +++ b/src/include/ldd_utils.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/include/pid.h b/src/include/pid.h index 55f2893a8..9d4735bdd 100644 --- a/src/include/pid.h +++ b/src/include/pid.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/include/seccomp.h b/src/include/seccomp.h index 4f84e3c45..6af84f821 100644 --- a/src/include/seccomp.h +++ b/src/include/seccomp.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/include/syscall.h b/src/include/syscall.h index 6d301158e..766f771cf 100644 --- a/src/include/syscall.h +++ b/src/include/syscall.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/lib/common.c b/src/lib/common.c index d6dd43c4b..3d701e62f 100644 --- a/src/lib/common.c +++ b/src/lib/common.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/lib/firejail_user.c b/src/lib/firejail_user.c index a595d8331..f7234cc08 100644 --- a/src/lib/firejail_user.c +++ b/src/lib/firejail_user.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/lib/ldd_utils.c b/src/lib/ldd_utils.c index b8a7aeed2..453c7e9dc 100644 --- a/src/lib/ldd_utils.c +++ b/src/lib/ldd_utils.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/lib/pid.c b/src/lib/pid.c index ee1550e57..c4235ede3 100644 --- a/src/lib/pid.c +++ b/src/lib/pid.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/libpostexecseccomp/libpostexecseccomp.c b/src/libpostexecseccomp/libpostexecseccomp.c index 856adb8fe..e51445de4 100644 --- a/src/libpostexecseccomp/libpostexecseccomp.c +++ b/src/libpostexecseccomp/libpostexecseccomp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/libpostexecseccomp/libpostexecseccomp.h b/src/libpostexecseccomp/libpostexecseccomp.h index 52d3128c9..908364d43 100644 --- a/src/libpostexecseccomp/libpostexecseccomp.h +++ b/src/libpostexecseccomp/libpostexecseccomp.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c index c41bafb68..397761c74 100644 --- a/src/libtrace/libtrace.c +++ b/src/libtrace/libtrace.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/libtracelog/libtracelog.c b/src/libtracelog/libtracelog.c index 0f8d5a00d..420c9370c 100644 --- a/src/libtracelog/libtracelog.c +++ b/src/libtracelog/libtracelog.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
@@ -181,7 +181,9 @@ static void load_blacklist(void) { | |||
181 | 181 | ||
182 | // extract blacklists | 182 | // extract blacklists |
183 | char buf[MAXBUF]; | 183 | char buf[MAXBUF]; |
184 | #ifdef DEBUG | ||
184 | int cnt = 0; | 185 | int cnt = 0; |
186 | #endif | ||
185 | while (fgets(buf, MAXBUF, fp)) { | 187 | while (fgets(buf, MAXBUF, fp)) { |
186 | if (strncmp(buf, "sandbox pid: ", 13) == 0) { | 188 | if (strncmp(buf, "sandbox pid: ", 13) == 0) { |
187 | char *ptr = strchr(buf, '\n'); | 189 | char *ptr = strchr(buf, '\n'); |
@@ -202,7 +204,9 @@ static void load_blacklist(void) { | |||
202 | if (ptr) | 204 | if (ptr) |
203 | *ptr = '\0'; | 205 | *ptr = '\0'; |
204 | storage_add(buf + 10); | 206 | storage_add(buf + 10); |
207 | #ifdef DEBUG | ||
205 | cnt++; | 208 | cnt++; |
209 | #endif | ||
206 | } | 210 | } |
207 | } | 211 | } |
208 | fclose(fp); | 212 | fclose(fp); |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index 2d0bd26d0..052aeb56b 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -770,12 +770,26 @@ $ firejail \-\-net=eth0 \-\-mtu=1492 | |||
770 | \fB\-\-name=name | 770 | \fB\-\-name=name |
771 | Set sandbox name. Several options, such as \-\-join and \-\-shutdown, can use | 771 | Set sandbox name. Several options, such as \-\-join and \-\-shutdown, can use |
772 | this name to identify a sandbox. | 772 | this name to identify a sandbox. |
773 | |||
774 | In case the name supplied by the user is already in use by another sandbox, Firejail will assign a | ||
775 | new name as "name-PID", where PID is the process ID of the sandbox. This functionality | ||
776 | can be disabled at run time in /etc/firejail/firejail.config file, by setting "name-change" flag to "no". | ||
773 | .br | 777 | .br |
774 | 778 | ||
775 | .br | 779 | .br |
776 | Example: | 780 | Example: |
777 | .br | 781 | .br |
778 | $ firejail \-\-name=mybrowser firefox | 782 | $ firejail \-\-name=browser firefox & |
783 | .br | ||
784 | $ firejail \-\-name=browser \-\-private \ | ||
785 | firefox \-\-no-remote & | ||
786 | .br | ||
787 | $ firejail --list | ||
788 | .br | ||
789 | 1198:netblue:browser:firejail --name=browser firefox | ||
790 | .br | ||
791 | 1312:netblue:browser-1312:firejail --name=browser --private firefox --no-remote | ||
792 | .br | ||
779 | 793 | ||
780 | .TP | 794 | .TP |
781 | \fB\-\-net=bridge_interface | 795 | \fB\-\-net=bridge_interface |
@@ -2513,7 +2527,7 @@ AppArmor support is disabled by default at compile time. Use --enable-apparmor c | |||
2513 | .br | 2527 | .br |
2514 | $ ./configure --prefix=/usr --enable-apparmor | 2528 | $ ./configure --prefix=/usr --enable-apparmor |
2515 | .TP | 2529 | .TP |
2516 | During software install, a generic AppArmor profile file, firejail-default, is placed in /etc/apparmor.d directory. The local customizations can be placed in /etc/apparmor.d/local/firejail-local. The profile needs to be loaded into the kernel by reloading apparmor.service, rebooting the system or running the following command as root: | 2530 | During software install, a generic AppArmor profile file, firejail-default, is placed in /etc/apparmor.d directory. The local customizations must be placed in /etc/apparmor.d/local/firejail-local. The profile needs to be loaded into the kernel by reloading apparmor.service, rebooting the system or running the following command as root: |
2517 | .br | 2531 | .br |
2518 | 2532 | ||
2519 | .br | 2533 | .br |
diff --git a/src/tools/extract_caps.c b/src/tools/extract_caps.c index 9769fb071..24c2b1bd1 100644 --- a/src/tools/extract_caps.c +++ b/src/tools/extract_caps.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/tools/extract_syscalls.c b/src/tools/extract_syscalls.c index d7e16e912..d762d283b 100644 --- a/src/tools/extract_syscalls.c +++ b/src/tools/extract_syscalls.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/src/tools/testuid.c b/src/tools/testuid.c index 51395a98d..2f85d0252 100644 --- a/src/tools/testuid.c +++ b/src/tools/testuid.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/test/appimage/appimage-args.exp b/test/appimage/appimage-args.exp index 0ec07c1ad..b8c7ee850 100755 --- a/test/appimage/appimage-args.exp +++ b/test/appimage/appimage-args.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/appimage/appimage-v1.exp b/test/appimage/appimage-v1.exp index 90b13b9ff..07f7d0d17 100755 --- a/test/appimage/appimage-v1.exp +++ b/test/appimage/appimage-v1.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/appimage/appimage-v2.exp b/test/appimage/appimage-v2.exp index f840a3d2d..7d3ba36c2 100755 --- a/test/appimage/appimage-v2.exp +++ b/test/appimage/appimage-v2.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/appimage/appimage.sh b/test/appimage/appimage.sh index 8fff40949..bcd82750e 100755 --- a/test/appimage/appimage.sh +++ b/test/appimage/appimage.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/appimage/filename.exp b/test/appimage/filename.exp index ac2f470f9..48bea4b3f 100755 --- a/test/appimage/filename.exp +++ b/test/appimage/filename.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11-xorg/apps-x11-xorg.sh b/test/apps-x11-xorg/apps-x11-xorg.sh index ea07d3713..fd532f7b0 100755 --- a/test/apps-x11-xorg/apps-x11-xorg.sh +++ b/test/apps-x11-xorg/apps-x11-xorg.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/apps-x11-xorg/firefox.exp b/test/apps-x11-xorg/firefox.exp index 10575b277..39b18aec0 100755 --- a/test/apps-x11-xorg/firefox.exp +++ b/test/apps-x11-xorg/firefox.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11-xorg/thunderbird.exp b/test/apps-x11-xorg/thunderbird.exp index 6706cc321..c46a5b6f0 100755 --- a/test/apps-x11-xorg/thunderbird.exp +++ b/test/apps-x11-xorg/thunderbird.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11-xorg/transmission-gtk.exp b/test/apps-x11-xorg/transmission-gtk.exp index 75c302764..5dfabd611 100755 --- a/test/apps-x11-xorg/transmission-gtk.exp +++ b/test/apps-x11-xorg/transmission-gtk.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh index c12b11f3e..e195036ce 100755 --- a/test/apps-x11/apps-x11.sh +++ b/test/apps-x11/apps-x11.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/apps-x11/chromium.exp b/test/apps-x11/chromium.exp index f72b86dde..8ec03674b 100755 --- a/test/apps-x11/chromium.exp +++ b/test/apps-x11/chromium.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11/firefox.exp b/test/apps-x11/firefox.exp index 8021042e5..8201b829f 100755 --- a/test/apps-x11/firefox.exp +++ b/test/apps-x11/firefox.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11/thunderbird.exp b/test/apps-x11/thunderbird.exp index 5994ab15e..cde842697 100755 --- a/test/apps-x11/thunderbird.exp +++ b/test/apps-x11/thunderbird.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11/transmission-gtk.exp b/test/apps-x11/transmission-gtk.exp index 48c685cf0..19dc1a24f 100755 --- a/test/apps-x11/transmission-gtk.exp +++ b/test/apps-x11/transmission-gtk.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11/x11-none.exp b/test/apps-x11/x11-none.exp index e6e515966..43adf67e2 100755 --- a/test/apps-x11/x11-none.exp +++ b/test/apps-x11/x11-none.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11/x11-xephyr.exp b/test/apps-x11/x11-xephyr.exp index 68f981096..6b8fa7da7 100755 --- a/test/apps-x11/x11-xephyr.exp +++ b/test/apps-x11/x11-xephyr.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11/xterm-xephyr.exp b/test/apps-x11/xterm-xephyr.exp index 63fa03fbb..5cbab4eb1 100755 --- a/test/apps-x11/xterm-xephyr.exp +++ b/test/apps-x11/xterm-xephyr.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11/xterm-xorg.exp b/test/apps-x11/xterm-xorg.exp index a31925383..2ec25e6c3 100755 --- a/test/apps-x11/xterm-xorg.exp +++ b/test/apps-x11/xterm-xorg.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps-x11/xterm-xpra.exp b/test/apps-x11/xterm-xpra.exp index 8830bb003..9134dbdce 100755 --- a/test/apps-x11/xterm-xpra.exp +++ b/test/apps-x11/xterm-xpra.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/apps.sh b/test/apps/apps.sh index a3d0c4dc7..01546d104 100755 --- a/test/apps/apps.sh +++ b/test/apps/apps.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/apps/chromium.exp b/test/apps/chromium.exp index 9373bb70e..664d4918f 100755 --- a/test/apps/chromium.exp +++ b/test/apps/chromium.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/deluge.exp b/test/apps/deluge.exp index 63811aecc..8d685e0c5 100755 --- a/test/apps/deluge.exp +++ b/test/apps/deluge.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/fbreader.exp b/test/apps/fbreader.exp index 64c569225..52d7ff268 100755 --- a/test/apps/fbreader.exp +++ b/test/apps/fbreader.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/filezilla.exp b/test/apps/filezilla.exp index e04d6ed2b..74f478ace 100755 --- a/test/apps/filezilla.exp +++ b/test/apps/filezilla.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/firefox.exp b/test/apps/firefox.exp index a646ecbde..34164d780 100755 --- a/test/apps/firefox.exp +++ b/test/apps/firefox.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/gnome-mplayer.exp b/test/apps/gnome-mplayer.exp index 3c360a32c..12d0a880d 100755 --- a/test/apps/gnome-mplayer.exp +++ b/test/apps/gnome-mplayer.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/gthumb.exp b/test/apps/gthumb.exp index e13ca6179..0631dff6f 100755 --- a/test/apps/gthumb.exp +++ b/test/apps/gthumb.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/hexchat.exp b/test/apps/hexchat.exp index d83ac6655..ec859df25 100755 --- a/test/apps/hexchat.exp +++ b/test/apps/hexchat.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/kcalc.exp b/test/apps/kcalc.exp index 247444b05..fac1a7344 100755 --- a/test/apps/kcalc.exp +++ b/test/apps/kcalc.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/ktorrent.exp b/test/apps/ktorrent.exp index fb7fab5e4..527de98fe 100755 --- a/test/apps/ktorrent.exp +++ b/test/apps/ktorrent.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/midori.exp b/test/apps/midori.exp index cefdbc0d9..4dd4160f9 100755 --- a/test/apps/midori.exp +++ b/test/apps/midori.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/opera.exp b/test/apps/opera.exp index 21a560ac3..72ad5e27a 100755 --- a/test/apps/opera.exp +++ b/test/apps/opera.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/qbittorrent.exp b/test/apps/qbittorrent.exp index 7e93fdc1d..f0f3c5c6c 100755 --- a/test/apps/qbittorrent.exp +++ b/test/apps/qbittorrent.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/thunderbird.exp b/test/apps/thunderbird.exp index 2440d612f..1d2711694 100755 --- a/test/apps/thunderbird.exp +++ b/test/apps/thunderbird.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/transmission-qt.exp b/test/apps/transmission-qt.exp index c74ea2aac..4ef9ec8b5 100755 --- a/test/apps/transmission-qt.exp +++ b/test/apps/transmission-qt.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/uget-gtk.exp b/test/apps/uget-gtk.exp index eabe150ee..00e6d1b17 100755 --- a/test/apps/uget-gtk.exp +++ b/test/apps/uget-gtk.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/vlc.exp b/test/apps/vlc.exp index 364b5c567..04e8a3757 100755 --- a/test/apps/vlc.exp +++ b/test/apps/vlc.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/wine.exp b/test/apps/wine.exp index 261232738..f045e47da 100755 --- a/test/apps/wine.exp +++ b/test/apps/wine.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/apps/xchat.exp b/test/apps/xchat.exp index 587c837e6..dae8638ef 100755 --- a/test/apps/xchat.exp +++ b/test/apps/xchat.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/chroot/chroot.sh b/test/chroot/chroot.sh index 0f0fdab22..ac7bc6a54 100755 --- a/test/chroot/chroot.sh +++ b/test/chroot/chroot.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/environment/env.exp b/test/environment/env.exp index 4557cd9b2..da16f81b3 100755 --- a/test/environment/env.exp +++ b/test/environment/env.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/environment/environment.sh b/test/environment/environment.sh index 97ba8ba58..85d6c0873 100755 --- a/test/environment/environment.sh +++ b/test/environment/environment.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/environment/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp index 29f82007b..53ddde807 100755 --- a/test/environment/firejail-in-firejail.exp +++ b/test/environment/firejail-in-firejail.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/environment/hostfile.exp b/test/environment/hostfile.exp index fd85a25ea..86acd7f3c 100755 --- a/test/environment/hostfile.exp +++ b/test/environment/hostfile.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | 6 | ||
diff --git a/test/environment/machineid.exp b/test/environment/machineid.exp index 0c6b1c936..7d3bdee43 100755 --- a/test/environment/machineid.exp +++ b/test/environment/machineid.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | 6 | ||
diff --git a/test/environment/nice.exp b/test/environment/nice.exp index 9a7e2e9f7..81f81e0b8 100755 --- a/test/environment/nice.exp +++ b/test/environment/nice.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/environment/quiet.exp b/test/environment/quiet.exp index 206c2ac8f..28b1a9f4f 100755 --- a/test/environment/quiet.exp +++ b/test/environment/quiet.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 4 | 6 | set timeout 4 |
diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp index e8195d1fb..89d4cfda5 100755 --- a/test/environment/shell-none.exp +++ b/test/environment/shell-none.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/environment/sound.exp b/test/environment/sound.exp index 29d431c5e..c44268708 100755 --- a/test/environment/sound.exp +++ b/test/environment/sound.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | 6 | ||
diff --git a/test/environment/timeout.exp b/test/environment/timeout.exp index d69cef071..83aefabb9 100755 --- a/test/environment/timeout.exp +++ b/test/environment/timeout.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fcopy/cmdline.exp b/test/fcopy/cmdline.exp index b68a09f99..a10aab463 100755 --- a/test/fcopy/cmdline.exp +++ b/test/fcopy/cmdline.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fcopy/dircopy.exp b/test/fcopy/dircopy.exp index bb5a1e45e..d9e361d05 100755 --- a/test/fcopy/dircopy.exp +++ b/test/fcopy/dircopy.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | # | 6 | # |
diff --git a/test/fcopy/fcopy.sh b/test/fcopy/fcopy.sh index 78dab4986..728782d49 100755 --- a/test/fcopy/fcopy.sh +++ b/test/fcopy/fcopy.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/fcopy/filecopy.exp b/test/fcopy/filecopy.exp index e5d6fb0bc..ffad16911 100755 --- a/test/fcopy/filecopy.exp +++ b/test/fcopy/filecopy.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | # | 6 | # |
diff --git a/test/fcopy/linkcopy.exp b/test/fcopy/linkcopy.exp index ab3369bbc..a82faf7bd 100755 --- a/test/fcopy/linkcopy.exp +++ b/test/fcopy/linkcopy.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | # | 6 | # |
diff --git a/test/filters/apparmor.exp b/test/filters/apparmor.exp index acc42a117..9238a1148 100755 --- a/test/filters/apparmor.exp +++ b/test/filters/apparmor.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/caps-join.exp b/test/filters/caps-join.exp index 2e29ef763..3e12d23bb 100755 --- a/test/filters/caps-join.exp +++ b/test/filters/caps-join.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/caps-print.exp b/test/filters/caps-print.exp index ce85a7732..d145d4d23 100755 --- a/test/filters/caps-print.exp +++ b/test/filters/caps-print.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/caps.exp b/test/filters/caps.exp index 5a89dbf1b..515da744f 100755 --- a/test/filters/caps.exp +++ b/test/filters/caps.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/debug.exp b/test/filters/debug.exp index 5c9005b45..25c499e6a 100755 --- a/test/filters/debug.exp +++ b/test/filters/debug.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/filters.sh b/test/filters/filters.sh index 33f205e05..114978f65 100755 --- a/test/filters/filters.sh +++ b/test/filters/filters.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/filters/fseccomp.exp b/test/filters/fseccomp.exp index 87c5932ae..70f85ccfa 100755 --- a/test/filters/fseccomp.exp +++ b/test/filters/fseccomp.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/memwrexe-32.exp b/test/filters/memwrexe-32.exp index fb06e6e1c..bd6a191f9 100755 --- a/test/filters/memwrexe-32.exp +++ b/test/filters/memwrexe-32.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/memwrexe.exp b/test/filters/memwrexe.exp index abc16660c..da68b3b5f 100755 --- a/test/filters/memwrexe.exp +++ b/test/filters/memwrexe.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp index dee0416c1..68304437f 100755 --- a/test/filters/noroot.exp +++ b/test/filters/noroot.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/protocol.exp b/test/filters/protocol.exp index 81c2a76de..8ff9bb7c9 100755 --- a/test/filters/protocol.exp +++ b/test/filters/protocol.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-bad-empty.exp b/test/filters/seccomp-bad-empty.exp index 7dc3854e9..c5efd09be 100755 --- a/test/filters/seccomp-bad-empty.exp +++ b/test/filters/seccomp-bad-empty.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-chmod-profile.exp b/test/filters/seccomp-chmod-profile.exp index 6c8e4406c..19db2177f 100755 --- a/test/filters/seccomp-chmod-profile.exp +++ b/test/filters/seccomp-chmod-profile.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-chmod.exp b/test/filters/seccomp-chmod.exp index 788869cec..f87c28691 100755 --- a/test/filters/seccomp-chmod.exp +++ b/test/filters/seccomp-chmod.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-chown.exp b/test/filters/seccomp-chown.exp index 59bc6792f..934b572c6 100755 --- a/test/filters/seccomp-chown.exp +++ b/test/filters/seccomp-chown.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-debug-32.exp b/test/filters/seccomp-debug-32.exp index 67cfb9729..990520424 100755 --- a/test/filters/seccomp-debug-32.exp +++ b/test/filters/seccomp-debug-32.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-debug.exp b/test/filters/seccomp-debug.exp index cceeb7041..39f836ed0 100755 --- a/test/filters/seccomp-debug.exp +++ b/test/filters/seccomp-debug.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-dualfilter.exp b/test/filters/seccomp-dualfilter.exp index 5a20bb243..32efbdacf 100755 --- a/test/filters/seccomp-dualfilter.exp +++ b/test/filters/seccomp-dualfilter.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 1 | 6 | set timeout 1 |
diff --git a/test/filters/seccomp-empty.exp b/test/filters/seccomp-empty.exp index e610b3172..36f4bc53f 100755 --- a/test/filters/seccomp-empty.exp +++ b/test/filters/seccomp-empty.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-errno.exp b/test/filters/seccomp-errno.exp index b59eadc59..1147c1060 100755 --- a/test/filters/seccomp-errno.exp +++ b/test/filters/seccomp-errno.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-join.exp b/test/filters/seccomp-join.exp index 7a869b85f..f9201f926 100755 --- a/test/filters/seccomp-join.exp +++ b/test/filters/seccomp-join.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-postexec.exp b/test/filters/seccomp-postexec.exp index 4302aec5e..75a935575 100755 --- a/test/filters/seccomp-postexec.exp +++ b/test/filters/seccomp-postexec.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-ptrace.exp b/test/filters/seccomp-ptrace.exp index 272523778..64912a005 100755 --- a/test/filters/seccomp-ptrace.exp +++ b/test/filters/seccomp-ptrace.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/seccomp-run-files.exp b/test/filters/seccomp-run-files.exp index 7a1345902..afdd07bb0 100755 --- a/test/filters/seccomp-run-files.exp +++ b/test/filters/seccomp-run-files.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
@@ -35,13 +35,13 @@ expect { | |||
35 | "/run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 5\n";exit} | 35 | "/run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 5\n";exit} |
36 | "/run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 6\n";exit} | 36 | "/run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 6\n";exit} |
37 | "/run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 7\n";exit} | 37 | "/run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 7\n";exit} |
38 | "/run/firejail/mnt/seccomp.protocol seccomp filter" | 38 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" |
39 | } | 39 | } |
40 | after 100 | 40 | after 100 |
41 | send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" | 41 | send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 8\n";exit} | 43 | timeout {puts "TESTING ERROR 8\n";exit} |
44 | "2" | 44 | "3" |
45 | } | 45 | } |
46 | send -- "exit\r" | 46 | send -- "exit\r" |
47 | sleep 1 | 47 | sleep 1 |
@@ -64,7 +64,7 @@ after 100 | |||
64 | send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" | 64 | send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 13\n";exit} | 66 | timeout {puts "TESTING ERROR 13\n";exit} |
67 | "3" | 67 | "4" |
68 | } | 68 | } |
69 | send -- "exit\r" | 69 | send -- "exit\r" |
70 | sleep 1 | 70 | sleep 1 |
diff --git a/test/filters/seccomp-su.exp b/test/filters/seccomp-su.exp index df1e339d2..3ff75b3b6 100755 --- a/test/filters/seccomp-su.exp +++ b/test/filters/seccomp-su.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/filters/syscall_test.c b/test/filters/syscall_test.c index 09e9614b3..6952c751c 100644 --- a/test/filters/syscall_test.c +++ b/test/filters/syscall_test.c | |||
@@ -1,5 +1,5 @@ | |||
1 | // This file is part of Firejail project | 1 | // This file is part of Firejail project |
2 | // Copyright (C) 2014-2018 Firejail Authors | 2 | // Copyright (C) 2014-2019 Firejail Authors |
3 | // License GPL v2 | 3 | // License GPL v2 |
4 | 4 | ||
5 | #include <stdlib.h> | 5 | #include <stdlib.h> |
diff --git a/test/fnetfilter/cmdline.exp b/test/fnetfilter/cmdline.exp index 71b448611..dcffba35b 100755 --- a/test/fnetfilter/cmdline.exp +++ b/test/fnetfilter/cmdline.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fnetfilter/copy.exp b/test/fnetfilter/copy.exp index bf95338c4..c490c2fe2 100755 --- a/test/fnetfilter/copy.exp +++ b/test/fnetfilter/copy.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fnetfilter/default.exp b/test/fnetfilter/default.exp index 8406160e3..b059852b6 100755 --- a/test/fnetfilter/default.exp +++ b/test/fnetfilter/default.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fnetfilter/fnetfilter.sh b/test/fnetfilter/fnetfilter.sh index aa2eb707a..e3aa2f12b 100755 --- a/test/fnetfilter/fnetfilter.sh +++ b/test/fnetfilter/fnetfilter.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/fnetfilter/template.exp b/test/fnetfilter/template.exp index 5b84166d8..153c21f8a 100755 --- a/test/fnetfilter/template.exp +++ b/test/fnetfilter/template.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/fs.sh b/test/fs/fs.sh index a462a4362..0fc216b20 100755 --- a/test/fs/fs.sh +++ b/test/fs/fs.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/fs/fs_dev_shm.exp b/test/fs/fs_dev_shm.exp index 41dd9d7fd..afd13053e 100755 --- a/test/fs/fs_dev_shm.exp +++ b/test/fs/fs_dev_shm.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/fs_var_lock.exp b/test/fs/fs_var_lock.exp index 72f3c8710..45a2ca1a8 100755 --- a/test/fs/fs_var_lock.exp +++ b/test/fs/fs_var_lock.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/fs_var_tmp.exp b/test/fs/fs_var_tmp.exp index 146a31ddb..8c1cf10af 100755 --- a/test/fs/fs_var_tmp.exp +++ b/test/fs/fs_var_tmp.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/invalid_filename.exp b/test/fs/invalid_filename.exp index 84abe74cd..4155e4ef5 100755 --- a/test/fs/invalid_filename.exp +++ b/test/fs/invalid_filename.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/kmsg.exp b/test/fs/kmsg.exp index e12c71851..253267299 100755 --- a/test/fs/kmsg.exp +++ b/test/fs/kmsg.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/macro.exp b/test/fs/macro.exp index 8080a8108..31a80452b 100755 --- a/test/fs/macro.exp +++ b/test/fs/macro.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/mkdir.exp b/test/fs/mkdir.exp index 81df7cd86..6685f4ee3 100755 --- a/test/fs/mkdir.exp +++ b/test/fs/mkdir.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2016 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 3 | 6 | set timeout 3 |
diff --git a/test/fs/mkdir_mkfile.exp b/test/fs/mkdir_mkfile.exp index 33c5e9f76..680ae1178 100755 --- a/test/fs/mkdir_mkfile.exp +++ b/test/fs/mkdir_mkfile.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/option_blacklist.exp b/test/fs/option_blacklist.exp index 93ad17df0..b3f7497cd 100755 --- a/test/fs/option_blacklist.exp +++ b/test/fs/option_blacklist.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/option_blacklist_glob.exp b/test/fs/option_blacklist_glob.exp index 4db0a26c8..cf6709322 100755 --- a/test/fs/option_blacklist_glob.exp +++ b/test/fs/option_blacklist_glob.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/private-bin.exp b/test/fs/private-bin.exp index 7558ce465..d432b3b87 100755 --- a/test/fs/private-bin.exp +++ b/test/fs/private-bin.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/private-etc-empty.exp b/test/fs/private-etc-empty.exp index 8506b664c..db8810da1 100755 --- a/test/fs/private-etc-empty.exp +++ b/test/fs/private-etc-empty.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/private-etc.exp b/test/fs/private-etc.exp index 5edaacd25..83f95dc5c 100755 --- a/test/fs/private-etc.exp +++ b/test/fs/private-etc.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/private-home-dir.exp b/test/fs/private-home-dir.exp index 41820b919..af93d021d 100755 --- a/test/fs/private-home-dir.exp +++ b/test/fs/private-home-dir.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/private-home.exp b/test/fs/private-home.exp index 4d35e31e9..2c5831f40 100755 --- a/test/fs/private-home.exp +++ b/test/fs/private-home.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/private-homedir.exp b/test/fs/private-homedir.exp index 10a73e219..ba815b332 100755 --- a/test/fs/private-homedir.exp +++ b/test/fs/private-homedir.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/private-lib.exp b/test/fs/private-lib.exp index 79e0341a3..777424ebe 100755 --- a/test/fs/private-lib.exp +++ b/test/fs/private-lib.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | 6 | ||
diff --git a/test/fs/private-whitelist.exp b/test/fs/private-whitelist.exp index 4b4f9fdaa..67c75355a 100755 --- a/test/fs/private-whitelist.exp +++ b/test/fs/private-whitelist.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/private.exp b/test/fs/private.exp index 154eb6777..a16acc6e6 100755 --- a/test/fs/private.exp +++ b/test/fs/private.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/read-write.exp b/test/fs/read-write.exp index 41d5a3f86..a2c397a43 100755 --- a/test/fs/read-write.exp +++ b/test/fs/read-write.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/sys_fs.exp b/test/fs/sys_fs.exp index 4d04ec63f..ba002fe91 100755 --- a/test/fs/sys_fs.exp +++ b/test/fs/sys_fs.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp index e22ff7b17..d2cb72edd 100755 --- a/test/fs/whitelist-dev.exp +++ b/test/fs/whitelist-dev.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/whitelist-double.exp b/test/fs/whitelist-double.exp index a236e209e..a983099ac 100755 --- a/test/fs/whitelist-double.exp +++ b/test/fs/whitelist-double.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/fs/whitelist-empty.exp b/test/fs/whitelist-empty.exp index 74a35742b..bc0c13688 100755 --- a/test/fs/whitelist-empty.exp +++ b/test/fs/whitelist-empty.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 30 | 6 | set timeout 30 |
diff --git a/test/fs/whitelist.exp b/test/fs/whitelist.exp index 556c46f7c..8553ad94a 100755 --- a/test/fs/whitelist.exp +++ b/test/fs/whitelist.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp index f20cb1446..d96d4e497 100755 --- a/test/network/4bridges_arp.exp +++ b/test/network/4bridges_arp.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp index 6c83e038d..cd4d88de9 100755 --- a/test/network/4bridges_ip.exp +++ b/test/network/4bridges_ip.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp index 8f4e39022..de812b602 100755 --- a/test/network/bandwidth.exp +++ b/test/network/bandwidth.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/configure b/test/network/configure index 9859519bd..5220f838a 100755 --- a/test/network/configure +++ b/test/network/configure | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2016 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | brctl addbr br0 | 6 | brctl addbr br0 |
diff --git a/test/network/firemon-interfaces.exp b/test/network/firemon-interfaces.exp index fea390b20..f628f2daa 100755 --- a/test/network/firemon-interfaces.exp +++ b/test/network/firemon-interfaces.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/hostname.exp b/test/network/hostname.exp index 9f4729771..748404e30 100755 --- a/test/network/hostname.exp +++ b/test/network/hostname.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/ip6.exp b/test/network/ip6.exp index b1dfc0246..e4da3a8a6 100755 --- a/test/network/ip6.exp +++ b/test/network/ip6.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/iprange.exp b/test/network/iprange.exp index 227fc58cb..1d360599d 100755 --- a/test/network/iprange.exp +++ b/test/network/iprange.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_arp.exp b/test/network/net_arp.exp index d681e26c8..57a30bf6a 100755 --- a/test/network/net_arp.exp +++ b/test/network/net_arp.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_badip.exp b/test/network/net_badip.exp index 5473b71fe..f844885f9 100755 --- a/test/network/net_badip.exp +++ b/test/network/net_badip.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp index 8103e7d62..fad4f52aa 100755 --- a/test/network/net_defaultgw.exp +++ b/test/network/net_defaultgw.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp index fbc4fd10c..163a2caf3 100755 --- a/test/network/net_defaultgw2.exp +++ b/test/network/net_defaultgw2.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_defaultgw3.exp b/test/network/net_defaultgw3.exp index 5b946c90e..bee80d818 100755 --- a/test/network/net_defaultgw3.exp +++ b/test/network/net_defaultgw3.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp index 44b082d35..d51dec994 100755 --- a/test/network/net_ip.exp +++ b/test/network/net_ip.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_local.exp b/test/network/net_local.exp index 6f598b737..0ce648c0b 100755 --- a/test/network/net_local.exp +++ b/test/network/net_local.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_mac.exp b/test/network/net_mac.exp index 0ddfd3c8f..55962ac65 100755 --- a/test/network/net_mac.exp +++ b/test/network/net_mac.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_macvlan2.exp b/test/network/net_macvlan2.exp index f29e33b80..5a347ed5d 100755 --- a/test/network/net_macvlan2.exp +++ b/test/network/net_macvlan2.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_mtu.exp b/test/network/net_mtu.exp index ac5fded4b..c5f74b5d3 100755 --- a/test/network/net_mtu.exp +++ b/test/network/net_mtu.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_netfilter.exp b/test/network/net_netfilter.exp index 76ea57ca5..1a04212ca 100755 --- a/test/network/net_netfilter.exp +++ b/test/network/net_netfilter.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp index 125862c2b..ee0930e01 100755 --- a/test/network/net_noip.exp +++ b/test/network/net_noip.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp index c9df2c36f..d33280047 100755 --- a/test/network/net_noip2.exp +++ b/test/network/net_noip2.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_none.exp b/test/network/net_none.exp index 9ae5bbf29..ba0722032 100755 --- a/test/network/net_none.exp +++ b/test/network/net_none.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp index 19535ddf6..cc7a3ee53 100755 --- a/test/network/net_profile.exp +++ b/test/network/net_profile.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_scan.exp b/test/network/net_scan.exp index f0d50bff2..8da1031d9 100755 --- a/test/network/net_scan.exp +++ b/test/network/net_scan.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_unconfigured.exp b/test/network/net_unconfigured.exp index 6f1be0e50..f66469e5f 100755 --- a/test/network/net_unconfigured.exp +++ b/test/network/net_unconfigured.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/net_veth.exp b/test/network/net_veth.exp index 85ef671e1..eb140fb9c 100755 --- a/test/network/net_veth.exp +++ b/test/network/net_veth.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/netfilter-template.exp b/test/network/netfilter-template.exp index 5a15152d3..2801b4e06 100755 --- a/test/network/netfilter-template.exp +++ b/test/network/netfilter-template.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/netns.exp b/test/network/netns.exp index 6b366d4f4..53a3d3dac 100755 --- a/test/network/netns.exp +++ b/test/network/netns.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/netstats.exp b/test/network/netstats.exp index 1b72a57a3..1a3b55108 100755 --- a/test/network/netstats.exp +++ b/test/network/netstats.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/network/network.sh b/test/network/network.sh index fa6f214cd..e1804ae3b 100755 --- a/test/network/network.sh +++ b/test/network/network.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/network/tcpserver.c b/test/network/tcpserver.c index 2be871390..e8f89b097 100644 --- a/test/network/tcpserver.c +++ b/test/network/tcpserver.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2014-2018 Firejail Authors | 2 | * Copyright (C) 2014-2019 Firejail Authors |
3 | * | 3 | * |
4 | * This file is part of firejail project | 4 | * This file is part of firejail project |
5 | * | 5 | * |
diff --git a/test/network/veth-name.exp b/test/network/veth-name.exp index db2737199..8d065da9f 100755 --- a/test/network/veth-name.exp +++ b/test/network/veth-name.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/overlay/firefox-x11-xorg.exp b/test/overlay/firefox-x11-xorg.exp index ec24b23af..8a02eb8eb 100755 --- a/test/overlay/firefox-x11-xorg.exp +++ b/test/overlay/firefox-x11-xorg.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/overlay/firefox-x11.exp b/test/overlay/firefox-x11.exp index 1b7034af0..b2fa5cfdc 100755 --- a/test/overlay/firefox-x11.exp +++ b/test/overlay/firefox-x11.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/overlay/firefox.exp b/test/overlay/firefox.exp index 5bdd6751f..b0e2fd561 100755 --- a/test/overlay/firefox.exp +++ b/test/overlay/firefox.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/overlay/overlay.sh b/test/overlay/overlay.sh index 9daf1f5f6..5dfacea18 100755 --- a/test/overlay/overlay.sh +++ b/test/overlay/overlay.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/private-lib/atril.exp b/test/private-lib/atril.exp index 04b11a646..391dc09b3 100755 --- a/test/private-lib/atril.exp +++ b/test/private-lib/atril.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/dig.exp b/test/private-lib/dig.exp index 6e03b0503..2d997076b 100755 --- a/test/private-lib/dig.exp +++ b/test/private-lib/dig.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/eog.exp b/test/private-lib/eog.exp index 1b5406add..3a4b403a0 100755 --- a/test/private-lib/eog.exp +++ b/test/private-lib/eog.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/eom.exp b/test/private-lib/eom.exp index a8b74de98..cd6bfadb5 100755 --- a/test/private-lib/eom.exp +++ b/test/private-lib/eom.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/evince.exp b/test/private-lib/evince.exp index 94ed826db..32538c338 100755 --- a/test/private-lib/evince.exp +++ b/test/private-lib/evince.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/galculator.exp b/test/private-lib/galculator.exp index c18c07571..3ff0b6111 100755 --- a/test/private-lib/galculator.exp +++ b/test/private-lib/galculator.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/gedit.exp b/test/private-lib/gedit.exp index 00fa934e7..90eb9a5c0 100755 --- a/test/private-lib/gedit.exp +++ b/test/private-lib/gedit.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/gnome-calculator.exp b/test/private-lib/gnome-calculator.exp index e9d2c8208..3ec484e05 100755 --- a/test/private-lib/gnome-calculator.exp +++ b/test/private-lib/gnome-calculator.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/gpicview.exp b/test/private-lib/gpicview.exp index 8d36a9d11..b01df4cbf 100755 --- a/test/private-lib/gpicview.exp +++ b/test/private-lib/gpicview.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/leafpad.exp b/test/private-lib/leafpad.exp index 2a1b07f94..7a4dcd86e 100755 --- a/test/private-lib/leafpad.exp +++ b/test/private-lib/leafpad.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/mousepad.exp b/test/private-lib/mousepad.exp index 2e8f5e92b..0a69ae432 100755 --- a/test/private-lib/mousepad.exp +++ b/test/private-lib/mousepad.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/pluma.exp b/test/private-lib/pluma.exp index 92ae0a345..4ba95353c 100755 --- a/test/private-lib/pluma.exp +++ b/test/private-lib/pluma.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh index 5d23ebe88..c6a5a4309 100755 --- a/test/private-lib/private-lib.sh +++ b/test/private-lib/private-lib.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/private-lib/transmission-gtk.exp b/test/private-lib/transmission-gtk.exp index 06559293b..b288b8504 100755 --- a/test/private-lib/transmission-gtk.exp +++ b/test/private-lib/transmission-gtk.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/whois.exp b/test/private-lib/whois.exp index 6807b7cc2..a15a63569 100755 --- a/test/private-lib/whois.exp +++ b/test/private-lib/whois.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/private-lib/xcalc.exp b/test/private-lib/xcalc.exp index 12bd73b51..768d01773 100755 --- a/test/private-lib/xcalc.exp +++ b/test/private-lib/xcalc.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/profiles/conditional.exp b/test/profiles/conditional.exp index 537fb361e..e124f22cd 100755 --- a/test/profiles/conditional.exp +++ b/test/profiles/conditional.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/profiles/ignore.exp b/test/profiles/ignore.exp index e0c6e81c1..0b5d92b70 100755 --- a/test/profiles/ignore.exp +++ b/test/profiles/ignore.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/profiles/profile_appname.exp b/test/profiles/profile_appname.exp index c70e7ad57..aadb86975 100755 --- a/test/profiles/profile_appname.exp +++ b/test/profiles/profile_appname.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/profiles/profile_recursivity.exp b/test/profiles/profile_recursivity.exp index 66e4510bf..0485573a1 100755 --- a/test/profiles/profile_recursivity.exp +++ b/test/profiles/profile_recursivity.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/profiles/profile_syntax.exp b/test/profiles/profile_syntax.exp index f74626959..fc9a8f1c8 100755 --- a/test/profiles/profile_syntax.exp +++ b/test/profiles/profile_syntax.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/profiles/profile_syntax2.exp b/test/profiles/profile_syntax2.exp index da34b67e8..74dcd429a 100755 --- a/test/profiles/profile_syntax2.exp +++ b/test/profiles/profile_syntax2.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh index 33729927c..46662cef5 100755 --- a/test/profiles/profiles.sh +++ b/test/profiles/profiles.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
@@ -44,21 +44,3 @@ do | |||
44 | ./test-profile.exp $PROFILE | 44 | ./test-profile.exp $PROFILE |
45 | done | 45 | done |
46 | 46 | ||
47 | echo "TESTING: profile syntax (test/profiles/profile_syntax.exp)" | ||
48 | ./profile_syntax.exp | ||
49 | |||
50 | echo "TESTING: profile syntax 2 (test/profiles/profile_syntax2.exp)" | ||
51 | ./profile_syntax2.exp | ||
52 | |||
53 | echo "TESTING: ignore command (test/profiles/ignore.exp)" | ||
54 | ./ignore.exp | ||
55 | |||
56 | echo "TESTING: profile read-only (test/profiles/profile_readonly.exp)" | ||
57 | ./profile_readonly.exp | ||
58 | |||
59 | echo "TESTING: profile read-only links (test/profiles/profile_readonly.exp)" | ||
60 | ./profile_followlnk.exp | ||
61 | |||
62 | echo "TESTING: profile no permissions (test/profiles/profile_noperm.exp)" | ||
63 | ./profile_noperm.exp | ||
64 | |||
diff --git a/test/profiles/test-profile.exp b/test/profiles/test-profile.exp index 02aec5181..7b552a1ca 100755 --- a/test/profiles/test-profile.exp +++ b/test/profiles/test-profile.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/root/cgroup.exp b/test/root/cgroup.exp index b392cfabb..06e2448e4 100755 --- a/test/root/cgroup.exp +++ b/test/root/cgroup.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/root/checkcfg.exp b/test/root/checkcfg.exp index 1f6d17a9c..5c5dcc055 100755 --- a/test/root/checkcfg.exp +++ b/test/root/checkcfg.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/root/firecfg.exp b/test/root/firecfg.exp index b73167bd1..872365570 100755 --- a/test/root/firecfg.exp +++ b/test/root/firecfg.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/root/join.exp b/test/root/join.exp index 2387ff560..54a86a8f0 100755 --- a/test/root/join.exp +++ b/test/root/join.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/root/login_nobody.exp b/test/root/login_nobody.exp index 8e9ec4367..7f5294af8 100755 --- a/test/root/login_nobody.exp +++ b/test/root/login_nobody.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/root/private.exp b/test/root/private.exp index e3d3245ae..3e93683ba 100755 --- a/test/root/private.exp +++ b/test/root/private.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/root/seccomp-chmod.exp b/test/root/seccomp-chmod.exp index 59baeb4b1..ac8f9121b 100755 --- a/test/root/seccomp-chmod.exp +++ b/test/root/seccomp-chmod.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/root/seccomp-chown.exp b/test/root/seccomp-chown.exp index a574776e3..9b8fe05ef 100755 --- a/test/root/seccomp-chown.exp +++ b/test/root/seccomp-chown.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/root/seccomp-umount.exp b/test/root/seccomp-umount.exp index d959a1a9b..706fa6d00 100755 --- a/test/root/seccomp-umount.exp +++ b/test/root/seccomp-umount.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/root/whitelist.exp b/test/root/whitelist.exp index 8712aff43..51611bda2 100755 --- a/test/root/whitelist.exp +++ b/test/root/whitelist.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/ssh/ssh.sh b/test/ssh/ssh.sh index 20a70b1b6..56e815f6f 100755 --- a/test/ssh/ssh.sh +++ b/test/ssh/ssh.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/stress/blacklist.exp b/test/stress/blacklist.exp index 57155d77d..5ea39779d 100755 --- a/test/stress/blacklist.exp +++ b/test/stress/blacklist.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/stress/env.exp b/test/stress/env.exp index bdba1e755..85c9e4bf6 100755 --- a/test/stress/env.exp +++ b/test/stress/env.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/stress/net_macvlan.exp b/test/stress/net_macvlan.exp index df5b9d582..7a732bf48 100755 --- a/test/stress/net_macvlan.exp +++ b/test/stress/net_macvlan.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/stress/stress.sh b/test/stress/stress.sh index 9b6f9808c..37b1a3bbc 100755 --- a/test/stress/stress.sh +++ b/test/stress/stress.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/sysutils/cpio.exp b/test/sysutils/cpio.exp index 3b109257b..9d13b4e44 100755 --- a/test/sysutils/cpio.exp +++ b/test/sysutils/cpio.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/sysutils/file.exp b/test/sysutils/file.exp index f71e6b0f4..f530dc152 100755 --- a/test/sysutils/file.exp +++ b/test/sysutils/file.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/sysutils/gzip.exp b/test/sysutils/gzip.exp index 83804f348..38313fd11 100755 --- a/test/sysutils/gzip.exp +++ b/test/sysutils/gzip.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/sysutils/less.exp b/test/sysutils/less.exp index 7fa4b4df2..436abfc2b 100755 --- a/test/sysutils/less.exp +++ b/test/sysutils/less.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/sysutils/ping.exp b/test/sysutils/ping.exp index a362a516e..d92aaa44f 100755 --- a/test/sysutils/ping.exp +++ b/test/sysutils/ping.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/sysutils/strings.exp b/test/sysutils/strings.exp index f86d73fcc..0be00fc7c 100755 --- a/test/sysutils/strings.exp +++ b/test/sysutils/strings.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh index 6794af520..0acf94d71 100755 --- a/test/sysutils/sysutils.sh +++ b/test/sysutils/sysutils.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/sysutils/tar.exp b/test/sysutils/tar.exp index 57cf1a7d8..29e156acd 100755 --- a/test/sysutils/tar.exp +++ b/test/sysutils/tar.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/sysutils/xz.exp b/test/sysutils/xz.exp index 5ccfccf88..93c83e814 100755 --- a/test/sysutils/xz.exp +++ b/test/sysutils/xz.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/sysutils/xzdec.exp b/test/sysutils/xzdec.exp index 7f8b7fc0e..6fec59d58 100755 --- a/test/sysutils/xzdec.exp +++ b/test/sysutils/xzdec.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/audit.exp b/test/utils/audit.exp index 6352dc62d..49d08d22d 100755 --- a/test/utils/audit.exp +++ b/test/utils/audit.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/build.exp b/test/utils/build.exp index 5e883e4ba..e8dd2bbbc 100755 --- a/test/utils/build.exp +++ b/test/utils/build.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/caps-print.exp b/test/utils/caps-print.exp index 0266a6f77..bfa88f3de 100755 --- a/test/utils/caps-print.exp +++ b/test/utils/caps-print.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/command.exp b/test/utils/command.exp index 3b18540db..a55d5436c 100755 --- a/test/utils/command.exp +++ b/test/utils/command.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/cpu-print.exp b/test/utils/cpu-print.exp index f83f9acb3..311a031f8 100755 --- a/test/utils/cpu-print.exp +++ b/test/utils/cpu-print.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/dns-print.exp b/test/utils/dns-print.exp index bed7df58d..be55d3db2 100755 --- a/test/utils/dns-print.exp +++ b/test/utils/dns-print.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/firemon-caps.exp b/test/utils/firemon-caps.exp index 5fd569970..ec92a0383 100755 --- a/test/utils/firemon-caps.exp +++ b/test/utils/firemon-caps.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/firemon-cgroup.exp b/test/utils/firemon-cgroup.exp index 8282e701a..91a1eb891 100755 --- a/test/utils/firemon-cgroup.exp +++ b/test/utils/firemon-cgroup.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/firemon-cpu.exp b/test/utils/firemon-cpu.exp index b72c1c1e0..eb98993f9 100755 --- a/test/utils/firemon-cpu.exp +++ b/test/utils/firemon-cpu.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/firemon-interface.exp b/test/utils/firemon-interface.exp index f96af2491..ba3ecf9ac 100755 --- a/test/utils/firemon-interface.exp +++ b/test/utils/firemon-interface.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/firemon-name.exp b/test/utils/firemon-name.exp index e9d1bf3b5..883c516fc 100755 --- a/test/utils/firemon-name.exp +++ b/test/utils/firemon-name.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/firemon-seccomp.exp b/test/utils/firemon-seccomp.exp index f390c96d9..db5ea7d8a 100755 --- a/test/utils/firemon-seccomp.exp +++ b/test/utils/firemon-seccomp.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/firemon-version.exp b/test/utils/firemon-version.exp index f38cdc46d..e1bb3e931 100755 --- a/test/utils/firemon-version.exp +++ b/test/utils/firemon-version.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/fs-print.exp b/test/utils/fs-print.exp index 17757f35f..20153829d 100755 --- a/test/utils/fs-print.exp +++ b/test/utils/fs-print.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/help.exp b/test/utils/help.exp index f19054303..0105c74f4 100755 --- a/test/utils/help.exp +++ b/test/utils/help.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/join.exp b/test/utils/join.exp index 4e65de615..1d2ad2a26 100755 --- a/test/utils/join.exp +++ b/test/utils/join.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/join2.exp b/test/utils/join2.exp index 7a1ef6ce6..ea40a80b3 100755 --- a/test/utils/join2.exp +++ b/test/utils/join2.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/join3.exp b/test/utils/join3.exp index edf760ad7..eeb5ccc30 100755 --- a/test/utils/join3.exp +++ b/test/utils/join3.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/join4.exp b/test/utils/join4.exp index 4c39be92e..80dcae93a 100755 --- a/test/utils/join4.exp +++ b/test/utils/join4.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/list.exp b/test/utils/list.exp index 9da154962..82f6324e5 100755 --- a/test/utils/list.exp +++ b/test/utils/list.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/man.exp b/test/utils/man.exp index 9576793dc..da2a8a565 100755 --- a/test/utils/man.exp +++ b/test/utils/man.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/name.exp b/test/utils/name.exp index f00b5866e..456f55252 100755 --- a/test/utils/name.exp +++ b/test/utils/name.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
@@ -111,39 +111,39 @@ expect { | |||
111 | } | 111 | } |
112 | expect { | 112 | expect { |
113 | timeout {puts "TESTING ERROR 13\n";exit} | 113 | timeout {puts "TESTING ERROR 13\n";exit} |
114 | ":ftest-1:" | 114 | ":ftest-" |
115 | } | 115 | } |
116 | expect { | 116 | expect { |
117 | timeout {puts "TESTING ERROR 14\n";exit} | 117 | timeout {puts "TESTING ERROR 14\n";exit} |
118 | ":ftest-2:" | 118 | ":ftest-" |
119 | } | 119 | } |
120 | expect { | 120 | expect { |
121 | timeout {puts "TESTING ERROR 15\n";exit} | 121 | timeout {puts "TESTING ERROR 15\n";exit} |
122 | ":ftest-3:" | 122 | ":ftest-" |
123 | } | 123 | } |
124 | expect { | 124 | expect { |
125 | timeout {puts "TESTING ERROR 16\n";exit} | 125 | timeout {puts "TESTING ERROR 16\n";exit} |
126 | ":ftest-4:" | 126 | ":ftest-" |
127 | } | 127 | } |
128 | expect { | 128 | expect { |
129 | timeout {puts "TESTING ERROR 17\n";exit} | 129 | timeout {puts "TESTING ERROR 17\n";exit} |
130 | ":ftest-5:" | 130 | ":ftest-" |
131 | } | 131 | } |
132 | expect { | 132 | expect { |
133 | timeout {puts "TESTING ERROR 18\n";exit} | 133 | timeout {puts "TESTING ERROR 18\n";exit} |
134 | ":ftest-6:" | 134 | ":ftest-" |
135 | } | 135 | } |
136 | expect { | 136 | expect { |
137 | timeout {puts "TESTING ERROR 19\n";exit} | 137 | timeout {puts "TESTING ERROR 19\n";exit} |
138 | ":ftest-7:" | 138 | ":ftest-" |
139 | } | 139 | } |
140 | expect { | 140 | expect { |
141 | timeout {puts "TESTING ERROR 20\n";exit} | 141 | timeout {puts "TESTING ERROR 20\n";exit} |
142 | ":ftest-8:" | 142 | ":ftest-" |
143 | } | 143 | } |
144 | expect { | 144 | expect { |
145 | timeout {puts "TESTING ERROR 21\n";exit} | 145 | timeout {puts "TESTING ERROR 21\n";exit} |
146 | ":ftest-9:" | 146 | ":ftest-" |
147 | } | 147 | } |
148 | expect { | 148 | expect { |
149 | timeout {puts "TESTING ERROR 22\n";exit} | 149 | timeout {puts "TESTING ERROR 22\n";exit} |
@@ -153,22 +153,5 @@ expect { | |||
153 | timeout {puts "TESTING ERROR 23\n";exit} | 153 | timeout {puts "TESTING ERROR 23\n";exit} |
154 | ":ftest-" | 154 | ":ftest-" |
155 | } | 155 | } |
156 | after 100 | ||
157 | |||
158 | send -- "firejail --shutdown=ftest-5\r" | ||
159 | expect { | ||
160 | timeout {puts "TESTING ERROR 11\n";exit} | ||
161 | "Sending SIGTERM" | ||
162 | } | ||
163 | sleep 1 | 156 | sleep 1 |
164 | |||
165 | spawn $env(SHELL) | ||
166 | send -- "firejail --list\r" | ||
167 | expect { | ||
168 | timeout {puts "TESTING ERROR 12\n";exit} | ||
169 | ":ftest-5:" {puts "TESTING ERROR 15\n";exit} | ||
170 | ":ftest-9:" | ||
171 | } | ||
172 | |||
173 | after 100 | ||
174 | puts "all done\n" | 157 | puts "all done\n" |
diff --git a/test/utils/profile_print.exp b/test/utils/profile_print.exp index 20d88a264..83faaf74d 100755 --- a/test/utils/profile_print.exp +++ b/test/utils/profile_print.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/protocol-print.exp b/test/utils/protocol-print.exp index 4209bbf39..fb181f564 100755 --- a/test/utils/protocol-print.exp +++ b/test/utils/protocol-print.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/seccomp-print.exp b/test/utils/seccomp-print.exp index 09e09ca84..2dc4a8287 100755 --- a/test/utils/seccomp-print.exp +++ b/test/utils/seccomp-print.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/shutdown.exp b/test/utils/shutdown.exp index 15a74f8c8..eb691bbf8 100755 --- a/test/utils/shutdown.exp +++ b/test/utils/shutdown.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/shutdown2.exp b/test/utils/shutdown2.exp index 0e063d257..a07241340 100755 --- a/test/utils/shutdown2.exp +++ b/test/utils/shutdown2.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/shutdown3.exp b/test/utils/shutdown3.exp index 1e55e5a41..847e63706 100755 --- a/test/utils/shutdown3.exp +++ b/test/utils/shutdown3.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/shutdown4.exp b/test/utils/shutdown4.exp index 39a0308ff..3d4f718cb 100755 --- a/test/utils/shutdown4.exp +++ b/test/utils/shutdown4.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/top.exp b/test/utils/top.exp index a1a8e8b44..3faf69080 100755 --- a/test/utils/top.exp +++ b/test/utils/top.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/trace.exp b/test/utils/trace.exp index 37c0b0f30..1b6db17be 100755 --- a/test/utils/trace.exp +++ b/test/utils/trace.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 30 | 6 | set timeout 30 |
diff --git a/test/utils/tree.exp b/test/utils/tree.exp index 977dbb360..09eb29029 100755 --- a/test/utils/tree.exp +++ b/test/utils/tree.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
diff --git a/test/utils/utils.sh b/test/utils/utils.sh index f819c3c01..fd24a5db0 100755 --- a/test/utils/utils.sh +++ b/test/utils/utils.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
diff --git a/test/utils/version.exp b/test/utils/version.exp index 5bff55409..aad3b72e0 100755 --- a/test/utils/version.exp +++ b/test/utils/version.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |