summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib/fileutl.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-09-24 16:22:05 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-09-24 16:22:05 +0200
commit3927c6da48c206b6b251661f44680d9883b4f6b4 (patch)
tree695aea2c55eb2358a07b9403c28a57a3ca0e585d /apt-pkg/contrib/fileutl.cc
parenta1380a5c52062b25c9ed260b721239ed57929503 (diff)
Drop Privileges to "Debian-apt" in most acquire methods
Add a new "Debian-apt" user that owns the /var/lib/apt/lists and /var/cache/apt/archive directories. The methods http, https, ftp, gpgv, gzip switch to this user when they start. Thanks to Julian and "ioerror" and tors "switch_id()" code.
Diffstat (limited to 'apt-pkg/contrib/fileutl.cc')
-rw-r--r--apt-pkg/contrib/fileutl.cc34
1 files changed, 33 insertions, 1 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 6b8f04dea..de67a94b9 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -48,6 +48,7 @@
#include <errno.h>
#include <glob.h>
#include <pwd.h>
+#include <grp.h>
#include <set>
#include <algorithm>
@@ -64,6 +65,10 @@
#include <endian.h>
#include <stdint.h>
+#if __gnu_linux__
+#include <sys/prctl.h>
+#endif
+
#include <apti18n.h>
/*}}}*/
@@ -2173,14 +2178,41 @@ bool DropPrivs()
if (getuid() != 0)
return true;
- const std::string nobody = _config->Find("APT::User::Nobody", "nobody");
+ if(_config->FindB("Debug::NoDropPrivs", false) == true)
+ return true;
+
+ const std::string nobody = _config->Find("APT::User::Nobody", "Debian-apt");
struct passwd *pw = getpwnam(nobody.c_str());
if (pw == NULL)
return _error->Warning("No user %s, can not drop rights", nobody.c_str());
+
+#if __gnu_linux__
+ // see prctl(2), needs linux3.5
+ int ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0,0, 0);
+ if(ret < 0)
+ _error->Warning("PR_SET_NO_NEW_PRIVS failed with %i", ret);
+#endif
+
+ if (setgroups(1, &pw->pw_gid) != 1)
+ return _error->Errno("setgroups", "Failed to setgroups");
+
+ if (setegid(pw->pw_gid) != 0)
+ return _error->Errno("setgid", "Failed to setgid");
if (setgid(pw->pw_gid) != 0)
return _error->Errno("setgid", "Failed to setgid");
+
if (setuid(pw->pw_uid) != 0)
return _error->Errno("setuid", "Failed to setuid");
+ // the seteuid() is probably uneeded (at least thats what the linux
+ // man-page says about setuid(2)) but we cargo culted it anyway
+ if (setuid(pw->pw_uid) != 0)
+ return _error->Errno("setuid", "Failed to setuid");
+
+ // be defensive
+ if(setgid(0) != -1 || setegid(0) != -1)
+ return _error->Error("Could restore gid to root, privilege dropping does not work");
+ if(setuid(0) != -1 || seteuid(0) != -1)
+ return _error->Error("Could restore uid to root, privilege dropping does not work");
return true;
}