Release 1.2.3

[apt.git] / apt-pkg / acquire-worker.cc

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 1a754dae905cd3f8aa6e49076ed07c7098be3e65..37804c67a098f585dadab54c018491299008a4cb 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -12,58 +12,46 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+
+#include <apt-pkg/acquire.h>

 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>

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

 
 

-#include <apti18n.h>
-
+#include <algorithm>
+#include <string>
+#include <vector>

 #include <iostream>
 #include <iostream>

-#include <sstream>
-#include <fstream>
-    
+

 #include <sys/stat.h>
 #include <sys/stat.h>

+#include <stdlib.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <fcntl.h>

 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>

+#include <sstream>
+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 using namespace std;
 
 // Worker::Worker - Constructor for Queue startup                      /*{{{*/
                                                                        /*}}}*/
 
 using namespace std;
 
 // Worker::Worker - Constructor for Queue startup                      /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,
-                          pkgAcquireStatus *Log) : Log(Log)
+pkgAcquire::Worker::Worker(Queue *Q, MethodConfig *Cnf, pkgAcquireStatus *log) :
+   d(NULL), OwnerQ(Q), Log(log), Config(Cnf), Access(Cnf->Access),
+   CurrentItem(nullptr), CurrentSize(0), TotalSize(0)

 {
 {

-   OwnerQ = Q;
-   Config = Cnf;
-   Access = Cnf->Access;
-   CurrentItem = 0;
-   TotalSize = 0;
-   CurrentSize = 0;
-   
-   Construct();   
+   Construct();

 }
                                                                        /*}}}*/
 // Worker::Worker - Constructor for method config startup              /*{{{*/
 }
                                                                        /*}}}*/
 // Worker::Worker - Constructor for method config startup              /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-pkgAcquire::Worker::Worker(MethodConfig *Cnf)
+pkgAcquire::Worker::Worker(MethodConfig *Cnf) : Worker(nullptr, Cnf, nullptr)

 {
 {

-   OwnerQ = 0;
-   Config = Cnf;
-   Access = Cnf->Access;
-   CurrentItem = 0;
-   TotalSize = 0;
-   CurrentSize = 0;
-   
-   Construct();   

 }
                                                                        /*}}}*/
 // Worker::Construct - Constructor helper                              /*{{{*/
 }
                                                                        /*}}}*/
 // Worker::Construct - Constructor helper                              /*{{{*/


@@ -107,7 +95,12 @@ bool pkgAcquire::Worker::Start()
    // Get the method path
    string Method = _config->FindDir("Dir::Bin::Methods") + Access;
    if (FileExists(Method) == false)
    // Get the method path
    string Method = _config->FindDir("Dir::Bin::Methods") + Access;
    if (FileExists(Method) == false)

-      return _error->Error(_("The method driver %s could not be found."),Method.c_str());
+   {
+      _error->Error(_("The method driver %s could not be found."),Method.c_str());
+      if (Access == "https")
+        _error->Notice(_("Is the package %s installed?"), "apt-transport-https");
+      return false;
+   }

 
    if (Debug == true)
       clog << "Starting method '" << Method << '\'' << endl;
 
    if (Debug == true)
       clog << "Starting method '" << Method << '\'' << endl;


@@ -123,7 +116,7 @@ bool pkgAcquire::Worker::Start()
    }
    for (int I = 0; I != 4; I++)
       SetCloseExec(Pipes[I],true);
    }
    for (int I = 0; I != 4; I++)
       SetCloseExec(Pipes[I],true);

-   
+

    // Fork off the process
    Process = ExecFork();
    if (Process == 0)
    // Fork off the process
    Process = ExecFork();
    if (Process == 0)


@@ -132,9 +125,9 @@ bool pkgAcquire::Worker::Start()
       dup2(Pipes[1],STDOUT_FILENO);
       dup2(Pipes[2],STDIN_FILENO);
       SetCloseExec(STDOUT_FILENO,false);
       dup2(Pipes[1],STDOUT_FILENO);
       dup2(Pipes[2],STDIN_FILENO);
       SetCloseExec(STDOUT_FILENO,false);

