Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add option to disable database lock when switching user on macOS (#9707)

Browse Source
This commit is contained in:
Sami Vänttinen 2024-08-12 01:32:10 +03:00 committed by GitHub
parent 42ce2a49fa
commit b3bec8b2b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/translations/keepassxc_en.ts
View File

@ -596,6 +596,10 @@
<source>Hide TOTP in the entry preview panel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lock databases when switching user</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AutoType</name>

1
src/core/Config.cpp
View File

@ -135,6 +135,7 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
{Config::Security_LockDatabaseIdleSeconds, {QS("Security/LockDatabaseIdleSeconds"), Roaming, 240}},
{Config::Security_LockDatabaseMinimize, {QS("Security/LockDatabaseMinimize"), Roaming, false}},
{Config::Security_LockDatabaseScreenLock, {QS("Security/LockDatabaseScreenLock"), Roaming, true}},
{Config::Security_LockDatabaseOnUserSwitch, {QS("Security/LockDatabaseOnUserSwitch"), Roaming, true}},
{Config::Security_RelockAutoType, {QS("Security/RelockAutoType"), Roaming, false}},
{Config::Security_PasswordsHidden, {QS("Security/PasswordsHidden"), Roaming, true}},
{Config::Security_PasswordEmptyPlaceholder, {QS("Security/PasswordEmptyPlaceholder"), Roaming, false}},

1
src/core/Config.h
View File

@ -116,6 +116,7 @@ public:
Security_LockDatabaseIdleSeconds,
Security_LockDatabaseMinimize,
Security_LockDatabaseScreenLock,
Security_LockDatabaseOnUserSwitch,
Security_RelockAutoType,
Security_PasswordsHidden,
Security_PasswordEmptyPlaceholder,

10
src/gui/ApplicationSettingsWidget.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -317,6 +317,13 @@ void ApplicationSettingsWidget::loadSettings()
&& config()->get(Config::Security_LockDatabaseMinimize).toBool());
m_secUi->lockDatabaseOnScreenLockCheckBox->setChecked(
config()->get(Config::Security_LockDatabaseScreenLock).toBool());
#if defined(Q_OS_MACOS)
m_secUi->lockDatabasesOnUserSwitchCheckBox->setVisible(true);
#else
m_secUi->lockDatabasesOnUserSwitchCheckBox->setVisible(false);
#endif
m_secUi->lockDatabasesOnUserSwitchCheckBox->setChecked(
config()->get(Config::Security_LockDatabaseOnUserSwitch).toBool());
m_secUi->fallbackToSearch->setChecked(config()->get(Config::Security_IconDownloadFallback).toBool());
m_secUi->passwordsHiddenCheckBox->setChecked(config()->get(Config::Security_PasswordsHidden).toBool());
@ -430,6 +437,7 @@ void ApplicationSettingsWidget::saveSettings()
config()->set(Config::Security_LockDatabaseIdleSeconds, m_secUi->lockDatabaseIdleSpinBox->value());
config()->set(Config::Security_LockDatabaseMinimize, m_secUi->lockDatabaseMinimizeCheckBox->isChecked());
config()->set(Config::Security_LockDatabaseScreenLock, m_secUi->lockDatabaseOnScreenLockCheckBox->isChecked());
config()->set(Config::Security_LockDatabaseOnUserSwitch, m_secUi->lockDatabasesOnUserSwitchCheckBox->isChecked());
config()->set(Config::Security_IconDownloadFallback, m_secUi->fallbackToSearch->isChecked());
config()->set(Config::Security_PasswordsHidden, m_secUi->passwordsHiddenCheckBox->isChecked());

8
src/gui/ApplicationSettingsWidgetSecurity.ui
View File

@ -186,6 +186,13 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="lockDatabasesOnUserSwitchCheckBox">
<property name="text">
<string>Lock databases when switching user</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="passwordsHiddenCheckBox">
<property name="text">
@ -277,6 +284,7 @@
<tabstop>clearClipboardSpinBox</tabstop>
<tabstop>lockDatabaseIdleCheckBox</tabstop>
<tabstop>lockDatabaseIdleSpinBox</tabstop>
<tabstop>lockDatabasesOnUserSwitchCheckBox</tabstop>
<tabstop>clearSearchCheckBox</tabstop>
<tabstop>clearSearchSpinBox</tabstop>
<tabstop>quickUnlockCheckBox</tabstop>

