restore ABI of pkgTagSection

[apt.git] / apt-pkg / contrib / hashes.cc

diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 66ae33146403b44bfd71ffc73af02ec741674843..6e7080bc90d9126e1f82240826d90dd90462ab5c 100644 (file)
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -11,39 +11,50 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>

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

 
 

-#include <unistd.h>    
+#include <stddef.h>
+#include <algorithm>
+#include <unistd.h>

 #include <string>
 #include <iostream>
                                                                        /*}}}*/
 
 #include <string>
 #include <iostream>
                                                                        /*}}}*/
 

-const char* HashString::_SupportedHashes[] = 
+const char * HashString::_SupportedHashes[] =

 {
 {

-   "SHA512", "SHA256", "SHA1", "MD5Sum", NULL
+   "SHA512", "SHA256", "SHA1", "MD5Sum", "Checksum-FileSize", NULL

 };
 
 HashString::HashString()
 {
 }
 
 };
 
 HashString::HashString()
 {
 }
 

-HashString::HashString(string Type, string Hash) : Type(Type), Hash(Hash)
+HashString::HashString(std::string Type, std::string Hash) : Type(Type), Hash(Hash)

 {
 }
 
 {
 }
 

-HashString::HashString(string StringedHash)                            /*{{{*/
+HashString::HashString(std::string StringedHash)                       /*{{{*/

 {
 {

-   // legacy: md5sum without "MD5Sum:" prefix
-   if (StringedHash.find(":") == string::npos && StringedHash.size() == 32)
+   if (StringedHash.find(":") == std::string::npos)

    {
    {

-      Type = "MD5Sum";
-      Hash = StringedHash;
+      // legacy: md5sum without "MD5Sum:" prefix
+      if (StringedHash.size() == 32)
+      {
+        Type = "MD5Sum";
+        Hash = StringedHash;
+      }
+      if(_config->FindB("Debug::Hashes",false) == true)
+        std::clog << "HashString(string): invalid StringedHash " << StringedHash << std::endl;

       return;
    }
       return;
    }

-   string::size_type pos = StringedHash.find(":");
+   std::string::size_type pos = StringedHash.find(":");

    Type = StringedHash.substr(0,pos);
    Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
 
    Type = StringedHash.substr(0,pos);
    Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
 


@@ -51,83 +62,274 @@ HashString::HashString(string StringedHash)                                /*{{{*/
       std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
 }
                                                                        /*}}}*/
       std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
 }
                                                                        /*}}}*/

-bool HashString::VerifyFile(string filename) const                     /*{{{*/
+bool HashString::VerifyFile(std::string filename) const                        /*{{{*/
+{
+   std::string fileHash = GetHashForFile(filename);
+
+   if(_config->FindB("Debug::Hashes",false) == true)
+      std::clog << "HashString::VerifyFile: got: " << fileHash << " expected: " << toStr() << std::endl;
+
+   return (fileHash == Hash);
+}
+                                                                       /*}}}*/
+bool HashString::FromFile(std::string filename)                        /*{{{*/
+{
+   // pick the strongest hash
+   if (Type == "")
+      Type = _SupportedHashes[0];
+
+   Hash = GetHashForFile(filename);
+   return true;
+}
+                                                                       /*}}}*/
+std::string HashString::GetHashForFile(std::string filename) const      /*{{{*/

 {
 {

-   FileFd fd;
-   MD5Summation MD5;
-   SHA1Summation SHA1;
-   SHA256Summation SHA256;
-   SHA256Summation SHA512;
-   string fileHash;
+   std::string fileHash;

 
    FileFd Fd(filename, FileFd::ReadOnly);
 
    FileFd Fd(filename, FileFd::ReadOnly);

-   if(Type == "MD5Sum") 
+   if(strcasecmp(Type.c_str(), "MD5Sum") == 0)

    {
    {

-      MD5.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)MD5.Result();
-   } 
-   else if (Type == "SHA1")
+      MD5Summation MD5;
+      MD5.AddFD(Fd);
+      fileHash = (std::string)MD5.Result();
+   }
+   else if (strcasecmp(Type.c_str(), "SHA1") == 0)

    {
    {

-      SHA1.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)SHA1.Result();
-   } 
-   else if (Type == "SHA256") 
+      SHA1Summation SHA1;
+      SHA1.AddFD(Fd);
+      fileHash = (std::string)SHA1.Result();
+   }
+   else if (strcasecmp(Type.c_str(), "SHA256") == 0)

    {
    {

-      SHA256.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)SHA256.Result();
+      SHA256Summation SHA256;
+      SHA256.AddFD(Fd);
+      fileHash = (std::string)SHA256.Result();

    }
    }

