mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-02-07 02:15:21 -05:00
504904a414
Previously, extracting the XML from a database was done with the `saveXml` attribute in the `KeePass2Reader` class. This had several unfortunate consequences: * The `KdbxReader` class had to import the `KdbxXmlWriter` class in order to perform the export (bad separation of concerns); * The CLI database unlocking logic had to be duplicated only for the `Extract` command; * The `xmlData` had to be stored in the `KeePass2Reader` as a temporary result. * Lots of `setSaveXml` functions were implemented only to trickle down this functionality. Also, the naming of the `saveXml` variable was not really helpful to understand it's role. Overall, this change will make it easier to maintain and expand the CLI database unlocking logic (for example, adding a `--no-password` option as requested in https://github.com/keepassxreboot/keepassxc/issues/1873) It also opens to door to other types of extraction/exporting (for example exporting to CSV, as requested in https://github.com/keepassxreboot/keepassxc/issues/2572)
58 lines
1.6 KiB
C++
58 lines
1.6 KiB
C++
/*
|
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 or (at your option)
|
|
* version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef KEEPASSX_KEEPASS2READER_H
|
|
#define KEEPASSX_KEEPASS2READER_H
|
|
|
|
#include "KdbxReader.h"
|
|
#include "core/Database.h"
|
|
#include "format/KeePass2.h"
|
|
#include "keys/CompositeKey.h"
|
|
|
|
#include <QByteArray>
|
|
#include <QCoreApplication>
|
|
#include <QIODevice>
|
|
#include <QScopedPointer>
|
|
#include <QString>
|
|
#include <QtGlobal>
|
|
|
|
class KeePass2Reader
|
|
{
|
|
Q_DECLARE_TR_FUNCTIONS(KdbxReader)
|
|
|
|
public:
|
|
bool readDatabase(const QString& filename, QSharedPointer<const CompositeKey> key, Database* db);
|
|
bool readDatabase(QIODevice* device, QSharedPointer<const CompositeKey> key, Database* db);
|
|
|
|
bool hasError() const;
|
|
QString errorString() const;
|
|
|
|
QSharedPointer<KdbxReader> reader() const;
|
|
quint32 version() const;
|
|
|
|
private:
|
|
void raiseError(const QString& errorMessage);
|
|
|
|
bool m_error = false;
|
|
QString m_errorStr = "";
|
|
|
|
QSharedPointer<KdbxReader> m_reader;
|
|
quint32 m_version = 0;
|
|
};
|
|
|
|
#endif // KEEPASSX_KEEPASS2READER_H
|