use only one --keyring in gpg interactions

[apt.git] / methods / https.cc

diff --git a/methods/https.cc b/methods/https.cc
index 9422df2f0d506741aa254f6c85bebc15efebfb39..a74d2a38be4ba416ee7f1bfffbc1fdc3e43a9e0a 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.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 $
 /* ######################################################################
 

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

    
    It uses libcurl
 
    
    It uses libcurl
 


@@ -18,19 +18,21 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/configuration.h>

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

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

-#include <signal.h>

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

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

 #include <iostream>
 #include <sstream>
 #include <iostream>
 #include <sstream>

+#include <ctype.h>
+#include <stdlib.h>

 
 

-#include "config.h"

 #include "https.h"
 #include "https.h"

+

 #include <apti18n.h>
                                                                        /*}}}*/
 using namespace std;
 #include <apti18n.h>
                                                                        /*}}}*/
 using namespace std;


@@ -83,9 +85,9 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
    return size*nmemb;
 }
 
    return size*nmemb;
 }
 

-int 
-HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, 
-                             double ultotal, double ulnow)
+int
+HttpsMethod::progress_callback(void *clientp, double dltotal, double /*dlnow*/,
+                             double /*ultotal*/, double /*ulnow*/)

 {
    HttpsMethod *me = (HttpsMethod *)clientp;
    if(dltotal > 0 && me->Res.Size == 0) {
 {
    HttpsMethod *me = (HttpsMethod *)clientp;
    if(dltotal > 0 && me->Res.Size == 0) {


@@ -95,7 +97,7 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
 }
 
 // HttpsServerState::HttpsServerState - Constructor                    /*{{{*/
 }
 
 // HttpsServerState::HttpsServerState - Constructor                    /*{{{*/

-HttpsServerState::HttpsServerState(URI Srv,HttpsMethod *Owner) : ServerState(Srv, NULL)
+HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * /*Owner*/) : ServerState(Srv, NULL)

 {
    TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut);
    Reset();
 {
    TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut);
    Reset();


@@ -106,6 +108,9 @@ void HttpsMethod::SetupProxy()                                      /*{{{*/
 {
    URI ServerName = Queue->Uri;
 
 {
    URI ServerName = Queue->Uri;
 

+   // Determine the proxy setting
+   AutoDetectProxy(ServerName);
+

    // Curl should never read proxy settings from the environment, as
    // we determine which proxy to use.  Do this for consistency among
    // methods and prevent an environment variable overriding a
    // Curl should never read proxy settings from the environment, as
    // we determine which proxy to use.  Do this for consistency among
    // methods and prevent an environment variable overriding a


@@ -188,7 +193,8 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // options
    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
    curl_easy_setopt(curl, CURLOPT_FILETIME, true);
    // options
    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
    curl_easy_setopt(curl, CURLOPT_FILETIME, true);

-   // only allow redirects to https
+   // only allow curl to handle https, not the other stuff it supports
+   curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);

    curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS);
 
    // SSL parameters are set by default to the common (non mirror-specific) value
    curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS);
 
    // SSL parameters are set by default to the common (non mirror-specific) value


@@ -308,7 +314,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
 
    // If we ask for uncompressed files servers might respond with content-
    curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
 
    // 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.


@@ -323,11 +329,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // if we have the file send an if-range query with a range header
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {
    // if we have the file send an if-range query with a range header
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {

-      char Buf[1000];
-      sprintf(Buf, "Range: bytes=%li-", (long) SBuf.st_size);
-      headers = curl_slist_append(headers, Buf);
-      sprintf(Buf, "If-Range: %s", TimeRFC1123(SBuf.st_mtime).c_str());
-      headers = curl_slist_append(headers, Buf);
+      std::string Buf;
+      strprintf(Buf, "Range: bytes=%lli-", (long long) SBuf.st_size);
+      headers = curl_slist_append(headers, Buf.c_str());
+      strprintf(Buf, "If-Range: %s", TimeRFC1123(SBuf.st_mtime).c_str());
+      headers = curl_slist_append(headers, Buf.c_str());

    }
    else if(Itm->LastModified > 0)
    {
    }
    else if(Itm->LastModified > 0)
    {


@@ -431,7 +437,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    delete File;
 
    return true;
    delete File;
 
    return true;

-};
+}

 
 int main()
 {
 
 int main()
 {


@@ -440,6 +446,8 @@ int main()
    HttpsMethod Mth;
    curl_global_init(CURL_GLOBAL_SSL) ;
 
    HttpsMethod Mth;
    curl_global_init(CURL_GLOBAL_SSL) ;
 

+   Mth.DropPrivsOrDie();
+

    return Mth.Run();
 }
 
    return Mth.Run();
 }