X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/30979dd7616105302f06af82f419eb62d7b613f8..61db48241f2d46697a291bfedaf398a1ca9a70e3:/apt-pkg/acquire-worker.cc

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 69ca6a28e..1ee78d070 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -97,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 (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;
    }
 
@@ -267,22 +269,35 @@ bool pkgAcquire::Worker::RunMessages()
 	    for (auto const &Owner: ItmOwners)
 	    {
 	       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))
 	       {
-		  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);
+			}
 		     }
 		  }
 	       }
@@ -375,6 +390,7 @@ bool pkgAcquire::Worker::RunMessages()
 
 	    bool const isIMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) ||
 	       StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false);
+	    auto const forcedHash = _config->Find("Acquire::ForceHash");
 	    for (auto const Owner: ItmOwners)
 	    {
 	       HashStringList const ExpectedHashes = Owner->GetExpectedHashes();
@@ -392,9 +408,10 @@ bool pkgAcquire::Worker::RunMessages()
 
 	       // 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
@@ -407,16 +424,8 @@ bool pkgAcquire::Worker::RunMessages()
 		     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;
-	       }
+		  consideredOkay = !Owner->HashesRequired();
 
 	       if (consideredOkay == true)
 		  consideredOkay = Owner->VerifyDone(Message, Config);
@@ -440,7 +449,13 @@ bool pkgAcquire::Worker::RunMessages()
 	       {
 		  if (isDoomedItem(Owner) == false)
 		  {
-		     Message.append("\nFailReason: HashSumMismatch");
+		     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)
@@ -481,7 +496,7 @@ bool pkgAcquire::Worker::RunMessages()
 	       }
 	       if (errTransient == false)
 	       {
-		  auto const reasons = { "HashSumMismatch", "MaximumSizeExceeded" };
+		  auto const reasons = { "HashSumMismatch", "WeakHashSums", "MaximumSizeExceeded" };
 		  errAuthErr = std::find(std::begin(reasons), std::end(reasons), failReason) != std::end(reasons);
 	       }
 	    }
@@ -628,12 +643,36 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
    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;
 
-   HashStringList const hsl = Item->GetExpectedHashes();
    for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
       Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();