check hashes of compressed files as well

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

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 3360a8eaea8d773f85d0dfba03df5f553eed587b..e4a937d1dd6de8b363998a43b24abaf48e3a2a0a 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -15,18 +15,26 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>

+#include <apt-pkg/md5.h>
+#include <apt-pkg/sha1.h>
+#include <apt-pkg/sha2.h>

 
 

-#include <iostream>

 #include <stdarg.h>
 #include <stdarg.h>

-#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

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

-#include <sys/signal.h>
+#include <string>
+#include <vector>
+#include <iostream>
+#include <stdio.h>

                                                                        /*}}}*/
 
 using namespace std;
                                                                        /*}}}*/
 
 using namespace std;


@@ -36,32 +44,28 @@ using namespace std;
 /* This constructs the initialization text */
 pkgAcqMethod::pkgAcqMethod(const char *Ver,unsigned long Flags)
 {
 /* This constructs the initialization text */
 pkgAcqMethod::pkgAcqMethod(const char *Ver,unsigned long Flags)
 {

-   char S[300] = "";
-   char *End = S;
-   strcat(End,"100 Capabilities\n");
-   sprintf(End+strlen(End),"Version: %s\n",Ver);
+   std::cout << "100 Capabilities\n"
+            << "Version: " << Ver << "\n";

 
    if ((Flags & SingleInstance) == SingleInstance)
 
    if ((Flags & SingleInstance) == SingleInstance)

-      strcat(End,"Single-Instance: true\n");
-   
+      std::cout << "Single-Instance: true\n";
+

    if ((Flags & Pipeline) == Pipeline)
    if ((Flags & Pipeline) == Pipeline)

-      strcat(End,"Pipeline: true\n");
-   
+      std::cout << "Pipeline: true\n";
+

    if ((Flags & SendConfig) == SendConfig)
    if ((Flags & SendConfig) == SendConfig)

-      strcat(End,"Send-Config: true\n");
+      std::cout << "Send-Config: true\n";

 
    if ((Flags & LocalOnly) == LocalOnly)
 
    if ((Flags & LocalOnly) == LocalOnly)

-      strcat(End,"Local-Only: true\n");
+      std::cout <<"Local-Only: true\n";

 
    if ((Flags & NeedsCleanup) == NeedsCleanup)
 
    if ((Flags & NeedsCleanup) == NeedsCleanup)

-      strcat(End,"Needs-Cleanup: true\n");
+      std::cout << "Needs-Cleanup: true\n";

 
    if ((Flags & Removable) == Removable)
 
    if ((Flags & Removable) == Removable)

-      strcat(End,"Removable: true\n");
-   strcat(End,"\n");
+      std::cout << "Removable: true\n";

 
 

-   if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
-      exit(100);
+   std::cout << "\n" << std::flush;

 
    SetNonBlock(STDIN_FILENO,true);
 
 
    SetNonBlock(STDIN_FILENO,true);
 


@@ -87,41 +91,32 @@ void pkgAcqMethod::Fail(bool Transient)
 void pkgAcqMethod::Fail(string Err,bool Transient)
 {
    // Strip out junk from the error messages
 void pkgAcqMethod::Fail(string Err,bool Transient)
 {
    // Strip out junk from the error messages

-   for (string::iterator I = Err.begin(); I != Err.end(); I++)
+   for (string::iterator I = Err.begin(); I != Err.end(); ++I)

    {
       if (*I == '\r') 
         *I = ' ';
       if (*I == '\n') 
         *I = ' ';
    }
    {
       if (*I == '\r') 
         *I = ' ';
       if (*I == '\n') 
         *I = ' ';
    }

-   
-   char S[1024];
+

    if (Queue != 0)
    {
    if (Queue != 0)
    {

-      snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: %s\n"
-              "Message: %s %s\n",Queue->Uri.c_str(),Err.c_str(),
-              FailExtra.c_str());
-
-      // Dequeue
-      FetchItem *Tmp = Queue;
-      Queue = Queue->Next;
-      delete Tmp;
-      if (Tmp == QueueBack)
-        QueueBack = Queue;
+      std::cout << "400 URI Failure\nURI: " << Queue->Uri << "\n"
+               << "Message: " << Err << " " << IP << "\n";
+      Dequeue();

    }
    else
    }
    else

-      snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: <UNKNOWN>\n"
-              "Message: %s %s\n",Err.c_str(),
-              FailExtra.c_str());
-      
-   // Set the transient flag 
+      std::cout << "400 URI Failure\nURI: <UNKNOWN>\nMessage: " << Err << "\n";
+
+   if(FailReason.empty() == false)
+      std::cout << "FailReason: " << FailReason << "\n";
+   if (UsedMirror.empty() == false)
+      std::cout << "UsedMirror: " << UsedMirror << "\n";
+   // Set the transient flag

    if (Transient == true)
    if (Transient == true)

-      strcat(S,"Transient-Failure: true\n\n");
-   else
-      strcat(S,"\n");
-   
-   if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
-      exit(100);
+      std::cout << "Transient-Failure: true\n";
+
+   std::cout << "\n" << std::flush;

 }
                                                                        /*}}}*/
 // AcqMethod::URIStart - Indicate a download is starting               /*{{{*/
 }
                                                                        /*}}}*/
 // AcqMethod::URIStart - Indicate a download is starting               /*{{{*/


