mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Feature : --key-file option for CLI (#816)

Browse source 
* removing readFromLine

* Removing gui-prompt

* execute uses an arg list.

* Testing with key-file

* Fixing the -a option in EntropyMeter.
This commit is contained in:
louib 2017-07-25 13:41:52 -04:00 • committed by GitHub
parent 1edabc4b3c
commit 1d30283514
23 changed files with 92 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/cli/Extract.cpp
View file

@ -21,15 +21,14 @@
#include "Extract.h"
#include <QCommandLineParser>
#include <QCoreApplication>
#include <QFile>
#include <QStringList>
#include <QTextStream>
#include "cli/Utils.h"
#include "core/Database.h"
#include "format/KeePass2Reader.h"
#include "keys/CompositeKey.h"
#include "keys/PasswordKey.h"
Extract::Extract()
{
@ -41,15 +40,8 @@ Extract::~Extract()
{
}
int Extract::execute(int argc, char** argv)
int Extract::execute(QStringList arguments)
{
QStringList arguments;
// Skipping the first argument (keepassxc).
for (int i = 1; i < argc; ++i) {
arguments << QString(argv[i]);
}
QCoreApplication app(argc, argv);
QTextStream out(stdout);
QCommandLineParser parser;
@ -66,8 +58,12 @@ int Extract::execute(int argc, char** argv)
out << "Insert the database password\n> ";
out.flush();
CompositeKey compositeKey;
QString line = Utils::getPassword();
CompositeKey key = CompositeKey::readFromLine(line);
PasswordKey passwordKey;
passwordKey.setPassword(line);
compositeKey.addKey(passwordKey);
QString databaseFilename = args.at(0);
QFile dbFile(databaseFilename);
@ -82,7 +78,7 @@ int Extract::execute(int argc, char** argv)
KeePass2Reader reader;
reader.setSaveXml(true);
Database* db = reader.readDatabase(&dbFile, key);
Database* db = reader.readDatabase(&dbFile, compositeKey);
delete db;
QByteArray xmlData = reader.xmlData();