From 41684db4934fcc6913909059b1cd22ac529d8dfc Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Fri, 10 Dec 2021 13:42:17 -0300
Subject: Revert "allow/noallow/deny/nodeny aliases for
 whitelist/nowhitelist/blacklist/noblacklist"

This reverts commit 45f2ba544e9934b49e03b17c0a638dddc3a44734.

Note: This is not a clean revert.

Note2: This also reverts the changes to src/firejail/profile.c from
commit fe0f975f4 ("move whitelist/blacklist to allow/deny", 2021-07-05).

Relates to #4410.
---
 src/firejail/main.c    | 36 ------------------------------------
 src/firejail/profile.c | 38 --------------------------------------
 2 files changed, 74 deletions(-)

(limited to 'src')

diff --git a/src/firejail/main.c b/src/firejail/main.c
index 0262db608..58e374b8b 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1574,7 +1574,6 @@ int main(int argc, char **argv, char **envp) {
 			profile_add(line);
 		}
 
-		// blacklist/deny
 		else if (strncmp(argv[i], "--blacklist=", 12) == 0) {
 			char *line;
 			if (asprintf(&line, "blacklist %s", argv[i] + 12) == -1)
@@ -1583,14 +1582,6 @@ int main(int argc, char **argv, char **envp) {
 			profile_check_line(line, 0, NULL);	// will exit if something wrong
 			profile_add(line);
 		}
-		else if (strncmp(argv[i], "--deny=", 7) == 0) {
-			char *line;
-			if (asprintf(&line, "blacklist %s", argv[i] + 7) == -1)
-				errExit("asprintf");
-
-			profile_check_line(line, 0, NULL);	// will exit if something wrong
-			profile_add(line);
-		}
 		else if (strncmp(argv[i], "--noblacklist=", 14) == 0) {
 			char *line;
 			if (asprintf(&line, "noblacklist %s", argv[i] + 14) == -1)
@@ -1599,16 +1590,6 @@ int main(int argc, char **argv, char **envp) {
 			profile_check_line(line, 0, NULL);	// will exit if something wrong
 			profile_add(line);
 		}
-		else if (strncmp(argv[i], "--nodeny=", 9) == 0) {
-			char *line;
-			if (asprintf(&line, "noblacklist %s", argv[i] + 9) == -1)
-				errExit("asprintf");
-
-			profile_check_line(line, 0, NULL);	// will exit if something wrong
-			profile_add(line);
-		}
-
-		// whitelist
 		else if (strncmp(argv[i], "--whitelist=", 12) == 0) {
 			char *line;
 			if (asprintf(&line, "whitelist %s", argv[i] + 12) == -1)
@@ -1617,14 +1598,6 @@ int main(int argc, char **argv, char **envp) {
 			profile_check_line(line, 0, NULL);	// will exit if something wrong
 			profile_add(line);
 		}
-		else if (strncmp(argv[i], "--allow=", 8) == 0) {
-			char *line;
-			if (asprintf(&line, "whitelist %s", argv[i] + 8) == -1)
-				errExit("asprintf");
-
-			profile_check_line(line, 0, NULL);	// will exit if something wrong
-			profile_add(line);
-		}
 		else if (strncmp(argv[i], "--nowhitelist=", 14) == 0) {
 			char *line;
 			if (asprintf(&line, "nowhitelist %s", argv[i] + 14) == -1)
@@ -1633,15 +1606,6 @@ int main(int argc, char **argv, char **envp) {
 			profile_check_line(line, 0, NULL);	// will exit if something wrong
 			profile_add(line);
 		}
-		else if (strncmp(argv[i], "--noallow=", 10) == 0) {
-			char *line;
-			if (asprintf(&line, "nowhitelist %s", argv[i] + 10) == -1)
-				errExit("asprintf");
-
-			profile_check_line(line, 0, NULL);	// will exit if something wrong
-			profile_add(line);
-		}
-
 
 		else if (strncmp(argv[i], "--mkdir=", 8) == 0) {
 			char *line;
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 5e24591fa..9504b26de 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1752,44 +1752,6 @@ void profile_read(const char *fname) {
 			continue;
 		}
 
-		// translate allow/deny to whitelist/blacklist
-		if (strncmp(ptr, "allow ", 6) == 0) {
-			char *tmp;
-			if (asprintf(&tmp, "whitelist %s", ptr + 6) == -1)
-				errExit("asprintf");
-			free(ptr);
-			ptr = tmp;
-		}
-		else if (strncmp(ptr, "deny ", 5) == 0) {
-			char *tmp;
-			if (asprintf(&tmp, "blacklist %s", ptr + 5) == -1)
-				errExit("asprintf");
-			free(ptr);
-			ptr = tmp;
-		}
-		else if (strncmp(ptr, "deny-nolog ", 11) == 0) {
-			char *tmp;
-			if (asprintf(&tmp, "blacklist-nolog %s", ptr + 11) == -1)
-				errExit("asprintf");
-			free(ptr);
-			ptr = tmp;
-		}
-		// translate noallow/nodeny to nowhitelist/noblacklist
-		else if (strncmp(ptr, "noallow ", 8) == 0) {
-			char *tmp;
-			if (asprintf(&tmp, "nowhitelist %s", ptr + 8) == -1)
-				errExit("asprintf");
-			free(ptr);
-			ptr = tmp;
-		}
-		else if (strncmp(ptr, "nodeny ", 7) == 0) {
-			char *tmp;
-			if (asprintf(&tmp, "noblacklist %s", ptr + 7) == -1)
-				errExit("asprintf");
-			free(ptr);
-			ptr = tmp;
-		}
-
 		// process quiet
 		// todo: a quiet in the profile file cannot be disabled by --ignore on command line
 		if (strcmp(ptr, "quiet") == 0) {
-- 
cgit v1.2.3-70-g09d2