http(s): allow empty values for header fields

[apt.git] / methods / server.h

diff --git a/methods/server.h b/methods/server.h
index 0134a95385cb60dc1eba9499cd0aa088a12ba587..1d114354f2a85ae7149b454111b1240d78746a9c 100644 (file)
--- a/methods/server.h
+++ b/methods/server.h
@@ -12,11 +12,12 @@
 #define APT_SERVER_H
 
 #include <apt-pkg/strutl.h>
 #define APT_SERVER_H
 
 #include <apt-pkg/strutl.h>

-#include <apt-pkg/acquire-method.h>
+#include "aptmethod.h"

 
 #include <time.h>
 #include <iostream>
 #include <string>
 
 #include <time.h>
 #include <iostream>
 #include <string>

+#include <memory>

 
 using std::cout;
 using std::endl;
 
 using std::cout;
 using std::endl;


@@ -34,13 +35,22 @@ struct ServerState
    char Code[360];
 
    // These are some statistics from the last parsed header lines
    char Code[360];
 
    // These are some statistics from the last parsed header lines

-   unsigned long long Size;
+
+   // total size of the usable content (aka: the file)
+   unsigned long long TotalFileSize;
+   // size we actually download (can be smaller than Size if we have partial content)
+   unsigned long long DownloadSize;
+   // size of junk content (aka: server error pages)
+   unsigned long long JunkSize;
+   // The start of the data (for partial content)

    unsigned long long StartPos;
    unsigned long long StartPos;

+

    time_t Date;
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool Persistent;
    time_t Date;
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool Persistent;

+   bool PipelineAllowed;

    std::string Location;
 
    // This is a Persistent attribute of the server itself.
    std::string Location;
 
    // This is a Persistent attribute of the server itself.


@@ -49,7 +59,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;


@@ -71,22 +81,24 @@ struct ServerState
    };
    /** \brief Get the headers before the data */
    RunHeadersResult RunHeaders(FileFd * const File, const std::string &Uri);
    };
    /** \brief Get the headers before the data */
    RunHeadersResult RunHeaders(FileFd * const File, const std::string &Uri);

+   bool AddPartialFileToHashes(FileFd &File);

 
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
 
    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;
+   virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; TotalFileSize = 0; JunkSize = 0;

                 StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;
                 StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;

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

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

+   virtual bool RunDataToDevNull() = 0;

 
    virtual bool Open() = 0;
    virtual bool IsOpen() = 0;
    virtual bool Close() = 0;
 
    virtual bool Open() = 0;
    virtual bool IsOpen() = 0;
    virtual bool Close() = 0;

-   virtual bool InitHashes(FileFd &File) = 0;
+   virtual bool InitHashes(HashStringList const &ExpectedHashes) = 0;

    virtual Hashes * GetHashes() = 0;
    virtual Hashes * GetHashes() = 0;

-   virtual bool Die(FileFd &File) = 0;
+   virtual bool Die(FileFd * const File) = 0;

    virtual bool Flush(FileFd * const File) = 0;
    virtual bool Go(bool ToFile, FileFd * const File) = 0;
 
    virtual bool Flush(FileFd * const File) = 0;
    virtual bool Go(bool ToFile, FileFd * const File) = 0;
 


@@ -94,18 +106,22 @@ struct ServerState
    virtual ~ServerState() {};
 };
 
    virtual ~ServerState() {};
 };
 

-class ServerMethod : public pkgAcqMethod
+class ServerMethod : public aptMethod

 {
    protected:
 {
    protected:

-   virtual bool Fetch(FetchItem *);
+   virtual bool Fetch(FetchItem *) APT_OVERRIDE;

 
 

-   ServerState *Server;
+   std::unique_ptr<ServerState> Server;

    std::string NextURI;
    FileFd *File;
 
    unsigned long PipelineDepth;
    bool AllowRedirect;
 
    std::string NextURI;
    FileFd *File;
 
    unsigned long PipelineDepth;
    bool AllowRedirect;
 

+   // Find the biggest item in the fetch queue for the checking of the maximum
+   // size
+   unsigned long long FindMaximumObjectSizeInQueue() const APT_PURE;
+

    public:
    bool Debug;
 
    public:
    bool Debug;
 


@@ -125,7 +141,7 @@ class ServerMethod : public pkgAcqMethod
       TRY_AGAIN_OR_REDIRECT
    };
    /** \brief Handle the retrieved header data */
       TRY_AGAIN_OR_REDIRECT
    };
    /** \brief Handle the retrieved header data */

-   DealWithHeadersResult DealWithHeaders(FetchResult &Res);
+   virtual DealWithHeadersResult DealWithHeaders(FetchResult &Res);

 
    // In the event of a fatal signal this file will be closed and timestamped.
    static std::string FailFile;
 
    // In the event of a fatal signal this file will be closed and timestamped.
    static std::string FailFile;


@@ -133,16 +149,18 @@ class ServerMethod : public pkgAcqMethod
    static time_t FailTime;
    static APT_NORETURN void SigTerm(int);
 
    static time_t FailTime;
    static APT_NORETURN void SigTerm(int);
 

-   virtual bool Configuration(std::string Message);

    virtual bool Flush() { return Server->Flush(File); };
 
    int Loop();
 
    virtual void SendReq(FetchItem *Itm) = 0;
    virtual bool Flush() { return Server->Flush(File); };
 
    int Loop();
 
    virtual void SendReq(FetchItem *Itm) = 0;

-   virtual ServerState * CreateServerState(URI uri) = 0;
+   virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) = 0;

    virtual void RotateDNS() = 0;
    virtual void RotateDNS() = 0;

+   virtual bool Configuration(std::string Message) APT_OVERRIDE;
+
+   bool AddProxyAuth(URI &Proxy, URI const &Server) const;

 
 

-   ServerMethod(const char *Ver,unsigned long Flags = 0) : pkgAcqMethod(Ver, Flags), Server(NULL), File(NULL), PipelineDepth(10), AllowRedirect(false), Debug(false) {};
+   ServerMethod(std::string &&Binary, char const * const Ver,unsigned long const Flags);

    virtual ~ServerMethod() {};
 };
 
    virtual ~ServerMethod() {};
 };