Get the number of failed attempts from the plugin.

sailfishos · Sep 20, 2016 · 7ce5ba8 · 7ce5ba8
1 parent 92f1607
commit 7ce5ba8
Show file tree

Hide file tree

Showing 23 changed files with 57 additions and 52 deletions.
diff --git a/rpm/nemo-qml-plugin-devicelock.spec b/rpm/nemo-qml-plugin-devicelock.spec
@@ -12,9 +12,8 @@ BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(keepalive)
 BuildRequires:  pkgconfig(mce)
-BuildRequires:  pkgconfig(mlite5)
 BuildRequires:  pkgconfig(libsystemd-daemon)
-Obsoletes:      nemo-qml-plugin-devicelock-default
+Obsoletes:      nemo-qml-plugin-devicelock-default < 0.2.0
 Requires:       nemo-devicelock-daemon
 
 %description
@@ -23,7 +22,7 @@ Requires:       nemo-devicelock-daemon
 %package -n nemo-devicelock-daemon-cli
 Summary:    The default command line lock code device lock daemon for Nemo Mobile
 Group:      System/GUI/Other
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%{release}
 Provides:   nemo-devicelock-daemon
 
 %description -n nemo-devicelock-daemon-cli
@@ -32,15 +31,15 @@ Provides:   nemo-devicelock-daemon
 %package devel
 Summary:    Development libraries for device lock
 Group:      Development/Libraries
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%{release}
 
 %description devel
 %{summary}.
 
 %package host-devel
 Summary:    Development libraries for device lock daemons
 Group:      Development/Libraries
-Requires:   %{name}-devel = %{version}
+Requires:   %{name}-devel = %{version}-%{release}
 
 %description host-devel
 %{summary}.

diff --git a/src/daemon/daemon.pro b/src/daemon/daemon.pro
@@ -11,8 +11,7 @@ CONFIG += \
 PKGCONFIG += \
         dbus-1 \
         keepalive \
-        libsystemd-daemon \
-        mlite5
+        libsystemd-daemon
 
 INCLUDEPATH += \
         $$PWD/../ \

diff --git a/src/nemo-devicelock/authenticator.cpp b/src/nemo-devicelock/authenticator.cpp
@@ -139,10 +139,14 @@ void Authenticator::authenticate(const QVariant &challengeCode, Methods methods)
         }
     });
 