-      SetCloseExec(STDIN_FILENO,false);      
+      SetCloseExec(STDIN_FILENO,false);

       SetCloseExec(STDERR_FILENO,false);
       SetCloseExec(STDERR_FILENO,false);

-      
+

       const char *Args[2];
       Args[0] = Method.c_str();
       Args[1] = 0;
       const char *Args[2];
       Args[0] = Method.c_str();
       Args[1] = 0;


@@ -152,7 +145,7 @@ bool pkgAcquire::Worker::Start()
    close(Pipes[2]);
    OutReady = false;
    InReady = true;
    close(Pipes[2]);
    OutReady = false;
    InReady = true;

-   
+

    // Read the configuration data
    if (WaitFd(InFd) == false ||
        ReadMessages() == false)
    // Read the configuration data
    if (WaitFd(InFd) == false ||
        ReadMessages() == false)


@@ -161,7 +154,7 @@ bool pkgAcquire::Worker::Start()
    RunMessages();
    if (OwnerQ != 0)
       SendConfiguration();
    RunMessages();
    if (OwnerQ != 0)
       SendConfiguration();

-   
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -188,7 +181,7 @@ bool pkgAcquire::Worker::RunMessages()
 
       if (Debug == true)
         clog << " <- " << Access << ':' << QuoteString(Message,"\n") << endl;
 
       if (Debug == true)
         clog << " <- " << Access << ':' << QuoteString(Message,"\n") << endl;

-      
+

       // Fetch the message number
       char *End;
       int Number = strtol(Message.c_str(),&End,10);
       // Fetch the message number
       char *End;
       int Number = strtol(Message.c_str(),&End,10);


@@ -196,10 +189,24 @@ bool pkgAcquire::Worker::RunMessages()
         return _error->Error("Invalid message from method %s: %s",Access.c_str(),Message.c_str());
 
       string URI = LookupTag(Message,"URI");
         return _error->Error("Invalid message from method %s: %s",Access.c_str(),Message.c_str());
 
       string URI = LookupTag(Message,"URI");

-      pkgAcquire::Queue::QItem *Itm = 0;
+      pkgAcquire::Queue::QItem *Itm = NULL;

       if (URI.empty() == false)
         Itm = OwnerQ->FindItem(URI,this);
       if (URI.empty() == false)
         Itm = OwnerQ->FindItem(URI,this);

