Lock database when OS is locked (Windows, DBus, macOS implementations) #134

This commit is contained in:
Claudio Bantaloukas 2016-12-24 01:04:43 +01:00 committed by thez3ro
parent a6bc3e9790
commit 2de5a9d281
No known key found for this signature in database
GPG Key ID: F628F9E41DD7C073
15 changed files with 362 additions and 0 deletions

View File

@ -48,6 +48,10 @@ set(keepassx_SOURCES
core/PasswordGenerator.cpp
core/PassphraseGenerator.cpp
core/SignalMultiplexer.cpp
core/ScreenLockListener.cpp
core/ScreenLockListener.h
core/ScreenLockListenerPrivate.h
core/ScreenLockListenerPrivate.cpp
core/TimeDelta.cpp
core/TimeInfo.cpp
core/ToDbExporter.cpp
@ -136,6 +140,24 @@ set(keepassx_SOURCES
totp/totp.h
totp/totp.cpp
)
if(APPLE)
set(keepassx_SOURCES ${keepassx_SOURCES}
core/ScreenLockListenerMac.h
core/ScreenLockListenerMac.cpp
)
endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(keepassx_SOURCES ${keepassx_SOURCES}
core/ScreenLockListenerDBus.h
core/ScreenLockListenerDBus.cpp
)
endif()
if(MINGW)
set(keepassx_SOURCES ${keepassx_SOURCES}
core/ScreenLockListenerWin.h
core/ScreenLockListenerWin.cpp
)
endif()
set(keepassx_SOURCES_MAINEXE
main.cpp

View File

@ -0,0 +1,11 @@
#include "ScreenLockListener.h"
#include "ScreenLockListenerPrivate.h"
ScreenLockListener::ScreenLockListener(QWidget* parent):
QObject(parent){
m_listener = ScreenLockListenerPrivate::instance(parent);
connect(m_listener,SIGNAL(screenLocked()), this,SIGNAL(screenLocked()));
}
ScreenLockListener::~ScreenLockListener(){
}

View File

@ -0,0 +1,21 @@
#ifndef SCREENLOCKLISTENER_H
#define SCREENLOCKLISTENER_H
#include <QWidget>
class ScreenLockListenerPrivate;
class ScreenLockListener : public QObject {
Q_OBJECT
public:
ScreenLockListener(QWidget* parent=NULL);
~ScreenLockListener();
Q_SIGNALS:
void screenLocked();
private:
ScreenLockListenerPrivate* m_listener;
};
#endif // SCREENLOCKLISTENER_H

View File

@ -0,0 +1,66 @@
#include "ScreenLockListenerDBus.h"
#include <QDBusConnection>
#include <QDBusInterface>
#include <QDBusReply>
ScreenLockListenerDBus::ScreenLockListenerDBus(QWidget *parent):
ScreenLockListenerMac(parent)
{
QDBusConnection sessionBus = QDBusConnection::sessionBus();
QDBusConnection systemBus = QDBusConnection::systemBus();
sessionBus.connect(
"org.gnome.SessionManager", // service
"/org/gnome/SessionManager/Presence", // path
"org.gnome.SessionManager.Presence", // interface
"StatusChanged", // signal name
this, //receiver
SLOT(gnomeSessionStatusChanged(uint)));
systemBus.connect(
"org.freedesktop.login1", // service
"/org/freedesktop/login1", // path
"org.freedesktop.login1.Manager", // interface
"PrepareForSleep", // signal name
this, //receiver
SLOT(logindPrepareForSleep(bool)));
sessionBus.connect(
"com.canonical.Unity", // service
"/com/canonical/Unity/Session", // path
"com.canonical.Unity.Session", // interface
"Locked", // signal name
this, //receiver
SLOT(unityLocked()));
/* Currently unable to get the current user session from login1.Manager
QDBusInterface login1_manager_iface("org.freedesktop.login1", "/org/freedesktop/login1",
"org.freedesktop.login1.Manager", systemBus);
if(login1_manager_iface.isValid()){
qint64 my_pid = QCoreApplication::applicationPid();
QDBusReply<QString> reply = login1_manager_iface.call("GetSessionByPID",static_cast<quint32>(my_pid));
if (reply.isValid()){
QString current_session = reply.value();
}
}
*/
}
void ScreenLockListenerDBus::gnomeSessionStatusChanged(uint status)
{
if(status != 0){
Q_EMIT screenLocked();
}
}
void ScreenLockListenerDBus::logindPrepareForSleep(bool beforeSleep)
{
if(beforeSleep){
Q_EMIT screenLocked();
}
}
void ScreenLockListenerDBus::unityLocked()
{
Q_EMIT screenLocked();
}

View File

@ -0,0 +1,18 @@
#ifndef SCREENLOCKLISTENERDBUS_H
#define SCREENLOCKLISTENERDBUS_H
#include <QObject>
#include <QWidget>
class ScreenLockListenerDBus : public ScreenLockListenerPrivate
{
Q_OBJECT
public:
explicit ScreenLockListenerDBus(QWidget *parent = 0);
private Q_SLOTS:
void gnomeSessionStatusChanged(uint status);
void logindPrepareForSleep(bool beforeSleep);
void unityLocked();
};
#endif // SCREENLOCKLISTENERDBUS_H

View File

@ -0,0 +1,41 @@
#include "ScreenLockListenerMac.h"
#include <QMutexLocker>
#include <CoreFoundation/CoreFoundation.h>
ScreenLockListenerMac* ScreenLockListenerMac::instance(){
static QMutex mutex;
QMutexLocker lock(&mutex);
static ScreenLockListenerMac* m_ptr=NULL;
if (m_ptr==NULL){
m_ptr = new ScreenLockListenerMac();
}
return m_ptr;
}
void ScreenLockListenerMac::notificationCenterCallBack(CFNotificationCenterRef /*center*/, void */*observer*/,
CFNotificationName /*name*/, const void */*object*/, CFDictionaryRef /*userInfo*/){
instance()->onSignalReception();
}
ScreenLockListenerMac::ScreenLockListenerMac(QWidget* parent):
ScreenLockListenerPrivate(parent){
CFNotificationCenterRef distCenter;
CFStringRef screenIsLockedSignal = CFSTR("com.apple.screenIsLocked");
distCenter = CFNotificationCenterGetDistributedCenter();
if (NULL == distCenter)
return;
CFNotificationCenterAddObserver(
distCenter,
this, &ScreenLockListenerMac::notificationCenterCallBack,
screenIsLockedSignal,
NULL,
CFNotificationSuspensionBehaviorDeliverImmediately);
}
void ScreenLockListenerMac::onSignalReception()
{
Q_EMIT screenLocked();
}

View File

@ -0,0 +1,24 @@
#ifndef SCREENLOCKLISTENERMAC_H
#define SCREENLOCKLISTENERMAC_H
#include <QObject>
#include <QWidget>
#include <CoreFoundation/CoreFoundation.h>
#include "ScreenLockListenerPrivate.h"
class ScreenLockListenerMac: public ScreenLockListenerPrivate {
Q_OBJECT
public:
static ScreenLockListenerMac* instance();
static void notificationCenterCallBack(CFNotificationCenterRef /*center*/, void */*observer*/,
CFNotificationName /*name*/, const void */*object*/, CFDictionaryRef /*userInfo*/);
private:
ScreenLockListenerMac(QWidget* parent=NULL);
void onSignalReception();
};
#endif // SCREENLOCKLISTENERMAC_H

View File

@ -0,0 +1,26 @@
#include "ScreenLockListenerPrivate.h"
#if defined(Q_OS_OSX)
#include "ScreenLockListenerMac.h"
#endif
#if defined(Q_OS_LINUX)
#include "ScreenLockListenerDBus.h"
#endif
#if defined(Q_OS_WIN)
#include "ScreenLockListenerWin.h"
#endif
ScreenLockListenerPrivate::ScreenLockListenerPrivate(QWidget* parent):
QObject(parent){
}
ScreenLockListenerPrivate* ScreenLockListenerPrivate::instance(QWidget* parent){
#if defined(Q_OS_OSX)
return ScreenLockListenerMac::instance();
#endif
#if defined(Q_OS_LINUX)
return new ScreenLockListenerDBus(parent);
#endif
#if defined(Q_OS_WIN)
return new ScreenLockListenerWin(parent);
#endif
}

View File

@ -0,0 +1,19 @@
#ifndef SCREENLOCKLISTENERPRIVATE_H
#define SCREENLOCKLISTENERPRIVATE_H
#include <QObject>
#include <QWidget>
class ScreenLockListenerPrivate : public QObject
{
Q_OBJECT
public:
static ScreenLockListenerPrivate* instance(QWidget *parent = 0);
protected:
ScreenLockListenerPrivate(QWidget *parent = 0);
Q_SIGNALS:
void screenLocked();
};
#endif // SCREENLOCKLISTENERPRIVATE_H

View File

@ -0,0 +1,69 @@
#include "ScreenLockListenerWin.h"
#include <QApplication>
#include <windows.h>
#include <wtsapi32.h>
/*
* See https://msdn.microsoft.com/en-us/library/windows/desktop/aa373196(v=vs.85).aspx
* See https://msdn.microsoft.com/en-us/library/aa383841(v=vs.85).aspx
* See https://blogs.msdn.microsoft.com/oldnewthing/20060104-50/?p=32783
*/
ScreenLockListenerWin::ScreenLockListenerWin(QWidget *parent) :
ScreenLockListenerPrivate(parent),
QAbstractNativeEventFilter()
{
Q_ASSERT(parent!=NULL);
// On windows, we need to register for platform specific messages and
// install a message handler for them
QCoreApplication::instance()->installNativeEventFilter(this);
// This call requests a notification from windows when a laptop is closed
HPOWERNOTIFY hPnotify = RegisterPowerSettingNotification(
reinterpret_cast<HWND>(parent->winId()),
&GUID_LIDSWITCH_STATE_CHANGE, DEVICE_NOTIFY_WINDOW_HANDLE);
m_powernotificationhandle = reinterpret_cast<void*>(hPnotify);
// This call requests a notification for session changes
if (!WTSRegisterSessionNotification(
reinterpret_cast<HWND>(parent->winId()),
NOTIFY_FOR_THIS_SESSION)){
}
}
ScreenLockListenerWin::~ScreenLockListenerWin()
{
HWND h= reinterpret_cast<HWND>(static_cast<QWidget*>(parent())->winId());
WTSUnRegisterSessionNotification(h);
if(m_powernotificationhandle){
UnregisterPowerSettingNotification(reinterpret_cast<HPOWERNOTIFY>(m_powernotificationhandle));
}
}
bool ScreenLockListenerWin::nativeEventFilter(const QByteArray &eventType, void *message, long *)
{
if(eventType == "windows_generic_MSG" || eventType == "windows_dispatcher_MSG"){
MSG* m = static_cast<MSG *>(message);
if(m->message == WM_POWERBROADCAST){
const POWERBROADCAST_SETTING* setting = reinterpret_cast<const POWERBROADCAST_SETTING*>(m->lParam);
if (setting->PowerSetting == GUID_LIDSWITCH_STATE_CHANGE){
const DWORD* state = reinterpret_cast<const DWORD*>(&setting->Data);
if (*state == 0){
Q_EMIT screenLocked();
return true;
}
}
}
if(m->message == WM_WTSSESSION_CHANGE){
if (m->wParam==WTS_CONSOLE_DISCONNECT){
Q_EMIT screenLocked();
return true;
}
if (m->wParam==WTS_SESSION_LOCK){
Q_EMIT screenLocked();
return true;
}
}
}
return false;
}

View File

@ -0,0 +1,21 @@
#ifndef SCREENLOCKLISTENERWIN_H
#define SCREENLOCKLISTENERWIN_H
#include <QObject>
#include <QWidget>
#include <QAbstractNativeEventFilter>
#include "ScreenLockListenerPrivate.h"
class ScreenLockListenerWin : public ScreenLockListenerPrivate, public QAbstractNativeEventFilter
{
Q_OBJECT
public:
explicit ScreenLockListenerWin(QWidget *parent = 0);
~ScreenLockListenerWin();
virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *) Q_DECL_OVERRIDE;
private:
void * m_powernotificationhandle;
};
#endif // SCREENLOCKLISTENERWIN_H

View File

@ -329,6 +329,9 @@ MainWindow::MainWindow()
connect(m_ui->tabWidget, SIGNAL(messageTab(QString,MessageWidget::MessageType)), this, SLOT(displayTabMessage(QString, MessageWidget::MessageType)));
connect(m_ui->tabWidget, SIGNAL(messageDismissTab()), this, SLOT(hideTabMessage()));
m_screenLockListener = new ScreenLockListener(this);
connect(m_screenLockListener, SIGNAL(screenLocked()), SLOT(handleScreenLock()));
updateTrayIcon();
if (config()->hasAccessError()) {
@ -959,3 +962,10 @@ void MainWindow::hideYubiKeyPopup()
hideGlobalMessage();
setEnabled(true);
}
void MainWindow::handleScreenLock()
{
if (config()->get("AutoCloseOnScreenLock").toBool()){
lockDatabasesAfterInactivity();
}
}

View File

@ -23,6 +23,7 @@
#include <QSystemTrayIcon>
#include "core/SignalMultiplexer.h"
#include "core/ScreenLockListener.h"
#include "gui/DatabaseWidget.h"
#include "gui/Application.h"
@ -91,6 +92,7 @@ private slots:
void lockDatabasesAfterInactivity();
void repairDatabase();
void hideTabMessage();
void handleScreenLock();
private:
static void setShortcut(QAction* action, QKeySequence::StandardKey standard, int fallback = 0);
@ -112,6 +114,7 @@ private:
InactivityTimer* m_inactivityTimer;
int m_countDefaultAttributes;
QSystemTrayIcon* m_trayIcon;
ScreenLockListener* m_screenLockListener;
Q_DISABLE_COPY(MainWindow)

View File

@ -141,6 +141,8 @@ void SettingsWidget::loadSettings()
}
}
m_generalUi->autoCloseOnScreenLockCheckBox->setChecked(config()->get("AutoCloseOnScreenLock").toBool());
m_secUi->clearClipboardCheckBox->setChecked(config()->get("security/clearclipboard").toBool());
m_secUi->clearClipboardSpinBox->setValue(config()->get("security/clearclipboardtimeout").toInt());
@ -186,6 +188,8 @@ void SettingsWidget::saveSettings()
config()->set("AutoTypeEntryTitleMatch",
m_generalUi->autoTypeEntryTitleMatchCheckBox->isChecked());
int currentLangIndex = m_generalUi->languageComboBox->currentIndex();
config()->set("AutoCloseOnScreenLock", m_generalUi->autoCloseOnScreenLockCheckBox->isChecked());
config()->set("GUI/Language", m_generalUi->languageComboBox->itemData(currentLangIndex).toString());
config()->set("GUI/ShowTrayIcon", m_generalUi->systrayShowCheckBox->isChecked());

View File

@ -367,6 +367,13 @@
</widget>
</widget>
</item>
<item row="15" column="0">
<widget class="QCheckBox" name="autoCloseOnScreenLockCheckBox">
<property name="text">
<string>Close database when session is locked or lid is closed</string>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>