Pass ExpectedSize to tthe backend method

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index b22b61efca5c9251713e5c334632ccd6f9634cbf..916fa464f7d79c3c41cb5a1af5eb650eea14aa47 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -3,7 +3,7 @@
 // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
 /* ######################################################################
 
 // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
 /* ######################################################################
 

-   HTTP Acquire Method - This is the HTTP aquire method for APT.
+   HTTP Acquire Method - This is the HTTP acquire method for APT.

    
    It uses HTTP/1.1 and many of the fancy options there-in, such as
    pipelining, range, if-range and so on. 
    
    It uses HTTP/1.1 and many of the fancy options there-in, such as
    pipelining, range, if-range and so on. 


@@ -33,25 +33,22 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>

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

 
 

+#include <stddef.h>
+#include <stdlib.h>
+#include <sys/select.h>
+#include <cstring>

 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/time.h>

-#include <utime.h>

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

-#include <signal.h>

 #include <stdio.h>
 #include <errno.h>
 #include <stdio.h>
 #include <errno.h>

-#include <string.h>
-#include <climits>

 #include <iostream>
 #include <iostream>

-#include <map>
-
-// Internet stuff
-#include <netdb.h>
+#include <sstream>

 
 #include "config.h"
 #include "connect.h"
 
 #include "config.h"
 #include "connect.h"

-#include "rfc2553emu.h"

 #include "http.h"
 
 #include <apti18n.h>
 #include "http.h"
 
 #include <apti18n.h>


@@ -62,11 +59,12 @@ unsigned long long CircleBuf::BwReadLimit=0;
 unsigned long long CircleBuf::BwTickReadData=0;
 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;
 unsigned long long CircleBuf::BwTickReadData=0;
 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;

- 
+

 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-CircleBuf::CircleBuf(unsigned long long Size) : Size(Size), Hash(0)
+CircleBuf::CircleBuf(unsigned long long Size) 
+   : Size(Size), Hash(0), TotalWriten(0)

 {
    Buf = new unsigned char[Size];
    Reset();
 {
    Buf = new unsigned char[Size];
    Reset();


@@ -82,14 +80,15 @@ void CircleBuf::Reset()
    InP = 0;
    OutP = 0;
    StrPos = 0;
    InP = 0;
    OutP = 0;
    StrPos = 0;

+   TotalWriten = 0;

    MaxGet = (unsigned long long)-1;
    OutQueue = string();
    if (Hash != 0)
    {
       delete Hash;
       Hash = new Hashes;
    MaxGet = (unsigned long long)-1;
    OutQueue = string();
    if (Hash != 0)
    {
       delete Hash;
       Hash = new Hashes;

-   }   
-};
+   }
+}

                                                                        /*}}}*/
 // CircleBuf::Read - Read from a FD into the circular buffer           /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // CircleBuf::Read - Read from a FD into the circular buffer           /*{{{*/
 // ---------------------------------------------------------------------


