diff options
| -rw-r--r-- | dbaccess/source/core/dataaccess/ModelImpl.cxx | 94 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.cxx | 90 | ||||
| -rw-r--r-- | dbaccess/source/core/inc/ModelImpl.hxx | 2 |
3 files changed, 96 insertions, 90 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 068149018264..e4882d53722c 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/beans/PropertyBag.hpp> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/document/MacroExecMode.hpp> +#include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/XTransactionBroadcaster.hpp> #include <com/sun/star/embed/StorageFactory.hpp> #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp> @@ -49,10 +50,12 @@ #include <sfx2/docfile.hxx> #include <sfx2/signaturestate.hxx> #include <tools/diagnose_ex.h> +#include <osl/file.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> #include <tools/urlobj.hxx> #include <unotools/configmgr.hxx> +#include <unotools/tempfile.hxx> #include <i18nlangtag/languagetag.hxx> #include <algorithm> @@ -840,6 +843,23 @@ bool ODatabaseModelImpl::commitEmbeddedStorage( bool _bPreventRootCommits ) bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference< XStorage >& _rxStorage ) { + bool bTryToPreserveScriptSignature = false; + utl::TempFile aTempFile; + aTempFile.EnableKillingFile(); + OUString m_sTmpFileUrl = aTempFile.GetURL(); + SignatureState aSignatureState = getScriptingSignatureState(); + if (aSignatureState == SignatureState::OK + || aSignatureState == SignatureState::NOTVALIDATED + || aSignatureState == SignatureState::INVALID) + { + bTryToPreserveScriptSignature = true; + // We need to first save the file (which removes the macro signature), then add the macro signature again. + // For that, we need a temporary copy of the original file. + osl::File::RC rc = osl::File::copy(getDocFileLocation(), m_sTmpFileUrl); + if (rc != osl::FileBase::E_None) + throw uno::RuntimeException("Could not create temp file"); + } + bool bSuccess = false; try { @@ -849,6 +869,80 @@ bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference< { DBG_UNHANDLED_EXCEPTION("dbaccess"); } + + // Preserve script signature if the script has not changed + if (bTryToPreserveScriptSignature) + { + // Need to close this storage, otherwise we can't open it for signing below + // (Windows needs exclusive file access) + //uno::Reference < lang::XComponent > xComp = xCurrentStorage; + //xComp->dispose(); + OUString aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(_rxStorage)); + uno::Reference<security::XDocumentDigitalSignatures> xDDSigns; + try + { + xDDSigns = security::DocumentDigitalSignatures::createWithVersion( + comphelper::getProcessComponentContext(), aODFVersion); + + const OUString aScriptSignName + = xDDSigns->getScriptingContentSignatureDefaultStreamName(); + + if (!aScriptSignName.isEmpty()) + { + Reference<XStorage> xReadOrig + = comphelper::OStorageHelper::GetStorageOfFormatFromURL( + ZIP_STORAGE_FORMAT_STRING, m_sTmpFileUrl, ElementModes::READ); + if (!xReadOrig.is()) + throw uno::RuntimeException("Could not read " + m_sTmpFileUrl); + uno::Reference<embed::XStorage> xMetaInf + = xReadOrig->openStorageElement("META-INF", embed::ElementModes::READ); + + OUString aURL = getDocFileLocation(); + Reference<XStorage> xTarget + = comphelper::OStorageHelper::GetStorageOfFormatFromURL( + ZIP_STORAGE_FORMAT_STRING, aURL, ElementModes::READWRITE); + if (!xTarget.is()) + throw uno::RuntimeException("Could not read " + aURL); + uno::Reference<embed::XStorage> xTargetMetaInf + = xTarget->openStorageElement("META-INF", embed::ElementModes::READWRITE); + + if (xMetaInf.is() && xTargetMetaInf.is()) + { + xMetaInf->copyElementTo(aScriptSignName, xTargetMetaInf, aScriptSignName); + + uno::Reference<embed::XTransactedObject> xTransact(xTargetMetaInf, + uno::UNO_QUERY); + if (xTransact.is()) + xTransact->commit(); + + xTargetMetaInf->dispose(); + + // now check the copied signature + uno::Sequence<security::DocumentSignatureInformation> aInfos + = xDDSigns->verifyScriptingContentSignatures( + xTarget, uno::Reference<io::XInputStream>()); + SignatureState nState = DocumentSignatures::getSignatureState(aInfos); + if (nState == SignatureState::OK || nState == SignatureState::NOTVALIDATED + || nState == SignatureState::PARTIAL_OK) + { + // commit the ZipStorage from target medium + xTransact.set(xTarget, uno::UNO_QUERY); + if (xTransact.is()) + xTransact->commit(); + } + else + { + SAL_WARN("dbaccess", "An invalid signature was copied!"); + } + } + } + } + catch (uno::Exception&) + { + TOOLS_WARN_EXCEPTION("dbaccess", ""); + } + } + return bSuccess; } diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 6717e2c403ec..922513a99e8d 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -1026,22 +1026,6 @@ void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comph _rGuard.reset(); } - bool bTryToPreserveScriptSignature = false; - utl::TempFile aTempFile; - aTempFile.EnableKillingFile(); - OUString aTmpFileURL = aTempFile.GetURL(); - if (m_pImpl->getScriptingSignatureState() == SignatureState::OK - || m_pImpl->getScriptingSignatureState() == SignatureState::NOTVALIDATED - || m_pImpl->getScriptingSignatureState() == SignatureState::INVALID) - { - bTryToPreserveScriptSignature = true; - // We need to first save the file (which removes the macro signature), then add the macro signature again. - // For that, we need a temporary copy of the original file. - osl::File::RC rc = osl::File::copy(m_pImpl->getDocFileLocation(), aTmpFileURL); - if (rc != osl::FileBase::E_None) - throw uno::RuntimeException("Could not create temp file"); - } - Reference< XStorage > xNewRootStorage; // will be non-NULL if our storage changed @@ -1084,81 +1068,9 @@ void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comph // store to current storage Reference< XStorage > xCurrentStorage( m_pImpl->getOrCreateRootStorage(), UNO_SET_THROW ); - OUString aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(xCurrentStorage)); Sequence< PropertyValue > aMediaDescriptor( lcl_appendFileNameToDescriptor( _rArguments, _rURL ) ); impl_storeToStorage_throw( xCurrentStorage, aMediaDescriptor, _rGuard ); - // Preserve script signature if the script has not changed - if (bTryToPreserveScriptSignature) - { - // Need to close this storage, otherwise we can't open it for signing below - // (Windows needs exclusive file access) - uno::Reference < lang::XComponent > xComp = xCurrentStorage; - xComp->dispose(); - uno::Reference<security::XDocumentDigitalSignatures> xDDSigns; - try - { - xDDSigns = security::DocumentDigitalSignatures::createWithVersion( - comphelper::getProcessComponentContext(), aODFVersion); - - const OUString aScriptSignName - = xDDSigns->getScriptingContentSignatureDefaultStreamName(); - - if (!aScriptSignName.isEmpty()) - { - Reference<XStorage> xReadOrig - = comphelper::OStorageHelper::GetStorageOfFormatFromURL( - ZIP_STORAGE_FORMAT_STRING, aTmpFileURL, ElementModes::READ); - if (!xReadOrig.is()) - throw uno::RuntimeException("Could not read " + aTmpFileURL); - uno::Reference<embed::XStorage> xMetaInf - = xReadOrig->openStorageElement("META-INF", embed::ElementModes::READ); - - Reference<XStorage> xTarget - = comphelper::OStorageHelper::GetStorageOfFormatFromURL( - ZIP_STORAGE_FORMAT_STRING, _rURL, ElementModes::READWRITE); - if (!xTarget.is()) - throw uno::RuntimeException("Could not read " + _rURL); - uno::Reference<embed::XStorage> xTargetMetaInf - = xTarget->openStorageElement("META-INF", embed::ElementModes::READWRITE); - - if (xMetaInf.is() && xTargetMetaInf.is()) - { - xMetaInf->copyElementTo(aScriptSignName, xTargetMetaInf, aScriptSignName); - - uno::Reference<embed::XTransactedObject> xTransact(xTargetMetaInf, - uno::UNO_QUERY); - if (xTransact.is()) - xTransact->commit(); - - xTargetMetaInf->dispose(); - - // now check the copied signature - uno::Sequence<security::DocumentSignatureInformation> aInfos - = xDDSigns->verifyScriptingContentSignatures( - xTarget, uno::Reference<io::XInputStream>()); - SignatureState nState = DocumentSignatures::getSignatureState(aInfos); - if (nState == SignatureState::OK || nState == SignatureState::NOTVALIDATED - || nState == SignatureState::PARTIAL_OK) - { - // commit the ZipStorage from target medium - xTransact.set(xTarget, uno::UNO_QUERY); - if (xTransact.is()) - xTransact->commit(); - } - else - { - SAL_WARN("dbaccess", "An invalid signature was copied!"); - } - } - } - } - catch (uno::Exception&) - { - TOOLS_WARN_EXCEPTION("dbaccess", ""); - } - } - // success - tell our impl m_pImpl->setDocFileLocation( _rURL ); m_pImpl->setResource( _rURL, aMediaDescriptor ); @@ -1317,7 +1229,7 @@ void ODatabaseDocument::impl_storeToStorage_throw( const Reference< XStorage >& lcl_triggerStatusIndicator_throw( aWriteArgs, _rDocGuard, false ); // commit target storage - OSL_VERIFY( tools::stor::commitStorageIfWriteable( _rxTargetStorage ) ); + m_pImpl->commitStorageIfWriteable_ignoreErrors(_rxTargetStorage); } catch( const IOException& ) { throw; } catch( const RuntimeException& ) { throw; } diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx index d67029c3bfb5..c67e67d57905 100644 --- a/dbaccess/source/core/inc/ModelImpl.hxx +++ b/dbaccess/source/core/inc/ModelImpl.hxx @@ -275,7 +275,7 @@ public: void commitRootStorage(); /// commits a given storage if it's not readonly, ignoring (but asserting) all errors - static bool commitStorageIfWriteable_ignoreErrors( + bool commitStorageIfWriteable_ignoreErrors( const css::uno::Reference< css::embed::XStorage >& _rxStorage ); |