diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/Library_sfx.mk | 1 | ||||
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 40 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/signaturestate.cxx | 59 |
5 files changed, 63 insertions, 41 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index bcd9aa26528c..0ca31c3d5357 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -231,6 +231,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/sfxbasemodel \ sfx2/source/doc/sfxmodelfactory \ sfx2/source/doc/SfxRedactionHelper \ + sfx2/source/doc/signaturestate \ sfx2/source/doc/syspath \ sfx2/source/doc/zoomitem \ sfx2/source/doc/templatedlg \ diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 43a5f5b10800..7bf2c77de4ef 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1810,7 +1810,7 @@ bool SfxObjectShell_Impl::hasTrustedScriptingSignature( bool bAllowUIToAddAuthor if ( aInfo.hasElements() ) { if ( nScriptingSignatureState == SignatureState::UNKNOWN ) - nScriptingSignatureState = SfxObjectShell::ImplCheckSignaturesInformation( aInfo ); + nScriptingSignatureState = DocumentSignatures::getSignatureState(aInfo); if ( nScriptingSignatureState == SignatureState::OK || nScriptingSignatureState == SignatureState::NOTVALIDATED ) diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index a4e4381ab179..96f932049c28 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1501,44 +1501,6 @@ void SfxObjectShell::StateView_Impl(SfxItemSet& /*rSet*/) { } -SignatureState SfxObjectShell::ImplCheckSignaturesInformation( const uno::Sequence< security::DocumentSignatureInformation >& aInfos ) -{ - bool bCertValid = true; - SignatureState nResult = SignatureState::NOSIGNATURES; - bool bCompleteSignature = true; - if( aInfos.hasElements() ) - { - nResult = SignatureState::OK; - for ( const auto& rInfo : aInfos ) - { - if ( bCertValid ) - { - sal_Int32 nCertStat = rInfo.CertificateStatus; - bCertValid = nCertStat == security::CertificateValidity::VALID; - } - - if ( !rInfo.SignatureIsValid ) - { - nResult = SignatureState::BROKEN; - break; // we know enough - } - bCompleteSignature &= !rInfo.PartialDocumentSignature; - } - } - - if (nResult == SignatureState::OK && !bCertValid && !bCompleteSignature) - nResult = SignatureState::NOTVALIDATED_PARTIAL_OK; - else if (nResult == SignatureState::OK && !bCertValid) - nResult = SignatureState::NOTVALIDATED; - else if ( nResult == SignatureState::OK && bCertValid && !bCompleteSignature) - nResult = SignatureState::PARTIAL_OK; - - // this code must not check whether the document is modified - // it should only check the provided info - - return nResult; -} - /// Does this ZIP storage have a signature stream? static bool HasSignatureStream(const uno::Reference<embed::XStorage>& xStorage) { @@ -1636,7 +1598,7 @@ SignatureState SfxObjectShell::ImplGetSignatureState( bool bScriptingContent ) *pState = SignatureState::NOSIGNATURES; uno::Sequence< security::DocumentSignatureInformation > aInfos = GetDocumentSignatureInformation( bScriptingContent ); - *pState = ImplCheckSignaturesInformation( aInfos ); + *pState = DocumentSignatures::getSignatureState(aInfos); } if ( *pState == SignatureState::OK || *pState == SignatureState::NOTVALIDATED diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 56b8fdde8e0a..67e642171f06 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1582,7 +1582,7 @@ bool SfxObjectShell::SaveTo_Impl uno::Sequence< security::DocumentSignatureInformation > aInfos = xDDSigns->verifyScriptingContentSignatures( xTarget, uno::Reference< io::XInputStream >() ); - SignatureState nState = ImplCheckSignaturesInformation( aInfos ); + SignatureState nState = DocumentSignatures::getSignatureState(aInfos); if ( nState == SignatureState::OK || nState == SignatureState::NOTVALIDATED || nState == SignatureState::PARTIAL_OK) { diff --git a/sfx2/source/doc/signaturestate.cxx b/sfx2/source/doc/signaturestate.cxx new file mode 100644 index 000000000000..d511fa31afed --- /dev/null +++ b/sfx2/source/doc/signaturestate.cxx @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <sfx2/signaturestate.hxx> + +#include <com/sun/star/security/CertificateValidity.hpp> +#include <com/sun/star/security/DocumentSignatureInformation.hpp> + +using namespace css; + +namespace DocumentSignatures +{ +SignatureState +getSignatureState(const uno::Sequence<security::DocumentSignatureInformation>& aSigInfo) +{ + bool bCertValid = true; + SignatureState nResult = SignatureState::NOSIGNATURES; + bool bCompleteSignature = true; + if (!aSigInfo.hasElements()) + return nResult; + + nResult = SignatureState::OK; + for (const auto& rInfo : aSigInfo) + { + if (bCertValid) + { + sal_Int32 nCertStat = rInfo.CertificateStatus; + bCertValid = nCertStat == security::CertificateValidity::VALID; + } + + if (!rInfo.SignatureIsValid) + { + nResult = SignatureState::BROKEN; + break; + } + bCompleteSignature &= !rInfo.PartialDocumentSignature; + } + + if (nResult == SignatureState::OK && !bCertValid && !bCompleteSignature) + nResult = SignatureState::NOTVALIDATED_PARTIAL_OK; + else if (nResult == SignatureState::OK && !bCertValid) + nResult = SignatureState::NOTVALIDATED; + else if (nResult == SignatureState::OK && bCertValid && !bCompleteSignature) + nResult = SignatureState::PARTIAL_OK; + + // this code must not check whether the document is modified + // it should only check the provided info + + return nResult; +} +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |