Merge branch 'master' into debian

4 files changed, 91 insertions, 15 deletions

diff --git a/Makefile.am b/Makefile.am
index 7ebcb3a..271579f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,4 +4,9 @@ methodsdir = $(prefix)/lib/apt/methods
 methods_PROGRAMS = tor
 tor_SOURCES = tor.cc tor.h server.cc server.h apti18n.h
 
+install-data-hook:
+	cd $(DESTDIR)$(methodsdir) && \
+	  $(LN_S) tor tor+https && \
+	  $(LN_S) tor tor+http
+
 EXTRA_DIST = README.md
diff --git a/README.md b/README.md
index e06b277..117c297 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Easily install Debian packages via Tor.
 
 This package implements an APT "acquire method" that handles URLs starting
-with "tor://" in your sources.list.
+with "tor+http://" or "tor+https://" in your sources.list.
 
 ## Installation
 
@@ -30,8 +30,8 @@ Then, or if installing from a tarball:
 Edit your /etc/apt/sources.list like so, adjusting the suite/components
 appropriately for your system:
 
-    deb     tor://http.debian.net/debian unstable main
-    deb-src tor://http.debian.net/debian unstable main
+    deb     tor+http://http.debian.net/debian unstable main
+    deb-src tor+http://http.debian.net/debian unstable main
 
 Note the use of http.debian.net so that a mirror close to your exit node
 will be automatically chosen.
@@ -39,8 +39,8 @@ will be automatically chosen.
 Alternatively, if you have the Tor hidden service address of a Debian
 mirror, you can use that:
 
-    deb     tor://<long string>.onion/debian unstable main
-    deb-src tor://<long string>.onion/debian unstable main
+    deb     tor+http://<long string>.onion/debian unstable main
+    deb-src tor+http://<long string>.onion/debian unstable main
 
 ## Configuration
 
diff --git a/configure.ac b/configure.ac
index 21f82ab..4341f88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
-AC_INIT([apt-transport-tor], [0.1], [diocles@debian.org])
+AC_INIT([apt-transport-tor], [0.2.1], [diocles@debian.org])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CXX
+AC_PROG_LN_S
 AC_CONFIG_HEADERS([config.h])
 AC_CHECK_LIB([apt-pkg], [main])
 AC_CHECK_LIB([curl], [curl_version])
diff --git a/tor.cc b/tor.cc
index 1df0a07..f071149 100644
--- a/tor.cc
+++ b/tor.cc
@@ -151,8 +151,16 @@ bool TorMethod::Fetch(FetchItem *Itm)
    URI Uri = Itm->Uri;
    string remotehost = Uri.Host;
 
-   // Undo the "tor" at the start
-   Uri.Access = "http";
+   // Undo any "tor" or "tor+" at the start
+   string prefix="tor+";
+   if ("tor" == Uri.Access)
+   {
+        Uri.Access = "http";
+   }
+   else if (!Uri.Access.compare(0, prefix.size(), prefix))
+   {
+        Uri.Access = Uri.Access.substr(prefix.size());
+   }
 
    // TODO:
    //       - http::Pipeline-Depth
@@ -175,9 +183,72 @@ bool TorMethod::Fetch(FetchItem *Itm)
    // options
    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
    curl_easy_setopt(curl, CURLOPT_FILETIME, true);
