add insecure (and weak) allow-options for sources.list

[apt.git] / apt-pkg / deb / debsrcrecords.cc

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 45cc0ae82200d0bcb5b370c160fa9d1b1143c862..e8295debb0e146c287ef856a70645763515ba9aa 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -15,15 +15,33 @@
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>

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

 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/aptconfiguration.h>

+#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/tagfile.h>

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

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

 
 

-using std::max;
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <string>
+#include <vector>

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

+using std::max;

 using std::string;
 
 using std::string;
 

+debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile const *Index)
+   : Parser(Index), d(NULL), Tags(&Fd), iOffset(0), Buffer(NULL)
+{
+   if (File.empty() == false)
+   {
+      if (Fd.Open(File, FileFd::ReadOnly, FileFd::Extension))
+        Tags.Init(&Fd, 102400);
+   }
+}
+

 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
 // ---------------------------------------------------------------------
 /* This member parses the binaries field into a pair of class arrays and
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
 // ---------------------------------------------------------------------
 /* This member parses the binaries field into a pair of class arrays and


@@ -36,7 +54,7 @@ const char **debSrcRecordParser::Binaries()
    const char *Start, *End;
    if (Sect.Find("Binary", Start, End) == false)
       return NULL;
    const char *Start, *End;
    if (Sect.Find("Binary", Start, End) == false)
       return NULL;

-   for (; isspace(*Start) != 0; ++Start);
+   for (; isspace_ascii(*Start) != 0; ++Start);

    if (Start >= End)
       return NULL;
 
    if (Start >= End)
       return NULL;
 


@@ -48,17 +66,18 @@ const char **debSrcRecordParser::Binaries()
    do {
       char* binStartNext = strchrnul(bin, ',');
       char* binEnd = binStartNext - 1;
    do {
       char* binStartNext = strchrnul(bin, ',');
       char* binEnd = binStartNext - 1;

-      for (; isspace(*binEnd) != 0; --binEnd)
-        binEnd = '\0';
+      for (; isspace_ascii(*binEnd) != 0; --binEnd)
+        binEnd = 0;

       StaticBinList.push_back(bin);
       if (*binStartNext != ',')
         break;
       *binStartNext = '\0';
       StaticBinList.push_back(bin);
       if (*binStartNext != ',')
         break;
       *binStartNext = '\0';

-      for (bin = binStartNext + 1; isspace(*bin) != 0; ++bin);
+      for (bin = binStartNext + 1; isspace_ascii(*bin) != 0; ++bin)
+         ;

    } while (*bin != '\0');
    StaticBinList.push_back(NULL);
 
    } while (*bin != '\0');
    StaticBinList.push_back(NULL);
 

-   return (const char **) &StaticBinList[0];
+   return &StaticBinList[0];

 }
                                                                        /*}}}*/
 // SrcRecordParser::BuildDepends - Return the Build-Depends information        /*{{{*/
 }
                                                                        /*}}}*/
 // SrcRecordParser::BuildDepends - Return the Build-Depends information        /*{{{*/


