X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Finternet.cc;h=ca72399f3f547076bafcceb707dfa7f7e44d70e2;hp=1e8c5d8e9e19dcdb2c4af155ca29ecdfec3c781c;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=c9548bb8272ffe5804085f0a7a9f19305f0d513b

diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index 1e8c5d8e9..ca72399f3 100644
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,14 @@
 
 */
 
+
 #include "scoped_temporary.h"
 #include "compose.hpp"
 #include "exceptions.h"
 #include "cross.h"
+#include "util.h"
 #include <curl/curl.h>
 #include <zip.h>
-#include <boost/function.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
@@ -32,36 +33,79 @@
 
 #include "i18n.h"
 
-using std::string;
+
+using std::function;
 using std::list;
+using std::string;
 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)
+ls_url_data (void* buffer, size_t size, size_t nmemb, void* output)
 {
-	FILE* f = reinterpret_cast<FILE*> (stream);
+	string* s = reinterpret_cast<string*>(output);
+	char* c = reinterpret_cast<char*>(buffer);
+	for (size_t i = 0; i < (size * nmemb); ++i) {
+		*s += c[i];
+	}
+	return nmemb;
+}
+
+
+list<string>
+ls_url (string url)
+{
+	auto curl = curl_easy_init ();
+	curl_easy_setopt (curl, CURLOPT_URL, url.c_str());
+	curl_easy_setopt (curl, CURLOPT_DIRLISTONLY, 1);
+
+	string ls;
+	curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ls_url_data);
+	curl_easy_setopt (curl, CURLOPT_WRITEDATA, &ls);
+	auto const cr = curl_easy_perform (curl);
+
+	if (cr != CURLE_OK) {
+		return list<string>();
+	}
+
+	list<string> result;
+	result.push_back("");
+	for (size_t i = 0; i < ls.size(); ++i) {
+		if (ls[i] == '\n') {
+			result.push_back("");
+		} else {
+			result.back() += ls[i];
+		}
+	}
+
+	result.pop_back ();
+	return result;
+}
+
+
+static size_t
+get_from_url_data (void* buffer, size_t size, size_t nmemb, void* stream)
+{
+	auto f = reinterpret_cast<FILE*> (stream);
 	return fwrite (buffer, size, nmemb, f);
 }
 
-/** @param url URL of ZIP file.
- *  @param file Filename within ZIP file.
- *  @param load Function passed a (temporary) filesystem path of the unpacked file.
- */
+
 optional<string>
-get_from_zip_url (string url, string file, bool pasv, function<void (boost::filesystem::path)> load)
+get_from_url (string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp)
 {
-	/* Download the ZIP file to temp_zip */
-	CURL* curl = curl_easy_init ();
-	curl_easy_setopt (curl, CURLOPT_URL, url.c_str ());
+	auto 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);
+	auto f = temp.open ("wb");
+	curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, get_from_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 (skip_pasv_ip) {
+		curl_easy_setopt (curl, CURLOPT_FTP_SKIP_PASV_IP, 1);
+	}
 	if (!pasv) {
 		curl_easy_setopt (curl, CURLOPT_FTPPORT, "-");
 	}