-   // only allow curl to handle http, not the other stuff it supports
-   curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP);
-   curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP);
+   // Allow curl to handle just the protocols we want
+   curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+   curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+
+   // SSL parameters are set by default to the common (non mirror-specific) value
+   // if available (or a default one) and gets overload by mirror-specific ones.
+
+   // File containing the list of trusted CA.
+   string cainfo = _config->Find("Acquire::https::CaInfo","");
+   string knob = "Acquire::https::"+remotehost+"::CaInfo";
+   cainfo = _config->Find(knob.c_str(),cainfo.c_str());
+   if(cainfo.empty() == false)
+      curl_easy_setopt(curl, CURLOPT_CAINFO,cainfo.c_str());
+
+   // Check server certificate against previous CA list ...
+   bool peer_verify = _config->FindB("Acquire::https::Verify-Peer",true);
+   knob = "Acquire::https::" + remotehost + "::Verify-Peer";
+   peer_verify = _config->FindB(knob.c_str(), peer_verify);
+   curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, peer_verify);
+
+   // ... and hostname against cert CN or subjectAltName
+   bool verify = _config->FindB("Acquire::https::Verify-Host",true);
+   knob = "Acquire::https::"+remotehost+"::Verify-Host";
+   verify = _config->FindB(knob.c_str(),verify);
+   int const default_verify = (verify == true) ? 2 : 0;
+   curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, default_verify);
+
+   // Also enforce issuer of server certificate using its cert
+   string issuercert = _config->Find("Acquire::https::IssuerCert","");
+   knob = "Acquire::https::"+remotehost+"::IssuerCert";
+   issuercert = _config->Find(knob.c_str(),issuercert.c_str());
+   if(issuercert.empty() == false)
+      curl_easy_setopt(curl, CURLOPT_ISSUERCERT,issuercert.c_str());
+
+   // For client authentication, certificate file ...
+   string pem = _config->Find("Acquire::https::SslCert","");
+   knob = "Acquire::https::"+remotehost+"::SslCert";
+   pem = _config->Find(knob.c_str(),pem.c_str());
+   if(pem.empty() == false)
+      curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str());
+
+   // ... and associated key.
+   string key = _config->Find("Acquire::https::SslKey","");
+   knob = "Acquire::https::"+remotehost+"::SslKey";
+   key = _config->Find(knob.c_str(),key.c_str());
+   if(key.empty() == false)
+      curl_easy_setopt(curl, CURLOPT_SSLKEY, key.c_str());
+
+   // Allow forcing SSL version to SSLv3 or TLSv1 (SSLv2 is not
+   // supported by GnuTLS).
+   long final_version = CURL_SSLVERSION_DEFAULT;
+   string sslversion = _config->Find("Acquire::https::SslForceVersion","");
+   knob = "Acquire::https::"+remotehost+"::SslForceVersion";
+   sslversion = _config->Find(knob.c_str(),sslversion.c_str());
+   if(sslversion == "TLSv1")
+     final_version = CURL_SSLVERSION_TLSv1;
+   else if(sslversion == "SSLv3")
+     final_version = CURL_SSLVERSION_SSLv3;
+   curl_easy_setopt(curl, CURLOPT_SSLVERSION, final_version);
+
+   // CRL file
+   string crlfile = _config->Find("Acquire::https::CrlFile","");
+   knob = "Acquire::https::"+remotehost+"::CrlFile";
+   crlfile = _config->Find(knob.c_str(),crlfile.c_str());
+   if(crlfile.empty() == false)
+      curl_easy_setopt(curl, CURLOPT_CRLFILE, crlfile.c_str());
 
    // cache-control
    if(_config->FindB("Acquire::tor::No-Cache",
@@ -205,10 +276,9 @@ bool TorMethod::Fetch(FetchItem *Itm)
       curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit);
 
    // set header
+   // Hardcoded so that all apt-transport-tor users look the same.
    curl_easy_setopt(curl, CURLOPT_USERAGENT,
-	_config->Find("Acquire::tor::User-Agent",
-		_config->Find("Acquire::http::User-Agent",
-			"Debian APT-CURL/1.0 (" PACKAGE_VERSION ")").c_str()).c_str());
+			"Debian APT-CURL/1.0 (0.1)");
 
    // set timeout
    int const timeout = _config->FindI("Acquire::tor::Timeout",
@@ -363,7 +433,7 @@ int main()
    setlocale(LC_ALL, "");
 
    TorMethod Mth;
-   curl_global_init(CURL_GLOBAL_NOTHING) ;
+   curl_global_init(CURL_GLOBAL_SSL) ;
 
    return Mth.Run();
 }