X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Futil.cc;h=6f09e8aae88c9af02c9cd36ab469ed215070cbea;hb=a4b28be9b47ca541bda1153feca9a37bbb304be6;hp=767c149090db42514738eff71bd0ee58b5632000;hpb=93096af59d8235235c0caed929b6f72dcf09cdc9;p=libdcp.git diff --git a/src/util.cc b/src/util.cc index 767c1490..6f09e8aa 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1,20 +1,34 @@ /* Copyright (C) 2012-2014 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp 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, + libdcp 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 libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ /** @file src/util.cc @@ -24,13 +38,13 @@ #include "util.h" #include "exceptions.h" #include "types.h" -#include "argb_frame.h" -#include "certificates.h" -#include "gamma_lut.h" -#include "xyz_frame.h" -#include "KM_util.h" -#include "KM_fileio.h" -#include "AS_DCP.h" +#include "certificate.h" +#include "openjpeg_image.h" +#include "dcp_assert.h" +#include "compose.hpp" +#include +#include +#include #include #include #include @@ -39,23 +53,25 @@ #include #include #include -#include +#include #include -#include #include #include using std::string; using std::wstring; using std::cout; -using std::stringstream; using std::min; using std::max; using std::list; using std::setw; using std::setfill; +using std::ostream; using boost::shared_ptr; -using boost::lexical_cast; +using boost::shared_array; +using boost::optional; +using boost::function; +using boost::algorithm::trim; using namespace dcp; /** Create a UUID. @@ -74,19 +90,19 @@ dcp::make_uuid () /** Create a digest for a file. * @param filename File name. - * @param progress Pointer to a progress reporting function, or 0. The function will be called + * @param progress Optional progress reporting function. The function will be called * with a progress value between 0 and 1. * @return Digest. */ string -dcp::make_digest (boost::filesystem::path filename, boost::function* progress) +dcp::make_digest (boost::filesystem::path filename, function progress) { Kumu::FileReader reader; Kumu::Result_t r = reader.OpenRead (filename.string().c_str ()); if (ASDCP_FAILURE (r)) { boost::throw_exception (FileError ("could not open file to compute digest", filename, r)); } - + SHA_CTX sha; SHA1_Init (&sha); @@ -98,17 +114,17 @@ dcp::make_digest (boost::filesystem::path filename, boost::function -dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce) -{ - opj_dinfo_t* decoder = opj_create_decompress (CODEC_J2K); - opj_dparameters_t parameters; - opj_set_default_decoder_parameters (¶meters); - parameters.cp_reduce = reduce; - opj_setup_decoder (decoder, ¶meters); - opj_cio_t* cio = opj_cio_open ((opj_common_ptr) decoder, data, size); - opj_image_t* image = opj_decode (decoder, cio); - if (!image) { - opj_destroy_decompress (decoder); - opj_cio_close (cio); - boost::throw_exception (DCPReadError ("could not decode JPEG2000 codestream of " + lexical_cast (size) + " bytes.")); - } - - opj_destroy_decompress (decoder); - opj_cio_close (cio); - - image->x1 = rint (float(image->x1) / pow (2, reduce)); - image->y1 = rint (float(image->y1) / pow (2, reduce)); - return shared_ptr (new XYZFrame (image)); + DCP_ASSERT (false); } /** @param s A string. @@ -251,7 +234,7 @@ dcp::init () if (xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { throw MiscError ("unable to load default xmlsec-crypto library"); } -#endif +#endif if (xmlSecCryptoAppInit(0) < 0) { throw MiscError ("could not initialise crypto"); @@ -260,16 +243,8 @@ dcp::init () if (xmlSecCryptoInit() < 0) { throw MiscError ("could not initialise xmlsec-crypto"); } -} - -bool dcp::operator== (dcp::Size const & a, dcp::Size const & b) -{ - return (a.width == b.width && a.height == b.height); -} -bool dcp::operator!= (dcp::Size const & a, dcp::Size const & b) -{ - return !(a == b); + OpenSSL_add_all_algorithms(); } /** Decode a base64 string. The base64 decode routine in KM_util.cpp @@ -297,7 +272,7 @@ dcp::base64_decode (string const & in, unsigned char* out, int out_length) *p++ = in[i]; } } - + BIO* bmem = BIO_new_mem_buf (in_buffer, p - in_buffer); bmem = BIO_push (b64, bmem); int const N = BIO_read (bmem, out, out_length); @@ -306,82 +281,121 @@ dcp::base64_decode (string const & in, unsigned char* out, int out_length) return N; } -/** Convert a struct tm to a string of the form - * 2014-01-26T21:39:00+01:00 - * @param tm struct tm. - * @return Time as a string. +/** @param p Path to open. + * @param t mode flags, as for fopen(3). + * @return FILE pointer or 0 on error. + * + * Apparently there is no way to create an ofstream using a UTF-8 + * filename under Windows. We are hence reduced to using fopen + * with this wrapper. */ -string -dcp::tm_to_string (struct tm* tm) +FILE * +dcp::fopen_boost (boost::filesystem::path p, string t) { - char buffer[64]; - strftime (buffer, 64, "%Y-%m-%dT%H:%M:%S", tm); - - int offset = 0; - -#ifdef LIBDCP_POSIX - offset = tm->tm_gmtoff / 60; +#ifdef LIBDCP_WINDOWS + wstring w (t.begin(), t.end()); + /* c_str() here should give a UTF-16 string */ + return _wfopen (p.c_str(), w.c_str ()); #else - TIME_ZONE_INFORMATION tz; - GetTimeZoneInformation (&tz); - offset = tz.Bias; + return fopen (p.c_str(), t.c_str ()); #endif - - return string (buffer) + utc_offset_to_string (offset); } -/** @param b Offset from UTC to local time in minutes. - * @return string of the form e.g. -01:00. - */ -string -dcp::utc_offset_to_string (int b) +optional +dcp::relative_to_root (boost::filesystem::path root, boost::filesystem::path file) +{ + boost::filesystem::path::const_iterator i = root.begin (); + boost::filesystem::path::const_iterator j = file.begin (); + + while (i != root.end() && j != file.end() && *i == *j) { + ++i; + ++j; + } + + if (i != root.end ()) { + return optional (); + } + + boost::filesystem::path rel; + while (j != file.end ()) { + rel /= *j++; + } + + return rel; +} + +bool +dcp::ids_equal (string a, string b) { - bool const negative = (b < 0); - b = negative ? -b : b; + transform (a.begin(), a.end(), a.begin(), ::tolower); + transform (b.begin(), b.end(), b.begin(), ::tolower); + trim (a); + trim (b); + return a == b; +} - int const hours = b / 60; - int const minutes = b % 60; +string +dcp::file_to_string (boost::filesystem::path p, uintmax_t max_length) +{ + uintmax_t len = boost::filesystem::file_size (p); + if (len > max_length) { + throw MiscError (String::compose ("Unexpectedly long file (%1)", p.string())); + } - stringstream o; - if (negative) { - o << "-"; - } else { - o << "+"; + FILE* f = fopen_boost (p, "r"); + if (!f) { + throw FileError ("could not open file", p, errno); } - o << setw(2) << setfill('0') << hours << ":" << setw(2) << setfill('0') << minutes; - return o.str (); + char* c = new char[len]; + /* This may read less than `len' if we are on Windows and we have CRLF in the file */ + int const N = fread (c, 1, len, f); + fclose (f); + + string s (c, N); + delete[] c; + + return s; } -/** Convert a boost::posix_time::ptime to a string of the form - * 2014-01-26T21:39:00+01:00. - * @param t boost::posix_time::ptime. - * @return Time as a string. +/** @param key RSA private key in PEM format (optionally with -----BEGIN... / -----END...) + * @return SHA1 fingerprint of key */ string -dcp::ptime_to_string (boost::posix_time::ptime t) +dcp::private_key_fingerprint (string key) { - struct tm t_tm = boost::posix_time::to_tm (t); - return tm_to_string (&t_tm); + boost::replace_all (key, "-----BEGIN RSA PRIVATE KEY-----\n", ""); + boost::replace_all (key, "\n-----END RSA PRIVATE KEY-----\n", ""); + + unsigned char buffer[4096]; + int const N = base64_decode (key, buffer, sizeof (buffer)); + + SHA_CTX sha; + SHA1_Init (&sha); + SHA1_Update (&sha, buffer, N); + uint8_t digest[20]; + SHA1_Final (digest, &sha); + + char digest_base64[64]; + return Kumu::base64encode (digest, 20, digest_base64, 64); } +xmlpp::Node * +dcp::find_child (xmlpp::Node const * node, string name) +{ + xmlpp::Node::NodeList c = node->get_children (); + xmlpp::Node::NodeList::iterator i = c.begin(); + while (i != c.end() && (*i)->get_name() != name) { + ++i; + } + + DCP_ASSERT (i != c.end ()); + return *i; +} -/** @param p Path to open. - * @param t mode flags, as for fopen(3). - * @return FILE pointer or 0 on error. - * - * Apparently there is no way to create an ofstream using a UTF-8 - * filename under Windows. We are hence reduced to using fopen - * with this wrapper. - */ -FILE * -dcp::fopen_boost (boost::filesystem::path p, string t) +string +dcp::remove_urn_uuid (string raw) { -#ifdef LIBDCP_WINDOWS - wstring w (t.begin(), t.end()); - /* c_str() here should give a UTF-16 string */ - return _wfopen (p.c_str(), w.c_str ()); -#else - return fopen (p.c_str(), t.c_str ()); -#endif + DCP_ASSERT (raw.substr(0, 9) == "urn:uuid:"); + return raw.substr (9); }