make expected-size a maximum-size check as this is what we want at this point

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 330854e752adc655b6fa6f111a45c71acbd74757..9c0558223dfaa659a567d4bdba3082dc40a713b2 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -373,7 +373,7 @@ int pkgAcqMethod::Run(bool Single)
                  Tmp->ExpectedHashes.push_back(HashString(*t, hash));
            }
             char *End;
                  Tmp->ExpectedHashes.push_back(HashString(*t, hash));
            }
             char *End;

-            Tmp->ExpectedSize = strtoll(LookupTag(Message, "Expected-Size", "0").c_str(), &End, 10);
+            Tmp->MaximumSize = strtoll(LookupTag(Message, "Maximum-Size", "0").c_str(), &End, 10);

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

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 2e4e8281a978d92bb13c48fe2cdebaffabf2fad9..675c4f8448231d22f321e18b753a15e91332ddbe 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -48,7 +48,10 @@ class pkgAcqMethod
       bool IndexFile;
       bool FailIgnore;
       HashStringList ExpectedHashes;
       bool IndexFile;
       bool FailIgnore;
       HashStringList ExpectedHashes;

-      unsigned long long ExpectedSize;
+      // a maximum size we will download, this can be the exact filesize
+      // for when we know it or a arbitrary limit when we don't know the
+      // filesize (like a InRelease file)
+      unsigned long long MaximumSize;

    };
    
    struct FetchResult
    };
    
    struct FetchResult

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 8bd1618f4b09efb69fd49f0029e88c6b43c426cb..ffa84eb68d30988fc471c209544ec3c2d9a513f9 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -526,9 +526,6 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
    if (OutFd == -1)
       return false;
    
    if (OutFd == -1)
       return false;
    

-   string ExpectedSize;
-   strprintf(ExpectedSize, "%llu", Item->Owner->FileSize);
-

    string Message = "600 URI Acquire\n";
    Message.reserve(300);
    Message += "URI: " + Item->URI;
    string Message = "600 URI Acquire\n";
    Message.reserve(300);
    Message += "URI: " + Item->URI;


@@ -536,7 +533,12 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
    HashStringList const hsl = Item->Owner->HashSums();
    for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
       Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();
    HashStringList const hsl = Item->Owner->HashSums();
    for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
       Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();

-   Message += "\nExpected-Size: " + ExpectedSize;
+   if(Item->Owner->FileSize > 0)
+   {
+      string MaximumSize;
+      strprintf(MaximumSize, "%llu", Item->Owner->FileSize);
+      Message += "\nMaximum-Size: " + MaximumSize;
+   }

    Message += Item->Owner->Custom600Headers();
    Message += "\n\n";
    
    Message += Item->Owner->Custom600Headers();
    Message += "\n\n";
    

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 75ace1c5a4e1b7198f984b8d357ea095ab15e61a..bc84dda7dbf919f0b0464ebfad22d6f24e94c477 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -849,7 +849,7 @@ bool FTPConn::Finalize()
 /* This opens a data connection, sends REST and RETR and then
    transfers the file over. */
 bool FTPConn::Get(const char *Path,FileFd &To,unsigned long long Resume,
 /* This opens a data connection, sends REST and RETR and then
    transfers the file over. */
 bool FTPConn::Get(const char *Path,FileFd &To,unsigned long long Resume,

-                 Hashes &Hash,bool &Missing, unsigned long long ExpectedSize)
+                 Hashes &Hash,bool &Missing, unsigned long long MaximumSize)

 {
    Missing = false;
    if (CreateDataFd() == false)
 {
    Missing = false;
    if (CreateDataFd() == false)


@@ -924,9 +924,9 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long long Resume,
         return false;
       }
 
         return false;
       }
 

-      if (ExpectedSize > 0 && To.Tell() > ExpectedSize)
+      if (MaximumSize > 0 && To.Tell() > MaximumSize)

          return _error->Error("Writing more data than expected (%llu > %llu)",
          return _error->Error("Writing more data than expected (%llu > %llu)",

-                              To.Tell(), ExpectedSize);
+                              To.Tell(), MaximumSize);

    }
 
    // All done
    }
 
    // All done


@@ -1067,7 +1067,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
       FailFd = Fd.Fd();
       
       bool Missing;
       FailFd = Fd.Fd();
       
       bool Missing;

-      if (Server->Get(File,Fd,Res.ResumePoint,Hash,Missing,Itm->ExpectedSize) == false)
+      if (Server->Get(File,Fd,Res.ResumePoint,Hash,Missing,Itm->MaximumSize) == false)

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

diff --git a/methods/ftp.h b/methods/ftp.h
index 416a91980d81c22f8cf678350b21068a90a94bdb..a31ebc999c8c2de5f9dc553f5de3b8fe7d1cac45 100644 (file)
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -62,7 +62,7 @@ class FTPConn
    bool Size(const char *Path,unsigned long long &Size);
    bool ModTime(const char *Path, time_t &Time);
    bool Get(const char *Path,FileFd &To,unsigned long long Resume,
    bool Size(const char *Path,unsigned long long &Size);
    bool ModTime(const char *Path, time_t &Time);
    bool Get(const char *Path,FileFd &To,unsigned long long Resume,

-           Hashes &MD5,bool &Missing, unsigned long long ExpectedSize);
+           Hashes &MD5,bool &Missing, unsigned long long MaximumSize);

    
    FTPConn(URI Srv);
    ~FTPConn();
    
    FTPConn(URI Srv);
    ~FTPConn();

