X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=da856d3589af6246df58ee6f96c1eb70517c3548;hp=35bad59586bb4b0f8a9e3584b4e1aaa8d0d74e8f;hb=0a1d944d74308ccb940194bcb627652c72128650;hpb=5d00c2f6e25c15a7699167f4f135257281c4b218 diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 35bad5958..da856d358 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Carl Hetherington + Copyright (C) 2015-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -18,7 +18,7 @@ */ -#include "wx/config_dialog.h" +#include "wx/full_config_dialog.h" #include "wx/about_dialog.h" #include "wx/report_problem_dialog.h" #include "wx/file_picker_ctrl.h" @@ -31,22 +31,29 @@ #include "wx/file_dialog_wrapper.h" #include "wx/new_dkdm_folder_dialog.h" #include "wx/editable_list.h" +#include "wx/static_text.h" +#include "wx/dcpomatic_button.h" +#include "wx/nag_dialog.h" #include "lib/config.h" #include "lib/util.h" #include "lib/screen.h" #include "lib/job_manager.h" -#include "lib/screen_kdm.h" +#include "lib/kdm_with_metadata.h" #include "lib/exceptions.h" -#include "lib/cinema_kdms.h" #include "lib/send_kdm_email_job.h" #include "lib/compose.hpp" #include "lib/cinema.h" #include "lib/dkdm_wrapper.h" +#include "lib/cross.h" +#ifdef DCPOMATIC_VARIANT_SWAROOP +#include "lib/decrypted_ecinema_kdm.h" +#endif #include #include #include #include #include +#include #include #ifdef __WXOSX__ #include @@ -69,6 +76,7 @@ using boost::bind; using boost::optional; using boost::ref; using boost::dynamic_pointer_cast; +using namespace dcpomatic; enum { ID_help_report_a_problem = 1, @@ -77,7 +85,7 @@ enum { class DOMFrame : public wxFrame { public: - DOMFrame (wxString const & title) + explicit DOMFrame (wxString const & title) : wxFrame (0, -1, title) , _config_dialog (0) , _job_view (0) @@ -127,20 +135,20 @@ public: wxFont subheading_font (*wxNORMAL_FONT); subheading_font.SetWeight (wxFONTWEIGHT_BOLD); - wxStaticText* h = new wxStaticText (overall_panel, wxID_ANY, _("Screens")); + wxStaticText* h = new StaticText (overall_panel, _("Screens")); h->SetFont (subheading_font); left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); _screens = new ScreensPanel (overall_panel); left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); /// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix - h = new wxStaticText (overall_panel, wxID_ANY, S_("KDM|Timing")); + h = new StaticText (overall_panel, S_("KDM|Timing")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); _timing = new KDMTimingPanel (overall_panel); right->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); - h = new wxStaticText (overall_panel, wxID_ANY, _("DKDM")); + h = new StaticText (overall_panel, _("DKDM")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); wxBoxSizer* dkdm_sizer = new wxBoxSizer (wxHORIZONTAL); @@ -149,25 +157,27 @@ public: ); dkdm_sizer->Add (_dkdm, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); wxBoxSizer* dkdm_buttons = new wxBoxSizer(wxVERTICAL); - _add_dkdm = new wxButton (overall_panel, wxID_ANY, _("Add...")); + _add_dkdm = new Button (overall_panel, _("Add...")); dkdm_buttons->Add (_add_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); - _add_dkdm_folder = new wxButton (overall_panel, wxID_ANY, _("Add folder...")); + _add_dkdm_folder = new Button (overall_panel, _("Add folder...")); dkdm_buttons->Add (_add_dkdm_folder, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); - _remove_dkdm = new wxButton (overall_panel, wxID_ANY, _("Remove")); + _remove_dkdm = new Button (overall_panel, _("Remove")); dkdm_buttons->Add (_remove_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); + _export_dkdm = new Button (overall_panel, _("Export...")); + dkdm_buttons->Add (_export_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); dkdm_sizer->Add (dkdm_buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); right->Add (dkdm_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); add_dkdm_view (Config::instance()->dkdms()); - h = new wxStaticText (overall_panel, wxID_ANY, _("Output")); + h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); /* XXX: hard-coded non-interop here */ _output = new KDMOutputPanel (overall_panel, false); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); - _create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs")); + _create = new Button (overall_panel, _("Create KDMs")); right->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP); main_sizer->Add (horizontal, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER); @@ -184,6 +194,7 @@ public: _add_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::add_dkdm_clicked, this)); _add_dkdm_folder->Bind (wxEVT_BUTTON, bind (&DOMFrame::add_dkdm_folder_clicked, this)); _remove_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::remove_dkdm_clicked, this)); + _export_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::export_dkdm_clicked, this)); setup_sensitivity (); } @@ -198,7 +209,7 @@ private: void edit_preferences () { if (!_config_dialog) { - _config_dialog = create_config_dialog (); + _config_dialog = create_full_config_dialog (); } _config_dialog->Show (this); } @@ -290,47 +301,115 @@ private: if (!dkdm_base) { return; } - shared_ptr dkdm = boost::dynamic_pointer_cast (dkdm_base); - if (!dkdm) { - return; - } - - /* Decrypt the DKDM */ - dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); - /* This is the signer for our new KDMs */ - shared_ptr signer = Config::instance()->signer_chain (); - if (!signer->valid ()) { - throw InvalidSignerError (); + list kdms; + string title; + +#ifdef DCPOMATIC_VARIANT_SWAROOP + shared_ptr ecinema_dkdm = boost::dynamic_pointer_cast (dkdm_base); + if (ecinema_dkdm) { + DecryptedECinemaKDM decrypted (ecinema_dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); + title = decrypted.name (); + + BOOST_FOREACH (shared_ptr i, _screens->screens()) { + + if (!i->recipient) { + continue; + } + + dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()); + dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()); + + DecryptedECinemaKDM kdm ( + decrypted.id(), + decrypted.name(), + decrypted.key(), + begin, + end + ); + + dcp::NameFormat::Map name_values; + name_values['c'] = i->cinema->name; + name_values['s'] = i->name; + name_values['f'] = title; + name_values['b'] = begin.date() + " " + begin.time_of_day(true, false); + name_values['e'] = end.date() + " " + end.time_of_day(true, false); + name_values['i'] = kdm.id(); + + /* Encrypt */ + kdms.push_back ( + KDMWithMetadataPtr( + new ECinemaKDMWithMetadata(name_values, i->cinema, kdm.encrypt(i->recipient.get())) + ) + ); + } } +#endif - list screen_kdms; - BOOST_FOREACH (shared_ptr i, _screens->screens()) { + shared_ptr dkdm = boost::dynamic_pointer_cast (dkdm_base); + if (dkdm) { - if (!i->recipient) { - continue; - } + /* Decrypt the DKDM */ + dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); + title = decrypted.content_title_text (); - /* Make an empty KDM */ - dcp::DecryptedKDM kdm ( - dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), - dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), - decrypted.annotation_text().get_value_or (""), - decrypted.content_title_text(), - dcp::LocalTime().as_string() - ); + /* This is the signer for our new KDMs */ + shared_ptr signer = Config::instance()->signer_chain (); + if (!signer->valid ()) { + throw InvalidSignerError (); + } - /* Add keys from the DKDM */ - BOOST_FOREACH (dcp::DecryptedKDMKey const & j, decrypted.keys()) { - kdm.add_key (j); + BOOST_FOREACH (shared_ptr i, _screens->screens()) { + + if (!i->recipient) { + continue; + } + + dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()); + dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()); + + /* Make an empty KDM */ + dcp::DecryptedKDM kdm ( + begin, + end, + decrypted.annotation_text().get_value_or (""), + decrypted.content_title_text(), + dcp::LocalTime().as_string() + ); + + /* Add keys from the DKDM */ + BOOST_FOREACH (dcp::DecryptedKDMKey const & j, decrypted.keys()) { + kdm.add_key (j); + } + + dcp::EncryptedKDM const encrypted = kdm.encrypt( + signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(), + !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional() : 0 + ); + + dcp::NameFormat::Map name_values; + name_values['c'] = i->cinema->name; + name_values['s'] = i->name; + name_values['f'] = title; + name_values['b'] = begin.date() + " " + begin.time_of_day(true, false); + name_values['e'] = end.date() + " " + end.time_of_day(true, false); + name_values['i'] = encrypted.cpl_id (); + + /* Encrypt */ + kdms.push_back ( + KDMWithMetadataPtr( + new DCPKDMWithMetadata(name_values, i->cinema, encrypted) + ) + ); } + } - /* Encrypt */ - screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation()))); + if (kdms.empty()) { + return; } pair, int> result = _output->make ( - screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1), shared_ptr () + kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1) ); if (result.first) { @@ -354,7 +433,7 @@ private: } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { - error_dialog (this, e.what ()); + error_dialog (this, std_to_wx(e.what())); } catch (...) { error_dialog (this, _("An unknown exception occurred.")); } @@ -366,7 +445,11 @@ private: _output->setup_sensitivity (); wxArrayTreeItemIds sel; _dkdm->GetSelections (sel); + shared_ptr group = dynamic_pointer_cast(selected_dkdm()); + shared_ptr dkdm = dynamic_pointer_cast(selected_dkdm()); _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0); + _remove_dkdm->Enable (sel.GetCount() > 0 && (!group || group->name() != "root")); + _export_dkdm->Enable (sel.GetCount() > 0 && dkdm); } void dkdm_begin_drag (wxTreeEvent& ev) @@ -378,7 +461,7 @@ private: { DKDMMap::iterator from = _dkdm_id.find (_dkdm->GetSelection ()); DKDMMap::iterator to = _dkdm_id.find (ev.GetItem ()); - if (from == _dkdm_id.end() || to == _dkdm_id.end()) { + if (from == _dkdm_id.end() || to == _dkdm_id.end() || from->first == to->first) { return; } @@ -402,28 +485,78 @@ private: { wxFileDialog* d = new wxFileDialog (this, _("Select DKDM file")); if (d->ShowModal() == wxID_OK) { - shared_ptr new_dkdm; + shared_ptr chain = Config::instance()->decryption_chain(); + DCPOMATIC_ASSERT (chain->key()); + +#ifdef DCPOMATIC_VARIANT_SWAROOP try { - new_dkdm.reset ( - new DKDM (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE))) + cxml::Document test_doc; + string const xml_string = dcp::file_to_string (wx_to_std(d->GetPath()), MAX_KDM_SIZE); + test_doc.read_string (xml_string); + if (test_doc.root_name() == "ECinemaSecurityMessage") { + EncryptedECinemaKDM ekdm(xml_string); + /* Decrypt the DKDM to make sure that we can */ + DecryptedECinemaKDM dkdm(ekdm, chain->key().get()); + + shared_ptr new_dkdm(new ECinemaDKDM(ekdm)); + shared_ptr group = dynamic_pointer_cast (selected_dkdm()); + if (!group) { + group = Config::instance()->dkdms(); + } + add_dkdm_model (new_dkdm, group); + add_dkdm_view (new_dkdm); + d->Destroy (); + return; + } + } catch (KDMError& e) { + error_dialog ( + this, "Could not read file as a KDM. Perhaps it is badly formatted, created with the wrong certificate, or not a KDM at all.", + std_to_wx(e.what()) ); - } catch (dcp::KDMFormatError& e) { + d->Destroy (); + return; + } catch (dcp::MiscError& e) { error_dialog ( this, - wxString::Format ( - _("Could not read file as a KDM. Perhaps it is badly formatted, or not a KDM at all.\n\n%s"), - std_to_wx(e.what()).data() - ) + _("Could not read file as a KDM. It is much too large. Make sure you are loading a DKDM (XML) file."), + std_to_wx(e.what()) ); + d->Destroy (); return; } +#endif - shared_ptr group = dynamic_pointer_cast (selected_dkdm ()); - if (!group) { - group = Config::instance()->dkdms (); + try { + dcp::EncryptedKDM ekdm(dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)); + /* Decrypt the DKDM to make sure that we can */ + dcp::DecryptedKDM dkdm(ekdm, chain->key().get()); + + shared_ptr new_dkdm(new DKDM(ekdm)); + shared_ptr group = dynamic_pointer_cast (selected_dkdm ()); + if (!group) { + group = Config::instance()->dkdms (); + } + add_dkdm_model (new_dkdm, group); + add_dkdm_view (new_dkdm); + } catch (dcp::KDMFormatError& e) { + error_dialog ( + this, + _("Could not read file as a KDM. Perhaps it is badly formatted, or not a KDM at all."), + std_to_wx(e.what()) + ); + return; + } catch (dcp::KDMDecryptionError &) { + error_dialog ( + this, + _("Could not decrypt the DKDM. Perhaps it was not created with the correct certificate.") + ); + } catch (dcp::MiscError& e) { + error_dialog ( + this, + _("Could not read file as a KDM. It is much too large. Make sure you are loading a DKDM (XML) file."), + std_to_wx(e.what()) + ); } - add_dkdm_model (new_dkdm, group); - add_dkdm_view (new_dkdm); } d->Destroy (); } @@ -498,12 +631,43 @@ private: return; } + if (NagDialog::maybe_nag ( + this, Config::NAG_DELETE_DKDM, + _("You are about to remove a DKDM. This will make it impossible to decrypt the DCP that the DKDM was made for, and it cannot be undone. " + "Are you sure?"), + true)) { + return; + } + _dkdm->Delete (dkdm_to_id (removed)); shared_ptr dkdms = Config::instance()->dkdms (); dkdms->remove (removed); Config::instance()->changed (); } + void export_dkdm_clicked () + { + shared_ptr removed = selected_dkdm (); + if (!removed) { + return; + } + + shared_ptr dkdm = dynamic_pointer_cast(removed); + if (!dkdm) { + return; + } + + wxFileDialog* d = new wxFileDialog ( + this, _("Select DKDM File"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT + ); + + if (d->ShowModal() == wxID_OK) { + dkdm->dkdm().as_xml(wx_to_std(d->GetPath())); + } + d->Destroy (); + } + wxPreferencesEditor* _config_dialog; ScreensPanel* _screens; KDMTimingPanel* _timing; @@ -513,6 +677,7 @@ private: wxButton* _add_dkdm; wxButton* _add_dkdm_folder; wxButton* _remove_dkdm; + wxButton* _export_dkdm; wxButton* _create; KDMOutputPanel* _output; JobViewDialog* _job_view; @@ -532,61 +697,75 @@ public: private: bool OnInit () - try { - wxInitAllImageHandlers (); + wxSplashScreen* splash = 0; - SetAppName (_("DCP-o-matic KDM Creator")); + try { + wxInitAllImageHandlers (); - if (!wxApp::OnInit()) { - return false; - } + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); + + splash = maybe_show_splash (); + + SetAppName (_("DCP-o-matic KDM Creator")); + + if (!wxApp::OnInit()) { + return false; + } #ifdef DCPOMATIC_LINUX - unsetenv ("UBUNTU_MENUPROXY"); + unsetenv ("UBUNTU_MENUPROXY"); #endif #ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); + ProcessSerialNumber serial; + GetCurrentProcess (&serial); + TransformProcessType (&serial, kProcessTransformToForegroundApplication); #endif - dcpomatic_setup_path_encoding (); - - /* Enable i18n; this will create a Config object - to look for a force-configured language. This Config - object will be wrong, however, because dcpomatic_setup - hasn't yet been called and there aren't any filters etc. - set up yet. - */ - dcpomatic_setup_i18n (); - - /* Set things up, including filters etc. - which will now be internationalised correctly. - */ - dcpomatic_setup (); - - /* Force the configuration to be re-loaded correctly next - time it is needed. - */ - Config::drop (); - - _frame = new DOMFrame (_("DCP-o-matic KDM Creator")); - SetTopWindow (_frame); - _frame->Maximize (); - _frame->Show (); + dcpomatic_setup_path_encoding (); + + /* Enable i18n; this will create a Config object + to look for a force-configured language. This Config + object will be wrong, however, because dcpomatic_setup + hasn't yet been called and there aren't any filters etc. + set up yet. + */ + dcpomatic_setup_i18n (); + + /* Set things up, including filters etc. + which will now be internationalised correctly. + */ + dcpomatic_setup (); + + /* Force the configuration to be re-loaded correctly next + time it is needed. + */ + Config::drop (); + + _frame = new DOMFrame (_("DCP-o-matic KDM Creator")); + SetTopWindow (_frame); + _frame->Maximize (); + if (splash) { + splash->Destroy (); + splash = 0; + } + _frame->Show (); - signal_manager = new wxSignalManager (this); - Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); + signal_manager = new wxSignalManager (this); + Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); + } + catch (exception& e) + { + if (splash) { + splash->Destroy (); + } + error_dialog (0, _("DCP-o-matic could not start"), std_to_wx(e.what())); + } return true; } - catch (exception& e) - { - error_dialog (0, wxString::Format ("DCP-o-matic could not start: %s", e.what ())); - return true; - } /* An unhandled exception has occurred inside the main event loop */ bool OnExceptionInMainLoop () @@ -628,6 +807,16 @@ private: signal_manager->ui_idle (); } + void config_failed_to_load () + { + message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); + } + + void config_warning (string m) + { + message_dialog (_frame, std_to_wx (m)); + } + DOMFrame* _frame; };