/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <string>
+#include "scoped_temporary.h"
+#include "compose.hpp"
+#include "safe_stringstream.h"
+#include "exceptions.h"
+#include <curl/curl.h>
+#include <zip.h>
#include <boost/function.hpp>
#include <boost/optional.hpp>
#include <boost/filesystem.hpp>
-#include <curl/curl.h>
-#include <zip.h>
-#include "util.h"
-#include "safe_stringstream.h"
+#include <boost/algorithm/string.hpp>
+#include <string>
#include "i18n.h"
using std::list;
using boost::optional;
using boost::function;
+using boost::algorithm::trim;
static size_t
get_from_zip_url_data (void* buffer, size_t size, size_t nmemb, void* stream)
* @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_URL, url.c_str ());
-
+
ScopedTemporary temp_zip;
FILE* f = temp_zip.open ("wb");
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);
}
/* Open the ZIP file and read `file' out of it */
-
+
struct zip* zip = zip_open (temp_zip.c_str(), 0, 0);
if (!zip) {
return optional<string> (_("Could not open downloaded ZIP file"));
}
-
+
struct zip_file* zip_file = zip_fopen (zip, file.c_str(), 0);
if (!zip_file) {
return optional<string> (_("Unexpected ZIP file contents"));
}
-
+
ScopedTemporary temp_cert;
f = temp_cert.open ("wb");
char buffer[4096];
}
}
temp_cert.close ();
-
+
load (temp_cert.file ());
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>
-ftp_ls (string url)
+ftp_ls (string url, bool pasv)
{
CURL* curl = curl_easy_init ();
if (!curl) {
- return list<string> ();
+ throw NetworkError ("could not set up curl");
}
if (url.substr (url.length() - 1, 1) != "/") {
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, "-");
+ }
CURLcode const r = curl_easy_perform (curl);
if (r != CURLE_OK) {
- return list<string> ();
+ curl_easy_cleanup (curl);
+ throw NetworkError (curl_easy_strerror (r));
}
SafeStringStream s (ls_raw);
list<string> ls;
while (s.good ()) {
- string const line = s.getline ();
+ string line = s.getline ();
+ trim (line);
if (line.length() > 55) {
string const file = line.substr (55);
if (file != "." && file != "..") {