-   else if (Type == "SHA512") 
+   else if (strcasecmp(Type.c_str(), "SHA512") == 0)

    {
    {

-      SHA512.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)SHA512.Result();
+      SHA512Summation SHA512;
+      SHA512.AddFD(Fd);
+      fileHash = (std::string)SHA512.Result();

    }
    }

+   else if (strcasecmp(Type.c_str(), "Checksum-FileSize") == 0)
+      strprintf(fileHash, "%llu", Fd.FileSize());

    Fd.Close();
 
    Fd.Close();
 

-   if(_config->FindB("Debug::Hashes",false) == true)
-      std::clog << "HashString::VerifyFile: got: " << fileHash << " expected: " << toStr() << std::endl;
-
-   return (fileHash == Hash);
+   return fileHash;

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

-const char** HashString::SupportedHashes()
+const char** HashString::SupportedHashes()                             /*{{{*/

 {
    return _SupportedHashes;
 }
 {
    return _SupportedHashes;
 }

-
-bool HashString::empty() const
+                                                                       /*}}}*/
+APT_PURE bool HashString::empty() const                                        /*{{{*/

 {
    return (Type.empty() || Hash.empty());
 }
 {
    return (Type.empty() || Hash.empty());
 }

+                                                                       /*}}}*/
+std::string HashString::toStr() const                                  /*{{{*/
+{
+   return Type + ":" + Hash;
+}
+                                                                       /*}}}*/
+APT_PURE bool HashString::operator==(HashString const &other) const    /*{{{*/
+{
+   return (strcasecmp(Type.c_str(), other.Type.c_str()) == 0 && Hash == other.Hash);
+}
+APT_PURE bool HashString::operator!=(HashString const &other) const
+{
+   return !(*this == other);
+}
+                                                                       /*}}}*/

 
 

-string HashString::toStr() const
+bool HashStringList::usable() const                                    /*{{{*/

 {
 {

-   return Type+string(":")+Hash;
+   if (empty() == true)
+      return false;
+   std::string const forcedType = _config->Find("Acquire::ForceHash", "");
+   if (forcedType.empty() == true)
+   {
+      // FileSize alone isn't usable
+      for (std::vector<HashString>::const_iterator hs = list.begin(); hs != list.end(); ++hs)
+        if (hs->HashType() != "Checksum-FileSize")
+           return true;
+      return false;
+   }
+   return find(forcedType) != NULL;

 }
 }

