From a978880b0b4ae4de8a2a45fdf753cb7c2041f618 Mon Sep 17 00:00:00 2001 From: Christian Kieschnick Date: Mon, 7 Jan 2019 12:02:21 +0100 Subject: [PATCH] Fixed QuaZip for windows, renaming QuaZip should now usable under windows (fixed include in FindQuaZip) Renamed the representation from secure and unsecure to signed and unsigned --- cmake/FindQuaZip.cmake | 56 +- src/gui/AboutDialog.cpp | 102 +- src/gui/MainWindow.cpp | 1429 +++++++++-------- src/keeshare/KeeShare.cpp | 8 +- src/keeshare/KeeShare.h | 4 +- src/keeshare/SettingsWidgetKeeShare.cpp | 266 +-- src/keeshare/ShareObserver.cpp | 1160 ++++++------- src/keeshare/ShareObserver.h | 8 +- .../group/EditGroupWidgetKeeShare.cpp | 366 ++--- 9 files changed, 1700 insertions(+), 1699 deletions(-) diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake index 23f4918db..f70973011 100644 --- a/cmake/FindQuaZip.cmake +++ b/cmake/FindQuaZip.cmake @@ -6,38 +6,38 @@ IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) - # in cache already - SET(QUAZIP_FOUND TRUE) + # in cache already + SET(QUAZIP_FOUND TRUE) ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) IF (Qt5Core_FOUND) set(QUAZIP_LIB_VERSION_SUFFIX 5) ENDIF() - IF (WIN32) - FIND_PATH(QUAZIP_LIBRARY_DIR - WIN32_DEBUG_POSTFIX d - NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll - HINTS "C:/Programme/" "C:/Program Files" - PATH_SUFFIXES QuaZip/lib - ) - FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR}) - FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip) - FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) - ELSE(WIN32) - FIND_PACKAGE(PkgConfig) + IF (WIN32) + FIND_PATH(QUAZIP_LIBRARY_DIR + WIN32_DEBUG_POSTFIX d + NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll + HINTS "C:/Programme/" "C:/Program Files" + PATH_SUFFIXES QuaZip/lib + ) + FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR}) + FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip5) + FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) + ELSE(WIN32) + FIND_PACKAGE(PkgConfig) # pkg_check_modules(PC_QCA2 QUIET qca2) - pkg_check_modules(PC_QUAZIP quazip) - FIND_LIBRARY(QUAZIP_LIBRARIES - WIN32_DEBUG_POSTFIX d + pkg_check_modules(PC_QUAZIP quazip) + FIND_LIBRARY(QUAZIP_LIBRARIES + WIN32_DEBUG_POSTFIX d NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} - HINTS /usr/lib /usr/lib64 - ) - FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h - HINTS /usr/include /usr/local/include - PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} - ) - FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) - ENDIF (WIN32) - INCLUDE(FindPackageHandleStandardArgs) - SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR}) - find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS) + HINTS /usr/lib /usr/lib64 + ) + FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h + HINTS /usr/include /usr/local/include + PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} + ) + FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) + ENDIF (WIN32) + INCLUDE(FindPackageHandleStandardArgs) + SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR}) + find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS) ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp index cbc0c5cf0..8aac63440 100644 --- a/src/gui/AboutDialog.cpp +++ b/src/gui/AboutDialog.cpp @@ -28,90 +28,90 @@ #include AboutDialog::AboutDialog(QWidget* parent) - : QDialog(parent) - , m_ui(new Ui::AboutDialog()) + : QDialog(parent) + , m_ui(new Ui::AboutDialog()) { - m_ui->setupUi(this); + m_ui->setupUi(this); - resize(minimumSize()); - setWindowFlags(Qt::Sheet); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + resize(minimumSize()); + setWindowFlags(Qt::Sheet); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - m_ui->nameLabel->setText(m_ui->nameLabel->text().replace("${VERSION}", KEEPASSXC_VERSION)); - QFont nameLabelFont = m_ui->nameLabel->font(); - nameLabelFont.setPointSize(nameLabelFont.pointSize() + 4); - m_ui->nameLabel->setFont(nameLabelFont); + m_ui->nameLabel->setText(m_ui->nameLabel->text().replace("${VERSION}", KEEPASSXC_VERSION)); + QFont nameLabelFont = m_ui->nameLabel->font(); + nameLabelFont.setPointSize(nameLabelFont.pointSize() + 4); + m_ui->nameLabel->setFont(nameLabelFont); - m_ui->iconLabel->setPixmap(filePath()->applicationIcon().pixmap(48)); + m_ui->iconLabel->setPixmap(filePath()->applicationIcon().pixmap(48)); - QString commitHash; - if (!QString(GIT_HEAD).isEmpty()) { - commitHash = GIT_HEAD; - } else if (!QString(DIST_HASH).contains("Format")) { - commitHash = DIST_HASH; - } + QString commitHash; + if (!QString(GIT_HEAD).isEmpty()) { + commitHash = GIT_HEAD; + } else if (!QString(DIST_HASH).contains("Format")) { + commitHash = DIST_HASH; + } - QString debugInfo = "KeePassXC - "; - debugInfo.append(tr("Version %1").arg(KEEPASSXC_VERSION).append("\n")); + QString debugInfo = "KeePassXC - "; + debugInfo.append(tr("Version %1").arg(KEEPASSXC_VERSION).append("\n")); #ifndef KEEPASSXC_BUILD_TYPE_RELEASE - debugInfo.append(tr("Build Type: %1").arg(KEEPASSXC_BUILD_TYPE).append("\n")); + debugInfo.append(tr("Build Type: %1").arg(KEEPASSXC_BUILD_TYPE).append("\n")); #endif - if (!commitHash.isEmpty()) { - debugInfo.append(tr("Revision: %1").arg(commitHash.left(7)).append("\n")); - } + if (!commitHash.isEmpty()) { + debugInfo.append(tr("Revision: %1").arg(commitHash.left(7)).append("\n")); + } #ifdef KEEPASSXC_DIST - debugInfo.append(tr("Distribution: %1").arg(KEEPASSXC_DIST_TYPE).append("\n")); + debugInfo.append(tr("Distribution: %1").arg(KEEPASSXC_DIST_TYPE).append("\n")); #endif - debugInfo.append("\n").append( - QString("%1\n- Qt %2\n- %3\n\n") - .arg(tr("Libraries:"), QString::fromLocal8Bit(qVersion()), Crypto::backendVersion())); + debugInfo.append("\n").append( + QString("%1\n- Qt %2\n- %3\n\n") + .arg(tr("Libraries:"), QString::fromLocal8Bit(qVersion()), Crypto::backendVersion())); #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) - debugInfo.append(tr("Operating system: %1\nCPU architecture: %2\nKernel: %3 %4") - .arg(QSysInfo::prettyProductName(), - QSysInfo::currentCpuArchitecture(), - QSysInfo::kernelType(), - QSysInfo::kernelVersion())); + debugInfo.append(tr("Operating system: %1\nCPU architecture: %2\nKernel: %3 %4") + .arg(QSysInfo::prettyProductName(), + QSysInfo::currentCpuArchitecture(), + QSysInfo::kernelType(), + QSysInfo::kernelVersion())); - debugInfo.append("\n\n"); + debugInfo.append("\n\n"); #endif - QString extensions; + QString extensions; #ifdef WITH_XC_AUTOTYPE - extensions += "\n- " + tr("Auto-Type"); + extensions += "\n- " + tr("Auto-Type"); #endif #ifdef WITH_XC_BROWSER - extensions += "\n- " + tr("Browser Integration"); + extensions += "\n- " + tr("Browser Integration"); #endif #ifdef WITH_XC_SSHAGENT - extensions += "\n- " + tr("SSH Agent"); + extensions += "\n- " + tr("SSH Agent"); #endif #if defined(WITH_XC_KEESHARE_SECURE) && defined(WITH_XC_KEESHARE_INSECURE) - extensions += "\n- " + tr("KeeShare (secure and insecure sharing)"); + extensions += "\n- " + tr("KeeShare (signed and unsigned sharing)"); #elif defined(WITH_XC_KEESHARE_SECURE) - extensions += "\n- " + tr("KeeShare (only secure sharing)"); + extensions += "\n- " + tr("KeeShare (only signed sharing)"); #elif defined(WITH_XC_KEESHARE_INSECURE) - extensions += "\n- " + tr("KeeShare (only insecure sharing)"); + extensions += "\n- " + tr("KeeShare (only unsigned sharing)"); #endif #ifdef WITH_XC_YUBIKEY - extensions += "\n- " + tr("YubiKey"); + extensions += "\n- " + tr("YubiKey"); #endif #ifdef WITH_XC_TOUCHID - extensions += "\n- " + tr("TouchID"); + extensions += "\n- " + tr("TouchID"); #endif - if (extensions.isEmpty()) - extensions = " " + tr("None"); + if (extensions.isEmpty()) + extensions = " " + tr("None"); - debugInfo.append(tr("Enabled extensions:").append(extensions)); + debugInfo.append(tr("Enabled extensions:").append(extensions)); - m_ui->debugInfo->setPlainText(debugInfo); + m_ui->debugInfo->setPlainText(debugInfo); - setAttribute(Qt::WA_DeleteOnClose); - connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close())); - connect(m_ui->copyToClipboard, SIGNAL(clicked()), SLOT(copyToClipboard())); + setAttribute(Qt::WA_DeleteOnClose); + connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close())); + connect(m_ui->copyToClipboard, SIGNAL(clicked()), SLOT(copyToClipboard())); } AboutDialog::~AboutDialog() @@ -120,6 +120,6 @@ AboutDialog::~AboutDialog() void AboutDialog::copyToClipboard() { - QClipboard* clipboard = QApplication::clipboard(); - clipboard->setText(m_ui->debugInfo->toPlainText()); + QClipboard* clipboard = QApplication::clipboard(); + clipboard->setText(m_ui->debugInfo->toPlainText()); } diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index fd9610e55..f3d1d4813 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -20,6 +20,7 @@ #include "ui_MainWindow.h" #include +#include #include #include #include @@ -68,49 +69,49 @@ class BrowserPlugin : public ISettingsPage { public: - BrowserPlugin(DatabaseTabWidget* tabWidget) - { - m_nativeMessagingHost = - QSharedPointer(new NativeMessagingHost(tabWidget, browserSettings()->isEnabled())); - } + BrowserPlugin(DatabaseTabWidget* tabWidget) + { + m_nativeMessagingHost = + QSharedPointer(new NativeMessagingHost(tabWidget, browserSettings()->isEnabled())); + } - ~BrowserPlugin() - { - } + ~BrowserPlugin() + { + } - QString name() override - { - return QObject::tr("Browser Integration"); - } + QString name() override + { + return QObject::tr("Browser Integration"); + } - QIcon icon() override - { - return FilePath::instance()->icon("apps", "internet-web-browser"); - } + QIcon icon() override + { + return FilePath::instance()->icon("apps", "internet-web-browser"); + } - QWidget* createWidget() override - { - BrowserOptionDialog* dlg = new BrowserOptionDialog(); - return dlg; - } + QWidget* createWidget() override + { + BrowserOptionDialog* dlg = new BrowserOptionDialog(); + return dlg; + } - void loadSettings(QWidget* widget) override - { - qobject_cast(widget)->loadSettings(); - } + void loadSettings(QWidget* widget) override + { + qobject_cast(widget)->loadSettings(); + } - void saveSettings(QWidget* widget) override - { - qobject_cast(widget)->saveSettings(); - if (browserSettings()->isEnabled()) { - m_nativeMessagingHost->run(); - } else { - m_nativeMessagingHost->stop(); - } - } + void saveSettings(QWidget* widget) override + { + qobject_cast(widget)->saveSettings(); + if (browserSettings()->isEnabled()) { + m_nativeMessagingHost->run(); + } else { + m_nativeMessagingHost->stop(); + } + } private: - QSharedPointer m_nativeMessagingHost; + QSharedPointer m_nativeMessagingHost; }; #endif @@ -120,279 +121,279 @@ MainWindow* g_MainWindow = nullptr; MainWindow* getMainWindow() { return g_MainWindow; } MainWindow::MainWindow() - : m_ui(new Ui::MainWindow()) - , m_trayIcon(nullptr) - , m_appExitCalled(false) - , m_appExiting(false) + : m_ui(new Ui::MainWindow()) + , m_trayIcon(nullptr) + , m_appExitCalled(false) + , m_appExiting(false) { - g_MainWindow = this; + g_MainWindow = this; - m_ui->setupUi(this); + m_ui->setupUi(this); #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && !defined(QT_NO_DBUS) - new MainWindowAdaptor(this); - QDBusConnection dbus = QDBusConnection::sessionBus(); - dbus.registerObject("/keepassxc", this); - dbus.registerService("org.keepassxc.KeePassXC.MainWindow"); + new MainWindowAdaptor(this); + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/keepassxc", this); + dbus.registerService("org.keepassxc.KeePassXC.MainWindow"); #endif - setAcceptDrops(true); + setAcceptDrops(true); - // Setup the search widget in the toolbar - auto* search = new SearchWidget(); - search->connectSignals(m_actionMultiplexer); - m_searchWidgetAction = m_ui->toolBar->addWidget(search); - m_searchWidgetAction->setEnabled(false); + // Setup the search widget in the toolbar + auto* search = new SearchWidget(); + search->connectSignals(m_actionMultiplexer); + m_searchWidgetAction = m_ui->toolBar->addWidget(search); + m_searchWidgetAction->setEnabled(false); - m_countDefaultAttributes = m_ui->menuEntryCopyAttribute->actions().size(); + m_countDefaultAttributes = m_ui->menuEntryCopyAttribute->actions().size(); - restoreGeometry(config()->get("GUI/MainWindowGeometry").toByteArray()); + restoreGeometry(config()->get("GUI/MainWindowGeometry").toByteArray()); #ifdef WITH_XC_BROWSER - m_ui->settingsWidget->addSettingsPage(new BrowserPlugin(m_ui->tabWidget)); + m_ui->settingsWidget->addSettingsPage(new BrowserPlugin(m_ui->tabWidget)); #endif #ifdef WITH_XC_SSHAGENT - SSHAgent::init(this); - connect(SSHAgent::instance(), SIGNAL(error(QString)), this, SLOT(showErrorMessage(QString))); - m_ui->settingsWidget->addSettingsPage(new AgentSettingsPage(m_ui->tabWidget)); + SSHAgent::init(this); + connect(SSHAgent::instance(), SIGNAL(error(QString)), this, SLOT(showErrorMessage(QString))); + m_ui->settingsWidget->addSettingsPage(new AgentSettingsPage(m_ui->tabWidget)); #endif #if defined(WITH_XC_KEESHARE) - KeeShare::init(this); - m_ui->settingsWidget->addSettingsPage(new SettingsPageKeeShare(m_ui->tabWidget)); - connect(KeeShare::instance(), SIGNAL(sharingMessage(QString, MessageWidget::MessageType)), - SLOT(displayGlobalMessage(QString, MessageWidget::MessageType))); + KeeShare::init(this); + m_ui->settingsWidget->addSettingsPage(new SettingsPageKeeShare(m_ui->tabWidget)); + connect(KeeShare::instance(), SIGNAL(sharingMessage(QString, MessageWidget::MessageType)), + SLOT(displayGlobalMessage(QString, MessageWidget::MessageType))); #endif - setWindowIcon(filePath()->applicationIcon()); - m_ui->globalMessageWidget->setHidden(true); - // clang-format off - connect(m_ui->globalMessageWidget, &MessageWidget::linkActivated, &MessageWidget::openHttpUrl); - connect(m_ui->globalMessageWidget, SIGNAL(showAnimationStarted()), m_ui->globalMessageWidgetContainer, SLOT(show())); - connect(m_ui->globalMessageWidget, SIGNAL(hideAnimationFinished()), m_ui->globalMessageWidgetContainer, SLOT(hide())); - // clang-format on + setWindowIcon(filePath()->applicationIcon()); + m_ui->globalMessageWidget->setHidden(true); + // clang-format off + connect(m_ui->globalMessageWidget, &MessageWidget::linkActivated, &MessageWidget::openHttpUrl); + connect(m_ui->globalMessageWidget, SIGNAL(showAnimationStarted()), m_ui->globalMessageWidgetContainer, SLOT(show())); + connect(m_ui->globalMessageWidget, SIGNAL(hideAnimationFinished()), m_ui->globalMessageWidgetContainer, SLOT(hide())); + // clang-format on - m_clearHistoryAction = new QAction(tr("Clear history"), m_ui->menuFile); - m_lastDatabasesActions = new QActionGroup(m_ui->menuRecentDatabases); - connect(m_clearHistoryAction, SIGNAL(triggered()), this, SLOT(clearLastDatabases())); - connect(m_lastDatabasesActions, SIGNAL(triggered(QAction*)), this, SLOT(openRecentDatabase(QAction*))); - connect(m_ui->menuRecentDatabases, SIGNAL(aboutToShow()), this, SLOT(updateLastDatabasesMenu())); + m_clearHistoryAction = new QAction(tr("Clear history"), m_ui->menuFile); + m_lastDatabasesActions = new QActionGroup(m_ui->menuRecentDatabases); + connect(m_clearHistoryAction, SIGNAL(triggered()), this, SLOT(clearLastDatabases())); + connect(m_lastDatabasesActions, SIGNAL(triggered(QAction*)), this, SLOT(openRecentDatabase(QAction*))); + connect(m_ui->menuRecentDatabases, SIGNAL(aboutToShow()), this, SLOT(updateLastDatabasesMenu())); - m_copyAdditionalAttributeActions = new QActionGroup(m_ui->menuEntryCopyAttribute); - m_actionMultiplexer.connect( - m_copyAdditionalAttributeActions, SIGNAL(triggered(QAction*)), SLOT(copyAttribute(QAction*))); - connect(m_ui->menuEntryCopyAttribute, SIGNAL(aboutToShow()), this, SLOT(updateCopyAttributesMenu())); + m_copyAdditionalAttributeActions = new QActionGroup(m_ui->menuEntryCopyAttribute); + m_actionMultiplexer.connect( + m_copyAdditionalAttributeActions, SIGNAL(triggered(QAction*)), SLOT(copyAttribute(QAction*))); + connect(m_ui->menuEntryCopyAttribute, SIGNAL(aboutToShow()), this, SLOT(updateCopyAttributesMenu())); - Qt::Key globalAutoTypeKey = static_cast(config()->get("GlobalAutoTypeKey").toInt()); - Qt::KeyboardModifiers globalAutoTypeModifiers = - static_cast(config()->get("GlobalAutoTypeModifiers").toInt()); - if (globalAutoTypeKey > 0 && globalAutoTypeModifiers > 0) { - autoType()->registerGlobalShortcut(globalAutoTypeKey, globalAutoTypeModifiers); - } + Qt::Key globalAutoTypeKey = static_cast(config()->get("GlobalAutoTypeKey").toInt()); + Qt::KeyboardModifiers globalAutoTypeModifiers = + static_cast(config()->get("GlobalAutoTypeModifiers").toInt()); + if (globalAutoTypeKey > 0 && globalAutoTypeModifiers > 0) { + autoType()->registerGlobalShortcut(globalAutoTypeKey, globalAutoTypeModifiers); + } - m_ui->actionEntryAutoType->setVisible(autoType()->isAvailable()); + m_ui->actionEntryAutoType->setVisible(autoType()->isAvailable()); - m_inactivityTimer = new InactivityTimer(this); - connect(m_inactivityTimer, SIGNAL(inactivityDetected()), this, SLOT(lockDatabasesAfterInactivity())); + m_inactivityTimer = new InactivityTimer(this); + connect(m_inactivityTimer, SIGNAL(inactivityDetected()), this, SLOT(lockDatabasesAfterInactivity())); #ifdef WITH_XC_TOUCHID - m_touchIDinactivityTimer = new InactivityTimer(this); - connect(m_touchIDinactivityTimer, SIGNAL(inactivityDetected()), this, SLOT(forgetTouchIDAfterInactivity())); + m_touchIDinactivityTimer = new InactivityTimer(this); + connect(m_touchIDinactivityTimer, SIGNAL(inactivityDetected()), this, SLOT(forgetTouchIDAfterInactivity())); #endif - applySettingsChanges(); + applySettingsChanges(); - m_ui->actionDatabaseNew->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_N); - setShortcut(m_ui->actionDatabaseOpen, QKeySequence::Open, Qt::CTRL + Qt::Key_O); - setShortcut(m_ui->actionDatabaseSave, QKeySequence::Save, Qt::CTRL + Qt::Key_S); - setShortcut(m_ui->actionDatabaseSaveAs, QKeySequence::SaveAs, Qt::CTRL + Qt::SHIFT + Qt::Key_S); - setShortcut(m_ui->actionDatabaseClose, QKeySequence::Close, Qt::CTRL + Qt::Key_W); - m_ui->actionLockDatabases->setShortcut(Qt::CTRL + Qt::Key_L); - setShortcut(m_ui->actionQuit, QKeySequence::Quit, Qt::CTRL + Qt::Key_Q); - setShortcut(m_ui->actionEntryNew, QKeySequence::New, Qt::CTRL + Qt::Key_N); - m_ui->actionEntryEdit->setShortcut(Qt::CTRL + Qt::Key_E); - m_ui->actionEntryDelete->setShortcut(Qt::CTRL + Qt::Key_D); - m_ui->actionEntryDelete->setShortcut(Qt::Key_Delete); - m_ui->actionEntryClone->setShortcut(Qt::CTRL + Qt::Key_K); - m_ui->actionEntryTotp->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_T); - m_ui->actionEntryCopyTotp->setShortcut(Qt::CTRL + Qt::Key_T); - m_ui->actionEntryCopyUsername->setShortcut(Qt::CTRL + Qt::Key_B); - m_ui->actionEntryCopyPassword->setShortcut(Qt::CTRL + Qt::Key_C); - m_ui->actionEntryAutoType->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_V); - m_ui->actionEntryOpenUrl->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_U); - m_ui->actionEntryCopyURL->setShortcut(Qt::CTRL + Qt::Key_U); + m_ui->actionDatabaseNew->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_N); + setShortcut(m_ui->actionDatabaseOpen, QKeySequence::Open, Qt::CTRL + Qt::Key_O); + setShortcut(m_ui->actionDatabaseSave, QKeySequence::Save, Qt::CTRL + Qt::Key_S); + setShortcut(m_ui->actionDatabaseSaveAs, QKeySequence::SaveAs, Qt::CTRL + Qt::SHIFT + Qt::Key_S); + setShortcut(m_ui->actionDatabaseClose, QKeySequence::Close, Qt::CTRL + Qt::Key_W); + m_ui->actionLockDatabases->setShortcut(Qt::CTRL + Qt::Key_L); + setShortcut(m_ui->actionQuit, QKeySequence::Quit, Qt::CTRL + Qt::Key_Q); + setShortcut(m_ui->actionEntryNew, QKeySequence::New, Qt::CTRL + Qt::Key_N); + m_ui->actionEntryEdit->setShortcut(Qt::CTRL + Qt::Key_E); + m_ui->actionEntryDelete->setShortcut(Qt::CTRL + Qt::Key_D); + m_ui->actionEntryDelete->setShortcut(Qt::Key_Delete); + m_ui->actionEntryClone->setShortcut(Qt::CTRL + Qt::Key_K); + m_ui->actionEntryTotp->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_T); + m_ui->actionEntryCopyTotp->setShortcut(Qt::CTRL + Qt::Key_T); + m_ui->actionEntryCopyUsername->setShortcut(Qt::CTRL + Qt::Key_B); + m_ui->actionEntryCopyPassword->setShortcut(Qt::CTRL + Qt::Key_C); + m_ui->actionEntryAutoType->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_V); + m_ui->actionEntryOpenUrl->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_U); + m_ui->actionEntryCopyURL->setShortcut(Qt::CTRL + Qt::Key_U); #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - // Qt 5.10 introduced a new "feature" to hide shortcuts in context menus - // Unfortunately, Qt::AA_DontShowShortcutsInContextMenus is broken, have to manually enable them - m_ui->actionEntryNew->setShortcutVisibleInContextMenu(true); - m_ui->actionEntryEdit->setShortcutVisibleInContextMenu(true); - m_ui->actionEntryDelete->setShortcutVisibleInContextMenu(true); - m_ui->actionEntryClone->setShortcutVisibleInContextMenu(true); - m_ui->actionEntryTotp->setShortcutVisibleInContextMenu(true); - m_ui->actionEntryCopyTotp->setShortcutVisibleInContextMenu(true); - m_ui->actionEntryCopyUsername->setShortcutVisibleInContextMenu(true); - m_ui->actionEntryCopyPassword->setShortcutVisibleInContextMenu(true); - m_ui->actionEntryAutoType->setShortcutVisibleInContextMenu(true); - m_ui->actionEntryOpenUrl->setShortcutVisibleInContextMenu(true); - m_ui->actionEntryCopyURL->setShortcutVisibleInContextMenu(true); + // Qt 5.10 introduced a new "feature" to hide shortcuts in context menus + // Unfortunately, Qt::AA_DontShowShortcutsInContextMenus is broken, have to manually enable them + m_ui->actionEntryNew->setShortcutVisibleInContextMenu(true); + m_ui->actionEntryEdit->setShortcutVisibleInContextMenu(true); + m_ui->actionEntryDelete->setShortcutVisibleInContextMenu(true); + m_ui->actionEntryClone->setShortcutVisibleInContextMenu(true); + m_ui->actionEntryTotp->setShortcutVisibleInContextMenu(true); + m_ui->actionEntryCopyTotp->setShortcutVisibleInContextMenu(true); + m_ui->actionEntryCopyUsername->setShortcutVisibleInContextMenu(true); + m_ui->actionEntryCopyPassword->setShortcutVisibleInContextMenu(true); + m_ui->actionEntryAutoType->setShortcutVisibleInContextMenu(true); + m_ui->actionEntryOpenUrl->setShortcutVisibleInContextMenu(true); + m_ui->actionEntryCopyURL->setShortcutVisibleInContextMenu(true); #endif - // Control window state - new QShortcut(Qt::CTRL + Qt::Key_M, this, SLOT(showMinimized())); - new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_M, this, SLOT(hideWindow())); - // Control database tabs - new QShortcut(Qt::CTRL + Qt::Key_Tab, this, SLOT(selectNextDatabaseTab())); - new QShortcut(Qt::CTRL + Qt::Key_PageUp, this, SLOT(selectNextDatabaseTab())); - new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab, this, SLOT(selectPreviousDatabaseTab())); - new QShortcut(Qt::CTRL + Qt::Key_PageDown, this, SLOT(selectPreviousDatabaseTab())); - // Toggle password and username visibility in entry view - new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_C, this, SLOT(togglePasswordsHidden())); - new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_B, this, SLOT(toggleUsernamesHidden())); + // Control window state + new QShortcut(Qt::CTRL + Qt::Key_M, this, SLOT(showMinimized())); + new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_M, this, SLOT(hideWindow())); + // Control database tabs + new QShortcut(Qt::CTRL + Qt::Key_Tab, this, SLOT(selectNextDatabaseTab())); + new QShortcut(Qt::CTRL + Qt::Key_PageUp, this, SLOT(selectNextDatabaseTab())); + new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab, this, SLOT(selectPreviousDatabaseTab())); + new QShortcut(Qt::CTRL + Qt::Key_PageDown, this, SLOT(selectPreviousDatabaseTab())); + // Toggle password and username visibility in entry view + new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_C, this, SLOT(togglePasswordsHidden())); + new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_B, this, SLOT(toggleUsernamesHidden())); - m_ui->actionDatabaseNew->setIcon(filePath()->icon("actions", "document-new")); - m_ui->actionDatabaseOpen->setIcon(filePath()->icon("actions", "document-open")); - m_ui->actionDatabaseSave->setIcon(filePath()->icon("actions", "document-save")); - m_ui->actionDatabaseSaveAs->setIcon(filePath()->icon("actions", "document-save-as")); - m_ui->actionDatabaseClose->setIcon(filePath()->icon("actions", "document-close")); - m_ui->actionChangeDatabaseSettings->setIcon(filePath()->icon("actions", "document-edit")); - m_ui->actionChangeMasterKey->setIcon(filePath()->icon("actions", "database-change-key")); - m_ui->actionLockDatabases->setIcon(filePath()->icon("actions", "document-encrypt")); - m_ui->actionQuit->setIcon(filePath()->icon("actions", "application-exit")); + m_ui->actionDatabaseNew->setIcon(filePath()->icon("actions", "document-new")); + m_ui->actionDatabaseOpen->setIcon(filePath()->icon("actions", "document-open")); + m_ui->actionDatabaseSave->setIcon(filePath()->icon("actions", "document-save")); + m_ui->actionDatabaseSaveAs->setIcon(filePath()->icon("actions", "document-save-as")); + m_ui->actionDatabaseClose->setIcon(filePath()->icon("actions", "document-close")); + m_ui->actionChangeDatabaseSettings->setIcon(filePath()->icon("actions", "document-edit")); + m_ui->actionChangeMasterKey->setIcon(filePath()->icon("actions", "database-change-key")); + m_ui->actionLockDatabases->setIcon(filePath()->icon("actions", "document-encrypt")); + m_ui->actionQuit->setIcon(filePath()->icon("actions", "application-exit")); - m_ui->actionEntryNew->setIcon(filePath()->icon("actions", "entry-new")); - m_ui->actionEntryClone->setIcon(filePath()->icon("actions", "entry-clone")); - m_ui->actionEntryEdit->setIcon(filePath()->icon("actions", "entry-edit")); - m_ui->actionEntryDelete->setIcon(filePath()->icon("actions", "entry-delete")); - m_ui->actionEntryAutoType->setIcon(filePath()->icon("actions", "auto-type")); - m_ui->actionEntryCopyUsername->setIcon(filePath()->icon("actions", "username-copy")); - m_ui->actionEntryCopyPassword->setIcon(filePath()->icon("actions", "password-copy")); - m_ui->actionEntryCopyURL->setIcon(filePath()->icon("actions", "url-copy")); + m_ui->actionEntryNew->setIcon(filePath()->icon("actions", "entry-new")); + m_ui->actionEntryClone->setIcon(filePath()->icon("actions", "entry-clone")); + m_ui->actionEntryEdit->setIcon(filePath()->icon("actions", "entry-edit")); + m_ui->actionEntryDelete->setIcon(filePath()->icon("actions", "entry-delete")); + m_ui->actionEntryAutoType->setIcon(filePath()->icon("actions", "auto-type")); + m_ui->actionEntryCopyUsername->setIcon(filePath()->icon("actions", "username-copy")); + m_ui->actionEntryCopyPassword->setIcon(filePath()->icon("actions", "password-copy")); + m_ui->actionEntryCopyURL->setIcon(filePath()->icon("actions", "url-copy")); - m_ui->actionGroupNew->setIcon(filePath()->icon("actions", "group-new")); - m_ui->actionGroupEdit->setIcon(filePath()->icon("actions", "group-edit")); - m_ui->actionGroupDelete->setIcon(filePath()->icon("actions", "group-delete")); - m_ui->actionGroupEmptyRecycleBin->setIcon(filePath()->icon("actions", "group-empty-trash")); + m_ui->actionGroupNew->setIcon(filePath()->icon("actions", "group-new")); + m_ui->actionGroupEdit->setIcon(filePath()->icon("actions", "group-edit")); + m_ui->actionGroupDelete->setIcon(filePath()->icon("actions", "group-delete")); + m_ui->actionGroupEmptyRecycleBin->setIcon(filePath()->icon("actions", "group-empty-trash")); - m_ui->actionSettings->setIcon(filePath()->icon("actions", "configure")); - m_ui->actionPasswordGenerator->setIcon(filePath()->icon("actions", "password-generator")); + m_ui->actionSettings->setIcon(filePath()->icon("actions", "configure")); + m_ui->actionPasswordGenerator->setIcon(filePath()->icon("actions", "password-generator")); - m_ui->actionAbout->setIcon(filePath()->icon("actions", "help-about")); + m_ui->actionAbout->setIcon(filePath()->icon("actions", "help-about")); - m_actionMultiplexer.connect( - SIGNAL(currentModeChanged(DatabaseWidget::Mode)), this, SLOT(setMenuActionState(DatabaseWidget::Mode))); - m_actionMultiplexer.connect(SIGNAL(groupChanged()), this, SLOT(setMenuActionState())); - m_actionMultiplexer.connect(SIGNAL(entrySelectionChanged()), this, SLOT(setMenuActionState())); - m_actionMultiplexer.connect(SIGNAL(groupContextMenuRequested(QPoint)), this, SLOT(showGroupContextMenu(QPoint))); - m_actionMultiplexer.connect(SIGNAL(entryContextMenuRequested(QPoint)), this, SLOT(showEntryContextMenu(QPoint))); + m_actionMultiplexer.connect( + SIGNAL(currentModeChanged(DatabaseWidget::Mode)), this, SLOT(setMenuActionState(DatabaseWidget::Mode))); + m_actionMultiplexer.connect(SIGNAL(groupChanged()), this, SLOT(setMenuActionState())); + m_actionMultiplexer.connect(SIGNAL(entrySelectionChanged()), this, SLOT(setMenuActionState())); + m_actionMultiplexer.connect(SIGNAL(groupContextMenuRequested(QPoint)), this, SLOT(showGroupContextMenu(QPoint))); + m_actionMultiplexer.connect(SIGNAL(entryContextMenuRequested(QPoint)), this, SLOT(showEntryContextMenu(QPoint))); - // Notify search when the active database changes or gets locked - connect(m_ui->tabWidget, - SIGNAL(activateDatabaseChanged(DatabaseWidget*)), - search, - SLOT(databaseChanged(DatabaseWidget*))); - connect(m_ui->tabWidget, SIGNAL(databaseLocked(DatabaseWidget*)), search, SLOT(databaseChanged())); + // Notify search when the active database changes or gets locked + connect(m_ui->tabWidget, + SIGNAL(activateDatabaseChanged(DatabaseWidget*)), + search, + SLOT(databaseChanged(DatabaseWidget*))); + connect(m_ui->tabWidget, SIGNAL(databaseLocked(DatabaseWidget*)), search, SLOT(databaseChanged())); - connect(m_ui->tabWidget, SIGNAL(tabNameChanged()), SLOT(updateWindowTitle())); - connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(updateWindowTitle())); - connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(databaseTabChanged(int))); - connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(setMenuActionState())); - connect(m_ui->tabWidget, SIGNAL(databaseLocked(DatabaseWidget*)), SLOT(databaseStatusChanged(DatabaseWidget*))); - connect(m_ui->tabWidget, SIGNAL(databaseUnlocked(DatabaseWidget*)), SLOT(databaseStatusChanged(DatabaseWidget*))); - connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(setMenuActionState())); - connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(updateWindowTitle())); - connect(m_ui->settingsWidget, SIGNAL(accepted()), SLOT(applySettingsChanges())); - connect(m_ui->settingsWidget, SIGNAL(apply()), SLOT(applySettingsChanges())); - connect(m_ui->settingsWidget, SIGNAL(accepted()), SLOT(switchToDatabases())); - connect(m_ui->settingsWidget, SIGNAL(rejected()), SLOT(switchToDatabases())); + connect(m_ui->tabWidget, SIGNAL(tabNameChanged()), SLOT(updateWindowTitle())); + connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(updateWindowTitle())); + connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(databaseTabChanged(int))); + connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(setMenuActionState())); + connect(m_ui->tabWidget, SIGNAL(databaseLocked(DatabaseWidget*)), SLOT(databaseStatusChanged(DatabaseWidget*))); + connect(m_ui->tabWidget, SIGNAL(databaseUnlocked(DatabaseWidget*)), SLOT(databaseStatusChanged(DatabaseWidget*))); + connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(setMenuActionState())); + connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(updateWindowTitle())); + connect(m_ui->settingsWidget, SIGNAL(accepted()), SLOT(applySettingsChanges())); + connect(m_ui->settingsWidget, SIGNAL(apply()), SLOT(applySettingsChanges())); + connect(m_ui->settingsWidget, SIGNAL(accepted()), SLOT(switchToDatabases())); + connect(m_ui->settingsWidget, SIGNAL(rejected()), SLOT(switchToDatabases())); - connect(m_ui->actionDatabaseNew, SIGNAL(triggered()), m_ui->tabWidget, SLOT(newDatabase())); - connect(m_ui->actionDatabaseOpen, SIGNAL(triggered()), m_ui->tabWidget, SLOT(openDatabase())); - connect(m_ui->actionDatabaseSave, SIGNAL(triggered()), m_ui->tabWidget, SLOT(saveDatabase())); - connect(m_ui->actionDatabaseSaveAs, SIGNAL(triggered()), m_ui->tabWidget, SLOT(saveDatabaseAs())); - connect(m_ui->actionDatabaseClose, SIGNAL(triggered()), m_ui->tabWidget, SLOT(closeCurrentDatabaseTab())); - connect(m_ui->actionDatabaseMerge, SIGNAL(triggered()), m_ui->tabWidget, SLOT(mergeDatabase())); - connect(m_ui->actionChangeMasterKey, SIGNAL(triggered()), m_ui->tabWidget, SLOT(changeMasterKey())); - connect(m_ui->actionChangeDatabaseSettings, SIGNAL(triggered()), m_ui->tabWidget, SLOT(changeDatabaseSettings())); - connect(m_ui->actionImportCsv, SIGNAL(triggered()), m_ui->tabWidget, SLOT(importCsv())); - connect(m_ui->actionImportKeePass1, SIGNAL(triggered()), m_ui->tabWidget, SLOT(importKeePass1Database())); - connect(m_ui->actionExportCsv, SIGNAL(triggered()), m_ui->tabWidget, SLOT(exportToCsv())); - connect(m_ui->actionLockDatabases, SIGNAL(triggered()), m_ui->tabWidget, SLOT(lockDatabases())); - connect(m_ui->actionQuit, SIGNAL(triggered()), SLOT(appExit())); + connect(m_ui->actionDatabaseNew, SIGNAL(triggered()), m_ui->tabWidget, SLOT(newDatabase())); + connect(m_ui->actionDatabaseOpen, SIGNAL(triggered()), m_ui->tabWidget, SLOT(openDatabase())); + connect(m_ui->actionDatabaseSave, SIGNAL(triggered()), m_ui->tabWidget, SLOT(saveDatabase())); + connect(m_ui->actionDatabaseSaveAs, SIGNAL(triggered()), m_ui->tabWidget, SLOT(saveDatabaseAs())); + connect(m_ui->actionDatabaseClose, SIGNAL(triggered()), m_ui->tabWidget, SLOT(closeCurrentDatabaseTab())); + connect(m_ui->actionDatabaseMerge, SIGNAL(triggered()), m_ui->tabWidget, SLOT(mergeDatabase())); + connect(m_ui->actionChangeMasterKey, SIGNAL(triggered()), m_ui->tabWidget, SLOT(changeMasterKey())); + connect(m_ui->actionChangeDatabaseSettings, SIGNAL(triggered()), m_ui->tabWidget, SLOT(changeDatabaseSettings())); + connect(m_ui->actionImportCsv, SIGNAL(triggered()), m_ui->tabWidget, SLOT(importCsv())); + connect(m_ui->actionImportKeePass1, SIGNAL(triggered()), m_ui->tabWidget, SLOT(importKeePass1Database())); + connect(m_ui->actionExportCsv, SIGNAL(triggered()), m_ui->tabWidget, SLOT(exportToCsv())); + connect(m_ui->actionLockDatabases, SIGNAL(triggered()), m_ui->tabWidget, SLOT(lockDatabases())); + connect(m_ui->actionQuit, SIGNAL(triggered()), SLOT(appExit())); - m_actionMultiplexer.connect(m_ui->actionEntryNew, SIGNAL(triggered()), SLOT(createEntry())); - m_actionMultiplexer.connect(m_ui->actionEntryClone, SIGNAL(triggered()), SLOT(cloneEntry())); - m_actionMultiplexer.connect(m_ui->actionEntryEdit, SIGNAL(triggered()), SLOT(switchToEntryEdit())); - m_actionMultiplexer.connect(m_ui->actionEntryDelete, SIGNAL(triggered()), SLOT(deleteSelectedEntries())); + m_actionMultiplexer.connect(m_ui->actionEntryNew, SIGNAL(triggered()), SLOT(createEntry())); + m_actionMultiplexer.connect(m_ui->actionEntryClone, SIGNAL(triggered()), SLOT(cloneEntry())); + m_actionMultiplexer.connect(m_ui->actionEntryEdit, SIGNAL(triggered()), SLOT(switchToEntryEdit())); + m_actionMultiplexer.connect(m_ui->actionEntryDelete, SIGNAL(triggered()), SLOT(deleteSelectedEntries())); - m_actionMultiplexer.connect(m_ui->actionEntryTotp, SIGNAL(triggered()), SLOT(showTotp())); - m_actionMultiplexer.connect(m_ui->actionEntrySetupTotp, SIGNAL(triggered()), SLOT(setupTotp())); + m_actionMultiplexer.connect(m_ui->actionEntryTotp, SIGNAL(triggered()), SLOT(showTotp())); + m_actionMultiplexer.connect(m_ui->actionEntrySetupTotp, SIGNAL(triggered()), SLOT(setupTotp())); - m_actionMultiplexer.connect(m_ui->actionEntryCopyTotp, SIGNAL(triggered()), SLOT(copyTotp())); - m_actionMultiplexer.connect(m_ui->actionEntryTotpQRCode, SIGNAL(triggered()), SLOT(showTotpKeyQrCode())); - m_actionMultiplexer.connect(m_ui->actionEntryCopyTitle, SIGNAL(triggered()), SLOT(copyTitle())); - m_actionMultiplexer.connect(m_ui->actionEntryCopyUsername, SIGNAL(triggered()), SLOT(copyUsername())); - m_actionMultiplexer.connect(m_ui->actionEntryCopyPassword, SIGNAL(triggered()), SLOT(copyPassword())); - m_actionMultiplexer.connect(m_ui->actionEntryCopyURL, SIGNAL(triggered()), SLOT(copyURL())); - m_actionMultiplexer.connect(m_ui->actionEntryCopyNotes, SIGNAL(triggered()), SLOT(copyNotes())); - m_actionMultiplexer.connect(m_ui->actionEntryAutoType, SIGNAL(triggered()), SLOT(performAutoType())); - m_actionMultiplexer.connect(m_ui->actionEntryOpenUrl, SIGNAL(triggered()), SLOT(openUrl())); + m_actionMultiplexer.connect(m_ui->actionEntryCopyTotp, SIGNAL(triggered()), SLOT(copyTotp())); + m_actionMultiplexer.connect(m_ui->actionEntryTotpQRCode, SIGNAL(triggered()), SLOT(showTotpKeyQrCode())); + m_actionMultiplexer.connect(m_ui->actionEntryCopyTitle, SIGNAL(triggered()), SLOT(copyTitle())); + m_actionMultiplexer.connect(m_ui->actionEntryCopyUsername, SIGNAL(triggered()), SLOT(copyUsername())); + m_actionMultiplexer.connect(m_ui->actionEntryCopyPassword, SIGNAL(triggered()), SLOT(copyPassword())); + m_actionMultiplexer.connect(m_ui->actionEntryCopyURL, SIGNAL(triggered()), SLOT(copyURL())); + m_actionMultiplexer.connect(m_ui->actionEntryCopyNotes, SIGNAL(triggered()), SLOT(copyNotes())); + m_actionMultiplexer.connect(m_ui->actionEntryAutoType, SIGNAL(triggered()), SLOT(performAutoType())); + m_actionMultiplexer.connect(m_ui->actionEntryOpenUrl, SIGNAL(triggered()), SLOT(openUrl())); - m_actionMultiplexer.connect(m_ui->actionGroupNew, SIGNAL(triggered()), SLOT(createGroup())); - m_actionMultiplexer.connect(m_ui->actionGroupEdit, SIGNAL(triggered()), SLOT(switchToGroupEdit())); - m_actionMultiplexer.connect(m_ui->actionGroupDelete, SIGNAL(triggered()), SLOT(deleteGroup())); - m_actionMultiplexer.connect(m_ui->actionGroupEmptyRecycleBin, SIGNAL(triggered()), SLOT(emptyRecycleBin())); + m_actionMultiplexer.connect(m_ui->actionGroupNew, SIGNAL(triggered()), SLOT(createGroup())); + m_actionMultiplexer.connect(m_ui->actionGroupEdit, SIGNAL(triggered()), SLOT(switchToGroupEdit())); + m_actionMultiplexer.connect(m_ui->actionGroupDelete, SIGNAL(triggered()), SLOT(deleteGroup())); + m_actionMultiplexer.connect(m_ui->actionGroupEmptyRecycleBin, SIGNAL(triggered()), SLOT(emptyRecycleBin())); - connect(m_ui->actionSettings, SIGNAL(toggled(bool)), SLOT(switchToSettings(bool))); - connect(m_ui->actionPasswordGenerator, SIGNAL(toggled(bool)), SLOT(switchToPasswordGen(bool))); - connect(m_ui->passwordGeneratorWidget, SIGNAL(dialogTerminated()), SLOT(closePasswordGen())); + connect(m_ui->actionSettings, SIGNAL(toggled(bool)), SLOT(switchToSettings(bool))); + connect(m_ui->actionPasswordGenerator, SIGNAL(toggled(bool)), SLOT(switchToPasswordGen(bool))); + connect(m_ui->passwordGeneratorWidget, SIGNAL(dialogTerminated()), SLOT(closePasswordGen())); - connect(m_ui->welcomeWidget, SIGNAL(newDatabase()), SLOT(switchToNewDatabase())); - connect(m_ui->welcomeWidget, SIGNAL(openDatabase()), SLOT(switchToOpenDatabase())); - connect(m_ui->welcomeWidget, SIGNAL(openDatabaseFile(QString)), SLOT(switchToDatabaseFile(QString))); - connect(m_ui->welcomeWidget, SIGNAL(importKeePass1Database()), SLOT(switchToKeePass1Database())); - connect(m_ui->welcomeWidget, SIGNAL(importCsv()), SLOT(switchToCsvImport())); + connect(m_ui->welcomeWidget, SIGNAL(newDatabase()), SLOT(switchToNewDatabase())); + connect(m_ui->welcomeWidget, SIGNAL(openDatabase()), SLOT(switchToOpenDatabase())); + connect(m_ui->welcomeWidget, SIGNAL(openDatabaseFile(QString)), SLOT(switchToDatabaseFile(QString))); + connect(m_ui->welcomeWidget, SIGNAL(importKeePass1Database()), SLOT(switchToKeePass1Database())); + connect(m_ui->welcomeWidget, SIGNAL(importCsv()), SLOT(switchToCsvImport())); - connect(m_ui->actionAbout, SIGNAL(triggered()), SLOT(showAboutDialog())); - connect(m_ui->actionDonate, SIGNAL(triggered()), SLOT(openDonateUrl())); - connect(m_ui->actionBugReport, SIGNAL(triggered()), SLOT(openBugReportUrl())); + connect(m_ui->actionAbout, SIGNAL(triggered()), SLOT(showAboutDialog())); + connect(m_ui->actionDonate, SIGNAL(triggered()), SLOT(openDonateUrl())); + connect(m_ui->actionBugReport, SIGNAL(triggered()), SLOT(openBugReportUrl())); #ifdef Q_OS_MACOS - setUnifiedTitleAndToolBarOnMac(true); + setUnifiedTitleAndToolBarOnMac(true); #endif - // clang-format off - connect(m_ui->tabWidget, - SIGNAL(messageGlobal(QString,MessageWidget::MessageType)), - this, - SLOT(displayGlobalMessage(QString,MessageWidget::MessageType))); - // clang-format on + // clang-format off + connect(m_ui->tabWidget, + SIGNAL(messageGlobal(QString,MessageWidget::MessageType)), + this, + SLOT(displayGlobalMessage(QString,MessageWidget::MessageType))); + // clang-format on - connect(m_ui->tabWidget, SIGNAL(messageDismissGlobal()), this, SLOT(hideGlobalMessage())); + connect(m_ui->tabWidget, SIGNAL(messageDismissGlobal()), this, SLOT(hideGlobalMessage())); - m_screenLockListener = new ScreenLockListener(this); - connect(m_screenLockListener, SIGNAL(screenLocked()), SLOT(handleScreenLock())); + m_screenLockListener = new ScreenLockListener(this); + connect(m_screenLockListener, SIGNAL(screenLocked()), SLOT(handleScreenLock())); - updateTrayIcon(); + updateTrayIcon(); - if (config()->hasAccessError()) { - m_ui->globalMessageWidget->showMessage(tr("Access error for config file %1").arg(config()->getFileName()), - MessageWidget::Error); - } + if (config()->hasAccessError()) { + m_ui->globalMessageWidget->showMessage(tr("Access error for config file %1").arg(config()->getFileName()), + MessageWidget::Error); + } #if !defined(KEEPASSXC_BUILD_TYPE_RELEASE) - m_ui->globalMessageWidget->showMessage( - tr("WARNING: You are using an unstable build of KeePassXC!\n" - "There is a high risk of corruption, maintain a backup of your databases.\n" - "This version is not meant for production use."), - MessageWidget::Warning, - -1); + m_ui->globalMessageWidget->showMessage( + tr("WARNING: You are using an unstable build of KeePassXC!\n" + "There is a high risk of corruption, maintain a backup of your databases.\n" + "This version is not meant for production use."), + MessageWidget::Warning, + -1); #elif (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) && QT_VERSION < QT_VERSION_CHECK(5, 6, 0)) - if (!config()->get("QtErrorMessageShown", false).toBool()) { - m_ui->globalMessageWidget->showMessage( - tr("WARNING: Your Qt version may cause KeePassXC to crash with an On-Screen Keyboard!\n" - "We recommend you use the AppImage available on our downloads page."), - MessageWidget::Warning, - -1); - config()->set("QtErrorMessageShown", true); - } + if (!config()->get("QtErrorMessageShown", false).toBool()) { + m_ui->globalMessageWidget->showMessage( + tr("WARNING: Your Qt version may cause KeePassXC to crash with an On-Screen Keyboard!\n" + "We recommend you use the AppImage available on our downloads page."), + MessageWidget::Warning, + -1); + config()->set("QtErrorMessageShown", true); + } #endif } @@ -402,748 +403,748 @@ MainWindow::~MainWindow() void MainWindow::showErrorMessage(const QString& message) { - m_ui->globalMessageWidget->showMessage(message, MessageWidget::Error); + m_ui->globalMessageWidget->showMessage(message, MessageWidget::Error); } void MainWindow::appExit() { - m_appExitCalled = true; - close(); + m_appExitCalled = true; + close(); } void MainWindow::updateLastDatabasesMenu() { - m_ui->menuRecentDatabases->clear(); + m_ui->menuRecentDatabases->clear(); - const QStringList lastDatabases = config()->get("LastDatabases", QVariant()).toStringList(); - for (const QString& database : lastDatabases) { - QAction* action = m_ui->menuRecentDatabases->addAction(database); - action->setData(database); - m_lastDatabasesActions->addAction(action); - } - m_ui->menuRecentDatabases->addSeparator(); - m_ui->menuRecentDatabases->addAction(m_clearHistoryAction); + const QStringList lastDatabases = config()->get("LastDatabases", QVariant()).toStringList(); + for (const QString& database : lastDatabases) { + QAction* action = m_ui->menuRecentDatabases->addAction(database); + action->setData(database); + m_lastDatabasesActions->addAction(action); + } + m_ui->menuRecentDatabases->addSeparator(); + m_ui->menuRecentDatabases->addAction(m_clearHistoryAction); } void MainWindow::updateCopyAttributesMenu() { - DatabaseWidget* dbWidget = m_ui->tabWidget->currentDatabaseWidget(); - if (!dbWidget) { - return; - } + DatabaseWidget* dbWidget = m_ui->tabWidget->currentDatabaseWidget(); + if (!dbWidget) { + return; + } - if (dbWidget->numberOfSelectedEntries() != 1) { - return; - } + if (dbWidget->numberOfSelectedEntries() != 1) { + return; + } - QList actions = m_ui->menuEntryCopyAttribute->actions(); - for (int i = m_countDefaultAttributes; i < actions.size(); i++) { - delete actions[i]; - } + QList actions = m_ui->menuEntryCopyAttribute->actions(); + for (int i = m_countDefaultAttributes; i < actions.size(); i++) { + delete actions[i]; + } - const QStringList customEntryAttributes = dbWidget->customEntryAttributes(); - for (const QString& key : customEntryAttributes) { - QAction* action = m_ui->menuEntryCopyAttribute->addAction(key); - action->setData(QVariant(key)); - m_copyAdditionalAttributeActions->addAction(action); - } + const QStringList customEntryAttributes = dbWidget->customEntryAttributes(); + for (const QString& key : customEntryAttributes) { + QAction* action = m_ui->menuEntryCopyAttribute->addAction(key); + action->setData(QVariant(key)); + m_copyAdditionalAttributeActions->addAction(action); + } } void MainWindow::openRecentDatabase(QAction* action) { - openDatabase(action->data().toString()); + openDatabase(action->data().toString()); } void MainWindow::clearLastDatabases() { - config()->set("LastDatabases", QVariant()); - bool inWelcomeWidget = (m_ui->stackedWidget->currentIndex() == 2); + config()->set("LastDatabases", QVariant()); + bool inWelcomeWidget = (m_ui->stackedWidget->currentIndex() == 2); - if (inWelcomeWidget) { - m_ui->welcomeWidget->refreshLastDatabases(); - } + if (inWelcomeWidget) { + m_ui->welcomeWidget->refreshLastDatabases(); + } } void MainWindow::openDatabase(const QString& filePath, const QString& pw, const QString& keyFile) { - if (pw.isEmpty() && keyFile.isEmpty()) { - m_ui->tabWidget->addDatabaseTab(filePath); - return; - } + if (pw.isEmpty() && keyFile.isEmpty()) { + m_ui->tabWidget->addDatabaseTab(filePath); + return; + } - auto db = QSharedPointer::create(); - auto key = QSharedPointer::create(); - if (!pw.isEmpty()) { - key->addKey(QSharedPointer::create(pw)); - } - if (!keyFile.isEmpty()) { - auto fileKey = QSharedPointer::create(); - fileKey->load(keyFile); - key->addKey(fileKey); - } - if (db->open(filePath, key, nullptr, false)) { - auto* dbWidget = new DatabaseWidget(db, this); - m_ui->tabWidget->addDatabaseTab(dbWidget); - dbWidget->switchToMainView(true); - } + auto db = QSharedPointer::create(); + auto key = QSharedPointer::create(); + if (!pw.isEmpty()) { + key->addKey(QSharedPointer::create(pw)); + } + if (!keyFile.isEmpty()) { + auto fileKey = QSharedPointer::create(); + fileKey->load(keyFile); + key->addKey(fileKey); + } + if (db->open(filePath, key, nullptr, false)) { + auto* dbWidget = new DatabaseWidget(db, this); + m_ui->tabWidget->addDatabaseTab(dbWidget); + dbWidget->switchToMainView(true); + } } void MainWindow::setMenuActionState(DatabaseWidget::Mode mode) { - int currentIndex = m_ui->stackedWidget->currentIndex(); + int currentIndex = m_ui->stackedWidget->currentIndex(); - bool inDatabaseTabWidget = (currentIndex == DatabaseTabScreen); - bool inWelcomeWidget = (currentIndex == WelcomeScreen); - bool inDatabaseTabWidgetOrWelcomeWidget = inDatabaseTabWidget || inWelcomeWidget; + bool inDatabaseTabWidget = (currentIndex == DatabaseTabScreen); + bool inWelcomeWidget = (currentIndex == WelcomeScreen); + bool inDatabaseTabWidgetOrWelcomeWidget = inDatabaseTabWidget || inWelcomeWidget; - m_ui->actionDatabaseMerge->setEnabled(inDatabaseTabWidget); + m_ui->actionDatabaseMerge->setEnabled(inDatabaseTabWidget); - m_ui->actionDatabaseNew->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); - m_ui->actionDatabaseOpen->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); - m_ui->menuRecentDatabases->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); - m_ui->menuImport->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); + m_ui->actionDatabaseNew->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); + m_ui->actionDatabaseOpen->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); + m_ui->menuRecentDatabases->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); + m_ui->menuImport->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); - m_ui->actionLockDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases()); + m_ui->actionLockDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases()); - if (inDatabaseTabWidget && m_ui->tabWidget->currentIndex() != -1) { - DatabaseWidget* dbWidget = m_ui->tabWidget->currentDatabaseWidget(); - Q_ASSERT(dbWidget); + if (inDatabaseTabWidget && m_ui->tabWidget->currentIndex() != -1) { + DatabaseWidget* dbWidget = m_ui->tabWidget->currentDatabaseWidget(); + Q_ASSERT(dbWidget); - if (mode == DatabaseWidget::Mode::None) { - mode = dbWidget->currentMode(); - } + if (mode == DatabaseWidget::Mode::None) { + mode = dbWidget->currentMode(); + } - switch (mode) { - case DatabaseWidget::Mode::ViewMode: { - // bool inSearch = dbWidget->isInSearchMode(); - bool singleEntrySelected = dbWidget->numberOfSelectedEntries() == 1 && dbWidget->currentEntryHasFocus(); - bool entriesSelected = dbWidget->numberOfSelectedEntries() > 0 && dbWidget->currentEntryHasFocus(); - bool groupSelected = dbWidget->isGroupSelected(); - bool recycleBinSelected = dbWidget->isRecycleBinSelected(); + switch (mode) { + case DatabaseWidget::Mode::ViewMode: { + // bool inSearch = dbWidget->isInSearchMode(); + bool singleEntrySelected = dbWidget->numberOfSelectedEntries() == 1 && dbWidget->currentEntryHasFocus(); + bool entriesSelected = dbWidget->numberOfSelectedEntries() > 0 && dbWidget->currentEntryHasFocus(); + bool groupSelected = dbWidget->isGroupSelected(); + bool recycleBinSelected = dbWidget->isRecycleBinSelected(); - m_ui->actionEntryNew->setEnabled(true); - m_ui->actionEntryClone->setEnabled(singleEntrySelected); - m_ui->actionEntryEdit->setEnabled(singleEntrySelected); - m_ui->actionEntryDelete->setEnabled(entriesSelected); - m_ui->actionEntryCopyTitle->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTitle()); - m_ui->actionEntryCopyUsername->setEnabled(singleEntrySelected && dbWidget->currentEntryHasUsername()); - m_ui->actionEntryCopyPassword->setEnabled(singleEntrySelected && dbWidget->currentEntryHasPassword()); - m_ui->actionEntryCopyURL->setEnabled(singleEntrySelected && dbWidget->currentEntryHasUrl()); - m_ui->actionEntryCopyNotes->setEnabled(singleEntrySelected && dbWidget->currentEntryHasNotes()); - m_ui->menuEntryCopyAttribute->setEnabled(singleEntrySelected); - m_ui->menuEntryTotp->setEnabled(singleEntrySelected); - m_ui->actionEntryAutoType->setEnabled(singleEntrySelected); - m_ui->actionEntryOpenUrl->setEnabled(singleEntrySelected && dbWidget->currentEntryHasUrl()); - m_ui->actionEntryTotp->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTotp()); - m_ui->actionEntryCopyTotp->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTotp()); - m_ui->actionEntrySetupTotp->setEnabled(singleEntrySelected); - m_ui->actionEntryTotpQRCode->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTotp()); - m_ui->actionGroupNew->setEnabled(groupSelected); - m_ui->actionGroupEdit->setEnabled(groupSelected); - m_ui->actionGroupDelete->setEnabled(groupSelected && dbWidget->canDeleteCurrentGroup()); - m_ui->actionGroupEmptyRecycleBin->setVisible(recycleBinSelected); - m_ui->actionGroupEmptyRecycleBin->setEnabled(recycleBinSelected); - m_ui->actionChangeMasterKey->setEnabled(true); - m_ui->actionChangeDatabaseSettings->setEnabled(true); - m_ui->actionDatabaseSave->setEnabled(m_ui->tabWidget->canSave()); - m_ui->actionDatabaseSaveAs->setEnabled(true); - m_ui->actionExportCsv->setEnabled(true); - m_ui->actionDatabaseMerge->setEnabled(m_ui->tabWidget->currentIndex() != -1); + m_ui->actionEntryNew->setEnabled(true); + m_ui->actionEntryClone->setEnabled(singleEntrySelected); + m_ui->actionEntryEdit->setEnabled(singleEntrySelected); + m_ui->actionEntryDelete->setEnabled(entriesSelected); + m_ui->actionEntryCopyTitle->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTitle()); + m_ui->actionEntryCopyUsername->setEnabled(singleEntrySelected && dbWidget->currentEntryHasUsername()); + m_ui->actionEntryCopyPassword->setEnabled(singleEntrySelected && dbWidget->currentEntryHasPassword()); + m_ui->actionEntryCopyURL->setEnabled(singleEntrySelected && dbWidget->currentEntryHasUrl()); + m_ui->actionEntryCopyNotes->setEnabled(singleEntrySelected && dbWidget->currentEntryHasNotes()); + m_ui->menuEntryCopyAttribute->setEnabled(singleEntrySelected); + m_ui->menuEntryTotp->setEnabled(singleEntrySelected); + m_ui->actionEntryAutoType->setEnabled(singleEntrySelected); + m_ui->actionEntryOpenUrl->setEnabled(singleEntrySelected && dbWidget->currentEntryHasUrl()); + m_ui->actionEntryTotp->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTotp()); + m_ui->actionEntryCopyTotp->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTotp()); + m_ui->actionEntrySetupTotp->setEnabled(singleEntrySelected); + m_ui->actionEntryTotpQRCode->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTotp()); + m_ui->actionGroupNew->setEnabled(groupSelected); + m_ui->actionGroupEdit->setEnabled(groupSelected); + m_ui->actionGroupDelete->setEnabled(groupSelected && dbWidget->canDeleteCurrentGroup()); + m_ui->actionGroupEmptyRecycleBin->setVisible(recycleBinSelected); + m_ui->actionGroupEmptyRecycleBin->setEnabled(recycleBinSelected); + m_ui->actionChangeMasterKey->setEnabled(true); + m_ui->actionChangeDatabaseSettings->setEnabled(true); + m_ui->actionDatabaseSave->setEnabled(m_ui->tabWidget->canSave()); + m_ui->actionDatabaseSaveAs->setEnabled(true); + m_ui->actionExportCsv->setEnabled(true); + m_ui->actionDatabaseMerge->setEnabled(m_ui->tabWidget->currentIndex() != -1); - m_searchWidgetAction->setEnabled(true); + m_searchWidgetAction->setEnabled(true); - break; - } - case DatabaseWidget::Mode::EditMode: - case DatabaseWidget::Mode::ImportMode: - case DatabaseWidget::Mode::LockedMode: { - const QList entryActions = m_ui->menuEntries->actions(); - for (QAction* action : entryActions) { - action->setEnabled(false); - } + break; + } + case DatabaseWidget::Mode::EditMode: + case DatabaseWidget::Mode::ImportMode: + case DatabaseWidget::Mode::LockedMode: { + const QList entryActions = m_ui->menuEntries->actions(); + for (QAction* action : entryActions) { + action->setEnabled(false); + } - const QList groupActions = m_ui->menuGroups->actions(); - for (QAction* action : groupActions) { - action->setEnabled(false); - } + const QList groupActions = m_ui->menuGroups->actions(); + for (QAction* action : groupActions) { + action->setEnabled(false); + } - m_ui->actionChangeMasterKey->setEnabled(false); - m_ui->actionChangeDatabaseSettings->setEnabled(false); - m_ui->actionDatabaseSave->setEnabled(false); - m_ui->actionDatabaseSaveAs->setEnabled(false); - m_ui->actionExportCsv->setEnabled(false); - m_ui->actionDatabaseMerge->setEnabled(false); + m_ui->actionChangeMasterKey->setEnabled(false); + m_ui->actionChangeDatabaseSettings->setEnabled(false); + m_ui->actionDatabaseSave->setEnabled(false); + m_ui->actionDatabaseSaveAs->setEnabled(false); + m_ui->actionExportCsv->setEnabled(false); + m_ui->actionDatabaseMerge->setEnabled(false); - m_searchWidgetAction->setEnabled(false); - break; - } - default: - Q_ASSERT(false); - } - m_ui->actionDatabaseClose->setEnabled(true); - } else { - const QList entryActions = m_ui->menuEntries->actions(); - for (QAction* action : entryActions) { - action->setEnabled(false); - } + m_searchWidgetAction->setEnabled(false); + break; + } + default: + Q_ASSERT(false); + } + m_ui->actionDatabaseClose->setEnabled(true); + } else { + const QList entryActions = m_ui->menuEntries->actions(); + for (QAction* action : entryActions) { + action->setEnabled(false); + } - const QList groupActions = m_ui->menuGroups->actions(); - for (QAction* action : groupActions) { - action->setEnabled(false); - } + const QList groupActions = m_ui->menuGroups->actions(); + for (QAction* action : groupActions) { + action->setEnabled(false); + } - m_ui->actionChangeMasterKey->setEnabled(false); - m_ui->actionChangeDatabaseSettings->setEnabled(false); - m_ui->actionDatabaseSave->setEnabled(false); - m_ui->actionDatabaseSaveAs->setEnabled(false); - m_ui->actionDatabaseClose->setEnabled(false); - m_ui->actionExportCsv->setEnabled(false); - m_ui->actionDatabaseMerge->setEnabled(false); + m_ui->actionChangeMasterKey->setEnabled(false); + m_ui->actionChangeDatabaseSettings->setEnabled(false); + m_ui->actionDatabaseSave->setEnabled(false); + m_ui->actionDatabaseSaveAs->setEnabled(false); + m_ui->actionDatabaseClose->setEnabled(false); + m_ui->actionExportCsv->setEnabled(false); + m_ui->actionDatabaseMerge->setEnabled(false); - m_searchWidgetAction->setEnabled(false); - } + m_searchWidgetAction->setEnabled(false); + } - if ((currentIndex == PasswordGeneratorScreen) != m_ui->actionPasswordGenerator->isChecked()) { - bool blocked = m_ui->actionPasswordGenerator->blockSignals(true); - m_ui->actionPasswordGenerator->toggle(); - m_ui->actionPasswordGenerator->blockSignals(blocked); - } else if ((currentIndex == SettingsScreen) != m_ui->actionSettings->isChecked()) { - bool blocked = m_ui->actionSettings->blockSignals(true); - m_ui->actionSettings->toggle(); - m_ui->actionSettings->blockSignals(blocked); - } + if ((currentIndex == PasswordGeneratorScreen) != m_ui->actionPasswordGenerator->isChecked()) { + bool blocked = m_ui->actionPasswordGenerator->blockSignals(true); + m_ui->actionPasswordGenerator->toggle(); + m_ui->actionPasswordGenerator->blockSignals(blocked); + } else if ((currentIndex == SettingsScreen) != m_ui->actionSettings->isChecked()) { + bool blocked = m_ui->actionSettings->blockSignals(true); + m_ui->actionSettings->toggle(); + m_ui->actionSettings->blockSignals(blocked); + } } void MainWindow::updateWindowTitle() { - QString customWindowTitlePart; - int stackedWidgetIndex = m_ui->stackedWidget->currentIndex(); - int tabWidgetIndex = m_ui->tabWidget->currentIndex(); - bool isModified = m_ui->tabWidget->isModified(tabWidgetIndex); + QString customWindowTitlePart; + int stackedWidgetIndex = m_ui->stackedWidget->currentIndex(); + int tabWidgetIndex = m_ui->tabWidget->currentIndex(); + bool isModified = m_ui->tabWidget->isModified(tabWidgetIndex); - if (stackedWidgetIndex == DatabaseTabScreen && tabWidgetIndex != -1) { - customWindowTitlePart = m_ui->tabWidget->tabName(tabWidgetIndex); - if (isModified) { - // remove asterisk '*' from title - customWindowTitlePart.remove(customWindowTitlePart.size() - 1, 1); - } - m_ui->actionDatabaseSave->setEnabled(m_ui->tabWidget->canSave(tabWidgetIndex)); - } else if (stackedWidgetIndex == 1) { - customWindowTitlePart = tr("Settings"); - } + if (stackedWidgetIndex == DatabaseTabScreen && tabWidgetIndex != -1) { + customWindowTitlePart = m_ui->tabWidget->tabName(tabWidgetIndex); + if (isModified) { + // remove asterisk '*' from title + customWindowTitlePart.remove(customWindowTitlePart.size() - 1, 1); + } + m_ui->actionDatabaseSave->setEnabled(m_ui->tabWidget->canSave(tabWidgetIndex)); + } else if (stackedWidgetIndex == 1) { + customWindowTitlePart = tr("Settings"); + } - QString windowTitle; - if (customWindowTitlePart.isEmpty()) { - windowTitle = BaseWindowTitle; - } else { - windowTitle = QString("%1[*] - %2").arg(customWindowTitlePart, BaseWindowTitle); - } + QString windowTitle; + if (customWindowTitlePart.isEmpty()) { + windowTitle = BaseWindowTitle; + } else { + windowTitle = QString("%1[*] - %2").arg(customWindowTitlePart, BaseWindowTitle); + } - if (customWindowTitlePart.isEmpty() || stackedWidgetIndex == 1) { - setWindowFilePath(""); - } else { - setWindowFilePath(m_ui->tabWidget->databaseWidgetFromIndex(tabWidgetIndex)->database()->filePath()); - } + if (customWindowTitlePart.isEmpty() || stackedWidgetIndex == 1) { + setWindowFilePath(""); + } else { + setWindowFilePath(m_ui->tabWidget->databaseWidgetFromIndex(tabWidgetIndex)->database()->filePath()); + } - setWindowTitle(windowTitle); - setWindowModified(isModified); + setWindowTitle(windowTitle); + setWindowModified(isModified); } void MainWindow::showAboutDialog() { - auto* aboutDialog = new AboutDialog(this); - aboutDialog->open(); + auto* aboutDialog = new AboutDialog(this); + aboutDialog->open(); } void MainWindow::openDonateUrl() { - QDesktopServices::openUrl(QUrl("https://keepassxc.org/donate")); + QDesktopServices::openUrl(QUrl("https://keepassxc.org/donate")); } void MainWindow::openBugReportUrl() { - QDesktopServices::openUrl(QUrl("https://github.com/keepassxreboot/keepassxc/issues")); + QDesktopServices::openUrl(QUrl("https://github.com/keepassxreboot/keepassxc/issues")); } void MainWindow::switchToDatabases() { - if (m_ui->tabWidget->currentIndex() == -1) { - m_ui->stackedWidget->setCurrentIndex(WelcomeScreen); - } else { - m_ui->stackedWidget->setCurrentIndex(DatabaseTabScreen); - } + if (m_ui->tabWidget->currentIndex() == -1) { + m_ui->stackedWidget->setCurrentIndex(WelcomeScreen); + } else { + m_ui->stackedWidget->setCurrentIndex(DatabaseTabScreen); + } } void MainWindow::switchToSettings(bool enabled) { - if (enabled) { - m_ui->settingsWidget->loadSettings(); - m_ui->stackedWidget->setCurrentIndex(SettingsScreen); - } else { - switchToDatabases(); - } + if (enabled) { + m_ui->settingsWidget->loadSettings(); + m_ui->stackedWidget->setCurrentIndex(SettingsScreen); + } else { + switchToDatabases(); + } } void MainWindow::switchToPasswordGen(bool enabled) { - if (enabled) { - m_ui->passwordGeneratorWidget->loadSettings(); - m_ui->passwordGeneratorWidget->regeneratePassword(); - m_ui->passwordGeneratorWidget->setStandaloneMode(true); - m_ui->stackedWidget->setCurrentIndex(PasswordGeneratorScreen); - } else { - m_ui->passwordGeneratorWidget->saveSettings(); - switchToDatabases(); - } + if (enabled) { + m_ui->passwordGeneratorWidget->loadSettings(); + m_ui->passwordGeneratorWidget->regeneratePassword(); + m_ui->passwordGeneratorWidget->setStandaloneMode(true); + m_ui->stackedWidget->setCurrentIndex(PasswordGeneratorScreen); + } else { + m_ui->passwordGeneratorWidget->saveSettings(); + switchToDatabases(); + } } void MainWindow::closePasswordGen() { - switchToPasswordGen(false); + switchToPasswordGen(false); } void MainWindow::switchToNewDatabase() { - m_ui->tabWidget->newDatabase(); - switchToDatabases(); + m_ui->tabWidget->newDatabase(); + switchToDatabases(); } void MainWindow::switchToOpenDatabase() { - m_ui->tabWidget->openDatabase(); - switchToDatabases(); + m_ui->tabWidget->openDatabase(); + switchToDatabases(); } void MainWindow::switchToDatabaseFile(const QString& file) { - m_ui->tabWidget->addDatabaseTab(file); - switchToDatabases(); + m_ui->tabWidget->addDatabaseTab(file); + switchToDatabases(); } void MainWindow::switchToKeePass1Database() { - m_ui->tabWidget->importKeePass1Database(); - switchToDatabases(); + m_ui->tabWidget->importKeePass1Database(); + switchToDatabases(); } void MainWindow::switchToCsvImport() { - m_ui->tabWidget->importCsv(); - switchToDatabases(); + m_ui->tabWidget->importCsv(); + switchToDatabases(); } void MainWindow::databaseStatusChanged(DatabaseWidget* dbWidget) { - Q_UNUSED(dbWidget); - updateTrayIcon(); + Q_UNUSED(dbWidget); + updateTrayIcon(); } void MainWindow::selectNextDatabaseTab() { - if (m_ui->stackedWidget->currentIndex() == DatabaseTabScreen) { - int index = m_ui->tabWidget->currentIndex() + 1; - if (index >= m_ui->tabWidget->count()) { - m_ui->tabWidget->setCurrentIndex(0); - } else { - m_ui->tabWidget->setCurrentIndex(index); - } - } + if (m_ui->stackedWidget->currentIndex() == DatabaseTabScreen) { + int index = m_ui->tabWidget->currentIndex() + 1; + if (index >= m_ui->tabWidget->count()) { + m_ui->tabWidget->setCurrentIndex(0); + } else { + m_ui->tabWidget->setCurrentIndex(index); + } + } } void MainWindow::selectPreviousDatabaseTab() { - if (m_ui->stackedWidget->currentIndex() == DatabaseTabScreen) { - int index = m_ui->tabWidget->currentIndex() - 1; - if (index < 0) { - m_ui->tabWidget->setCurrentIndex(m_ui->tabWidget->count() - 1); - } else { - m_ui->tabWidget->setCurrentIndex(index); - } - } + if (m_ui->stackedWidget->currentIndex() == DatabaseTabScreen) { + int index = m_ui->tabWidget->currentIndex() - 1; + if (index < 0) { + m_ui->tabWidget->setCurrentIndex(m_ui->tabWidget->count() - 1); + } else { + m_ui->tabWidget->setCurrentIndex(index); + } + } } void MainWindow::databaseTabChanged(int tabIndex) { - if (tabIndex != -1 && m_ui->stackedWidget->currentIndex() == WelcomeScreen) { - m_ui->stackedWidget->setCurrentIndex(DatabaseTabScreen); - } else if (tabIndex == -1 && m_ui->stackedWidget->currentIndex() == DatabaseTabScreen) { - m_ui->stackedWidget->setCurrentIndex(WelcomeScreen); - } + if (tabIndex != -1 && m_ui->stackedWidget->currentIndex() == WelcomeScreen) { + m_ui->stackedWidget->setCurrentIndex(DatabaseTabScreen); + } else if (tabIndex == -1 && m_ui->stackedWidget->currentIndex() == DatabaseTabScreen) { + m_ui->stackedWidget->setCurrentIndex(WelcomeScreen); + } - m_actionMultiplexer.setCurrentObject(m_ui->tabWidget->currentDatabaseWidget()); + m_actionMultiplexer.setCurrentObject(m_ui->tabWidget->currentDatabaseWidget()); } void MainWindow::togglePasswordsHidden() { - auto dbWidget = m_ui->tabWidget->currentDatabaseWidget(); - if (dbWidget) { - dbWidget->setPasswordsHidden(!dbWidget->isPasswordsHidden()); - } + auto dbWidget = m_ui->tabWidget->currentDatabaseWidget(); + if (dbWidget) { + dbWidget->setPasswordsHidden(!dbWidget->isPasswordsHidden()); + } } void MainWindow::toggleUsernamesHidden() { - auto dbWidget = m_ui->tabWidget->currentDatabaseWidget(); - if (dbWidget) { - dbWidget->setUsernamesHidden(!dbWidget->isUsernamesHidden()); - } + auto dbWidget = m_ui->tabWidget->currentDatabaseWidget(); + if (dbWidget) { + dbWidget->setUsernamesHidden(!dbWidget->isUsernamesHidden()); + } } void MainWindow::closeEvent(QCloseEvent* event) { - // ignore double close events (happens on macOS when closing from the dock) - if (m_appExiting) { - event->accept(); - return; - } + // ignore double close events (happens on macOS when closing from the dock) + if (m_appExiting) { + event->accept(); + return; + } - if (config()->get("GUI/MinimizeOnClose").toBool() && !m_appExitCalled) { - event->ignore(); - hideWindow(); - return; - } + if (config()->get("GUI/MinimizeOnClose").toBool() && !m_appExitCalled) { + event->ignore(); + hideWindow(); + return; + } - bool accept = saveLastDatabases(); + bool accept = saveLastDatabases(); - if (accept) { - m_appExiting = true; - saveWindowInformation(); + if (accept) { + m_appExiting = true; + saveWindowInformation(); - event->accept(); - QApplication::quit(); - } else { - event->ignore(); - } + event->accept(); + QApplication::quit(); + } else { + event->ignore(); + } } void MainWindow::changeEvent(QEvent* event) { - if ((event->type() == QEvent::WindowStateChange) && isMinimized()) { - if (isTrayIconEnabled() && m_trayIcon && m_trayIcon->isVisible() - && config()->get("GUI/MinimizeToTray").toBool()) { - event->ignore(); - QTimer::singleShot(0, this, SLOT(hide())); - } + if ((event->type() == QEvent::WindowStateChange) && isMinimized()) { + if (isTrayIconEnabled() && m_trayIcon && m_trayIcon->isVisible() + && config()->get("GUI/MinimizeToTray").toBool()) { + event->ignore(); + QTimer::singleShot(0, this, SLOT(hide())); + } - if (config()->get("security/lockdatabaseminimize").toBool()) { - m_ui->tabWidget->lockDatabases(); - } - } else { - QMainWindow::changeEvent(event); - } + if (config()->get("security/lockdatabaseminimize").toBool()) { + m_ui->tabWidget->lockDatabases(); + } + } else { + QMainWindow::changeEvent(event); + } } void MainWindow::saveWindowInformation() { - if (isVisible()) { - config()->set("GUI/MainWindowGeometry", saveGeometry()); - } + if (isVisible()) { + config()->set("GUI/MainWindowGeometry", saveGeometry()); + } } bool MainWindow::saveLastDatabases() { - bool accept; - m_openDatabases.clear(); - bool openPreviousDatabasesOnStartup = config()->get("OpenPreviousDatabasesOnStartup").toBool(); + bool accept; + m_openDatabases.clear(); + bool openPreviousDatabasesOnStartup = config()->get("OpenPreviousDatabasesOnStartup").toBool(); - if (openPreviousDatabasesOnStartup) { - connect(m_ui->tabWidget, SIGNAL(databaseClosed(const QString&)), this, SLOT(rememberOpenDatabases(const QString&))); - } + if (openPreviousDatabasesOnStartup) { + connect(m_ui->tabWidget, SIGNAL(databaseClosed(const QString&)), this, SLOT(rememberOpenDatabases(const QString&))); + } - accept = m_ui->tabWidget->closeAllDatabaseTabs(); + accept = m_ui->tabWidget->closeAllDatabaseTabs(); - if (openPreviousDatabasesOnStartup) { - disconnect( - m_ui->tabWidget, SIGNAL(databaseClosed(const QString&)), this, SLOT(rememberOpenDatabases(const QString&))); - config()->set("LastOpenedDatabases", m_openDatabases); - } + if (openPreviousDatabasesOnStartup) { + disconnect( + m_ui->tabWidget, SIGNAL(databaseClosed(const QString&)), this, SLOT(rememberOpenDatabases(const QString&))); + config()->set("LastOpenedDatabases", m_openDatabases); + } - return accept; + return accept; } void MainWindow::updateTrayIcon() { - if (isTrayIconEnabled()) { - if (!m_trayIcon) { - m_trayIcon = new QSystemTrayIcon(this); - QMenu* menu = new QMenu(this); + if (isTrayIconEnabled()) { + if (!m_trayIcon) { + m_trayIcon = new QSystemTrayIcon(this); + QMenu* menu = new QMenu(this); - QAction* actionToggle = new QAction(tr("Toggle window"), menu); - menu->addAction(actionToggle); + QAction* actionToggle = new QAction(tr("Toggle window"), menu); + menu->addAction(actionToggle); #ifdef Q_OS_MACOS - QAction* actionQuit = new QAction(tr("Quit KeePassXC"), menu); - menu->addAction(actionQuit); + QAction* actionQuit = new QAction(tr("Quit KeePassXC"), menu); + menu->addAction(actionQuit); - connect(actionQuit, SIGNAL(triggered()), SLOT(appExit())); + connect(actionQuit, SIGNAL(triggered()), SLOT(appExit())); #else - menu->addAction(m_ui->actionQuit); + menu->addAction(m_ui->actionQuit); - connect(m_trayIcon, - SIGNAL(activated(QSystemTrayIcon::ActivationReason)), - SLOT(trayIconTriggered(QSystemTrayIcon::ActivationReason))); + connect(m_trayIcon, + SIGNAL(activated(QSystemTrayIcon::ActivationReason)), + SLOT(trayIconTriggered(QSystemTrayIcon::ActivationReason))); #endif - connect(actionToggle, SIGNAL(triggered()), SLOT(toggleWindow())); + connect(actionToggle, SIGNAL(triggered()), SLOT(toggleWindow())); - m_trayIcon->setContextMenu(menu); + m_trayIcon->setContextMenu(menu); - m_trayIcon->setIcon(filePath()->trayIcon()); - m_trayIcon->show(); - } - if (m_ui->tabWidget->hasLockableDatabases()) { - m_trayIcon->setIcon(filePath()->trayIconUnlocked()); - } else { - m_trayIcon->setIcon(filePath()->trayIconLocked()); - } - } else { - if (m_trayIcon) { - m_trayIcon->hide(); - delete m_trayIcon; - m_trayIcon = nullptr; - } - } + m_trayIcon->setIcon(filePath()->trayIcon()); + m_trayIcon->show(); + } + if (m_ui->tabWidget->hasLockableDatabases()) { + m_trayIcon->setIcon(filePath()->trayIconUnlocked()); + } else { + m_trayIcon->setIcon(filePath()->trayIconLocked()); + } + } else { + if (m_trayIcon) { + m_trayIcon->hide(); + delete m_trayIcon; + m_trayIcon = nullptr; + } + } } void MainWindow::showEntryContextMenu(const QPoint& globalPos) { - m_ui->menuEntries->popup(globalPos); + m_ui->menuEntries->popup(globalPos); } void MainWindow::showGroupContextMenu(const QPoint& globalPos) { - m_ui->menuGroups->popup(globalPos); + m_ui->menuGroups->popup(globalPos); } void MainWindow::setShortcut(QAction* action, QKeySequence::StandardKey standard, int fallback) { - if (!QKeySequence::keyBindings(standard).isEmpty()) { - action->setShortcuts(standard); - } else if (fallback != 0) { - action->setShortcut(QKeySequence(fallback)); - } + if (!QKeySequence::keyBindings(standard).isEmpty()) { + action->setShortcuts(standard); + } else if (fallback != 0) { + action->setShortcut(QKeySequence(fallback)); + } } void MainWindow::rememberOpenDatabases(const QString& filePath) { - m_openDatabases.prepend(filePath); + m_openDatabases.prepend(filePath); } void MainWindow::applySettingsChanges() { - int timeout = config()->get("security/lockdatabaseidlesec").toInt() * 1000; - if (timeout <= 0) { - timeout = 60; - } + int timeout = config()->get("security/lockdatabaseidlesec").toInt() * 1000; + if (timeout <= 0) { + timeout = 60; + } - m_inactivityTimer->setInactivityTimeout(timeout); - if (config()->get("security/lockdatabaseidle").toBool()) { - m_inactivityTimer->activate(); - } else { - m_inactivityTimer->deactivate(); - } + m_inactivityTimer->setInactivityTimeout(timeout); + if (config()->get("security/lockdatabaseidle").toBool()) { + m_inactivityTimer->activate(); + } else { + m_inactivityTimer->deactivate(); + } #ifdef WITH_XC_TOUCHID - // forget TouchID (in minutes) - timeout = config()->get("security/resettouchidtimeout").toInt() * 60 * 1000; - if (timeout <= 0) { - timeout = 30 * 60 * 1000; - } + // forget TouchID (in minutes) + timeout = config()->get("security/resettouchidtimeout").toInt() * 60 * 1000; + if (timeout <= 0) { + timeout = 30 * 60 * 1000; + } - m_touchIDinactivityTimer->setInactivityTimeout(timeout); - if (config()->get("security/resettouchid").toBool()) { - m_touchIDinactivityTimer->activate(); - } else { - m_touchIDinactivityTimer->deactivate(); - } + m_touchIDinactivityTimer->setInactivityTimeout(timeout); + if (config()->get("security/resettouchid").toBool()) { + m_touchIDinactivityTimer->activate(); + } else { + m_touchIDinactivityTimer->deactivate(); + } #endif - m_ui->toolBar->setHidden(config()->get("GUI/HideToolbar").toBool()); + m_ui->toolBar->setHidden(config()->get("GUI/HideToolbar").toBool()); - updateTrayIcon(); + updateTrayIcon(); } void MainWindow::trayIconTriggered(QSystemTrayIcon::ActivationReason reason) { - if (reason == QSystemTrayIcon::Trigger || reason == QSystemTrayIcon::MiddleClick) { - toggleWindow(); - } + if (reason == QSystemTrayIcon::Trigger || reason == QSystemTrayIcon::MiddleClick) { + toggleWindow(); + } } void MainWindow::hideWindow() { - saveWindowInformation(); + saveWindowInformation(); #if !defined(Q_OS_LINUX) && !defined(Q_OS_MACOS) - // On some Linux systems, the window should NOT be minimized and hidden (i.e. not shown), at - // the same time (which would happen if both minimize on startup and minimize to tray are set) - // since otherwise it causes problems on restore as seen on issue #1595. Hiding it is enough. - // TODO: Add an explanation for why this is also not done on Mac (or remove the check) - setWindowState(windowState() | Qt::WindowMinimized); + // On some Linux systems, the window should NOT be minimized and hidden (i.e. not shown), at + // the same time (which would happen if both minimize on startup and minimize to tray are set) + // since otherwise it causes problems on restore as seen on issue #1595. Hiding it is enough. + // TODO: Add an explanation for why this is also not done on Mac (or remove the check) + setWindowState(windowState() | Qt::WindowMinimized); #endif - // Only hide if tray icon is active, otherwise window will be gone forever - if (isTrayIconEnabled()) { - hide(); - } else { - showMinimized(); - } + // Only hide if tray icon is active, otherwise window will be gone forever + if (isTrayIconEnabled()) { + hide(); + } else { + showMinimized(); + } - if (config()->get("security/lockdatabaseminimize").toBool()) { - m_ui->tabWidget->lockDatabases(); - } + if (config()->get("security/lockdatabaseminimize").toBool()) { + m_ui->tabWidget->lockDatabases(); + } } void MainWindow::toggleWindow() { - if (isVisible() && !isMinimized()) { - hideWindow(); - } else { - bringToFront(); + if (isVisible() && !isMinimized()) { + hideWindow(); + } else { + bringToFront(); #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && !defined(QT_NO_DBUS) && (QT_VERSION < QT_VERSION_CHECK(5, 9, 0)) - // re-register global D-Bus menu (needed on Ubuntu with Unity) - // see https://github.com/keepassxreboot/keepassxc/issues/271 - // and https://bugreports.qt.io/browse/QTBUG-58723 - // check for !isVisible(), because isNativeMenuBar() does not work with appmenu-qt5 - if (!m_ui->menubar->isVisible()) { - QDBusMessage msg = QDBusMessage::createMethodCall("com.canonical.AppMenu.Registrar", - "/com/canonical/AppMenu/Registrar", - "com.canonical.AppMenu.Registrar", - "RegisterWindow"); - QList args; - args << QVariant::fromValue(static_cast(winId())) - << QVariant::fromValue(QDBusObjectPath("/MenuBar/1")); - msg.setArguments(args); - QDBusConnection::sessionBus().send(msg); - } + // re-register global D-Bus menu (needed on Ubuntu with Unity) + // see https://github.com/keepassxreboot/keepassxc/issues/271 + // and https://bugreports.qt.io/browse/QTBUG-58723 + // check for !isVisible(), because isNativeMenuBar() does not work with appmenu-qt5 + if (!m_ui->menubar->isVisible()) { + QDBusMessage msg = QDBusMessage::createMethodCall("com.canonical.AppMenu.Registrar", + "/com/canonical/AppMenu/Registrar", + "com.canonical.AppMenu.Registrar", + "RegisterWindow"); + QList args; + args << QVariant::fromValue(static_cast(winId())) + << QVariant::fromValue(QDBusObjectPath("/MenuBar/1")); + msg.setArguments(args); + QDBusConnection::sessionBus().send(msg); + } #endif - } + } } void MainWindow::lockDatabasesAfterInactivity() { - // ignore event if a modal dialog is open (such as a message box or file dialog) - if (QApplication::activeModalWidget()) { - return; - } + // ignore event if a modal dialog is open (such as a message box or file dialog) + if (QApplication::activeModalWidget()) { + return; + } - m_ui->tabWidget->lockDatabases(); + m_ui->tabWidget->lockDatabases(); } void MainWindow::forgetTouchIDAfterInactivity() { #ifdef WITH_XC_TOUCHID - TouchID::getInstance().reset(); + TouchID::getInstance().reset(); #endif } bool MainWindow::isTrayIconEnabled() const { - return config()->get("GUI/ShowTrayIcon").toBool() && QSystemTrayIcon::isSystemTrayAvailable(); + return config()->get("GUI/ShowTrayIcon").toBool() && QSystemTrayIcon::isSystemTrayAvailable(); } void MainWindow::displayGlobalMessage(const QString& text, - MessageWidget::MessageType type, - bool showClosebutton, - int autoHideTimeout) + MessageWidget::MessageType type, + bool showClosebutton, + int autoHideTimeout) { - m_ui->globalMessageWidget->setCloseButtonVisible(showClosebutton); - m_ui->globalMessageWidget->showMessage(text, type, autoHideTimeout); + m_ui->globalMessageWidget->setCloseButtonVisible(showClosebutton); + m_ui->globalMessageWidget->showMessage(text, type, autoHideTimeout); } void MainWindow::displayTabMessage(const QString& text, - MessageWidget::MessageType type, - bool showClosebutton, - int autoHideTimeout) + MessageWidget::MessageType type, + bool showClosebutton, + int autoHideTimeout) { - m_ui->tabWidget->currentDatabaseWidget()->showMessage(text, type, showClosebutton, autoHideTimeout); + m_ui->tabWidget->currentDatabaseWidget()->showMessage(text, type, showClosebutton, autoHideTimeout); } void MainWindow::hideGlobalMessage() { - m_ui->globalMessageWidget->hideMessage(); + m_ui->globalMessageWidget->hideMessage(); } void MainWindow::showYubiKeyPopup() { - displayGlobalMessage(tr("Please touch the button on your YubiKey!"), - MessageWidget::Information, - false, - MessageWidget::DisableAutoHide); - setEnabled(false); + displayGlobalMessage(tr("Please touch the button on your YubiKey!"), + MessageWidget::Information, + false, + MessageWidget::DisableAutoHide); + setEnabled(false); } void MainWindow::hideYubiKeyPopup() { - hideGlobalMessage(); - setEnabled(true); + hideGlobalMessage(); + setEnabled(true); } void MainWindow::bringToFront() { - ensurePolished(); - setWindowState(windowState() & ~Qt::WindowMinimized); - show(); - raise(); - activateWindow(); + ensurePolished(); + setWindowState(windowState() & ~Qt::WindowMinimized); + show(); + raise(); + activateWindow(); } void MainWindow::handleScreenLock() { - if (config()->get("security/lockdatabasescreenlock").toBool()) { - lockDatabasesAfterInactivity(); - } + if (config()->get("security/lockdatabasescreenlock").toBool()) { + lockDatabasesAfterInactivity(); + } #ifdef WITH_XC_TOUCHID - if (config()->get("security/resettouchidscreenlock").toBool()) { - forgetTouchIDAfterInactivity(); - } + if (config()->get("security/resettouchidscreenlock").toBool()) { + forgetTouchIDAfterInactivity(); + } #endif } QStringList MainWindow::kdbxFilesFromUrls(const QList& urls) { - QStringList kdbxFiles; - for (const QUrl& url : urls) { - const QFileInfo fInfo(url.toLocalFile()); - const bool isKdbxFile = fInfo.isFile() && fInfo.suffix().toLower() == "kdbx"; - if (isKdbxFile) { - kdbxFiles.append(fInfo.absoluteFilePath()); - } - } + QStringList kdbxFiles; + for (const QUrl& url : urls) { + const QFileInfo fInfo(url.toLocalFile()); + const bool isKdbxFile = fInfo.isFile() && fInfo.suffix().toLower() == "kdbx"; + if (isKdbxFile) { + kdbxFiles.append(fInfo.absoluteFilePath()); + } + } - return kdbxFiles; + return kdbxFiles; } void MainWindow::dragEnterEvent(QDragEnterEvent* event) { - const QMimeData* mimeData = event->mimeData(); - if (mimeData->hasUrls()) { - const QStringList kdbxFiles = kdbxFilesFromUrls(mimeData->urls()); - if (!kdbxFiles.isEmpty()) { - event->acceptProposedAction(); - } - } + const QMimeData* mimeData = event->mimeData(); + if (mimeData->hasUrls()) { + const QStringList kdbxFiles = kdbxFilesFromUrls(mimeData->urls()); + if (!kdbxFiles.isEmpty()) { + event->acceptProposedAction(); + } + } } void MainWindow::dropEvent(QDropEvent* event) { - const QMimeData* mimeData = event->mimeData(); - if (mimeData->hasUrls()) { - const QStringList kdbxFiles = kdbxFilesFromUrls(mimeData->urls()); - if (!kdbxFiles.isEmpty()) { - event->acceptProposedAction(); - } - for (const QString& kdbxFile : kdbxFiles) { - openDatabase(kdbxFile); - } - } + const QMimeData* mimeData = event->mimeData(); + if (mimeData->hasUrls()) { + const QStringList kdbxFiles = kdbxFilesFromUrls(mimeData->urls()); + if (!kdbxFiles.isEmpty()) { + event->acceptProposedAction(); + } + for (const QString& kdbxFile : kdbxFiles) { + openDatabase(kdbxFile); + } + } } void MainWindow::closeAllDatabases() { - m_ui->tabWidget->closeAllDatabaseTabs(); + m_ui->tabWidget->closeAllDatabaseTabs(); } void MainWindow::lockAllDatabases() { - lockDatabasesAfterInactivity(); + lockDatabasesAfterInactivity(); } diff --git a/src/keeshare/KeeShare.cpp b/src/keeshare/KeeShare.cpp index 3e15d2137..ba188a974 100644 --- a/src/keeshare/KeeShare.cpp +++ b/src/keeshare/KeeShare.cpp @@ -129,12 +129,12 @@ bool KeeShare::isEnabled(const Group* group) { const auto reference = KeeShare::referenceOf(group); #if !defined(WITH_XC_KEESHARE_SECURE) - if (reference.path.endsWith(secureContainerFileType(), Qt::CaseInsensitive)){ + if (reference.path.endsWith(signedContainerFileType(), Qt::CaseInsensitive)){ return false; } #endif #if !defined(WITH_XC_KEESHARE_INSECURE) - if (reference.path.endsWith(insecureContainerFileType(), Qt::CaseInsensitive)){ + if (reference.path.endsWith(unsignedContainerFileType(), Qt::CaseInsensitive)){ return false; } #endif @@ -198,13 +198,13 @@ void KeeShare::connectDatabase(QSharedPointer newDb, QSharedPointer newDb, QSharedPointer oldDb); - static const QString& secureContainerFileType(); - static const QString& insecureContainerFileType(); + static const QString& signedContainerFileType(); + static const QString& unsignedContainerFileType(); signals: void activeChanged(); diff --git a/src/keeshare/SettingsWidgetKeeShare.cpp b/src/keeshare/SettingsWidgetKeeShare.cpp index be4aee2ef..03fee3340 100644 --- a/src/keeshare/SettingsWidgetKeeShare.cpp +++ b/src/keeshare/SettingsWidgetKeeShare.cpp @@ -29,26 +29,26 @@ #include SettingsWidgetKeeShare::SettingsWidgetKeeShare(QWidget* parent) - : QWidget(parent) - , m_ui(new Ui::SettingsWidgetKeeShare()) + : QWidget(parent) + , m_ui(new Ui::SettingsWidgetKeeShare()) { - m_ui->setupUi(this); + m_ui->setupUi(this); #if !defined(WITH_XC_KEESHARE_SECURE) - // Setting does not help the user of Version without secure export - m_ui->ownCertificateGroupBox->setVisible(false); + // Setting does not help the user of Version without signed export + m_ui->ownCertificateGroupBox->setVisible(false); #endif - connect(m_ui->ownCertificateSignerEdit, SIGNAL(textChanged(QString)), SLOT(setVerificationExporter(QString))); + connect(m_ui->ownCertificateSignerEdit, SIGNAL(textChanged(QString)), SLOT(setVerificationExporter(QString))); - connect(m_ui->generateOwnCerticateButton, SIGNAL(clicked(bool)), SLOT(generateCertificate())); - connect(m_ui->importOwnCertificateButton, SIGNAL(clicked(bool)), SLOT(importCertificate())); - connect(m_ui->exportOwnCertificateButton, SIGNAL(clicked(bool)), SLOT(exportCertificate())); + connect(m_ui->generateOwnCerticateButton, SIGNAL(clicked(bool)), SLOT(generateCertificate())); + connect(m_ui->importOwnCertificateButton, SIGNAL(clicked(bool)), SLOT(importCertificate())); + connect(m_ui->exportOwnCertificateButton, SIGNAL(clicked(bool)), SLOT(exportCertificate())); - connect(m_ui->trustImportedCertificateButton, SIGNAL(clicked(bool)), SLOT(trustSelectedCertificates())); - connect(m_ui->askImportedCertificateButton, SIGNAL(clicked(bool)), SLOT(askSelectedCertificates())); - connect(m_ui->untrustImportedCertificateButton, SIGNAL(clicked(bool)), SLOT(untrustSelectedCertificates())); - connect(m_ui->removeImportedCertificateButton, SIGNAL(clicked(bool)), SLOT(removeSelectedCertificates())); + connect(m_ui->trustImportedCertificateButton, SIGNAL(clicked(bool)), SLOT(trustSelectedCertificates())); + connect(m_ui->askImportedCertificateButton, SIGNAL(clicked(bool)), SLOT(askSelectedCertificates())); + connect(m_ui->untrustImportedCertificateButton, SIGNAL(clicked(bool)), SLOT(untrustSelectedCertificates())); + connect(m_ui->removeImportedCertificateButton, SIGNAL(clicked(bool)), SLOT(removeSelectedCertificates())); } SettingsWidgetKeeShare::~SettingsWidgetKeeShare() @@ -57,181 +57,181 @@ SettingsWidgetKeeShare::~SettingsWidgetKeeShare() void SettingsWidgetKeeShare::loadSettings() { - const auto active = KeeShare::active(); - m_ui->enableExportCheckBox->setChecked(active.out); - m_ui->enableImportCheckBox->setChecked(active.in); + const auto active = KeeShare::active(); + m_ui->enableExportCheckBox->setChecked(active.out); + m_ui->enableImportCheckBox->setChecked(active.in); - m_own = KeeShare::own(); - updateOwnCertificate(); + m_own = KeeShare::own(); + updateOwnCertificate(); - m_foreign = KeeShare::foreign(); - updateForeignCertificates(); + m_foreign = KeeShare::foreign(); + updateForeignCertificates(); } void SettingsWidgetKeeShare::updateForeignCertificates() { - m_importedCertificateModel.reset(new QStandardItemModel()); - m_importedCertificateModel->setHorizontalHeaderLabels(QStringList() << tr("Path") << tr("Status") + m_importedCertificateModel.reset(new QStandardItemModel()); + m_importedCertificateModel->setHorizontalHeaderLabels(QStringList() << tr("Path") << tr("Status") #if defined(WITH_XC_KEESHARE_SECURE) - << tr("Signer") << tr("Fingerprint") << tr("Certificate") + << tr("Signer") << tr("Fingerprint") << tr("Certificate") #endif - ); + ); - for (const auto& scopedCertificate : m_foreign.certificates) { - const auto items = QList() - << new QStandardItem(scopedCertificate.path) - << new QStandardItem(scopedCertificate.trust == KeeShareSettings::Trust::Ask ? tr("Ask") - : (scopedCertificate.trust == KeeShareSettings::Trust::Trusted ? tr("Trusted") - : tr("Untrusted"))) + for (const auto& scopedCertificate : m_foreign.certificates) { + const auto items = QList() + << new QStandardItem(scopedCertificate.path) + << new QStandardItem(scopedCertificate.trust == KeeShareSettings::Trust::Ask ? tr("Ask") + : (scopedCertificate.trust == KeeShareSettings::Trust::Trusted ? tr("Trusted") + : tr("Untrusted"))) #if defined(WITH_XC_KEESHARE_SECURE) - << new QStandardItem(scopedCertificate.isKnown() ? scopedCertificate.certificate.signer : tr("Unknown")) - << new QStandardItem(scopedCertificate.certificate.fingerprint()) - << new QStandardItem(scopedCertificate.certificate.publicKey()) + << new QStandardItem(scopedCertificate.isKnown() ? scopedCertificate.certificate.signer : tr("Unknown")) + << new QStandardItem(scopedCertificate.certificate.fingerprint()) + << new QStandardItem(scopedCertificate.certificate.publicKey()) #endif - ; - m_importedCertificateModel->appendRow(items); - } + ; + m_importedCertificateModel->appendRow(items); + } - m_ui->importedCertificateTableView->setModel(m_importedCertificateModel.data()); + m_ui->importedCertificateTableView->setModel(m_importedCertificateModel.data()); } void SettingsWidgetKeeShare::updateOwnCertificate() { - m_ui->ownCertificateSignerEdit->setText(m_own.certificate.signer); - m_ui->ownCertificatePublicKeyEdit->setText(m_own.certificate.publicKey()); - m_ui->ownCertificatePrivateKeyEdit->setText(m_own.key.privateKey()); - m_ui->ownCertificateFingerprintEdit->setText(m_own.certificate.fingerprint()); + m_ui->ownCertificateSignerEdit->setText(m_own.certificate.signer); + m_ui->ownCertificatePublicKeyEdit->setText(m_own.certificate.publicKey()); + m_ui->ownCertificatePrivateKeyEdit->setText(m_own.key.privateKey()); + m_ui->ownCertificateFingerprintEdit->setText(m_own.certificate.fingerprint()); } void SettingsWidgetKeeShare::saveSettings() { - KeeShareSettings::Active active; - active.out = m_ui->enableExportCheckBox->isChecked(); - active.in = m_ui->enableImportCheckBox->isChecked(); - // TODO HNH: This depends on the order of saving new data - a better model would be to - // store changes to the settings in a temporary object and check on the final values - // of this object (similar scheme to Entry) - this way we could validate the settings before save - KeeShare::setOwn(m_own); - KeeShare::setForeign(m_foreign); - KeeShare::setActive(active); + KeeShareSettings::Active active; + active.out = m_ui->enableExportCheckBox->isChecked(); + active.in = m_ui->enableImportCheckBox->isChecked(); + // TODO HNH: This depends on the order of saving new data - a better model would be to + // store changes to the settings in a temporary object and check on the final values + // of this object (similar scheme to Entry) - this way we could validate the settings before save + KeeShare::setOwn(m_own); + KeeShare::setForeign(m_foreign); + KeeShare::setActive(active); } void SettingsWidgetKeeShare::setVerificationExporter(const QString& signer) { - m_own.certificate.signer = signer; - m_ui->ownCertificateSignerEdit->setText(m_own.certificate.signer); + m_own.certificate.signer = signer; + m_ui->ownCertificateSignerEdit->setText(m_own.certificate.signer); } void SettingsWidgetKeeShare::generateCertificate() { - m_own = KeeShareSettings::Own::generate(); - m_ui->ownCertificateSignerEdit->setText(m_own.certificate.signer); - m_ui->ownCertificatePublicKeyEdit->setText(m_own.certificate.publicKey()); - m_ui->ownCertificatePrivateKeyEdit->setText(m_own.key.privateKey()); - m_ui->ownCertificateFingerprintEdit->setText(m_own.certificate.fingerprint()); + m_own = KeeShareSettings::Own::generate(); + m_ui->ownCertificateSignerEdit->setText(m_own.certificate.signer); + m_ui->ownCertificatePublicKeyEdit->setText(m_own.certificate.publicKey()); + m_ui->ownCertificatePrivateKeyEdit->setText(m_own.key.privateKey()); + m_ui->ownCertificateFingerprintEdit->setText(m_own.certificate.fingerprint()); } void SettingsWidgetKeeShare::importCertificate() { - QString defaultDirPath = config()->get("KeeShare/LastKeyDir").toString(); - const bool dirExists = !defaultDirPath.isEmpty() && QDir(defaultDirPath).exists(); - if (!dirExists) { - defaultDirPath = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).first(); - } - const auto filetype = tr("key.share", "Filetype for KeeShare key"); - const auto filters = QString("%1 (*." + filetype + ");;%2 (*)").arg(tr("KeeShare key file"), tr("All files")); - QString filename = fileDialog()->getOpenFileName(this, tr("Select path"), defaultDirPath, filters, nullptr, QFileDialog::Options(0)); - if (filename.isEmpty()) { - return; - } - QFile file(filename); - file.open(QIODevice::ReadOnly); - QTextStream stream(&file); - m_own = KeeShareSettings::Own::deserialize(stream.readAll()); - file.close(); - config()->set("KeeShare/LastKeyDir", QFileInfo(filename).absolutePath()); + QString defaultDirPath = config()->get("KeeShare/LastKeyDir").toString(); + const bool dirExists = !defaultDirPath.isEmpty() && QDir(defaultDirPath).exists(); + if (!dirExists) { + defaultDirPath = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).first(); + } + const auto filetype = tr("key.share", "Filetype for KeeShare key"); + const auto filters = QString("%1 (*." + filetype + ");;%2 (*)").arg(tr("KeeShare key file"), tr("All files")); + QString filename = fileDialog()->getOpenFileName(this, tr("Select path"), defaultDirPath, filters, nullptr, QFileDialog::Options(0)); + if (filename.isEmpty()) { + return; + } + QFile file(filename); + file.open(QIODevice::ReadOnly); + QTextStream stream(&file); + m_own = KeeShareSettings::Own::deserialize(stream.readAll()); + file.close(); + config()->set("KeeShare/LastKeyDir", QFileInfo(filename).absolutePath()); - updateOwnCertificate(); + updateOwnCertificate(); } void SettingsWidgetKeeShare::exportCertificate() { - if (KeeShare::own() != m_own) { - QMessageBox warning; - warning.setIcon(QMessageBox::Warning); - warning.setWindowTitle(tr("Exporting changed certificate")); - warning.setText(tr("The exported certificate is not the same as the one in use. Do you want to export the current certificate?")); - auto yes = warning.addButton(QMessageBox::StandardButton::Yes); - auto no = warning.addButton(QMessageBox::StandardButton::No); - warning.setDefaultButton(no); - warning.exec(); - if (warning.clickedButton() != yes) { - return; - } - } - QString defaultDirPath = config()->get("KeeShare/LastKeyDir").toString(); - const bool dirExists = !defaultDirPath.isEmpty() && QDir(defaultDirPath).exists(); - if (!dirExists) { - defaultDirPath = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).first(); - } - const auto filetype = tr("key.share", "Filetype for KeeShare key"); - const auto filters = QString("%1 (*." + filetype + ");;%2 (*)").arg(tr("KeeShare key file"), tr("All files")); - QString filename = tr("%1.%2", "Template for KeeShare key file").arg(m_own.certificate.signer).arg(filetype); - filename = fileDialog()->getSaveFileName(this, tr("Select path"), defaultDirPath, filters, nullptr, QFileDialog::Options(0), filetype, filename); - if (filename.isEmpty()) { - return; - } - QFile file(filename); - file.open(QIODevice::Truncate | QIODevice::WriteOnly); - QTextStream stream(&file); - stream << KeeShareSettings::Own::serialize(m_own); - stream.flush(); - file.close(); - config()->set("KeeShare/LastKeyDir", QFileInfo(filename).absolutePath()); + if (KeeShare::own() != m_own) { + QMessageBox warning; + warning.setIcon(QMessageBox::Warning); + warning.setWindowTitle(tr("Exporting changed certificate")); + warning.setText(tr("The exported certificate is not the same as the one in use. Do you want to export the current certificate?")); + auto yes = warning.addButton(QMessageBox::StandardButton::Yes); + auto no = warning.addButton(QMessageBox::StandardButton::No); + warning.setDefaultButton(no); + warning.exec(); + if (warning.clickedButton() != yes) { + return; + } + } + QString defaultDirPath = config()->get("KeeShare/LastKeyDir").toString(); + const bool dirExists = !defaultDirPath.isEmpty() && QDir(defaultDirPath).exists(); + if (!dirExists) { + defaultDirPath = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).first(); + } + const auto filetype = tr("key.share", "Filetype for KeeShare key"); + const auto filters = QString("%1 (*." + filetype + ");;%2 (*)").arg(tr("KeeShare key file"), tr("All files")); + QString filename = tr("%1.%2", "Template for KeeShare key file").arg(m_own.certificate.signer).arg(filetype); + filename = fileDialog()->getSaveFileName(this, tr("Select path"), defaultDirPath, filters, nullptr, QFileDialog::Options(0), filetype, filename); + if (filename.isEmpty()) { + return; + } + QFile file(filename); + file.open(QIODevice::Truncate | QIODevice::WriteOnly); + QTextStream stream(&file); + stream << KeeShareSettings::Own::serialize(m_own); + stream.flush(); + file.close(); + config()->set("KeeShare/LastKeyDir", QFileInfo(filename).absolutePath()); } void SettingsWidgetKeeShare::trustSelectedCertificates() { - const auto* selectionModel = m_ui->importedCertificateTableView->selectionModel(); - Q_ASSERT(selectionModel); - for (const auto& index : selectionModel->selectedRows()) { - m_foreign.certificates[index.row()].trust = KeeShareSettings::Trust::Trusted; - } + const auto* selectionModel = m_ui->importedCertificateTableView->selectionModel(); + Q_ASSERT(selectionModel); + for (const auto& index : selectionModel->selectedRows()) { + m_foreign.certificates[index.row()].trust = KeeShareSettings::Trust::Trusted; + } - updateForeignCertificates(); + updateForeignCertificates(); } void SettingsWidgetKeeShare::askSelectedCertificates() { - const auto* selectionModel = m_ui->importedCertificateTableView->selectionModel(); - Q_ASSERT(selectionModel); - for (const auto& index : selectionModel->selectedRows()) { - m_foreign.certificates[index.row()].trust = KeeShareSettings::Trust::Ask; - } + const auto* selectionModel = m_ui->importedCertificateTableView->selectionModel(); + Q_ASSERT(selectionModel); + for (const auto& index : selectionModel->selectedRows()) { + m_foreign.certificates[index.row()].trust = KeeShareSettings::Trust::Ask; + } - updateForeignCertificates(); + updateForeignCertificates(); } void SettingsWidgetKeeShare::untrustSelectedCertificates() { - const auto* selectionModel = m_ui->importedCertificateTableView->selectionModel(); - Q_ASSERT(selectionModel); - for (const auto& index : selectionModel->selectedRows()) { - m_foreign.certificates[index.row()].trust = KeeShareSettings::Trust::Untrusted; - } + const auto* selectionModel = m_ui->importedCertificateTableView->selectionModel(); + Q_ASSERT(selectionModel); + for (const auto& index : selectionModel->selectedRows()) { + m_foreign.certificates[index.row()].trust = KeeShareSettings::Trust::Untrusted; + } - updateForeignCertificates(); + updateForeignCertificates(); } void SettingsWidgetKeeShare::removeSelectedCertificates() { - auto certificates = m_foreign.certificates; - const auto* selectionModel = m_ui->importedCertificateTableView->selectionModel(); - Q_ASSERT(selectionModel); - for (const auto& index : selectionModel->selectedRows()) { - certificates.removeOne(m_foreign.certificates[index.row()]); - } - m_foreign.certificates = certificates; + auto certificates = m_foreign.certificates; + const auto* selectionModel = m_ui->importedCertificateTableView->selectionModel(); + Q_ASSERT(selectionModel); + for (const auto& index : selectionModel->selectedRows()) { + certificates.removeOne(m_foreign.certificates[index.row()]); + } + m_foreign.certificates = certificates; - updateForeignCertificates(); + updateForeignCertificates(); } diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp index 45f3049c4..bb87c1c75 100644 --- a/src/keeshare/ShareObserver.cpp +++ b/src/keeshare/ShareObserver.cpp @@ -56,116 +56,116 @@ static const QString KeeShare_Container("container.share.kdbx"); enum Trust { - Invalid, - Own, - UntrustedForever, - UntrustedOnce, - TrustedOnce, - TrustedForever, + Invalid, + Own, + UntrustedForever, + UntrustedOnce, + TrustedOnce, + TrustedForever, }; bool isOfExportType(const QFileInfo &fileInfo, const QString type) { - return fileInfo.fileName().endsWith(type, Qt::CaseInsensitive); + return fileInfo.fileName().endsWith(type, Qt::CaseInsensitive); } QPair check(QByteArray& data, - const KeeShareSettings::Reference& reference, - const KeeShareSettings::Certificate& ownCertificate, - const QList& knownCertificates, - const KeeShareSettings::Sign& sign) + const KeeShareSettings::Reference& reference, + const KeeShareSettings::Certificate& ownCertificate, + const QList& knownCertificates, + const KeeShareSettings::Sign& sign) { - KeeShareSettings::Certificate certificate; - if (!sign.signature.isEmpty()) { - certificate = sign.certificate; - auto key = sign.certificate.sshKey(); - key.openKey(QString()); - const auto signer = Signature(); - if (!signer.verify(data, sign.signature, key)) { - qCritical("Invalid signature for sharing container %s.", qPrintable(reference.path)); - return {Invalid, KeeShareSettings::Certificate()}; - } + KeeShareSettings::Certificate certificate; + if (!sign.signature.isEmpty()) { + certificate = sign.certificate; + auto key = sign.certificate.sshKey(); + key.openKey(QString()); + const auto signer = Signature(); + if (!signer.verify(data, sign.signature, key)) { + qCritical("Invalid signature for sharing container %s.", qPrintable(reference.path)); + return {Invalid, KeeShareSettings::Certificate()}; + } - if (ownCertificate.key == sign.certificate.key) { - return {Own, ownCertificate }; - } - } - enum Scope { Invalid, Global, Local }; - Scope scope = Invalid; - KeeShareSettings::Trust trusted = KeeShareSettings::Trust::Ask; - for (const auto& scopedCertificate : knownCertificates) { - if (scopedCertificate.certificate.key == certificate.key && scopedCertificate.path == reference.path) { - // Global scope is overwritten by local scope - scope = Global; - trusted = scopedCertificate.trust; - } - if (scopedCertificate.certificate.key == certificate.key && scopedCertificate.path == reference.path) { - scope = Local; - trusted = scopedCertificate.trust; - break; - } - } - if (scope != Invalid && trusted != KeeShareSettings::Trust::Ask){ - // we introduce now scopes if there is a global - return {trusted == KeeShareSettings::Trust::Trusted ? TrustedForever : UntrustedForever, certificate}; - } + if (ownCertificate.key == sign.certificate.key) { + return {Own, ownCertificate }; + } + } + enum Scope { Invalid, Global, Local }; + Scope scope = Invalid; + KeeShareSettings::Trust trusted = KeeShareSettings::Trust::Ask; + for (const auto& scopedCertificate : knownCertificates) { + if (scopedCertificate.certificate.key == certificate.key && scopedCertificate.path == reference.path) { + // Global scope is overwritten by local scope + scope = Global; + trusted = scopedCertificate.trust; + } + if (scopedCertificate.certificate.key == certificate.key && scopedCertificate.path == reference.path) { + scope = Local; + trusted = scopedCertificate.trust; + break; + } + } + if (scope != Invalid && trusted != KeeShareSettings::Trust::Ask){ + // we introduce now scopes if there is a global + return {trusted == KeeShareSettings::Trust::Trusted ? TrustedForever : UntrustedForever, certificate}; + } - QMessageBox warning; - if (sign.signature.isEmpty()){ - warning.setIcon(QMessageBox::Warning); - warning.setWindowTitle(ShareObserver::tr("Import from container without signature")); - warning.setText(ShareObserver::tr("We cannot verify the source of the shared container because it is not signed. Do you really want to import from %1?") - .arg(reference.path)); - } - else { - warning.setIcon(QMessageBox::Question); - warning.setWindowTitle(ShareObserver::tr("Import from container with certificate")); - warning.setText(ShareObserver::tr("Do you want to trust %1 with the fingerprint of %2 from %3") - .arg(certificate.signer, certificate.fingerprint(), reference.path)); - } - auto untrustedOnce = warning.addButton(ShareObserver::tr("Not this time"), QMessageBox::ButtonRole::NoRole); - auto untrustedForever = warning.addButton(ShareObserver::tr("Never"), QMessageBox::ButtonRole::NoRole); - auto trustedForever = warning.addButton(ShareObserver::tr("Always"), QMessageBox::ButtonRole::YesRole); - auto trustedOnce = warning.addButton(ShareObserver::tr("Just this time"), QMessageBox::ButtonRole::YesRole); - warning.setDefaultButton(untrustedOnce); - warning.exec(); - if (warning.clickedButton() == trustedForever){ - return {TrustedForever, certificate }; - } - if (warning.clickedButton() == trustedOnce){ - return {TrustedOnce, certificate}; - } - if (warning.clickedButton() == untrustedOnce){ - return {UntrustedOnce, certificate }; - } - if (warning.clickedButton() == untrustedForever){ - return {UntrustedForever, certificate }; - } - return {UntrustedOnce, certificate }; + QMessageBox warning; + if (sign.signature.isEmpty()){ + warning.setIcon(QMessageBox::Warning); + warning.setWindowTitle(ShareObserver::tr("Import from container without signature")); + warning.setText(ShareObserver::tr("We cannot verify the source of the shared container because it is not signed. Do you really want to import from %1?") + .arg(reference.path)); + } + else { + warning.setIcon(QMessageBox::Question); + warning.setWindowTitle(ShareObserver::tr("Import from container with certificate")); + warning.setText(ShareObserver::tr("Do you want to trust %1 with the fingerprint of %2 from %3") + .arg(certificate.signer, certificate.fingerprint(), reference.path)); + } + auto untrustedOnce = warning.addButton(ShareObserver::tr("Not this time"), QMessageBox::ButtonRole::NoRole); + auto untrustedForever = warning.addButton(ShareObserver::tr("Never"), QMessageBox::ButtonRole::NoRole); + auto trustedForever = warning.addButton(ShareObserver::tr("Always"), QMessageBox::ButtonRole::YesRole); + auto trustedOnce = warning.addButton(ShareObserver::tr("Just this time"), QMessageBox::ButtonRole::YesRole); + warning.setDefaultButton(untrustedOnce); + warning.exec(); + if (warning.clickedButton() == trustedForever){ + return {TrustedForever, certificate }; + } + if (warning.clickedButton() == trustedOnce){ + return {TrustedOnce, certificate}; + } + if (warning.clickedButton() == untrustedOnce){ + return {UntrustedOnce, certificate }; + } + if (warning.clickedButton() == untrustedForever){ + return {UntrustedForever, certificate }; + } + return {UntrustedOnce, certificate }; } } // End Namespace ShareObserver::ShareObserver(QSharedPointer db, QObject* parent) - : QObject(parent) - , m_db(std::move(db)) - , m_fileWatcher(new BulkFileWatcher(this)) + : QObject(parent) + , m_db(std::move(db)) + , m_fileWatcher(new BulkFileWatcher(this)) { - connect(KeeShare::instance(), SIGNAL(activeChanged()), SLOT(handleDatabaseChanged())); + connect(KeeShare::instance(), SIGNAL(activeChanged()), SLOT(handleDatabaseChanged())); - connect(m_db.data(), SIGNAL(databaseModified()), SLOT(handleDatabaseChanged())); - connect(m_db.data(), SIGNAL(databaseSaved()), SLOT(handleDatabaseSaved())); + connect(m_db.data(), SIGNAL(databaseModified()), SLOT(handleDatabaseChanged())); + connect(m_db.data(), SIGNAL(databaseSaved()), SLOT(handleDatabaseSaved())); - connect(m_fileWatcher, SIGNAL(fileCreated(QString)), SLOT(handleFileUpdated(QString))); - connect(m_fileWatcher, SIGNAL(fileChanged(QString)), SLOT(handleFileUpdated(QString))); - connect(m_fileWatcher, SIGNAL(fileRemoved(QString)), SLOT(handleFileUpdated(QString))); + connect(m_fileWatcher, SIGNAL(fileCreated(QString)), SLOT(handleFileUpdated(QString))); + connect(m_fileWatcher, SIGNAL(fileChanged(QString)), SLOT(handleFileUpdated(QString))); + connect(m_fileWatcher, SIGNAL(fileRemoved(QString)), SLOT(handleFileUpdated(QString))); - const auto active = KeeShare::active(); - if (!active.in && !active.out) { - deinitialize(); - } else { - reinitialize(); - } + const auto active = KeeShare::active(); + if (!active.in && !active.out) { + deinitialize(); + } else { + reinitialize(); + } } ShareObserver::~ShareObserver() @@ -174,604 +174,604 @@ ShareObserver::~ShareObserver() void ShareObserver::deinitialize() { - m_fileWatcher->clear(); - m_groupToReference.clear(); - m_referenceToGroup.clear(); + m_fileWatcher->clear(); + m_groupToReference.clear(); + m_referenceToGroup.clear(); } void ShareObserver::reinitialize() { - struct Update - { - Group* group; - KeeShareSettings::Reference oldReference; - KeeShareSettings::Reference newReference; - }; + struct Update + { + Group* group; + KeeShareSettings::Reference oldReference; + KeeShareSettings::Reference newReference; + }; - const auto active = KeeShare::active(); - QList updated; - QList groups = m_db->rootGroup()->groupsRecursive(true); - for (Group* group : groups) { - Update couple{group, m_groupToReference.value(group), KeeShare::referenceOf(group)}; - if (couple.oldReference == couple.newReference) { - continue; - } + const auto active = KeeShare::active(); + QList updated; + QList groups = m_db->rootGroup()->groupsRecursive(true); + for (Group* group : groups) { + Update couple{group, m_groupToReference.value(group), KeeShare::referenceOf(group)}; + if (couple.oldReference == couple.newReference) { + continue; + } - m_groupToReference.remove(couple.group); - m_referenceToGroup.remove(couple.oldReference); - m_shareToGroup.remove(couple.oldReference.path); - if (couple.newReference.isValid() && ((active.in && couple.newReference.isImporting()) - || (active.out && couple.newReference.isExporting()))) { - m_groupToReference[couple.group] = couple.newReference; - m_referenceToGroup[couple.newReference] = couple.group; - m_shareToGroup[couple.newReference.path] = couple.group; - } - updated << couple; - } + m_groupToReference.remove(couple.group); + m_referenceToGroup.remove(couple.oldReference); + m_shareToGroup.remove(couple.oldReference.path); + if (couple.newReference.isValid() && ((active.in && couple.newReference.isImporting()) + || (active.out && couple.newReference.isExporting()))) { + m_groupToReference[couple.group] = couple.newReference; + m_referenceToGroup[couple.newReference] = couple.group; + m_shareToGroup[couple.newReference.path] = couple.group; + } + updated << couple; + } - QStringList success; - QStringList warning; - QStringList error; - for (const auto& update : updated) { - if (!update.oldReference.path.isEmpty()) { - m_fileWatcher->removePath(update.oldReference.path); - } + QStringList success; + QStringList warning; + QStringList error; + for (const auto& update : updated) { + if (!update.oldReference.path.isEmpty()) { + m_fileWatcher->removePath(update.oldReference.path); + } - if (!update.newReference.path.isEmpty() && update.newReference.type != KeeShareSettings::Inactive) { - m_fileWatcher->addPath(update.newReference.path); - } + if (!update.newReference.path.isEmpty() && update.newReference.type != KeeShareSettings::Inactive) { + m_fileWatcher->addPath(update.newReference.path); + } - if (update.newReference.isImporting()) { - const auto result = this->importFromReferenceContainer(update.newReference.path); - if (!result.isValid()) { - // tolerable result - blocked import or missing source - continue; - } + if (update.newReference.isImporting()) { + const auto result = this->importFromReferenceContainer(update.newReference.path); + if (!result.isValid()) { + // tolerable result - blocked import or missing source + continue; + } - if (result.isError()) { - error << tr("Import from %1 failed (%2)").arg(result.path).arg(result.message); - } else if (result.isWarning()) { - warning << tr("Import from %1 failed (%2)").arg(result.path).arg(result.message); - } else if (result.isInfo()) { - success << tr("Import from %1 successful (%2)").arg(result.path).arg(result.message); - } else { - success << tr("Imported from %1").arg(result.path); - } - } - } + if (result.isError()) { + error << tr("Import from %1 failed (%2)").arg(result.path).arg(result.message); + } else if (result.isWarning()) { + warning << tr("Import from %1 failed (%2)").arg(result.path).arg(result.message); + } else if (result.isInfo()) { + success << tr("Import from %1 successful (%2)").arg(result.path).arg(result.message); + } else { + success << tr("Imported from %1").arg(result.path); + } + } + } - notifyAbout(success, warning, error); + notifyAbout(success, warning, error); } void ShareObserver::notifyAbout(const QStringList& success, const QStringList& warning, const QStringList& error) { - if (error.isEmpty() && warning.isEmpty() && success.isEmpty()) { - return; - } + if (error.isEmpty() && warning.isEmpty() && success.isEmpty()) { + return; + } - MessageWidget::MessageType type = MessageWidget::Positive; - if (!warning.isEmpty()) { - type = MessageWidget::Warning; - } - if (!error.isEmpty()) { - type = MessageWidget::Error; - } - emit sharingMessage((success + warning + error).join("\n"), type); + MessageWidget::MessageType type = MessageWidget::Positive; + if (!warning.isEmpty()) { + type = MessageWidget::Warning; + } + if (!error.isEmpty()) { + type = MessageWidget::Error; + } + emit sharingMessage((success + warning + error).join("\n"), type); } void ShareObserver::handleDatabaseChanged() { - if (!m_db) { - Q_ASSERT(m_db); - return; - } - const auto active = KeeShare::active(); - if (!active.out && !active.in) { - deinitialize(); - } else { - reinitialize(); - } + if (!m_db) { + Q_ASSERT(m_db); + return; + } + const auto active = KeeShare::active(); + if (!active.out && !active.in) { + deinitialize(); + } else { + reinitialize(); + } } void ShareObserver::handleFileUpdated(const QString& path) { - const Result result = this->importFromReferenceContainer(path); - if (!result.isValid()) { - return; - } - QStringList success; - QStringList warning; - QStringList error; - if (result.isError()) { - error << tr("Import from %1 failed (%2)").arg(result.path).arg(result.message); - } else if (result.isWarning()) { - warning << tr("Import from %1 failed (%2)").arg(result.path).arg(result.message); - } else if (result.isInfo()) { - success << tr("Import from %1 successful (%2)").arg(result.path).arg(result.message); - } else { - success << tr("Imported from %1").arg(result.path); - } - notifyAbout(success, warning, error); + const Result result = this->importFromReferenceContainer(path); + if (!result.isValid()) { + return; + } + QStringList success; + QStringList warning; + QStringList error; + if (result.isError()) { + error << tr("Import from %1 failed (%2)").arg(result.path).arg(result.message); + } else if (result.isWarning()) { + warning << tr("Import from %1 failed (%2)").arg(result.path).arg(result.message); + } else if (result.isInfo()) { + success << tr("Import from %1 successful (%2)").arg(result.path).arg(result.message); + } else { + success << tr("Imported from %1").arg(result.path); + } + notifyAbout(success, warning, error); } -ShareObserver::Result ShareObserver::importSecureContainerInto(const KeeShareSettings::Reference& reference, Group* targetGroup) +ShareObserver::Result ShareObserver::importSingedContainerInto(const KeeShareSettings::Reference& reference, Group* targetGroup) { #if !defined(WITH_XC_KEESHARE_SECURE) - Q_UNUSED(targetGroup); - return { reference.path, Result::Warning, tr("Secured share container are not supported - import prevented") }; + Q_UNUSED(targetGroup); + return { reference.path, Result::Warning, tr("Signed share container are not supported - import prevented") }; #else - QuaZip zip(reference.path); - if (!zip.open(QuaZip::mdUnzip)) { - qCritical("Unable to open file %s.", qPrintable(reference.path)); - return {reference.path, Result::Error, tr("File is not readable")}; - } - const auto expected = QSet() << KeeShare_Signature << KeeShare_Container; - const auto files = zip.getFileInfoList(); - QSet actual; - for (const auto& file : files) { - actual << file.name; - } - if (expected != actual) { - qCritical("Invalid sharing container %s.", qPrintable(reference.path)); - return {reference.path, Result::Error, tr("Invalid sharing container")}; - } + QuaZip zip(reference.path); + if (!zip.open(QuaZip::mdUnzip)) { + qCritical("Unable to open file %s.", qPrintable(reference.path)); + return {reference.path, Result::Error, tr("File is not readable")}; + } + const auto expected = QSet() << KeeShare_Signature << KeeShare_Container; + const auto files = zip.getFileInfoList(); + QSet actual; + for (const auto& file : files) { + actual << file.name; + } + if (expected != actual) { + qCritical("Invalid sharing container %s.", qPrintable(reference.path)); + return {reference.path, Result::Error, tr("Invalid sharing container")}; + } - zip.setCurrentFile(KeeShare_Signature); - QuaZipFile signatureFile(&zip); - signatureFile.open(QuaZipFile::ReadOnly); - QTextStream stream(&signatureFile); + zip.setCurrentFile(KeeShare_Signature); + QuaZipFile signatureFile(&zip); + signatureFile.open(QuaZipFile::ReadOnly); + QTextStream stream(&signatureFile); - const auto sign = KeeShareSettings::Sign::deserialize(stream.readAll()); - signatureFile.close(); + const auto sign = KeeShareSettings::Sign::deserialize(stream.readAll()); + signatureFile.close(); - zip.setCurrentFile(KeeShare_Container); - QuaZipFile databaseFile(&zip); - databaseFile.open(QuaZipFile::ReadOnly); - auto payload = databaseFile.readAll(); - databaseFile.close(); - QBuffer buffer(&payload); - buffer.open(QIODevice::ReadOnly); + zip.setCurrentFile(KeeShare_Container); + QuaZipFile databaseFile(&zip); + databaseFile.open(QuaZipFile::ReadOnly); + auto payload = databaseFile.readAll(); + databaseFile.close(); + QBuffer buffer(&payload); + buffer.open(QIODevice::ReadOnly); - KeePass2Reader reader; - auto key = QSharedPointer::create(); - key->addKey(QSharedPointer::create(reference.password)); - auto sourceDb = QSharedPointer::create(); - if (!reader.readDatabase(&buffer, key, sourceDb.data())) { - qCritical("Error while parsing the database: %s", qPrintable(reader.errorString())); - return {reference.path, Result::Error, reader.errorString()}; - } + KeePass2Reader reader; + auto key = QSharedPointer::create(); + key->addKey(QSharedPointer::create(reference.password)); + auto sourceDb = QSharedPointer::create(); + if (!reader.readDatabase(&buffer, key, sourceDb.data())) { + qCritical("Error while parsing the database: %s", qPrintable(reader.errorString())); + return {reference.path, Result::Error, reader.errorString()}; + } - auto foreign = KeeShare::foreign(); - auto own = KeeShare::own(); - auto trust = check(payload, reference, own.certificate, foreign.certificates, sign); - switch (trust.first) { - case Invalid: - qWarning("Prevent untrusted import"); - return {reference.path, Result::Error, tr("Untrusted import prevented")}; + auto foreign = KeeShare::foreign(); + auto own = KeeShare::own(); + auto trust = check(payload, reference, own.certificate, foreign.certificates, sign); + switch (trust.first) { + case Invalid: + qWarning("Prevent untrusted import"); + return {reference.path, Result::Error, tr("Untrusted import prevented")}; - case UntrustedForever: - case TrustedForever: { - bool found = false; - const auto trusted = trust.first == TrustedForever ? KeeShareSettings::Trust::Trusted : KeeShareSettings::Trust::Untrusted; - for (KeeShareSettings::ScopedCertificate& scopedCertificate : foreign.certificates) { - if (scopedCertificate.certificate.key == trust.second.key && scopedCertificate.path == reference.path) { - scopedCertificate.certificate.signer = trust.second.signer; - scopedCertificate.path = reference.path; - scopedCertificate.trust = trusted; - found = true; - } - } - if (!found) { - foreign.certificates << KeeShareSettings::ScopedCertificate{ reference.path, trust.second, trusted}; - // we need to update with the new signer - KeeShare::setForeign(foreign); - } - if (trust.first == TrustedForever) { - qDebug("Synchronize %s %s with %s", - qPrintable(reference.path), - qPrintable(targetGroup->name()), - qPrintable(sourceDb->rootGroup()->name())); - Merger merger(sourceDb->rootGroup(), targetGroup); - merger.setForcedMergeMode(Group::Synchronize); - const bool changed = merger.merge(); - if (changed) { - return {reference.path, Result::Success, tr("Successful secured import")}; - } - } - // Silent ignore of untrusted import or unchanging import - return {}; - } - case TrustedOnce: - case Own: { - qDebug("Synchronize %s %s with %s", - qPrintable(reference.path), - qPrintable(targetGroup->name()), - qPrintable(sourceDb->rootGroup()->name())); - Merger merger(sourceDb->rootGroup(), targetGroup); - merger.setForcedMergeMode(Group::Synchronize); - const bool changed = merger.merge(); - if (changed) { - return {reference.path, Result::Success, tr("Successful secured import")}; - } - return {}; - } - default: - Q_ASSERT(false); - return {reference.path, Result::Error, tr("Unexpected error")}; - } + case UntrustedForever: + case TrustedForever: { + bool found = false; + const auto trusted = trust.first == TrustedForever ? KeeShareSettings::Trust::Trusted : KeeShareSettings::Trust::Untrusted; + for (KeeShareSettings::ScopedCertificate& scopedCertificate : foreign.certificates) { + if (scopedCertificate.certificate.key == trust.second.key && scopedCertificate.path == reference.path) { + scopedCertificate.certificate.signer = trust.second.signer; + scopedCertificate.path = reference.path; + scopedCertificate.trust = trusted; + found = true; + } + } + if (!found) { + foreign.certificates << KeeShareSettings::ScopedCertificate{ reference.path, trust.second, trusted}; + // we need to update with the new signer + KeeShare::setForeign(foreign); + } + if (trust.first == TrustedForever) { + qDebug("Synchronize %s %s with %s", + qPrintable(reference.path), + qPrintable(targetGroup->name()), + qPrintable(sourceDb->rootGroup()->name())); + Merger merger(sourceDb->rootGroup(), targetGroup); + merger.setForcedMergeMode(Group::Synchronize); + const bool changed = merger.merge(); + if (changed) { + return {reference.path, Result::Success, tr("Successful signed import")}; + } + } + // Silent ignore of untrusted import or unchanging import + return {}; + } + case TrustedOnce: + case Own: { + qDebug("Synchronize %s %s with %s", + qPrintable(reference.path), + qPrintable(targetGroup->name()), + qPrintable(sourceDb->rootGroup()->name())); + Merger merger(sourceDb->rootGroup(), targetGroup); + merger.setForcedMergeMode(Group::Synchronize); + const bool changed = merger.merge(); + if (changed) { + return {reference.path, Result::Success, tr("Successful signed import")}; + } + return {}; + } + default: + Q_ASSERT(false); + return {reference.path, Result::Error, tr("Unexpected error")}; + } #endif } -ShareObserver::Result ShareObserver::importInsecureContainerInto(const KeeShareSettings::Reference& reference, Group* targetGroup) +ShareObserver::Result ShareObserver::importUnsignedContainerInto(const KeeShareSettings::Reference& reference, Group* targetGroup) { #if !defined(WITH_XC_KEESHARE_INSECURE) - Q_UNUSED(targetGroup); - return {reference.path, Result::Warning, tr("Insecured share container are not supported - import prevented")}; + Q_UNUSED(targetGroup); + return {reference.path, Result::Warning, tr("Unsigned share container are not supported - import prevented")}; #else - QFile file(reference.path); - if (!file.open(QIODevice::ReadOnly)){ - qCritical("Unable to open file %s.", qPrintable(reference.path)); - return {reference.path, Result::Error, tr("File is not readable")}; - } - auto payload = file.readAll(); - file.close(); - QBuffer buffer(&payload); - buffer.open(QIODevice::ReadOnly); + QFile file(reference.path); + if (!file.open(QIODevice::ReadOnly)){ + qCritical("Unable to open file %s.", qPrintable(reference.path)); + return {reference.path, Result::Error, tr("File is not readable")}; + } + auto payload = file.readAll(); + file.close(); + QBuffer buffer(&payload); + buffer.open(QIODevice::ReadOnly); - KeePass2Reader reader; - auto key = QSharedPointer::create(); - key->addKey(QSharedPointer::create(reference.password)); - auto sourceDb = QSharedPointer::create(); - if (!reader.readDatabase(&buffer, key, sourceDb.data())) { - qCritical("Error while parsing the database: %s", qPrintable(reader.errorString())); - return {reference.path, Result::Error, reader.errorString()}; - } + KeePass2Reader reader; + auto key = QSharedPointer::create(); + key->addKey(QSharedPointer::create(reference.password)); + auto sourceDb = QSharedPointer::create(); + if (!reader.readDatabase(&buffer, key, sourceDb.data())) { + qCritical("Error while parsing the database: %s", qPrintable(reader.errorString())); + return {reference.path, Result::Error, reader.errorString()}; + } - auto foreign = KeeShare::foreign(); - const auto own = KeeShare::own(); - const auto sign = KeeShareSettings::Sign(); // invalid sign - auto trust = check(payload, reference, own.certificate, foreign.certificates, sign); - switch(trust.first) { - case UntrustedForever: - case TrustedForever: { - bool found = false; - const auto trusted = trust.first == TrustedForever ? KeeShareSettings::Trust::Trusted : KeeShareSettings::Trust::Untrusted; - for (KeeShareSettings::ScopedCertificate& scopedCertificate : foreign.certificates) { - if (scopedCertificate.certificate.key == trust.second.key && scopedCertificate.path == reference.path) { - scopedCertificate.certificate.signer = trust.second.signer; - scopedCertificate.path = reference.path; - scopedCertificate.trust = trusted; - found = true; - } - } - if (!found) { - foreign.certificates << KeeShareSettings::ScopedCertificate{ reference.path, trust.second, trusted}; - // we need to update with the new signer - KeeShare::setForeign(foreign); - } - if (trust.first == TrustedForever) { - qDebug("Synchronize %s %s with %s", - qPrintable(reference.path), - qPrintable(targetGroup->name()), - qPrintable(sourceDb->rootGroup()->name())); - Merger merger(sourceDb->rootGroup(), targetGroup); - merger.setForcedMergeMode(Group::Synchronize); - const bool changed = merger.merge(); - if (changed) { - return {reference.path, Result::Success, tr("Successful secured import")}; - } - } - return {}; - } + auto foreign = KeeShare::foreign(); + const auto own = KeeShare::own(); + const auto sign = KeeShareSettings::Sign(); // invalid sign + auto trust = check(payload, reference, own.certificate, foreign.certificates, sign); + switch(trust.first) { + case UntrustedForever: + case TrustedForever: { + bool found = false; + const auto trusted = trust.first == TrustedForever ? KeeShareSettings::Trust::Trusted : KeeShareSettings::Trust::Untrusted; + for (KeeShareSettings::ScopedCertificate& scopedCertificate : foreign.certificates) { + if (scopedCertificate.certificate.key == trust.second.key && scopedCertificate.path == reference.path) { + scopedCertificate.certificate.signer = trust.second.signer; + scopedCertificate.path = reference.path; + scopedCertificate.trust = trusted; + found = true; + } + } + if (!found) { + foreign.certificates << KeeShareSettings::ScopedCertificate{ reference.path, trust.second, trusted}; + // we need to update with the new signer + KeeShare::setForeign(foreign); + } + if (trust.first == TrustedForever) { + qDebug("Synchronize %s %s with %s", + qPrintable(reference.path), + qPrintable(targetGroup->name()), + qPrintable(sourceDb->rootGroup()->name())); + Merger merger(sourceDb->rootGroup(), targetGroup); + merger.setForcedMergeMode(Group::Synchronize); + const bool changed = merger.merge(); + if (changed) { + return {reference.path, Result::Success, tr("Successful signed import")}; + } + } + return {}; + } - case TrustedOnce: { - qDebug("Synchronize %s %s with %s", - qPrintable(reference.path), - qPrintable(targetGroup->name()), - qPrintable(sourceDb->rootGroup()->name())); - Merger merger(sourceDb->rootGroup(), targetGroup); - merger.setForcedMergeMode(Group::Synchronize); - const bool changed = merger.merge(); - if (changed) { - return {reference.path, Result::Success, tr("Successful unsecured import")}; - } - return {}; - } - default: - qWarning("Prevent untrusted import"); - return {reference.path, Result::Warning, tr("Untrusted import prevented")}; - } + case TrustedOnce: { + qDebug("Synchronize %s %s with %s", + qPrintable(reference.path), + qPrintable(targetGroup->name()), + qPrintable(sourceDb->rootGroup()->name())); + Merger merger(sourceDb->rootGroup(), targetGroup); + merger.setForcedMergeMode(Group::Synchronize); + const bool changed = merger.merge(); + if (changed) { + return {reference.path, Result::Success, tr("Successful unsigned import")}; + } + return {}; + } + default: + qWarning("Prevent untrusted import"); + return {reference.path, Result::Warning, tr("Untrusted import prevented")}; + } #endif } ShareObserver::Result ShareObserver::importContainerInto(const KeeShareSettings::Reference& reference, Group* targetGroup) { - const QFileInfo info(reference.path); - if (!info.exists()) { - qCritical("File %s does not exist.", qPrintable(info.absoluteFilePath())); - return {reference.path, Result::Warning, tr("File does not exist")}; - } + const QFileInfo info(reference.path); + if (!info.exists()) { + qCritical("File %s does not exist.", qPrintable(info.absoluteFilePath())); + return {reference.path, Result::Warning, tr("File does not exist")}; + } - if (isOfExportType(info, KeeShare::secureContainerFileType())) { - return importSecureContainerInto(reference, targetGroup); - } - if (isOfExportType(info, KeeShare::insecureContainerFileType())) { - return importInsecureContainerInto(reference, targetGroup); - } - return {reference.path, Result::Error, tr("Unknown share container type")}; + if (isOfExportType(info, KeeShare::signedContainerFileType())) { + return importSingedContainerInto(reference, targetGroup); + } + if (isOfExportType(info, KeeShare::unsignedContainerFileType())) { + return importUnsignedContainerInto(reference, targetGroup); + } + return {reference.path, Result::Error, tr("Unknown share container type")}; } ShareObserver::Result ShareObserver::importFromReferenceContainer(const QString& path) { - if (!KeeShare::active().in) { - return {}; - } - auto shareGroup = m_shareToGroup.value(path); - if (!shareGroup) { - qWarning("Source for %s does not exist", qPrintable(path)); - Q_ASSERT(shareGroup); - return {}; - } - const auto reference = KeeShare::referenceOf(shareGroup); - if (reference.type == KeeShareSettings::Inactive) { - qDebug("Ignore change of inactive reference %s", qPrintable(reference.path)); - return {}; - } - if (reference.type == KeeShareSettings::ExportTo) { - qDebug("Ignore change of export reference %s", qPrintable(reference.path)); - return {}; - } - Q_ASSERT(shareGroup->database() == m_db); - Q_ASSERT(shareGroup == m_db->rootGroup()->findGroupByUuid(shareGroup->uuid())); - return importContainerInto(reference, shareGroup); + if (!KeeShare::active().in) { + return {}; + } + auto shareGroup = m_shareToGroup.value(path); + if (!shareGroup) { + qWarning("Source for %s does not exist", qPrintable(path)); + Q_ASSERT(shareGroup); + return {}; + } + const auto reference = KeeShare::referenceOf(shareGroup); + if (reference.type == KeeShareSettings::Inactive) { + qDebug("Ignore change of inactive reference %s", qPrintable(reference.path)); + return {}; + } + if (reference.type == KeeShareSettings::ExportTo) { + qDebug("Ignore change of export reference %s", qPrintable(reference.path)); + return {}; + } + Q_ASSERT(shareGroup->database() == m_db); + Q_ASSERT(shareGroup == m_db->rootGroup()->findGroupByUuid(shareGroup->uuid())); + return importContainerInto(reference, shareGroup); } void ShareObserver::resolveReferenceAttributes(Entry* targetEntry, const Database* sourceDb) { - for (const auto& attribute : EntryAttributes::DefaultAttributes) { - const auto standardValue = targetEntry->attributes()->value(attribute); - const auto type = targetEntry->placeholderType(standardValue); - if (type != Entry::PlaceholderType::Reference) { - // No reference to resolve - continue; - } - const auto* referencedTargetEntry = targetEntry->resolveReference(standardValue); - if (referencedTargetEntry) { - // References is within scope, no resolving needed - continue; - } - // We could do more sophisticated **** trying to point the reference to the next in-scope reference - // but those cases with high propability constructed examples and very rare in real usage - const auto* sourceReference = sourceDb->rootGroup()->findEntryByUuid(targetEntry->uuid()); - const auto resolvedValue = sourceReference->resolveMultiplePlaceholders(standardValue); - targetEntry->setUpdateTimeinfo(false); - targetEntry->attributes()->set(attribute, resolvedValue, targetEntry->attributes()->isProtected(attribute)); - targetEntry->setUpdateTimeinfo(true); - } + for (const auto& attribute : EntryAttributes::DefaultAttributes) { + const auto standardValue = targetEntry->attributes()->value(attribute); + const auto type = targetEntry->placeholderType(standardValue); + if (type != Entry::PlaceholderType::Reference) { + // No reference to resolve + continue; + } + const auto* referencedTargetEntry = targetEntry->resolveReference(standardValue); + if (referencedTargetEntry) { + // References is within scope, no resolving needed + continue; + } + // We could do more sophisticated **** trying to point the reference to the next in-scope reference + // but those cases with high propability constructed examples and very rare in real usage + const auto* sourceReference = sourceDb->rootGroup()->findEntryByUuid(targetEntry->uuid()); + const auto resolvedValue = sourceReference->resolveMultiplePlaceholders(standardValue); + targetEntry->setUpdateTimeinfo(false); + targetEntry->attributes()->set(attribute, resolvedValue, targetEntry->attributes()->isProtected(attribute)); + targetEntry->setUpdateTimeinfo(true); + } } Database* ShareObserver::exportIntoContainer(const KeeShareSettings::Reference& reference, const Group* sourceRoot) { - const auto* sourceDb = sourceRoot->database(); - auto* targetDb = new Database(); - targetDb->metadata()->setRecycleBinEnabled(false); - auto key = QSharedPointer::create(); - key->addKey(QSharedPointer::create(reference.password)); + const auto* sourceDb = sourceRoot->database(); + auto* targetDb = new Database(); + targetDb->metadata()->setRecycleBinEnabled(false); + auto key = QSharedPointer::create(); + key->addKey(QSharedPointer::create(reference.password)); - // Copy the source root as the root of the export database, memory manage the old root node - auto* targetRoot = sourceRoot->clone(Entry::CloneNoFlags, Group::CloneNoFlags); - const bool updateTimeinfo = targetRoot->canUpdateTimeinfo(); - targetRoot->setUpdateTimeinfo(false); - KeeShare::setReferenceTo(targetRoot, KeeShareSettings::Reference()); - targetRoot->setUpdateTimeinfo(updateTimeinfo); - const auto sourceEntries = sourceRoot->entriesRecursive(false); - for (const Entry* sourceEntry : sourceEntries) { - auto* targetEntry = sourceEntry->clone(Entry::CloneIncludeHistory); - const bool updateTimeinfo = targetEntry->canUpdateTimeinfo(); - targetEntry->setUpdateTimeinfo(false); - targetEntry->setGroup(targetRoot); - targetEntry->setUpdateTimeinfo(updateTimeinfo); - const auto iconUuid = targetEntry->iconUuid(); - if (!iconUuid.isNull()) { - targetDb->metadata()->addCustomIcon(iconUuid, sourceEntry->icon()); - } - } + // Copy the source root as the root of the export database, memory manage the old root node + auto* targetRoot = sourceRoot->clone(Entry::CloneNoFlags, Group::CloneNoFlags); + const bool updateTimeinfo = targetRoot->canUpdateTimeinfo(); + targetRoot->setUpdateTimeinfo(false); + KeeShare::setReferenceTo(targetRoot, KeeShareSettings::Reference()); + targetRoot->setUpdateTimeinfo(updateTimeinfo); + const auto sourceEntries = sourceRoot->entriesRecursive(false); + for (const Entry* sourceEntry : sourceEntries) { + auto* targetEntry = sourceEntry->clone(Entry::CloneIncludeHistory); + const bool updateTimeinfo = targetEntry->canUpdateTimeinfo(); + targetEntry->setUpdateTimeinfo(false); + targetEntry->setGroup(targetRoot); + targetEntry->setUpdateTimeinfo(updateTimeinfo); + const auto iconUuid = targetEntry->iconUuid(); + if (!iconUuid.isNull()) { + targetDb->metadata()->addCustomIcon(iconUuid, sourceEntry->icon()); + } + } - targetDb->setKey(key); - auto* obsoleteRoot = targetDb->rootGroup(); - targetDb->setRootGroup(targetRoot); - delete obsoleteRoot; + targetDb->setKey(key); + auto* obsoleteRoot = targetDb->rootGroup(); + targetDb->setRootGroup(targetRoot); + delete obsoleteRoot; - targetDb->metadata()->setName(sourceRoot->name()); + targetDb->metadata()->setName(sourceRoot->name()); - // Push all deletions of the source database to the target - // simple moving out of a share group will not trigger a deletion in the - // target - a more elaborate mechanism may need the use of another custom - // attribute to share unshared entries from the target db - for (const auto& object : sourceDb->deletedObjects()) { - targetDb->addDeletedObject(object); - } - for (auto* targetEntry : targetRoot->entriesRecursive(false)) { - if (targetEntry->hasReferences()) { - resolveReferenceAttributes(targetEntry, sourceDb); - } - } - return targetDb; + // Push all deletions of the source database to the target + // simple moving out of a share group will not trigger a deletion in the + // target - a more elaborate mechanism may need the use of another custom + // attribute to share unshared entries from the target db + for (const auto& object : sourceDb->deletedObjects()) { + targetDb->addDeletedObject(object); + } + for (auto* targetEntry : targetRoot->entriesRecursive(false)) { + if (targetEntry->hasReferences()) { + resolveReferenceAttributes(targetEntry, sourceDb); + } + } + return targetDb; } QSharedPointer ShareObserver::database() { - return m_db; + return m_db; } -ShareObserver::Result ShareObserver::exportIntoReferenceSecureContainer(const KeeShareSettings::Reference &reference, Database *targetDb) +ShareObserver::Result ShareObserver::exportIntoReferenceSignedContainer(const KeeShareSettings::Reference &reference, Database *targetDb) { #if !defined(WITH_XC_KEESHARE_SECURE) - Q_UNUSED(targetDb); - return {reference.path, Result::Warning, tr("Overwriting secured share container is not supported - export prevented")}; + Q_UNUSED(targetDb); + return {reference.path, Result::Warning, tr("Overwriting signed share container is not supported - export prevented")}; #else - QByteArray bytes; - { - QBuffer buffer(&bytes); - buffer.open(QIODevice::WriteOnly); - KeePass2Writer writer; - writer.writeDatabase(&buffer, targetDb); - if (writer.hasError()) { - qWarning("Serializing export dabase failed: %s.", writer.errorString().toLatin1().data()); - return {reference.path, Result::Error, writer.errorString()}; - } - } - const auto own = KeeShare::own(); - QuaZip zip(reference.path); - zip.setFileNameCodec("UTF-8"); - const bool zipOpened = zip.open(QuaZip::mdCreate); - if (!zipOpened) { - ::qWarning("Opening export file failed: %d", zip.getZipError()); - return {reference.path, Result::Error, tr("Could not write export container (%1)").arg(zip.getZipError())}; - } - { - QuaZipFile file(&zip); - const auto signatureOpened = file.open(QIODevice::WriteOnly, QuaZipNewInfo(KeeShare_Signature)); - if (!signatureOpened) { - ::qWarning("Embedding signature failed: %d", zip.getZipError()); - return {reference.path, Result::Error, tr("Could not embed signature (%1)").arg(file.getZipError())}; - } - QTextStream stream(&file); - KeeShareSettings::Sign sign; - auto sshKey = own.key.sshKey(); - sshKey.openKey(QString()); - const Signature signer; - sign.signature = signer.create(bytes, sshKey); - sign.certificate = own.certificate; - stream << KeeShareSettings::Sign::serialize(sign); - stream.flush(); - if (file.getZipError() != ZIP_OK) { - ::qWarning("Embedding signature failed: %d", zip.getZipError()); - return {reference.path, Result::Error, tr("Could not embed signature (%1)").arg(file.getZipError())}; - } - file.close(); - } - { - QuaZipFile file(&zip); - const auto dbOpened = file.open(QIODevice::WriteOnly, QuaZipNewInfo(KeeShare_Container)); - if (!dbOpened) { - ::qWarning("Embedding database failed: %d", zip.getZipError()); - return {reference.path, Result::Error, tr("Could not embed database (%1)").arg(file.getZipError())}; - } - if (file.getZipError() != ZIP_OK) { - ::qWarning("Embedding database failed: %d", zip.getZipError()); - return {reference.path, Result::Error, tr("Could not embed database (%1)").arg(file.getZipError())}; - } - file.write(bytes); - file.close(); - } - zip.close(); - return {reference.path}; + QByteArray bytes; + { + QBuffer buffer(&bytes); + buffer.open(QIODevice::WriteOnly); + KeePass2Writer writer; + writer.writeDatabase(&buffer, targetDb); + if (writer.hasError()) { + qWarning("Serializing export dabase failed: %s.", writer.errorString().toLatin1().data()); + return {reference.path, Result::Error, writer.errorString()}; + } + } + const auto own = KeeShare::own(); + QuaZip zip(reference.path); + zip.setFileNameCodec("UTF-8"); + const bool zipOpened = zip.open(QuaZip::mdCreate); + if (!zipOpened) { + ::qWarning("Opening export file failed: %d", zip.getZipError()); + return {reference.path, Result::Error, tr("Could not write export container (%1)").arg(zip.getZipError())}; + } + { + QuaZipFile file(&zip); + const auto signatureOpened = file.open(QIODevice::WriteOnly, QuaZipNewInfo(KeeShare_Signature)); + if (!signatureOpened) { + ::qWarning("Embedding signature failed: %d", zip.getZipError()); + return {reference.path, Result::Error, tr("Could not embed signature (%1)").arg(file.getZipError())}; + } + QTextStream stream(&file); + KeeShareSettings::Sign sign; + auto sshKey = own.key.sshKey(); + sshKey.openKey(QString()); + const Signature signer; + sign.signature = signer.create(bytes, sshKey); + sign.certificate = own.certificate; + stream << KeeShareSettings::Sign::serialize(sign); + stream.flush(); + if (file.getZipError() != ZIP_OK) { + ::qWarning("Embedding signature failed: %d", zip.getZipError()); + return {reference.path, Result::Error, tr("Could not embed signature (%1)").arg(file.getZipError())}; + } + file.close(); + } + { + QuaZipFile file(&zip); + const auto dbOpened = file.open(QIODevice::WriteOnly, QuaZipNewInfo(KeeShare_Container)); + if (!dbOpened) { + ::qWarning("Embedding database failed: %d", zip.getZipError()); + return {reference.path, Result::Error, tr("Could not embed database (%1)").arg(file.getZipError())}; + } + if (file.getZipError() != ZIP_OK) { + ::qWarning("Embedding database failed: %d", zip.getZipError()); + return {reference.path, Result::Error, tr("Could not embed database (%1)").arg(file.getZipError())}; + } + file.write(bytes); + file.close(); + } + zip.close(); + return {reference.path}; #endif } -ShareObserver::Result ShareObserver::exportIntoReferenceInsecureContainer(const KeeShareSettings::Reference &reference, Database *targetDb) +ShareObserver::Result ShareObserver::exportIntoReferenceUnsignedContainer(const KeeShareSettings::Reference &reference, Database *targetDb) { #if !defined(WITH_XC_KEESHARE_INSECURE) - Q_UNUSED(targetDb); - return {reference.path, Result::Warning, tr("Overwriting secured share container is not supported - export prevented")}; + Q_UNUSED(targetDb); + return {reference.path, Result::Warning, tr("Overwriting unsigned share container is not supported - export prevented")}; #else - QFile file(reference.path); - const bool fileOpened = file.open(QIODevice::WriteOnly); - if (!fileOpened) { - ::qWarning("Opening export file failed"); - return {reference.path, Result::Error, tr("Could not write export container")}; - } - KeePass2Writer writer; - writer.writeDatabase(&file, targetDb); - if (writer.hasError()) { - qWarning("Exporting dabase failed: %s.", writer.errorString().toLatin1().data()); - return {reference.path, Result::Error, writer.errorString()}; - } - file.close(); + QFile file(reference.path); + const bool fileOpened = file.open(QIODevice::WriteOnly); + if (!fileOpened) { + ::qWarning("Opening export file failed"); + return {reference.path, Result::Error, tr("Could not write export container")}; + } + KeePass2Writer writer; + writer.writeDatabase(&file, targetDb); + if (writer.hasError()) { + qWarning("Exporting dabase failed: %s.", writer.errorString().toLatin1().data()); + return {reference.path, Result::Error, writer.errorString()}; + } + file.close(); #endif - return {reference.path}; + return {reference.path}; } QList ShareObserver::exportIntoReferenceContainers() { - QList results; - const auto groups = m_db->rootGroup()->groupsRecursive(true); - for (const auto* group : groups) { - const auto reference = KeeShare::referenceOf(group); - if (!reference.isExporting()) { - continue; - } + QList results; + const auto groups = m_db->rootGroup()->groupsRecursive(true); + for (const auto* group : groups) { + const auto reference = KeeShare::referenceOf(group); + if (!reference.isExporting()) { + continue; + } - m_fileWatcher->ignoreFileChanges(reference.path); - QScopedPointer targetDb(exportIntoContainer(reference, group)); - QFileInfo info(reference.path); - if (isOfExportType(info, KeeShare::secureContainerFileType())) { - results << exportIntoReferenceSecureContainer(reference, targetDb.data()); - m_fileWatcher->observeFileChanges(true); - continue; - } - if (isOfExportType(info, KeeShare::insecureContainerFileType())) { - results << exportIntoReferenceInsecureContainer(reference, targetDb.data()); - m_fileWatcher->observeFileChanges(true); - continue; - } - Q_ASSERT(false); - results << Result{reference.path, Result::Error, tr("Unexpected export error occurred")}; - } - return results; + m_fileWatcher->ignoreFileChanges(reference.path); + QScopedPointer targetDb(exportIntoContainer(reference, group)); + QFileInfo info(reference.path); + if (isOfExportType(info, KeeShare::signedContainerFileType())) { + results << exportIntoReferenceSignedContainer(reference, targetDb.data()); + m_fileWatcher->observeFileChanges(true); + continue; + } + if (isOfExportType(info, KeeShare::unsignedContainerFileType())) { + results << exportIntoReferenceUnsignedContainer(reference, targetDb.data()); + m_fileWatcher->observeFileChanges(true); + continue; + } + Q_ASSERT(false); + results << Result{reference.path, Result::Error, tr("Unexpected export error occurred")}; + } + return results; } void ShareObserver::handleDatabaseSaved() { - if (!KeeShare::active().out) { - return; - } - QStringList error; - QStringList warning; - QStringList success; - const auto results = exportIntoReferenceContainers(); - for (const Result& result : results) { - if (!result.isValid()) { - Q_ASSERT(result.isValid()); - continue; - } - if (result.isError()) { - error << tr("Export to %1 failed (%2)").arg(result.path).arg(result.message); - } else if (result.isWarning()) { - warning << tr("Export to %1 failed (%2)").arg(result.path).arg(result.message); - } else if (result.isInfo()) { - success << tr("Export to %1 successful (%2)").arg(result.path).arg(result.message); - } else { - success << tr("Export to %1").arg(result.path); - } - } - notifyAbout(success, warning, error); + if (!KeeShare::active().out) { + return; + } + QStringList error; + QStringList warning; + QStringList success; + const auto results = exportIntoReferenceContainers(); + for (const Result& result : results) { + if (!result.isValid()) { + Q_ASSERT(result.isValid()); + continue; + } + if (result.isError()) { + error << tr("Export to %1 failed (%2)").arg(result.path).arg(result.message); + } else if (result.isWarning()) { + warning << tr("Export to %1 failed (%2)").arg(result.path).arg(result.message); + } else if (result.isInfo()) { + success << tr("Export to %1 successful (%2)").arg(result.path).arg(result.message); + } else { + success << tr("Export to %1").arg(result.path); + } + } + notifyAbout(success, warning, error); } ShareObserver::Result::Result(const QString& path, ShareObserver::Result::Type type, const QString& message) - : path(path) - , type(type) - , message(message) + : path(path) + , type(type) + , message(message) { } bool ShareObserver::Result::isValid() const { - return !path.isEmpty() || !message.isEmpty() || !message.isEmpty() || !message.isEmpty(); + return !path.isEmpty() || !message.isEmpty() || !message.isEmpty() || !message.isEmpty(); } bool ShareObserver::Result::isError() const { - return !message.isEmpty() && type == Error; + return !message.isEmpty() && type == Error; } bool ShareObserver::Result::isInfo() const { - return !message.isEmpty() && type == Info; + return !message.isEmpty() && type == Info; } bool ShareObserver::Result::isWarning() const { - return !message.isEmpty() && type == Warning; + return !message.isEmpty() && type == Warning; } diff --git a/src/keeshare/ShareObserver.h b/src/keeshare/ShareObserver.h index b21934389..26f010813 100644 --- a/src/keeshare/ShareObserver.h +++ b/src/keeshare/ShareObserver.h @@ -77,10 +77,10 @@ private: static void resolveReferenceAttributes(Entry* targetEntry, const Database* sourceDb); static Database* exportIntoContainer(const KeeShareSettings::Reference& reference, const Group* sourceRoot); - static Result exportIntoReferenceInsecureContainer(const KeeShareSettings::Reference &reference, Database *targetDb); - static Result exportIntoReferenceSecureContainer(const KeeShareSettings::Reference &reference, Database *targetDb); - static Result importSecureContainerInto(const KeeShareSettings::Reference& reference, Group* targetGroup); - static Result importInsecureContainerInto(const KeeShareSettings::Reference& reference, Group* targetGroup); + static Result exportIntoReferenceUnsignedContainer(const KeeShareSettings::Reference &reference, Database *targetDb); + static Result exportIntoReferenceSignedContainer(const KeeShareSettings::Reference &reference, Database *targetDb); + static Result importSingedContainerInto(const KeeShareSettings::Reference& reference, Group* targetGroup); + static Result importUnsignedContainerInto(const KeeShareSettings::Reference& reference, Group* targetGroup); static Result importContainerInto(const KeeShareSettings::Reference& reference, Group* targetGroup); static Result importDatabaseInto(); diff --git a/src/keeshare/group/EditGroupWidgetKeeShare.cpp b/src/keeshare/group/EditGroupWidgetKeeShare.cpp index 63f4182af..eecdaee21 100644 --- a/src/keeshare/group/EditGroupWidgetKeeShare.cpp +++ b/src/keeshare/group/EditGroupWidgetKeeShare.cpp @@ -31,54 +31,54 @@ #include EditGroupWidgetKeeShare::EditGroupWidgetKeeShare(QWidget* parent) - : QWidget(parent) - , m_ui(new Ui::EditGroupWidgetKeeShare()) + : QWidget(parent) + , m_ui(new Ui::EditGroupWidgetKeeShare()) { - m_ui->setupUi(this); + m_ui->setupUi(this); - m_ui->togglePasswordButton->setIcon(filePath()->onOffIcon("actions", "password-show")); - m_ui->togglePasswordGeneratorButton->setIcon(filePath()->icon("actions", "password-generator", false)); + m_ui->togglePasswordButton->setIcon(filePath()->onOffIcon("actions", "password-show")); + m_ui->togglePasswordGeneratorButton->setIcon(filePath()->icon("actions", "password-generator", false)); - m_ui->passwordGenerator->layout()->setContentsMargins(0, 0, 0, 0); - m_ui->passwordGenerator->hide(); - m_ui->passwordGenerator->reset(); + m_ui->passwordGenerator->layout()->setContentsMargins(0, 0, 0, 0); + m_ui->passwordGenerator->hide(); + m_ui->passwordGenerator->reset(); - m_ui->messageWidget->hide(); - m_ui->messageWidget->setCloseButtonVisible(false); - m_ui->messageWidget->setAutoHideTimeout(-1); + m_ui->messageWidget->hide(); + m_ui->messageWidget->setCloseButtonVisible(false); + m_ui->messageWidget->setAutoHideTimeout(-1); - connect(m_ui->togglePasswordButton, SIGNAL(toggled(bool)), m_ui->passwordEdit, SLOT(setShowPassword(bool))); - connect(m_ui->togglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool))); - connect(m_ui->passwordEdit, SIGNAL(textChanged(QString)), SLOT(selectPassword())); - connect(m_ui->passwordGenerator, SIGNAL(appliedPassword(QString)), SLOT(setGeneratedPassword(QString))); - connect(m_ui->pathEdit, SIGNAL(editingFinished()), SLOT(selectPath())); - connect(m_ui->pathSelectionButton, SIGNAL(pressed()), SLOT(launchPathSelectionDialog())); - connect(m_ui->typeComboBox, SIGNAL(currentIndexChanged(int)), SLOT(selectType())); + connect(m_ui->togglePasswordButton, SIGNAL(toggled(bool)), m_ui->passwordEdit, SLOT(setShowPassword(bool))); + connect(m_ui->togglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool))); + connect(m_ui->passwordEdit, SIGNAL(textChanged(QString)), SLOT(selectPassword())); + connect(m_ui->passwordGenerator, SIGNAL(appliedPassword(QString)), SLOT(setGeneratedPassword(QString))); + connect(m_ui->pathEdit, SIGNAL(editingFinished()), SLOT(selectPath())); + connect(m_ui->pathSelectionButton, SIGNAL(pressed()), SLOT(launchPathSelectionDialog())); + connect(m_ui->typeComboBox, SIGNAL(currentIndexChanged(int)), SLOT(selectType())); - connect(KeeShare::instance(), SIGNAL(activeChanged()), SLOT(showSharingState())); + connect(KeeShare::instance(), SIGNAL(activeChanged()), SLOT(showSharingState())); - const auto types = QList() << KeeShareSettings::Inactive - << KeeShareSettings::ImportFrom - << KeeShareSettings::ExportTo - << KeeShareSettings::SynchronizeWith; - for (const auto& type : types) { - QString name; - switch (type) { - case KeeShareSettings::Inactive: - name = tr("Inactive"); - break; - case KeeShareSettings::ImportFrom: - name = tr("Import from path"); - break; - case KeeShareSettings::ExportTo: - name = tr("Export to path"); - break; - case KeeShareSettings::SynchronizeWith: - name = tr("Synchronize with path"); - break; - } - m_ui->typeComboBox->insertItem(type, name, static_cast(type)); - } + const auto types = QList() << KeeShareSettings::Inactive + << KeeShareSettings::ImportFrom + << KeeShareSettings::ExportTo + << KeeShareSettings::SynchronizeWith; + for (const auto& type : types) { + QString name; + switch (type) { + case KeeShareSettings::Inactive: + name = tr("Inactive"); + break; + case KeeShareSettings::ImportFrom: + name = tr("Import from path"); + break; + case KeeShareSettings::ExportTo: + name = tr("Export to path"); + break; + case KeeShareSettings::SynchronizeWith: + name = tr("Synchronize with path"); + break; + } + m_ui->typeComboBox->insertItem(type, name, static_cast(type)); + } } EditGroupWidgetKeeShare::~EditGroupWidgetKeeShare() @@ -87,198 +87,198 @@ EditGroupWidgetKeeShare::~EditGroupWidgetKeeShare() void EditGroupWidgetKeeShare::setGroup(Group* temporaryGroup) { - if (m_temporaryGroup) { - m_temporaryGroup->disconnect(this); - } + if (m_temporaryGroup) { + m_temporaryGroup->disconnect(this); + } - m_temporaryGroup = temporaryGroup; + m_temporaryGroup = temporaryGroup; - if (m_temporaryGroup) { - connect(m_temporaryGroup, SIGNAL(groupModified()), SLOT(update())); - } + if (m_temporaryGroup) { + connect(m_temporaryGroup, SIGNAL(groupModified()), SLOT(update())); + } - update(); + update(); } void EditGroupWidgetKeeShare::showSharingState() { - if (!m_temporaryGroup) { - return; - } + if (!m_temporaryGroup) { + return; + } - auto supportedExtensions = QStringList(); + auto supportedExtensions = QStringList(); #if defined(WITH_XC_KEESHARE_INSECURE) - supportedExtensions << KeeShare::insecureContainerFileType(); + supportedExtensions << KeeShare::unsignedContainerFileType(); #endif #if defined(WITH_XC_KEESHARE_SECURE) - supportedExtensions << KeeShare::secureContainerFileType(); + supportedExtensions << KeeShare::signedContainerFileType(); #endif - const auto reference = KeeShare::referenceOf(m_temporaryGroup); - if (!reference.path.isEmpty()) { - bool supported = false; - for(const auto &extension : supportedExtensions){ - if (reference.path.endsWith(extension, Qt::CaseInsensitive)){ - supported = true; - break; - } - } - if (!supported) { - m_ui->messageWidget->showMessage( - tr("Your KeePassXC version does not support sharing your container type. Please use %1.") - .arg(supportedExtensions.join(", ")), - MessageWidget::Warning); - return; - } - } - const auto active = KeeShare::active(); - if (!active.in && !active.out) { - m_ui->messageWidget->showMessage(tr("Database sharing is disabled"), MessageWidget::Information); - return; - } - if (active.in && !active.out) { - m_ui->messageWidget->showMessage(tr("Database export is disabled"), MessageWidget::Information); - return; - } - if (!active.in && active.out) { - m_ui->messageWidget->showMessage(tr("Database import is disabled"), MessageWidget::Information); - return; - } + const auto reference = KeeShare::referenceOf(m_temporaryGroup); + if (!reference.path.isEmpty()) { + bool supported = false; + for(const auto &extension : supportedExtensions){ + if (reference.path.endsWith(extension, Qt::CaseInsensitive)){ + supported = true; + break; + } + } + if (!supported) { + m_ui->messageWidget->showMessage( + tr("Your KeePassXC version does not support sharing your container type. Please use %1.") + .arg(supportedExtensions.join(", ")), + MessageWidget::Warning); + return; + } + } + const auto active = KeeShare::active(); + if (!active.in && !active.out) { + m_ui->messageWidget->showMessage(tr("Database sharing is disabled"), MessageWidget::Information); + return; + } + if (active.in && !active.out) { + m_ui->messageWidget->showMessage(tr("Database export is disabled"), MessageWidget::Information); + return; + } + if (!active.in && active.out) { + m_ui->messageWidget->showMessage(tr("Database import is disabled"), MessageWidget::Information); + return; + } } void EditGroupWidgetKeeShare::update() { - if (!m_temporaryGroup) { - m_ui->passwordEdit->clear(); - m_ui->pathEdit->clear(); - } else { - const auto reference = KeeShare::referenceOf(m_temporaryGroup); + if (!m_temporaryGroup) { + m_ui->passwordEdit->clear(); + m_ui->pathEdit->clear(); + } else { + const auto reference = KeeShare::referenceOf(m_temporaryGroup); - m_ui->typeComboBox->setCurrentIndex(reference.type); - m_ui->passwordEdit->setText(reference.password); - m_ui->pathEdit->setText(reference.path); + m_ui->typeComboBox->setCurrentIndex(reference.type); + m_ui->passwordEdit->setText(reference.password); + m_ui->pathEdit->setText(reference.path); - showSharingState(); - } + showSharingState(); + } - m_ui->passwordGenerator->hide(); - m_ui->togglePasswordGeneratorButton->setChecked(false); - m_ui->togglePasswordButton->setChecked(false); + m_ui->passwordGenerator->hide(); + m_ui->togglePasswordGeneratorButton->setChecked(false); + m_ui->togglePasswordButton->setChecked(false); } void EditGroupWidgetKeeShare::togglePasswordGeneratorButton(bool checked) { - m_ui->passwordGenerator->regeneratePassword(); - m_ui->passwordGenerator->setVisible(checked); + m_ui->passwordGenerator->regeneratePassword(); + m_ui->passwordGenerator->setVisible(checked); } void EditGroupWidgetKeeShare::setGeneratedPassword(const QString& password) { - if (!m_temporaryGroup) { - return; - } - auto reference = KeeShare::referenceOf(m_temporaryGroup); - reference.password = password; - KeeShare::setReferenceTo(m_temporaryGroup, reference); - m_ui->togglePasswordGeneratorButton->setChecked(false); + if (!m_temporaryGroup) { + return; + } + auto reference = KeeShare::referenceOf(m_temporaryGroup); + reference.password = password; + KeeShare::setReferenceTo(m_temporaryGroup, reference); + m_ui->togglePasswordGeneratorButton->setChecked(false); } void EditGroupWidgetKeeShare::selectPath() { - if (!m_temporaryGroup) { - return; - } - auto reference = KeeShare::referenceOf(m_temporaryGroup); - reference.path = m_ui->pathEdit->text(); - KeeShare::setReferenceTo(m_temporaryGroup, reference); + if (!m_temporaryGroup) { + return; + } + auto reference = KeeShare::referenceOf(m_temporaryGroup); + reference.path = m_ui->pathEdit->text(); + KeeShare::setReferenceTo(m_temporaryGroup, reference); } void EditGroupWidgetKeeShare::launchPathSelectionDialog() { - if (!m_temporaryGroup) { - return; - } - QString defaultDirPath = config()->get("KeeShare/LastShareDir").toString(); - const bool dirExists = !defaultDirPath.isEmpty() && QDir(defaultDirPath).exists(); - if (!dirExists) { - defaultDirPath = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).first(); - } - auto reference = KeeShare::referenceOf(m_temporaryGroup); - QString defaultFiletype = ""; - auto supportedExtensions = QStringList(); - auto unsupportedExtensions = QStringList(); - auto knownFilters = QStringList() << QString("%1 (*)").arg("All files"); + if (!m_temporaryGroup) { + return; + } + QString defaultDirPath = config()->get("KeeShare/LastShareDir").toString(); + const bool dirExists = !defaultDirPath.isEmpty() && QDir(defaultDirPath).exists(); + if (!dirExists) { + defaultDirPath = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).first(); + } + auto reference = KeeShare::referenceOf(m_temporaryGroup); + QString defaultFiletype = ""; + auto supportedExtensions = QStringList(); + auto unsupportedExtensions = QStringList(); + auto knownFilters = QStringList() << QString("%1 (*)").arg("All files"); #if defined(WITH_XC_KEESHARE_INSECURE) - defaultFiletype = KeeShare::insecureContainerFileType(); - supportedExtensions << KeeShare::insecureContainerFileType(); - knownFilters.prepend(QString("%1 (*.%2)").arg(tr("KeeShare insecure container"), KeeShare::insecureContainerFileType())); + defaultFiletype = KeeShare::unsignedContainerFileType(); + supportedExtensions << KeeShare::unsignedContainerFileType(); + knownFilters.prepend(QString("%1 (*.%2)").arg(tr("KeeShare unsigned container"), KeeShare::unsignedContainerFileType())); #else - unsupportedExtensions << KeeShare::insecureContainerFileType(); + unsupportedExtensions << KeeShare::unsignedContainerFileType(); #endif #if defined(WITH_XC_KEESHARE_SECURE) - defaultFiletype = KeeShare::secureContainerFileType(); - supportedExtensions << KeeShare::secureContainerFileType(); - knownFilters.prepend(QString("%1 (*.%2)").arg(tr("KeeShare secure container"), KeeShare::secureContainerFileType())); + defaultFiletype = KeeShare::signedContainerFileType(); + supportedExtensions << KeeShare::signedContainerFileType(); + knownFilters.prepend(QString("%1 (*.%2)").arg(tr("KeeShare signed container"), KeeShare::signedContainerFileType())); #else - unsupportedExtensions << KeeShare::secureContainerFileType(); + unsupportedExtensions << KeeShare::signedContainerFileType(); #endif - const auto filters = knownFilters.join(";;"); - auto filename = reference.path; - if (filename.isEmpty()) { - filename = m_temporaryGroup->name(); - } - switch (reference.type) { - case KeeShareSettings::ImportFrom: - filename = fileDialog()->getFileName( - this, tr("Select import source"), defaultDirPath, filters, nullptr, QFileDialog::DontConfirmOverwrite, - defaultFiletype, filename); - break; - case KeeShareSettings::ExportTo: - filename = fileDialog()->getFileName( - this, tr("Select export target"), defaultDirPath, filters, nullptr, QFileDialog::Option(0), defaultFiletype, filename); - break; - case KeeShareSettings::SynchronizeWith: - case KeeShareSettings::Inactive: - filename = fileDialog()->getFileName( - this, tr("Select import/export file"), defaultDirPath, filters, nullptr, QFileDialog::Option(0), defaultFiletype, filename); - break; - } + const auto filters = knownFilters.join(";;"); + auto filename = reference.path; + if (filename.isEmpty()) { + filename = m_temporaryGroup->name(); + } + switch (reference.type) { + case KeeShareSettings::ImportFrom: + filename = fileDialog()->getFileName( + this, tr("Select import source"), defaultDirPath, filters, nullptr, QFileDialog::DontConfirmOverwrite, + defaultFiletype, filename); + break; + case KeeShareSettings::ExportTo: + filename = fileDialog()->getFileName( + this, tr("Select export target"), defaultDirPath, filters, nullptr, QFileDialog::Option(0), defaultFiletype, filename); + break; + case KeeShareSettings::SynchronizeWith: + case KeeShareSettings::Inactive: + filename = fileDialog()->getFileName( + this, tr("Select import/export file"), defaultDirPath, filters, nullptr, QFileDialog::Option(0), defaultFiletype, filename); + break; + } - if (filename.isEmpty()) { - return; - } - bool validFilename = false; - for(const auto& extension : supportedExtensions + unsupportedExtensions){ - if (filename.endsWith(extension, Qt::CaseInsensitive)) { - validFilename = true; - break; - } - } - if (!validFilename){ - filename += (!filename.endsWith(".") ? "." : "") + defaultFiletype; - } + if (filename.isEmpty()) { + return; + } + bool validFilename = false; + for(const auto& extension : supportedExtensions + unsupportedExtensions){ + if (filename.endsWith(extension, Qt::CaseInsensitive)) { + validFilename = true; + break; + } + } + if (!validFilename){ + filename += (!filename.endsWith(".") ? "." : "") + defaultFiletype; + } - m_ui->pathEdit->setText(filename); - selectPath(); - config()->set("KeeShare/LastShareDir", QFileInfo(filename).absolutePath()); + m_ui->pathEdit->setText(filename); + selectPath(); + config()->set("KeeShare/LastShareDir", QFileInfo(filename).absolutePath()); } void EditGroupWidgetKeeShare::selectPassword() { - if (!m_temporaryGroup) { - return; - } - auto reference = KeeShare::referenceOf(m_temporaryGroup); - reference.password = m_ui->passwordEdit->text(); - KeeShare::setReferenceTo(m_temporaryGroup, reference); + if (!m_temporaryGroup) { + return; + } + auto reference = KeeShare::referenceOf(m_temporaryGroup); + reference.password = m_ui->passwordEdit->text(); + KeeShare::setReferenceTo(m_temporaryGroup, reference); } void EditGroupWidgetKeeShare::selectType() { - if (!m_temporaryGroup) { - return; - } - auto reference = KeeShare::referenceOf(m_temporaryGroup); - reference.type = static_cast(m_ui->typeComboBox->currentData().toInt()); - KeeShare::setReferenceTo(m_temporaryGroup, reference); + if (!m_temporaryGroup) { + return; + } + auto reference = KeeShare::referenceOf(m_temporaryGroup); + reference.type = static_cast(m_ui->typeComboBox->currentData().toInt()); + KeeShare::setReferenceTo(m_temporaryGroup, reference); }