@@ -91,7 +110,7 @@ bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDe
       while (1)
       {
          Start = debListParser::ParseDepends(Start, Stop, 
       while (1)
       {
          Start = debListParser::ParseDepends(Start, Stop, 

-                    rec.Package,rec.Version,rec.Op,true, StripMultiArch);
+                    rec.Package,rec.Version,rec.Op,true,StripMultiArch,true);

         
          if (Start == 0) 
             return _error->Error("Problem parsing dependency: %s", fields[I]);
         
          if (Start == 0) 
             return _error->Error("Problem parsing dependency: %s", fields[I]);


@@ -112,87 +131,128 @@ bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDe
 // ---------------------------------------------------------------------
 /* This parses the list of files and returns it, each file is required to have
    a complete source package */
 // ---------------------------------------------------------------------
 /* This parses the list of files and returns it, each file is required to have
    a complete source package */

-bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
+bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &F)

 {
 {

-   List.erase(List.begin(),List.end());
-
-   const char *hash_field[] = { "Checksums-Sha512", 
-                            "Checksums-Sha256",
-                            "Checksums-Sha1",
-                            "Files", // historic name
-                            NULL,
-   };
-   const char *hash_type[] = { "Sha512", 
-                            "Sha256",
-                            "Sha1",
-                            "md5sum",
-                            NULL,
-   };
-   
-   for (int i=0; hash_field[i] != NULL; i++)
+   std::vector<pkgSrcRecords::File2> F2;
+   if (Files2(F2) == false)
+      return false;
+   for (std::vector<pkgSrcRecords::File2>::const_iterator f2 = F2.begin(); f2 != F2.end(); ++f2)

    {
    {

+      pkgSrcRecords::File2 f;
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic push
+       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+      f.MD5Hash = f2->MD5Hash;
+      f.Size = f2->Size;
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic pop
+#endif
+      f.Path = f2->Path;
+      f.Type = f2->Type;
+      F.push_back(f);
+   }
+   return true;
+}
+bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List)
+{
+   List.clear();

 
 

-      string Files = Sect.FindS(hash_field[i]);
-      if (Files.empty() == true)
-         continue;
+   // Stash the / terminated directory prefix
+   string Base = Sect.FindS("Directory");
+   if (Base.empty() == false && Base[Base.length()-1] != '/')
+      Base += '/';

 
 

-      // Stash the / terminated directory prefix
-      string Base = Sect.FindS("Directory");
-      if (Base.empty() == false && Base[Base.length()-1] != '/')
-         Base += '/';
+   std::vector<std::string> const compExts = APT::Configuration::getCompressorExtensions();
+
+   for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
+   {
+      // derive field from checksum type
+      std::string checksumField("Checksums-");
+      if (strcmp(*type, "MD5Sum") == 0)
+        checksumField = "Files"; // historic name for MD5 checksums
+      else
+        checksumField.append(*type);

 
 

-      std::vector<std::string> const compExts = APT::Configuration::getCompressorExtensions();
+      string const Files = Sect.FindS(checksumField.c_str());
+      if (Files.empty() == true)
+        continue;

 
       // Iterate over the entire list grabbing each triplet
       const char *C = Files.c_str();
       while (*C != 0)
 
       // Iterate over the entire list grabbing each triplet
       const char *C = Files.c_str();
       while (*C != 0)

-      {   
-         pkgSrcRecords::File F;
-         string Size;
-         
-         // Parse each of the elements
-         std::string RawHash;
-         if (ParseQuoteWord(C, RawHash) == false ||
-             ParseQuoteWord(C, Size) == false ||
-             ParseQuoteWord(C, F.Path) == false)
-            return _error->Error("Error parsing '%s' record", hash_field[i]);
-         // assign full hash string
-         F.Hash = HashString(hash_type[i], RawHash).toStr();
-         
-         // Parse the size and append the directory
-         F.Size = atoi(Size.c_str());
-         F.Path = Base + F.Path;
-         
-         // Try to guess what sort of file it is we are getting.
-         string::size_type Pos = F.Path.length()-1;
-         while (1)
-         {
-            string::size_type Tmp = F.Path.rfind('.',Pos);
-            if (Tmp == string::npos)
-               break;
-            if (F.Type == "tar") {
-               // source v3 has extension 'debian.tar.*' instead of 'diff.*'
-               if (string(F.Path, Tmp+1, Pos-Tmp) == "debian")
-                  F.Type = "diff";
-               break;
-            }
-            F.Type = string(F.Path,Tmp+1,Pos-Tmp);
-            
-            if (std::find(compExts.begin(), compExts.end(), std::string(".").append(F.Type)) != compExts.end() ||
-                F.Type == "tar")
-            {
-               Pos = Tmp-1;
-               continue;
-            }
-        
-            break;
-         }
-      
-         List.push_back(F);
+      {
+        string hash, size, path;
+
+        // Parse each of the elements
+        if (ParseQuoteWord(C, hash) == false ||
+              ParseQuoteWord(C, size) == false ||
+              ParseQuoteWord(C, path) == false)
+           return _error->Error("Error parsing file record in %s of source package %s", checksumField.c_str(), Package().c_str());
+
+        HashString const hashString(*type, hash);
+        if (Base.empty() == false)
+           path = Base + path;
+
+        // look if we have a record for this file already
+        std::vector<pkgSrcRecords::File2>::iterator file = List.begin();
+        for (; file != List.end(); ++file)
+           if (file->Path == path)
+              break;
+
+        // we have it already, store the new hash and be done
+        if (file != List.end())
+        {
+           if (checksumField == "Files")
+              APT_IGNORE_DEPRECATED(file->MD5Hash = hash;)
+           // an error here indicates that we have two different hashes for the same file
+           if (file->Hashes.push_back(hashString) == false)
+              return _error->Error("Error parsing checksum in %s of source package %s", checksumField.c_str(), Package().c_str());
+           continue;
+        }
+
+        // we haven't seen this file yet
+        pkgSrcRecords::File2 F;
+        F.Path = path;
+        F.FileSize = strtoull(size.c_str(), NULL, 10);
+        F.Hashes.push_back(hashString);
+        F.Hashes.FileSize(F.FileSize);
+
+        APT_IGNORE_DEPRECATED_PUSH
+        F.Size = F.FileSize;
+        if (checksumField == "Files")
+           F.MD5Hash = hash;
+        APT_IGNORE_DEPRECATED_POP
+
+        // Try to guess what sort of file it is we are getting.
+        string::size_type Pos = F.Path.length()-1;
+        while (1)
+        {
+           string::size_type Tmp = F.Path.rfind('.',Pos);
+           if (Tmp == string::npos)
+              break;
+           if (F.Type == "tar") {
+              // source v3 has extension 'debian.tar.*' instead of 'diff.*'
+              if (string(F.Path, Tmp+1, Pos-Tmp) == "debian")
+                 F.Type = "diff";
+              break;
+           }
+           F.Type = string(F.Path,Tmp+1,Pos-Tmp);
+
+           if (std::find(compExts.begin(), compExts.end(), std::string(".").append(F.Type)) != compExts.end() ||
+                 F.Type == "tar")
+           {
+              Pos = Tmp-1;
+              continue;
+           }
+
+           break;
+        }
+        List.push_back(F);

       }
       }

-      break;

    }
    }

-   return (List.size() > 0);
+
+   return true;

 }
                                                                        /*}}}*/
 // SrcRecordParser::~SrcRecordParser - Destructor                      /*{{{*/
 }
                                                                        /*}}}*/
 // SrcRecordParser::~SrcRecordParser - Destructor                      /*{{{*/


@@ -200,6 +260,25 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
 /* */
 debSrcRecordParser::~debSrcRecordParser()
 {
 /* */
 debSrcRecordParser::~debSrcRecordParser()
 {

-   delete[] Buffer;
+   // was allocated via strndup()
+   free(Buffer);

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

+
+
+debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile const *Index)
+   : debSrcRecordParser("", Index)
+{
+   // support clear signed files
+   if (OpenMaybeClearSignedFile(DscFile, Fd) == false)
+   {
+      _error->Error("Failed to open %s", DscFile.c_str());
+      return;
+   }
+
+   // re-init to ensure the updated Fd is used
+   Tags.Init(&Fd, pkgTagFile::SUPPORT_COMMENTS);
+   // read the first (and only) record
+   Step();
+
+}