1
=== modified file 'plugins/LightDM/liblightdm/GreeterPrivate.cpp'
2
--- plugins/LightDM/liblightdm/GreeterPrivate.cpp	2015-01-20 11:50:19 +0000
3
+++ plugins/LightDM/liblightdm/GreeterPrivate.cpp	2015-04-23 00:56:41 +0000
4
@@ -56,7 +56,8 @@
5
56
                this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
56
                this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
6
57
        // This next connect is how we pass ResponseFutures between threads
57
        // This next connect is how we pass ResponseFutures between threads
7
58
        connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
58
        connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
9
59
                this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
59
                this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
10
60
                Qt::BlockingQueuedConnection);
11
60
    }
61
    }
12
61
62
13
62
    ~GreeterImpl()
63
    ~GreeterImpl()
14
@@ -68,6 +69,13 @@
15
68
    {
69
    {
16
69
        // Clear out any existing PAM interactions first
70
        // Clear out any existing PAM interactions first
17
70
        cancelPam();
71
        cancelPam();
18
72
        if (pamHandle != nullptr) {
19
73
            // While we were cancelling pam above, we processed Qt events.
20
74
            // Which may have allowed someone to call start() on us again.
21
75
            // In which case, we'll bail on our current start() call.
22
76
            // This isn't racy because it's all in the same thread.
23
77
            return;
24
78
        }
25
71
79
26
72
        AppData *appData = new AppData();
80
        AppData *appData = new AppData();
27
73
        appData->impl = this;
81
        appData->impl = this;
28
@@ -79,7 +87,7 @@
29
79
87
30
80
        if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
88
        if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
31
81
            appData->handle = pamHandle;
89
            appData->handle = pamHandle;
33
82
            futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));
90
            futureWatcher.setFuture(QtConcurrent::mapped(QList<pam_handle*>() << pamHandle, authenticateWithPam));
34
83
        } else {
91
        } else {
35
84
            delete appData;
92
            delete appData;
36
85
            greeterPrivate->authenticated = false;
93
            greeterPrivate->authenticated = false;
37
@@ -88,7 +96,7 @@
38
88
        }
96
        }
39
89
    }
97
    }
40
90
98
42
91
    static int authenticateWithPam(pam_handle* pamHandle)
99
    static int authenticateWithPam(pam_handle* const& pamHandle)