+                                                                       /*}}}*/
+HashString const * HashStringList::find(char const * const type) const /*{{{*/
+{
+   if (type == NULL || type[0] == '\0')
+   {
+      std::string const forcedType = _config->Find("Acquire::ForceHash", "");
+      if (forcedType.empty() == false)
+        return find(forcedType.c_str());
+      for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t)
+        for (std::vector<HashString>::const_iterator hs = list.begin(); hs != list.end(); ++hs)
+           if (strcasecmp(hs->HashType().c_str(), *t) == 0)
+              return &*hs;
+      return NULL;
+   }
+   for (std::vector<HashString>::const_iterator hs = list.begin(); hs != list.end(); ++hs)
+      if (strcasecmp(hs->HashType().c_str(), type) == 0)
+        return &*hs;
+   return NULL;
+}
+                                                                       /*}}}*/
+bool HashStringList::supported(char const * const type)                        /*{{{*/
+{
+   for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t)
+      if (strcasecmp(*t, type) == 0)
+        return true;
+   return false;
+}
+                                                                       /*}}}*/
+bool HashStringList::push_back(const HashString &hashString)           /*{{{*/
+{
+   if (hashString.HashType().empty() == true ||
+        hashString.HashValue().empty() == true ||
+        supported(hashString.HashType().c_str()) == false)
+      return false;
+
+   // ensure that each type is added only once
+   HashString const * const hs = find(hashString.HashType().c_str());
+   if (hs != NULL)
+      return *hs == hashString;
+
+   list.push_back(hashString);
+   return true;
+}
+                                                                       /*}}}*/
+bool HashStringList::VerifyFile(std::string filename) const            /*{{{*/
+{
+   if (list.empty() == true)
+      return false;
+   HashString const * const hs = find(NULL);
+   if (hs == NULL || hs->VerifyFile(filename) == false)
+      return false;
+   HashString const * const hsf = find("Checksum-FileSize");
+   if (hsf != NULL && hsf->VerifyFile(filename) == false)
+      return false;
+   return true;
+}
+                                                                       /*}}}*/
+bool HashStringList::operator==(HashStringList const &other) const     /*{{{*/
+{
+   std::string const forcedType = _config->Find("Acquire::ForceHash", "");
+   if (forcedType.empty() == false)
+   {
+      HashString const * const hs = find(forcedType);
+      HashString const * const ohs = other.find(forcedType);
+      if (hs == NULL || ohs == NULL)
+        return false;
+      return *hs == *ohs;
+   }
+   short matches = 0;
+   for (const_iterator hs = begin(); hs != end(); ++hs)
+   {
+      HashString const * const ohs = other.find(hs->HashType());
+      if (ohs == NULL)
+        continue;
+      if (*hs != *ohs)
+        return false;
+      ++matches;
+   }
+   if (matches == 0)
+      return false;
+   return true;
+}
+bool HashStringList::operator!=(HashStringList const &other) const
+{
+   return !(*this == other);
+}
+                                                                       /*}}}*/
+
+// PrivateHashes                                                       /*{{{*/
+class PrivateHashes {
+public:
+   unsigned long long FileSize;

 
 

-// Hashes::AddFD - Add the contents of the FD                          /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool Hashes::AddFD(int Fd,unsigned long Size)
+   PrivateHashes() : FileSize(0) {}
+};
+                                                                       /*}}}*/
+// Hashes::Add* - Add the contents of data or FD                       /*{{{*/
+bool Hashes::Add(const unsigned char * const Data,unsigned long long const Size, unsigned int const Hashes)
+{
+   bool Res = true;
+APT_IGNORE_DEPRECATED_PUSH
+   if ((Hashes & MD5SUM) == MD5SUM)
+      Res &= MD5.Add(Data, Size);
+   if ((Hashes & SHA1SUM) == SHA1SUM)
+      Res &= SHA1.Add(Data, Size);
+   if ((Hashes & SHA256SUM) == SHA256SUM)
+      Res &= SHA256.Add(Data, Size);
+   if ((Hashes & SHA512SUM) == SHA512SUM)
+      Res &= SHA512.Add(Data, Size);
+APT_IGNORE_DEPRECATED_POP
+   d->FileSize += Size;
+   return Res;
+}
+bool Hashes::AddFD(int const Fd,unsigned long long Size, unsigned int const Hashes)

 {
    unsigned char Buf[64*64];
 {
    unsigned char Buf[64*64];

-   int Res = 0;
-   int ToEOF = (Size == 0);
+   bool const ToEOF = (Size == UntilEOF);

    while (Size != 0 || ToEOF)
    {
    while (Size != 0 || ToEOF)
    {

-      unsigned n = sizeof(Buf);
-      if (!ToEOF) n = min(Size,(unsigned long)n);
-      Res = read(Fd,Buf,n);
-      if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
-         return false;
+      unsigned long long n = sizeof(Buf);
+      if (!ToEOF) n = std::min(Size, n);
+      ssize_t const Res = read(Fd,Buf,n);
+      if (Res < 0 || (!ToEOF && Res != (ssize_t) n)) // error, or short read
+        return false;

       if (ToEOF && Res == 0) // EOF
       if (ToEOF && Res == 0) // EOF

-         break;
+        break;

       Size -= Res;
       Size -= Res;

-      MD5.Add(Buf,Res);
-      SHA1.Add(Buf,Res);
-      SHA256.Add(Buf,Res);
-      SHA512.Add(Buf,Res);
+      if (Add(Buf, Res, Hashes) == false)
+        return false;
+   }
+   return true;
+}
+bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, unsigned int const Hashes)
+{
+   unsigned char Buf[64*64];
+   bool const ToEOF = (Size == 0);
+   while (Size != 0 || ToEOF)
+   {
+      unsigned long long n = sizeof(Buf);
+      if (!ToEOF) n = std::min(Size, n);
+      unsigned long long a = 0;
+      if (Fd.Read(Buf, n, &a) == false) // error
+        return false;
+      if (ToEOF == false)
+      {
+        if (a != n) // short read
+           return false;
+      }
+      else if (a == 0) // EOF
+        break;
+      Size -= a;
+      if (Add(Buf, a, Hashes) == false)
+        return false;

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

-
+HashStringList Hashes::GetHashStringList()
+{
+   HashStringList hashes;
+APT_IGNORE_DEPRECATED_PUSH
+   hashes.push_back(HashString("MD5Sum", MD5.Result().Value()));
+   hashes.push_back(HashString("SHA1", SHA1.Result().Value()));
+   hashes.push_back(HashString("SHA256", SHA256.Result().Value()));
+   hashes.push_back(HashString("SHA512", SHA512.Result().Value()));
+APT_IGNORE_DEPRECATED_POP
+   std::string SizeStr;
+   strprintf(SizeStr, "%llu", d->FileSize);
+   hashes.push_back(HashString("Checksum-FileSize", SizeStr));
+   return hashes;
+}
+APT_IGNORE_DEPRECATED_PUSH
+Hashes::Hashes() { d = new PrivateHashes(); }
+Hashes::~Hashes() { delete d; }
+APT_IGNORE_DEPRECATED_POP