@@ -131,101 +126,91 @@ void pkgAcqMethod::URIStart(FetchResult &Res)
 {
    if (Queue == 0)
       abort();
 {
    if (Queue == 0)
       abort();

-   
-   char S[1024] = "";
-   char *End = S;
-   
-   End += snprintf(S,sizeof(S),"200 URI Start\nURI: %s\n",Queue->Uri.c_str());
+
+   std::cout << "200 URI Start\n"
+            << "URI: " << Queue->Uri << "\n";

    if (Res.Size != 0)
    if (Res.Size != 0)

-      End += snprintf(End,sizeof(S)-4 - (End - S),"Size: %lu\n",Res.Size);
-   
+      std::cout << "Size: " << Res.Size << "\n";
+

    if (Res.LastModified != 0)
    if (Res.LastModified != 0)

-      End += snprintf(End,sizeof(S)-4 - (End - S),"Last-Modified: %s\n",
-                     TimeRFC1123(Res.LastModified).c_str());
-   
+      std::cout << "Last-Modified: " << TimeRFC1123(Res.LastModified) << "\n";
+

    if (Res.ResumePoint != 0)
    if (Res.ResumePoint != 0)

-      End += snprintf(End,sizeof(S)-4 - (End - S),"Resume-Point: %lu\n",
-                     Res.ResumePoint);
-      
-   strcat(End,"\n");
-   if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
-      exit(100);
+      std::cout << "Resume-Point: " << Res.ResumePoint << "\n";
+
+   if (UsedMirror.empty() == false)
+      std::cout << "UsedMirror: " << UsedMirror << "\n";
+
+   std::cout << "\n" << std::flush;

 }
                                                                        /*}}}*/
 // AcqMethod::URIDone - A URI is finished                              /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 }
                                                                        /*}}}*/
 // AcqMethod::URIDone - A URI is finished                              /*{{{*/
 // ---------------------------------------------------------------------
 /* */

+static void printHashStringList(HashStringList const * const list)
+{
+      for (HashStringList::const_iterator hash = list->begin(); hash != list->end(); ++hash)
+      {
+        // very old compatibility name for MD5Sum
+        if (hash->HashType() == "MD5Sum")
+           std::cout << "MD5-Hash: " << hash->HashValue() << "\n";
+        std::cout << hash->HashType() << "-Hash: " << hash->HashValue() << "\n";
+      }
+}

 void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
 {
    if (Queue == 0)
       abort();
 void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
 {
    if (Queue == 0)
       abort();

-   
-   char S[1024] = "";
-   char *End = S;
-   
-   End += snprintf(S,sizeof(S),"201 URI Done\nURI: %s\n",Queue->Uri.c_str());
+
+   std::cout << "201 URI Done\n"
+            << "URI: " << Queue->Uri << "\n";

 
    if (Res.Filename.empty() == false)
 
    if (Res.Filename.empty() == false)

-      End += snprintf(End,sizeof(S)-50 - (End - S),"Filename: %s\n",Res.Filename.c_str());
-   
+      std::cout << "Filename: " << Res.Filename << "\n";
+

    if (Res.Size != 0)
    if (Res.Size != 0)

-      End += snprintf(End,sizeof(S)-50 - (End - S),"Size: %lu\n",Res.Size);
-   
+      std::cout << "Size: " << Res.Size << "\n";
+

    if (Res.LastModified != 0)
    if (Res.LastModified != 0)

-      End += snprintf(End,sizeof(S)-50 - (End - S),"Last-Modified: %s\n",
-                     TimeRFC1123(Res.LastModified).c_str());
-
-   if (Res.MD5Sum.empty() == false)
-      End += snprintf(End,sizeof(S)-50 - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());
-   if (Res.SHA1Sum.empty() == false)
-      End += snprintf(End,sizeof(S)-50 - (End - S),"SHA1-Hash: %s\n",Res.SHA1Sum.c_str());
-   if (Res.GPGVOutput.size() > 0)
-      End += snprintf(End,sizeof(S)-50 - (End - S),"GPGVOutput:\n");     
-   for (vector<string>::iterator I = Res.GPGVOutput.begin();
-      I != Res.GPGVOutput.end(); I++)
-      End += snprintf(End,sizeof(S)-50 - (End - S), " %s\n", (*I).c_str());
+      std::cout << "Last-Modified: " << TimeRFC1123(Res.LastModified) << "\n";
+
+   printHashStringList(&Res.Hashes);
+
+   if (UsedMirror.empty() == false)
+      std::cout << "UsedMirror: " << UsedMirror << "\n";
+   if (Res.GPGVOutput.empty() == false)
+   {
+      std::cout << "GPGVOutput:\n";
+      for (vector<string>::const_iterator I = Res.GPGVOutput.begin();
+          I != Res.GPGVOutput.end(); ++I)
+        std::cout << " " << *I << "\n";
+   }

 
    if (Res.ResumePoint != 0)
 
    if (Res.ResumePoint != 0)

-      End += snprintf(End,sizeof(S)-50 - (End - S),"Resume-Point: %lu\n",
-                     Res.ResumePoint);
+      std::cout << "Resume-Point: " << Res.ResumePoint << "\n";

 
    if (Res.IMSHit == true)
 
    if (Res.IMSHit == true)

-      strcat(End,"IMS-Hit: true\n");
-   End = S + strlen(S);
-   
+      std::cout << "IMS-Hit: true\n";
+

    if (Alt != 0)
    {
       if (Alt->Filename.empty() == false)
    if (Alt != 0)
    {
       if (Alt->Filename.empty() == false)

-        End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-Filename: %s\n",Alt->Filename.c_str());
-      
+        std::cout << "Alt-Filename: " << Alt->Filename << "\n";
+

       if (Alt->Size != 0)
       if (Alt->Size != 0)

-        End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-Size: %lu\n",Alt->Size);
-      
+        std::cout << "Alt-Size: " << Alt->Size << "\n";
+

       if (Alt->LastModified != 0)
       if (Alt->LastModified != 0)

-        End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-Last-Modified: %s\n",
-                        TimeRFC1123(Alt->LastModified).c_str());
-      
-      if (Alt->MD5Sum.empty() == false)
-        End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-MD5-Hash: %s\n",
-                        Alt->MD5Sum.c_str());
-      if (Alt->SHA1Sum.empty() == false)
-        End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA1-Hash: %s\n",
-                        Alt->SHA1Sum.c_str());
-      
+        std::cout << "Alt-Last-Modified: " << TimeRFC1123(Alt->LastModified) << "\n";
+
+      printHashStringList(&Alt->Hashes);
+

       if (Alt->IMSHit == true)
       if (Alt->IMSHit == true)

-        strcat(End,"Alt-IMS-Hit: true\n");
+        std::cout << "Alt-IMS-Hit: true\n";

    }
    }

