phase1

8 files changed, 11 insertions, 562 deletions

diff --git a/src/fcopy/Makefile.in b/src/fcopy/Makefile.in
deleted file mode 100644
index c9e7d87ab..000000000
--- a/src/fcopy/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-all: fcopy
-
-include ../common.mk
-
-%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h
-        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
-
-fcopy: $(OBJS)
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
-
-clean:; rm -f *.o fcopy *.gcov *.gcda *.gcno
-
-distclean: clean
-        rm -fr Makefile
diff --git a/src/fcopy/main.c b/src/fcopy/main.c
deleted file mode 100644
index e93cd1cb8..000000000
--- a/src/fcopy/main.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * Copyright (C) 2014-2018 Firejail Authors
- *
- * This file is part of firejail project
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "../include/common.h"
-#include <fcntl.h>
-#include <ftw.h>
-#include <errno.h>
-#include <pwd.h>
-
-int arg_quiet = 0;
-static int arg_follow_link = 0;
-
-#define COPY_LIMIT (500 * 1024 *1024)
-static int size_limit_reached = 0;
-static unsigned file_cnt = 0;
-static unsigned size_cnt = 0;
-
-static char *outpath = NULL;
-static char *inpath = NULL;
-
-// modified version of the function from util.c
-static void copy_file(const char *srcname, const char *destname, mode_t mode, uid_t uid, gid_t gid) {
-        assert(srcname);
-        assert(destname);
-        mode &= 07777;
-
-        // don't copy the file if it is already there
-        struct stat s;
-        if (stat(destname, &s) == 0)
-                return;
-
-        // open source
-        int src = open(srcname, O_RDONLY);
-        if (src < 0) {
-                if (!arg_quiet)
-                        fprintf(stderr, "Warning fcopy: cannot open %s, file not copied\n", srcname);
-                return;
-        }
-
-        // open destination
-        int dst = open(destname, O_CREAT|O_WRONLY|O_TRUNC, 0755);
-        if (dst < 0) {
-                if (!arg_quiet)
-                        fprintf(stderr, "Warning fcopy: cannot open %s, file not copied\n", destname);
-                close(src);
-                return;
-        }
-
-        // copy
-        ssize_t len;
-        static const int BUFLEN = 1024;
-        unsigned char buf[BUFLEN];
-        while ((len = read(src, buf, BUFLEN)) > 0) {
-                int done = 0;
-                while (done != len) {
-                        int rv = write(dst, buf + done, len - done);
-                        if (rv == -1)
-                                goto errexit;
-                        done += rv;
-                }
-        }
-        fflush(0);
-
-        if (fchown(dst, uid, gid) == -1)
-                goto errexit;
-        if (fchmod(dst, mode) == -1)
-                goto errexit;
-
-        close(src);
-        close(dst);
-
-        return;
-
-errexit:
-        close(src);
-        close(dst);
-        unlink(destname);
-        if (!arg_quiet)
-                fprintf(stderr, "Warning fcopy: cannot copy %s\n", destname);
-}
-
-
-// modified version of the function in firejail/util.c
-static void mkdir_attr(const char *fname, mode_t mode, uid_t uid, gid_t gid) {
-        assert(fname);
-        mode &= 07777;
-
-        if (mkdir(fname, mode) == -1 ||
-        chmod(fname, mode) == -1) {
-                fprintf(stderr, "Error fcopy: failed to create %s directory\n", fname);
-                errExit("mkdir/chmod");
-        }
-        if (chown(fname, uid, gid)) {
-                if (!arg_quiet)
-                        fprintf(stderr, "Warning fcopy: failed to change ownership of %s\n", fname);
-        }
-}
-
-
-void copy_link(const char *target, const char *linkpath, mode_t mode, uid_t uid, gid_t gid) {
-        (void) mode;
-        (void) uid;
-        (void) gid;
-
-        // if the link is already there, don't create it
-        struct stat s;
-        if (stat(linkpath, &s) == 0)
-               return;
-
-        char *rp = realpath(target, NULL);
-        if (rp) {
-                if (symlink(rp, linkpath) == -1) {
-                        free(rp);
-                        goto errout;
-                }
-                free(rp);
-        }
-        else
-                goto errout;
-
-        return;
-errout:
-        if (!arg_quiet)
-                fprintf(stderr, "Warning fcopy: cannot create symbolic link %s\n", target);
-}
-
-
-
-static int first = 1;
-static int fs_copydir(const char *infname, const struct stat *st, int ftype, struct FTW *sftw) {
-        (void) st;
-        (void) sftw;
-        assert(infname);
-        assert(*infname != '\0');
-        assert(outpath);
-        assert(*outpath != '\0');
-        assert(inpath);
-
-        // check size limit
-        if (size_limit_reached)
-                return 0;
-
-        char *outfname;
-        if (asprintf(&outfname, "%s%s", outpath, infname + strlen(inpath)) == -1)
-                errExit("asprintf");
-
-        // don't copy it if we already have the file
-        struct stat s;
-        if (stat(outfname, &s) == 0) {
-                if (first)
-                        first = 0;
-                else if (!arg_quiet)
-                        fprintf(stderr, "Warning fcopy: skipping %s, file already present\n", infname);
-                free(outfname);
-                return 0;
-        }
-
-        // extract mode and ownership
-        if (stat(infname, &s) != 0) {
-                if (!arg_quiet)
-                        fprintf(stderr, "Warning fcopy: skipping %s, cannot find inode\n", infname);
-                free(outfname);
-                return 0;
-        }
-        uid_t uid = s.st_uid;
-        gid_t gid = s.st_gid;
-        mode_t mode = s.st_mode;
-
-        // recalculate size
-        if ((s.st_size + size_cnt) > COPY_LIMIT) {
-                fprintf(stderr, "Error fcopy: size limit of %dMB reached\n", (COPY_LIMIT / 1024) / 1024);
-                size_limit_reached = 1;
-                free(outfname);
-                return 0;
-        }
-
-        file_cnt++;
-        size_cnt += s.st_size;
-
-        if(ftype == FTW_F) {
-                copy_file(infname, outfname, mode, uid, gid);
-        }
-        else if (ftype == FTW_D) {
-                mkdir_attr(outfname, mode, uid, gid);
-        }
-        else if (ftype == FTW_SL) {
-                copy_link(infname, outfname, mode, uid, gid);
-        }
-
-        return(0);
-}
-
-
-static char *check(const char *src) {
-        struct stat s;
-        char *rsrc = realpath(src, NULL);
-        if (!rsrc || stat(rsrc, &s) == -1)
-                goto errexit;
-
-        // on systems with systemd-resolved installed /etc/resolve.conf is a symlink to
-        //    /run/systemd/resolve/resolv.conf; this file is owned by systemd-resolve user
-        // checking gid will fail for files with a larger group such as /usr/bin/mutt_dotlock
-        uid_t user = getuid();
-        if (user == 0 && strncmp(rsrc, "/run/systemd/resolve/", 21) == 0) {
-                // check user systemd-resolve
-                struct passwd *p = getpwnam("systemd-resolve");
-                if (!p)
-                        goto errexit;
-                if (s.st_uid != user && s.st_uid != p->pw_uid)
-                        goto errexit;
-        }
-        else {
-                if (s.st_uid != user)
-                        goto errexit;
-        }
-
-        // dir, link, regular file
-        if (S_ISDIR(s.st_mode) || S_ISREG(s.st_mode) || S_ISLNK(s.st_mode))
-                return rsrc;                      // normal exit from the function
-
-errexit:
-        fprintf(stderr, "Error fcopy: invalid file %s\n", src);
-        exit(1);
-}
-
-
-static void duplicate_dir(const char *src, const char *dest, struct stat *s) {
-        (void) s;
-        char *rsrc = check(src);
-        char *rdest = check(dest);
-        inpath = rsrc;
-        outpath = rdest;
-
-        // walk
-        if(nftw(rsrc, fs_copydir, 1, FTW_PHYS) != 0) {
-                fprintf(stderr, "Error: unable to copy file\n");
-                exit(1);
-        }
-
-        free(rsrc);
-        free(rdest);
-}
-
-
-static void duplicate_file(const char *src, const char *dest, struct stat *s) {
-        char *rsrc = check(src);
-        char *rdest = check(dest);
-        uid_t uid = s->st_uid;
-        gid_t gid = s->st_gid;
-        mode_t mode = s->st_mode;
-
-        // build destination file name
-        char *name;
-        char *ptr = (arg_follow_link)? strrchr(src, '/'): strrchr(rsrc, '/');
-        ptr++;
-        if (asprintf(&name, "%s/%s", rdest, ptr) == -1)
-                errExit("asprintf");
-
-        // copy
-        copy_file(rsrc, name, mode, uid, gid);
-
-        free(name);
-        free(rsrc);
-        free(rdest);
-}
-
-
-static void duplicate_link(const char *src, const char *dest, struct stat *s) {
-        char *rsrc = check(src);                  // we drop the result and use the original name
-        char *rdest = check(dest);
-        uid_t uid = s->st_uid;
-        gid_t gid = s->st_gid;
-        mode_t mode = s->st_mode;
-
-        // build destination file name
-        char *name;
-        //     char *ptr = strrchr(rsrc, '/');
-        char *ptr = strrchr(src, '/');
-        ptr++;
-        if (asprintf(&name, "%s/%s", rdest, ptr) == -1)
-                errExit("asprintf");
-
-        // copy
-        copy_link(rsrc, name, mode, uid, gid);
-
-        free(name);
-        free(rsrc);
-        free(rdest);
-}
-
-
-static void usage(void) {
-        fputs("Usage: fcopy [--follow-link] src dest\n"
-                "\n"
-                "Copy SRC to DEST/SRC. SRC may be a file, directory, or symbolic link.\n"
-                "If SRC is a directory it is copied recursively.  If it is a symlink,\n"
-                "the link itself is duplicated, unless --follow-link is given,\n"
-                "in which case the destination of the link is copied.\n"
-                "DEST must already exist and must be a directory.\n", stderr);
-}
-
-
-int main(int argc, char **argv) {
-#if 0
-        {
-                //system("cat /proc/self/status");
-                int i;
-                for (i = 0; i < argc; i++)
-                        printf("*%s* ", argv[i]);
-                printf("\n");
-        }
-#endif
-        char *quiet = getenv("FIREJAIL_QUIET");
-        if (quiet && strcmp(quiet, "yes") == 0)
-                arg_quiet = 1;
-
-        char *src;
-        char *dest;
-
-        if (argc == 3) {
-                src = argv[1];
-                dest = argv[2];
-                arg_follow_link = 0;
-        }
-        else if (argc == 4 && !strcmp(argv[1], "--follow-link")) {
-                src = argv[2];
-                dest = argv[3];
-                arg_follow_link = 1;
-        }
-        else {
-                fprintf(stderr, "Error: arguments missing\n");
-                usage();
-                exit(1);
-        }
-
-        // trim trailing chars
-        if (src[strlen(src) - 1] == '/')
-                src[strlen(src) - 1] = '\0';
-        if (dest[strlen(dest) - 1] == '/')
-                dest[strlen(dest) - 1] = '\0';
-
-        // check the two files; remove ending /
-        int len = strlen(src);
-        if (src[len - 1] == '/')
-                src[len - 1] = '\0';
-        if (strcspn(src, "\\*&!?\"'<>%^(){}[];,") != (size_t)len) {
-                fprintf(stderr, "Error fcopy: invalid source file name %s\n", src);
-                exit(1);
-        }
-
-        len = strlen(dest);
-        if (dest[len - 1] == '/')
-                dest[len - 1] = '\0';
-        if (strcspn(dest, "\\*&!?\"'<>%^(){}[];,~") != (size_t)len) {
-                fprintf(stderr, "Error fcopy: invalid dest file name %s\n", dest);
-                exit(1);
-        }
-
-        // the destination should be a directory;
-        struct stat s;
-        if (stat(dest, &s) == -1) {
-                fprintf(stderr, "Error fcopy: dest dir %s: %s\n", dest, strerror(errno));
-                exit(1);
-        }
-        if (!S_ISDIR(s.st_mode)) {
-                fprintf(stderr, "Error fcopy: dest %s is not a directory\n", dest);
-                exit(1);
-        }
-
-        // copy files
-        if ((arg_follow_link ? stat : lstat)(src, &s) == -1) {
-                fprintf(stderr, "Error fcopy: src %s: %s\n", src, strerror(errno));
-                exit(1);
-        }
-
-        if (S_ISDIR(s.st_mode))
-                duplicate_dir(src, dest, &s);
-        else if (S_ISREG(s.st_mode))
-                duplicate_file(src, dest, &s);
-        else if (S_ISLNK(s.st_mode))
-                duplicate_link(src, dest, &s);
-        else {
-                fprintf(stderr, "Error fcopy: src %s is an unsupported type of file\n", src);
-                exit(1);
-        }
-
-        return 0;
-}
diff --git a/src/fgit/fgit-install.sh b/src/fgit/fgit-install.sh
deleted file mode 100755
index 1f710c688..000000000
--- a/src/fgit/fgit-install.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# Purpose: Fetch, compile, and install firejail from GitHub source. Package-manager agnostic.
-#
-
-set -e          # exit immediately if one of the commands fails
-cd /tmp         # by the time we start this, we should have a tmpfs mounted on top of /tmp
-git clone --depth=1 https://www.github.com/netblue30/firejail.git
-cd firejail
-./configure --enable-git-install
-make
-sudo make install-strip
-echo "**********************************************************************"
-echo "Mainline git Firejail version was installed in /usr/local."
-echo "If you want to remove it, run"
-echo
-echo "           firejail --git-uninstall"
-echo
-echo "**********************************************************************"
-cd ..
-rm -rf firejail
diff --git a/src/fgit/fgit-uninstall.sh b/src/fgit/fgit-uninstall.sh
deleted file mode 100644
index bc7cc9563..000000000
--- a/src/fgit/fgit-uninstall.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Purpose: Fetch, compile, and install firejail from GitHub source. Package-manager agnostic.
-#
-
-set -e          # exit immediately if one of the commands fails
-cd /tmp         # by the time we start this, we should have a tmpfs mounted on top of /tmp
-git clone --depth=1 https://www.github.com/netblue30/firejail.git
-cd firejail
-./configure --enable-git-install
-sudo make uninstall
-echo "**********************************************************************"
-echo "Firejail mainline git version uninstalled from /usr/local"
-echo
-echo "**********************************************************************"
-cd ..
-rm -rf firejail
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 04e057e28..891e73eda 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1212,6 +1212,7 @@ int main(int argc, char **argv) {
                         arg_trace = 1;
                 else if (strcmp(argv[i], "--tracelog") == 0)
                         arg_tracelog = 1;
+#ifndef LTS
                 else if (strncmp(argv[i], "--rlimit-cpu=", 13) == 0) {
                         check_unsigned(argv[i] + 13, "Error: invalid rlimit");
                         sscanf(argv[i] + 13, "%llu", &cfg.rlimit_cpu);
@@ -1242,6 +1243,7 @@ int main(int argc, char **argv) {
                         sscanf(argv[i] + 12, "%llu", &cfg.rlimit_as);
                         arg_rlimit_as = 1;
                 }
+#endif
                 else if (strncmp(argv[i], "--ipc-namespace", 15) == 0)
                         arg_ipc = 1;
                 else if (strncmp(argv[i], "--cpu=", 6) == 0)
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 057e3582f..ab27c29a8 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1077,6 +1077,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 return 0;
         }
 
+#ifndef LTS
         // rlimit
         if (strncmp(ptr, "rlimit", 6) == 0) {
                 if (strncmp(ptr, "rlimit-nofile ", 14) == 0) {
@@ -1116,6 +1117,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
 
                 return 0;
         }
+#endif
 
         if (strncmp(ptr, "timeout ", 8) == 0) {
                 cfg.timeout = extract_timeout(ptr +8);
@@ -1186,13 +1188,14 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 ptr += 6;
         }
         else {
-                if (lineno == 0)
+                if (lineno == 0) {
                         fprintf(stderr, "Error: \"%s\" as a command line option is invalid\n", ptr);
-                else if (fname != NULL)
-                        fprintf(stderr, "Error: line %d in %s is invalid\n", lineno, fname);
-                else
-                        fprintf(stderr, "Error: line %d in the custom profile is invalid\n", lineno);
-                exit(1);
+                        exit(1);
+                }
+                else {
+                        fwarning("\"%s\" is not supported in LTS build\n", ptr);
+                        return 0;
+                }
         }
 
         // some characters just don't belong in filenames
diff --git a/src/firejail/rlimit.c b/src/firejail/rlimit.c
deleted file mode 100644
index e9d459ac2..000000000
--- a/src/firejail/rlimit.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2014-2018 Firejail Authors
- *
- * This file is part of firejail project
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include "firejail.h"
-#include <sys/time.h>
-#include <sys/resource.h>
-
-void set_rlimits(void) {
-        // resource limits
-        struct rlimit rl;
-        if (arg_rlimit_cpu) {
-                rl.rlim_cur = (rlim_t) cfg.rlimit_cpu;
-                rl.rlim_max = (rlim_t) cfg.rlimit_cpu;
-#ifdef HAVE_GCOV
-                __gcov_dump();
-#endif
-                if (setrlimit(RLIMIT_CPU, &rl) == -1)
-                        errExit("setrlimit");
-                if (arg_debug)
-                        printf("Config rlimit: max cpu time %llu\n", cfg.rlimit_cpu);
-        }
-
-        if (arg_rlimit_nofile) {
-                rl.rlim_cur = (rlim_t) cfg.rlimit_nofile;
-                rl.rlim_max = (rlim_t) cfg.rlimit_nofile;
-#ifdef HAVE_GCOV        // gcov-instrumented programs might crash at this point
-                __gcov_dump();
-#endif
-                if (setrlimit(RLIMIT_NOFILE, &rl) == -1)
-                        errExit("setrlimit");
-                if (arg_debug)
-                        printf("Config rlimit: number of open file descriptors %llu\n", cfg.rlimit_nofile);
-        }
-
-        if (arg_rlimit_nproc) {
-                rl.rlim_cur = (rlim_t) cfg.rlimit_nproc;
-                rl.rlim_max = (rlim_t) cfg.rlimit_nproc;
-#ifdef HAVE_GCOV
-                __gcov_dump();
-#endif
-                if (setrlimit(RLIMIT_NPROC, &rl) == -1)
-                        errExit("setrlimit");
-                if (arg_debug)
-                        printf("Config rlimit: number of processes %llu\n", cfg.rlimit_nproc);
-        }
-
-        if (arg_rlimit_fsize) {
-                rl.rlim_cur = (rlim_t) cfg.rlimit_fsize;
-                rl.rlim_max = (rlim_t) cfg.rlimit_fsize;
-#ifdef HAVE_GCOV
-                __gcov_dump();
-#endif
-                if (setrlimit(RLIMIT_FSIZE, &rl) == -1)
-                        errExit("setrlimit");
-                if (arg_debug)
-                        printf("Config rlimit: maximum file size %llu\n", cfg.rlimit_fsize);
-        }
-
-        if (arg_rlimit_sigpending) {
-                rl.rlim_cur = (rlim_t) cfg.rlimit_sigpending;
-                rl.rlim_max = (rlim_t) cfg.rlimit_sigpending;
-#ifdef HAVE_GCOV
-                __gcov_dump();
-#endif
-                if (setrlimit(RLIMIT_SIGPENDING, &rl) == -1)
-                        errExit("setrlimit");
-                if (arg_debug)
-                        printf("Config rlimit: maximum number of signals pending %llu\n", cfg.rlimit_sigpending);
-        }
-
-        if (arg_rlimit_as) {
-                rl.rlim_cur = (rlim_t) cfg.rlimit_as;
-                rl.rlim_max = (rlim_t) cfg.rlimit_as;
-#ifdef HAVE_GCOV
-                __gcov_dump();
-#endif
-                if (setrlimit(RLIMIT_AS, &rl) == -1)
-                        errExit("setrlimit");
-                if (arg_debug)
-                        printf("Config rlimit: maximum virtual memory %llu\n", cfg.rlimit_as);
-        }
-}
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 24daedeaa..2335e9ed2 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -1023,9 +1023,6 @@ int sandbox(void* sandbox_arg) {
         // set capabilities
         set_caps();
 
-        // set rlimits
-        set_rlimits();
-
         // set cpu affinity
         if (cfg.cpus) {
                 save_cpu(); // save cpu affinity mask to CPU_CFG file