Merge remote-tracking branch 'upstream/debian/experimental' into feature/no-more...

[apt.git] / cmdline / apt-helper.cc

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index b0edafcbd08224f70d6fd31feabbcb33b3c0e324..27abb2013bdd122b4c91b0681917960e201560a5 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -16,6 +16,7 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>

+#include <apt-pkg/proxy.h>

 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-output.h>
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-output.h>


@@ -29,15 +30,27 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

+static bool DoAutoDetectProxy(CommandLine &CmdL)
+{
+   if (CmdL.FileSize() != 2)
+      return _error->Error(_("Need one URL as argument"));
+   URI ServerURL(CmdL.FileList[1]);
+   AutoDetectProxy(ServerURL);
+   std::string SpecificProxy = _config->Find("Acquire::"+ServerURL.Access+"::Proxy::" + ServerURL.Host);
+   ioprintf(std::cout, "Using proxy '%s' for URL '%s'\n",
+            SpecificProxy.c_str(), std::string(ServerURL).c_str());
+
+   return true;
+}
+

 static bool DoDownloadFile(CommandLine &CmdL)
 {
    if (CmdL.FileSize() <= 2)
       return _error->Error(_("Must specify at least one pair url/filename"));
 
 static bool DoDownloadFile(CommandLine &CmdL)
 {
    if (CmdL.FileSize() <= 2)
       return _error->Error(_("Must specify at least one pair url/filename"));
 

-
-   pkgAcquire Fetcher;

    AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
    AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));

-   Fetcher.Setup(&Stat);
+   pkgAcquire Fetcher(&Stat);
+

    std::string download_uri = CmdL.FileList[1];
    std::string targetfile = CmdL.FileList[2];
    std::string hash;
    std::string download_uri = CmdL.FileList[1];
    std::string targetfile = CmdL.FileList[2];
    std::string hash;


@@ -46,7 +59,10 @@ static bool DoDownloadFile(CommandLine &CmdL)
    // we use download_uri as descr and targetfile as short-descr
    new pkgAcqFile(&Fetcher, download_uri, hash, 0, download_uri, targetfile, 
                   "dest-dir-ignored", targetfile);
    // we use download_uri as descr and targetfile as short-descr
    new pkgAcqFile(&Fetcher, download_uri, hash, 0, download_uri, targetfile, 
                   "dest-dir-ignored", targetfile);

-   Fetcher.Run();
+
+   // Disable drop-privs if "_apt" can not write to the target dir
+   CheckDropPrivsMustBeDisabled(Fetcher);
+

    bool Failed = false;
    if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true ||
         FileExists(targetfile) == false)
    bool Failed = false;
    if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true ||
         FileExists(targetfile) == false)


@@ -70,6 +86,7 @@ static bool ShowHelp(CommandLine &)
       "\n"
       "Commands:\n"
       "   download-file - download the given uri to the target-path\n"
       "\n"
       "Commands:\n"
       "   download-file - download the given uri to the target-path\n"

+      "   auto-detect-proxy - detect proxy using apt.conf\n"

       "\n"
       "                       This APT helper has Super Meep Powers.\n");
    return true;
       "\n"
       "                       This APT helper has Super Meep Powers.\n");
    return true;


@@ -80,6 +97,7 @@ int main(int argc,const char *argv[])                                 /*{{{*/
 {
    CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
                                   {"download-file", &DoDownloadFile},
 {
    CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
                                   {"download-file", &DoDownloadFile},

+                                  {"auto-detect-proxy", &DoAutoDetectProxy},

                                    {0,0}};
 
    std::vector<CommandLine::Args> Args = getCommandArgs(
                                    {0,0}};
 
    std::vector<CommandLine::Args> Args = getCommandArgs(