Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 00:09:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Support --key-file in keepassxc-cli extract (#824)

Browse Source
This commit is contained in:
Yen Chi Hsuan 2017-08-02 04:57:19 +08:00 committed by louib
parent 839a61ef59
commit 23b818f9e6
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cli/Extract.cpp
View File

@ -28,6 +28,7 @@
#include "core/Database.h"
#include "format/KeePass2Reader.h"
#include "keys/CompositeKey.h"
#include "keys/FileKey.h"
#include "keys/PasswordKey.h"
Extract::Extract()
@ -43,10 +44,16 @@ Extract::~Extract()
int Extract::execute(QStringList arguments)
{
QTextStream out(stdout);
QTextStream errorTextStream(stderr);
QCommandLineParser parser;
parser.setApplicationDescription(this->description);
parser.addPositionalArgument("database", QObject::tr("Path of the database to extract."));
QCommandLineOption keyFile(QStringList() << "k"
<< "key-file",
QObject::tr("Key file of the database."),
QObject::tr("path"));
parser.addOption(keyFile);
parser.process(arguments);
const QStringList args = parser.positionalArguments();
@ -65,6 +72,20 @@ int Extract::execute(QStringList arguments)
passwordKey.setPassword(line);
compositeKey.addKey(passwordKey);
QString keyFilePath = parser.value(keyFile);
if (!keyFilePath.isEmpty()) {
FileKey fileKey;
QString errorMsg;
if (!fileKey.load(keyFilePath, &errorMsg)) {
errorTextStream << QObject::tr("Failed to load key file %s: %s").arg(keyFilePath).arg(errorMsg);
errorTextStream << endl;
return EXIT_FAILURE;
}
compositeKey.addKey(fileKey);
}
QString databaseFilename = args.at(0);
QFile dbFile(databaseFilename);
if (!dbFile.exists()) {