From 88132d9dfba9db08d424f95f110547028199d661 Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Fri, 21 Jun 2019 13:21:12 +0200 Subject: reduce redundancy in paths --- src/include/rundefs.h | 144 +++++++++++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/src/include/rundefs.h b/src/include/rundefs.h index 67c693dce..6cc931faf 100644 --- a/src/include/rundefs.h +++ b/src/include/rundefs.h @@ -21,82 +21,82 @@ #ifndef RUNDEFS_H #define RUNDEFS_H // filesystem -#define RUN_FIREJAIL_BASEDIR "/run" -#define RUN_FIREJAIL_DIR "/run/firejail" -#define RUN_FIREJAIL_APPIMAGE_DIR "/run/firejail/appimage" -#define RUN_FIREJAIL_NAME_DIR "/run/firejail/name" // also used in src/lib/pid.c - todo: move it in a common place -#define RUN_FIREJAIL_LIB_DIR "/run/firejail/lib" -#define RUN_FIREJAIL_X11_DIR "/run/firejail/x11" -#define RUN_FIREJAIL_NETWORK_DIR "/run/firejail/network" -#define RUN_FIREJAIL_BANDWIDTH_DIR "/run/firejail/bandwidth" -#define RUN_FIREJAIL_PROFILE_DIR "/run/firejail/profile" -#define RUN_NETWORK_LOCK_FILE "/run/firejail/firejail-network.lock" -#define RUN_DIRECTORY_LOCK_FILE "/run/firejail/firejail-run.lock" -#define RUN_RO_DIR "/run/firejail/firejail.ro.dir" -#define RUN_RO_FILE "/run/firejail/firejail.ro.file" -#define RUN_MNT_DIR "/run/firejail/mnt" // a tmpfs is mounted on this directory before any of the files below are created -#define RUN_CGROUP_CFG "/run/firejail/mnt/cgroup" -#define RUN_CPU_CFG "/run/firejail/mnt/cpu" -#define RUN_GROUPS_CFG "/run/firejail/mnt/groups" -#define RUN_PROTOCOL_CFG "/run/firejail/mnt/protocol" -#define RUN_NONEWPRIVS_CFG "/run/firejail/mnt/nonewprivs" -#define RUN_HOME_DIR "/run/firejail/mnt/home" -#define RUN_ETC_DIR "/run/firejail/mnt/etc" -#define RUN_OPT_DIR "/run/firejail/mnt/opt" -#define RUN_SRV_DIR "/run/firejail/mnt/srv" -#define RUN_BIN_DIR "/run/firejail/mnt/bin" -#define RUN_PULSE_DIR "/run/firejail/mnt/pulse" -#define RUN_LIB_DIR "/run/firejail/mnt/lib" -#define RUN_LIB_FILE "/run/firejail/mnt/libfiles" -#define RUN_DNS_ETC "/run/firejail/mnt/dns-etc" +#define RUN_FIREJAIL_BASEDIR "/run" +#define RUN_FIREJAIL_DIR RUN_FIREJAIL_BASEDIR "/firejail" +#define RUN_FIREJAIL_APPIMAGE_DIR RUN_FIREJAIL_DIR "/appimage" +#define RUN_FIREJAIL_NAME_DIR RUN_FIREJAIL_DIR "/name" // also used in src/lib/pid.c - todo: move it in a common place +#define RUN_FIREJAIL_LIB_DIR RUN_FIREJAIL_DIR "/lib" +#define RUN_FIREJAIL_X11_DIR RUN_FIREJAIL_DIR "/x11" +#define RUN_FIREJAIL_NETWORK_DIR RUN_FIREJAIL_DIR "/network" +#define RUN_FIREJAIL_BANDWIDTH_DIR RUN_FIREJAIL_DIR "/bandwidth" +#define RUN_FIREJAIL_PROFILE_DIR RUN_FIREJAIL_DIR "/profile" +#define RUN_NETWORK_LOCK_FILE RUN_FIREJAIL_DIR "/firejail-network.lock" +#define RUN_DIRECTORY_LOCK_FILE RUN_FIREJAIL_DIR "/firejail-run.lock" +#define RUN_RO_DIR RUN_FIREJAIL_DIR "/firejail.ro.dir" +#define RUN_RO_FILE RUN_FIREJAIL_DIR "/firejail.ro.file" +#define RUN_MNT_DIR RUN_FIREJAIL_DIR "/mnt" // a tmpfs is mounted on this directory before any of the files below are created +#define RUN_CGROUP_CFG RUN_MNT_DIR "/cgroup" +#define RUN_CPU_CFG RUN_MNT_DIR "/cpu" +#define RUN_GROUPS_CFG RUN_MNT_DIR "/groups" +#define RUN_PROTOCOL_CFG RUN_MNT_DIR "/protocol" +#define RUN_NONEWPRIVS_CFG RUN_MNT_DIR "/nonewprivs" +#define RUN_HOME_DIR RUN_MNT_DIR "/home" +#define RUN_ETC_DIR RUN_MNT_DIR "/etc" +#define RUN_OPT_DIR RUN_MNT_DIR "/opt" +#define RUN_SRV_DIR RUN_MNT_DIR "/srv" +#define RUN_BIN_DIR RUN_MNT_DIR "/bin" +#define RUN_PULSE_DIR RUN_MNT_DIR "/pulse" +#define RUN_LIB_DIR RUN_MNT_DIR "/lib" +#define RUN_LIB_FILE RUN_MNT_DIR "/libfiles" +#define RUN_DNS_ETC RUN_MNT_DIR "/dns-etc" -#define RUN_SECCOMP_DIR "/run/firejail/mnt/seccomp" -#define RUN_SECCOMP_LIST (RUN_SECCOMP_DIR "/seccomp.list") // list of seccomp files installed -#define RUN_SECCOMP_PROTOCOL (RUN_SECCOMP_DIR "/seccomp.protocol") // protocol filter -#define RUN_SECCOMP_CFG (RUN_SECCOMP_DIR "/seccomp") // configured filter -#define RUN_SECCOMP_32 (RUN_SECCOMP_DIR "/seccomp.32") // 32bit arch filter installed on 64bit architectures -#define RUN_SECCOMP_MDWX (RUN_SECCOMP_DIR "/seccomp.mdwx") // filter for memory-deny-write-execute -#define RUN_SECCOMP_BLOCK_SECONDARY (RUN_SECCOMP_DIR "/seccomp.block_secondary") // secondary arch blocking filter -#define RUN_SECCOMP_POSTEXEC (RUN_SECCOMP_DIR "/seccomp.postexec") // filter for post-exec library -#define PATH_SECCOMP_DEFAULT (LIBDIR "/firejail/seccomp") // default filter built during make -#define PATH_SECCOMP_DEFAULT_DEBUG (LIBDIR "/firejail/seccomp.debug") // default filter built during make -#define PATH_SECCOMP_32 (LIBDIR "/firejail/seccomp.32") // 32bit arch filter built during make -#define PATH_SECCOMP_MDWX (LIBDIR "/firejail/seccomp.mdwx") // filter for memory-deny-write-execute built during make -#define PATH_SECCOMP_BLOCK_SECONDARY (LIBDIR "/firejail/seccomp.block_secondary") // secondary arch blocking filter built during make +#define RUN_SECCOMP_DIR RUN_MNT_DIR "/seccomp" +#define RUN_SECCOMP_LIST RUN_SECCOMP_DIR "/seccomp.list" // list of seccomp files installed +#define RUN_SECCOMP_PROTOCOL RUN_SECCOMP_DIR "/seccomp.protocol" // protocol filter +#define RUN_SECCOMP_CFG RUN_SECCOMP_DIR "/seccomp" // configured filter +#define RUN_SECCOMP_32 RUN_SECCOMP_DIR "/seccomp.32" // 32bit arch filter installed on 64bit architectures +#define RUN_SECCOMP_MDWX RUN_SECCOMP_DIR "/seccomp.mdwx" // filter for memory-deny-write-execute +#define RUN_SECCOMP_BLOCK_SECONDARY RUN_SECCOMP_DIR "/seccomp.block_secondary" // secondary arch blocking filter +#define RUN_SECCOMP_POSTEXEC RUN_SECCOMP_DIR "/seccomp.postexec" // filter for post-exec library +#define PATH_SECCOMP_DEFAULT LIBDIR "/firejail/seccomp" // default filter built during make +#define PATH_SECCOMP_DEFAULT_DEBUG LIBDIR "/firejail/seccomp.debug" // default filter built during make +#define PATH_SECCOMP_32 LIBDIR "/firejail/seccomp.32" // 32bit arch filter built during make +#define PATH_SECCOMP_MDWX LIBDIR "/firejail/seccomp.mdwx" // filter for memory-deny-write-execute built during make +#define PATH_SECCOMP_BLOCK_SECONDARY LIBDIR "/firejail/seccomp.block_secondary" // secondary arch blocking filter built during make -#define RUN_DEV_DIR "/run/firejail/mnt/dev" -#define RUN_DEVLOG_FILE "/run/firejail/mnt/devlog" +#define RUN_DEV_DIR RUN_MNT_DIR "/dev" +#define RUN_DEVLOG_FILE RUN_MNT_DIR "/devlog" -#define RUN_WHITELIST_X11_DIR "/run/firejail/mnt/orig-x11" -#define RUN_WHITELIST_HOME_DIR "/run/firejail/mnt/orig-home" // default home directory masking -#define RUN_WHITELIST_RUN_DIR "/run/firejail/mnt/orig-run" // default run directory masking -#define RUN_WHITELIST_HOME_USER_DIR "/run/firejail/mnt/orig-home-user" // home directory whitelisting -#define RUN_WHITELIST_RUN_USER_DIR "/run/firejail/mnt/orig-run-user" // run directory whitelisting -#define RUN_WHITELIST_TMP_DIR "/run/firejail/mnt/orig-tmp" -#define RUN_WHITELIST_MEDIA_DIR "/run/firejail/mnt/orig-media" -#define RUN_WHITELIST_MNT_DIR "/run/firejail/mnt/orig-mnt" -#define RUN_WHITELIST_VAR_DIR "/run/firejail/mnt/orig-var" -#define RUN_WHITELIST_DEV_DIR "/run/firejail/mnt/orig-dev" -#define RUN_WHITELIST_OPT_DIR "/run/firejail/mnt/orig-opt" -#define RUN_WHITELIST_SRV_DIR "/run/firejail/mnt/orig-srv" -#define RUN_WHITELIST_ETC_DIR "/run/firejail/mnt/orig-etc" -#define RUN_WHITELIST_SHARE_DIR "/run/firejail/mnt/orig-share" -#define RUN_WHITELIST_MODULE_DIR "/run/firejail/mnt/orig-module" +#define RUN_WHITELIST_X11_DIR RUN_MNT_DIR "/orig-x11" +#define RUN_WHITELIST_HOME_DIR RUN_MNT_DIR "/orig-home" // default home directory masking +#define RUN_WHITELIST_RUN_DIR RUN_MNT_DIR "/orig-run" // default run directory masking +#define RUN_WHITELIST_HOME_USER_DIR RUN_MNT_DIR "/orig-home-user" // home directory whitelisting +#define RUN_WHITELIST_RUN_USER_DIR RUN_MNT_DIR "/orig-run-user" // run directory whitelisting +#define RUN_WHITELIST_TMP_DIR RUN_MNT_DIR "/orig-tmp" +#define RUN_WHITELIST_MEDIA_DIR RUN_MNT_DIR "/orig-media" +#define RUN_WHITELIST_MNT_DIR RUN_MNT_DIR "/orig-mnt" +#define RUN_WHITELIST_VAR_DIR RUN_MNT_DIR "/orig-var" +#define RUN_WHITELIST_DEV_DIR RUN_MNT_DIR "/orig-dev" +#define RUN_WHITELIST_OPT_DIR RUN_MNT_DIR "/orig-opt" +#define RUN_WHITELIST_SRV_DIR RUN_MNT_DIR "/orig-srv" +#define RUN_WHITELIST_ETC_DIR RUN_MNT_DIR "/orig-etc" +#define RUN_WHITELIST_SHARE_DIR RUN_MNT_DIR "/orig-share" +#define RUN_WHITELIST_MODULE_DIR RUN_MNT_DIR "/orig-module" -#define RUN_XAUTHORITY_FILE "/run/firejail/mnt/.Xauthority" -#define RUN_XAUTHORITY_SEC_FILE "/run/firejail/mnt/sec.Xauthority" -#define RUN_ASOUNDRC_FILE "/run/firejail/mnt/.asoundrc" -#define RUN_HOSTNAME_FILE "/run/firejail/mnt/hostname" -#define RUN_HOSTS_FILE "/run/firejail/mnt/hosts" -#define RUN_MACHINEID "/run/firejail/mnt/machine-id" -#define RUN_LDPRELOAD_FILE "/run/firejail/mnt/ld.so.preload" -#define RUN_UTMP_FILE "/run/firejail/mnt/utmp" -#define RUN_PASSWD_FILE "/run/firejail/mnt/passwd" -#define RUN_GROUP_FILE "/run/firejail/mnt/group" -#define RUN_FSLOGGER_FILE "/run/firejail/mnt/fslogger" -#define RUN_UMASK_FILE "/run/firejail/mnt/umask" -#define RUN_OVERLAY_ROOT "/run/firejail/mnt/oroot" -#define RUN_READY_FOR_JOIN "/run/firejail/mnt/ready-for-join" +#define RUN_XAUTHORITY_FILE RUN_MNT_DIR "/.Xauthority" +#define RUN_XAUTHORITY_SEC_FILE RUN_MNT_DIR "/sec.Xauthority" +#define RUN_ASOUNDRC_FILE RUN_MNT_DIR "/.asoundrc" +#define RUN_HOSTNAME_FILE RUN_MNT_DIR "/hostname" +#define RUN_HOSTS_FILE RUN_MNT_DIR "/hosts" +#define RUN_MACHINEID RUN_MNT_DIR "/machine-id" +#define RUN_LDPRELOAD_FILE RUN_MNT_DIR "/ld.so.preload" +#define RUN_UTMP_FILE RUN_MNT_DIR "/utmp" +#define RUN_PASSWD_FILE RUN_MNT_DIR "/passwd" +#define RUN_GROUP_FILE RUN_MNT_DIR "/group" +#define RUN_FSLOGGER_FILE RUN_MNT_DIR "/fslogger" +#define RUN_UMASK_FILE RUN_MNT_DIR "/umask" +#define RUN_OVERLAY_ROOT RUN_MNT_DIR "/oroot" +#define RUN_READY_FOR_JOIN RUN_MNT_DIR "/ready-for-join" #endif -- cgit v1.2.3-54-g00ecf