From 3927c6da48c206b6b251661f44680d9883b4f6b4 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Wed, 24 Sep 2014 16:22:05 +0200
Subject: 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.
---
 methods/copy.cc      | 2 ++
 methods/ftp.cc       | 3 +++
 methods/gpgv.cc      | 3 +++
 methods/gzip.cc      | 2 ++
 methods/http_main.cc | 4 +++-
 methods/https.cc     | 2 ++
 6 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'methods')

diff --git a/methods/copy.cc b/methods/copy.cc
index b78053d36..18d70e153 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -118,6 +118,8 @@ int main()
 {
    setlocale(LC_ALL, "");
 
+   DropPrivs();
+
    CopyMethod Mth;
    return Mth.Run();
 }
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 66787a7be..9d58aa3b9 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1107,6 +1107,9 @@ int main(int, const char *argv[])
 { 
    setlocale(LC_ALL, "");
 
+   // no more active ftp, sorry
+   DropPrivs();
+
    /* See if we should be come the http client - we do this for http
       proxy urls */
    if (getenv("ftp_proxy") != 0)
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index ae521a2ed..159417883 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -5,6 +5,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/gpgv.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
 
 #include <ctype.h>
 #include <errno.h>
@@ -262,6 +263,8 @@ int main()
 {
    setlocale(LC_ALL, "");
    
+   DropPrivs();
+
    GPGVMethod Mth;
 
    return Mth.Run();
diff --git a/methods/gzip.cc b/methods/gzip.cc
index df3f8828f..518e58f82 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -135,6 +135,8 @@ int main(int, char *argv[])
 {
    setlocale(LC_ALL, "");
 
+   DropPrivs();
+
    Prog = strrchr(argv[0],'/');
    ++Prog;
 
diff --git a/methods/http_main.cc b/methods/http_main.cc
index 3b346a514..788582632 100644
--- a/methods/http_main.cc
+++ b/methods/http_main.cc
@@ -1,5 +1,5 @@
 #include <config.h>
-
+#include <apt-pkg/fileutl.h>
 #include <signal.h>
 
 #include "http.h"
@@ -12,6 +12,8 @@ int main()
    // closes the connection (this is dealt with via ServerDie())
    signal(SIGPIPE, SIG_IGN);
 
+   DropPrivs();
+
    HttpMethod Mth;
    return Mth.Loop();
 }
diff --git a/methods/https.cc b/methods/https.cc
index 0499af0c5..a40f37710 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -443,6 +443,8 @@ int main()
 {
    setlocale(LC_ALL, "");
 
+   DropPrivs();
+
    HttpsMethod Mth;
    curl_global_init(CURL_GLOBAL_SSL) ;
 
-- 
cgit v1.2.3


From 7b18d5592fd5e0bb173e193d1e6693a66065f971 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 24 Sep 2014 21:49:19 +0200
Subject: methods: Fail if we cannot drop privileges

---
 methods/copy.cc      | 4 ++--
 methods/ftp.cc       | 6 +++---
 methods/gpgv.cc      | 4 ++--
 methods/gzip.cc      | 5 +++--
 methods/http_main.cc | 4 ++--
 methods/https.cc     | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'methods')

diff --git a/methods/copy.cc b/methods/copy.cc
index 18d70e153..3883c822b 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -118,8 +118,8 @@ int main()
 {
    setlocale(LC_ALL, "");
 
-   DropPrivs();
-
    CopyMethod Mth;
+
+   Mth.DropPrivsOrDie();
    return Mth.Run();
 }
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 9d58aa3b9..a658b5657 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1107,9 +1107,6 @@ int main(int, const char *argv[])
 { 
    setlocale(LC_ALL, "");
 
-   // no more active ftp, sorry
-   DropPrivs();
-
    /* See if we should be come the http client - we do this for http
       proxy urls */
    if (getenv("ftp_proxy") != 0)
@@ -1134,6 +1131,9 @@ int main(int, const char *argv[])
    }
    
    FtpMethod Mth;
+
+   // no more active ftp, sorry
+   Mth.DropPrivsOrDie();
    
    return Mth.Run();
 }
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 159417883..4071cbac6 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -262,10 +262,10 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
 int main()
 {
    setlocale(LC_ALL, "");
-   
-   DropPrivs();
 
    GPGVMethod Mth;
 
+   Mth.DropPrivsOrDie();
+
    return Mth.Run();
 }
diff --git a/methods/gzip.cc b/methods/gzip.cc
index 518e58f82..7ffcda60f 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -135,11 +135,12 @@ int main(int, char *argv[])
 {
    setlocale(LC_ALL, "");
 
-   DropPrivs();
-
    Prog = strrchr(argv[0],'/');
    ++Prog;
 
    GzipMethod Mth;
+
+   Mth.DropPrivsOrDie();
+
    return Mth.Run();
 }
diff --git a/methods/http_main.cc b/methods/http_main.cc
index 788582632..d7724701a 100644
--- a/methods/http_main.cc
+++ b/methods/http_main.cc
@@ -12,8 +12,8 @@ int main()
    // closes the connection (this is dealt with via ServerDie())
    signal(SIGPIPE, SIG_IGN);
 
-   DropPrivs();
-
    HttpMethod Mth;
+
+   Mth.DropPrivsOrDie();
    return Mth.Loop();
 }
diff --git a/methods/https.cc b/methods/https.cc
index a40f37710..a74d2a38b 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -443,11 +443,11 @@ int main()
 {
    setlocale(LC_ALL, "");
 
-   DropPrivs();
-
    HttpsMethod Mth;
    curl_global_init(CURL_GLOBAL_SSL) ;
 
+   Mth.DropPrivsOrDie();
+
    return Mth.Run();
 }
 
-- 
cgit v1.2.3


From 47d278dc7184606f751d015689e0c49eccde4547 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Wed, 24 Sep 2014 20:14:55 +0200
Subject: releasing package apt version 1.1~exp3

---
 methods/http_main.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'methods')

diff --git a/methods/http_main.cc b/methods/http_main.cc
index d7724701a..f21a5709c 100644
--- a/methods/http_main.cc
+++ b/methods/http_main.cc
@@ -1,5 +1,6 @@
 #include <config.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/error.h>
 #include <signal.h>
 
 #include "http.h"
-- 
cgit v1.2.3