6e76e8a210
The problem is that ZipPackageStream::GetEncryptionData() doesn't handle
the checksum correctly; what is required here is *no checksum* but the
check of m_oImportedChecksumAlgorithm results in calling
m_rZipPackage.GetChecksumAlgID() instead, so it ends up in invalid
situation and assert:
package/source/zippackage/ZipPackageStream.cxx:656: virtual bool ZipPackageStream::saveChild(): Assertion `xEncData->m_nEncAlg != xml::crypto::CipherID::AES_GCM_W3C' failed.
Refactor this so all the imported algorithm identifiers are in a struct
in a std::optional member.
(regression from commit 09f23a3dc5)
Change-Id: I4b705520cd9bc800ce3c8611f8ad01a1e1008929
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173342
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins
171 lines
7.6 KiB
C++
171 lines
7.6 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 .
|
|
*/
|
|
#ifndef INCLUDED_PACKAGE_INC_ZIPPACKAGE_HXX
|
|
#define INCLUDED_PACKAGE_INC_ZIPPACKAGE_HXX
|
|
|
|
#include <cppuhelper/implbase.hxx>
|
|
#include <com/sun/star/lang/XInitialization.hpp>
|
|
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
|
|
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
|
|
#include <com/sun/star/util/XChangesBatch.hpp>
|
|
#include <com/sun/star/beans/XPropertySet.hpp>
|
|
#include <com/sun/star/beans/PropertyValue.hpp>
|
|
#include <com/sun/star/beans/NamedValue.hpp>
|
|
#include <com/sun/star/lang/XServiceInfo.hpp>
|
|
#include <com/sun/star/xml/crypto/CipherID.hpp>
|
|
#include <comphelper/refcountedmutex.hxx>
|
|
#include <rtl/ref.hxx>
|
|
#include <o3tl/unreachable.hxx>
|
|
|
|
#include "HashMaps.hxx"
|
|
#include "ZipFile.hxx"
|
|
#include <vector>
|
|
#include <optional>
|
|
|
|
class SvStream;
|
|
class ZipOutputStream;
|
|
class ZipPackageFolder;
|
|
class ZipFile;
|
|
namespace com::sun::star {
|
|
namespace container { class XNameContainer; }
|
|
namespace io { class XStream; class XOutputStream; class XInputStream; class XSeekable; class XActiveDataStreamer; }
|
|
namespace lang { class XMultiServiceFactory; }
|
|
namespace uno { class XComponentContext; }
|
|
namespace task { class XInteractionHandler; }
|
|
}
|
|
|
|
enum InitialisationMode
|
|
{
|
|
e_IMode_None,
|
|
e_IMode_URL,
|
|
e_IMode_XInputStream,
|
|
e_IMode_XStream
|
|
};
|
|
|
|
sal_Int32 GetDefaultDerivedKeySize(sal_Int32 nCipherID);
|
|
|
|
class ZipPackage final : public cppu::WeakImplHelper
|
|
<
|
|
css::lang::XInitialization,
|
|
css::lang::XSingleServiceFactory,
|
|
css::lang::XServiceInfo,
|
|
css::container::XHierarchicalNameAccess,
|
|
css::util::XChangesBatch,
|
|
css::beans::XPropertySet
|
|
>
|
|
{
|
|
rtl::Reference<comphelper::RefCountedMutex> m_aMutexHolder;
|
|
|
|
css::uno::Sequence< css::beans::NamedValue > m_aStorageEncryptionKeys;
|
|
css::uno::Sequence< sal_Int8 > m_aEncryptionKey;
|
|
css::uno::Sequence< css::uno::Sequence< css::beans::NamedValue > > m_aGpgProps;
|
|
|
|
FolderHash m_aRecent;
|
|
OUString m_aURL;
|
|
|
|
sal_Int32 m_nStartKeyGenerationID;
|
|
::std::optional<sal_Int32> m_oChecksumDigestID;
|
|
sal_Int32 m_nKeyDerivationFunctionID;
|
|
sal_Int32 m_nCommonEncryptionID;
|
|
bool m_bHasEncryptedEntries;
|
|
bool m_bHasNonEncryptedEntries;
|
|
|
|
bool m_bInconsistent;
|
|
bool m_bForceRecovery;
|
|
|
|
bool m_bMediaTypeFallbackUsed;
|
|
sal_Int32 m_nFormat;
|
|
bool m_bAllowRemoveOnInsert;
|
|
|
|
InitialisationMode m_eMode;
|
|
|
|
rtl::Reference < ZipPackageFolder > m_xRootFolder;
|
|
css::uno::Reference < css::io::XStream > m_xStream;
|
|
css::uno::Reference < css::io::XInputStream > m_xContentStream;
|
|
css::uno::Reference < css::io::XSeekable > m_xContentSeek;
|
|
const css::uno::Reference < css::uno::XComponentContext > m_xContext;
|
|
|
|
std::optional<ZipFile> m_pZipFile;
|
|
bool m_bDisableFileSync = false;
|
|
|
|
bool isLocalFile() const;
|
|
|
|
void checkZipEntriesWithDD();
|
|
void parseManifest();
|
|
void parseContentType();
|
|
void getZipFileContents();
|
|
|
|
void WriteMimetypeMagicFile( ZipOutputStream& aZipOut );
|
|
void WriteManifest( ZipOutputStream& aZipOut, const ::std::vector< css::uno::Sequence< css::beans::PropertyValue > >& aManList );
|
|
void WriteContentTypes( ZipOutputStream& aZipOut, const ::std::vector< css::uno::Sequence< css::beans::PropertyValue > >& aManList );
|
|
|
|
css::uno::Reference< css::io::XInputStream > writeTempFile();
|
|
css::uno::Reference < css::io::XActiveDataStreamer > openOriginalForOutput();
|
|
void DisconnectFromTargetAndThrowException_Impl(
|
|
const css::uno::Reference< css::io::XInputStream >& xTempStream );
|
|
|
|
public:
|
|
ZipPackage( css::uno::Reference < css::uno::XComponentContext > xContext );
|
|
virtual ~ZipPackage() override;
|
|
ZipFile& getZipFile() { return *m_pZipFile;}
|
|
sal_Int32 getFormat() const { return m_nFormat; }
|
|
|
|
sal_Int32 GetStartKeyGenID() const { return m_nStartKeyGenerationID; }
|
|
sal_Int32 GetEncAlgID() const { return m_nCommonEncryptionID; }
|
|
::std::optional<sal_Int32> GetChecksumAlgID() const { return m_oChecksumDigestID; }
|
|
sal_Int32 GetDefaultDerivedKeySize() const {
|
|
return ::GetDefaultDerivedKeySize(m_nCommonEncryptionID);
|
|
}
|
|
|
|
rtl::Reference<comphelper::RefCountedMutex>& GetSharedMutexRef() { return m_aMutexHolder; }
|
|
|
|
void ConnectTo( const css::uno::Reference< css::io::XInputStream >& xInStream );
|
|
css::uno::Sequence< sal_Int8 > GetEncryptionKey();
|
|
|
|
// XInitialization
|
|
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
|
|
// XHierarchicalNameAccess
|
|
virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString& aName ) override;
|
|
virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName ) override;
|
|
// XSingleServiceFactory
|
|
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) override;
|
|
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
|
|
// XChangesBatch
|
|
virtual void SAL_CALL commitChanges( ) override;
|
|
virtual sal_Bool SAL_CALL hasPendingChanges( ) override;
|
|
virtual css::uno::Sequence< css::util::ElementChange > SAL_CALL getPendingChanges( ) override;
|
|
// XPropertySet
|
|
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
|
|
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
|
|
virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
|
|
virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
|
|
virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
|
|
virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
|
|
virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
|
|
|
|
// XServiceInfo
|
|
virtual OUString SAL_CALL getImplementationName( ) override;
|
|
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
|
|
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
|
|
};
|
|
#endif
|
|
|
|
extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportZip(SvStream& rStream);
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|