implement socks5h proxy support for http method

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

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index c2ee8cda39fdba8962fae476ad602cdc84e14464..1ee78d07031a7dbe226c550e6a251d3e45a78b8f 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -42,29 +42,16 @@
 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) : d(NULL), 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();
 }
                                                                        /*}}}*/
 // Worker::Worker - Constructor for method config startup              /*{{{*/
    Construct();
 }
                                                                        /*}}}*/
 // Worker::Worker - Constructor for method config startup              /*{{{*/

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

 {
 {

-   Construct();

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


@@ -110,8 +97,10 @@ bool pkgAcquire::Worker::Start()
    if (FileExists(Method) == false)
    {
       _error->Error(_("The method driver %s could not be found."),Method.c_str());
    if (FileExists(Method) == false)
    {
       _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");
+      std::string const A(Access.cbegin(), std::find(Access.cbegin(), Access.cend(), '+'));
+      std::string pkg;
+      strprintf(pkg, "apt-transport-%s", A.c_str());
+      _error->Notice(_("Is the package %s installed?"), pkg.c_str());

       return false;
    }
 
       return false;
    }
 


@@ -185,6 +174,25 @@ bool pkgAcquire::Worker::ReadMessages()
 // ---------------------------------------------------------------------
 /* This takes the messages from the message queue and runs them through
    the parsers in order. */
 // ---------------------------------------------------------------------
 /* This takes the messages from the message queue and runs them through
    the parsers in order. */

+enum class APT_HIDDEN MessageType {
+   CAPABILITIES = 100,
+   LOG = 101,
+   STATUS = 102,
+   REDIRECT = 103,
+   WARNING = 104,
+   URI_START = 200,
+   URI_DONE = 201,
+   URI_FAILURE = 400,
+   GENERAL_FAILURE = 401,
+   MEDIA_CHANGE = 403
+};
+static bool isDoomedItem(pkgAcquire::Item const * const Itm)
+{
+   auto const TransItm = dynamic_cast<pkgAcqTransactionItem const * const>(Itm);
+   if (TransItm == nullptr)
+      return false;
+   return TransItm->TransactionManager->State != pkgAcqTransactionItem::TransactionStarted;
+}

 bool pkgAcquire::Worker::RunMessages()
 {
    while (MessageQueue.empty() == false)
 bool pkgAcquire::Worker::RunMessages()
 {
    while (MessageQueue.empty() == false)


@@ -197,7 +205,7 @@ bool pkgAcquire::Worker::RunMessages()
 
       // Fetch the message number
       char *End;
 
       // Fetch the message number
       char *End;

-      int Number = strtol(Message.c_str(),&End,10);
+      MessageType const Number = static_cast<MessageType>(strtoul(Message.c_str(),&End,10));

       if (End == Message.c_str())
         return _error->Error("Invalid message from method %s: %s",Access.c_str(),Message.c_str());
 
       if (End == Message.c_str())
         return _error->Error("Invalid message from method %s: %s",Access.c_str(),Message.c_str());
 


@@ -223,27 +231,23 @@ bool pkgAcquire::Worker::RunMessages()
       // Determine the message number and dispatch
       switch (Number)
       {
       // Determine the message number and dispatch
       switch (Number)
       {

-        // 100 Capabilities
-        case 100:
+        case MessageType::CAPABILITIES:

         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:
+        case MessageType::LOG:

         if (Debug == true)
            clog << " <- (log) " << LookupTag(Message,"Message") << endl;
         break;
 
         if (Debug == true)
            clog << " <- (log) " << LookupTag(Message,"Message") << endl;
         break;
 

-        // 102 Status
-        case 102:
+        case MessageType::STATUS:

         Status = LookupTag(Message,"Message");
         break;
 
         Status = LookupTag(Message,"Message");
         break;
 

-         // 103 Redirect
-         case 103:
+        case MessageType::REDIRECT:

          {
          {

-            if (Itm == 0)
+            if (Itm == nullptr)

             {
                _error->Error("Method gave invalid 103 Redirect message");
                break;
             {
                _error->Error("Method gave invalid 103 Redirect message");
                break;


@@ -261,40 +265,56 @@ bool pkgAcquire::Worker::RunMessages()
            // and then put it in the main queue again
            std::vector<Item*> const ItmOwners = Itm->Owners;
            OwnerQ->ItemDone(Itm);
            // 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)
+           Itm = nullptr;
+           for (auto const &Owner: ItmOwners)

            {
            {

-              pkgAcquire::Item *Owner = *O;

               pkgAcquire::ItemDesc &desc = Owner->GetItemDesc();
               pkgAcquire::ItemDesc &desc = Owner->GetItemDesc();

+              if (Owner->IsRedirectionLoop(NewURI))
+              {
+                 std::string msg = Message;
+                 msg.append("\nFailReason: RedirectionLoop");
+                 Owner->Failed(msg, Config);
+                 if (Log != nullptr)
+                    Log->Fail(Owner->GetItemDesc());
+                 continue;
+              }
+
+              if (Log != nullptr)
+                 Log->Done(desc);
+

               // if we change site, treat it as a mirror change
               if (URI::SiteOnly(NewURI) != URI::SiteOnly(desc.URI))
               {
               // 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)))
+                 auto const firstSpace = desc.Description.find(" ");
+                 if (firstSpace != std::string::npos)

                  {
                  {

-                    std::string const OldExtra = desc.URI.substr(OldSite.length() + 1);
-                    if (likely(APT::String::Endswith(NewURI, OldExtra)))
+                    std::string const OldSite = desc.Description.substr(0, firstSpace);
+                    if (likely(APT::String::Startswith(desc.URI, OldSite)))

                     {
                     {

-                       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);
+                       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);
+                          desc.Description.replace(0, firstSpace, Owner->UsedMirror);
+                       }

                     }
                  }
               }
               desc.URI = NewURI;
                     }
                  }
               }
               desc.URI = NewURI;

-              OwnerQ->Owner->Enqueue(desc);
-
-              if (Log != 0)
-                 Log->Done(desc);
+              if (isDoomedItem(Owner) == false)
+                 OwnerQ->Owner->Enqueue(desc);

            }
             break;
          }
 
            }
             break;
          }
 

-        // 200 URI Start
-        case 200:
+        case MessageType::WARNING:
+           _error->Warning("%s: %s", Itm->Owner->DescURI().c_str(), LookupTag(Message,"Message").c_str());
+           break;
+
+        case MessageType::URI_START:

         {
         {

-           if (Itm == 0)
+           if (Itm == nullptr)

            {
               _error->Error("Method gave invalid 200 URI Start message");
               break;
            {
               _error->Error("Method gave invalid 200 URI Start message");
               break;


@@ -304,26 +324,24 @@ bool pkgAcquire::Worker::RunMessages()
            CurrentSize = 0;
            TotalSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
            ResumePoint = strtoull(LookupTag(Message,"Resume-Point","0").c_str(), NULL, 10);
            CurrentSize = 0;
            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)
+           for (auto const Owner: Itm->Owners)

            {
            {

-              (*O)->Start(Message, TotalSize);
-
+              Owner->Start(Message, TotalSize);

               // Display update before completion
               // Display update before completion

-              if (Log != 0)
+              if (Log != nullptr)

               {
                  if (Log->MorePulses == true)
               {
                  if (Log->MorePulses == true)

-                    Log->Pulse((*O)->GetOwner());
-                 Log->Fetch((*O)->GetItemDesc());
+                    Log->Pulse(Owner->GetOwner());
+                 Log->Fetch(Owner->GetItemDesc());

               }
            }
 
            break;
         }
 
               }
            }
 
            break;
         }
 

-        // 201 URI Done
-        case 201:
+        case MessageType::URI_DONE:

         {
         {

-           if (Itm == 0)
+           if (Itm == nullptr)

            {
               _error->Error("Method gave invalid 201 URI Done message");
               break;
            {
               _error->Error("Method gave invalid 201 URI Done message");
               break;


@@ -372,9 +390,9 @@ bool pkgAcquire::Worker::RunMessages()
 
            bool const isIMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) ||
               StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false);
 
            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)
+           auto const forcedHash = _config->Find("Acquire::ForceHash");
+           for (auto const Owner: ItmOwners)

            {
            {

-              pkgAcquire::Item * const Owner = *O;

               HashStringList const ExpectedHashes = Owner->GetExpectedHashes();
               if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
               {
               HashStringList const ExpectedHashes = Owner->GetExpectedHashes();
               if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
               {


@@ -390,9 +408,10 @@ bool pkgAcquire::Worker::RunMessages()
 
               // decide if what we got is what we expected
               bool consideredOkay = false;
 
               // decide if what we got is what we expected
               bool consideredOkay = false;

-              if (ExpectedHashes.usable())
+              if ((forcedHash.empty() && ExpectedHashes.empty() == false) ||
+                    (forcedHash.empty() == false && ExpectedHashes.usable()))

               {
               {

-                 if (ReceivedHashes.usable() == false)
+                 if (ReceivedHashes.empty())

                  {
                     /* 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
                  {
                     /* 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


@@ -405,26 +424,20 @@ bool pkgAcquire::Worker::RunMessages()
                     consideredOkay = false;
 
               }
                     consideredOkay = false;
 
               }

-              else if (Owner->HashesRequired() == true)
-                 consideredOkay = false;

               else
               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;
-              }
+                 consideredOkay = !Owner->HashesRequired();

 
               if (consideredOkay == true)
                  consideredOkay = Owner->VerifyDone(Message, Config);
               else // hashsum mismatch
                  Owner->Status = pkgAcquire::Item::StatAuthError;
 
 
               if (consideredOkay == true)
                  consideredOkay = Owner->VerifyDone(Message, Config);
               else // hashsum mismatch
                  Owner->Status = pkgAcquire::Item::StatAuthError;
 

+

               if (consideredOkay == true)
               {
               if (consideredOkay == true)
               {

-                 Owner->Done(Message, ReceivedHashes, Config);
-                 if (Log != 0)
+                 if (isDoomedItem(Owner) == false)
+                    Owner->Done(Message, ReceivedHashes, Config);
+                 if (Log != nullptr)

                  {
                     if (isIMSHit)
                        Log->IMSHit(Owner->GetItemDesc());
                  {
                     if (isIMSHit)
                        Log->IMSHit(Owner->GetItemDesc());


@@ -434,8 +447,18 @@ bool pkgAcquire::Worker::RunMessages()
               }
               else
               {
               }
               else
               {

-                 Owner->Failed(Message,Config);
-                 if (Log != 0)
+                 if (isDoomedItem(Owner) == false)
+                 {
+                    if (Message.find("\nFailReason:") == std::string::npos)
+                    {
+                       if (ReceivedHashes != ExpectedHashes)
+                          Message.append("\nFailReason: HashSumMismatch");
+                       else
+                          Message.append("\nFailReason: WeakHashSums");
+                    }
+                    Owner->Failed(Message,Config);
+                 }
+                 if (Log != nullptr)

                     Log->Fail(Owner->GetItemDesc());
               }
            }
                     Log->Fail(Owner->GetItemDesc());
               }
            }


@@ -443,10 +466,9 @@ bool pkgAcquire::Worker::RunMessages()
            break;
         }
 
            break;
         }
 

-        // 400 URI Failure
-        case 400:
+        case MessageType::URI_FAILURE:

         {
         {

-           if (Itm == 0)
+           if (Itm == nullptr)

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


@@ -456,43 +478,51 @@ bool pkgAcquire::Worker::RunMessages()
            PrepareFiles("400::URIFailure", Itm);
 
            // Display update before completion
            PrepareFiles("400::URIFailure", Itm);
 
            // Display update before completion

-           if (Log != 0 && Log->MorePulses == true)
+           if (Log != nullptr && Log->MorePulses == true)

               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);
               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);

-           Itm = NULL;
+           Itm = nullptr;

 
 

-           bool errTransient;
+           bool errTransient = false, errAuthErr = false;

            {
               std::string const failReason = LookupTag(Message, "FailReason");
            {
               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);
+              {
+                 auto const reasons = { "Timeout", "ConnectionRefused",
+                    "ConnectionTimedOut", "ResolveFailure", "TmpResolveFailure" };
+                 errTransient = std::find(std::begin(reasons), std::end(reasons), failReason) != std::end(reasons);
+              }
+              if (errTransient == false)
+              {
+                 auto const reasons = { "HashSumMismatch", "WeakHashSums", "MaximumSizeExceeded" };
+                 errAuthErr = std::find(std::begin(reasons), std::end(reasons), failReason) != std::end(reasons);
+              }

            }
 
            }
 

-           for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
+           for (auto const Owner: ItmOwners)

            {
            {

-              if (errTransient)
-                 (*O)->Status = pkgAcquire::Item::StatTransientNetworkError;
-              (*O)->Failed(Message,Config);
+              if (errAuthErr && Owner->GetExpectedHashes().empty() == false)
+                 Owner->Status = pkgAcquire::Item::StatAuthError;
+              else if (errTransient)
+                 Owner->Status = pkgAcquire::Item::StatTransientNetworkError;

 
 

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

            }
            ItemDone();
 
            break;
         }
 
            }
            ItemDone();
 
            break;
         }
 

-        // 401 General Failure
-        case 401:
+        case MessageType::GENERAL_FAILURE:

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

-        // 403 Media Change
-        case 403:
+        case MessageType::MEDIA_CHANGE:

         MediaChange(Message);
         break;
       }
         MediaChange(Message);
         break;
       }


@@ -613,12 +643,36 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
    if (OutFd == -1)
       return false;
 
    if (OutFd == -1)
       return false;
 

+   HashStringList const hsl = Item->GetExpectedHashes();
+
+   if (isDoomedItem(Item->Owner))
+      return true;
+
+   if (hsl.usable() == false && Item->Owner->HashesRequired() &&
+        _config->Exists("Acquire::ForceHash") == false)
+   {
+      std::string const Message = "400 URI Failure"
+        "\nURI: " + Item->URI +
+        "\nFilename: " + Item->Owner->DestFile +
+        "\nFailReason: WeakHashSums";
+
+      auto const ItmOwners = Item->Owners;
+      for (auto &O: ItmOwners)
+      {
+        O->Status = pkgAcquire::Item::StatAuthError;
+        O->Failed(Message, Config);
+        if (Log != nullptr)
+           Log->Fail(O->GetItemDesc());
+      }
+      // "queued" successfully, the item just instantly failed
+      return true;
+   }
+

    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;
 

-   HashStringList const hsl = Item->GetExpectedHashes();

    for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
       Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();
 
    for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
       Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();