From 5bc3924756bed2cbe3a723b2ea0e18ae06f93315 Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Fri, 6 Jan 2017 16:25:26 -0500 Subject: [PATCH 01/10] Merge databases script. --- .gitignore | 2 + utils/CMakeLists.txt | 10 ++++ utils/merge-databases.cpp | 121 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+) create mode 100644 utils/merge-databases.cpp diff --git a/.gitignore b/.gitignore index 081abf831..8882e10cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ CMakeLists.txt.* build*/ +*.swp +cmake/ diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index d0cfb5a31..3887c9a22 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -25,6 +25,16 @@ target_link_libraries(kdbx-extract ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES}) +add_executable(merge-databases merge-databases.cpp) +target_link_libraries(merge-databases + keepassx_core + ${MHD_LIBRARIES} + Qt5::Core + Qt5::Concurrent + Qt5::Widgets + ${GCRYPT_LIBRARIES} + ${ZLIB_LIBRARIES}) + add_executable(entropy-meter entropy-meter.cpp) target_link_libraries(entropy-meter zxcvbn) diff --git a/utils/merge-databases.cpp b/utils/merge-databases.cpp new file mode 100644 index 000000000..9809aa1c7 --- /dev/null +++ b/utils/merge-databases.cpp @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2010 Felix Geyer + * + * 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 . + */ + +#include + +#include +#include +#include +#include +#include + +#include "core/Database.h" +#include "crypto/Crypto.h" +#include "format/KeePass2Reader.h" +#include "format/KeePass2Writer.h" +#include "keys/CompositeKey.h" +#include "keys/FileKey.h" +#include "keys/PasswordKey.h" + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + + if (app.arguments().size() != 4) { + qCritical("Usage: merge-databases "); + return 1; + } + + if (!Crypto::init()) { + qFatal("Fatal error while testing the cryptographic functions:\n%s", qPrintable(Crypto::errorString())); + } + + CompositeKey key; + if (QFile::exists(app.arguments().at(1))) { + FileKey fileKey; + fileKey.load(app.arguments().at(1)); + key.addKey(fileKey); + } + else { + PasswordKey password; + password.setPassword(app.arguments().at(1)); + key.addKey(password); + } + + + QFile dbFile1(app.arguments().at(2)); + if (!dbFile1.exists()) { + qCritical("File %s does not exist.", qPrintable(app.arguments().at(2))); + return 1; + } + if (!dbFile1.open(QIODevice::ReadOnly)) { + qCritical("Unable to open file %s.", qPrintable(app.arguments().at(2))); + return 1; + } + + KeePass2Reader reader1; + Database* db1 = reader1.readDatabase(&dbFile1, key); + + if (reader1.hasError()) { + qCritical("Error while parsing the database:\n%s\n", qPrintable(reader1.errorString())); + return 1; + } + + + QFile dbFile2(app.arguments().at(3)); + if (!dbFile2.exists()) { + qCritical("File %s does not exist.", qPrintable(app.arguments().at(3))); + return 1; + } + if (!dbFile2.open(QIODevice::ReadOnly)) { + qCritical("Unable to open file %s.", qPrintable(app.arguments().at(3))); + return 1; + } + + KeePass2Reader reader2; + Database* db2 = reader2.readDatabase(&dbFile2, key); + + if (reader1.hasError()) { + qCritical("Error while parsing the database:\n%s\n", qPrintable(reader1.errorString())); + return 1; + } + + db1->merge(db2); + + QSaveFile saveFile(app.arguments().at(2)); + if (!saveFile.open(QIODevice::WriteOnly)) { + qCritical("Unable to open file %s for writing.", qPrintable(app.arguments().at(2))); + return 1; + } + + KeePass2Writer writer; + writer.writeDatabase(&saveFile, db1); + + if (writer.hasError()) { + qCritical("Error while updating the database:\n%s\n", qPrintable(writer.errorString())); + return 1; + } + + if (!saveFile.commit()) { + qCritical("Error while updating the database:\n%s\n", qPrintable(writer.errorString())); + return 0; + } + + qInfo("Successfully merged the database files.\n"); + return 1; + +} From be827211d2a70602a647ca9e87763434a4fb7fb5 Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Fri, 6 Jan 2017 16:32:18 -0500 Subject: [PATCH 02/10] Removing unused imports. --- utils/merge-databases.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/merge-databases.cpp b/utils/merge-databases.cpp index 9809aa1c7..3644df187 100644 --- a/utils/merge-databases.cpp +++ b/utils/merge-databases.cpp @@ -20,8 +20,6 @@ #include #include #include -#include -#include #include "core/Database.h" #include "crypto/Crypto.h" From 007073354fddfa6b3a8dfaffcb64a16d3ff45224 Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Fri, 6 Jan 2017 20:19:26 -0500 Subject: [PATCH 03/10] Revert cmake in .gitignore. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8882e10cc..5a72e3303 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ CMakeLists.txt.* build*/ *.swp -cmake/ From 1458ba6f6f477a828834d9355c21e4efbc9a9b50 Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Fri, 6 Jan 2017 20:24:50 -0500 Subject: [PATCH 04/10] qInfo -> qDebug and missing imports. --- utils/merge-databases.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/merge-databases.cpp b/utils/merge-databases.cpp index 3644df187..e1a587fd2 100644 --- a/utils/merge-databases.cpp +++ b/utils/merge-databases.cpp @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include "core/Database.h" #include "crypto/Crypto.h" @@ -29,6 +31,7 @@ #include "keys/FileKey.h" #include "keys/PasswordKey.h" + int main(int argc, char **argv) { QCoreApplication app(argc, argv); @@ -113,7 +116,7 @@ int main(int argc, char **argv) return 0; } - qInfo("Successfully merged the database files.\n"); + qDebug("Successfully merged the database files.\n"); return 1; } From bdb49a36bf76023099569c480baf2f7c928bc767 Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Sat, 7 Jan 2017 13:12:30 -0500 Subject: [PATCH 05/10] Reverting .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5a72e3303..081abf831 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ CMakeLists.txt.* build*/ -*.swp From a40f84d519bc594341d44a305e195c6a20149955 Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Sat, 7 Jan 2017 15:14:54 -0500 Subject: [PATCH 06/10] Read the password from stdin. --- utils/merge-databases.cpp | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/utils/merge-databases.cpp b/utils/merge-databases.cpp index e1a587fd2..32178c01b 100644 --- a/utils/merge-databases.cpp +++ b/utils/merge-databases.cpp @@ -36,8 +36,8 @@ int main(int argc, char **argv) { QCoreApplication app(argc, argv); - if (app.arguments().size() != 4) { - qCritical("Usage: merge-databases "); + if (app.arguments().size() != 3) { + qCritical("Usage: merge-databases "); return 1; } @@ -45,26 +45,30 @@ int main(int argc, char **argv) qFatal("Fatal error while testing the cryptographic functions:\n%s", qPrintable(Crypto::errorString())); } + static QTextStream inputTextStream(stdin, QIODevice::ReadOnly); + QString line = inputTextStream.readLine(); + CompositeKey key; - if (QFile::exists(app.arguments().at(1))) { + if (QFile::exists(line)) { FileKey fileKey; - fileKey.load(app.arguments().at(1)); + fileKey.load(line); key.addKey(fileKey); } else { PasswordKey password; - password.setPassword(app.arguments().at(1)); + password.setPassword(line); key.addKey(password); } - QFile dbFile1(app.arguments().at(2)); + QString databaseFilename1 = app.arguments().at(1); + QFile dbFile1(databaseFilename1); if (!dbFile1.exists()) { - qCritical("File %s does not exist.", qPrintable(app.arguments().at(2))); + qCritical("File %s does not exist.", qPrintable(databaseFilename1)); return 1; } if (!dbFile1.open(QIODevice::ReadOnly)) { - qCritical("Unable to open file %s.", qPrintable(app.arguments().at(2))); + qCritical("Unable to open file %s.", qPrintable(databaseFilename1)); return 1; } @@ -77,13 +81,14 @@ int main(int argc, char **argv) } - QFile dbFile2(app.arguments().at(3)); + QString databaseFilename2 = app.arguments().at(2); + QFile dbFile2(databaseFilename2); if (!dbFile2.exists()) { - qCritical("File %s does not exist.", qPrintable(app.arguments().at(3))); + qCritical("File %s does not exist.", qPrintable(databaseFilename2)); return 1; } if (!dbFile2.open(QIODevice::ReadOnly)) { - qCritical("Unable to open file %s.", qPrintable(app.arguments().at(3))); + qCritical("Unable to open file %s.", qPrintable(databaseFilename2)); return 1; } @@ -97,9 +102,9 @@ int main(int argc, char **argv) db1->merge(db2); - QSaveFile saveFile(app.arguments().at(2)); + QSaveFile saveFile(databaseFilename1); if (!saveFile.open(QIODevice::WriteOnly)) { - qCritical("Unable to open file %s for writing.", qPrintable(app.arguments().at(2))); + qCritical("Unable to open file %s for writing.", qPrintable(databaseFilename1)); return 1; } From 2afa1f0dc8208709820655795f3e1cd5617eb36c Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Sun, 8 Jan 2017 22:46:30 -0500 Subject: [PATCH 07/10] Use 2 passwords for merging. --- utils/merge-databases.cpp | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/utils/merge-databases.cpp b/utils/merge-databases.cpp index 32178c01b..52a04e42a 100644 --- a/utils/merge-databases.cpp +++ b/utils/merge-databases.cpp @@ -46,18 +46,31 @@ int main(int argc, char **argv) } static QTextStream inputTextStream(stdin, QIODevice::ReadOnly); - QString line = inputTextStream.readLine(); - CompositeKey key; - if (QFile::exists(line)) { + QString line1 = inputTextStream.readLine(); + CompositeKey key1; + if (QFile::exists(line1)) { FileKey fileKey; - fileKey.load(line); - key.addKey(fileKey); + fileKey.load(line1); + key1.addKey(fileKey); } else { PasswordKey password; - password.setPassword(line); - key.addKey(password); + password.setPassword(line1); + key1.addKey(password); + } + + QString line2 = inputTextStream.readLine(); + CompositeKey key2; + if (QFile::exists(line2)) { + FileKey fileKey; + fileKey.load(line2); + key2.addKey(fileKey); + } + else { + PasswordKey password; + password.setPassword(line2); + key2.addKey(password); } @@ -73,7 +86,7 @@ int main(int argc, char **argv) } KeePass2Reader reader1; - Database* db1 = reader1.readDatabase(&dbFile1, key); + Database* db1 = reader1.readDatabase(&dbFile1, key1); if (reader1.hasError()) { qCritical("Error while parsing the database:\n%s\n", qPrintable(reader1.errorString())); @@ -93,10 +106,10 @@ int main(int argc, char **argv) } KeePass2Reader reader2; - Database* db2 = reader2.readDatabase(&dbFile2, key); + Database* db2 = reader2.readDatabase(&dbFile2, key2); - if (reader1.hasError()) { - qCritical("Error while parsing the database:\n%s\n", qPrintable(reader1.errorString())); + if (reader2.hasError()) { + qCritical("Error while parsing the database:\n%s\n", qPrintable(reader2.errorString())); return 1; } From a79366f1059e55500614d94178d7d84603e962ac Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Wed, 11 Jan 2017 21:00:11 -0500 Subject: [PATCH 08/10] Use QCommandLineParser * Switch to using QCommandLineParser * Implement the --same-password option * extract `getKeyFromLine` function --- utils/merge-databases.cpp | 69 ++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/utils/merge-databases.cpp b/utils/merge-databases.cpp index 52a04e42a..d67a87672 100644 --- a/utils/merge-databases.cpp +++ b/utils/merge-databases.cpp @@ -17,6 +17,7 @@ #include +#include #include #include #include @@ -31,13 +32,49 @@ #include "keys/FileKey.h" #include "keys/PasswordKey.h" +/* + * Read a key from a line of input. + * If the line references a valid file + * path, the key is loaded from file. + */ +CompositeKey readKeyFromLine(QString line) +{ + + CompositeKey key; + if (QFile::exists(line)) { + FileKey fileKey; + fileKey.load(line); + key.addKey(fileKey); + } + else { + PasswordKey password; + password.setPassword(line); + key.addKey(password); + } + return key; + +} int main(int argc, char **argv) { + QCoreApplication app(argc, argv); - if (app.arguments().size() != 3) { - qCritical("Usage: merge-databases "); + QCommandLineParser parser; + parser.setApplicationDescription(QCoreApplication::translate("main", "Merge 2 KeePassXC database files.")); + parser.addPositionalArgument("database1", QCoreApplication::translate("main", "path of the database to merge into.")); + parser.addPositionalArgument("database2", QCoreApplication::translate("main", "path of the database to merge from.")); + + QCommandLineOption samePasswordOption(QStringList() << "s" << "same-password", + QCoreApplication::translate("main", "use the same password for both database files.")); + + parser.addHelpOption(); + parser.addOption(samePasswordOption); + parser.process(app); + + const QStringList args = parser.positionalArguments(); + if (args.size() != 2) { + parser.showHelp(); return 1; } @@ -48,33 +85,19 @@ int main(int argc, char **argv) static QTextStream inputTextStream(stdin, QIODevice::ReadOnly); QString line1 = inputTextStream.readLine(); - CompositeKey key1; - if (QFile::exists(line1)) { - FileKey fileKey; - fileKey.load(line1); - key1.addKey(fileKey); - } - else { - PasswordKey password; - password.setPassword(line1); - key1.addKey(password); - } + CompositeKey key1 = readKeyFromLine(line1); - QString line2 = inputTextStream.readLine(); CompositeKey key2; - if (QFile::exists(line2)) { - FileKey fileKey; - fileKey.load(line2); - key2.addKey(fileKey); + if (parser.isSet("same-password")) { + key2 = *key1.clone(); } else { - PasswordKey password; - password.setPassword(line2); - key2.addKey(password); + QString line2 = inputTextStream.readLine(); + key2 = readKeyFromLine(line2); } - QString databaseFilename1 = app.arguments().at(1); + QString databaseFilename1 = args.at(0); QFile dbFile1(databaseFilename1); if (!dbFile1.exists()) { qCritical("File %s does not exist.", qPrintable(databaseFilename1)); @@ -94,7 +117,7 @@ int main(int argc, char **argv) } - QString databaseFilename2 = app.arguments().at(2); + QString databaseFilename2 = args.at(1); QFile dbFile2(databaseFilename2); if (!dbFile2.exists()) { qCritical("File %s does not exist.", qPrintable(databaseFilename2)); From 421e6303ae9566bbff58188a7fbe74da4daccda9 Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Wed, 11 Jan 2017 21:05:16 -0500 Subject: [PATCH 09/10] Rename merge-databases -> kdbx-merge --- utils/CMakeLists.txt | 4 ++-- utils/{merge-databases.cpp => kdbx-merge.cpp} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename utils/{merge-databases.cpp => kdbx-merge.cpp} (100%) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 3887c9a22..31bb6db4f 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -25,8 +25,8 @@ target_link_libraries(kdbx-extract ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES}) -add_executable(merge-databases merge-databases.cpp) -target_link_libraries(merge-databases +add_executable(kdbx-merge kdbx-merge.cpp) +target_link_libraries(kdbx-merge keepassx_core ${MHD_LIBRARIES} Qt5::Core diff --git a/utils/merge-databases.cpp b/utils/kdbx-merge.cpp similarity index 100% rename from utils/merge-databases.cpp rename to utils/kdbx-merge.cpp From 1e0191a37c71c46294b0c1f3b30fbc177b645ca6 Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Fri, 13 Jan 2017 19:45:33 -0500 Subject: [PATCH 10/10] Remove unused dependencies. --- utils/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 31bb6db4f..e3928051e 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -28,10 +28,7 @@ target_link_libraries(kdbx-extract add_executable(kdbx-merge kdbx-merge.cpp) target_link_libraries(kdbx-merge keepassx_core - ${MHD_LIBRARIES} Qt5::Core - Qt5::Concurrent - Qt5::Widgets ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES})