using PASV. Fix incorrect return value from ftp_ls_data.
Tidy Dolby fetching code a bit. Fix sensitivity of Dolby
download button (#769).
2015-12-02 Carl Hetherington <cth@carlh.net>
+ * Various fixes to certificate downloading.
+
* Version 2.5.13 released.
2015-12-02 Carl Hetherington <cth@carlh.net>
* @param load Function passed a (temporary) filesystem path of the unpacked file.
*/
optional<string>
-get_from_zip_url (string url, string file, function<void (boost::filesystem::path)> load)
+get_from_zip_url (string url, string file, bool pasv, function<void (boost::filesystem::path)> load)
{
/* Download the ZIP file to temp_zip */
CURL* curl = curl_easy_init ();
curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, get_from_zip_url_data);
curl_easy_setopt (curl, CURLOPT_WRITEDATA, f);
curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, 0);
+ curl_easy_setopt (curl, CURLOPT_FTP_USE_EPRT, 0);
+ if (!pasv) {
+ curl_easy_setopt (curl, CURLOPT_FTPPORT, "-");
+ }
+
/* Maximum time is 20s */
curl_easy_setopt (curl, CURLOPT_TIMEOUT, 20);
return optional<string> ();
}
-
static size_t
ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data)
{
for (size_t i = 0; i < (size * nmemb); ++i) {
*s += b[i];
}
- return nmemb;
+ return size * nmemb;
}
list<string>
curl_easy_setopt (curl, CURLOPT_WRITEDATA, &ls_raw);
curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ftp_ls_data);
curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, 0);
+ curl_easy_setopt (curl, CURLOPT_FTP_USE_EPRT, 0);
+ curl_easy_setopt (curl, CURLOPT_VERBOSE, 1);
if (!pasv) {
- curl_easy_setopt (curl, CURLOPT_FTPPORT, "");
+ curl_easy_setopt (curl, CURLOPT_FTPPORT, "-");
}
CURLcode const r = curl_easy_perform (curl);
if (r != CURLE_OK) {
#include <boost/function.hpp>
#include <boost/filesystem.hpp>
-boost::optional<std::string> get_from_zip_url (std::string url, std::string file, boost::function<void (boost::filesystem::path)> load);
+boost::optional<std::string> get_from_zip_url (std::string url, std::string file, bool pasv, boost::function<void (boost::filesystem::path)> load);
std::list<std::string> ftp_ls (std::string dir, bool pasv = true);
_cinema->Clear ();
}
+string
+DolbyCertificatePanel::url (string path) const
+{
+ return String::compose ("ftp://dolbyrootcertificates:houro61l@ftp.dolby.co.uk/SHA256/%1", path);
+}
+
list<string>
DolbyCertificatePanel::get_dir (string dir) const
{
- string url = String::compose ("ftp://dolbyrootcertificates:houro61l@ftp.dolby.co.uk/SHA256/%1", dir);
- return ftp_ls (url, false);
+ return ftp_ls (url (dir), false);
}
void
{
string const zip = string_client_data (_serial->GetClientObject (_serial->GetSelection ()));
- string const file = String::compose (
- "ftp://dolbyrootcertificates:houro61l@ftp.dolby.co.uk/SHA256/%1/%2/%3",
- wx_to_std (_country->GetStringSelection()),
- wx_to_std (_cinema->GetStringSelection()),
- zip
+ string const file = url (
+ String::compose ("%1/%2/%3",
+ wx_to_std (_country->GetStringSelection()),
+ wx_to_std (_cinema->GetStringSelection()),
+ zip
+ )
);
/* Work out the certificate file name inside the zip */
}
string const cert = b[0] + "_" + b[1] + ".pem.crt";
- optional<string> error = get_from_zip_url (file, cert, boost::bind (&DownloadCertificatePanel::load, this, _1));
+ optional<string> error = get_from_zip_url (file, cert, false, boost::bind (&DownloadCertificatePanel::load, this, _1));
if (error) {
message->SetLabel (std_to_wx (error.get ()));
} else {
bool
DolbyCertificatePanel::ready_to_download () const
{
- /* XXX */
- return false;
+ return _country->GetSelection() != -1 && _cinema->GetSelection() != -1 && _serial->GetSelection() != -1;
}
void
void finish_country_selected ();
void cinema_selected ();
void finish_cinema_selected ();
+ std::string url (std::string path) const;
std::list<std::string> get_dir (std::string) const;
wxChoice* _country;
serial.substr(0, 3), serial
),
String::compose ("dcp2000-%1.cert.sha256.pem", serial),
+ true,
boost::bind (&DownloadCertificatePanel::load, this, _1)
);
serial.substr(0, 3), serial
),
String::compose ("dcp2000-%1.cert.sha256.pem", serial),
+ true,
boost::bind (&DownloadCertificatePanel::load, this, _1)
);
}
serial.substr(0, 3), serial
),
String::compose ("imb-%1.cert.sha256.pem", serial),
+ true,
boost::bind (&DownloadCertificatePanel::load, this, _1)
);
}
serial.substr(0, 3), serial
),
String::compose ("ims-%1.cert.sha256.pem", serial),
+ true,
boost::bind (&DownloadCertificatePanel::load, this, _1)
);
}