From 517994c640ac83d48b9e5f238bc4d219ebd6abbd Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 21 Dec 2016 08:06:10 +0100 Subject: xmlsecurity: instantiate SignatureCreatorImpl directly in XSecController Going via UNO for a class in the same module is an overkill. Change-Id: I3a24bc770e40be5b0a6fc34206e92f968de060ae Reviewed-on: https://gerrit.libreoffice.org/32271 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- xmlsecurity/inc/framework/signaturecreatorimpl.hxx | 114 +++++++++++++++++++++ .../source/framework/signaturecreatorimpl.cxx | 2 +- .../source/framework/signaturecreatorimpl.hxx | 114 --------------------- xmlsecurity/source/framework/xsec_framework.cxx | 2 +- xmlsecurity/source/helper/xsecsign.cxx | 14 +-- 5 files changed, 118 insertions(+), 128 deletions(-) create mode 100644 xmlsecurity/inc/framework/signaturecreatorimpl.hxx delete mode 100644 xmlsecurity/source/framework/signaturecreatorimpl.hxx (limited to 'xmlsecurity') diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx new file mode 100644 index 000000000000..ce5e01f08eb7 --- /dev/null +++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx @@ -0,0 +1,114 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATURECREATORIMPL_HXX +#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATURECREATORIMPL_HXX + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "framework/signatureengine.hxx" + +typedef cppu::ImplInheritanceHelper +< + SignatureEngine, + css::xml::crypto::sax::XBlockerMonitor, + css::xml::crypto::sax::XSignatureCreationResultBroadcaster, + css::lang::XInitialization, + css::lang::XServiceInfo +> SignatureCreatorImpl_Base; + +class XSECFW_DLLPUBLIC SignatureCreatorImpl : public SignatureCreatorImpl_Base +/****** SignatureCreatorImpl.hxx/CLASS SignatureCreatorImpl ******************* + * + * NAME + * SignatureCreatorImpl -- generates a signature + * + * FUNCTION + * Collects all resources for a signature generation, then generates the + * signature by invoking a xmlsec-based signature bridge component. + ******************************************************************************/ +{ +private: + /* + * the Id of template blocker. + */ + sal_Int32 m_nIdOfBlocker; + + css::uno::Reference< css::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment; + + virtual void notifyResultListener() const + throw (css::uno::Exception, css::uno::RuntimeException) override; + virtual void clearUp( ) const override; + virtual bool checkReady() const override; + virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) + throw (css::uno::Exception, css::uno::RuntimeException) override; + +public: + explicit SignatureCreatorImpl( const css::uno::Reference< css::uno::XComponentContext > & xContext ); + virtual ~SignatureCreatorImpl() override; + + /* XBlockerMonitor */ + virtual void SAL_CALL setBlockerId( sal_Int32 id ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + + /* XSignatureCreationResultBroadcaster */ + void SAL_CALL addSignatureCreationResultListener( + const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + + void SAL_CALL removeSignatureCreationResultListener( + const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener ) + throw (css::uno::RuntimeException, std::exception) override; + + /* XInitialization */ + virtual void SAL_CALL initialize( + const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + + /* XServiceInfo */ + virtual OUString SAL_CALL getImplementationName( ) + throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw (css::uno::RuntimeException, std::exception) override; +}; + +OUString SignatureCreatorImpl_getImplementationName() + throw ( css::uno::RuntimeException ); + +css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ) + throw ( css::uno::RuntimeException ); + +css::uno::Reference< css::uno::XInterface > +SAL_CALL SignatureCreatorImpl_createInstance( + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) + throw ( css::uno::Exception ); + +#endif + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index 905db95a6787..e9269c267c20 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -18,7 +18,7 @@ */ -#include "signaturecreatorimpl.hxx" +#include "framework/signaturecreatorimpl.hxx" #include #include #include diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx deleted file mode 100644 index 81a8fc3f2731..000000000000 --- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx +++ /dev/null @@ -1,114 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_SIGNATURECREATORIMPL_HXX -#define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_SIGNATURECREATORIMPL_HXX - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "framework/signatureengine.hxx" - -typedef cppu::ImplInheritanceHelper -< - SignatureEngine, - css::xml::crypto::sax::XBlockerMonitor, - css::xml::crypto::sax::XSignatureCreationResultBroadcaster, - css::lang::XInitialization, - css::lang::XServiceInfo -> SignatureCreatorImpl_Base; - -class SignatureCreatorImpl : public SignatureCreatorImpl_Base -/****** SignatureCreatorImpl.hxx/CLASS SignatureCreatorImpl ******************* - * - * NAME - * SignatureCreatorImpl -- generates a signature - * - * FUNCTION - * Collects all resources for a signature generation, then generates the - * signature by invoking a xmlsec-based signature bridge component. - ******************************************************************************/ -{ -private: - /* - * the Id of template blocker. - */ - sal_Int32 m_nIdOfBlocker; - - css::uno::Reference< css::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment; - - virtual void notifyResultListener() const - throw (css::uno::Exception, css::uno::RuntimeException) override; - virtual void clearUp( ) const override; - virtual bool checkReady() const override; - virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) - throw (css::uno::Exception, css::uno::RuntimeException) override; - -public: - explicit SignatureCreatorImpl( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~SignatureCreatorImpl() override; - - /* XBlockerMonitor */ - virtual void SAL_CALL setBlockerId( sal_Int32 id ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - - /* XSignatureCreationResultBroadcaster */ - void SAL_CALL addSignatureCreationResultListener( - const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - - void SAL_CALL removeSignatureCreationResultListener( - const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener ) - throw (css::uno::RuntimeException, std::exception) override; - - /* XInitialization */ - virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - - /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; -}; - -OUString SignatureCreatorImpl_getImplementationName() - throw ( css::uno::RuntimeException ); - -css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL SignatureCreatorImpl_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) - throw ( css::uno::Exception ); - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx index bfe132efce32..2afd010fee56 100644 --- a/xmlsecurity/source/framework/xsec_framework.cxx +++ b/xmlsecurity/source/framework/xsec_framework.cxx @@ -24,7 +24,7 @@ #include "decryptorimpl.hxx" #include "encryptorimpl.hxx" -#include "signaturecreatorimpl.hxx" +#include "framework/signaturecreatorimpl.hxx" #include "framework/signatureverifierimpl.hxx" #include "framework/saxeventkeeperimpl.hxx" #include "xmlencryptiontemplateimpl.hxx" diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index 40d1fd0e3848..eabae475bb02 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -30,7 +30,7 @@ #include #include -#include +#include "framework/signaturecreatorimpl.hxx" using namespace com::sun::star; namespace cssu = com::sun::star::uno; @@ -38,9 +38,6 @@ namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; namespace cssxs = com::sun::star::xml::sax; -/* xml security framework components */ -#define SIGNATURECREATOR_COMPONENT "com.sun.star.xml.crypto.sax.SignatureCreator" - /* protected: for signature generation */ OUString XSecController::createId() { @@ -66,20 +63,13 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar SignatureReferenceInformations& vReferenceInfors = internalSignatureInfor.signatureInfor.vSignatureReferenceInfors; sal_Int32 nIdOfSignatureElementCollector; - cssu::Reference< cssxc::sax::XReferenceResolvedListener > xReferenceResolvedListener; nIdOfSignatureElementCollector = m_xSAXEventKeeper->addSecurityElementCollector( cssxc::sax::ElementMarkPriority_AFTERMODIFY, true ); m_xSAXEventKeeper->setSecurityId(nIdOfSignatureElementCollector, nSecurityId); - /* - * create a SignatureCreator - */ - cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() ); - xReferenceResolvedListener.set( - xMCF->createInstanceWithContext(SIGNATURECREATOR_COMPONENT, mxCtx), - cssu::UNO_QUERY); + uno::Reference xReferenceResolvedListener(new SignatureCreatorImpl(mxCtx)); cssu::Reference xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY); -- cgit