X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=c035af48725fb4625062be765542508c5f947b7d;hb=HEAD;hp=90e315aab737722bd39da9a213b71880d26bc602;hpb=5fd2715af0b316d5ad0c3b08812f24af869f9fcc;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 90e315aab..9adef0ab0 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -22,6 +22,8 @@ #include "wx/about_dialog.h" #include "wx/dcpomatic_button.h" #include "wx/editable_list.h" +#include "wx/id.h" +#include "wx/invalid_certificate_period_dialog.h" #include "wx/file_dialog.h" #include "wx/file_picker_ctrl.h" #include "wx/full_config_dialog.h" @@ -46,15 +48,17 @@ #include "lib/exceptions.h" #include "lib/file_log.h" #include "lib/job_manager.h" +#include "lib/kdm_util.h" #include "lib/kdm_with_metadata.h" -#include "lib/scope_guard.h" #include "lib/screen.h" #include "lib/send_kdm_email_job.h" #include #include #include +#include #include LIBDCP_DISABLE_WARNINGS +#include #include #include #include @@ -73,6 +77,7 @@ LIBDCP_ENABLE_WARNINGS #endif +using std::dynamic_pointer_cast; using std::exception; using std::list; using std::make_shared; @@ -85,7 +90,6 @@ using std::vector; using boost::bind; using boost::optional; using boost::ref; -using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif @@ -93,7 +97,7 @@ using namespace dcpomatic; enum { - ID_help_report_a_problem = 1, + ID_help_report_a_problem = DCPOMATIC_MAIN_MENU, }; @@ -165,7 +169,7 @@ public: h = new StaticText (overall_panel, _("DKDM")); h->SetFont (subheading_font); - right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _dkdm_search = new wxSearchCtrl(overall_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height())); #ifndef __WXGTK3__ @@ -175,10 +179,31 @@ public: right->Add(_dkdm_search, 0, wxTOP | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); + class DKDMDropTarget : public wxFileDropTarget + { + public: + DKDMDropTarget(DOMFrame* frame) + : _frame(frame) + {} + + bool OnDropFiles(wxCoord, wxCoord, wxArrayString const& filenames) override + { + for (size_t i = 0; i < filenames.GetCount(); ++i) { + _frame->add_dkdm(boost::filesystem::path(wx_to_std(filenames[0]))); + } + + return true; + } + + private: + DOMFrame* _frame; + }; + auto dkdm_sizer = new wxBoxSizer (wxHORIZONTAL); _dkdm = new wxTreeCtrl ( overall_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT ); + _dkdm->SetDropTarget(new DKDMDropTarget(this)); dkdm_sizer->Add(_dkdm, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); auto dkdm_buttons = new wxBoxSizer(wxVERTICAL); _add_dkdm = new Button (overall_panel, _("Add...")); @@ -196,7 +221,7 @@ public: h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); - right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _output = new KDMOutputPanel (overall_panel); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); @@ -221,6 +246,8 @@ public: _remove_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::remove_dkdm_clicked, this)); _export_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::export_dkdm_clicked, this)); _dkdm_search->Bind(wxEVT_TEXT, boost::bind(&DOMFrame::dkdm_search_changed, this)); + _timing->TimingChanged.connect(boost::bind(&DOMFrame::setup_sensitivity, this)); + _output->MethodChanged.connect(boost::bind(&DOMFrame::setup_sensitivity, this)); setup_sensitivity (); @@ -244,18 +271,16 @@ private: void help_about () { - auto d = new AboutDialog (this); - d->ShowModal (); - d->Destroy (); + AboutDialog dialog(this); + dialog.ShowModal(); } void help_report_a_problem () { - auto d = new ReportProblemDialog (this, shared_ptr()); - if (d->ShowModal () == wxID_OK) { - d->report (); + ReportProblemDialog dialog(this, shared_ptr()); + if (dialog.ShowModal() == wxID_OK) { + dialog.report(); } - d->Destroy (); } void setup_menu (wxMenuBar* m) @@ -269,7 +294,7 @@ private: #endif #ifdef __WXOSX__ - file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); + file->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-,")); #else wxMenu* edit = new wxMenu; edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P")); @@ -292,10 +317,17 @@ private: bool confirm_overwrite (boost::filesystem::path path) { - return confirm_dialog ( - this, - wxString::Format (_("File %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) - ); + if (dcp::filesystem::is_directory(path)) { + return confirm_dialog ( + this, + wxString::Format(_("Folder %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) + ); + } else { + return confirm_dialog ( + this, + wxString::Format(_("File %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) + ); + } } /** @id if not nullptr this is filled in with the wxTreeItemId of the selection */ @@ -334,56 +366,55 @@ private: string title; auto dkdm = std::dynamic_pointer_cast(dkdm_base); - if (dkdm) { + if (!dkdm) { + return; + } + + /* Decrypt the DKDM */ + dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); + title = decrypted.content_title_text (); + + /* This is the signer for our new KDMs */ + auto signer = Config::instance()->signer_chain (); + if (!signer->valid ()) { + throw InvalidSignerError (); + } - /* Decrypt the DKDM */ - dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); - title = decrypted.content_title_text (); + vector period_checks; - /* This is the signer for our new KDMs */ - auto signer = Config::instance()->signer_chain (); - if (!signer->valid ()) { - throw InvalidSignerError (); + std::function make_kdm = [this, decrypted, title](dcp::LocalTime begin, dcp::LocalTime end) { + /* Make an empty KDM */ + dcp::DecryptedKDM kdm ( + begin, + end, + _output->annotation_text(), + title, + dcp::LocalTime().as_string() + ); + + /* Add keys from the DKDM */ + for (auto const& j: decrypted.keys()) { + kdm.add_key(j); } - for (auto i: _screens->screens()) { + return kdm; + }; - if (!i->recipient) { - continue; - } + for (auto i: _screens->screens()) { - dcp::LocalTime begin(_timing->from(), dcp::UTCOffset(i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())); - dcp::LocalTime end(_timing->until(), dcp::UTCOffset(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 (""), - title, - dcp::LocalTime().as_string() - ); - - /* Add keys from the DKDM */ - for (auto const& j: decrypted.keys()) { - kdm.add_key (j); - } + auto kdm = kdm_for_screen( + make_kdm, + i, + _timing->from(), + _timing->until(), + _output->formulation(), + !_output->forensic_mark_video(), + _output->forensic_mark_audio() ? boost::optional() : 0, + period_checks + ); - auto 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 (make_shared(name_values, i->cinema.get(), i->cinema->emails, encrypted)); + if (kdm) { + kdms.push_back(kdm); } } @@ -391,6 +422,18 @@ private: return; } + if ( + find_if( + period_checks.begin(), + period_checks.end(), + [](KDMCertificatePeriod const& p) { return p.overlap != KDMCertificateOverlap::KDM_WITHIN_CERTIFICATE; } + ) != period_checks.end()) { + InvalidCertificatePeriodDialog dialog(this, period_checks); + if (dialog.ShowModal() == wxID_CANCEL) { + return; + } + } + auto result = _output->make ( kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1) ); @@ -413,6 +456,13 @@ private: wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data()) ); } + } catch (dcp::BadKDMDateError& e) { + if (e.starts_too_early()) { + error_dialog(this, _("The KDM start period is before (or close to) the start of the signing certificate's validity period. Use a later start time for this KDM.")); + } else { + error_dialog(this, _("The KDM end period is after (or close to) the end of the signing certificates' validity period. Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window.")); + } + return; } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { @@ -430,7 +480,7 @@ private: _dkdm->GetSelections (sel); auto group = dynamic_pointer_cast(selected_dkdm()); auto dkdm = dynamic_pointer_cast(selected_dkdm()); - _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0 && dkdm); + _create->Enable(!_screens->screens().empty() && _timing->valid() && sel.GetCount() > 0 && dkdm && _output->method_selected()); _remove_dkdm->Enable (sel.GetCount() > 0 && (!group || group->name() != "root")); _export_dkdm->Enable (sel.GetCount() > 0 && dkdm); } @@ -438,6 +488,17 @@ private: void dkdm_selection_changed() { _selected_dkdm = selected_dkdm(); + if (_selected_dkdm) { + auto dkdm = std::dynamic_pointer_cast(_selected_dkdm); + if (dkdm) { + try { + dcp::DecryptedKDM decrypted(dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); + if (decrypted.annotation_text()) { + _output->set_annotation_text(*decrypted.annotation_text()); + } + } catch (...) {} + } + } setup_sensitivity(); } @@ -479,6 +540,15 @@ private: group = to->second->parent(); } + /* Check we're not adding a group to one of its children */ + auto to_parent = group; + while (to_parent) { + if (from->second == to_parent) { + return; + } + to_parent = to_parent->parent(); + } + DCPOMATIC_ASSERT (group); DCPOMATIC_ASSERT (from->second->parent ()); @@ -490,15 +560,12 @@ private: void add_dkdm_clicked () { - auto dialog = new FileDialog(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath"); - - ScopeGuard sg = [dialog]() { dialog->Destroy(); }; - - if (!dialog->show()) { + FileDialog dialog(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath"); + if (!dialog.show()) { return; } - for (auto path: dialog->paths()) { + for (auto path: dialog.paths()) { add_dkdm(path); } } @@ -514,6 +581,15 @@ private: dcp::DecryptedKDM dkdm(ekdm, chain->key().get()); auto new_dkdm = make_shared(ekdm); + + if (Config::instance()->dkdms()->contains(new_dkdm->dkdm().id())) { + error_dialog( + this, + wxString::Format(_("DKDM %s is already in the DKDM list and will not be added again."), std_to_wx(new_dkdm->dkdm().id())) + ); + return; + } + auto group = dynamic_pointer_cast (selected_dkdm()); if (!group) { group = Config::instance()->dkdms (); @@ -544,17 +620,18 @@ private: void add_dkdm_folder_clicked () { - auto d = new NewDKDMFolderDialog (this); - if (d->ShowModal() == wxID_OK) { - auto new_dkdm = make_shared(wx_to_std(d->get())); - auto parent = dynamic_pointer_cast(selected_dkdm()); - if (!parent) { - parent = Config::instance()->dkdms (); - } - add_dkdm(new_dkdm, parent); - update_dkdm_view(); + NewDKDMFolderDialog dialog(this); + if (dialog.ShowModal() != wxID_OK) { + return; + } + + auto new_dkdm = make_shared(wx_to_std(dialog.get())); + auto parent = dynamic_pointer_cast(selected_dkdm()); + if (!parent) { + parent = Config::instance()->dkdms (); } - d->Destroy (); + add_dkdm(new_dkdm, parent); + update_dkdm_view(); } void update_dkdm_view() @@ -668,12 +745,14 @@ 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; + if (removed->contains_dkdm()) { + 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)); @@ -694,15 +773,14 @@ private: return; } - auto d = new wxFileDialog ( + wxFileDialog dialog( 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())); + if (dialog.ShowModal() == wxID_OK) { + dkdm->dkdm().as_xml(wx_to_std(dialog.GetPath())); } - d->Destroy (); } void dkdm_search_changed() @@ -753,7 +831,7 @@ private: bool OnInit () override { - wxSplashScreen* splash = nullptr; + wxSplashScreen* splash; try { wxInitAllImageHandlers ();