-      
+
+      if (Itm != NULL)
+      {
+        // update used mirror
+        string UsedMirror = LookupTag(Message,"UsedMirror", "");
+        if (UsedMirror.empty() == false)
+        {
+           for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+              (*O)->UsedMirror = UsedMirror;
+
+           if (Itm->Description.find(" ") != string::npos)
+              Itm->Description.replace(0, Itm->Description.find(" "), UsedMirror);
+        }
+      }
+

       // Determine the message number and dispatch
       switch (Number)
       {
       // Determine the message number and dispatch
       switch (Number)
       {


@@ -208,18 +215,69 @@ bool pkgAcquire::Worker::RunMessages()
         if (Capabilities(Message) == false)
            return _error->Error("Unable to process Capabilities message from %s",Access.c_str());
         break;
         if (Capabilities(Message) == false)
            return _error->Error("Unable to process Capabilities message from %s",Access.c_str());
         break;

-        
+

         // 101 Log
         case 101:
         if (Debug == true)
            clog << " <- (log) " << LookupTag(Message,"Message") << endl;
         break;
         // 101 Log
         case 101:
         if (Debug == true)
            clog << " <- (log) " << LookupTag(Message,"Message") << endl;
         break;

-        
+

         // 102 Status
         case 102:
         Status = LookupTag(Message,"Message");
         break;
         // 102 Status
         case 102:
         Status = LookupTag(Message,"Message");
         break;

-           
+
+         // 103 Redirect
+         case 103:
+         {
+            if (Itm == 0)
+            {
+               _error->Error("Method gave invalid 103 Redirect message");
+               break;
+            }
+
+           std::string const NewURI = LookupTag(Message,"New-URI",URI.c_str());
+            Itm->URI = NewURI;
+
+           ItemDone();
+
+           // Change the status so that it can be dequeued
+           for (auto const &O: Itm->Owners)
+              O->Status = pkgAcquire::Item::StatIdle;
+           // Mark the item as done (taking care of all queues)
+           // and then put it in the main queue again
+           std::vector<Item*> const ItmOwners = Itm->Owners;
+           OwnerQ->ItemDone(Itm);
+           Itm = NULL;
+           for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
+           {
+              pkgAcquire::Item *Owner = *O;
+              pkgAcquire::ItemDesc &desc = Owner->GetItemDesc();
+              // if we change site, treat it as a mirror change
+              if (URI::SiteOnly(NewURI) != URI::SiteOnly(desc.URI))
+              {
+                 std::string const OldSite = desc.Description.substr(0, desc.Description.find(" "));
+                 if (likely(APT::String::Startswith(desc.URI, OldSite)))
+                 {
+                    std::string const OldExtra = desc.URI.substr(OldSite.length() + 1);
+                    if (likely(APT::String::Endswith(NewURI, OldExtra)))
+                    {
+                       std::string const NewSite = NewURI.substr(0, NewURI.length() - OldExtra.length());
+                       Owner->UsedMirror = URI::ArchiveOnly(NewSite);
+                       if (desc.Description.find(" ") != string::npos)
+                          desc.Description.replace(0, desc.Description.find(" "), Owner->UsedMirror);
+                    }
+                 }
+              }
+              desc.URI = NewURI;
+              OwnerQ->Owner->Enqueue(desc);
+
+              if (Log != 0)
+                 Log->Done(desc);
+           }
+            break;
+         }
+

         // 200 URI Start
         case 200:
         {
         // 200 URI Start
         case 200:
         {


@@ -228,23 +286,27 @@ bool pkgAcquire::Worker::RunMessages()
               _error->Error("Method gave invalid 200 URI Start message");
               break;
            }
               _error->Error("Method gave invalid 200 URI Start message");
               break;
            }

-           
+

            CurrentItem = Itm;
            CurrentSize = 0;
            CurrentItem = Itm;
            CurrentSize = 0;

-           TotalSize = atoi(LookupTag(Message,"Size","0").c_str());
-           ResumePoint = atoi(LookupTag(Message,"Resume-Point","0").c_str());
-           Itm->Owner->Start(Message,atoi(LookupTag(Message,"Size","0").c_str()));
+           TotalSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
+           ResumePoint = strtoull(LookupTag(Message,"Resume-Point","0").c_str(), NULL, 10);
+           for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+           {
+              (*O)->Start(Message, TotalSize);

 
 

-           // Display update before completion
-           if (Log != 0 && Log->MorePulses == true)
-              Log->Pulse(Itm->Owner->GetOwner());
-           
-           if (Log != 0)
-              Log->Fetch(*Itm);
+              // Display update before completion
+              if (Log != 0)
+              {
+                 if (Log->MorePulses == true)
+                    Log->Pulse((*O)->GetOwner());
+                 Log->Fetch((*O)->GetItemDesc());
+              }
+           }

 
            break;
         }
 
            break;
         }

-        
+

         // 201 URI Done
         case 201:
         {
         // 201 URI Done
         case 201:
         {


@@ -253,101 +315,174 @@ bool pkgAcquire::Worker::RunMessages()
               _error->Error("Method gave invalid 201 URI Done message");
               break;
            }
               _error->Error("Method gave invalid 201 URI Done message");
               break;
            }

-           
-           pkgAcquire::Item *Owner = Itm->Owner;
-           pkgAcquire::ItemDesc Desc = *Itm;
-           
+
+           PrepareFiles("201::URIDone", Itm);
+

            // Display update before completion
            if (Log != 0 && Log->MorePulses == true)
            // Display update before completion
            if (Log != 0 && Log->MorePulses == true)

