Add first keepassxc-cli version.

src/CMakeLists.txt

@@ -164,6 +164,7 @@ if(WITH_XC_HTTP)
 endif()
 
 add_subdirectory(autotype)
+add_subdirectory(cli)
 
 set(autotype_SOURCES
     core/Tools.cpp

src/cli/CMakeLists.txt

@@ -1,4 +1,4 @@
-#  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
+#  Copyright (C) 2017 KeePassXC Team
 #
 #  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
@@ -13,24 +13,19 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include_directories(../src)
+set(cli_SOURCES
+    Merge.cpp
+    Merge.h
+    Extract.cpp
+    Extract.h)
 
-add_executable(kdbx-extract kdbx-extract.cpp)
-target_link_libraries(kdbx-extract
+add_library(cli STATIC ${cli_SOURCES})
+target_link_libraries(cli Qt5::Core Qt5::Widgets)
+
+add_executable(keepassxc-cli keepassxc-cli.cpp)
+target_link_libraries(keepassxc-cli
+                      cli
                       keepassx_core
                       Qt5::Core
                       ${GCRYPT_LIBRARIES}
-                      ${GPGERROR_LIBRARIES}
                       ${ZLIB_LIBRARIES})
-
-add_executable(kdbx-merge kdbx-merge.cpp)
-target_link_libraries(kdbx-merge
-                      keepassx_core
-                      Qt5::Core
-                      ${GCRYPT_LIBRARIES}
-                      ${GPGERROR_LIBRARIES}
-                      ${ZLIB_LIBRARIES})
-
-
-add_executable(entropy-meter entropy-meter.cpp)
-target_link_libraries(entropy-meter zxcvbn)

src/cli/Extract.cpp

@@ -17,6 +17,8 @@
 
 #include <stdio.h>
 
+#include "Extract.h"
+
 #include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QFile>
@@ -30,7 +32,7 @@
 #include "keys/FileKey.h"
 #include "keys/PasswordKey.h"
 
-int main(int argc, char **argv)
+int Extract::execute(int argc, char **argv)
 {
     QCoreApplication app(argc, argv);
 
@@ -38,7 +40,6 @@ int main(int argc, char **argv)
     parser.setApplicationDescription(QCoreApplication::translate("main",
                                                                  "Extract and print a KeePassXC database file."));
     parser.addPositionalArgument("database", QCoreApplication::translate("main", "path of the database to extract."));
-    parser.addHelpOption();
     parser.process(app);
 
     const QStringList args = parser.positionalArguments();
@@ -47,10 +48,6 @@ int main(int argc, char **argv)
         return 1;
     }
 
-    if (!Crypto::init()) {
-        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 = CompositeKey::readFromLine(line);

src/cli/Extract.h

@@ -0,0 +1,27 @@
+/*
+ *  Copyright (C) 2017 KeePassXC Team
+ *
+ *  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 KEEPASSXC_EXTRACT_H
+#define KEEPASSXC_EXTRACT_H
+
+class Extract
+{
+public:
+    static int execute(int argc, char** argv);
+};
+
+#endif // KEEPASSXC_EXTRACT_H

src/cli/Merge.cpp

@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
+#include "Merge.h"
 
 #include <QCommandLineParser>
 #include <QCoreApplication>
@@ -25,12 +25,11 @@
 #include <QTextStream>
 
 #include "core/Database.h"
-#include "crypto/Crypto.h"
 #include "format/KeePass2Reader.h"
 #include "format/KeePass2Writer.h"
 #include "keys/CompositeKey.h"
 
-int main(int argc, char **argv)
+int Merge::execute(int argc, char** argv)
 {
 
     QCoreApplication app(argc, argv);
@@ -43,7 +42,6 @@ int main(int argc, char **argv)
     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);
 
@@ -53,10 +51,6 @@ int main(int argc, char **argv)
         return 1;
     }
 
-    if (!Crypto::init()) {
-        qFatal("Fatal error while testing the cryptographic functions:\n%s", qPrintable(Crypto::errorString()));
-    }
-
     static QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
 
     QString line1 = inputTextStream.readLine();
@@ -133,6 +127,6 @@ int main(int argc, char **argv)
     }
 
     qDebug("Successfully merged the database files.\n");
-    return 1;
+    return 0;
 
 }

src/cli/Merge.h

@@ -0,0 +1,27 @@
+/*
+ *  Copyright (C) 2017 KeePassXC Team
+ *
+ *  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 KEEPASSXC_MERGE_H
+#define KEEPASSXC_MERGE_H
+
+class Merge
+{
+public:
+    static int execute(int argc, char** argv);
+};
+
+#endif // KEEPASSXC_MERGE_H

src/cli/keepassxc-cli.cpp

@@ -0,0 +1,77 @@
+/*
+ *  Copyright (C) 2017 KeePassXC Team
+ *
+ *  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/>.
+ */
+
+#include <cli/Merge.h>
+#include <cli/Extract.h>
+
+#include <QCommandLineParser>
+#include <QCoreApplication>
+#include <QStringList>
+
+#include "config-keepassx.h"
+#include "crypto/Crypto.h"
+
+int main(int argc, char **argv)
+{
+
+    if (!Crypto::init()) {
+        qFatal("Fatal error while testing the cryptographic functions:\n%s", qPrintable(Crypto::errorString()));
+        return 1;
+    }
+
+    QCoreApplication app(argc, argv);
+    app.setApplicationVersion(KEEPASSX_VERSION);
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription(QCoreApplication::translate("main", "KeepassXC command line interface."));
+    parser.addPositionalArgument("command", QCoreApplication::translate("main", "Name of the command to execute."));
+
+    parser.addHelpOption();
+    parser.addVersionOption();
+    parser.process(app);
+
+    const QStringList args = parser.positionalArguments();
+    if (args.size() < 1) {
+        parser.showHelp();
+        return 1;
+    }
+
+    QString commandName = args.at(0);
+
+    for (int i = 1; i < argc - 1; ++i) {
+      argv[i] = argv[i+1];
+    }
+    argv[argc - 1] = nullptr;
+    argc--;
+
+    if (commandName == "merge")
+    {
+      argv[0] = const_cast<char *>("keepassxc-cli merge");
+      return Merge::execute(argc, argv);
+    }
+
+    if (commandName == "extract")
+    {
+      argv[0] = const_cast<char *>("keepassxc-cli extract");
+      return Extract::execute(argc, argv);
+    }
+
+    qCritical("Invalid command %s.", qPrintable(commandName));
+    parser.showHelp();
+    return 1;
+
+}