testing

src/fcopy/main.c

@@ -188,22 +188,19 @@ static int fs_copydir(const char *infname, const struct stat *st, int ftype, str
 static char *check(const char *src) {
  struct stat s;
  char *rsrc = realpath(src, NULL);
- if (!rsrc || stat(rsrc, &s) == -1) {
- fprintf(stderr, "Error fcopy: cannot find %s directory\n", src);
- exit(1);
- }
+ if (!rsrc || stat(rsrc, &s) == -1)
+ goto errexit;
 
  // check uid
- if (s.st_uid != getuid() || s.st_gid != getgid()) {
- fprintf(stderr, "Error fcopy: uid/gid mismatch for %s\n", rsrc);
- exit(1);
- }
+ if (s.st_uid != getuid() || s.st_gid != getgid())
+ goto errexit;
 
  // dir, link, regular file
- if (S_ISDIR(s.st_mode) || S_ISREG(s.st_mode) || S_ISLNK(s.st_mode)) {
+ if (S_ISDIR(s.st_mode) || S_ISREG(s.st_mode) || S_ISLNK(s.st_mode))
  return rsrc; // normal exit from the function
- }
- fprintf(stderr, "Error fcopy: invalid directory %s\n", rsrc);
+
+errexit:
+ fprintf(stderr, "Error fcopy: invalid file %s\n", src);
  exit(1);
 }
 

src/firemon/caps.c

@@ -24,7 +24,6 @@ static void print_caps(int pid) {
  char *file;
  if (asprintf(&file, "/proc/%d/status", pid) == -1) {
  errExit("asprintf");
- exit(1);
  }
 
  FILE *fp = fopen(file, "r");

src/firemon/procevent.c

@@ -43,10 +43,8 @@ static int pid_is_firejail(pid_t pid) {
 
  // open /proc/self/comm
  char *file;
- if (asprintf(&file, "/proc/%u/comm", pid) == -1) {
- perror("asprintf");
- exit(1);
- }
+ if (asprintf(&file, "/proc/%u/comm", pid) == -1)
+ errExit("asprintf");
 
  FILE *fp = fopen(file, "r");
  if (!fp) {

src/firemon/seccomp.c

@@ -22,10 +22,8 @@
 #define MAXBUF 4098
 static void print_seccomp(int pid) {
  char *file;
- if (asprintf(&file, "/proc/%d/status", pid) == -1) {
+ if (asprintf(&file, "/proc/%d/status", pid) == -1)
  errExit("asprintf");
- exit(1);
- }
 
  FILE *fp = fopen(file, "r");
  if (!fp) {

src/ftee/main.c

@@ -179,10 +179,6 @@ static int is_link(const char *fname) {
  return 0;
 }
 
-
-
-
-
 static void usage(void) {
  printf("Usage: ftee filename\n");
 }
@@ -201,33 +197,25 @@ int main(int argc, char **argv) {
 
 
  // do not accept directories, links, and files with ".."
- if (strstr(fname, "..") || is_link(fname) || is_dir(fname)) {
- fprintf(stderr, "Error: invalid output file. Links, directories and files with \"..\" are not allowed.\n");
- exit(1);
- }
+ if (strstr(fname, "..") || is_link(fname) || is_dir(fname))
+ goto errexit;
 
  struct stat s;
  if (stat(fname, &s) == 0) {
  // check permissions
- if (s.st_uid != getuid() || s.st_gid != getgid()) {
- fprintf(stderr, "Error: the output file needs to be owned by the current user.\n");
- exit(1);
- }
+ if (s.st_uid != getuid() || s.st_gid != getgid())
+ goto errexit;
 
  // check hard links
- if (s.st_nlink != 1) {
- fprintf(stderr, "Error: no hard links allowed.\n");
- exit(1);
- }
+ if (s.st_nlink != 1)
+ goto errexit;
  }
 
  // check if we can append to this file
  /* coverity[toctou] */
  FILE *fp = fopen(fname, "a");
- if (!fp) {
- fprintf(stderr, "Error: cannot open output file %s\n", fname);
- exit(1);
- }
+ if (!fp)
+ goto errexit;
  fclose(fp);
 
 
@@ -248,4 +236,8 @@ int main(int argc, char **argv) {
 
  log_close();
  return 0;
+
+errexit:
+ fprintf(stderr, "Error ftee: invalid output file.\n");
+ return 1;
 }

test/utils/firemon-cpu.exp

@@ -24,7 +24,6 @@ sleep 1
 
 spawn $env(SHELL)
 send -- "firemon --cpu\r"
-sleep 4
 expect {
  timeout {puts "TESTING ERROR 2\n";exit}
  "need to be root" {puts "TESTING SKIP: /proc mounted as hidepid\n"; exit}

test/utils/firemon-interface.exp

@@ -0,0 +1,18 @@
+#!/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 -- "firemon --interface\r"
+expect {
+ timeout {puts "TESTING ERROR 0\n";exit}
+ "you need to be root"
+}
+after 100
+
+puts "\nall done\n"
+

test/utils/firemon-name.exp

@@ -0,0 +1,28 @@
+#!/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 --name=test\r"
+expect {
+ timeout {puts "TESTING ERROR 0\n";exit}
+ "Child process initialized"
+}
+sleep 1
+
+spawn $env(SHELL)
+send -- "firemon --cpu --name=test\r"
+expect {
+ timeout {puts "TESTING ERROR 2\n";exit}
+ "need to be root" {puts "TESTING SKIP: /proc mounted as hidepid\n"; exit}
+ "Cpus_allowed_list"
+}
+
+after 100
+
+puts "\nall done\n"
+

test/utils/firemon-version.exp

@@ -0,0 +1,18 @@
+#!/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 -- "firemon --version\r"
+expect {
+ timeout {puts "TESTING ERROR 0\n";exit}
+ "firemon version"
+}
+after 100
+
+puts "\nall done\n"
+

test/utils/utils.sh

@@ -100,3 +100,12 @@ echo "TESTING: firemon cpu (test/utils/firemon-cpu.exp)"
 echo "TESTING: firemon cgroup (test/utils/firemon-cgroup.exp)"
 ./firemon-cgroup.exp
 
+echo "TESTING: firemon version (test/utils/firemon-version.exp)"
+./firemon-version.exp
+
+echo "TESTING: firemon interface (test/utils/firemon-interface.exp)"
+./firemon-interface.exp
+
+echo "TESTING: firemon name (test/utils/firemon-name.exp)"
+./firemon-name.exp
+