-              Log->Pulse(Owner->GetOwner());
-           
-           OwnerQ->ItemDone(Itm);
-           if (TotalSize != 0 &&
-               (unsigned)atoi(LookupTag(Message,"Size","0").c_str()) != TotalSize)
-              _error->Warning("Bizarre Error - File size is not what the server reported %s %lu",
-                              LookupTag(Message,"Size","0").c_str(),TotalSize);
-
-           // see if there is a hash to verify
-           string RecivedHash;
-           HashString expectedHash(Owner->HashSum());
-           if(!expectedHash.empty()) 
+              for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+                 Log->Pulse((*O)->GetOwner());
+
+           HashStringList ReceivedHashes;

            {
            {

-              string hashTag = expectedHash.HashType()+"-Hash";
-              string hashSum = LookupTag(Message, hashTag.c_str());
-              if(!hashSum.empty())
-                 RecivedHash = expectedHash.HashType() + ":" + hashSum;
-              if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
+              std::string const givenfilename = LookupTag(Message, "Filename");
+              std::string const filename = givenfilename.empty() ? Itm->Owner->DestFile : givenfilename;
+              // see if we got hashes to verify
+              for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)

               {
               {

-                 clog << "201 URI Done: " << Owner->DescURI() << endl
-                      << "RecivedHash: " << RecivedHash << endl
-                      << "ExpectedHash: " << expectedHash.toStr() 
-                      << endl << endl;
+                 std::string const tagname = std::string(*type) + "-Hash";
+                 std::string const hashsum = LookupTag(Message, tagname.c_str());
+                 if (hashsum.empty() == false)
+                    ReceivedHashes.push_back(HashString(*type, hashsum));

               }
               }

+              // not all methods always sent Hashes our way
+              if (ReceivedHashes.usable() == false)
+              {
+                 HashStringList const ExpectedHashes = Itm->GetExpectedHashes();
+                 if (ExpectedHashes.usable() == true && RealFileExists(filename))
+                 {
+                    Hashes calc(ExpectedHashes);
+                    FileFd file(filename, FileFd::ReadOnly, FileFd::None);
+                    calc.AddFD(file);
+                    ReceivedHashes = calc.GetHashStringList();
+                 }
+              }
+
+              // only local files can refer other filenames and counting them as fetched would be unfair
+              if (Log != NULL && Itm->Owner->Complete == false && Itm->Owner->Local == false && givenfilename == filename)
+                 Log->Fetched(ReceivedHashes.FileSize(),atoi(LookupTag(Message,"Resume-Point","0").c_str()));

            }
            }

-           Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()),
-                       RecivedHash.c_str(), Config);
-           ItemDone();
-           
-           // Log that we are done
-           if (Log != 0)
+
+           std::vector<Item*> const ItmOwners = Itm->Owners;
+           OwnerQ->ItemDone(Itm);
+           Itm = NULL;
+
+           bool const isIMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) ||
+              StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false);
+           for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)

            {
            {

-              if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true ||
-                  StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)
+              pkgAcquire::Item * const Owner = *O;
+              HashStringList const ExpectedHashes = Owner->GetExpectedHashes();
+              if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
+              {
+                 std::clog << "201 URI Done: " << Owner->DescURI() << endl
+                    << "ReceivedHash:" << endl;
+                 for (HashStringList::const_iterator hs = ReceivedHashes.begin(); hs != ReceivedHashes.end(); ++hs)
+                    std::clog <<  "\t- " << hs->toStr() << std::endl;
+                 std::clog << "ExpectedHash:" << endl;
+                 for (HashStringList::const_iterator hs = ExpectedHashes.begin(); hs != ExpectedHashes.end(); ++hs)
+                    std::clog <<  "\t- " << hs->toStr() << std::endl;
+                 std::clog << endl;
+              }
+
+              // decide if what we got is what we expected
+              bool consideredOkay = false;
+              if (ExpectedHashes.usable())
+              {
+                 if (ReceivedHashes.usable() == false)
+                 {
+                    /* IMS-Hits can't be checked here as we will have uncompressed file,
+                       but the hashes for the compressed file. What we have was good through
+                       so all we have to ensure later is that we are not stalled. */
+                    consideredOkay = isIMSHit;
+                 }
+                 else if (ReceivedHashes == ExpectedHashes)
+                    consideredOkay = true;
+                 else
+                    consideredOkay = false;
+
+              }
+              else if (Owner->HashesRequired() == true)
+                 consideredOkay = false;
+              else
+              {
+                 consideredOkay = true;
+                 // even if the hashes aren't usable to declare something secure
+                 // we can at least use them to declare it an integrity failure
+                 if (ExpectedHashes.empty() == false && ReceivedHashes != ExpectedHashes && _config->Find("Acquire::ForceHash").empty())
+                    consideredOkay = false;
+              }
+
+              if (consideredOkay == true)
+                 consideredOkay = Owner->VerifyDone(Message, Config);
+              else // hashsum mismatch
+                 Owner->Status = pkgAcquire::Item::StatAuthError;
+
+              if (consideredOkay == true)

               {
               {

-                 /* Hide 'hits' for local only sources - we also manage to
-                    hide gets */
-                 if (Config->LocalOnly == false)
-                    Log->IMSHit(Desc);
-              }               
+                 Owner->Done(Message, ReceivedHashes, Config);
+                 if (Log != 0)
+                 {
+                    if (isIMSHit)
+                       Log->IMSHit(Owner->GetItemDesc());
+                    else
+                       Log->Done(Owner->GetItemDesc());
+                 }
+              }

               else
               else

-                 Log->Done(Desc);
+              {
+                 Owner->Failed(Message,Config);
+                 if (Log != 0)
+                    Log->Fail(Owner->GetItemDesc());
+              }

            }
            }

