X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Finternet.cc;h=ad313bd3f71fb7623dcef484bc8f6d3c70b3c64f;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hp=99ae5c2142ed255d3731e1a667591e811bc63bb9;hpb=6bc83f72f12c8513a1e9e9b6fd880697a73f968f;p=dcpomatic.git diff --git a/src/lib/internet.cc b/src/lib/internet.cc index 99ae5c214..ad313bd3f 100644 --- a/src/lib/internet.cc +++ b/src/lib/internet.cc @@ -1,149 +1,154 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include +#include "scoped_temporary.h" +#include "compose.hpp" +#include "exceptions.h" +#include "cross.h" +#include +#include #include #include #include -#include -#include -#include "util.h" +#include +#include #include "i18n.h" using std::string; -using std::stringstream; 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) +get_from_url_data (void* buffer, size_t size, size_t nmemb, void* stream) { FILE* f = reinterpret_cast (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 -get_from_zip_url (string url, string file, function load) +get_from_url (string url, bool pasv, ScopedTemporary& temp) { - /* 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_URL, url.c_str()); + + FILE* 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 (!pasv) { + curl_easy_setopt (curl, CURLOPT_FTPPORT, "-"); + } + + /* Maximum time is 20s */ + curl_easy_setopt (curl, CURLOPT_TIMEOUT, 20); 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, cr); + return String::compose (_("Download failed (%1 error %2)"), url, (int) cr); + } + + return optional(); +} + +optional +get_from_url (string url, bool pasv, function load) +{ + ScopedTemporary temp; + optional e = get_from_url (url, pasv, temp); + if (e) { + return e; + } + load (temp.file()); + return optional(); +} + +/** @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 +get_from_zip_url (string url, string file, bool pasv, function load) +{ + /* Download the ZIP file to temp_zip */ + ScopedTemporary temp_zip; + optional e = get_from_url (url, pasv, temp_zip); + if (e) { + return e; } /* Open the ZIP file and read `file' out of it */ - - struct zip* zip = zip_open (temp_zip.c_str(), 0, 0); - if (!zip) { + +#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. + */ + + FILE* zip_file = fopen_boost (temp_zip.file (), "rb"); + if (!zip_file) { return optional (_("Could not open downloaded ZIP file")); } - - struct zip_file* zip_file = zip_fopen (zip, file.c_str(), 0); - if (!zip_file) { + + zip_source_t* zip_source = zip_source_filep_create (zip_file, 0, -1, 0); + if (!zip_source) { + return optional (_("Could not open downloaded ZIP file")); + } + + zip_error_t error; + zip_error_init (&error); + zip_t* zip = zip_open_from_source (zip_source, ZIP_RDONLY, &error); + if (!zip) { + 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 (_("Unexpected ZIP file contents")); } - + ScopedTemporary temp_cert; - f = temp_cert.open ("wb"); + FILE* f = temp_cert.open ("wb"); char buffer[4096]; while (true) { - int const N = zip_fread (zip_file, buffer, sizeof (buffer)); + int const N = zip_fread (file_in_zip, buffer, sizeof (buffer)); fwrite (buffer, 1, N, f); if (N < int (sizeof (buffer))) { break; } } + zip_fclose (file_in_zip); + zip_close (zip); temp_cert.close (); - + load (temp_cert.file ()); return optional (); } - - -static size_t -ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data) -{ - string* s = reinterpret_cast (data); - uint8_t* b = reinterpret_cast (buffer); - for (size_t i = 0; i < (size * nmemb); ++i) { - *s += b[i]; - } - return nmemb; -} - -list -ftp_ls (string url) -{ - CURL* curl = curl_easy_init (); - if (!curl) { - return list (); - } - - if (url.substr (url.length() - 1, 1) != "/") { - url += "/"; - } - curl_easy_setopt (curl, CURLOPT_URL, url.c_str ()); - - 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); - CURLcode const r = curl_easy_perform (curl); - if (r != CURLE_OK) { - return list (); - } - - stringstream s (ls_raw); - string line; - list ls; - while (s.good ()) { - getline (s, line); - if (line.length() > 55) { - string const file = line.substr (55); - if (file != "." && file != "..") { - ls.push_back (file); - } - } - } - - curl_easy_cleanup (curl); - - return ls; -}