summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/inc/documentsignaturemanager.hxx2
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx49
-rw-r--r--xmlsecurity/source/helper/documentsignaturemanager.cxx31
3 files changed, 62 insertions, 20 deletions
diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx
index ab89e5b96674..9f0c5d61f9e2 100644
--- a/xmlsecurity/inc/documentsignaturemanager.hxx
+++ b/xmlsecurity/inc/documentsignaturemanager.hxx
@@ -54,6 +54,7 @@ class XComponentContext;
}
}
class PDFSignatureHelper;
+class Xmlsec;
/// Manages signatures (addition, removal), used by DigitalSignaturesDialog.
class XMLSECURITY_DLLPUBLIC DocumentSignatureManager
@@ -75,6 +76,7 @@ private:
css::uno::Reference<css::xml::crypto::XXMLSecurityContext> mxSecurityContext;
css::uno::Reference<css::xml::crypto::XSEInitializer> mxGpgSEInitializer;
css::uno::Reference<css::xml::crypto::XXMLSecurityContext> mxGpgSecurityContext;
+ std::shared_ptr<Xmlsec> mpXmlsecLibrary;
public:
DocumentSignatureManager(const css::uno::Reference<css::uno::XComponentContext>& xContext,
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 31b965a63765..9e3810edcb68 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -81,9 +81,10 @@ private:
bool m_bHasDocumentSignature;
/// @throws css::uno::RuntimeException
- bool ImplViewSignatures(const css::uno::Reference<css::embed::XStorage>& rxStorage,
+ void ImplViewSignatures(const css::uno::Reference<css::embed::XStorage>& rxStorage,
const css::uno::Reference<css::io::XStream>& xSignStream,
- DocumentSignatureMode eMode, bool bReadOnly);
+ DocumentSignatureMode eMode, bool bReadOnly,
+ const std::function<void(bool)>& rCallback);
/// @throws css::uno::RuntimeException
void ImplViewSignatures(const css::uno::Reference<css::embed::XStorage>& rxStorage,
const css::uno::Reference<css::io::XInputStream>& xSignStream,
@@ -216,6 +217,10 @@ public:
void SignDocumentContentAsync(const css::uno::Reference<css::embed::XStorage>& xStorage,
const css::uno::Reference<css::io::XStream>& xSignStream,
const std::function<void(bool)>& rCallback) override;
+ /// See sfx2::DigitalSignatures::SignScriptingContentAsync().
+ void SignScriptingContentAsync(const css::uno::Reference<css::embed::XStorage>& xStorage,
+ const css::uno::Reference<css::io::XStream>& xSignStream,
+ const std::function<void(bool)>& rCallback) override;
};
}
@@ -354,12 +359,10 @@ OUString DocumentDigitalSignatures::getDocumentContentSignatureDefaultStreamName
}
sal_Bool DocumentDigitalSignatures::signScriptingContent(
- const Reference< css::embed::XStorage >& rxStorage,
- const Reference< css::io::XStream >& xSignStream )
+ const Reference< css::embed::XStorage >& /*rxStorage*/,
+ const Reference< css::io::XStream >& /*xSignStream*/ )
{
- OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
- OSL_ENSURE(m_nArgumentsCount == 2, "DocumentDigitalSignatures: Service was not initialized properly");
- return ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Macros, false );
+ for (;;) { std::abort(); } // avoid "must return a value" warnings
}
Sequence< css::security::DocumentSignatureInformation >
@@ -386,11 +389,10 @@ OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamNam
sal_Bool DocumentDigitalSignatures::signPackage(
- const Reference< css::embed::XStorage >& rxStorage,
- const Reference< css::io::XStream >& xSignStream )
+ const Reference< css::embed::XStorage >& /*rxStorage*/,
+ const Reference< css::io::XStream >& /*xSignStream*/ )
{
- OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
- return ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Package, false );
+ for (;;) { std::abort(); } // avoid "must return a value" warnings
}
Sequence< css::security::DocumentSignatureInformation >
@@ -424,12 +426,12 @@ void DocumentDigitalSignatures::ImplViewSignatures(
Reference< io::XStream > xStream;
if ( xSignStream.is() )
xStream.set( xSignStream, UNO_QUERY );
- ImplViewSignatures( rxStorage, xStream, eMode, bReadOnly );
+ ImplViewSignatures( rxStorage, xStream, eMode, bReadOnly, [](bool /*bSuccess*/){} );
}
-bool DocumentDigitalSignatures::ImplViewSignatures(
+void DocumentDigitalSignatures::ImplViewSignatures(
const Reference< css::embed::XStorage >& rxStorage, const Reference< css::io::XStream >& xSignStream,
- DocumentSignatureMode eMode, bool bReadOnly )
+ DocumentSignatureMode eMode, bool bReadOnly, const std::function<void(bool)>& rCallback )
{
bool bChanges = false;
auto xSignaturesDialog = std::make_shared<DigitalSignaturesDialog>(
@@ -447,7 +449,8 @@ bool DocumentDigitalSignatures::ImplViewSignatures(
{
xSignaturesDialog->beforeRun();
weld::DialogController::runAsync(xSignaturesDialog, [] (sal_Int32) {});
- return false;
+ rCallback(false);
+ return;
}
else if (xSignaturesDialog->run() == RET_OK)
{
@@ -461,6 +464,8 @@ bool DocumentDigitalSignatures::ImplViewSignatures(
xTrans->commit();
}
}
+ rCallback(bChanges);
+ return;
}
}
else
@@ -471,7 +476,7 @@ bool DocumentDigitalSignatures::ImplViewSignatures(
xBox->run();
}
- return bChanges;
+ rCallback(bChanges);
}
Sequence< css::security::DocumentSignatureInformation >
@@ -835,8 +840,16 @@ void DocumentDigitalSignatures::SignDocumentContentAsync(const css::uno::Referen
const std::function<void(bool)>& rCallback)
{
OSL_ENSURE(!m_sODFVersion.isEmpty(), "DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
- bool bRet = ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Content, false );
- rCallback(bRet);
+ ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Content, false, rCallback );
+}
+
+void DocumentDigitalSignatures::SignScriptingContentAsync(
+ const Reference<css::embed::XStorage>& rxStorage,
+ const Reference<css::io::XStream>& xSignStream, const std::function<void(bool)>& rCallback)
+{
+ OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
+ OSL_ENSURE(m_nArgumentsCount == 2, "DocumentDigitalSignatures: Service was not initialized properly");
+ ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Macros, false, rCallback );
}
sal_Bool DocumentDigitalSignatures::signPackageWithCertificate(
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 620c85458afe..f3931a9cdd31 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -56,6 +56,33 @@ using namespace css;
using namespace css::graphic;
using namespace css::uno;
+/// RAII class to init / shut down libxmlsec.
+class Xmlsec
+{
+public:
+ Xmlsec();
+ ~Xmlsec();
+};
+
+Xmlsec::Xmlsec() { initXmlSec(); }
+
+Xmlsec::~Xmlsec() { deInitXmlSec(); }
+
+namespace
+{
+/// Shared access to libxmlsec, to avoid double init.
+struct XmlsecLibrary
+{
+ static std::shared_ptr<Xmlsec>& get();
+};
+
+std::shared_ptr<Xmlsec>& XmlsecLibrary::get()
+{
+ static std::shared_ptr<Xmlsec> pInstance = std::make_shared<Xmlsec>();
+ return pInstance;
+}
+}
+
DocumentSignatureManager::DocumentSignatureManager(
const uno::Reference<uno::XComponentContext>& xContext, DocumentSignatureMode eMode)
: mxContext(xContext)
@@ -64,7 +91,7 @@ DocumentSignatureManager::DocumentSignatureManager(
{
}
-DocumentSignatureManager::~DocumentSignatureManager() { deInitXmlSec(); }
+DocumentSignatureManager::~DocumentSignatureManager() { mpXmlsecLibrary.reset(); }
bool DocumentSignatureManager::init()
{
@@ -76,7 +103,7 @@ bool DocumentSignatureManager::init()
"DocumentSignatureManager::Init - mxGpgSEInitializer already set!");
// xmlsec is needed by both services, so init before those
- initXmlSec();
+ mpXmlsecLibrary = XmlsecLibrary::get();
mxSEInitializer = xml::crypto::SEInitializer::create(mxContext);
#if HAVE_FEATURE_GPGME
generated by cgit (git 2.34.1) at 2025-05-14 01:17:18 +0000