minor cleanup: move pid functions from main.c to util.c

1 files changed, 70 insertions, 0 deletions

diff --git a/src/firejail/util.c b/src/firejail/util.c
index 3aa0584d6..d65ac0071 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -29,6 +29,7 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <sys/wait.h>
+#include <limits.h>
 
 #include <fcntl.h>
 #ifndef O_PATH
@@ -1265,3 +1266,72 @@ void enter_network_namespace(pid_t pid) {
                 exit(1);
         }
 }
+
+// return 1 if error, 0 if a valid pid was found
+static int extract_pid(const char *name, pid_t *pid) {
+        int retval = 0;
+        EUID_ASSERT();
+        if (!name || strlen(name) == 0) {
+                fprintf(stderr, "Error: invalid sandbox name\n");
+                exit(1);
+        }
+
+        EUID_ROOT();
+        if (name2pid(name, pid)) {
+                retval = 1;
+        }
+        EUID_USER();
+        return retval;
+}
+
+// return 1 if error, 0 if a valid pid was found
+int read_pid(const char *name, pid_t *pid) {
+        char *endptr;
+        errno = 0;
+        long int pidtmp = strtol(name, &endptr, 10);
+        if ((errno == ERANGE && (pidtmp == LONG_MAX || pidtmp == LONG_MIN))
+                || (errno != 0 && pidtmp == 0)) {
+                return extract_pid(name,pid);
+        }
+        // endptr points to '\0' char in name if the entire string is valid
+        if (endptr == NULL || endptr[0]!='\0') {
+                return extract_pid(name,pid);
+        }
+        *pid =(pid_t)pidtmp;
+        return 0;
+}
+
+pid_t require_pid(const char *name) {
+        pid_t pid;
+        if (read_pid(name,&pid)) {
+                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
+                exit(1);
+        }
+        return pid;
+}
+
+// return 1 if there is a link somewhere in path of directory
+static int has_link(const char *dir) {
+        assert(dir);
+        int fd = safe_fd(dir, O_PATH|O_DIRECTORY|O_NOFOLLOW|O_CLOEXEC);
+        if (fd == -1) {
+                if (errno == ENOTDIR && is_dir(dir))
+                        return 1;
+        }
+        else
+                close(fd);
+        return 0;
+}
+
+void check_homedir(void) {
+        assert(cfg.homedir);
+        if (cfg.homedir[0] != '/') {
+                fprintf(stderr, "Error: invalid user directory \"%s\"\n", cfg.homedir);
+                exit(1);
+        }
+        // symlinks are rejected in many places
+        if (has_link(cfg.homedir)) {
+                fprintf(stderr, "No full support for symbolic links in path of user directory.\n"
+                        "Please provide resolved path in password database (/etc/passwd).\n\n");
+        }
+}