From 65992ba6aee89c63beb91ff59fc1ec1e5212a6a3 Mon Sep 17 00:00:00 2001 From: thez3ro Date: Sun, 4 Dec 2016 19:57:24 +0100 Subject: [PATCH] Option to select extension compile-time. Fix #50 #123 --- CMakeLists.txt | 9 +++++++ src/CMakeLists.txt | 42 ++++++++++++++++++++--------- src/autotype/CMakeLists.txt | 38 ++++++++++++++------------ src/config-keepassx.h.cmake | 4 +++ src/gui/MainWindow.cpp | 11 +++++++- tests/CMakeLists.txt | 8 +++--- tests/config-keepassx-tests.h.cmake | 4 +++ 7 files changed, 82 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbef4bc45..883f462ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,10 @@ option(WITH_GUI_TESTS "Enable building of GUI tests" OFF) option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated methods." OFF) option(WITH_COVERAGE "Use to build with coverage tests. (GCC ONLY)." OFF) +option(WITH_XC_AUTOTYPE "Include Autotype." OFF) +option(WITH_XC_HTTP "Include KeePassHTTP." OFF) +option(WITH_XC_YUBIKEY "Include Yubikey support." OFF) + set(KEEPASSXC_VERSION "2.1.0") set(KEEPASSXC_VERSION_NUM "2.1.0") @@ -221,5 +225,10 @@ if(WITH_TESTS) endif(WITH_TESTS) if(PRINT_SUMMARY) + # This will print ENABLED, REQUIRED and DISABLED feature_summary(WHAT ALL) +else() + # This will only print ENABLED and DISABLED feature + print_enabled_features() + print_disabled_features() endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5778e06be..b85032ef3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -118,14 +118,6 @@ set(keepassx_SOURCES gui/group/EditGroupWidget.cpp gui/group/GroupModel.cpp gui/group/GroupView.cpp - http/AccessControlDialog.cpp - http/EntryConfig.cpp - http/HttpPasswordGeneratorWidget.cpp - http/HttpSettings.cpp - http/OptionDialog.cpp - http/Protocol.cpp - http/Server.cpp - http/Service.cpp keys/CompositeKey.cpp keys/CompositeKey_p.h keys/FileKey.cpp @@ -161,11 +153,30 @@ set(keepassx_FORMS gui/entry/EditEntryWidgetHistory.ui gui/entry/EditEntryWidgetMain.ui gui/group/EditGroupWidgetMain.ui - http/AccessControlDialog.ui - http/HttpPasswordGeneratorWidget.ui - http/OptionDialog.ui ) +add_feature_info(KeePassHTTP WITH_XC_HTTP "KeePassHTTP support for ChromeIPass and PassIFox") + +if(WITH_XC_HTTP) + set(keepasshttp_SOURCES + http/AccessControlDialog.cpp + http/EntryConfig.cpp + http/HttpPasswordGeneratorWidget.cpp + http/HttpSettings.cpp + http/OptionDialog.cpp + http/Protocol.cpp + http/Server.cpp + http/Service.cpp + ) + set(keepasshttp_FORMS + http/AccessControlDialog.ui + http/HttpPasswordGeneratorWidget.ui + http/OptionDialog.ui + ) + set(keepasshttp_LIB keepasshttp) + qt5_wrap_ui(keepasshttp_SOURCES ${keepasshttp_FORMS}) +endif() + if(MINGW) set(keepassx_SOURCES_MAINEXE ${keepassx_SOURCES_MAINEXE} @@ -177,15 +188,20 @@ qt5_wrap_ui(keepassx_SOURCES ${keepassx_FORMS}) add_library(zxcvbn STATIC zxcvbn/zxcvbn.cpp) target_link_libraries(zxcvbn) +if(WITH_XC_HTTP) + add_library(keepasshttp STATIC ${keepasshttp_SOURCES}) + target_link_libraries(keepasshttp ${MHD_LIBRARIES} Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network) +endif() + add_library(keepassx_core STATIC ${keepassx_SOURCES}) set_target_properties(keepassx_core PROPERTIES COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE) -target_link_libraries(keepassx_core zxcvbn Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network) +target_link_libraries(keepassx_core zxcvbn ${keepasshttp_LIB} Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network) add_executable(${PROGNAME} WIN32 MACOSX_BUNDLE ${keepassx_SOURCES_MAINEXE}) target_link_libraries(${PROGNAME} keepassx_core zxcvbn - ${MHD_LIBRARIES} + ${keepasshttp_LIB} Qt5::Core Qt5::Concurrent Qt5::Widgets diff --git a/src/autotype/CMakeLists.txt b/src/autotype/CMakeLists.txt index 40dd449db..613b122ff 100644 --- a/src/autotype/CMakeLists.txt +++ b/src/autotype/CMakeLists.txt @@ -1,21 +1,25 @@ -if(UNIX AND NOT APPLE) - find_package(X11) - find_package(Qt5X11Extras 5.2) - if(PRINT_SUMMARY) - add_feature_info(libXi X11_Xi_FOUND "The X11 Xi Protocol library is required for auto-type") - add_feature_info(libXtst X11_XTest_FOUND "The X11 XTEST Protocol library is required for auto-type") - add_feature_info(Qt5X11Extras Qt5X11Extras_FOUND "The Qt5X11Extras library is required for auto-type") +add_feature_info(Autotype WITH_XC_AUTOTYPE "Auto-type passwords in Input fields") + +if(WITH_XC_AUTOTYPE) + if(UNIX AND NOT APPLE) + find_package(X11) + find_package(Qt5X11Extras 5.2) + if(PRINT_SUMMARY) + add_feature_info(libXi X11_Xi_FOUND "The X11 Xi Protocol library is required for auto-type") + add_feature_info(libXtst X11_XTest_FOUND "The X11 XTEST Protocol library is required for auto-type") + add_feature_info(Qt5X11Extras Qt5X11Extras_FOUND "The Qt5X11Extras library is required for auto-type") + endif() + + if(X11_FOUND AND X11_Xi_FOUND AND X11_XTest_FOUND AND Qt5X11Extras_FOUND) + add_subdirectory(xcb) + endif() + elseif(APPLE) + add_subdirectory(mac) + elseif(WIN32) + add_subdirectory(windows) endif() - if(X11_FOUND AND X11_Xi_FOUND AND X11_XTest_FOUND AND Qt5X11Extras_FOUND) - add_subdirectory(xcb) + if(WITH_TESTS) + add_subdirectory(test) endif() -elseif(APPLE) - add_subdirectory(mac) -elseif(WIN32) - add_subdirectory(windows) -endif() - -if(WITH_TESTS) - add_subdirectory(test) endif() diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake index 2ef2836c5..9ae5f4836 100644 --- a/src/config-keepassx.h.cmake +++ b/src/config-keepassx.h.cmake @@ -12,6 +12,10 @@ #define KEEPASSX_PLUGIN_DIR "${PLUGIN_INSTALL_DIR}" #define KEEPASSX_DATA_DIR "${DATA_INSTALL_DIR}" +#cmakedefine WITH_XC_HTTP +#cmakedefine WITH_XC_AUTOTYPE +#cmakedefine WITH_XC_YUBIKEY + #cmakedefine HAVE_PR_SET_DUMPABLE 1 #cmakedefine HAVE_RLIMIT_CORE 1 #cmakedefine HAVE_PT_DENY_ATTACH 1 diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index ed58f69ea..cc94ca9a9 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -22,6 +22,8 @@ #include #include +#include "config-keepassx.h" + #include "autotype/AutoType.h" #include "core/Config.h" #include "core/FilePath.h" @@ -35,12 +37,16 @@ #include "gui/MessageBox.h" #include "gui/SearchWidget.h" +#ifdef WITH_XC_HTTP #include "http/Service.h" #include "http/HttpSettings.h" #include "http/OptionDialog.h" +#endif + #include "gui/SettingsWidget.h" #include "gui/PasswordGeneratorWidget.h" +#ifdef WITH_XC_HTTP class HttpPlugin: public ISettingsPage { public: @@ -72,6 +78,7 @@ class HttpPlugin: public ISettingsPage private: Service *m_service; }; +#endif const QString MainWindow::BaseWindowTitle = "KeePassXC"; @@ -92,7 +99,9 @@ MainWindow::MainWindow() m_countDefaultAttributes = m_ui->menuEntryCopyAttribute->actions().size(); restoreGeometry(config()->get("GUI/MainWindowGeometry").toByteArray()); + #ifdef WITH_XC_HTTP m_ui->settingsWidget->addSettingsPage(new HttpPlugin(m_ui->tabWidget)); + #endif setWindowIcon(filePath()->applicationIcon()); QAction* toggleViewAction = m_ui->toolBar->toggleViewAction(); @@ -449,7 +458,7 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode) m_ui->actionRepairDatabase->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); m_ui->actionLockDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases()); - + if ((3 == currentIndex) != m_ui->actionPasswordGenerator->isChecked()) { bool blocked = m_ui->actionPasswordGenerator->blockSignals(true); m_ui->actionPasswordGenerator->toggle(); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0dcb4a77e..af38acea6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -85,13 +85,13 @@ endmacro(add_unit_test) set(TEST_LIBRARIES keepassx_core + ${keepasshttp_LIB} Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Test ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES} - ${MHD_LIBRARIES} ) set(testsupport_SOURCES modeltest.cpp FailDevice.cpp) @@ -143,9 +143,11 @@ add_unit_test(NAME testkeepass1reader SOURCES TestKeePass1Reader.cpp add_unit_test(NAME testwildcardmatcher SOURCES TestWildcardMatcher.cpp LIBS ${TEST_LIBRARIES}) -add_unit_test(NAME testautotype SOURCES TestAutoType.cpp +if(WITH_XC_AUTOTYPE) + add_unit_test(NAME testautotype SOURCES TestAutoType.cpp LIBS ${TEST_LIBRARIES}) -set_target_properties(testautotype PROPERTIES ENABLE_EXPORTS ON) + set_target_properties(testautotype PROPERTIES ENABLE_EXPORTS ON) +endif() add_unit_test(NAME testentry SOURCES TestEntry.cpp LIBS ${TEST_LIBRARIES}) diff --git a/tests/config-keepassx-tests.h.cmake b/tests/config-keepassx-tests.h.cmake index b515f5c5f..26204f7dd 100644 --- a/tests/config-keepassx-tests.h.cmake +++ b/tests/config-keepassx-tests.h.cmake @@ -5,4 +5,8 @@ #define KEEPASSX_TEST_DATA_DIR "${KEEPASSX_TEST_DATA_DIR}" +#cmakedefine WITH_XC_HTTP +#cmakedefine WITH_XC_AUTOTYPE +#cmakedefine WITH_XC_YUBIKEY + #endif // KEEPASSX_CONFIG_TESTS_H