diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2017-07-26 15:40:55 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2017-07-26 15:40:55 -0300 |
commit | 543d65c6ab767a53844c28d9e887440dec90da1c (patch) | |
tree | 8f3dd30712aca174dd621f21e35e07a99164db70 /CRT.c | |
parent | f205f7004c2530a499175ad240e0d83e484a0961 (diff) |
Security review: make privilege dropping-restoring optional.
This is/was necessary only on macOS, because you needed root in order
to read the process list. This was never necessary on Linux, and
it also raises security concerns, so now it needs to be enabled
explicitly at build time.
Diffstat (limited to 'CRT.c')
-rw-r--r-- | CRT.c | 47 |
1 files changed, 47 insertions, 0 deletions
@@ -5,6 +5,7 @@ Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ +#include "config.h" #include "CRT.h" #include "StringUtils.h" @@ -17,6 +18,10 @@ in the source distribution for its full text. #include <string.h> #include <locale.h> #include <langinfo.h> +#if HAVE_SETUID_ENABLED +#include <unistd.h> +#include <sys/types.h> +#endif #define ColorIndex(i,j) ((7-i)*8+j) @@ -545,6 +550,48 @@ static void CRT_handleSIGTERM(int sgn) { exit(0); } +#if HAVE_SETUID_ENABLED + +static int CRT_euid = -1; + +static int CRT_egid = -1; + +#define DIE(msg) do { CRT_done(); fprintf(stderr, msg); exit(1); } while(0) + +void CRT_dropPrivileges() { + CRT_egid = getegid(); + CRT_euid = geteuid(); + if (setegid(getgid()) == -1) { + DIE("Fatal error: failed dropping group privileges.\n"); + } + if (seteuid(getuid()) == -1) { + DIE("Fatal error: failed dropping user privileges.\n"); + } +} + +void CRT_restorePrivileges() { + if (CRT_egid == -1 || CRT_euid == -1) { + DIE("Fatal error: internal inconsistency.\n"); + } + if (setegid(CRT_egid) == -1) { + DIE("Fatal error: failed restoring group privileges.\n"); + } + if (seteuid(CRT_euid) == -1) { + DIE("Fatal error: failed restoring user privileges.\n"); + } +} + +#else + +/* Turn setuid operations into NOPs */ + +#ifndef CRT_dropPrivileges +#define CRT_dropPrivileges() +#define CRT_restorePrivileges() +#endif + +#endif + // TODO: pass an instance of Settings instead. void CRT_init(int delay, int colorScheme) { |