struct curl_slist *headers=NULL;
char curl_errorstr[CURL_ERROR_SIZE];
long curl_responsecode;
+ URI Uri = Itm->Uri;
+ string remotehost = Uri.Host;
// TODO:
- // - http::Timeout
// - http::Pipeline-Depth
// - error checking/reporting
// - more debug options? (CURLOPT_DEBUGFUNCTION?)
curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
curl_easy_setopt(curl, CURLOPT_FILETIME, true);
- // FIXME: https: offer various options of verification
- bool peer_verify = _config->FindB("Acquire::https::Verify-Peer", false);
+ // 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 != "")
+ 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);
- // sslcert file
+ // ... and hostname against cert CN or subjectAltName
+ int default_verify = 2;
+ bool verify = _config->FindB("Acquire::https::Verify-Host",true);
+ knob = "Acquire::https::"+remotehost+"::Verify-Host";
+ verify = _config->FindB(knob.c_str(),verify);
+ if (!verify)
+ default_verify = 0;
+ curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify);
+
+ // 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 != "")
curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str());
-
- // CA-Dir
- string certdir = _config->Find("Acquire::https::CaPath","");
- if(certdir != "")
- curl_easy_setopt(curl, CURLOPT_CAPATH, certdir.c_str());
-
- // Server-verify
- int verify = _config->FindI("Acquire::https::Verify-Host",2);
- curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify);
+
+ // ... 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 != "")
+ 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);
// cache-control
if(_config->FindB("Acquire::http::No-Cache",false) == false)
}
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
- // set time values
- if(Itm->LastModified > 0)
- {
- curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
- curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified);
- }
-
// speed limit
int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024;
if (dlLimit > 0)
// set header
curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")");
+ // set timeout
+ int timeout = _config->FindI("Acquire::http::Timeout",120);
+ curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
+ curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
+
+ // set redirect options and default to 10 redirects
+ bool AllowRedirect = _config->FindI("Acquire::https::AllowRedirect", true);
+ curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect);
+ curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10);
+
// debug
if(_config->FindB("Debug::Acquire::https", false))
curl_easy_setopt(curl, CURLOPT_VERBOSE, true);
// error handling
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
- // In this case we send an if-range query with a range header
+ // 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];
(long)SBuf.st_size - 1,
TimeRFC1123(SBuf.st_mtime).c_str());
headers = curl_slist_append(headers, Buf);
+ }
+ else if(Itm->LastModified > 0)
+ {
+ curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
+ curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified);
}
// go for it - if the file exists, append on it
File = new FileFd(Itm->DestFile, FileFd::WriteAny);
- File->Seek(File->Size());
+ if (File->Size() > 0)
+ File->Seek(File->Size() - 1);
// keep apt updated
Res.Filename = Itm->DestFile;
// cleanup
if(success != 0)
{
- unlink(File->Name().c_str());
- _error->Error(curl_errorstr);
+ _error->Error("%s", curl_errorstr);
Fail();
return true;
}
File->Close();
- if (Res.Size == 0)
- Res.Size = File->Size();
-
// Timestamp
struct utimbuf UBuf;
if (curl_servdate != -1) {
struct stat Buf;
if (stat(File->Name().c_str(),&Buf) == 0)
{
- Res.Size = Buf.st_size;
Res.Filename = File->Name();
Res.LastModified = Buf.st_mtime;
Res.IMSHit = false;
if (curl_responsecode == 304)
{
+ unlink(File->Name().c_str());
Res.IMSHit = true;
Res.LastModified = Itm->LastModified;
+ Res.Size = 0;
+ URIDone(Res);
+ return true;
}
+ Res.Size = Buf.st_size;
}
// take hashes
projects / apt.git / blobdiff