9
src/gui/DatabaseTabWidget.cpp
View File

@ -63,7 +63,7 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent)
// clang-format on
#ifdef Q_OS_MACOS
connect(macUtils(), SIGNAL(lockDatabases()), SLOT(lockDatabases()));
connect(macUtils(), SIGNAL(userSwitched()), SLOT(lockDatabasesOnUserSwitch()));
#endif
m_lockDelayTimer.setSingleShot(true);
@ -700,6 +700,13 @@ void DatabaseTabWidget::lockDatabasesDelayed()
}
}
void DatabaseTabWidget::lockDatabasesOnUserSwitch()
{
if (config()->get(Config::Security_LockDatabaseOnUserSwitch).toBool()) {
lockDatabases();
}
}
/**
* Unlock a database with an unlock popup dialog.
*

1
src/gui/DatabaseTabWidget.h
View File

@ -74,6 +74,7 @@ public slots:
bool lockDatabases();
void lockDatabasesDelayed();
void lockDatabasesOnUserSwitch();
void closeDatabaseFromSender();
void unlockDatabaseInDialog(DatabaseWidget* dbWidget, DatabaseOpenDialog::Intent intent);
void unlockDatabaseInDialog(DatabaseWidget* dbWidget, DatabaseOpenDialog::Intent intent, const QString& filePath);

6
src/gui/osutils/macutils/AppKit.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2016 Lennart Glauer <mail@lennart-glauer.de>
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -19,8 +19,8 @@
#ifndef KEEPASSX_APPKIT_H
#define KEEPASSX_APPKIT_H
#include <QObject>
#include <QColor>
#include <QObject>
#include <unistd.h>
class QWindow;
@ -47,7 +47,7 @@ public:
void setWindowSecurity(QWindow* window, bool state);
signals:
void lockDatabases();
void userSwitched();
void interfaceThemeChanged();
private:

6
src/gui/osutils/macutils/AppKitImpl.mm
View File

@ -32,7 +32,7 @@
selector:@selector(didDeactivateApplicationObserver:)
name:NSWorkspaceDidDeactivateApplicationNotification
object:nil];
[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self
selector:@selector(userSwitchHandler:)
name:NSWorkspaceSessionDidResignActiveNotification
@ -160,7 +160,7 @@
{
if ([[notification name] isEqualToString:NSWorkspaceSessionDidResignActiveNotification] && m_appkit)
{
emit m_appkit->lockDatabases();
emit m_appkit->userSwitched();
}
}
@ -188,7 +188,7 @@
// Request screen recording permission on macOS 10.15+
// This is necessary to get the current window title
CGDisplayStreamRef stream = CGDisplayStreamCreate(CGMainDisplayID(), 1, 1, kCVPixelFormatType_32BGRA, nil,
^(CGDisplayStreamFrameStatus status, uint64_t displayTime,
^(CGDisplayStreamFrameStatus status, uint64_t displayTime,
IOSurfaceRef frameSurface, CGDisplayStreamUpdateRef updateRef) {
Q_UNUSED(status);
Q_UNUSED(displayTime);

4
src/gui/osutils/macutils/MacUtils.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
* Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -39,7 +39,7 @@ MacUtils::MacUtils(QObject* parent)
: OSUtilsBase(parent)
, m_appkit(new AppKit())
{
connect(m_appkit.data(), SIGNAL(lockDatabases()), SIGNAL(lockDatabases()));
connect(m_appkit.data(), SIGNAL(userSwitched()), SIGNAL(userSwitched()));
connect(m_appkit.data(), SIGNAL(interfaceThemeChanged()), SIGNAL(interfaceThemeChanged()));
connect(m_appkit.data(), &AppKit::interfaceThemeChanged, this, [this]() {
// Emit with delay, since isStatusBarDark() still returns the old value

4
src/gui/osutils/macutils/MacUtils.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -66,7 +66,7 @@ public:
bool setPreventScreenCapture(QWindow* window, bool prevent) const override;
signals:
void lockDatabases();
void userSwitched();
protected:
explicit MacUtils(QObject* parent = nullptr);