@@ -97,8 +96,6 @@ void CircleBuf::Reset()
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {

-   unsigned long long BwReadMax;
-

    while (1)
    {
       // Woops, buffer is full
    while (1)
    {
       // Woops, buffer is full


@@ -106,7 +103,7 @@ bool CircleBuf::Read(int Fd)
         return true;
 
       // what's left to read in this tick
         return true;
 
       // what's left to read in this tick

-      BwReadMax = CircleBuf::BwReadLimit/BW_HZ;
+      unsigned long long const BwReadMax = CircleBuf::BwReadLimit/BW_HZ;

 
       if(CircleBuf::BwReadLimit) {
         struct timeval now;
 
       if(CircleBuf::BwReadLimit) {
         struct timeval now;


@@ -221,6 +218,8 @@ bool CircleBuf::Write(int Fd)
         
         return false;
       }
         
         return false;
       }

+
+      TotalWriten += Res;

       
       if (Hash != 0)
         Hash->Add(Buf + (OutP%Size),Res);
       
       if (Hash != 0)
         Hash->Add(Buf + (OutP%Size),Res);


@@ -476,7 +475,7 @@ bool HttpServerState::WriteResponse(const std::string &Data)                /*{{{*/
    return Out.Read(Data);
 }
                                                                        /*}}}*/
    return Out.Read(Data);
 }
                                                                        /*}}}*/

-bool HttpServerState::IsOpen()                                         /*{{{*/
+APT_PURE bool HttpServerState::IsOpen()                                        /*{{{*/

 {
    return (ServerFd != -1);
 }
 {
    return (ServerFd != -1);
 }


@@ -487,16 +486,11 @@ bool HttpServerState::InitHashes(FileFd &File)                            /*{{{*/
    In.Hash = new Hashes;
 
    // Set the expected size and read file for the hashes
    In.Hash = new Hashes;
 
    // Set the expected size and read file for the hashes

-   if (StartPos >= 0)
-   {
-      File.Truncate(StartPos);
-
-      return In.Hash->AddFD(File, StartPos);
-   }
-   return true;
+   File.Truncate(StartPos);
+   return In.Hash->AddFD(File, StartPos);

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

-Hashes * HttpServerState::GetHashes()                                  /*{{{*/
+APT_PURE Hashes * HttpServerState::GetHashes()                         /*{{{*/

 {
    return In.Hash;
 }
 {
    return In.Hash;
 }


@@ -659,6 +653,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 && In.TotalWriten > ExpectedSize)
+      return _error->Error("Writing more data than expected (%llu > %llu)",
+                           In.TotalWriten, ExpectedSize);
+

    // Handle commands from APT
    if (FD_ISSET(STDIN_FILENO,&rfds))
    {
    // Handle commands from APT
    if (FD_ISSET(STDIN_FILENO,&rfds))
    {


@@ -678,22 +676,13 @@ void HttpMethod::SendReq(FetchItem *Itm)
    URI Uri = Itm->Uri;
 
    // The HTTP server expects a hostname with a trailing :port
    URI Uri = Itm->Uri;
 
    // The HTTP server expects a hostname with a trailing :port

-   char Buf[1000];
+   std::stringstream Req;

    string ProperHost;
 
    if (Uri.Host.find(':') != string::npos)
       ProperHost = '[' + Uri.Host + ']';
    else
       ProperHost = Uri.Host;
    string ProperHost;
 
    if (Uri.Host.find(':') != string::npos)
       ProperHost = '[' + Uri.Host + ']';
    else
       ProperHost = Uri.Host;

-   if (Uri.Port != 0)
-   {
-      sprintf(Buf,":%u",Uri.Port);
-      ProperHost += Buf;
-   }   
-      
-   // Just in case.
-   if (Itm->Uri.length() >= sizeof(Buf))
-       abort();

 
    /* RFC 2616 §5.1.2 requires absolute URIs for requests to proxies,
       but while its a must for all servers to accept absolute URIs,
 
    /* RFC 2616 §5.1.2 requires absolute URIs for requests to proxies,
       but while its a must for all servers to accept absolute URIs,


@@ -712,30 +701,23 @@ void HttpMethod::SendReq(FetchItem *Itm)
       in 1.1, can cause problems with proxies, and we are an HTTP/1.1
       client anyway.
       C.f. https://tools.ietf.org/wg/httpbis/trac/ticket/158 */
       in 1.1, can cause problems with proxies, and we are an HTTP/1.1
       client anyway.
       C.f. https://tools.ietf.org/wg/httpbis/trac/ticket/158 */

-   sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n",
-          requesturi.c_str(),ProperHost.c_str());
+   Req << "GET " << requesturi << " HTTP/1.1\r\n";
+   if (Uri.Port != 0)
+      Req << "Host: " << ProperHost << ":" << Uri.Port << "\r\n";
+   else
+      Req << "Host: " << ProperHost << "\r\n";

 
    // generate a cache control header (if needed)
 
    // generate a cache control header (if needed)

-   if (_config->FindB("Acquire::http::No-Cache",false) == true) 
-   {
-      strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
-   }
-   else
-   {
-      if (Itm->IndexFile == true) 
-      {
-        sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n",
-                _config->FindI("Acquire::http::Max-Age",0));
-      }
-      else
-      {
-        if (_config->FindB("Acquire::http::No-Store",false) == true)
-           strcat(Buf,"Cache-Control: no-store\r\n");
-      }
-   }
+   if (_config->FindB("Acquire::http::No-Cache",false) == true)
+      Req << "Cache-Control: no-cache\r\n"
+        << "Pragma: no-cache\r\n";
+   else if (Itm->IndexFile == true)
+      Req << "Cache-Control: max-age=" << _config->FindI("Acquire::http::Max-Age",0) << "\r\n";
+   else if (_config->FindB("Acquire::http::No-Store",false) == true)
+      Req << "Cache-Control: no-store\r\n";

 
    // If we ask for uncompressed files servers might respond with content-
 
    // If we ask for uncompressed files servers might respond with content-