43
92
    {
100
    {
44
93
        int pamStatus = pam_authenticate(pamHandle, 0);
101
        int pamStatus = pam_authenticate(pamHandle, 0);
45
94
        if (pamStatus == PAM_SUCCESS) {
102
        if (pamStatus == PAM_SUCCESS) {
46
@@ -242,11 +250,22 @@
47
242
private:
250
private:
48
243
    void cancelPam()
251
    void cancelPam()
49
244
    {
252
    {
50
245
        // Unfortunately we can't simply cancel our QFuture because QtConcurrent::run doesn't support cancel
51
246
        if (pamHandle != nullptr) {
253
        if (pamHandle != nullptr) {
52
254
            QFuture<int> pamFuture = futureWatcher.future();
53
247
            pam_handle *handle = pamHandle;
255
            pam_handle *handle = pamHandle;
54
248
            pamHandle = nullptr; // to disable normal finishPam() handling
256
            pamHandle = nullptr; // to disable normal finishPam() handling
56
249
            while (respond(QString())); // clear our local queue of QFutures
257
            pamFuture.cancel();
57
258
58
259
            // Note the empty loop, we just want to clear the futures queue.
59
260
            // Any further prompts from the pam thread will be immediately
60
261
            // responded to/dismissed in handlePrompt().
61
262
            while (respond(QString()));
62
263
63
264
            // Now let signal/slot handling happen so the thread can finish
64
265
            while (!pamFuture.isFinished()) {
65
266
                QCoreApplication::processEvents();
66
267
            }
67
268
68
250
            pam_end(handle, PAM_CONV_ERR);
269
            pam_end(handle, PAM_CONV_ERR);
69
251
        }
270
        }
70
252
    }
271
    }
71
@@ -266,6 +285,11 @@
72
266
{
285
{
73
267
}
286
}
74
268
287
75
288
GreeterPrivate::~GreeterPrivate()
76
289
{
77
290
    delete m_impl;
78
291
}
79
292
80
269
void GreeterPrivate::handleAuthenticate()
293
void GreeterPrivate::handleAuthenticate()
81
270
{
294
{
82
271
    m_impl->start(authenticationUser);
295
    m_impl->start(authenticationUser);
83
272
296
84
=== modified file 'plugins/LightDM/liblightdm/GreeterPrivate.h'
85
--- plugins/LightDM/liblightdm/GreeterPrivate.h	2015-01-20 11:50:19 +0000
86
+++ plugins/LightDM/liblightdm/GreeterPrivate.h	2015-04-23 00:56:41 +0000
87
@@ -30,7 +30,7 @@
88
30
{
30
{
89
31
public:
31
public:
90
32
    explicit GreeterPrivate(Greeter* parent=0);
32
    explicit GreeterPrivate(Greeter* parent=0);
92
33
    virtual ~GreeterPrivate() = default;
33
    virtual ~GreeterPrivate();
93
34
34
94
35
    // These variables may not be used by all subclasses, that's no problem
35
    // These variables may not be used by all subclasses, that's no problem
95
36
    bool authenticated;
36
    bool authenticated;
96
37
37
97
=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
98
--- tests/plugins/LightDM/CMakeLists.txt	2015-03-02 14:31:08 +0000
99
+++ tests/plugins/LightDM/CMakeLists.txt	2015-04-23 00:56:41 +0000
100
@@ -1,8 +1,38 @@
101
1
add_definitions(
102
2
    -DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
103
3
    )
104
4
include_directories(
105
5
    ${CMAKE_CURRENT_BINARY_DIR}
106
6
    )
107
7
108
1
add_executable(GreeterDBusTestExec
8
add_executable(GreeterDBusTestExec
109
2
    dbus.cpp
9
    dbus.cpp
110
3
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
10
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
111
4
    )
11
    )
112
5
qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
12
qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
113
13
target_link_libraries(GreeterDBusTestExec
114
14
    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
115
15
    -llightdm-qt5-2
116
16
    )
117
17
target_include_directories(GreeterDBusTestExec PUBLIC
118
18
    ${CMAKE_SOURCE_DIR}/plugins/LightDM
119
19
    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
120
20
    )
121
21
add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
122
22
123
23
add_executable(GreeterPamTestExec
124
24
    pam.cpp
125
25
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/liblightdm/GreeterPrivate.cpp
126
26
    )
127
27
qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
128
28
target_link_libraries(GreeterPamTestExec
129
29
    integratedLightDM
130
30
    )
131
31
target_include_directories(GreeterPamTestExec PUBLIC
132
32
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/liblightdm
133
33
    )
134
34
add_qmltest_target(testGreeterPam "${CMAKE_CURRENT_BINARY_DIR}/GreeterPamTestExec" TRUE FALSE)
135
35
add_dependencies(testGreeterPam GreeterPamTestExec)
136
6
36
137
7
add_executable(GreeterUsersModelTestExec
37
add_executable(GreeterUsersModelTestExec
138
8
    usersmodel.cpp
38
    usersmodel.cpp
139
@@ -10,24 +40,13 @@
140
10
    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
40
    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
141
11
    )
41
    )
142
12
qt5_use_modules(GreeterUsersModelTestExec Core Test)
42
qt5_use_modules(GreeterUsersModelTestExec Core Test)
146
13
43
target_link_libraries(GreeterUsersModelTestExec
147
14
include_directories(
44
    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
148
15
    ${CMAKE_CURRENT_BINARY_DIR}
45
    -llightdm-qt5-2
149
46
    )
150
47
target_include_directories(GreeterUsersModelTestExec PUBLIC
151
16
    ${CMAKE_SOURCE_DIR}/plugins/LightDM
48
    ${CMAKE_SOURCE_DIR}/plugins/LightDM
152
17
    ${CMAKE_SOURCE_DIR}/plugins/Utils
49
    ${CMAKE_SOURCE_DIR}/plugins/Utils
153
18
    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
50
    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
154
19
    )
51
    )
155
20
156
21
target_link_libraries(GreeterDBusTestExec
157
22
    MockLightDM
158
23
    )
159
24
160
25
target_link_libraries(GreeterUsersModelTestExec
161
26
    MockLightDM
162
27
    )
163
28
164
29
add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
165
30
166
31
add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
167
32
168
33
add_binary_qml_test(GreeterUsersModel "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "LIBLIGHTDM_MOCK_MODE=full")
52
add_binary_qml_test(GreeterUsersModel "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "LIBLIGHTDM_MOCK_MODE=full")
169
34
53
170
=== added file 'tests/plugins/LightDM/pam.cpp'
171
--- tests/plugins/LightDM/pam.cpp	1970-01-01 00:00:00 +0000
172
+++ tests/plugins/LightDM/pam.cpp	2015-04-23 00:56:41 +0000
173
@@ -0,0 +1,52 @@
174
1
/*
175
2
 * Copyright (C) 2015 Canonical, Ltd.
176
3
 *
177
4
 * This program is free software; you can redistribute it and/or modify
178
5
 * it under the terms of the GNU General Public License as published by
179
6
 * the Free Software Foundation; version 3.
180
7
 *
181
8
 * This program is distributed in the hope that it will be useful,
182
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
183
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
184
11
 * GNU General Public License for more details.
185
12
 *
186
13
 * You should have received a copy of the GNU General Public License
187
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
188
15
 */
189
16
190
17
#include "GreeterPrivate.h"
191
18
192
19
#include <QtTest>
193
20
194
21
class GreeterPamTest : public QObject
195
22
{
196
23
    Q_OBJECT
197
24
198
25
private Q_SLOTS:
199
26
200
27
    void init()
201
28
    {
202
29
        m_greeterpriv = new QLightDM::GreeterPrivate();
203
30
    }
204
31
205
32
    void cleanup()
206
33
    {
207
34
        delete m_greeterpriv;
208
35
        QTRY_COMPARE(QThreadPool::globalInstance()->activeThreadCount(), 0);
209
36
    }
210
37
211
38
    void testRapidFireAuthentication()
212
39
    {
213
40
        m_greeterpriv->authenticationUser = qgetenv("USER");
214
41
        for (int i = 0; i < 100; i++) {
215
42
            m_greeterpriv->handleAuthenticate();
216
43
        }
217
44
    }
218
45
219
46
private:
220
47
    QLightDM::GreeterPrivate *m_greeterpriv;
221
48
};
222
49
223
50
QTEST_GUILESS_MAIN(GreeterPamTest)
224
51
225
52
#include "pam.moc"
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2015-02-26	Approve on 2015-05-08
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-04-23
Michał Sawicz			Needs Fixing on 2015-03-16
Review via email: mp+251174@code.launchpad.net