sysutils

7 files changed, 74 insertions, 0 deletions

diff --git a/Makefile.in b/Makefile.in
index 5204fc34a..00131099a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -215,6 +215,7 @@ realinstall:
         install -c -m 0644 .etc/xzdec.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/strings.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/xz.profile $(DESTDIR)/$(sysconfdir)/firejail/.
+        install -c -m 0644 .etc/less.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
         install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.
         rm -fr .etc
diff --git a/etc/less.profile b/etc/less.profile
new file mode 100644
index 000000000..9cad7ceb6
--- /dev/null
+++ b/etc/less.profile
@@ -0,0 +1,7 @@
+# less profile
+include /etc/firejail/default.profile
+tracelog
+net none
+shell none
+private-dev
+private-tmp
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 34ab8cd81..62a4cfebe 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -124,4 +124,5 @@
 /etc/firejail/xzdec.profile
 /etc/firejail/strings.profile
 /etc/firejail/xz.profile
+/etc/firejail/less.profile
 
diff --git a/src/firejail/main.c b/src/firejail/main.c
index f149dd376..463bf4f31 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -696,6 +696,7 @@ static void delete_x11_file(pid_t pid) {
 static void detect_quiet(int argc, char **argv) {
         int i;
         char *progs[] = {
+                "less",
                 "cpio",
                 "strings",
                 "gzip",
diff --git a/test/sysutils/less.exp b/test/sysutils/less.exp
new file mode 100755
index 000000000..720830304
--- /dev/null
+++ b/test/sysutils/less.exp
@@ -0,0 +1,20 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "firejail less ../../Makefile.in\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "MYLIBS"
+}
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "APPS"
+}
+
+puts "\nall done\n"
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh
index f230c9a6b..d75738f97 100755
--- a/test/sysutils/sysutils.sh
+++ b/test/sysutils/sysutils.sh
@@ -42,3 +42,21 @@ else
         echo "TESTING SKIP: xzdec not found"
 fi
 
+which xz
+if [ "$?" -eq 0 ];
+then
+        echo "TESTING: xz"
+        ./xz.exp
+else
+        echo "TESTING SKIP: xz not found"
+fi
+
+which less
+if [ "$?" -eq 0 ];
+then
+        echo "TESTING: less"
+        ./less.exp
+else
+        echo "TESTING SKIP: less not found"
+fi
+
diff --git a/test/sysutils/xz.exp b/test/sysutils/xz.exp
new file mode 100755
index 000000000..11d0e560c
--- /dev/null
+++ b/test/sysutils/xz.exp
@@ -0,0 +1,26 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "/usr/bin/xz -c /usr/bin/firejail > firejail_t1\r"
+sleep 1
+
+send -- "firejail /usr/bin/xz -c /usr/bin/firejail > firejail_t2\r"
+sleep 1
+
+send -- "diff -s firejail_t1 firejail_t2\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "firejail_t1 and firejail_t2 are identical"
+}
+
+send -- "rm firejail_t*\r"
+sleep 1
+
+
+puts "\nall done\n"