+           ItemDone();

            break;
            break;

-        }       
-        
+        }
+

         // 400 URI Failure
         case 400:
         {
            if (Itm == 0)
            {
         // 400 URI Failure
         case 400:
         {
            if (Itm == 0)
            {

-              _error->Error("Method gave invalid 400 URI Failure message");
+              std::string const msg = LookupTag(Message,"Message");
+              _error->Error("Method gave invalid 400 URI Failure message: %s", msg.c_str());

               break;
            }
 
               break;
            }
 

+           PrepareFiles("400::URIFailure", Itm);
+

            // Display update before completion
            if (Log != 0 && Log->MorePulses == true)
            // Display update before completion
            if (Log != 0 && Log->MorePulses == true)

-              Log->Pulse(Itm->Owner->GetOwner());
-           
-           pkgAcquire::Item *Owner = Itm->Owner;
-           pkgAcquire::ItemDesc Desc = *Itm;
+              for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+                 Log->Pulse((*O)->GetOwner());
+
+           std::vector<Item*> const ItmOwners = Itm->Owners;

            OwnerQ->ItemDone(Itm);
            OwnerQ->ItemDone(Itm);

+           Itm = NULL;
+
+           bool errTransient;
+           {
+              std::string const failReason = LookupTag(Message, "FailReason");
+              std::string const reasons[] = { "Timeout", "ConnectionRefused",
+                 "ConnectionTimedOut", "ResolveFailure", "TmpResolveFailure" };
+              errTransient = std::find(std::begin(reasons), std::end(reasons), failReason) != std::end(reasons);
+           }

 
 

-           // set some status
-           if(LookupTag(Message,"FailReason") == "Timeout" || 
-              LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
-              LookupTag(Message,"FailReason") == "ResolveFailure" ||
-              LookupTag(Message,"FailReason") == "ConnectionRefused") 
-              Owner->Status = pkgAcquire::Item::StatTransientNetworkError;
+           for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
+           {
+              if (errTransient)
+                 (*O)->Status = pkgAcquire::Item::StatTransientNetworkError;
+              (*O)->Failed(Message,Config);

 
 

-           Owner->Failed(Message,Config);
+              if (Log != 0)
+                 Log->Fail((*O)->GetItemDesc());
+           }

            ItemDone();
 
            ItemDone();
 

-           if (Log != 0)
-              Log->Fail(Desc);
-

            break;
            break;

-        }       
-        
+        }
+

         // 401 General Failure
         case 401:
         _error->Error("Method %s General failure: %s",Access.c_str(),LookupTag(Message,"Message").c_str());
         break;
         // 401 General Failure
         case 401:
         _error->Error("Method %s General failure: %s",Access.c_str(),LookupTag(Message,"Message").c_str());
         break;

