Various fixes for non-Latin filenames.

[libdcp.git] / src / certificates.cc

diff --git a/src/certificates.cc b/src/certificates.cc
index 372f8571a2c6a277062b8326c86b60d2f277bd65..aa7972a55411d1ec972040347d76196783fb1a82 100644 (file)
--- a/src/certificates.cc
+++ b/src/certificates.cc
@@ -23,10 +23,13 @@
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
 #include <openssl/asn1.h>
+#include <openssl/err.h>
 #include <libxml++/nodes/element.h>
 #include "KM_util.h"
 #include "certificates.h"
+#include "compose.hpp"
 #include "exceptions.h"
+#include "util.h"
 
 using std::list;
 using std::string;
@@ -38,14 +41,16 @@ using namespace libdcp;
 /** @param c X509 certificate, which this object will take ownership of */
 Certificate::Certificate (X509* c)
        : _certificate (c)
+       , _public_key (0)
 {
        
 }
 
-Certificate::Certificate (string const & filename)
+Certificate::Certificate (boost::filesystem::path filename)
        : _certificate (0)
+       , _public_key (0)
 {
-       FILE* f = fopen (filename.c_str(), "r");
+       FILE* f = fopen_boost (filename, "r");
        if (!f) {
                throw FileError ("could not open file", filename);
        }
@@ -55,13 +60,61 @@ Certificate::Certificate (string const & filename)
        }
 }
 
+Certificate::Certificate (string cert)
+       : _certificate (0)
+       , _public_key (0)
+{
+       read_string (cert);
+}
+
+Certificate::Certificate (Certificate const & other)
+       : _certificate (0)
+       , _public_key (0)
+{
+       read_string (other.certificate (true));
+}
+
+void
+Certificate::read_string (string cert)
+{
+       BIO* bio = BIO_new_mem_buf (const_cast<char *> (cert.c_str ()), -1);
+       if (!bio) {
+               throw MiscError ("could not create memory BIO");
+       }
+
+       _certificate = PEM_read_bio_X509 (bio, 0, 0, 0);
+       if (!_certificate) {
+               throw MiscError ("could not read X509 certificate from memory BIO");
+       }
+
+       BIO_free (bio);
+}
+
 Certificate::~Certificate ()
 {
        X509_free (_certificate);
+       RSA_free (_public_key);
+}
+
+Certificate &
+Certificate::operator= (Certificate const & other)
+{
+       if (this == &other) {
+               return *this;
+       }
+
+       X509_free (_certificate);
+       _certificate = 0;
+       RSA_free (_public_key);
+       _public_key = 0;
+       
+       read_string (other.certificate ());
+
+       return *this;
 }
 
 string
-Certificate::certificate () const
+Certificate::certificate (bool with_begin_end) const
 {
        assert (_certificate);
        
@@ -81,8 +134,11 @@ Certificate::certificate () const
 
        BIO_free (bio);
 
-       boost::replace_all (s, "-----BEGIN CERTIFICATE-----\n", "");
-       boost::replace_all (s, "\n-----END CERTIFICATE-----\n", "");
+       if (!with_begin_end) {
+               boost::replace_all (s, "-----BEGIN CERTIFICATE-----\n", "");
+               boost::replace_all (s, "\n-----END CERTIFICATE-----\n", "");
+       }
+       
        return s;
 }
 
@@ -90,30 +146,44 @@ string
 Certificate::issuer () const
 {
        assert (_certificate);
-       
-       X509_NAME* n = X509_get_issuer_name (_certificate);
-       assert (n);
+       return name_for_xml (X509_get_issuer_name (_certificate));
+}
 
-       char b[256];
-       X509_NAME_oneline (n, b, 256);
-       return b;
+string
+Certificate::asn_to_utf8 (ASN1_STRING* s)
+{
+       unsigned char* buf = 0;
+       ASN1_STRING_to_UTF8 (&buf, s);
+       string const u (reinterpret_cast<char *> (buf));
+       OPENSSL_free (buf);
+       return u;
 }
 
 string
-Certificate::name_for_xml (string const & n)
+Certificate::get_name_part (X509_NAME* n, int nid)
 {
-       stringstream x;
+       int p = -1;
+       p = X509_NAME_get_index_by_NID (n, nid, p);
+       assert (p != -1);
+       return asn_to_utf8 (X509_NAME_ENTRY_get_data (X509_NAME_get_entry (n, p)));
+}
        
-       vector<string> p;
-       boost::split (p, n, boost::is_any_of ("/"));
-       for (vector<string>::const_reverse_iterator i = p.rbegin(); i != p.rend(); ++i) {
-               x << *i << ",";
-       }
 
-       string s = x.str();
-       boost::replace_all (s, "+", "\\+");
+string
+Certificate::name_for_xml (X509_NAME * n)
+{
+       assert (n);
 
-       return s.substr(0, s.length() - 2);
+       string s = String::compose (
+               "dnQualifier=%1,CN=%2,OU=%3,O=%4",
+               get_name_part (n, NID_dnQualifier),
+               get_name_part (n, NID_commonName),
+               get_name_part (n, NID_organizationalUnitName),
+               get_name_part (n, NID_organizationName)
+               );
+       
+       boost::replace_all (s, "+", "\\+");
+       return s;
 }
 
 string
@@ -121,12 +191,15 @@ Certificate::subject () const
 {
        assert (_certificate);
 
-       X509_NAME* n = X509_get_subject_name (_certificate);
-       assert (n);
+       return name_for_xml (X509_get_subject_name (_certificate));
+}
 
-       char b[256];
-       X509_NAME_oneline (n, b, 256);
-       return b;
+string
+Certificate::common_name () const
+{
+       assert (_certificate);
+
+       return get_name_part (X509_get_subject_name (_certificate), NID_commonName);
 }
 
 string
@@ -170,6 +243,28 @@ Certificate::thumbprint () const
        return Kumu::base64encode (digest, 20, digest_base64, 64);
 }
 
+RSA *
+Certificate::public_key () const
+{
+       assert (_certificate);
+
+       if (_public_key) {
+               return _public_key;
+       }
+
+       EVP_PKEY* key = X509_get_pubkey (_certificate);
+       if (!key) {
+               throw MiscError ("could not get public key from certificate");
+       }
+
+       _public_key = EVP_PKEY_get1_RSA (key);
+       if (!_public_key) {
+               throw MiscError (String::compose ("could not get RSA public key (%1)", ERR_error_string (ERR_get_error(), 0)));
+       }
+
+       return _public_key;
+}
+
 shared_ptr<Certificate>
 CertificateChain::root () const
 {