-    response->onError([this]() {
+    response->onError([this](const QDBusError &dbusError) {
         m_authenticating = false;
 
-        emit error(SoftwareError);
+        if (dbusError.name() == QStringLiteral("org.nemomobile.devicelock.Authenticator.LockedOut")) {
+            emit error(LockedOut);
+        } else {
+            emit error(SoftwareError);
+        }
         emit authenticatingChanged();
     });
 

diff --git a/src/nemo-devicelock/devicereset.cpp b/src/nemo-devicelock/devicereset.cpp
@@ -68,7 +68,7 @@ void DeviceReset::clearDevice(const QVariant &authenticationToken, ResetMode mod
         response->onFinished([this]() {
             emit clearingDevice();
         });
-        response->onError([this]() {
+        response->onError([this](const QDBusError &) {
             emit clearDeviceError();
         });
     }

diff --git a/src/nemo-devicelock/encryptionsettings.cpp b/src/nemo-devicelock/encryptionsettings.cpp
@@ -75,7 +75,7 @@ void EncryptionSettings::encryptHome(const QVariant &authenticationToken)
         response->onFinished([this]() {
             emit encryptingHome();
         });
-        response->onError([this]() {
+        response->onError([this](const QDBusError &) {
             emit encryptHomeError();
         });
     }

diff --git a/src/nemo-devicelock/fingerprintsettings.cpp b/src/nemo-devicelock/fingerprintsettings.cpp
@@ -278,7 +278,7 @@ void FingerprintSettings::acquireFinger(const QVariant &authenticationToken)
             emit samplesRemainingChanged();
         });
 
-        response->onError([this]() {
+        response->onError([this](const QDBusError &) {
             m_isAcquiring = false;
 
             emit acquisitionError(CannotContinue);

diff --git a/src/nemo-devicelock/host/cli/cliauthenticator.cpp b/src/nemo-devicelock/host/cli/cliauthenticator.cpp
@@ -45,7 +45,6 @@ namespace NemoDeviceLock
 CliAuthenticator::CliAuthenticator(QObject *parent)
     : HostAuthenticator(parent)
     , m_watcher(LockCodeWatcher::instance())
-    , m_attemptCount(QStringLiteral("/desktop/nemo/devicelock/attempt_count"))
 {
     connect(m_watcher.data(), &LockCodeWatcher::lockCodeSetChanged,
             this, &CliAuthenticator::availableMethodsChanged);
@@ -79,7 +78,7 @@ Authenticator::Methods CliAuthenticator::authenticate(
 
     if (m_watcher->lockCodeSet()) {
         const int maximum = maximumAttempts();
-        const int attempts = m_attemptCount.value(0).toInt();
+        const int attempts = currentAttempts();
 
         if (maximum > 0 && attempts >= maximum) {
             QDBusContext::sendErrorReply(QStringLiteral("org.nemomobile.devicelock.Authenticator.LockedOut"));
@@ -121,29 +120,27 @@ void CliAuthenticator::enterLockCode(const QString &authenticator, const QString
             }
         });
 
-        command->onFailure([this, connection, authenticator]() {
+        command->onFailure([this, connection, authenticator](int exitCode) {
             const int maximum = maximumAttempts();
 
-            if (maximum > 0) {
-                const int attempts = m_attemptCount.value(0).toInt() + 1;
-                m_attemptCount.set(attempts);
+            if (!checkConnection(connection, authenticator)) {
+                return;
+            } else if (maximum > 0 && exitCode < 0) {
+                const int attempts = -exitCode;
+                sendFeedback(
+                            connection,
+                            authenticator,
+                            Authenticator::IncorrectLockCode,
+                            qMax(0, maximum - attempts));
 
-                if (checkConnection(connection, authenticator)) {
-                    sendFeedback(
-                                connection,
-                                authenticator,
-                                Authenticator::IncorrectLockCode,
-                                qMax(0, maximum - attempts));
+                if (attempts >= maximum) {
+                    sendError(connection, authenticator, Authenticator::LockedOut);
 
-                    if (attempts >= maximum) {
-                        sendError(connection, authenticator, Authenticator::LockedOut);
+                    clearConnection();
 
-                        clearConnection();
-
-                        authenticationEnded(false);
-                    }
+                    authenticationEnded(false);
                 }
-            } else if (checkConnection(connection, authenticator)) {
+            } else {
                 sendFeedback(connection, authenticator, Authenticator::IncorrectLockCode, -1);
             }
         });
@@ -159,8 +156,6 @@ void CliAuthenticator::lockCodeValidated(const QString &lockCode)
 
 void CliAuthenticator::confirmAuthentication(const QVariant &authenticationToken)
 {
-    m_attemptCount.set(0);
-
     sendAuthenticated(m_authenticatorConnection, m_authenticatorPath, authenticationToken);
     clearConnection();
 

diff --git a/src/nemo-devicelock/host/cli/cliauthenticator.h b/src/nemo-devicelock/host/cli/cliauthenticator.h
@@ -35,8 +35,6 @@
 
 #include <nemo-devicelock/host/hostauthenticator.h>
 
-#include <MGConfItem>
-
 #include <QDBusConnection>
 #include <QSharedDataPointer>
 
@@ -78,7 +76,6 @@ class CliAuthenticator : public HostAuthenticator
     void clearConnection();
 
     QExplicitlySharedDataPointer<LockCodeWatcher> m_watcher;
-    MGConfItem m_attemptCount;
     QString m_authenticatorConnection;
     QString m_authenticatorPath;
 };

diff --git a/src/nemo-devicelock/host/cli/clidevicelock.cpp b/src/nemo-devicelock/host/cli/clidevicelock.cpp
@@ -75,7 +75,7 @@ void CliDeviceLock::unlock(const QString &, const QVariant &authenticationToken)
             setState(DeviceLock::Unlocked);
         });
 
-        command->onFailure([this, connection, message]() {
+        command->onFailure([this, connection, message](int) {
             connection.send(message.createErrorReply(QDBusError::AccessDenied, QString()));
         });
     } else {

diff --git a/src/nemo-devicelock/host/cli/clidevicelocksettings.cpp b/src/nemo-devicelock/host/cli/clidevicelocksettings.cpp
@@ -66,7 +66,7 @@ void CliDeviceLockSettings::changeSetting(
         command->onSuccess([this, connection, message]() {
             connection.send(message.createReply());
         });
-        command->onFailure([this, connection, message]() {
+        command->onFailure([this, connection, message](int) {
             connection.send(message.createErrorReply(QDBusError::AccessDenied, QString()));
         });
     } else {

diff --git a/src/nemo-devicelock/host/cli/clidevicereset.cpp b/src/nemo-devicelock/host/cli/clidevicereset.cpp
@@ -69,7 +69,7 @@ void CliDeviceReset::clearDevice(
         command->onSuccess([this, connection, message]() {
             connection.send(message.createReply());
         });
-        command->onFailure([this, connection, message]() {
+        command->onFailure([this, connection, message](int) {
             connection.send(message.createErrorReply(QDBusError::AccessDenied, QString()));
         });
     } else {

diff --git a/src/nemo-devicelock/host/cli/cliencryptionsettings.cpp b/src/nemo-devicelock/host/cli/cliencryptionsettings.cpp
@@ -63,7 +63,7 @@ void CliEncryptionSettings::encryptHome(const QString &, const QVariant &authent
         command->onSuccess([this, connection, message]() {
             connection.send(message.createReply());
         });
-        command->onFailure([this, connection, message]() {
+        command->onFailure([this, connection, message](int) {
             connection.send(message.createErrorReply(QDBusError::AccessDenied, QString()));
         });
     } else {

diff --git a/src/nemo-devicelock/host/cli/clilockcodesettings.cpp b/src/nemo-devicelock/host/cli/clilockcodesettings.cpp
@@ -75,7 +75,7 @@ void CliLockCodeSettings::change(const QString &oldCode, const QString &newCode)
 
             connection.send(message.createReply());
         });
-        command->onFailure([this, connection, message]() {
+        command->onFailure([this, connection, message](int) {
             connection.send(message.createErrorReply(QDBusError::AccessDenied, QString()));
         });
     } else {
@@ -97,7 +97,7 @@ void CliLockCodeSettings::clear(const QString &code)
 
             connection.send(message.createReply());
         });
-        command->onFailure([this, connection, message]() {
+        command->onFailure([this, connection, message](int) {
             connection.send(message.createErrorReply(QDBusError::AccessDenied, QString()));
         });
     } else {

diff --git a/src/nemo-devicelock/host/cli/lockcodewatcher.cpp b/src/nemo-devicelock/host/cli/lockcodewatcher.cpp
@@ -77,7 +77,7 @@ void PluginCommand::processFinished(int exitCode, QProcess::ExitStatus status)
     } else if (exitCode == 0 && status == QProcess::NormalExit) {
         emit succeeded();
     } else {
-        emit failed();
+        emit failed(exitCode);
     }
 }
 

diff --git a/src/nemo-devicelock/host/cli/lockcodewatcher.h b/src/nemo-devicelock/host/cli/lockcodewatcher.h
@@ -61,7 +61,7 @@ class PluginCommand : public QProcess
 
 signals:
     void succeeded();
-    void failed();
+    void failed(int exitCode);
 
 private:
     friend class LockCodeWatcher;

diff --git a/src/nemo-devicelock/host/host.pro b/src/nemo-devicelock/host/host.pro
@@ -12,8 +12,7 @@ QT += dbus
 PKGCONFIG += \
         dbus-1 \
         keepalive \
-        libsystemd-daemon \
-        mlite5
+        libsystemd-daemon
 
 INCLUDEPATH += \
         $$PWD/.. \

diff --git a/src/nemo-devicelock/host/hostauthenticator.cpp b/src/nemo-devicelock/host/hostauthenticator.cpp
@@ -84,6 +84,11 @@ int HostAuthenticator::maximumAttempts() const
     return m_settings->maximumAttempts;
 }
 
+int HostAuthenticator::currentAttempts() const
+{
+    return m_settings->currentAttempts;
+}
+
 void HostAuthenticator::sendAuthenticated(
         const QString &connection, const QString &path, const QVariant &authenticationToken)
 {

diff --git a/src/nemo-devicelock/host/hostauthenticator.h b/src/nemo-devicelock/host/hostauthenticator.h
@@ -86,6 +86,7 @@ class HostAuthenticator : public HostObject
     virtual void cancel(const QString &authenticator) = 0;
 
     int maximumAttempts() const;
+    int currentAttempts() const;
 
     void sendAuthenticated(
             const QString &connectionName, const QString &path, const QVariant &authenticationToken);

diff --git a/src/nemo-devicelock/lockcodesettings.cpp b/src/nemo-devicelock/lockcodesettings.cpp
@@ -79,7 +79,7 @@ void LockCodeSettings::change(const QString &oldCode, const QString &newCode)
         emit changed();
     });
 
-    response->onError([this]() {
+    response->onError([this](const QDBusError &) {
         emit changeError();
     });
 }
@@ -92,7 +92,7 @@ void LockCodeSettings::clear(const QString &currentCode)
         emit cleared();
     });
 
-    response->onError([this]() {
+    response->onError([this](const QDBusError &) {
         emit clearError();
     });
 }

diff --git a/src/nemo-devicelock/private/clientauthorization.cpp b/src/nemo-devicelock/private/clientauthorization.cpp
@@ -117,7 +117,7 @@ void ClientAuthorization::requestChallenge()
             }
         });
 
-        response->onError([this]() {
+        response->onError([this](const QDBusError &) {
             if (m_status == RequestingChallenge) {
                 m_status = NoChallenge;
 

diff --git a/src/nemo-devicelock/private/connection.h b/src/nemo-devicelock/private/connection.h
@@ -68,8 +68,8 @@ class PendingCall : public QDBusPendingCallWatcher
 
     template <typename T> void onError(const T &handler)
     {
-        connect(this, &PendingCall::failure, [handler](const QDBusError &) {
-            handler();
+        connect(this, &PendingCall::failure, [handler](const QDBusError &error) {
+            handler(error);
         });
     }
 

diff --git a/src/nemo-devicelock/private/settingswatcher.cpp b/src/nemo-devicelock/private/settingswatcher.cpp
@@ -43,6 +43,7 @@ const char * const SettingsWatcher::automaticLockingKey = "/desktop/nemo/devicel
 const char * const SettingsWatcher::minimumLengthKey = "/desktop/nemo/devicelock/code_min_length";
 const char * const SettingsWatcher::maximumLengthKey = "/desktop/nemo/devicelock/code_max_length";
 const char * const SettingsWatcher::maximumAttemptsKey = "/desktop/nemo/devicelock/maximum_attempts";
+const char * const SettingsWatcher::currentAttemptsKey = "/desktop/nemo/devicelock/current_attempts";
 const char * const SettingsWatcher::peekingAllowedKey = "/desktop/nemo/devicelock/peeking_allowed";
 const char * const SettingsWatcher::sideloadingAllowedKey = "/desktop/nemo/devicelock/sideloading_allowed";
 const char * const SettingsWatcher::showNotificationsKey = "/desktop/nemo/devicelock/show_notification";
@@ -58,6 +59,7 @@ SettingsWatcher::SettingsWatcher(QObject *parent)
     , minimumLength(5)
     , maximumLength(42)
     , maximumAttempts(-1)
+    , currentAttempts(0)
     , peekingAllowed(1)
     , sideloadingAllowed(-1)
     , showNotifications(1)
@@ -112,12 +114,13 @@ static void read(
 
 void SettingsWatcher::reloadSettings()
 {
-    QSettings settings(QStringLiteral("/usr/share/lipstick/devicelock/devicelock_settings.conf"), QSettings::IniFormat);
+    QSettings settings(m_settingsPath, QSettings::IniFormat);
 
     read(settings, this, automaticLockingKey, 10, &SettingsWatcher::automaticLocking, &SettingsWatcher::automaticLockingChanged);
     read(settings, this, minimumLengthKey, 5, &SettingsWatcher::minimumLength, &SettingsWatcher::minimumLengthChanged);
     read(settings, this, maximumLengthKey, 42, &SettingsWatcher::maximumLength, &SettingsWatcher::maximumLengthChanged);
     read(settings, this, maximumAttemptsKey, -1, &SettingsWatcher::maximumAttempts, &SettingsWatcher::maximumAttemptsChanged);
+    read(settings, this, currentAttemptsKey, 0, &SettingsWatcher::currentAttempts, &SettingsWatcher::currentAttemptsChanged);
     read(settings, this, peekingAllowedKey, 1, &SettingsWatcher::peekingAllowed, &SettingsWatcher::peekingAllowedChanged);
     read(settings, this, sideloadingAllowedKey, -1, &SettingsWatcher::sideloadingAllowed, &SettingsWatcher::sideloadingAllowedChanged);
     read(settings, this, showNotificationsKey, 1, &SettingsWatcher::showNotifications, &SettingsWatcher::showNotificationsChanged);

diff --git a/src/nemo-devicelock/private/settingswatcher.h b/src/nemo-devicelock/private/settingswatcher.h
@@ -53,6 +53,7 @@ class NEMODEVICELOCK_EXPORT SettingsWatcher : public QObject, public QSharedData
     int minimumLength;
     int maximumLength;
     int maximumAttempts;
+    int currentAttempts;
     int peekingAllowed;
     int sideloadingAllowed;
     int showNotifications;
@@ -64,6 +65,7 @@ class NEMODEVICELOCK_EXPORT SettingsWatcher : public QObject, public QSharedData
     static const char * const minimumLengthKey;
     static const char * const maximumLengthKey;
     static const char * const maximumAttemptsKey;
+    static const char * const currentAttemptsKey;
     static const char * const peekingAllowedKey;
     static const char * const sideloadingAllowedKey;
     static const char * const showNotificationsKey;
@@ -74,6 +76,7 @@ class NEMODEVICELOCK_EXPORT SettingsWatcher : public QObject, public QSharedData
 signals:
     void automaticLockingChanged();
     void maximumAttemptsChanged();
+    void currentAttemptsChanged();
     void minimumLengthChanged();
     void maximumLengthChanged();
     void peekingAllowedChanged();