diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/jailcheck/Makefile.in (renamed from src/jailtest/Makefile.in) | 6 | ||||
-rw-r--r-- | src/jailcheck/access.c (renamed from src/jailtest/access.c) | 4 | ||||
-rw-r--r-- | src/jailcheck/apparmor.c (renamed from src/jailtest/apparmor.c) | 2 | ||||
-rw-r--r-- | src/jailcheck/jailcheck.h (renamed from src/jailtest/jailtest.h) | 4 | ||||
-rw-r--r-- | src/jailcheck/main.c (renamed from src/jailtest/main.c) | 4 | ||||
-rw-r--r-- | src/jailcheck/noexec.c (renamed from src/jailtest/noexec.c) | 4 | ||||
-rw-r--r-- | src/jailcheck/seccomp.c (renamed from src/jailtest/seccomp.c) | 2 | ||||
-rw-r--r-- | src/jailcheck/sysfiles.c (renamed from src/jailtest/sysfiles.c) | 2 | ||||
-rw-r--r-- | src/jailcheck/utils.c (renamed from src/jailtest/utils.c) | 2 | ||||
-rw-r--r-- | src/jailcheck/virtual.c (renamed from src/jailtest/virtual.c) | 4 | ||||
-rw-r--r-- | src/man/Makefile.in | 2 | ||||
-rw-r--r-- | src/man/firecfg.txt | 2 | ||||
-rw-r--r-- | src/man/firejail-login.txt | 2 | ||||
-rw-r--r-- | src/man/firejail-profile.txt | 2 | ||||
-rw-r--r-- | src/man/firejail-users.txt | 2 | ||||
-rw-r--r-- | src/man/firejail.txt | 2 | ||||
-rw-r--r-- | src/man/firemon.txt | 2 | ||||
-rw-r--r-- | src/man/jailcheck.txt (renamed from src/man/jailtest.txt) | 17 |
18 files changed, 32 insertions, 33 deletions
diff --git a/src/jailtest/Makefile.in b/src/jailcheck/Makefile.in index 6306d24ec..d218c1f90 100644 --- a/src/jailtest/Makefile.in +++ b/src/jailcheck/Makefile.in | |||
@@ -1,16 +1,16 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: jailtest | 2 | all: jailcheck |
3 | 3 | ||
4 | include ../common.mk | 4 | include ../common.mk |
5 | 5 | ||
6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h | 6 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h |
7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 7 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
8 | 8 | ||
9 | jailtest: $(OBJS) | 9 | jailcheck: $(OBJS) |
10 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) | 10 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) |
11 | 11 | ||
12 | .PHONY: clean | 12 | .PHONY: clean |
13 | clean:; rm -fr *.o jailtest *.gcov *.gcda *.gcno *.plist | 13 | clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist |
14 | 14 | ||
15 | .PHONY: distclean | 15 | .PHONY: distclean |
16 | distclean: clean | 16 | distclean: clean |
diff --git a/src/jailtest/access.c b/src/jailcheck/access.c index 4e737dc7a..c18d64a82 100644 --- a/src/jailtest/access.c +++ b/src/jailcheck/access.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | #include "jailtest.h" | 20 | #include "jailcheck.h" |
21 | #include <dirent.h> | 21 | #include <dirent.h> |
22 | #include <sys/wait.h> | 22 | #include <sys/wait.h> |
23 | 23 | ||
@@ -74,7 +74,7 @@ void access_setup(const char *directory) { | |||
74 | 74 | ||
75 | // create a test file | 75 | // create a test file |
76 | char *test_file; | 76 | char *test_file; |
77 | if (asprintf(&test_file, "%s/jailtest-access-%d", path, getpid()) == -1) | 77 | if (asprintf(&test_file, "%s/jailcheck-access-%d", path, getpid()) == -1) |
78 | errExit("asprintf"); | 78 | errExit("asprintf"); |
79 | 79 | ||
80 | FILE *fp = fopen(test_file, "w"); | 80 | FILE *fp = fopen(test_file, "w"); |
diff --git a/src/jailtest/apparmor.c b/src/jailcheck/apparmor.c index 9ddfea3de..64f278046 100644 --- a/src/jailtest/apparmor.c +++ b/src/jailcheck/apparmor.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | #include "jailtest.h" | 20 | #include "jailcheck.h" |
21 | 21 | ||
22 | #ifdef HAVE_APPARMOR | 22 | #ifdef HAVE_APPARMOR |
23 | #include <sys/apparmor.h> | 23 | #include <sys/apparmor.h> |
diff --git a/src/jailtest/jailtest.h b/src/jailcheck/jailcheck.h index 0c4883061..32be1c978 100644 --- a/src/jailtest/jailtest.h +++ b/src/jailcheck/jailcheck.h | |||
@@ -17,8 +17,8 @@ | |||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | #ifndef JAILTEST_H | 20 | #ifndef JAILCHECK_H |
21 | #define JAILTEST_H | 21 | #define JAILCHECK_H |
22 | 22 | ||
23 | #include "../include/common.h" | 23 | #include "../include/common.h" |
24 | 24 | ||
diff --git a/src/jailtest/main.c b/src/jailcheck/main.c index 3369dca39..4d642bf96 100644 --- a/src/jailtest/main.c +++ b/src/jailcheck/main.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | #include "jailtest.h" | 20 | #include "jailcheck.h" |
21 | #include "../include/firejail_user.h" | 21 | #include "../include/firejail_user.h" |
22 | #include "../include/pid.h" | 22 | #include "../include/pid.h" |
23 | #include <sys/wait.h> | 23 | #include <sys/wait.h> |
@@ -30,7 +30,7 @@ char *user_run_dir = NULL; | |||
30 | int arg_debug = 0; | 30 | int arg_debug = 0; |
31 | 31 | ||
32 | static char *usage_str = | 32 | static char *usage_str = |
33 | "Usage: jailtest [options] directory [directory]\n\n" | 33 | "Usage: jailcheck [options] directory [directory]\n\n" |
34 | "Options:\n" | 34 | "Options:\n" |
35 | " --debug - print debug messages.\n" | 35 | " --debug - print debug messages.\n" |
36 | " --help, -? - this help screen.\n" | 36 | " --help, -? - this help screen.\n" |
diff --git a/src/jailtest/noexec.c b/src/jailcheck/noexec.c index 4347b7eef..7f994d6a1 100644 --- a/src/jailtest/noexec.c +++ b/src/jailcheck/noexec.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | #include "jailtest.h" | 20 | #include "jailcheck.h" |
21 | #include <sys/wait.h> | 21 | #include <sys/wait.h> |
22 | #include <sys/stat.h> | 22 | #include <sys/stat.h> |
23 | #include <fcntl.h> | 23 | #include <fcntl.h> |
@@ -67,7 +67,7 @@ void noexec_test(const char *path) { | |||
67 | return; | 67 | return; |
68 | 68 | ||
69 | char *fname; | 69 | char *fname; |
70 | if (asprintf(&fname, "%s/jailtest-noexec-%d", path, getpid()) == -1) | 70 | if (asprintf(&fname, "%s/jailcheck-noexec-%d", path, getpid()) == -1) |
71 | errExit("asprintf"); | 71 | errExit("asprintf"); |
72 | 72 | ||
73 | pid_t child = fork(); | 73 | pid_t child = fork(); |
diff --git a/src/jailtest/seccomp.c b/src/jailcheck/seccomp.c index 2cecb4b4d..9345eb970 100644 --- a/src/jailtest/seccomp.c +++ b/src/jailcheck/seccomp.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | #include "jailtest.h" | 20 | #include "jailcheck.h" |
21 | #define MAXBUF 4096 | 21 | #define MAXBUF 4096 |
22 | 22 | ||
23 | void seccomp_test(pid_t pid) { | 23 | void seccomp_test(pid_t pid) { |
diff --git a/src/jailtest/sysfiles.c b/src/jailcheck/sysfiles.c index 7e4709453..caeb580af 100644 --- a/src/jailtest/sysfiles.c +++ b/src/jailcheck/sysfiles.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | #include "jailtest.h" | 20 | #include "jailcheck.h" |
21 | #include <dirent.h> | 21 | #include <dirent.h> |
22 | #include <sys/wait.h> | 22 | #include <sys/wait.h> |
23 | 23 | ||
diff --git a/src/jailtest/utils.c b/src/jailcheck/utils.c index 41c21b753..c3aaae298 100644 --- a/src/jailtest/utils.c +++ b/src/jailcheck/utils.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | #include "jailtest.h" | 20 | #include "jailcheck.h" |
21 | #include "../include/pid.h" | 21 | #include "../include/pid.h" |
22 | #include <errno.h> | 22 | #include <errno.h> |
23 | #include <pwd.h> | 23 | #include <pwd.h> |
diff --git a/src/jailtest/virtual.c b/src/jailcheck/virtual.c index fcdcf9720..09092f9ce 100644 --- a/src/jailtest/virtual.c +++ b/src/jailcheck/virtual.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | #include "jailtest.h" | 20 | #include "jailcheck.h" |
21 | #include <dirent.h> | 21 | #include <dirent.h> |
22 | #include <sys/wait.h> | 22 | #include <sys/wait.h> |
23 | 23 | ||
@@ -43,7 +43,7 @@ void virtual_setup(const char *directory) { | |||
43 | 43 | ||
44 | // create a test file | 44 | // create a test file |
45 | char *test_file; | 45 | char *test_file; |
46 | if (asprintf(&test_file, "%s/jailtest-private-%d", directory, getpid()) == -1) | 46 | if (asprintf(&test_file, "%s/jailcheck-private-%d", directory, getpid()) == -1) |
47 | errExit("asprintf"); | 47 | errExit("asprintf"); |
48 | 48 | ||
49 | FILE *fp = fopen(test_file, "w"); | 49 | FILE *fp = fopen(test_file, "w"); |
diff --git a/src/man/Makefile.in b/src/man/Makefile.in index 3711d5cec..fbd2d795e 100644 --- a/src/man/Makefile.in +++ b/src/man/Makefile.in | |||
@@ -1,5 +1,5 @@ | |||
1 | .PHONY: all | 1 | .PHONY: all |
2 | all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailtest.man | 2 | all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man |
3 | 3 | ||
4 | include ../common.mk | 4 | include ../common.mk |
5 | 5 | ||
diff --git a/src/man/firecfg.txt b/src/man/firecfg.txt index dbb9397c6..7e0a57f92 100644 --- a/src/man/firecfg.txt +++ b/src/man/firecfg.txt | |||
@@ -135,4 +135,4 @@ Homepage: https://firejail.wordpress.com | |||
135 | .BR firejail-profile (5), | 135 | .BR firejail-profile (5), |
136 | .BR firejail-login (5), | 136 | .BR firejail-login (5), |
137 | .BR firejail-users (5), | 137 | .BR firejail-users (5), |
138 | .BR jailtest (1) | 138 | .BR jailcheck (1) |
diff --git a/src/man/firejail-login.txt b/src/man/firejail-login.txt index 1b8a4931c..05afd55b5 100644 --- a/src/man/firejail-login.txt +++ b/src/man/firejail-login.txt | |||
@@ -39,4 +39,4 @@ Homepage: https://firejail.wordpress.com | |||
39 | .BR firecfg (1), | 39 | .BR firecfg (1), |
40 | .BR firejail-profile (5), | 40 | .BR firejail-profile (5), |
41 | .BR firejail-users (5), | 41 | .BR firejail-users (5), |
42 | .BR jailtest (1) | 42 | .BR jailcheck (1) |
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index 49be8d0b0..3d59705b9 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt | |||
@@ -986,7 +986,7 @@ Homepage: https://firejail.wordpress.com | |||
986 | .BR firecfg (1), | 986 | .BR firecfg (1), |
987 | .BR firejail-login (5), | 987 | .BR firejail-login (5), |
988 | .BR firejail-users (5), | 988 | .BR firejail-users (5), |
989 | .BR jailtest (1) | 989 | .BR jailcheck (1) |
990 | 990 | ||
991 | .UR https://github.com/netblue30/firejail/wiki/Creating-Profiles | 991 | .UR https://github.com/netblue30/firejail/wiki/Creating-Profiles |
992 | .UE | 992 | .UE |
diff --git a/src/man/firejail-users.txt b/src/man/firejail-users.txt index c5a9c1848..e3cce7ed5 100644 --- a/src/man/firejail-users.txt +++ b/src/man/firejail-users.txt | |||
@@ -59,4 +59,4 @@ Homepage: https://firejail.wordpress.com | |||
59 | .BR firecfg (1), | 59 | .BR firecfg (1), |
60 | .BR firejail-profile (5), | 60 | .BR firejail-profile (5), |
61 | .BR firejail-login (5), | 61 | .BR firejail-login (5), |
62 | .BR jailtest (1) | 62 | .BR jailcheck (1) |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index 68aea5857..690da4b4e 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -3367,7 +3367,7 @@ Homepage: https://firejail.wordpress.com | |||
3367 | .BR firejail-profile (5), | 3367 | .BR firejail-profile (5), |
3368 | .BR firejail-login (5), | 3368 | .BR firejail-login (5), |
3369 | .BR firejail-users (5), | 3369 | .BR firejail-users (5), |
3370 | .BR jailtest (1) | 3370 | .BR jailcheck (1) |
3371 | 3371 | ||
3372 | .UR https://github.com/netblue30/firejail/wiki | 3372 | .UR https://github.com/netblue30/firejail/wiki |
3373 | .UE , | 3373 | .UE , |
diff --git a/src/man/firemon.txt b/src/man/firemon.txt index 64f15a1f0..76b2f7be2 100644 --- a/src/man/firemon.txt +++ b/src/man/firemon.txt | |||
@@ -120,4 +120,4 @@ Homepage: https://firejail.wordpress.com | |||
120 | .BR firejail-profile (5), | 120 | .BR firejail-profile (5), |
121 | .BR firejail-login (5), | 121 | .BR firejail-login (5), |
122 | .BR firejail-users (5), | 122 | .BR firejail-users (5), |
123 | .BR jailtest (1) | 123 | .BR jailcheck (1) |
diff --git a/src/man/jailtest.txt b/src/man/jailcheck.txt index b52fc5eed..c80e305cc 100644 --- a/src/man/jailtest.txt +++ b/src/man/jailcheck.txt | |||
@@ -1,23 +1,22 @@ | |||
1 | .TH JAILTEST 1 "MONTH YEAR" "VERSION" "JAILTEST man page" | 1 | .TH JAILCHECK 1 "MONTH YEAR" "VERSION" "JAILCHECK man page" |
2 | .SH NAME | 2 | .SH NAME |
3 | jailtest \- Simple utility program to test running sandboxes | 3 | jailcheck \- Simple utility program to test running sandboxes |
4 | .SH SYNOPSIS | 4 | .SH SYNOPSIS |
5 | sudo jailtest [OPTIONS] [directory] | 5 | sudo jailcheck [OPTIONS] [directory] |
6 | .SH DESCRIPTION | 6 | .SH DESCRIPTION |
7 | WORK IN PROGRESS! | 7 | jailcheck attaches itself to all sandboxes started by the user and performs some basic tests |
8 | jailtest attaches itself to all sandboxes started by the user and performs some basic tests | ||
9 | on the sandbox filesystem: | 8 | on the sandbox filesystem: |
10 | .TP | 9 | .TP |
11 | \fB1. Virtual directories | 10 | \fB1. Virtual directories |
12 | jailtest extracts a list with the main virtual directories installed by the sandbox. | 11 | jailcheck extracts a list with the main virtual directories installed by the sandbox. |
13 | These directories are build by firejail at startup using --private* and --whitelist commands. | 12 | These directories are build by firejail at startup using --private* and --whitelist commands. |
14 | .TP | 13 | .TP |
15 | \fB2. Noexec test | 14 | \fB2. Noexec test |
16 | jailtest inserts executable programs in /home/username, /tmp, and /var/tmp directories | 15 | jailcheck inserts executable programs in /home/username, /tmp, and /var/tmp directories |
17 | and tries to run them from inside the sandbox, thus testing if the directory is executable or not. | 16 | and tries to run them from inside the sandbox, thus testing if the directory is executable or not. |
18 | .TP | 17 | .TP |
19 | \fB3. Read access test | 18 | \fB3. Read access test |
20 | jailtest creates test files in the directories specified by the user and tries to read | 19 | jailcheck creates test files in the directories specified by the user and tries to read |
21 | them from inside the sandbox. | 20 | them from inside the sandbox. |
22 | .TP | 21 | .TP |
23 | \fB4. AppArmor test | 22 | \fB4. AppArmor test |
@@ -49,7 +48,7 @@ It is followed by relevant sandbox information, such as the virtual directories | |||
49 | 48 | ||
50 | .SH EXAMPLE | 49 | .SH EXAMPLE |
51 | 50 | ||
52 | $ sudo jailtest | 51 | $ sudo jailcheck |
53 | .br | 52 | .br |
54 | 2014:netblue::firejail /usr/bin/gimp | 53 | 2014:netblue::firejail /usr/bin/gimp |
55 | .br | 54 | .br |