e5a0209d4b
Sign a document with macros (via file -> digital signatures -> digital signatures), realize that you still get a warning on file open, sign the macros in the document (via tools -> macros -> digital signature), realize that you did this in the wrong order, so now you have to re-sign the doc content. The reason for this is that the macro signature only signs the macro parts of the document (so you can still edit the document and the signature is valid, as long as you don't touch macros), while the doc content signature signs everything, including the macro signature, so the order of the two matters. Solve this trouble by adding a new setting that allows doing the two signatures in one step. Do this by extending the doc content signing code with an optional pre-step that first signs the document macros. This is a bit tricky to do, since xmlsecurity/ gets an RW signature stream and a RO document storage from sfx2/, but transferring one more signature stream can solve this trouble. Other tricky parts of the change: 1) The crypto signing is always done by libxmlsec, so DigitalSignaturesDialog::SetScriptingSignatureStream() has to update the storage of the sign manager's sign helper, otherwise, the hashes in the macro signature will be empty. 2) Signing reads the RO storage, so normally the macro signature would not be part of the doc signature when creating both signatures inside a single dialog. (The storage is only committed after the dialog ends.) Fix this problem by extending DocumentSignatureManager::add() and UriBindingHelper::OpenInputStream() to provide kind of an overlay when xmlsecurity/ gets a script signature stream: this way the macro signature will be part of the doc signature while the dialog is in progress. No overlay is needed later, once both streams are committed to the storage on dialog end. Change-Id: Ic2728689997165595991d5ec59c7a2683286e22d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173263 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
176 lines
9.3 KiB
C++
176 lines
9.3 KiB
C++
/* -*- 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 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <tools/link.hxx>
|
|
#include <rtl/ustring.hxx>
|
|
#include <rtl/ref.hxx>
|
|
#include <svl/sigstruct.hxx>
|
|
#include "xmlsecuritydllapi.h"
|
|
#include "xsecctl.hxx"
|
|
|
|
#include <com/sun/star/security/XCertificate.hpp>
|
|
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
|
|
|
|
class DateTime;
|
|
class UriBindingHelper;
|
|
|
|
namespace com::sun::star {
|
|
namespace io {
|
|
class XOutputStream;
|
|
class XInputStream;
|
|
class XStream;
|
|
}
|
|
namespace embed { class XStorage; }
|
|
}
|
|
|
|
namespace com::sun::star::graphic { class XGraphic; }
|
|
namespace com::sun::star::uno { class XComponentContext; }
|
|
namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
|
|
namespace com::sun::star::xml::sax { class XDocumentHandler; }
|
|
namespace com::sun::star::xml::sax { class XWriter; }
|
|
|
|
/**********************************************************
|
|
XMLSignatureHelper
|
|
|
|
Helper class for the XML Security framework
|
|
|
|
Functions:
|
|
1. help to create a security context;
|
|
2. help to listen signature creation result;
|
|
3. help to listen signature verify result;
|
|
4. help to indicate which signature to verify.
|
|
|
|
**********************************************************/
|
|
|
|
class XMLSignatureHelper
|
|
{
|
|
private:
|
|
css::uno::Reference< css::uno::XComponentContext > mxCtx;
|
|
rtl::Reference<UriBindingHelper> mxUriBinding;
|
|
|
|
rtl::Reference<XSecController> mpXSecController;
|
|
bool mbError;
|
|
bool mbODFPre1_2;
|
|
Link<LinkParamNone*,bool> maStartVerifySignatureHdl;
|
|
|
|
private:
|
|
XMLSignatureHelper(const XMLSignatureHelper&) = delete;
|
|
|
|
public:
|
|
XMLSignatureHelper(const css::uno::Reference< css::uno::XComponentContext >& mrCtx );
|
|
~XMLSignatureHelper();
|
|
|
|
void StartVerifySignatureElement();
|
|
|
|
// Set the storage which should be used by the default UriBinding
|
|
// Must be set before StartMission().
|
|
//sODFVersion indicates the ODF version
|
|
XMLSECURITY_DLLPUBLIC void SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStorage, std::u16string_view sODFVersion, const css::uno::Reference<css::io::XStream>& xScriptStream = css::uno::Reference<css::io::XStream>() );
|
|
|
|
// Argument for the Link is a uno::Reference< xml::sax::XAttributeList >*
|
|
// Return 1 to verify, 0 to skip.
|
|
// Default handler will verify all.
|
|
void SetStartVerifySignatureHdl( const Link<LinkParamNone*,bool>& rLink );
|
|
|
|
// After signing/verifying, get information about signatures
|
|
SignatureInformation GetSignatureInformation( sal_Int32 nSecurityId ) const;
|
|
SignatureInformations GetSignatureInformations() const;
|
|
/// ImplVerifySignature calls this to figure out which X509Data is the
|
|
/// signing certificate and update the internal state with the result.
|
|
/// @return
|
|
/// A sequence with the signing certificate at the back on success.
|
|
/// An empty sequence on failure.
|
|
std::vector<css::uno::Reference<css::security::XCertificate>>
|
|
CheckAndUpdateSignatureInformation(
|
|
css::uno::Reference<css::xml::crypto::XSecurityEnvironment> const& xSecEnv,
|
|
SignatureInformation const& rInfo);
|
|
|
|
// See XSecController for documentation
|
|
void StartMission(const css::uno::Reference<css::xml::crypto::XXMLSecurityContext>& xSecurityContext);
|
|
void EndMission();
|
|
sal_Int32 GetNewSecurityId();
|
|
/** sets data that describes the certificate.
|
|
|
|
It is absolutely necessary that the parameter ouX509IssuerName is set. It contains
|
|
the base64 encoded certificate, which is DER encoded. The XMLSec needs it to find
|
|
the private key. Although issuer name and certificate should be sufficient to identify
|
|
the certificate the implementation in XMLSec is broken, both for Windows and mozilla.
|
|
The reason is that they use functions to find the certificate which take as parameter
|
|
the DER encoded ASN.1 issuer name. The issuer name is a DName, where most attributes
|
|
are of type DirectoryName, which is a choice of 5 string types. This information is
|
|
not contained in the issuer string and while it is converted to the ASN.1 name the
|
|
conversion function must assume a particular type, which is often wrong. For example,
|
|
the Windows function CertStrToName will use a T.61 string if the string does not contain
|
|
special characters. So if the certificate uses simple characters but encodes the
|
|
issuer attributes in Utf8, then CertStrToName will use T.61. The resulting DER encoded
|
|
ASN.1 name now contains different bytes which indicate the string type. The functions
|
|
for finding the certificate apparently use memcmp - hence they fail to find the
|
|
certificate.
|
|
*/
|
|
void SetX509Certificate(sal_Int32 nSecurityId, const OUString& ouX509IssuerName,
|
|
const OUString& ouX509SerialNumber, const OUString& ouX509Cert, const OUString& ouX509CertDigest,
|
|
svl::crypto::SignatureMethodAlgorithm eAlgorithmID);
|
|
|
|
void AddEncapsulatedX509Certificate(const OUString& ouEncapsulatedX509Certificate);
|
|
|
|
void SetGpgCertificate(sal_Int32 nSecurityId, const OUString& ouGpgCertDigest,
|
|
const OUString& ouGpgCert, const OUString& ouGpgOwner);
|
|
|
|
void SetDateTime( sal_Int32 nSecurityId, const DateTime& rDateTime );
|
|
void SetDescription(sal_Int32 nSecurityId, const OUString& rDescription);
|
|
void SetSignatureLineId(sal_Int32 nSecurityId, const OUString& rSignatureLineId);
|
|
void
|
|
SetSignatureLineValidGraphic(sal_Int32 nSecurityId,
|
|
const css::uno::Reference<css::graphic::XGraphic>& xValidGraphic);
|
|
void SetSignatureLineInvalidGraphic(
|
|
sal_Int32 nSecurityId, const css::uno::Reference<css::graphic::XGraphic>& xInvalidGraphic);
|
|
|
|
void AddForSigning( sal_Int32 securityId, const OUString& uri, bool bBinary, bool bXAdESCompliantIfODF );
|
|
void CreateAndWriteSignature( const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler, bool bXAdESCompliantIfODF );
|
|
bool ReadAndVerifySignature( const css::uno::Reference< css::io::XInputStream >& xInputStream );
|
|
|
|
// MT: ??? I think only for adding/removing, not for new signatures...
|
|
// MM: Yes, but if you want to insert a new signature into an existing signature file, those function
|
|
// will be very useful, see Mission 3 in the new "multisigdemo" program :-)
|
|
css::uno::Reference< css::xml::sax::XWriter> CreateDocumentHandlerWithHeader( const css::uno::Reference< css::io::XOutputStream >& xOutputStream );
|
|
static void CloseDocumentHandler( const css::uno::Reference< css::xml::sax::XDocumentHandler>& xDocumentHandler );
|
|
static void ExportSignature(
|
|
const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler,
|
|
const SignatureInformation& signatureInfo,
|
|
bool bXAdESCompliantIfODF );
|
|
|
|
/// Read and verify OOXML signatures.
|
|
bool ReadAndVerifySignatureStorage(const css::uno::Reference<css::embed::XStorage>& xStorage, bool bCacheLastSignature = true);
|
|
/// Read and verify a single OOXML signature.
|
|
bool ReadAndVerifySignatureStorageStream(const css::uno::Reference<css::io::XInputStream>& xInputStream);
|
|
/// Adds or removes an OOXML digital signature relation to _rels/.rels if there wasn't any before.
|
|
void EnsureSignaturesRelation(const css::uno::Reference<css::embed::XStorage>& xStorage, bool bAdd);
|
|
/// Given that xStorage is an OOXML _xmlsignatures storage, create origin.sigs and its relations.
|
|
void ExportSignatureRelations(const css::uno::Reference<css::embed::XStorage>& xStorage, int nSignatureCount);
|
|
/// Given that xSignatureStorage is an OOXML _xmlsignatures storage, create and write a new signature.
|
|
void CreateAndWriteOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::embed::XStorage>& xSignatureStorage, int nSignatureIndex);
|
|
/// Similar to CreateAndWriteOOXMLSignature(), but used to write the signature to the persistent storage, not the temporary one.
|
|
void ExportOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::embed::XStorage>& xSignatureStorage, const SignatureInformation& rInformation, int nSignatureIndex);
|
|
/// Given that xStorage is an OOXML root storage, advertise signatures in its [Content_Types].xml stream.
|
|
void ExportSignatureContentTypes(const css::uno::Reference<css::embed::XStorage>& xStorage, int nSignatureCount);
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|