-   
-   strcat(End,"\n");
-   if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
-      exit(100);

 
 

-   // Dequeue
-   FetchItem *Tmp = Queue;
-   Queue = Queue->Next;
-   delete Tmp;
-   if (Tmp == QueueBack)
-      QueueBack = Queue;
+   std::cout << "\n" << std::flush;
+   Dequeue();

 }
                                                                        /*}}}*/
 // AcqMethod::MediaFail - Syncronous request for new media             /*{{{*/
 }
                                                                        /*}}}*/
 // AcqMethod::MediaFail - Syncronous request for new media             /*{{{*/


@@ -234,13 +219,10 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
    to be ackd */
 bool pkgAcqMethod::MediaFail(string Required,string Drive)
 {
    to be ackd */
 bool pkgAcqMethod::MediaFail(string Required,string Drive)
 {

-   char S[1024];
-   snprintf(S,sizeof(S),"403 Media Failure\nMedia: %s\nDrive: %s\n\n",
+   fprintf(stdout, "403 Media Failure\nMedia: %s\nDrive: %s\n",

            Required.c_str(),Drive.c_str());
            Required.c_str(),Drive.c_str());

+   std::cout << "\n" << std::flush;

 
 

-   if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
-      exit(100);
-   

    vector<string> MyMessages;
    
    /* Here we read messages until we find a 603, each non 603 message is
    vector<string> MyMessages;
    
    /* Here we read messages until we find a 603, each non 603 message is


@@ -302,12 +284,12 @@ bool pkgAcqMethod::Configuration(string Message)
       I += Length + 1;
       
       for (; I < MsgEnd && *I == ' '; I++);
       I += Length + 1;
       
       for (; I < MsgEnd && *I == ' '; I++);

-      const char *Equals = I;
-      for (; Equals < MsgEnd && *Equals != '='; Equals++);
-      const char *End = Equals;
-      for (; End < MsgEnd && *End != '\n'; End++);
-      if (End == Equals)
+      const char *Equals = (const char*) memchr(I, '=', MsgEnd - I);
+      if (Equals == NULL)

         return false;
         return false;

+      const char *End = (const char*) memchr(Equals, '\n', MsgEnd - Equals);
+      if (End == NULL)
+        End = MsgEnd;

       
       Cnf.Set(DeQuoteString(string(I,Equals-I)),
              DeQuoteString(string(Equals+1,End-Equals-1)));
       
       Cnf.Set(DeQuoteString(string(I,Equals-I)),
              DeQuoteString(string(Equals+1,End-Equals-1)));


@@ -365,9 +347,19 @@ int pkgAcqMethod::Run(bool Single)
            
            Tmp->Uri = LookupTag(Message,"URI");
            Tmp->DestFile = LookupTag(Message,"FileName");
            
            Tmp->Uri = LookupTag(Message,"URI");
            Tmp->DestFile = LookupTag(Message,"FileName");

-           if (StrToTime(LookupTag(Message,"Last-Modified"),Tmp->LastModified) == false)
+           if (RFC1123StrToTime(LookupTag(Message,"Last-Modified").c_str(),Tmp->LastModified) == false)

               Tmp->LastModified = 0;
            Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false);
               Tmp->LastModified = 0;
            Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false);

+           Tmp->FailIgnore = StringToBool(LookupTag(Message,"Fail-Ignore"),false);
+           Tmp->ExpectedHashes = HashStringList();
+           for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t)
+           {
+              std::string tag = "Expected-";
+              tag.append(*t);
+              std::string const hash = LookupTag(Message, tag.c_str());
+              if (hash.empty() == false)
+                 Tmp->ExpectedHashes.push_back(HashString(*t, hash));
+           }

            Tmp->Next = 0;
            
            // Append it to the list
            Tmp->Next = 0;
            
            // Append it to the list


@@ -390,28 +382,34 @@ int pkgAcqMethod::Run(bool Single)
    return 0;
 }
                                                                        /*}}}*/
    return 0;
 }
                                                                        /*}}}*/

-// AcqMethod::Log - Send a log message                                 /*{{{*/
+// AcqMethod::PrintStatus - privately really send a log/status message /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-void pkgAcqMethod::Log(const char *Format,...)
+void pkgAcqMethod::PrintStatus(char const * const header, const char* Format,
+                              va_list &args) const

 {
    string CurrentURI = "<UNKNOWN>";
    if (Queue != 0)
       CurrentURI = Queue->Uri;
 {
    string CurrentURI = "<UNKNOWN>";
    if (Queue != 0)
       CurrentURI = Queue->Uri;

-   
+   if (UsedMirror.empty() == true)
+      fprintf(stdout, "%s\nURI: %s\nMessage: ",
+             header, CurrentURI.c_str());
+   else
+      fprintf(stdout, "%s\nURI: %s\nUsedMirror: %s\nMessage: ",
+             header, CurrentURI.c_str(), UsedMirror.c_str());
+   vfprintf(stdout,Format,args);
+   std::cout << "\n\n" << std::flush;
+}
+                                                                       /*}}}*/
+// AcqMethod::Log - Send a log message                                 /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgAcqMethod::Log(const char *Format,...)
+{

    va_list args;
    va_start(args,Format);
    va_list args;
    va_start(args,Format);

-
-   // sprintf the description
-   char S[1024];
-   unsigned int Len = snprintf(S,sizeof(S)-4,"101 Log\nURI: %s\n"
-                              "Message: ",CurrentURI.c_str());
-
-   vsnprintf(S+Len,sizeof(S)-4-Len,Format,args);
-   strcat(S,"\n\n");
-   
-   if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
-      exit(100);
+   PrintStatus("101 Log", Format, args);
+   va_end(args);

 }
                                                                        /*}}}*/
 // AcqMethod::Status - Send a status message                           /*{{{*/
 }
                                                                        /*}}}*/
 // AcqMethod::Status - Send a status message                           /*{{{*/


@@ -419,26 +417,24 @@ void pkgAcqMethod::Log(const char *Format,...)
 /* */
 void pkgAcqMethod::Status(const char *Format,...)
 {
 /* */
 void pkgAcqMethod::Status(const char *Format,...)
 {

-   string CurrentURI = "<UNKNOWN>";
-   if (Queue != 0)
-      CurrentURI = Queue->Uri;
-   

    va_list args;
    va_start(args,Format);
    va_list args;
    va_start(args,Format);

-
-   // sprintf the description
-   char S[1024];
-   unsigned int Len = snprintf(S,sizeof(S)-4,"102 Status\nURI: %s\n"
-                              "Message: ",CurrentURI.c_str());
-
-   vsnprintf(S+Len,sizeof(S)-4-Len,Format,args);
-   strcat(S,"\n\n");
-   
-   if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
-      exit(100);
+   PrintStatus("102 Status", Format, args);
+   va_end(args);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-
+// AcqMethod::Redirect - Send a redirect message                       /*{{{*/
+// ---------------------------------------------------------------------
+/* This method sends the redirect message and dequeues the item as
+ * the worker will enqueue again later on to the right queue */
+void pkgAcqMethod::Redirect(const string &NewURI)
+{
+   std::cout << "103 Redirect\nURI: " << Queue->Uri << "\n"
+            << "New-URI: " << NewURI << "\n"
+            << "\n" << std::flush;
+   Dequeue();
+}
+                                                                        /*}}}*/

 // AcqMethod::FetchResult::FetchResult - Constructor                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // AcqMethod::FetchResult::FetchResult - Constructor                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -451,9 +447,16 @@ pkgAcqMethod::FetchResult::FetchResult() : LastModified(0),
 // ---------------------------------------------------------------------
 /* This hides the number of hashes we are supporting from the caller. 
    It just deals with the hash class. */
 // ---------------------------------------------------------------------
 /* This hides the number of hashes we are supporting from the caller. 
    It just deals with the hash class. */

-void pkgAcqMethod::FetchResult::TakeHashes(Hashes &Hash)
+void pkgAcqMethod::FetchResult::TakeHashes(class Hashes &Hash)

 {
 {

-   MD5Sum = Hash.MD5.Result();
-   SHA1Sum = Hash.SHA1.Result();
+   Hashes = Hash.GetHashStringList();
+}
+                                                                       /*}}}*/
+void pkgAcqMethod::Dequeue() {                                         /*{{{*/
+   FetchItem const * const Tmp = Queue;
+   Queue = Queue->Next;
+   if (Tmp == QueueBack)
+      QueueBack = Queue;
+   delete Tmp;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/