From 1365b0d41b013a8fd209acfd2f7adefb9b6adbdc Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sun, 6 Dec 2015 19:37:08 -0500 Subject: tracelog fixes --- etc/conkeror.profile | 1 - etc/deluge.profile | 1 - etc/dnscrypt-proxy.profile | 1 - etc/dropbox.profile | 1 - etc/evince.profile | 1 - etc/fbreader.profile | 1 - etc/filezilla.profile | 1 - etc/google-chrome-beta.profile | 1 - etc/google-chrome-unstable.profile | 1 - etc/google-chrome.profile | 1 - etc/midori.profile | 1 - etc/opera-beta.profile | 1 - etc/opera.profile | 1 - etc/qbittorrent.profile | 1 - etc/rtorrent.profile | 1 - etc/skype.profile | 1 - etc/spotify.profile | 1 - etc/steam.profile | 1 - etc/transmission-gtk.profile | 2 +- etc/weechat.profile | 1 - etc/wine.profile | 1 - src/libtracelog/libtracelog.c | 83 +++++++++++++++++++++++++++++++++++++- test/chromium.exp | 2 +- test/deluge.exp | 2 +- test/evince.exp | 6 +-- test/fbreader.exp | 6 +-- test/firefox.exp | 2 +- test/gnome-mplayer.exp | 4 +- test/google-chrome.exp | 4 +- test/hexchat.exp | 2 +- test/icedove.exp | 6 +-- test/midori.exp | 2 +- test/opera.exp | 2 +- test/transmission-gtk.exp | 6 +-- test/transmission-qt.exp | 6 +-- test/vlc.exp | 6 +-- test/weechat.exp | 2 +- test/wine.exp | 2 +- test/xchat.exp | 2 +- 39 files changed, 114 insertions(+), 53 deletions(-) diff --git a/etc/conkeror.profile b/etc/conkeror.profile index dde756754..7c1384523 100644 --- a/etc/conkeror.profile +++ b/etc/conkeror.profile @@ -7,7 +7,6 @@ caps.drop all seccomp protocol unix,inet,inet6 netfilter -tracelog noroot whitelist ~/.conkeror.mozdev.org whitelist ~/Downloads diff --git a/etc/deluge.profile b/etc/deluge.profile index 98c2e4fc5..4f76f3666 100644 --- a/etc/deluge.profile +++ b/etc/deluge.profile @@ -12,7 +12,6 @@ caps.drop all seccomp protocol unix,inet,inet6 netfilter -tracelog noroot diff --git a/etc/dnscrypt-proxy.profile b/etc/dnscrypt-proxy.profile index 8a57a8975..e0c5c93a3 100644 --- a/etc/dnscrypt-proxy.profile +++ b/etc/dnscrypt-proxy.profile @@ -5,5 +5,4 @@ include /etc/firejail/disable-mgmt.inc private private-dev seccomp.drop mount,umount2,ptrace,kexec_load,kexec_file_load,open_by_handle_at,init_module,finit_module,delete_module,iopl,ioperm,swapon,swapoff,syslog,process_vm_readv,process_vm_writev,sysfs,_sysctl,adjtimex,clock_adjtime,lookup_dcookie,perf_event_open,fanotify_init,kcmp,add_key,request_key,keyctl,uselib,acct,modify_ldt,pivot_root,io_setup,io_destroy,io_getevents,io_submit,io_cancel,remap_file_pages,mbind,get_mempolicy,set_mempolicy,migrate_pages,move_pages,vmsplice,perf_event_open -tracelog diff --git a/etc/dropbox.profile b/etc/dropbox.profile index c0b7e6342..248e3ac9e 100644 --- a/etc/dropbox.profile +++ b/etc/dropbox.profile @@ -11,5 +11,4 @@ caps seccomp protocol unix,inet,inet6 noroot -tracelog diff --git a/etc/evince.profile b/etc/evince.profile index 977a2bd68..34d8162b3 100644 --- a/etc/evince.profile +++ b/etc/evince.profile @@ -12,4 +12,3 @@ caps.drop all seccomp protocol unix,inet,inet6 noroot -tracelog diff --git a/etc/fbreader.profile b/etc/fbreader.profile index 1a530a867..f94fc28df 100644 --- a/etc/fbreader.profile +++ b/etc/fbreader.profile @@ -13,6 +13,5 @@ caps.drop all seccomp protocol unix,inet,inet6 netfilter -tracelog noroot diff --git a/etc/filezilla.profile b/etc/filezilla.profile index 3f20fe755..ba8649067 100644 --- a/etc/filezilla.profile +++ b/etc/filezilla.profile @@ -11,6 +11,5 @@ seccomp protocol unix,inet,inet6 noroot netfilter -tracelog diff --git a/etc/google-chrome-beta.profile b/etc/google-chrome-beta.profile index d08a5f41d..6122876bf 100644 --- a/etc/google-chrome-beta.profile +++ b/etc/google-chrome-beta.profile @@ -9,7 +9,6 @@ include /etc/firejail/disable-common.inc # netfilter -tracelog whitelist ${DOWNLOADS} whitelist ~/.config/google-chrome-beta whitelist ~/.cache/google-chrome-beta diff --git a/etc/google-chrome-unstable.profile b/etc/google-chrome-unstable.profile index 06b1399e1..7b8b12d04 100644 --- a/etc/google-chrome-unstable.profile +++ b/etc/google-chrome-unstable.profile @@ -9,7 +9,6 @@ include /etc/firejail/disable-common.inc # netfilter -tracelog whitelist ${DOWNLOADS} whitelist ~/.config/google-chrome-unstable whitelist ~/.cache/google-chrome-unstable diff --git a/etc/google-chrome.profile b/etc/google-chrome.profile index 7d2580116..351490d7f 100644 --- a/etc/google-chrome.profile +++ b/etc/google-chrome.profile @@ -9,7 +9,6 @@ include /etc/firejail/disable-common.inc # netfilter -tracelog whitelist ${DOWNLOADS} whitelist ~/.config/google-chrome whitelist ~/.cache/google-chrome diff --git a/etc/midori.profile b/etc/midori.profile index 9722d0313..77a6fb984 100644 --- a/etc/midori.profile +++ b/etc/midori.profile @@ -8,5 +8,4 @@ caps.drop all seccomp protocol unix,inet,inet6 netfilter -tracelog diff --git a/etc/opera-beta.profile b/etc/opera-beta.profile index ab8f55e28..c1672abce 100644 --- a/etc/opera-beta.profile +++ b/etc/opera-beta.profile @@ -5,7 +5,6 @@ include /etc/firejail/disable-secret.inc include /etc/firejail/disable-common.inc include /etc/firejail/disable-devel.inc netfilter -tracelog whitelist ~/.config/opera-beta whitelist ${DOWNLOADS} whitelist ~/.cache/opera-beta diff --git a/etc/opera.profile b/etc/opera.profile index c307e7703..a76806ed0 100644 --- a/etc/opera.profile +++ b/etc/opera.profile @@ -5,7 +5,6 @@ include /etc/firejail/disable-secret.inc include /etc/firejail/disable-common.inc include /etc/firejail/disable-devel.inc netfilter -tracelog whitelist ~/.config/opera whitelist ${DOWNLOADS} whitelist ~/.cache/opera diff --git a/etc/qbittorrent.profile b/etc/qbittorrent.profile index af5a6f697..dd50c779e 100644 --- a/etc/qbittorrent.profile +++ b/etc/qbittorrent.profile @@ -12,6 +12,5 @@ caps.drop all seccomp protocol unix,inet,inet6 netfilter -tracelog noroot diff --git a/etc/rtorrent.profile b/etc/rtorrent.profile index 03aa8a71f..c2c0356d9 100644 --- a/etc/rtorrent.profile +++ b/etc/rtorrent.profile @@ -7,5 +7,4 @@ caps.drop all seccomp protocol unix,inet,inet6 netfilter -tracelog noroot diff --git a/etc/skype.profile b/etc/skype.profile index f1519b0ff..4d2d042cc 100644 --- a/etc/skype.profile +++ b/etc/skype.profile @@ -6,7 +6,6 @@ include /etc/firejail/disable-common.inc include /etc/firejail/disable-devel.inc caps.drop all netfilter -tracelog noroot seccomp protocol unix,inet,inet6 diff --git a/etc/spotify.profile b/etc/spotify.profile index 0063564ae..414660857 100644 --- a/etc/spotify.profile +++ b/etc/spotify.profile @@ -16,6 +16,5 @@ caps.drop all seccomp protocol unix,inet,inet6 netfilter -tracelog noroot diff --git a/etc/steam.profile b/etc/steam.profile index af49580ce..5b9244567 100644 --- a/etc/steam.profile +++ b/etc/steam.profile @@ -7,7 +7,6 @@ include /etc/firejail/disable-common.inc include /etc/firejail/disable-devel.inc caps.drop all netfilter -tracelog noroot seccomp protocol unix,inet,inet6 diff --git a/etc/transmission-gtk.profile b/etc/transmission-gtk.profile index 1245a514b..f23c50528 100644 --- a/etc/transmission-gtk.profile +++ b/etc/transmission-gtk.profile @@ -12,7 +12,7 @@ caps.drop all seccomp protocol unix,inet,inet6 netfilter -noroot tracelog +noroot diff --git a/etc/weechat.profile b/etc/weechat.profile index 1a9fa02b3..79e3ae774 100644 --- a/etc/weechat.profile +++ b/etc/weechat.profile @@ -7,5 +7,4 @@ caps.drop all seccomp protocol unix,inet,inet6 netfilter -tracelog noroot diff --git a/etc/wine.profile b/etc/wine.profile index 6d1106993..8a7f66773 100644 --- a/etc/wine.profile +++ b/etc/wine.profile @@ -8,6 +8,5 @@ include /etc/firejail/disable-common.inc include /etc/firejail/disable-devel.inc caps.drop all netfilter -tracelog noroot seccomp diff --git a/src/libtracelog/libtracelog.c b/src/libtracelog/libtracelog.c index d89998f61..0e133d7e4 100644 --- a/src/libtracelog/libtracelog.c +++ b/src/libtracelog/libtracelog.c @@ -32,7 +32,7 @@ #include #include -//#define DEBUG +#define DEBUG // break recursivity on fopen call typedef FILE *(*orig_fopen_t)(const char *pathname, const char *mode); @@ -63,6 +63,9 @@ static inline uint32_t hash(const char *str) { } static void storage_add(const char *str) { +#ifdef DEBUG + printf("add %s\n", str); +#endif ListElem *ptr = malloc(sizeof(ListElem)); if (!ptr) { fprintf(stderr, "Error: cannot allocate memory\n"); @@ -82,11 +85,20 @@ static void storage_add(const char *str) { } static char *storage_find(const char *str) { +#ifdef DEBUG + printf("storage find %s\n", str); +#endif const char *tofind = str; int allocated = 0; if (strstr(str, "..") || strstr(str, "/./")) { tofind = realpath(str, NULL); + if (!tofind) { +#ifdef DEBUG + printf("realpath failed\n"); +#endif + return NULL; + } allocated = 1; } @@ -96,6 +108,9 @@ static char *storage_find(const char *str) { if (strcmp(tofind, ptr->path) == 0) { if (allocated) free((char *) tofind); +#ifdef DEBUG + printf("storage found\n"); +#endif return ptr->path; } ptr = ptr->next; @@ -103,6 +118,9 @@ static char *storage_find(const char *str) { if (allocated) free((char *) tofind); +#ifdef DEBUG + printf("storage not found\n"); +#endif return NULL; } @@ -249,6 +267,9 @@ static char *name(void) { typedef int (*orig_open_t)(const char *pathname, int flags, mode_t mode); static orig_open_t orig_open = NULL; int open(const char *pathname, int flags, mode_t mode) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_open) orig_open = (orig_open_t)dlsym(RTLD_NEXT, "open"); @@ -261,9 +282,16 @@ int open(const char *pathname, int flags, mode_t mode) { return rv; } + + + +//#if 0 - todo: fix problems on google-chrome and opera - seems to be crashing when open64 is called typedef int (*orig_open64_t)(const char *pathname, int flags, mode_t mode); static orig_open64_t orig_open64 = NULL; int open64(const char *pathname, int flags, mode_t mode) { +#ifdef DEBUG + printf("%s %s\n", __FUNCTION__, pathname); +#endif if (!orig_open64) orig_open64 = (orig_open64_t)dlsym(RTLD_NEXT, "open64"); if (!blacklist_loaded) @@ -274,11 +302,16 @@ int open64(const char *pathname, int flags, mode_t mode) { sendlog(name(), __FUNCTION__, pathname); return rv; } +//#endif + // openat typedef int (*orig_openat_t)(int dirfd, const char *pathname, int flags, mode_t mode); static orig_openat_t orig_openat = NULL; int openat(int dirfd, const char *pathname, int flags, mode_t mode) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_openat) orig_openat = (orig_openat_t)dlsym(RTLD_NEXT, "openat"); if (!blacklist_loaded) @@ -293,6 +326,9 @@ int openat(int dirfd, const char *pathname, int flags, mode_t mode) { typedef int (*orig_openat64_t)(int dirfd, const char *pathname, int flags, mode_t mode); static orig_openat64_t orig_openat64 = NULL; int openat64(int dirfd, const char *pathname, int flags, mode_t mode) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_openat64) orig_openat64 = (orig_openat64_t)dlsym(RTLD_NEXT, "openat64"); if (!blacklist_loaded) @@ -307,6 +343,9 @@ int openat64(int dirfd, const char *pathname, int flags, mode_t mode) { // fopen FILE *fopen(const char *pathname, const char *mode) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_fopen) orig_fopen = (orig_fopen_t)dlsym(RTLD_NEXT, "fopen"); if (!blacklist_loaded) @@ -320,6 +359,9 @@ FILE *fopen(const char *pathname, const char *mode) { #ifdef __GLIBC__ FILE *fopen64(const char *pathname, const char *mode) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_fopen64) orig_fopen64 = (orig_fopen_t)dlsym(RTLD_NEXT, "fopen64"); if (!blacklist_loaded) @@ -337,6 +379,9 @@ FILE *fopen64(const char *pathname, const char *mode) { typedef FILE *(*orig_freopen_t)(const char *pathname, const char *mode, FILE *stream); static orig_freopen_t orig_freopen = NULL; FILE *freopen(const char *pathname, const char *mode, FILE *stream) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_freopen) orig_freopen = (orig_freopen_t)dlsym(RTLD_NEXT, "freopen"); if (!blacklist_loaded) @@ -352,6 +397,9 @@ FILE *freopen(const char *pathname, const char *mode, FILE *stream) { typedef FILE *(*orig_freopen64_t)(const char *pathname, const char *mode, FILE *stream); static orig_freopen64_t orig_freopen64 = NULL; FILE *freopen64(const char *pathname, const char *mode, FILE *stream) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_freopen64) orig_freopen64 = (orig_freopen64_t)dlsym(RTLD_NEXT, "freopen64"); if (!blacklist_loaded) @@ -368,6 +416,9 @@ FILE *freopen64(const char *pathname, const char *mode, FILE *stream) { typedef int (*orig_unlink_t)(const char *pathname); static orig_unlink_t orig_unlink = NULL; int unlink(const char *pathname) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_unlink) orig_unlink = (orig_unlink_t)dlsym(RTLD_NEXT, "unlink"); if (!blacklist_loaded) @@ -382,6 +433,9 @@ int unlink(const char *pathname) { typedef int (*orig_unlinkat_t)(int dirfd, const char *pathname, int flags); static orig_unlinkat_t orig_unlinkat = NULL; int unlinkat(int dirfd, const char *pathname, int flags) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_unlinkat) orig_unlinkat = (orig_unlinkat_t)dlsym(RTLD_NEXT, "unlinkat"); if (!blacklist_loaded) @@ -397,6 +451,9 @@ int unlinkat(int dirfd, const char *pathname, int flags) { typedef int (*orig_mkdir_t)(const char *pathname, mode_t mode); static orig_mkdir_t orig_mkdir = NULL; int mkdir(const char *pathname, mode_t mode) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_mkdir) orig_mkdir = (orig_mkdir_t)dlsym(RTLD_NEXT, "mkdir"); if (!blacklist_loaded) @@ -411,6 +468,9 @@ int mkdir(const char *pathname, mode_t mode) { typedef int (*orig_mkdirat_t)(int dirfd, const char *pathname, mode_t mode); static orig_mkdirat_t orig_mkdirat = NULL; int mkdirat(int dirfd, const char *pathname, mode_t mode) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_mkdirat) orig_mkdirat = (orig_mkdirat_t)dlsym(RTLD_NEXT, "mkdirat"); if (!blacklist_loaded) @@ -425,6 +485,9 @@ int mkdirat(int dirfd, const char *pathname, mode_t mode) { typedef int (*orig_rmdir_t)(const char *pathname); static orig_rmdir_t orig_rmdir = NULL; int rmdir(const char *pathname) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_rmdir) orig_rmdir = (orig_rmdir_t)dlsym(RTLD_NEXT, "rmdir"); if (!blacklist_loaded) @@ -440,6 +503,9 @@ int rmdir(const char *pathname) { typedef int (*orig_stat_t)(const char *pathname, struct stat *buf); static orig_stat_t orig_stat = NULL; int stat(const char *pathname, struct stat *buf) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_stat) orig_stat = (orig_stat_t)dlsym(RTLD_NEXT, "stat"); if (!blacklist_loaded) @@ -455,6 +521,9 @@ int stat(const char *pathname, struct stat *buf) { typedef int (*orig_stat64_t)(const char *pathname, struct stat64 *buf); static orig_stat64_t orig_stat64 = NULL; int stat64(const char *pathname, struct stat64 *buf) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_stat) orig_stat64 = (orig_stat64_t)dlsym(RTLD_NEXT, "stat64"); if (!blacklist_loaded) @@ -470,6 +539,9 @@ int stat64(const char *pathname, struct stat64 *buf) { typedef int (*orig_lstat_t)(const char *pathname, struct stat *buf); static orig_lstat_t orig_lstat = NULL; int lstat(const char *pathname, struct stat *buf) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_lstat) orig_lstat = (orig_lstat_t)dlsym(RTLD_NEXT, "lstat"); if (!blacklist_loaded) @@ -485,6 +557,9 @@ int lstat(const char *pathname, struct stat *buf) { typedef int (*orig_lstat64_t)(const char *pathname, struct stat64 *buf); static orig_lstat64_t orig_lstat64 = NULL; int lstat64(const char *pathname, struct stat64 *buf) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_lstat) orig_lstat64 = (orig_lstat64_t)dlsym(RTLD_NEXT, "lstat64"); if (!blacklist_loaded) @@ -501,6 +576,9 @@ int lstat64(const char *pathname, struct stat64 *buf) { typedef int (*orig_access_t)(const char *pathname, int mode); static orig_access_t orig_access = NULL; int access(const char *pathname, int mode) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_access) orig_access = (orig_access_t)dlsym(RTLD_NEXT, "access"); if (!blacklist_loaded) @@ -516,6 +594,9 @@ int access(const char *pathname, int mode) { typedef DIR *(*orig_opendir_t)(const char *pathname); static orig_opendir_t orig_opendir = NULL; DIR *opendir(const char *pathname) { +#ifdef DEBUG + printf("%s\n", __FUNCTION__); +#endif if (!orig_opendir) orig_opendir = (orig_opendir_t)dlsym(RTLD_NEXT, "opendir"); if (!blacklist_loaded) diff --git a/test/chromium.exp b/test/chromium.exp index 9f4aa9ea4..77325d070 100755 --- a/test/chromium.exp +++ b/test/chromium.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog chromium www.gentoo.org\r" +send -- "firejail chromium www.gentoo.org\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/chromium.profile" diff --git a/test/deluge.exp b/test/deluge.exp index 88982f189..49266813e 100755 --- a/test/deluge.exp +++ b/test/deluge.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog deluge\r" +send -- "firejail deluge\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/deluge.profile" diff --git a/test/evince.exp b/test/evince.exp index 6c94dff9a..0c57f3871 100755 --- a/test/evince.exp +++ b/test/evince.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog evince\r" +send -- "firejail evince\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/evince.profile" @@ -38,7 +38,7 @@ spawn $env(SHELL) send -- "firemon --seccomp\r" expect { timeout {puts "TESTING ERROR 5\n";exit} - ":firejail --tracelog evince" + ":firejail evince" } expect { timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit} @@ -52,7 +52,7 @@ sleep 1 send -- "firemon --caps\r" expect { timeout {puts "TESTING ERROR 6\n";exit} - ":firejail --tracelog evince" + ":firejail evince" } expect { timeout {puts "TESTING ERROR 6.1\n";exit} diff --git a/test/fbreader.exp b/test/fbreader.exp index 97df8aca8..65a193c54 100755 --- a/test/fbreader.exp +++ b/test/fbreader.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog fbreader\r" +send -- "firejail fbreader\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/fbreader.profile" @@ -38,7 +38,7 @@ spawn $env(SHELL) send -- "firemon --seccomp\r" expect { timeout {puts "TESTING ERROR 5\n";exit} - ":firejail --tracelog fbreader" + ":firejailfbreader" } expect { timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit} @@ -52,7 +52,7 @@ sleep 1 send -- "firemon --caps\r" expect { timeout {puts "TESTING ERROR 6\n";exit} - ":firejail --tracelog fbreader" + ":firejail fbreader" } expect { timeout {puts "TESTING ERROR 6.1\n";exit} diff --git a/test/firefox.exp b/test/firefox.exp index e1b31dd87..c2e64e04f 100755 --- a/test/firefox.exp +++ b/test/firefox.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog firefox www.gentoo.org\r" +send -- "firejail firefox www.gentoo.org\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/firefox.profile" diff --git a/test/gnome-mplayer.exp b/test/gnome-mplayer.exp index e0157ffa9..193d532ae 100755 --- a/test/gnome-mplayer.exp +++ b/test/gnome-mplayer.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog gnome-mplayer\r" +send -- "firejail gnome-mplayer\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/gnome-mplayer.profile" @@ -68,5 +68,5 @@ expect { } sleep 1 -puts "\n" +puts "\nall done\n" diff --git a/test/google-chrome.exp b/test/google-chrome.exp index f66608de4..7999831d7 100755 --- a/test/google-chrome.exp +++ b/test/google-chrome.exp @@ -4,10 +4,10 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog google-chrome www.gentoo.org\r" +send -- "firejail google-chrome www.gentoo.org\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Reading profile /etc/firejail/chromium.profile" + "Reading profile /etc/firejail/google-chrome.profile" } expect { timeout {puts "TESTING ERROR 1\n";exit} diff --git a/test/hexchat.exp b/test/hexchat.exp index 90d775574..0653bcb13 100755 --- a/test/hexchat.exp +++ b/test/hexchat.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog hexchat\r" +send -- "firejail hexchat\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/hexchat.profile" diff --git a/test/icedove.exp b/test/icedove.exp index af2bd1ace..be5309e07 100755 --- a/test/icedove.exp +++ b/test/icedove.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog icedove\r" +send -- "firejail icedove\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/icedove.profile" @@ -38,7 +38,7 @@ spawn $env(SHELL) send -- "firemon --seccomp\r" expect { timeout {puts "TESTING ERROR 5\n";exit} - ":firejail --tracelog icedove" + ":firejail icedove" } expect { timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit} @@ -52,7 +52,7 @@ sleep 1 send -- "firemon --caps\r" expect { timeout {puts "TESTING ERROR 6\n";exit} - ":firejail --tracelog icedove" + ":firejail icedove" } expect { timeout {puts "TESTING ERROR 6.1\n";exit} diff --git a/test/midori.exp b/test/midori.exp index f8f39d579..ec33816dd 100755 --- a/test/midori.exp +++ b/test/midori.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog midori www.gentoo.org\r" +send -- "firejail midori www.gentoo.org\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/midori.profile" diff --git a/test/opera.exp b/test/opera.exp index 62dc22279..f536ae866 100755 --- a/test/opera.exp +++ b/test/opera.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog opera www.gentoo.org\r" +send -- "firejail opera www.gentoo.org\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/opera.profile" diff --git a/test/transmission-gtk.exp b/test/transmission-gtk.exp index 01e220573..77d5dd30c 100755 --- a/test/transmission-gtk.exp +++ b/test/transmission-gtk.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog transmission-gtk\r" +send -- "firejail transmission-gtk\r" expect { timeout {puts "TESTING ERROR 1\n";exit} "Child process initialized" @@ -34,7 +34,7 @@ spawn $env(SHELL) send -- "firemon --seccomp\r" expect { timeout {puts "TESTING ERROR 5\n";exit} - ":firejail --tracelog transmission-gtk" + ":firejail transmission-gtk" } expect { timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit} @@ -48,7 +48,7 @@ sleep 1 send -- "firemon --caps\r" expect { timeout {puts "TESTING ERROR 6\n";exit} - ":firejail --tracelog transmission-gtk" + ":firejail transmission-gtk" } expect { timeout {puts "TESTING ERROR 6.1\n";exit} diff --git a/test/transmission-qt.exp b/test/transmission-qt.exp index 785e35649..d27c16d6d 100755 --- a/test/transmission-qt.exp +++ b/test/transmission-qt.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog transmission-qt\r" +send -- "firejail transmission-qt\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/transmission-qt.profile" @@ -38,7 +38,7 @@ spawn $env(SHELL) send -- "firemon --seccomp\r" expect { timeout {puts "TESTING ERROR 5\n";exit} - ":firejail --tracelog transmission-qt" + ":firejail transmission-qt" } expect { timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit} @@ -52,7 +52,7 @@ sleep 1 send -- "firemon --caps\r" expect { timeout {puts "TESTING ERROR 6\n";exit} - ":firejail --tracelog transmission-qt" + ":firejail transmission-qt" } expect { timeout {puts "TESTING ERROR 6.1\n";exit} diff --git a/test/vlc.exp b/test/vlc.exp index a9a0a3fb1..53d25c9dd 100755 --- a/test/vlc.exp +++ b/test/vlc.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog vlc\r" +send -- "firejail vlc\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/vlc.profile" @@ -38,7 +38,7 @@ spawn $env(SHELL) send -- "firemon --seccomp\r" expect { timeout {puts "TESTING ERROR 5\n";exit} - ":firejail --tracelog vlc" + ":firejail vlc" } expect { timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit} @@ -52,7 +52,7 @@ sleep 1 send -- "firemon --caps\r" expect { timeout {puts "TESTING ERROR 6\n";exit} - ":firejail --tracelog vlc" + ":firejail vlc" } expect { timeout {puts "TESTING ERROR 6.1\n";exit} diff --git a/test/weechat.exp b/test/weechat.exp index 8a928b0e9..ac2430280 100755 --- a/test/weechat.exp +++ b/test/weechat.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog weechat-curses\r" +send -- "firejail weechat-curses\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/weechat.profile" diff --git a/test/wine.exp b/test/wine.exp index 1e7df434c..d87c1f205 100755 --- a/test/wine.exp +++ b/test/wine.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog wine --help\r" +send -- "firejail wine --help\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/wine.profile" diff --git a/test/xchat.exp b/test/xchat.exp index d1b06b2c0..babbcf87d 100755 --- a/test/xchat.exp +++ b/test/xchat.exp @@ -4,7 +4,7 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "firejail --tracelog xchat\r" +send -- "firejail xchat\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Reading profile /etc/firejail/xchat.profile" -- cgit v1.2.3-54-g00ecf