-   // negotation which lets us end up with compressed files we do not support,
+   // negotiation which lets us end up with compressed files we do not support,

    // see 657029, 657560 and co, so if we have no extension on the request
    // ask for text only. As a sidenote: If there is nothing to negotate servers
    // seem to be nice and ignore it.
    // see 657029, 657560 and co, so if we have no extension on the request
    // ask for text only. As a sidenote: If there is nothing to negotate servers
    // seem to be nice and ignore it.


@@ -744,46 +726,35 @@ void HttpMethod::SendReq(FetchItem *Itm)
       size_t const filepos = Itm->Uri.find_last_of('/');
       string const file = Itm->Uri.substr(filepos + 1);
       if (flExtension(file) == file)
       size_t const filepos = Itm->Uri.find_last_of('/');
       string const file = Itm->Uri.substr(filepos + 1);
       if (flExtension(file) == file)

-        strcat(Buf,"Accept: text/*\r\n");
+        Req << "Accept: text/*\r\n";

    }
 
    }
 

-   string Req = Buf;
-
-   // Check for a partial file
+   // Check for a partial file and send if-queries accordingly

    struct stat SBuf;
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    struct stat SBuf;
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)

-   {
-      // In this case we send an if-range query with a range header
-      sprintf(Buf,"Range: bytes=%lli-\r\nIf-Range: %s\r\n",(long long)SBuf.st_size,
-             TimeRFC1123(SBuf.st_mtime).c_str());
-      Req += Buf;
-   }
-   else
-   {
-      if (Itm->LastModified != 0)
-      {
-        sprintf(Buf,"If-Modified-Since: %s\r\n",TimeRFC1123(Itm->LastModified).c_str());
-        Req += Buf;
-      }
-   }
+      Req << "Range: bytes=" << SBuf.st_size << "-\r\n"
+        << "If-Range: " << TimeRFC1123(SBuf.st_mtime) << "\r\n";
+   else if (Itm->LastModified != 0)
+      Req << "If-Modified-Since: " << TimeRFC1123(Itm->LastModified).c_str() << "\r\n";

 
    if (Server->Proxy.User.empty() == false || Server->Proxy.Password.empty() == false)
 
    if (Server->Proxy.User.empty() == false || Server->Proxy.Password.empty() == false)

-      Req += string("Proxy-Authorization: Basic ") + 
-          Base64Encode(Server->Proxy.User + ":" + Server->Proxy.Password) + "\r\n";
+      Req << "Proxy-Authorization: Basic "
+        << Base64Encode(Server->Proxy.User + ":" + Server->Proxy.Password) << "\r\n";

 
    maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
    if (Uri.User.empty() == false || Uri.Password.empty() == false)
 
    maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
    if (Uri.User.empty() == false || Uri.Password.empty() == false)

-   {
-      Req += string("Authorization: Basic ") + 
-          Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
-   }
-   Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
-               "Debian APT-HTTP/1.3 (" PACKAGE_VERSION ")") + "\r\n\r\n";
-   
+      Req << "Authorization: Basic "
+        << Base64Encode(Uri.User + ":" + Uri.Password) << "\r\n";
+
+   Req << "User-Agent: " << _config->Find("Acquire::http::User-Agent",
+               "Debian APT-HTTP/1.3 (" PACKAGE_VERSION ")") << "\r\n";
+
+   Req << "\r\n";
+

    if (Debug == true)
       cerr << Req << endl;
 
    if (Debug == true)
       cerr << Req << endl;
 

-   Server->WriteResponse(Req);
+   Server->WriteResponse(Req.str());

 }
                                                                        /*}}}*/
 // HttpMethod::Configuration - Handle a configuration message          /*{{{*/
 }
                                                                        /*}}}*/
 // HttpMethod::Configuration - Handle a configuration message          /*{{{*/