@@ -71,40 +115,82 @@ get_from_zip_url (string url, string file, bool pasv, function<void (boost::file
 
 	CURLcode const cr = curl_easy_perform (curl);
 
-	temp_zip.close ();
+	temp.close ();
 	curl_easy_cleanup (curl);
 	if (cr != CURLE_OK) {
-		return String::compose (_("Download failed (%1/%2 error %3)"), url, file, (int) cr);
+		return String::compose (_("Download failed (%1 error %2)"), url, (int) cr);
+	}
+
+	return optional<string>();
+}
+
+
+optional<string>
+get_from_url (string url, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path)> load)
+{
+	ScopedTemporary temp;
+	auto e = get_from_url (url, pasv, skip_pasv_ip, temp);
+	if (e) {
+		return e;
+	}
+	return load (temp.file());
+}
+
+
+/** @param url URL of ZIP file.
+ *  @param file Filename within ZIP file.
+ *  @param load Function passed a (temporary) filesystem path of the unpacked file.
+ */
+optional<string>
+get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path)> load)
+{
+	/* Download the ZIP file to temp_zip */
+	ScopedTemporary temp_zip;
+	auto e = get_from_url (url, pasv, skip_pasv_ip, temp_zip);
+	if (e) {
+		return e;
 	}
 
 	/* Open the ZIP file and read `file' out of it */
 
-	FILE* zip_file = fopen_boost (temp_zip.file (), "rb");
+#ifdef DCPOMATIC_HAVE_ZIP_SOURCE_T
+	/* This is the way to do it with newer versions of libzip, and is required on Windows.
+	   The zip_source_t API is missing in the libzip versions shipped with Ubuntu 14.04,
+	   Centos 6, Centos 7, Debian 7 and Debian 8.
+	*/
+
+	auto zip_file = fopen_boost (temp_zip.file (), "rb");
 	if (!zip_file) {
 		return optional<string> (_("Could not open downloaded ZIP file"));
 	}
 
-	zip_source_t* zip_source = zip_source_filep_create (zip_file, 0, -1, 0);
+	auto zip_source = zip_source_filep_create (zip_file, 0, -1, 0);
 	if (!zip_source) {
 		return optional<string> (_("Could not open downloaded ZIP file"));
 	}
 
-	zip_t* zip = zip_open_from_source (zip_source, 0, 0);
+	zip_error_t error;
+	zip_error_init (&error);
+	auto zip = zip_open_from_source (zip_source, ZIP_RDONLY, &error);
 	if (!zip) {
-		return optional<string> (_("Could not open downloaded ZIP file"));
+		return String::compose (_("Could not open downloaded ZIP file (%1:%2: %3)"), error.zip_err, error.sys_err, error.str ? error.str : "");
 	}
 
+#else
+	struct zip* zip = zip_open (temp_zip.c_str(), 0, 0);
+#endif
+
 	struct zip_file* file_in_zip = zip_fopen (zip, file.c_str(), 0);
 	if (!file_in_zip) {
 		return optional<string> (_("Unexpected ZIP file contents"));
 	}
 
 	ScopedTemporary temp_cert;
-	f = temp_cert.open ("wb");
+	auto f = temp_cert.open ("wb");
 	char buffer[4096];
 	while (true) {
 		int const N = zip_fread (file_in_zip, buffer, sizeof (buffer));
-		fwrite (buffer, 1, N, f);
+		checked_fwrite (buffer, N, f, temp_cert.file());
 		if (N < int (sizeof (buffer))) {
 			break;
 		}
@@ -113,71 +199,5 @@ get_from_zip_url (string url, string file, bool pasv, function<void (boost::file
 	zip_close (zip);
 	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)
-{
-	string* s = reinterpret_cast<string *> (data);
-	uint8_t* b = reinterpret_cast<uint8_t *> (buffer);
-	for (size_t i = 0; i < (size * nmemb); ++i) {
-		*s += b[i];
-	}
-	return size * nmemb;
-}
-
-list<string>
-ftp_ls (string url, bool pasv)
-{
-	CURL* curl = curl_easy_init ();
-	if (!curl) {
-		throw NetworkError ("could not set up curl");
-	}
-
-	if (url.substr (url.length() - 1, 1) != "/") {
-		url += "/";
-	}
-	curl_easy_setopt (curl, CURLOPT_URL, url.c_str ());
-	/* 20s timeout */
-	curl_easy_setopt (curl, CURLOPT_TIMEOUT, 20);
-
-	string ls_raw;
-	struct curl_slist* commands = 0;
-	commands = curl_slist_append (commands, "NLST");
-	curl_easy_setopt (curl, CURLOPT_POSTQUOTE, commands);
-	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) {
-		curl_easy_cleanup (curl);
-		throw NetworkError (curl_easy_strerror (r));
-	}
-
-	list<string> ls;
-	string line;
-	for (size_t i = 0; i < ls_raw.length(); ++i) {
-		line += ls_raw[i];
-		if (ls_raw[i] == '\n') {
-			trim (line);
-			if (line.length() > 55) {
-				string const file = line.substr (55);
-				if (file != "." && file != "..") {
-					ls.push_back (file);
-				}
-			}
-			line = "";
-		}
-	}
-
-	curl_easy_cleanup (curl);
-
-	return ls;
+	return load (temp_cert.file());
 }