diff --git a/methods/http.cc b/methods/http.cc
index b076e59ccc52f883fb96643acaef39f9d8550aa6..f8faa0cf8cbfff41be3a4867c3cc26936aa97a0b 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -655,10 +655,10 @@ bool HttpServerState::Go(bool ToFile, FileFd * const File)
         return _error->Errno("write",_("Error writing to output file"));
    }
 
         return _error->Errno("write",_("Error writing to output file"));
    }
 

-   if (ExpectedSize > 0 && File && File->Tell() > ExpectedSize)
+   if (MaximumSize > 0 && File && File->Tell() > MaximumSize)

    {
       return _error->Error("Writing more data than expected (%llu > %llu)",
    {
       return _error->Error("Writing more data than expected (%llu > %llu)",

-                           File->Tell(), ExpectedSize);
+                           File->Tell(), MaximumSize);

    }
 
    // Handle commands from APT
    }
 
    // Handle commands from APT

diff --git a/methods/https.cc b/methods/https.cc
index a4794e70509fc19f8145c4a1d51bd116bb62c599..787e4a5075a99aaf180935f6380fab83fe5a63de 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -82,9 +82,9 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
    if(me->File->Write(buffer, size*nmemb) != true)
       return false;
 
    if(me->File->Write(buffer, size*nmemb) != true)
       return false;
 

-   if(me->Queue->ExpectedSize > 0 && me->File->Tell() > me->Queue->ExpectedSize)
+   if(me->Queue->MaximumSize > 0 && me->File->Tell() > me->Queue->MaximumSize)

       return _error->Error("Writing more data than expected (%llu > %llu)",
       return _error->Error("Writing more data than expected (%llu > %llu)",

-                           me->TotalWritten, me->Queue->ExpectedSize);
+                           me->TotalWritten, me->Queue->MaximumSize);

 
    return size*nmemb;
 }
 
    return size*nmemb;
 }

diff --git a/methods/server.cc b/methods/server.cc
index 2237379010d809544183a9ae96336ee315ccdf2d..82f9b4750b835fc72fb5bbe421e7b82fec5a0ef2 100644 (file)
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -534,8 +534,8 @@ int ServerMethod::Loop()
            bool Result = true;
 
             // ensure we don't fetch too much
            bool Result = true;
 
             // ensure we don't fetch too much

-            if (Queue->ExpectedSize > 0)
-               Server->ExpectedSize = Queue->ExpectedSize;
+            if (Queue->MaximumSize > 0)
+               Server->MaximumSize = Queue->MaximumSize;

 
             if (Server->HaveContent)
               Result = Server->RunData(File);
 
             if (Server->HaveContent)
               Result = Server->RunData(File);

diff --git a/methods/server.h b/methods/server.h
index 0134a95385cb60dc1eba9499cd0aa088a12ba587..3093e00c99ba44f0218f12d3a0b0826b830f911f 100644 (file)
--- a/methods/server.h
+++ b/methods/server.h
@@ -49,7 +49,7 @@ struct ServerState
    URI Proxy;
    unsigned long TimeOut;
 
    URI Proxy;
    unsigned long TimeOut;
 

-   unsigned long long ExpectedSize;
+   unsigned long long MaximumSize;

 
    protected:
    ServerMethod *Owner;
 
    protected:
    ServerMethod *Owner;


@@ -75,7 +75,7 @@ struct ServerState
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
    virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0;
                 StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
    virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0;
                 StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;

-                State = Header; Persistent = false; Pipeline = true; ExpectedSize = 0;};
+                State = Header; Persistent = false; Pipeline = true; MaximumSize = 0;};

    virtual bool WriteResponse(std::string const &Data) = 0;
 
    /** \brief Transfer the data from the socket */
    virtual bool WriteResponse(std::string const &Data) = 0;
 
    /** \brief Transfer the data from the socket */

diff --git a/test/integration/test-apt-update-expected-size b/test/integration/test-apt-update-expected-size
index 72812336dec811c9bad76dc939f5ef726e79fd26..c1eecc08a43dd028dba8cd933ccb270983fb180b 100755 (executable)
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -15,6 +15,13 @@ changetowebserver
 # normal update works fine
 testsuccess aptget update
 
 # normal update works fine
 testsuccess aptget update
 

+# make InRelease really big
+mv aptarchive/dists/unstable/InRelease aptarchive/dists/unstable/InRelease.good
+dd if=/dev/zero of=aptarchive/dists/unstable/InRelease bs=1M count=2
+touch -d '+1hour' aptarchive/dists/unstable/InRelease
+aptget update -o acquire::MaxReleaseFileSize=$((1*1000*1000))
+
+

 # append junk at the end of the Packages.gz/Packages
 SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages)"
 echo "1234567890" >> aptarchive/dists/unstable/main/binary-i386/Packages.gz
 # append junk at the end of the Packages.gz/Packages
 SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages)"
 echo "1234567890" >> aptarchive/dists/unstable/main/binary-i386/Packages.gz