-        
+

         // 403 Media Change
         case 403:
         // 403 Media Change
         case 403:

-        MediaChange(Message); 
+        MediaChange(Message);

         break;
         break;

-      }      
+      }

    }
    return true;
 }
    }
    return true;
 }


@@ -360,7 +495,7 @@ bool pkgAcquire::Worker::Capabilities(string Message)
 {
    if (Config == 0)
       return true;
 {
    if (Config == 0)
       return true;

-   
+

    Config->Version = LookupTag(Message,"Version");
    Config->SingleInstance = StringToBool(LookupTag(Message,"Single-Instance"),false);
    Config->Pipeline = StringToBool(LookupTag(Message,"Pipeline"),false);
    Config->Version = LookupTag(Message,"Version");
    Config->SingleInstance = StringToBool(LookupTag(Message,"Single-Instance"),false);
    Config->Pipeline = StringToBool(LookupTag(Message,"Pipeline"),false);


@@ -375,13 +510,13 @@ bool pkgAcquire::Worker::Capabilities(string Message)
       clog << "Configured access method " << Config->Access << endl;
       clog << "Version:" << Config->Version <<
              " SingleInstance:" << Config->SingleInstance <<
       clog << "Configured access method " << Config->Access << endl;
       clog << "Version:" << Config->Version <<
              " SingleInstance:" << Config->SingleInstance <<

-             " Pipeline:" << Config->Pipeline << 
-             " SendConfig:" << Config->SendConfig << 
-             " LocalOnly: " << Config->LocalOnly << 
-             " NeedsCleanup: " << Config->NeedsCleanup << 
+             " Pipeline:" << Config->Pipeline <<
+             " SendConfig:" << Config->SendConfig <<
+             " LocalOnly: " << Config->LocalOnly <<
+             " NeedsCleanup: " << Config->NeedsCleanup <<

              " Removable: " << Config->Removable << endl;
    }
              " Removable: " << Config->Removable << endl;
    }

-   
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -391,21 +526,23 @@ bool pkgAcquire::Worker::Capabilities(string Message)
 bool pkgAcquire::Worker::MediaChange(string Message)
 {
    int status_fd = _config->FindI("APT::Status-Fd",-1);
 bool pkgAcquire::Worker::MediaChange(string Message)
 {
    int status_fd = _config->FindI("APT::Status-Fd",-1);

-   if(status_fd > 0) 
+   if(status_fd > 0)

    {
       string Media = LookupTag(Message,"Media");
    {
       string Media = LookupTag(Message,"Media");

-      string Drive = LookupTag(Message,"Drive"); 
+      string Drive = LookupTag(Message,"Drive");

       ostringstream msg,status;
       ioprintf(msg,_("Please insert the disc labeled: "
                     "'%s' "
       ostringstream msg,status;
       ioprintf(msg,_("Please insert the disc labeled: "
                     "'%s' "

-                    "in the drive '%s' and press enter."),
+                    "in the drive '%s' and press [Enter]."),

               Media.c_str(),Drive.c_str());
       status << "media-change: "  // message
             << Media  << ":"     // media
             << Drive  << ":"     // drive
             << msg.str()         // l10n message
             << endl;
               Media.c_str(),Drive.c_str());
       status << "media-change: "  // message
             << Media  << ":"     // media
             << Drive  << ":"     // drive
             << msg.str()         // l10n message
             << endl;

-      write(status_fd, status.str().c_str(), status.str().size());
+
+      std::string const dlstatus = status.str();
+      FileFd::Write(status_fd, dlstatus.c_str(), dlstatus.size());

    }
 
    if (Log == 0 || Log->MediaChange(LookupTag(Message,"Media"),
    }
 
    if (Log == 0 || Log->MediaChange(LookupTag(Message,"Media"),


@@ -439,40 +576,19 @@ bool pkgAcquire::Worker::SendConfiguration()
 
    if (OutFd == -1)
       return false;
 
    if (OutFd == -1)
       return false;

-   
-   string Message = "601 Configuration\n";
-   Message.reserve(2000);

 
 

-   /* Write out all of the configuration directives by walking the 
+   /* Write out all of the configuration directives by walking the

       configuration tree */
       configuration tree */

-   const Configuration::Item *Top = _config->Tree(0);
-   for (; Top != 0;)
-   {
-      if (Top->Value.empty() == false)
-      {
-        string Line = "Config-Item: " + QuoteString(Top->FullTag(),"=\"\n") + "=";
-        Line += QuoteString(Top->Value,"\n") + '\n';
-        Message += Line;
-      }
-      
-      if (Top->Child != 0)
-      {
-        Top = Top->Child;
-        continue;
-      }
-      
-      while (Top != 0 && Top->Next == 0)
-        Top = Top->Parent;
-      if (Top != 0)
-        Top = Top->Next;
-   }   
-   Message += '\n';
+   std::ostringstream Message;
+   Message << "601 Configuration\n";
+   _config->Dump(Message, NULL, "Config-Item: %F=%V\n", false);
+   Message << '\n';

 
    if (Debug == true)
 
    if (Debug == true)

-      clog << " -> " << Access << ':' << QuoteString(Message,"\n") << endl;
-   OutQueue += Message;
-   OutReady = true; 
-   
+      clog << " -> " << Access << ':' << QuoteString(Message.str(),"\n") << endl;
+   OutQueue += Message.str();
+   OutReady = true;
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -483,19 +599,43 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
 {
    if (OutFd == -1)
       return false;
 {
    if (OutFd == -1)
       return false;

-   
+

    string Message = "600 URI Acquire\n";
    Message.reserve(300);
    Message += "URI: " + Item->URI;
    Message += "\nFilename: " + Item->Owner->DestFile;
    string Message = "600 URI Acquire\n";
    Message.reserve(300);
    Message += "URI: " + Item->URI;
    Message += "\nFilename: " + Item->Owner->DestFile;

-   Message += Item->Owner->Custom600Headers();
+
+   HashStringList const hsl = Item->GetExpectedHashes();
+   for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
+      Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();
+
+   if (hsl.FileSize() == 0)
+   {
+      unsigned long long FileSize = Item->GetMaximumSize();
+      if(FileSize > 0)
+      {
+        string MaximumSize;
+        strprintf(MaximumSize, "%llu", FileSize);
+        Message += "\nMaximum-Size: " + MaximumSize;
+      }
+   }
+
+   Item->SyncDestinationFiles();
+   Message += Item->Custom600Headers();

    Message += "\n\n";
    Message += "\n\n";

-   
+
+   if (RealFileExists(Item->Owner->DestFile))
+   {
+      std::string const SandboxUser = _config->Find("APT::Sandbox::User");
+      ChangeOwnerAndPermissionOfFile("Item::QueueURI", Item->Owner->DestFile.c_str(),
+                                     SandboxUser.c_str(), "root", 0600);
+   }
+

    if (Debug == true)
       clog << " -> " << Access << ':' << QuoteString(Message,"\n") << endl;
    OutQueue += Message;
    OutReady = true;
    if (Debug == true)
       clog << " -> " << Access << ':' << QuoteString(Message,"\n") << endl;
    OutQueue += Message;
    OutReady = true;

-   
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -510,18 +650,14 @@ bool pkgAcquire::Worker::OutFdReady()
       Res = write(OutFd,OutQueue.c_str(),OutQueue.length());
    }
    while (Res < 0 && errno == EINTR);
       Res = write(OutFd,OutQueue.c_str(),OutQueue.length());
    }
    while (Res < 0 && errno == EINTR);

-   
+

    if (Res <= 0)
       return MethodFailure();
 
    if (Res <= 0)
       return MethodFailure();
 

-   // Hmm.. this should never happen.
-   if (Res < 0)
-      return true;
-   

    OutQueue.erase(0,Res);
    if (OutQueue.empty() == true)
       OutReady = false;
    OutQueue.erase(0,Res);
    if (OutQueue.empty() == true)
       OutReady = false;

-   
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -538,13 +674,14 @@ bool pkgAcquire::Worker::InFdReady()
                                                                        /*}}}*/
 // Worker::MethodFailure - Called when the method fails                        /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // Worker::MethodFailure - Called when the method fails                        /*{{{*/
 // ---------------------------------------------------------------------

-/* This is called when the method is belived to have failed, probably because
+/* This is called when the method is believed to have failed, probably because

    read returned -1. */
 bool pkgAcquire::Worker::MethodFailure()
 {
    _error->Error("Method %s has died unexpectedly!",Access.c_str());
    read returned -1. */
 bool pkgAcquire::Worker::MethodFailure()
 {
    _error->Error("Method %s has died unexpectedly!",Access.c_str());

-   
-   ExecWait(Process,Access.c_str(),true);
+
+   // do not reap the child here to show meaningfull error to the user
+   ExecWait(Process,Access.c_str(),false);

    Process = -1;
    close(InFd);
    close(OutFd);
    Process = -1;
    close(InFd);
    close(OutFd);


@@ -554,26 +691,22 @@ bool pkgAcquire::Worker::MethodFailure()
    InReady = false;
    OutQueue = string();
    MessageQueue.erase(MessageQueue.begin(),MessageQueue.end());
    InReady = false;
    OutQueue = string();
    MessageQueue.erase(MessageQueue.begin(),MessageQueue.end());

-   
+

    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

-// Worker::Pulse - Called periodically                                         /*{{{*/
+// Worker::Pulse - Called periodically                                 /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 void pkgAcquire::Worker::Pulse()
 {
    if (CurrentItem == 0)
       return;
 // ---------------------------------------------------------------------
 /* */
 void pkgAcquire::Worker::Pulse()
 {
    if (CurrentItem == 0)
       return;

- 
+

    struct stat Buf;
    if (stat(CurrentItem->Owner->DestFile.c_str(),&Buf) != 0)
       return;
    CurrentSize = Buf.st_size;
    struct stat Buf;
    if (stat(CurrentItem->Owner->DestFile.c_str(),&Buf) != 0)
       return;
    CurrentSize = Buf.st_size;

-   
-   // Hmm? Should not happen...
-   if (CurrentSize > TotalSize && TotalSize != 0)
-      TotalSize = CurrentSize;

 }
                                                                        /*}}}*/
 // Worker::ItemDone - Called when the current item is finished         /*{{{*/
 }
                                                                        /*}}}*/
 // Worker::ItemDone - Called when the current item is finished         /*{{{*/


@@ -587,3 +720,33 @@ void pkgAcquire::Worker::ItemDone()
    Status = string();
 }
                                                                        /*}}}*/
    Status = string();
 }
                                                                        /*}}}*/

+void pkgAcquire::Worker::PrepareFiles(char const * const caller, pkgAcquire::Queue::QItem const * const Itm)/*{{{*/
+{
+   if (RealFileExists(Itm->Owner->DestFile))
+   {
+      ChangeOwnerAndPermissionOfFile(caller, Itm->Owner->DestFile.c_str(), "root", "root", 0644);
+      std::string const filename = Itm->Owner->DestFile;
+      for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+      {
+        pkgAcquire::Item const * const Owner = *O;
+        if (Owner->DestFile == filename || filename == "/dev/null")
+           continue;
+        RemoveFile("PrepareFiles", Owner->DestFile);
+        if (link(filename.c_str(), Owner->DestFile.c_str()) != 0)
+        {
+           // different mounts can't happen for us as we download to lists/ by default,
+           // but if the system is reused by others the locations can potentially be on
+           // different disks, so use symlink as poor-men replacement.
+           // FIXME: Real copying as last fallback, but that is costly, so offload to a method preferable
+           if (symlink(filename.c_str(), Owner->DestFile.c_str()) != 0)
+              _error->Error("Can't create (sym)link of file %s to %s", filename.c_str(), Owner->DestFile.c_str());
+        }
+      }
+   }
+   else
+   {
+      for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+        RemoveFile("PrepareFiles", (*O)->DestFile);
+   }
+}
+                                                                       /*}}}*/