1
=== modified file '3rd_party/CMakeLists.txt'
2
--- 3rd_party/CMakeLists.txt	2016-01-20 23:59:18 +0000
3
+++ 3rd_party/CMakeLists.txt	2016-01-25 13:42:04 +0000
4
@@ -11,6 +11,7 @@
5
11
set(MIR_INPUT_ANDROID_COMPILE_FLAGS ${MIR_INPUT_ANDROID_COMPILE_FLAGS}
11
set(MIR_INPUT_ANDROID_COMPILE_FLAGS ${MIR_INPUT_ANDROID_COMPILE_FLAGS}
6
12
  PARENT_SCOPE)
12
  PARENT_SCOPE)
7
13
13
8
14
include_directories(${PROJECT_SOURCE_DIR}/src/include/cookie)
9
14
include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
15
include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
10
15
include_directories(${PROJECT_SOURCE_DIR}/src/include/platform)
16
include_directories(${PROJECT_SOURCE_DIR}/src/include/platform)
11
16
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/android-deps)
17
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/android-deps)
12
17
18
13
=== modified file '3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h'
14
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h	2016-01-20 23:59:18 +0000
15
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h	2016-01-25 13:42:04 +0000
16
@@ -31,6 +31,8 @@
17
31
31
18
32
#include <chrono>
32
#include <chrono>
19
33
33
20
34
#include "mir/cookie/blob.h"
21
35
22
34
#ifdef HAVE_ANDROID_OS
36
#ifdef HAVE_ANDROID_OS
23
35
class SkMatrix;
37
class SkMatrix;
24
36
#endif
38
#endif
25
@@ -276,7 +278,7 @@
26
276
278
27
277
    inline int32_t getRepeatCount() const { return mRepeatCount; }
279
    inline int32_t getRepeatCount() const { return mRepeatCount; }
28
278
280
30
279
    inline uint64_t getMac() const { return mMac; }
281
    inline mir::cookie::Blob const& getCookieAsBlob() const { return mCookieBlob; }
31
280
282
32
281
    inline std::chrono::nanoseconds getDownTime() const { return mDownTime; }
283
    inline std::chrono::nanoseconds getDownTime() const { return mDownTime; }
33
282
284
34
@@ -299,7 +301,7 @@
35
299
            int32_t scanCode,
301
            int32_t scanCode,
36
300
            int32_t metaState,
302
            int32_t metaState,
37
301
            int32_t repeatCount,
303
            int32_t repeatCount,
39
302
            uint64_t mac,
304
            mir::cookie::Blob const& cookie,
40
303
            std::chrono::nanoseconds downTime,
305
            std::chrono::nanoseconds downTime,
41
304
            std::chrono::nanoseconds eventTime);
306
            std::chrono::nanoseconds eventTime);
42
305
    void initialize(const KeyEvent& from);
307
    void initialize(const KeyEvent& from);
43
@@ -311,7 +313,7 @@
44
311
    int32_t mScanCode;
313
    int32_t mScanCode;
45
312
    int32_t mMetaState;
314
    int32_t mMetaState;
46
313
    int32_t mRepeatCount;
315
    int32_t mRepeatCount;
48
314
    uint64_t mMac;
316
    mir::cookie::Blob mCookieBlob;
49
315
    std::chrono::nanoseconds mDownTime;
317
    std::chrono::nanoseconds mDownTime;
50
316
    std::chrono::nanoseconds mEventTime;
318
    std::chrono::nanoseconds mEventTime;
51
317
};
319
};
52
@@ -358,7 +360,7 @@
53
358
360
54
359
    inline float getYPrecision() const { return mYPrecision; }
361
    inline float getYPrecision() const { return mYPrecision; }
55
360
362
57
361
    inline uint64_t getMac() const { return mMac; }
363
    inline mir::cookie::Blob const& getCookieAsBlob() const { return mCookieBlob; }
58
362
364
59
363
    inline std::chrono::nanoseconds getDownTime() const { return mDownTime; }
365
    inline std::chrono::nanoseconds getDownTime() const { return mDownTime; }
60
364
366
61
@@ -513,7 +515,7 @@
62
513
            float yOffset,
515
            float yOffset,
63
514
            float xPrecision,
516
            float xPrecision,
64
515
            float yPrecision,
517
            float yPrecision,
66
516
            uint64_t mac,
518
            mir::cookie::Blob const& cookie,
67
517
            std::chrono::nanoseconds downTime,
519
            std::chrono::nanoseconds downTime,
68
518
            std::chrono::nanoseconds eventTime,
520
            std::chrono::nanoseconds eventTime,
69
519
            size_t pointerCount,
521
            size_t pointerCount,
70
@@ -561,7 +563,7 @@
71
561
    float mYOffset;
563
    float mYOffset;
72
562
    float mXPrecision;
564
    float mXPrecision;
73
563
    float mYPrecision;
565
    float mYPrecision;
75
564
    uint64_t mMac;
566
    mir::cookie::Blob mCookieBlob;
76
565
    std::chrono::nanoseconds mDownTime;
567
    std::chrono::nanoseconds mDownTime;
77
566
    Vector<PointerProperties> mPointerProperties;
568
    Vector<PointerProperties> mPointerProperties;
78
567
    Vector<std::chrono::nanoseconds> mSampleEventTimes;
569
    Vector<std::chrono::nanoseconds> mSampleEventTimes;
79
568
570
80
=== modified file '3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h'
81
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h	2016-01-20 23:59:18 +0000
82
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h	2016-01-25 13:42:04 +0000
83
@@ -62,7 +62,7 @@
84
62
        struct Key {
62
        struct Key {
85
63
            uint32_t seq;
63
            uint32_t seq;
86
64
            int64_t eventTime;
64
            int64_t eventTime;
88
65
            uint64_t mac;
65
            mir::cookie::Blob cookieBlob;
89
66
            int32_t deviceId;
66
            int32_t deviceId;
90
67
            int32_t source;
67
            int32_t source;
91
68
            int32_t action;
68
            int32_t action;
92
@@ -81,7 +81,7 @@
93
81
        struct Motion {
81
        struct Motion {
94
82
            uint32_t seq;
82
            uint32_t seq;
95
83
            int64_t eventTime;
83
            int64_t eventTime;
97
84
            uint64_t mac;
84
            mir::cookie::Blob cookieBlob;
98
85
            int32_t deviceId;
85
            int32_t deviceId;
99
86
            int32_t source;
86
            int32_t source;
100
87
            int32_t action;
87
            int32_t action;
101
@@ -212,7 +212,7 @@
102
212
            int32_t scanCode,
212
            int32_t scanCode,
103
213
            int32_t metaState,
213
            int32_t metaState,
104
214
            int32_t repeatCount,
214
            int32_t repeatCount,
106
215
            uint64_t mac,
215
            mir::cookie::Blob const& cookieBlob,
107
216
            std::chrono::nanoseconds downTime,
216
            std::chrono::nanoseconds downTime,
108
217
            std::chrono::nanoseconds eventTime);
217
            std::chrono::nanoseconds eventTime);
109
218
218
110
@@ -237,7 +237,7 @@
111
237
            float yOffset,
237
            float yOffset,
112
238
            float xPrecision,
238
            float xPrecision,
113
239
            float yPrecision,
239
            float yPrecision,
115
240
            uint64_t mac,
240
            mir::cookie::Blob const& cookieBlob,
116
241
            std::chrono::nanoseconds downTime,
241
            std::chrono::nanoseconds downTime,
117
242
            std::chrono::nanoseconds eventTime,
242
            std::chrono::nanoseconds eventTime,
118
243
            size_t pointerCount,
243
            size_t pointerCount,
119
244
244
120
=== modified file '3rd_party/android-input/android/frameworks/base/services/input/Input.cpp'
121
--- 3rd_party/android-input/android/frameworks/base/services/input/Input.cpp	2016-01-20 23:59:18 +0000
122
+++ 3rd_party/android-input/android/frameworks/base/services/input/Input.cpp	2016-01-25 13:42:04 +0000
123
@@ -127,7 +127,7 @@
124
127
        int32_t scanCode,
127
        int32_t scanCode,
125
128
        int32_t metaState,
128
        int32_t metaState,
126
129
        int32_t repeatCount,
129
        int32_t repeatCount,
128
130
        uint64_t mac,
130
        mir::cookie::Blob const& cookieBlob,
129
131
        std::chrono::nanoseconds downTime,
131
        std::chrono::nanoseconds downTime,
130
132
        std::chrono::nanoseconds eventTime) {
132
        std::chrono::nanoseconds eventTime) {
131
133
    InputEvent::initialize(deviceId, source);
133
    InputEvent::initialize(deviceId, source);
132
@@ -137,7 +137,7 @@
133
137
    mScanCode = scanCode;
137
    mScanCode = scanCode;
134
138
    mMetaState = metaState;
138
    mMetaState = metaState;
135
139
    mRepeatCount = repeatCount;
139
    mRepeatCount = repeatCount;
137
140
    mMac = mac;
140
    mCookieBlob = cookieBlob;
138
141
    mDownTime = downTime;
141
    mDownTime = downTime;
139
142
    mEventTime = eventTime;
142
    mEventTime = eventTime;
140
143
}
143
}
141
@@ -150,7 +150,7 @@
142
150
    mScanCode = from.mScanCode;
150
    mScanCode = from.mScanCode;
143
151
    mMetaState = from.mMetaState;
151
    mMetaState = from.mMetaState;
144
152
    mRepeatCount = from.mRepeatCount;
152
    mRepeatCount = from.mRepeatCount;
146
153
    mMac = from.mMac;
153
    mCookieBlob = from.mCookieBlob;
147
154
    mDownTime = from.mDownTime;
154
    mDownTime = from.mDownTime;
148
155
    mEventTime = from.mEventTime;
155
    mEventTime = from.mEventTime;
149
156
}
156
}
150
@@ -294,7 +294,7 @@
151
294
        float yOffset,
294
        float yOffset,
152
295
        float xPrecision,
295
        float xPrecision,
153
296
        float yPrecision,
296
        float yPrecision,
155
297
        uint64_t mac,
297
        mir::cookie::Blob const& cookieBlob,
156
298
        std::chrono::nanoseconds downTime,
298
        std::chrono::nanoseconds downTime,
157
299
        std::chrono::nanoseconds eventTime,
299
        std::chrono::nanoseconds eventTime,
158
300
        size_t pointerCount,
300
        size_t pointerCount,
159
@@ -310,7 +310,7 @@
160
310
    mYOffset = yOffset;
310
    mYOffset = yOffset;
161
311
    mXPrecision = xPrecision;
311
    mXPrecision = xPrecision;
162
312
    mYPrecision = yPrecision;
312
    mYPrecision = yPrecision;
164
313
    mMac = mac;
313
    mCookieBlob = cookieBlob;
165
314
    mDownTime = downTime;
314
    mDownTime = downTime;
166
315
    mPointerProperties.clear();
315
    mPointerProperties.clear();
167
316
    mPointerProperties.appendArray(pointerProperties, pointerCount);
316
    mPointerProperties.appendArray(pointerProperties, pointerCount);
168
@@ -330,7 +330,7 @@
169
330
    mYOffset = other->mYOffset;
330
    mYOffset = other->mYOffset;
170
331
    mXPrecision = other->mXPrecision;
331
    mXPrecision = other->mXPrecision;
171
332
    mYPrecision = other->mYPrecision;
332
    mYPrecision = other->mYPrecision;
173
333
    mMac = other->mMac;
333
    mCookieBlob = other->mCookieBlob;
174
334
    mDownTime = other->mDownTime;
334
    mDownTime = other->mDownTime;
175
335
    mPointerProperties = other->mPointerProperties;
335
    mPointerProperties = other->mPointerProperties;
176
336
336
177
337
337
178
=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp'
179
--- 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp	2016-01-20 23:59:18 +0000
180
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp	2016-01-25 13:42:04 +0000
181
@@ -236,16 +236,16 @@
182
236
        int32_t scanCode,
236
        int32_t scanCode,
183
237
        int32_t metaState,
237
        int32_t metaState,
184
238
        int32_t repeatCount,
238
        int32_t repeatCount,
186
239
        uint64_t mac,
239
        mir::cookie::Blob const& cookieBlob,
187
240
        std::chrono::nanoseconds downTime,
240
        std::chrono::nanoseconds downTime,
188
241
        std::chrono::nanoseconds eventTime) {
241
        std::chrono::nanoseconds eventTime) {
189
242
#if DEBUG_TRANSPORT_ACTIONS
242
#if DEBUG_TRANSPORT_ACTIONS
190
243
    ALOGD("channel '%s' publisher ~ publishKeyEvent: seq=%u, deviceId=%d, source=0x%x, "
243
    ALOGD("channel '%s' publisher ~ publishKeyEvent: seq=%u, deviceId=%d, source=0x%x, "
191
244
            "action=0x%x, flags=0x%x, keyCode=%d, scanCode=%d, metaState=0x%x, repeatCount=%d,"
244
            "action=0x%x, flags=0x%x, keyCode=%d, scanCode=%d, metaState=0x%x, repeatCount=%d,"
193
245
            "mac=%lu, downTime=%lld, eventTime=%lld",
245
            "downTime=%lld, eventTime=%lld",
194
246
            c_str(mChannel->getName()), seq,
246
            c_str(mChannel->getName()), seq,
195
247
            deviceId, source, action, flags, keyCode, scanCode, metaState, repeatCount,
247
            deviceId, source, action, flags, keyCode, scanCode, metaState, repeatCount,
197
248
            mac, downTime, eventTime);
248
            downTime, eventTime);
198
249
#endif
249
#endif
199
250
250
200
251
    if (!seq) {
251
    if (!seq) {
201
@@ -264,7 +264,7 @@
202
264
    msg.body.key.scanCode = scanCode;
264
    msg.body.key.scanCode = scanCode;
203
265
    msg.body.key.metaState = metaState;
265
    msg.body.key.metaState = metaState;
204
266
    msg.body.key.repeatCount = repeatCount;
266
    msg.body.key.repeatCount = repeatCount;
206
267
    msg.body.key.mac = mac;
267
    msg.body.key.cookieBlob = cookieBlob;
207
268
    msg.body.key.downTime = downTime.count();
268
    msg.body.key.downTime = downTime.count();
208
269
    msg.body.key.eventTime = eventTime.count();
269
    msg.body.key.eventTime = eventTime.count();
209
270
    return mChannel->sendMessage(&msg);
270
    return mChannel->sendMessage(&msg);
210
@@ -283,7 +283,7 @@
211
283
        float yOffset,
283
        float yOffset,
212
284
        float xPrecision,
284
        float xPrecision,
213
285
        float yPrecision,
285
        float yPrecision,
215
286
        uint64_t mac,
286
        mir::cookie::Blob const& cookieBlob,
216
287
        std::chrono::nanoseconds downTime,
287
        std::chrono::nanoseconds downTime,
217
288
        std::chrono::nanoseconds eventTime,
288
        std::chrono::nanoseconds eventTime,
218
289
        size_t pointerCount,
289
        size_t pointerCount,
219
@@ -293,11 +293,11 @@
220
293
    ALOGD("channel '%s' publisher ~ publishMotionEvent: seq=%u, deviceId=%d, source=0x%x, "
293
    ALOGD("channel '%s' publisher ~ publishMotionEvent: seq=%u, deviceId=%d, source=0x%x, "
221
294
            "action=0x%x, flags=0x%x, edgeFlags=0x%x, metaState=0x%x, buttonState=0x%x, "
294
            "action=0x%x, flags=0x%x, edgeFlags=0x%x, metaState=0x%x, buttonState=0x%x, "
222
295
            "xOffset=%f, yOffset=%f, "
295
            "xOffset=%f, yOffset=%f, "
224
296
            "xPrecision=%f, yPrecision=%f, mac=%lu, "
296
            "xPrecision=%f, yPrecision=%f,"
225
297
            "downTime=%lld, eventTime=%lld, pointerCount=%d",
297
            "downTime=%lld, eventTime=%lld, pointerCount=%d",
226
298
            c_str(mChannel->getName()), seq,
298
            c_str(mChannel->getName()), seq,
227
299
            deviceId, source, action, flags, edgeFlags, metaState, buttonState,
299
            deviceId, source, action, flags, edgeFlags, metaState, buttonState,
229
300
            xOffset, yOffset, xPrecision, yPrecision, mac, downTime, eventTime, pointerCount);
300
            xOffset, yOffset, xPrecision, yPrecision, downTime, eventTime, pointerCount);
230
301
#endif
301
#endif
231
302
302
232
303
    if (!seq) {
303
    if (!seq) {
233
@@ -325,7 +325,7 @@
234
325
    msg.body.motion.yOffset = yOffset;
325
    msg.body.motion.yOffset = yOffset;
235
326
    msg.body.motion.xPrecision = xPrecision;
326
    msg.body.motion.xPrecision = xPrecision;
236
327
    msg.body.motion.yPrecision = yPrecision;
327
    msg.body.motion.yPrecision = yPrecision;
238
328
    msg.body.motion.mac = mac;
328
    msg.body.motion.cookieBlob = cookieBlob;
239
329
    msg.body.motion.downTime = downTime.count();
329
    msg.body.motion.downTime = downTime.count();
240
330
    msg.body.motion.eventTime = eventTime.count();
330
    msg.body.motion.eventTime = eventTime.count();
241
331
    msg.body.motion.pointerCount = pointerCount;
331
    msg.body.motion.pointerCount = pointerCount;
242
@@ -882,7 +882,7 @@
243
882
            msg->body.key.scanCode,
882
            msg->body.key.scanCode,
244
883
            msg->body.key.metaState,
883
            msg->body.key.metaState,
245
884
            msg->body.key.repeatCount,
884
            msg->body.key.repeatCount,
247
885
            msg->body.key.mac,
885
            msg->body.key.cookieBlob,
248
886
            std::chrono::nanoseconds(msg->body.key.downTime),
886
            std::chrono::nanoseconds(msg->body.key.downTime),
249
887
            std::chrono::nanoseconds(msg->body.key.eventTime));
887
            std::chrono::nanoseconds(msg->body.key.eventTime));
250
888
}
888
}
251
@@ -908,7 +908,7 @@
252
908
            msg->body.motion.yOffset,
908
            msg->body.motion.yOffset,
253
909
            msg->body.motion.xPrecision,
909
            msg->body.motion.xPrecision,
254
910
            msg->body.motion.yPrecision,
910
            msg->body.motion.yPrecision,
256
911
            msg->body.motion.mac,
911
            msg->body.motion.cookieBlob,
257
912
            std::chrono::nanoseconds(msg->body.motion.downTime),
912
            std::chrono::nanoseconds(msg->body.motion.downTime),
258
913
            std::chrono::nanoseconds(msg->body.motion.eventTime),
913
            std::chrono::nanoseconds(msg->body.motion.eventTime),
259
914
            pointerCount,
914
            pointerCount,
260
915
915
261
=== modified file 'debian/control'
262
--- debian/control	2016-01-21 23:54:16 +0000
263
+++ debian/control	2016-01-25 13:42:04 +0000
264
@@ -420,7 +420,7 @@
265
420
 This package depends on a full set of graphics drivers for running Mir on top
420
 This package depends on a full set of graphics drivers for running Mir on top
266
421
 of an existing Android driver stack.
421
 of an existing Android driver stack.
267
422
422
269
423
Package: libmircookie1
423
Package: libmircookie2
270
424
Section: libs
424
Section: libs
271
425
Architecture: any
425
Architecture: any
272
426
Multi-Arch: same
426
Multi-Arch: same
273
@@ -439,7 +439,7 @@
274
439
Architecture: any
439
Architecture: any
275
440
Multi-Arch: same
440
Multi-Arch: same
276
441
Pre-Depends: ${misc:Pre-Depends}
441
Pre-Depends: ${misc:Pre-Depends}
278
442
Depends: libmircookie1 (= ${binary:Version}),
442
Depends: libmircookie2 (= ${binary:Version}),
279
443
         ${misc:Depends},
443
         ${misc:Depends},
280
444
Description: Produce and verify spoof-resistant timestamps - development headers
444
Description: Produce and verify spoof-resistant timestamps - development headers
281
445
 libmircookie provides a simple mechanism for a group of cooperating processes
445
 libmircookie provides a simple mechanism for a group of cooperating processes
282
446
446
283
=== renamed file 'debian/libmircookie1.install' => 'debian/libmircookie2.install'
284
--- debian/libmircookie1.install	2015-09-08 21:22:41 +0000
285
+++ debian/libmircookie2.install	2016-01-25 13:42:04 +0000
286
@@ -1,1 +1,1 @@
288
1
/usr/lib/*/libmircookie.so.1
1
/usr/lib/*/libmircookie.so.2
289
2
2
290
=== modified file 'include/client/mir/events/event_builders.h'
291
--- include/client/mir/events/event_builders.h	2016-01-23 03:16:06 +0000
292
+++ include/client/mir/events/event_builders.h	2016-01-25 13:42:04 +0000
293
@@ -28,6 +28,7 @@
294
28
#include <memory>
28
#include <memory>
295
29
#include <functional>
29
#include <functional>
296
30
#include <chrono>
30
#include <chrono>
297
31
#include <vector>
298
31
32
299
32
namespace mir
33
namespace mir
300
33
{
34
{
301
@@ -58,13 +59,18 @@
302
58
59
303
59
// Key event
60
// Key event
304
60
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
61
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
306
61
    uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
62
    std::vector<uint8_t> const& cookie, MirKeyboardAction action, xkb_keysym_t key_code,
307
62
    int scan_code, MirInputEventModifiers modifiers);
63
    int scan_code, MirInputEventModifiers modifiers);
308
63
64
309
64
void set_modifier(MirEvent& event, MirInputEventModifiers modifiers);
65
void set_modifier(MirEvent& event, MirInputEventModifiers modifiers);
310
65
void set_cursor_position(MirEvent& event, mir::geometry::Point const& pos);
66
void set_cursor_position(MirEvent& event, mir::geometry::Point const& pos);
311
66
void set_button_state(MirEvent& event, MirPointerButtons button_state);
67
void set_button_state(MirEvent& event, MirPointerButtons button_state);
312
67
68
313
69
// Deprecated version with uint64_t mac
314
70
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
315
71
    uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
316
72
    int scan_code, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
317
73
318
68
// Deprecated version without mac
74
// Deprecated version without mac
319
69
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
75
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
320
70
    MirKeyboardAction action, xkb_keysym_t key_code,
76
    MirKeyboardAction action, xkb_keysym_t key_code,
321
@@ -72,7 +78,11 @@
322
72
78
323
73
// Touch event
79
// Touch event
324
74
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
80
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
326
75
    uint64_t mac, MirInputEventModifiers modifiers);
81
    std::vector<uint8_t> const& mac, MirInputEventModifiers modifiers);
327
82
328
83
// Deprecated version with uint64_t mac
329
84
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
330
85
    uint64_t mac, MirInputEventModifiers modifiers) __attribute__ ((deprecated));
331
76
86
332
77
// Deprecated version without mac
87
// Deprecated version without mac
333
78
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
88
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
334
@@ -98,12 +108,20 @@
335
98
    float hscroll_value, float vscroll_value) __attribute__ ((deprecated));
108
    float hscroll_value, float vscroll_value) __attribute__ ((deprecated));
336
99
109
337
100
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
110
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
339
101
    uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
111
    std::vector<uint8_t> const& mac, MirInputEventModifiers modifiers, MirPointerAction action,
340
102
    MirPointerButtons buttons_pressed,
112
    MirPointerButtons buttons_pressed,
341
103
    float x_axis_value, float y_axis_value,
113
    float x_axis_value, float y_axis_value,
342
104
    float hscroll_value, float vscroll_value,
114
    float hscroll_value, float vscroll_value,
343
105
    float relative_x_value, float relative_y_value);
115
    float relative_x_value, float relative_y_value);
344
106
116
345
117
// Deprecated version with uint64_t mac
346
118
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
347
119
    uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
348
120
    MirPointerButtons buttons_pressed,
349
121
    float x_axis_value, float y_axis_value,
350
122
    float hscroll_value, float vscroll_value,
351
123
    float relative_x_value, float relative_y_value) __attribute__ ((deprecated));
352
124
353
107
// Deprecated version without mac
125
// Deprecated version without mac
354
108
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
126
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
355
109
    MirInputEventModifiers modifiers, MirPointerAction action,
127
    MirInputEventModifiers modifiers, MirPointerAction action,
356
110
128
357
=== modified file 'include/client/mir_toolkit/events/event.h'
358
--- include/client/mir_toolkit/events/event.h	2016-01-22 19:03:16 +0000
359
+++ include/client/mir_toolkit/events/event.h	2016-01-25 13:42:04 +0000
360
@@ -58,6 +58,8 @@
361
58
typedef struct MirInputConfigurationEvent MirInputConfigurationEvent;
58
typedef struct MirInputConfigurationEvent MirInputConfigurationEvent;
362
59
typedef struct MirSurfaceOutputEvent MirSurfaceOutputEvent;
59
typedef struct MirSurfaceOutputEvent MirSurfaceOutputEvent;
363
60
60
364
61
typedef struct MirCookie MirCookie;
365
62
366
61
typedef union MirEvent MirEvent;
63
typedef union MirEvent MirEvent;
367
62
64
368
63
#ifdef __cplusplus
65
#ifdef __cplusplus
369
64
66
370
=== modified file 'include/client/mir_toolkit/events/input/input_event.h'
371
--- include/client/mir_toolkit/events/input/input_event.h	2016-01-20 23:59:18 +0000
372
+++ include/client/mir_toolkit/events/input/input_event.h	2016-01-25 13:42:04 +0000
373
@@ -1,5 +1,5 @@
374
1
/*
1
/*
376
2
 * Copyright © 2014 Canonical Ltd.
2
 * Copyright © 2014-2016 Canonical Ltd.
377
3
 *
3
 *
378
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
379
5
 * under the terms of the GNU Lesser General Public License version 3,
5
 * under the terms of the GNU Lesser General Public License version 3,
380
@@ -22,6 +22,7 @@
381
22
#include "mir_toolkit/events/event.h"
22
#include "mir_toolkit/events/event.h"
382
23
23
383
24
#include <stdint.h>
24
#include <stdint.h>
384
25
#include <stdbool.h>
385
25
26
386
26
#ifdef __cplusplus
27
#ifdef __cplusplus
387
27
/**
28
/**
388
@@ -132,6 +133,22 @@
389
132
 */
133
 */
390
133
MirPointerEvent const* mir_input_event_get_pointer_event(MirInputEvent const* ev);
134
MirPointerEvent const* mir_input_event_get_pointer_event(MirInputEvent const* ev);
391
134
135
392
136
/* Query if an input event contains a cookie
393
137
 *
394
138
 * \params[in] ev The input event
395
139
 * \return        True if the input event contains a cookie
396
140
 */
397
141
bool mir_input_event_has_cookie(MirInputEvent const* ev);
398
142
399
143
/* Returns the cookie associated with an input event.
400
144
 *
401
145
 * \pre The input event must have a MirCookie
402
146
 * \params[in] ev An input event
403
147
 * \return        The cookie associated with the given input event
404
148
 *                The cookie must be released by calling mir_cookie_release
405
149
 */
406
150
MirCookie const* mir_input_event_get_cookie(MirInputEvent const* ev);
407
151
408
135
#ifdef __cplusplus
152
#ifdef __cplusplus
409
136
}
153
}
410
137
/**@}*/
154
/**@}*/
411
138
155
412
=== modified file 'include/client/mir_toolkit/mir_client_library.h'
413
--- include/client/mir_toolkit/mir_client_library.h	2015-04-28 07:54:10 +0000
414
+++ include/client/mir_toolkit/mir_client_library.h	2016-01-25 13:42:04 +0000
415
@@ -25,5 +25,6 @@
416
25
#include <mir_toolkit/version.h>
25
#include <mir_toolkit/version.h>
417
26
#include <mir_toolkit/mir_platform_message.h>
26
#include <mir_toolkit/mir_platform_message.h>
418
27
#include <mir_toolkit/cursors.h>
27
#include <mir_toolkit/cursors.h>
419
28
#include <mir_toolkit/mir_cookie.h>
420
28
29
421
29
#endif /* MIR_CLIENT_LIBRARY_H */
30
#endif /* MIR_CLIENT_LIBRARY_H */
422
30
31
423
=== added file 'include/client/mir_toolkit/mir_cookie.h'
424
--- include/client/mir_toolkit/mir_cookie.h	1970-01-01 00:00:00 +0000
425
+++ include/client/mir_toolkit/mir_cookie.h	2016-01-25 13:42:04 +0000
426
@@ -0,0 +1,71 @@
427
1
/*
428
2
* Copyright © 2016 Canonical Ltd.
429
3
 *
430
4
 * This program is free software: you can redistribute it and/or modify it
431
5
 * under the terms of the GNU Lesser General Public License version 3,
432
6
 * as published by the Free Software Foundation.
433
7
 *
434
8
 * This program is distributed in the hope that it will be useful,
435
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
436
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
437
11
 * GNU Lesser General Public License for more details.
438
12
 *
439
13
 * You should have received a copy of the GNU Lesser General Public License
440
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
441
15
 *
442
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
443
17
 */
444
18
445
19
#ifndef MIR_TOOLKIT_MIR_COOKIE_H_
446
20
#define MIR_TOOLKIT_MIR_COOKIE_H_
447
21
448
22
#include <stdint.h>
449
23
450
24
#ifdef __cplusplus
451
25
/**
452
26
 * \addtogroup mir_toolkit
453
27
 * @{
454
28
 */
455
29
extern "C" {
456
30
#endif
457
31
458
32
/* Queries the size needed to serialize a given cookie
459
33
 *
460
34
 * \params[in] cookie A cookie instance
461
35
 * \return            The size of the serialized representation of the given cookie
462
36
 */
463
37
size_t mir_cookie_buffer_size(MirCookie const* cookie);
464
38
465
39
/* Serializes a cookie into the given buffer
466
40
 *
467
41
 * \pre The size must be equal to mir_cookie_size
468
42
 * \params[in] cookie A cookie instance
469
43
 * \params[in] buffer A buffer which is filled with the serialized representation
470
44
                      of the given cookie
471
45
 * \params[in] size   The size of the given buffer
472
46
 */
473
47
void mir_cookie_to_buffer(MirCookie const* cookie, void* buffer, size_t size);
474
48
475
49
/* Create a cookie from a serialized representation
476
50
 *
477
51
 * \params[in] buffer The buffer containing a serialized cookie.
478
52
 *                    The buffer may be freed immediately after this call.
479
53
 * \return            A MirCookie instance. The instance must be released
480
54
 *                    with a call to mir_cookie_release.
481
55
 *                    NULL will be returned if the buffer and size don't describe
482
56
 *                    the contents of a MirCookie.
483
57
 */
484
58
MirCookie const* mir_cookie_from_buffer(void const* buffer, size_t size);
485
59
486
60
/* Release the MirCookie
487
61
 *
488
62
 * \params[in] cookie The cookie to release
489
63
 */
490
64
void mir_cookie_release(MirCookie const* cookie);
491
65
492
66
#ifdef __cplusplus
493
67
}
494
68
/**@}*/
495
69
#endif
496
70
497
71
#endif // MIR_TOOLKIT_MIR_COOKIE_H_
498
0
72
499
=== modified file 'include/client/mir_toolkit/mir_surface.h'
500
--- include/client/mir_toolkit/mir_surface.h	2016-01-20 23:59:18 +0000
501
+++ include/client/mir_toolkit/mir_surface.h	2016-01-25 13:42:04 +0000
502
@@ -756,6 +756,15 @@
503
756
 */
756
 */
504
757
MirPersistentId* mir_persistent_id_from_string(char const* string_representation);
757
MirPersistentId* mir_persistent_id_from_string(char const* string_representation);
505
758
758
506
759
/*
507
760
* Attempts to raise the surface to the front.
508
761
*
509
762
* \param [in] surface The surface to raise
510
763
* \param [in] cookie  A cookie instance obtained from an input event.
511
764
*                     An invalid cookie will terminate the client connection.
512
765
*/
513
766
void mir_surface_raise(MirSurface* surface, MirCookie const* cookie);
514
767
515
759
#ifdef __cplusplus
768
#ifdef __cplusplus
516
760
}
769
}
517
761
/**@}*/
770
/**@}*/
518
762
771
519
=== added directory 'include/cookie/mir/cookie'
520
=== renamed file 'include/cookie/mir/cookie_factory.h' => 'include/cookie/mir/cookie/authority.h'
521
--- include/cookie/mir/cookie_factory.h	2016-01-20 23:59:18 +0000
522
+++ include/cookie/mir/cookie/authority.h	2016-01-25 13:42:04 +0000
523
@@ -1,5 +1,5 @@
524
1
/*
1
/*
526
2
 * Copyright © 2015 Canonical Ltd.
2
 * Copyright © 2015-2016 Canonical Ltd.
527
3
 *
3
 *
528
4
 * This program is free software: you can redistribute it and/or modify
4
 * This program is free software: you can redistribute it and/or modify
529
5
 * it under the terms of the GNU General Public License version 3 as
5
 * it under the terms of the GNU General Public License version 3 as
530
@@ -14,22 +14,29 @@
531
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
532
15
 *
15
 *
533
16
 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
16
 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
534
17
 *              Brandon Schaefer <brandon.schaefer@canonical.com>
535
17
 */
18
 */
536
18
19
541
19
#ifndef MIR_COOKIE_COOKIE_FACTORY_H_
20
#ifndef MIR_COOKIE_AUTHORITY_H_
542
20
#define MIR_COOKIE_COOKIE_FACTORY_H_
21
#define MIR_COOKIE_AUTHORITY_H_
539
21
540
22
#include "mir_toolkit/cookie.h"
543
23
22
544
24
#include <memory>
23
#include <memory>
545
24
#include <stdexcept>
546
25
#include <vector>
25
#include <vector>
547
26
26
548
27
#include "mir/cookie/cookie.h"
549
28
550
27
namespace mir
29
namespace mir
551
28
{
30
{
552
29
namespace cookie
31
namespace cookie
553
30
{
32
{
554
31
using Secret = std::vector<uint8_t>;
33
using Secret = std::vector<uint8_t>;
555
32
34
556
35
struct SecurityCheckError : std::runtime_error
557
36
{
558
37
    SecurityCheckError();
559
38
};
560
39
561
33
/**
40
/**
562
34
 * \brief A source of moderately-difficult-to-spoof cookies.
41
 * \brief A source of moderately-difficult-to-spoof cookies.
563
35
 *
42
 *
564
@@ -41,7 +48,7 @@
565
41
 * to attempt to bypass focus stealing prevention.
48
 * to attempt to bypass focus stealing prevention.
566
42
 *
49
 *
567
43
 */
50
 */
569
44
class CookieFactory
51
class Authority
570
45
{
52
{
571
46
public:
53
public:
572
47
    /**
54
    /**
573
@@ -54,60 +61,60 @@
574
54
    static size_t optimal_secret_size();
61
    static size_t optimal_secret_size();
575
55
62
576
56
    /**
63
    /**
578
57
    *   Construction function used to create a CookieFactory. The secret size must be
64
    *   Construction function used to create an Authority. The secret size must be
579
58
    *   no less then minimum_secret_size otherwise an exception will be thrown
65
    *   no less then minimum_secret_size otherwise an exception will be thrown
580
59
    *
66
    *
583
60
    *   \param [in] secret  A filled in secret used to set the key for the hash function
67
    *   \param [in] secret  A secret used to set the key for the hash function
584
61
    *   \return             A unique_ptr CookieFactory
68
    *   \return             An Authority
585
62
    */
69
    */
587
63
    static std::unique_ptr<CookieFactory> create_from_secret(Secret const& secret);
70
    static std::unique_ptr<Authority> create_from(Secret const& secret);
588
64
71
589
65
    /**
72
    /**
591
66
    *   Construction function used to create a CookieFactory as well as a secret.
73
    *   Construction function used to create an Authority as well as a secret.
592
67
    *
74
    *
593
68
    *   \param [out] save_secret  The secret that was created.
75
    *   \param [out] save_secret  The secret that was created.
631
69
    *   \return                   A unique_ptr CookieFactory
76
    *   \return                   An Authority
632
70
    */
77
    */
633
71
    static std::unique_ptr<CookieFactory> create_saving_secret(Secret& save_secret);
78
    static std::unique_ptr<Authority> create_saving(Secret& save_secret);
634
72
79
635
73
    /**
80
    /**
636
74
    *   Construction function used to create a CookieFactory and a secret which it keeps internally.
81
    *   Construction function used to create an Authority and a secret which it keeps internally.
637
75
    *
82
    *
638
76
    *   \return                   A unique_ptr CookieFactory
83
    *   \return                   An Authority
639
77
    */
84
    */
640
78
    static std::unique_ptr<CookieFactory> create_keeping_secret();
85
    static std::unique_ptr<Authority> create();
641
79
86
642
80
    CookieFactory(CookieFactory const& factory) = delete;
87
    Authority(Authority const& authority) = delete;
643
81
    CookieFactory& operator=(CookieFactory const& factory) = delete;
88
    Authority& operator=(Authority const& authority) = delete;
644
82
    virtual ~CookieFactory() noexcept = default;
89
    virtual ~Authority() noexcept = default;
645
83
90
646
84
    /**
91
    /**
647
85
    *   Turns a timestamp into a MAC and returns a MirCookie.
92
    * Creates a cookie from a timestamp.
648
86
    *
93
    *
649
87
    *   \param [in] timestamp The timestamp
94
    * \param [in] timestamp A timestamp
650
88
    *   \return               MirCookie with the stored MAC and timestamp
95
    * \return               A cookie instance
651
89
    */
96
    */
652
90
    virtual MirCookie timestamp_to_cookie(uint64_t const& timestamp) = 0;
97
    virtual std::unique_ptr<Cookie> make_cookie(uint64_t const& timestamp) = 0;
653
91
98
654
92
    /**
99
    /**
655
93
    *   Checks that a MirCookie is a valid MirCookie.
100
    * Creates a cookie from a serialized representation
656
94
    *
101
    *
657
95
    *   \param [in] cookie  A created MirCookie
102
    * \param [in] blob A blob of bytes representing a serialized cookie
658
96
    *   \return             True when the MirCookie is valid, False when the MirCookie is not valid
103
    * \return          A cookie instance
659
97
    */
104
    */
660
98
    virtual bool attest_timestamp(MirCookie const& cookie) = 0;
105
    virtual std::unique_ptr<Cookie> make_cookie(std::vector<uint8_t> const& raw_cookie) = 0;
661
99
106
662
100
    /**
107
    /**
663
101
     * Absolute minimum size of secret key the CookieFactory will accept.
108
    * Absolute minimum size of secret key the Authority will accept.
664
102
     *
109
    *
665
103
     * Code should be using optimum_secret_size(); this minimum size is provided
110
    * Code should be using optimum_secret_size(); this minimum size is provided
666
104
     * as a user convenience to guard against catastrophically bad initialisation.
111
    * as a user convenience to guard against catastrophically bad initialisation.
667
105
     */
112
    */
668
106
    static unsigned const minimum_secret_size = 8;
113
    static unsigned const minimum_secret_size = 8;
669
107
protected:
114
protected:
671
108
    CookieFactory() = default;
115
    Authority() = default;
672
109
};
116
};
673
110
117
674
111
}
118
}
675
112
}
119
}
677
113
#endif // MIR_COOKIE_COOKIE_FACTORY_H_
120
#endif // MIR_COOKIE_COOKIE_AUTHORITY_H_
678
114
121
679
=== added file 'include/cookie/mir/cookie/cookie.h'
680
--- include/cookie/mir/cookie/cookie.h	1970-01-01 00:00:00 +0000
681
+++ include/cookie/mir/cookie/cookie.h	2016-01-25 13:42:04 +0000
682
@@ -0,0 +1,57 @@
683
1
/*
684
2
 * Copyright © 2016 Canonical Ltd.
685
3
 *
686
4
 * This program is free software: you can redistribute it and/or modify
687
5
 * it under the terms of the GNU General Public License version 3 as
688
6
 * published by the Free Software Foundation.
689
7
 *
690
8
 * This program is distributed in the hope that it will be useful,
691
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
692
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
693
11
 * GNU General Public License for more details.
694
12
 *
695
13
 * You should have received a copy of the GNU General Public License
696
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
697
15
 *
698
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
699
17
 */
700
18
701
19
#ifndef MIR_COOKIE_COOKIE_H_
702
20
#define MIR_COOKIE_COOKIE_H_
703
21
704
22
#include <stdint.h>
705
23
#include <vector>
706
24
707
25
namespace mir
708
26
{
709
27
namespace cookie
710
28
{
711
29
712
30
class Cookie
713
31
{
714
32
public:
715
33
    Cookie() = default;
716
34
    virtual ~Cookie() = default;
717
35
718
36
    Cookie(Cookie const& cookie) = delete;
719
37
    Cookie& operator=(Cookie const& cookie) = delete;
720
38
721
39
    /**
722
40
    *  Returns the timestamp that the cookie is built with
723
41
    *
724
42
    *  \return  The timestamp
725
43
    */
726
44
    virtual uint64_t timestamp() const = 0;
727
45
728
46
    /**
729
47
    *  Converts the cookie into a stream of bytes.
730
48
    *
731
49
    *  \return  The stream of bytes formatted
732
50
    */
733
51
    virtual std::vector<uint8_t> serialize() const = 0;
734
52
};
735
53
736
54
}
737
55
}
738
56
739
57
#endif // MIR_COOKIE_COOKIE_H_
740
0
58
741
=== removed directory 'include/cookie/mir_toolkit'
742
=== modified file 'include/server/mir/server.h'
743
--- include/server/mir/server.h	2016-01-20 23:59:18 +0000
744
+++ include/server/mir/server.h	2016-01-25 13:42:04 +0000
745
@@ -37,7 +37,7 @@
746
37
namespace cookie
37
namespace cookie
747
38
{
38
{
748
39
using Secret = std::vector<uint8_t>;
39
using Secret = std::vector<uint8_t>;
750
40
class CookieFactory;
40
class Authority;
751
41
}
41
}
752
42
namespace shell
42
namespace shell
753
43
{
43
{
754
@@ -86,11 +86,11 @@
755
86
    /// This must remain valid while apply_settings() and run() are called.
86
    /// This must remain valid while apply_settings() and run() are called.
756
87
    void set_command_line(int argc, char const* argv[]);
87
    void set_command_line(int argc, char const* argv[]);
757
88
88
759
89
    /// Sets an override functor for creating the cookie factory.
89
    /// Sets an override functor for creating the cookie authority.
760
90
    /// A secret can be saved and any process this secret is shared
90
    /// A secret can be saved and any process this secret is shared
761
91
    /// with can verify Mir-generated cookies, or produce their own.
91
    /// with can verify Mir-generated cookies, or produce their own.
764
92
    void override_the_cookie_factory(
92
    void override_the_cookie_authority(
765
93
        std::function<std::shared_ptr<cookie::CookieFactory>()> const& cookie_factory_builder);
93
        std::function<std::shared_ptr<cookie::Authority>()> const& cookie_authority_builder);
766
94
94
767
95
    /// Applies any configuration options, hooks, or custom implementations.
95
    /// Applies any configuration options, hooks, or custom implementations.
768
96
    /// Must be called before calling run() or accessing any mir subsystems.
96
    /// Must be called before calling run() or accessing any mir subsystems.
769
97
97
770
=== modified file 'include/server/mir/shell/abstract_shell.h'
771
--- include/server/mir/shell/abstract_shell.h	2016-01-20 23:59:18 +0000
772
+++ include/server/mir/shell/abstract_shell.h	2016-01-25 13:42:04 +0000
773
@@ -71,7 +71,7 @@
774
71
        std::shared_ptr<scene::Surface> const& surface,
71
        std::shared_ptr<scene::Surface> const& surface,
775
72
        MirSurfaceAttrib attrib) override;
72
        MirSurfaceAttrib attrib) override;
776
73
73
778
74
    void raise_surface_with_timestamp(
74
    void raise_surface(
779
75
        std::shared_ptr<scene::Session> const& session,
75
        std::shared_ptr<scene::Session> const& session,
780
76
        std::shared_ptr<scene::Surface> const& surface,
76
        std::shared_ptr<scene::Surface> const& surface,
781
77
        uint64_t timestamp) override;
77
        uint64_t timestamp) override;
782
78
78
783
=== modified file 'include/server/mir/shell/shell.h'
784
--- include/server/mir/shell/shell.h	2016-01-20 23:59:18 +0000
785
+++ include/server/mir/shell/shell.h	2016-01-25 13:42:04 +0000
786
@@ -95,7 +95,7 @@
787
95
        std::shared_ptr<scene::Surface> const& surface,
95
        std::shared_ptr<scene::Surface> const& surface,
788
96
        MirSurfaceAttrib attrib) = 0;
96
        MirSurfaceAttrib attrib) = 0;
789
97
97
791
98
    virtual void raise_surface_with_timestamp(
98
    virtual void raise_surface(
792
99
        std::shared_ptr<scene::Session> const& session,
99
        std::shared_ptr<scene::Session> const& session,
793
100
        std::shared_ptr<scene::Surface> const& surface,
100
        std::shared_ptr<scene::Surface> const& surface,
794
101
        uint64_t timestamp) = 0;
101
        uint64_t timestamp) = 0;
795
102
102
796
=== modified file 'include/server/mir/shell/shell_wrapper.h'
797
--- include/server/mir/shell/shell_wrapper.h	2016-01-20 23:59:18 +0000
798
+++ include/server/mir/shell/shell_wrapper.h	2016-01-25 13:42:04 +0000
799
@@ -80,7 +80,7 @@
800
80
        std::shared_ptr<scene::Surface> const& surface,
80
        std::shared_ptr<scene::Surface> const& surface,
801
81
        MirSurfaceAttrib attrib) override;
81
        MirSurfaceAttrib attrib) override;
802
82
82
804
83
    void raise_surface_with_timestamp(
83
    void raise_surface(
805
84
        std::shared_ptr<scene::Session> const& session,
84
        std::shared_ptr<scene::Session> const& session,
806
85
        std::shared_ptr<scene::Surface> const& surface,
85
        std::shared_ptr<scene::Surface> const& surface,
807
86
        uint64_t timestamp) override;
86
        uint64_t timestamp) override;
808
87
87
809
=== modified file 'src/client/CMakeLists.txt'
810
--- src/client/CMakeLists.txt	2016-01-22 03:09:31 +0000
811
+++ src/client/CMakeLists.txt	2016-01-25 13:42:04 +0000
812
@@ -20,9 +20,9 @@
813
20
include_directories(
20
include_directories(
814
21
  ${PROTOBUF_INCLUDE_DIRS}
21
  ${PROTOBUF_INCLUDE_DIRS}
815
22
  ${CMAKE_CURRENT_BINARY_DIR}
22
  ${CMAKE_CURRENT_BINARY_DIR}
816
23
  ${PROJECT_SOURCE_DIR}/include/cookie
817
24
  ${PROJECT_SOURCE_DIR}/include/client
23
  ${PROJECT_SOURCE_DIR}/include/client
818
25
  ${PROJECT_SOURCE_DIR}/src/include/client
24
  ${PROJECT_SOURCE_DIR}/src/include/client
819
25
  ${PROJECT_SOURCE_DIR}/src/include/cookie
820
26
  ${DRM_INCLUDE_DIRS}
26
  ${DRM_INCLUDE_DIRS}
821
27
)
27
)
822
28
28
823
@@ -49,6 +49,7 @@
824
49
  event.cpp
49
  event.cpp
825
50
  event_printer.cpp
50
  event_printer.cpp
826
51
  mir_blob.cpp
51
  mir_blob.cpp
827
52
  mir_cookie.cpp
828
52
  mir_connection.cpp
53
  mir_connection.cpp
829
53
  mir_connection_api.cpp
54
  mir_connection_api.cpp
830
54
  mir_wait_handle.cpp
55
  mir_wait_handle.cpp
831
@@ -95,6 +96,7 @@
832
95
set(LINKS
96
set(LINKS
833
96
  mircommon
97
  mircommon
834
97
  mirprotobuf
98
  mirprotobuf
835
99
  mircookie
836
98
100
837
99
  ${XKBCOMMON_LIBRARIES}
101
  ${XKBCOMMON_LIBRARIES}
838
100
)
102
)
839
101
103
840
=== modified file 'src/client/events/event_builders.cpp'
841
--- src/client/events/event_builders.cpp	2016-01-23 03:16:06 +0000
842
+++ src/client/events/event_builders.cpp	2016-01-25 13:42:04 +0000
843
@@ -24,11 +24,14 @@
844
24
24
845
25
#include "mir/events/event_builders.h"
25
#include "mir/events/event_builders.h"
846
26
#include "mir/events/event_private.h"
26
#include "mir/events/event_private.h"
847
27
#include "mir/cookie/blob.h"
848
27
#include "mir/input/xkb_mapper.h"
28
#include "mir/input/xkb_mapper.h"
849
28
29
850
29
#include <string.h>
30
#include <string.h>
851
30
31
852
31
#include <boost/throw_exception.hpp>
32
#include <boost/throw_exception.hpp>
853
33
854
34
#include <algorithm>
855
32
#include <stdexcept>
35
#include <stdexcept>
856
33
36
857
34
namespace mi = mir::input;
37
namespace mi = mir::input;
858
@@ -36,6 +39,25 @@
859
36
namespace mev = mir::events;
39
namespace mev = mir::events;
860
37
namespace geom = mir::geometry;
40
namespace geom = mir::geometry;
861
38
41
862
42
namespace
863
43
{
864
44
    mir::cookie::Blob vector_to_cookie_as_blob(std::vector<uint8_t> const& vector)
865
45
    {
866
46
        mir::cookie::Blob blob{{}};
867
47
868
48
        if (vector.size() > blob.size())
869
49
        {
870
50
            throw std::runtime_error("Vector size " + std::to_string(vector.size()) +
871
51
                                     " is larger then array size: " +
872
52
                                     std::to_string(blob.size()));
873
53
        }
874
54
875
55
        std::copy_n(vector.begin(), vector.size(), blob.begin());
876
56
877
57
        return blob;
878
58
    }
879
59
}
880
60
881
39
mir::EventUPtr mev::make_event(mf::SurfaceId const& surface_id, MirOrientation orientation)
61
mir::EventUPtr mev::make_event(mf::SurfaceId const& surface_id, MirOrientation orientation)
882
40
{
62
{
883
41
    auto e = make_empty_event();
63
    auto e = make_empty_event();
884
@@ -137,7 +159,7 @@
885
137
}
159
}
886
138
160
887
139
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
161
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
889
140
    uint64_t mac, MirKeyboardAction action, xkb_keysym_t key_code,
162
    std::vector<uint8_t> const& cookie, MirKeyboardAction action, xkb_keysym_t key_code,
890
141
    int scan_code, MirInputEventModifiers modifiers)
163
    int scan_code, MirInputEventModifiers modifiers)
891
142
{
164
{
892
143
    auto e = make_empty_event();
165
    auto e = make_empty_event();
893
@@ -147,7 +169,7 @@
894
147
    kev.device_id = device_id;
169
    kev.device_id = device_id;
895
148
    kev.source_id = AINPUT_SOURCE_KEYBOARD;
170
    kev.source_id = AINPUT_SOURCE_KEYBOARD;
896
149
    kev.event_time = timestamp;
171
    kev.event_time = timestamp;
898
150
    kev.mac = mac;
172
    kev.cookie = vector_to_cookie_as_blob(cookie);
899
151
    kev.action = action;
173
    kev.action = action;
900
152
    kev.key_code = key_code;
174
    kev.key_code = key_code;
901
153
    kev.scan_code = scan_code;
175
    kev.scan_code = scan_code;
902
@@ -156,7 +178,6 @@
903
156
    return e;
178
    return e;
904
157
}
179
}
905
158
180
906
159
907
160
void mev::set_modifier(MirEvent& event, MirInputEventModifiers modifiers)
181
void mev::set_modifier(MirEvent& event, MirInputEventModifiers modifiers)
908
161
{
182
{
909
162
    switch(event.type)
183
    switch(event.type)
910
@@ -199,16 +220,24 @@
911
199
    event.motion.buttons = button_state;
220
    event.motion.buttons = button_state;
912
200
}
221
}
913
201
222
914
223
// Deprecated version with uint64_t mac
915
224
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
916
225
    uint64_t /*mac*/, MirKeyboardAction action, xkb_keysym_t key_code,
917
226
    int scan_code, MirInputEventModifiers modifiers)
918
227
{
919
228
    return make_event(device_id, timestamp, std::vector<uint8_t>{}, action, key_code, scan_code, modifiers);
920
229
}
921
230
922
202
// Deprecated version without mac
231
// Deprecated version without mac
923
203
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
232
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
924
204
    MirKeyboardAction action, xkb_keysym_t key_code,
233
    MirKeyboardAction action, xkb_keysym_t key_code,
925
205
    int scan_code, MirInputEventModifiers modifiers)
234
    int scan_code, MirInputEventModifiers modifiers)
926
206
{
235
{
928
207
    return make_event(device_id, timestamp, 0, action, key_code, scan_code, modifiers);
236
    return make_event(device_id, timestamp, std::vector<uint8_t>{}, action, key_code, scan_code, modifiers);
929
208
}
237
}
930
209
238
931
210
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
239
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
933
211
    uint64_t mac, MirInputEventModifiers modifiers)
240
    std::vector<uint8_t> const& cookie, MirInputEventModifiers modifiers)
934
212
{
241
{
935
213
    auto e = make_empty_event();
242
    auto e = make_empty_event();
936
214
243
937
@@ -216,18 +245,25 @@
938
216
    auto& mev = e->motion;
245
    auto& mev = e->motion;
939
217
    mev.device_id = device_id;
246
    mev.device_id = device_id;
940
218
    mev.event_time = timestamp;
247
    mev.event_time = timestamp;
942
219
    mev.mac = mac;
248
    mev.cookie = vector_to_cookie_as_blob(cookie);
943
220
    mev.modifiers = modifiers;
249
    mev.modifiers = modifiers;
944
221
    mev.source_id = AINPUT_SOURCE_TOUCHSCREEN;
250
    mev.source_id = AINPUT_SOURCE_TOUCHSCREEN;
945
222
251
946
223
    return e;
252
    return e;
947
224
}
253
}
948
225
254
949
255
// Deprecated version with uint64_t mac
950
256
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
951
257
    uint64_t /*mac*/, MirInputEventModifiers modifiers)
952
258
{
953
259
    return make_event(device_id, timestamp, std::vector<uint8_t>{}, modifiers);
954
260
}
955
261
956
226
// Deprecated version without mac
262
// Deprecated version without mac
957
227
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
263
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
958
228
    MirInputEventModifiers modifiers)
264
    MirInputEventModifiers modifiers)
959
229
{
265
{
961
230
    return make_event(device_id, timestamp, 0, modifiers);
266
    return make_event(device_id, timestamp, std::vector<uint8_t>{}, modifiers);
962
231
}
267
}
963
232
268
964
233
void mev::add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,
269
void mev::add_touch(MirEvent &event, MirTouchId touch_id, MirTouchAction action,
965
@@ -248,7 +284,7 @@
966
248
}
284
}
967
249
285
968
250
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
286
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
970
251
    uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
287
    std::vector<uint8_t> const& cookie, MirInputEventModifiers modifiers, MirPointerAction action,
971
252
    MirPointerButtons buttons_pressed,                               
288
    MirPointerButtons buttons_pressed,                               
972
253
    float x_axis_value, float y_axis_value,
289
    float x_axis_value, float y_axis_value,
973
254
    float hscroll_value, float vscroll_value,
290
    float hscroll_value, float vscroll_value,
974
@@ -260,7 +296,7 @@
975
260
    auto& mev = e->motion;
296
    auto& mev = e->motion;
976
261
    mev.device_id = device_id;
297
    mev.device_id = device_id;
977
262
    mev.event_time = timestamp;
298
    mev.event_time = timestamp;
979
263
    mev.mac = mac;
299
    mev.cookie = vector_to_cookie_as_blob(cookie);
980
264
    mev.modifiers = modifiers;
300
    mev.modifiers = modifiers;
981
265
    mev.source_id = AINPUT_SOURCE_MOUSE;
301
    mev.source_id = AINPUT_SOURCE_MOUSE;
982
266
    mev.buttons = buttons_pressed;
302
    mev.buttons = buttons_pressed;
983
@@ -278,6 +314,19 @@
984
278
    return e;
314
    return e;
985
279
}
315
}
986
280
316
987
317
// Deprecated version with uint64_t mac
988
318
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
989
319
    uint64_t /*mac*/, MirInputEventModifiers modifiers, MirPointerAction action,
990
320
    MirPointerButtons buttons_pressed,                               
991
321
    float x_axis_value, float y_axis_value,
992
322
    float hscroll_value, float vscroll_value,
993
323
    float relative_x_value, float relative_y_value)
994
324
{
995
325
    return make_event(device_id, timestamp, std::vector<uint8_t>{}, modifiers, action,
996
326
                      buttons_pressed, x_axis_value, y_axis_value, hscroll_value,
997
327
                      vscroll_value, relative_x_value, relative_y_value);
998
328
}
999
329
1000
281
// Deprecated version without mac
330
// Deprecated version without mac
1001
282
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
331
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
1002
283
    MirInputEventModifiers modifiers, MirPointerAction action,
332
    MirInputEventModifiers modifiers, MirPointerAction action,
1003
@@ -286,19 +335,19 @@
1004
286
    float hscroll_value, float vscroll_value,
335
    float hscroll_value, float vscroll_value,
1005
287
    float relative_x_value, float relative_y_value)
336
    float relative_x_value, float relative_y_value)
1006
288
{
337
{
1008
289
    return make_event(device_id, timestamp, 0, modifiers, action,
338
    return make_event(device_id, timestamp, std::vector<uint8_t>{}, modifiers, action,
1009
290
                      buttons_pressed, x_axis_value, y_axis_value, hscroll_value,
339
                      buttons_pressed, x_axis_value, y_axis_value, hscroll_value,
1010
291
                      vscroll_value, relative_x_value, relative_y_value);
340
                      vscroll_value, relative_x_value, relative_y_value);
1011
292
}
341
}
1012
293
342
1013
294
// Deprecated version without relative axis
343
// Deprecated version without relative axis
1014
295
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
344
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
1016
296
    uint64_t mac, MirInputEventModifiers modifiers, MirPointerAction action,
345
    uint64_t /*mac*/, MirInputEventModifiers modifiers, MirPointerAction action,
1017
297
    MirPointerButtons buttons_pressed,                               
346
    MirPointerButtons buttons_pressed,                               
1018
298
    float x_axis_value, float y_axis_value,
347
    float x_axis_value, float y_axis_value,
1019
299
    float hscroll_value, float vscroll_value)
348
    float hscroll_value, float vscroll_value)
1020
300
{
349
{
1022
301
    return make_event(device_id, timestamp, mac, modifiers, action, buttons_pressed,
350
    return make_event(device_id, timestamp, std::vector<uint8_t>{}, modifiers, action, buttons_pressed,
1023
302
                      x_axis_value, y_axis_value, hscroll_value, vscroll_value, 0, 0);
351
                      x_axis_value, y_axis_value, hscroll_value, vscroll_value, 0, 0);
1024
303
}
352
}
1025
304
353
1026
@@ -309,7 +358,7 @@
1027
309
    float x_axis_value, float y_axis_value,
358
    float x_axis_value, float y_axis_value,
1028
310
    float hscroll_value, float vscroll_value)
359
    float hscroll_value, float vscroll_value)
1029
311
{
360
{
1031
312
    return make_event(device_id, timestamp, 0, modifiers, action, buttons_pressed,
361
    return make_event(device_id, timestamp, std::vector<uint8_t>{}, modifiers, action, buttons_pressed,
1032
313
                      x_axis_value, y_axis_value, hscroll_value, vscroll_value, 0, 0);
362
                      x_axis_value, y_axis_value, hscroll_value, vscroll_value, 0, 0);
1033
314
}
363
}
1034
315
364
1035
316
365
1036
=== modified file 'src/client/input/android/android_input_lexicon.cpp'
1037
--- src/client/input/android/android_input_lexicon.cpp	2016-01-20 23:59:18 +0000
1038
+++ src/client/input/android/android_input_lexicon.cpp	2016-01-25 13:42:04 +0000
1039
@@ -20,6 +20,7 @@
1040
20
#include "mir/input/android/android_input_lexicon.h"
20
#include "mir/input/android/android_input_lexicon.h"
1041
21
#include "mir/input/android/event_conversion_helpers.h"
21
#include "mir/input/android/event_conversion_helpers.h"
1042
22
#include "mir/events/event_builders.h"
22
#include "mir/events/event_builders.h"
1043
23
#include "mir/cookie/blob.h"
1044
23
24
1045
24
#include <androidfw/Input.h>
25
#include <androidfw/Input.h>
1046
25
26
1047
@@ -38,9 +39,10 @@
1048
38
        case AINPUT_EVENT_TYPE_KEY:
39
        case AINPUT_EVENT_TYPE_KEY:
1049
39
        {
40
        {
1050
40
            auto kev = static_cast<const droidinput::KeyEvent*>(android_event);
41
            auto kev = static_cast<const droidinput::KeyEvent*>(android_event);
1051
42
            auto const cookie = kev->getCookieAsBlob();
1052
41
            return mev::make_event(MirInputDeviceId(android_event->getDeviceId()),
43
            return mev::make_event(MirInputDeviceId(android_event->getDeviceId()),
1053
42
                                   kev->getEventTime(),
44
                                   kev->getEventTime(),
1055
43
                                   kev->getMac(),
45
                                   {std::begin(cookie), std::end(cookie)},
1056
44
                                   mia::mir_keyboard_action_from_android(kev->getAction(), kev->getRepeatCount()),
46
                                   mia::mir_keyboard_action_from_android(kev->getAction(), kev->getRepeatCount()),
1057
45
                                   kev->getKeyCode(),
47
                                   kev->getKeyCode(),
1058
46
                                   kev->getScanCode(),
48
                                   kev->getScanCode(),
1059
@@ -51,9 +53,10 @@
1060
51
            if (mia::android_source_id_is_pointer_device(android_event->getSource()))
53
            if (mia::android_source_id_is_pointer_device(android_event->getSource()))
1061
52
            {
54
            {
1062
53
                auto mev = static_cast<const droidinput::MotionEvent*>(android_event);
55
                auto mev = static_cast<const droidinput::MotionEvent*>(android_event);
1063
56
                auto const cookie = mev->getCookieAsBlob();
1064
54
                return mev::make_event(MirInputDeviceId(android_event->getDeviceId()),
57
                return mev::make_event(MirInputDeviceId(android_event->getDeviceId()),
1065
55
                                       mev->getEventTime(),
58
                                       mev->getEventTime(),
1067
56
                                       mev->getMac(),
59
                                       {std::begin(cookie), std::end(cookie)},
1068
57
                                       mia::mir_modifiers_from_android(mev->getMetaState()),
60
                                       mia::mir_modifiers_from_android(mev->getMetaState()),
1069
58
                                       mia::mir_pointer_action_from_masked_android(mev->getAction() & AMOTION_EVENT_ACTION_MASK),
61
                                       mia::mir_pointer_action_from_masked_android(mev->getAction() & AMOTION_EVENT_ACTION_MASK),
1070
59
                                       mia::mir_pointer_buttons_from_android(mev->getButtonState()),
62
                                       mia::mir_pointer_buttons_from_android(mev->getButtonState()),
1071
@@ -66,9 +69,10 @@
1072
66
            else
69
            else
1073
67
            {
70
            {
1074
68
                auto mev = static_cast<const droidinput::MotionEvent*>(android_event);
71
                auto mev = static_cast<const droidinput::MotionEvent*>(android_event);
1075
72
                auto const cookie = mev->getCookieAsBlob();
1076
69
                auto ev = mev::make_event(MirInputDeviceId(android_event->getDeviceId()),
73
                auto ev = mev::make_event(MirInputDeviceId(android_event->getDeviceId()),
1077
70
                                          mev->getEventTime(),
74
                                          mev->getEventTime(),
1079
71
                                          mev->getMac(),
75
                                          {std::begin(cookie), std::end(cookie)},
1080
72
                                          mia::mir_modifiers_from_android(mev->getMetaState()));
76
                                          mia::mir_modifiers_from_android(mev->getMetaState()));
1081
73
                auto action = mev->getAction();
77
                auto action = mev->getAction();
1082
74
                size_t index_with_action = (action & AMOTION_EVENT_ACTION_POINTER_INDEX_MASK) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
78
                size_t index_with_action = (action & AMOTION_EVENT_ACTION_POINTER_INDEX_MASK) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
1083
75
79
1084
=== modified file 'src/client/input/input_event.cpp'
1085
--- src/client/input/input_event.cpp	2016-01-20 23:59:18 +0000
1086
+++ src/client/input/input_event.cpp	2016-01-25 13:42:04 +0000
1087
@@ -1,5 +1,5 @@
1088
1
/*
1
/*
1090
2
 * Copyright © 2014 Canonical Ltd.
2
 * Copyright © 2014-2016 Canonical Ltd.
1091
3
 *
3
 *
1092
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
1093
5
 * under the terms of the GNU Lesser General Public License version 3,
5
 * under the terms of the GNU Lesser General Public License version 3,
1094
@@ -18,9 +18,16 @@
1095
18
18
1096
19
#define MIR_LOG_COMPONENT "input-event-access"
19
#define MIR_LOG_COMPONENT "input-event-access"
1097
20
20
1098
21
#include "mir/cookie/cookie.h"
1099
21
#include "mir/event_type_to_string.h"
22
#include "mir/event_type_to_string.h"
1100
22
#include "mir/events/event_private.h"
23
#include "mir/events/event_private.h"
1101
23
#include "mir/log.h"
24
#include "mir/log.h"
1102
25
#include "mir/require.h"
1103
26
#include "mir_toolkit/mir_cookie.h"
1104
27
1105
28
#include "../mir_cookie.h"
1106
29
1107
30
#include <string.h>
1108
24
31
1109
25
namespace ml = mir::logging;
32
namespace ml = mir::logging;
1110
26
33
1111
@@ -395,3 +402,92 @@
1112
395
       abort();
402
       abort();
1113
396
   }
403
   }
1114
397
}
404
}
1115
405
1116
406
bool mir_input_event_has_cookie(MirInputEvent const* ev)
1117
407
{
1118
408
    switch (mir_input_event_get_type(ev))
1119
409
    {
1120
410
        case mir_input_event_type_key:
1121
411
            return true;
1122
412
        case mir_input_event_type_pointer:
1123
413
        {
1124
414
            auto const pev = mir_input_event_get_pointer_event(ev);
1125
415
            auto const pev_action = mir_pointer_event_action(pev);
1126
416
            return (pev_action == mir_pointer_action_button_up ||
1127
417
                    pev_action == mir_pointer_action_button_down);
1128
418
        }
1129
419
        case mir_input_event_type_touch:
1130
420
        {
1131
421
            auto const tev = mir_input_event_get_touch_event(ev);
1132
422
            auto const point_count = mir_touch_event_point_count(tev);
1133
423
            for (size_t i = 0; i < point_count; i++)
1134
424
            {
1135
425
                auto const tev_action = mir_touch_event_action(tev, i);
1136
426
                if (tev_action == mir_touch_action_up ||
1137
427
                    tev_action == mir_touch_action_down)
1138
428
                {
1139
429
                    return true;
1140
430
                }
1141
431
            }
1142
432
            break;
1143
433
        }
1144
434
    }
1145
435
1146
436
    return false;
1147
437
}
1148
438
1149
439
size_t mir_cookie_buffer_size(MirCookie const* cookie) try
1150
440
{
1151
441
    return cookie->size();
1152
442
} catch (...)
1153
443
{
1154
444
    abort();
1155
445
}
1156
446
1157
447
MirCookie const* mir_input_event_get_cookie(MirInputEvent const* iev) try
1158
448
{
1159
449
    auto const ev = old_ev_from_new(iev);
1160
450
1161
451
    switch (ev->type)
1162
452
    {
1163
453
    case mir_event_type_motion:
1164
454
        return new MirCookie(ev->motion.cookie);
1165
455
    case mir_event_type_key:
1166
456
        return new MirCookie(ev->key.cookie);
1167
457
    default:
1168
458
    {
1169
459
        mir::log_critical("expected a key or motion events, type was: " + mir::event_type_to_string(ev->type));
1170
460
        abort();
1171
461
    }
1172
462
    }
1173
463
} catch (...)
1174
464
{
1175
465
    abort();
1176
466
}
1177
467
1178
468
void mir_cookie_to_buffer(MirCookie const* cookie, void* buffer, size_t size) try
1179
469
{
1180
470
    return cookie->copy_to(buffer, size);
1181
471
} catch (...)
1182
472
{
1183
473
    abort();
1184
474
}
1185
475
1186
476
MirCookie const* mir_cookie_from_buffer(void const* buffer, size_t size) try
1187
477
{
1188
478
    if (size != mir::cookie::default_blob_size)
1189
479
        return NULL;
1190
480
1191
481
    return new MirCookie(buffer, size);
1192
482
} catch (...)
1193
483
{
1194
484
    abort();
1195
485
}
1196
486
1197
487
void mir_cookie_release(MirCookie const* cookie) try
1198
488
{
1199
489
    delete cookie;
1200
490
} catch (...)
1201
491
{
1202
492
    abort();
1203
493
}
1204
398
494
1205
=== added file 'src/client/mir_cookie.cpp'
1206
--- src/client/mir_cookie.cpp	1970-01-01 00:00:00 +0000
1207
+++ src/client/mir_cookie.cpp	2016-01-25 13:42:04 +0000
1208
@@ -0,0 +1,49 @@
1209
1
/*
1210
2
 * Copyright © 2016 Canonical Ltd.
1211
3
 *
1212
4
 * This program is free software: you can redistribute it and/or modify it
1213
5
 * under the terms of the GNU Lesser General Public License version 3,
1214
6
 * as published by the Free Software Foundation.
1215
7
 *
1216
8
 * This program is distributed in the hope that it will be useful,
1217
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1218
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1219
11
 * GNU Lesser General Public License for more details.
1220
12
 *
1221
13
 * You should have received a copy of the GNU Lesser General Public License
1222
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1223
15
 *
1224
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
1225
17
 */
1226
18
1227
19
#include "mir_cookie.h"
1228
20
1229
21
#include "mir/require.h"
1230
22
1231
23
#include <string.h>
1232
24
1233
25
MirCookie::MirCookie(void const* buffer, size_t size)
1234
26
{
1235
27
    memcpy(blob_.data(), buffer, size);
1236
28
}
1237
29
1238
30
MirCookie::MirCookie(mir::cookie::Blob const& blob) :
1239
31
    blob_(blob)
1240
32
{
1241
33
}
1242
34
1243
35
void MirCookie::copy_to(void* buffer, size_t size) const
1244
36
{
1245
37
    mir::require(size == blob_.size());
1246
38
    memcpy(buffer, blob_.data(), size);
1247
39
}
1248
40
1249
41
size_t MirCookie::size() const
1250
42
{
1251
43
    return blob_.size();
1252
44
}
1253
45
1254
46
mir::cookie::Blob MirCookie::blob() const
1255
47
{
1256
48
    return blob_;
1257
49
}
1258
0
50
1259
=== added file 'src/client/mir_cookie.h'
1260
--- src/client/mir_cookie.h	1970-01-01 00:00:00 +0000
1261
+++ src/client/mir_cookie.h	2016-01-25 13:42:04 +0000
1262
@@ -0,0 +1,40 @@
1263
1
/*
1264
2
 * Copyright © 2016 Canonical Ltd.
1265
3
 *
1266
4
 * This program is free software: you can redistribute it and/or modify it
1267
5
 * under the terms of the GNU Lesser General Public License version 3,
1268
6
 * as published by the Free Software Foundation.
1269
7
 *
1270
8
 * This program is distributed in the hope that it will be useful,
1271
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1272
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1273
11
 * GNU Lesser General Public License for more details.
1274
12
 *
1275
13
 * You should have received a copy of the GNU Lesser General Public License
1276
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1277
15
 *
1278
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
1279
17
 */
1280
18
1281
19
1282
20
#ifndef MIR_CLIENT_MIR_COOKIE_H_
1283
21
#define MIR_CLIENT_MIR_COOKIE_H_
1284
22
1285
23
#include "mir/cookie/blob.h"
1286
24
1287
25
class MirCookie
1288
26
{
1289
27
public:
1290
28
    explicit MirCookie(void const* buffer, size_t size);
1291
29
    explicit MirCookie(mir::cookie::Blob const& blob);
1292
30
1293
31
    void copy_to(void* buffer, size_t size) const;
1294
32
    size_t size() const;
1295
33
1296
34
    mir::cookie::Blob blob() const;
1297
35
1298
36
private:
1299
37
    mir::cookie::Blob blob_;
1300
38
};
1301
39
1302
40
#endif // MIR_CLIENT_MIR_COOKIE_H_
1303
0
41
1304
=== modified file 'src/client/mir_surface.cpp'
1305
--- src/client/mir_surface.cpp	2016-01-23 03:16:06 +0000
1306
+++ src/client/mir_surface.cpp	2016-01-25 13:42:04 +0000
1307
@@ -29,7 +29,8 @@
1308
29
#include "mir/dispatch/threaded_dispatcher.h"
29
#include "mir/dispatch/threaded_dispatcher.h"
1309
30
#include "mir/input/input_platform.h"
30
#include "mir/input/input_platform.h"
1310
31
#include "mir/input/xkb_mapper.h"
31
#include "mir/input/xkb_mapper.h"
1312
32
#include "mir_toolkit/cookie.h"
32
#include "mir/cookie/cookie.h"
1313
33
#include "mir_cookie.h"
1314
33
34
1315
34
#include <cassert>
35
#include <cassert>
1316
35
#include <unistd.h>
36
#include <unistd.h>
1317
@@ -485,7 +486,7 @@
1318
485
    return configure(mir_surface_attrib_preferred_orientation, mode);
486
    return configure(mir_surface_attrib_preferred_orientation, mode);
1319
486
}
487
}
1320
487
488
1322
488
void MirSurface::raise_surface_with_cookie(MirCookie const& cookie)
489
void MirSurface::raise_surface(MirCookie const* cookie)
1323
489
{
490
{
1324
490
    mp::RaiseRequest raise_request;
491
    mp::RaiseRequest raise_request;
1325
491
492
1326
@@ -494,10 +495,9 @@
1327
494
495
1328
495
    auto const event_cookie = raise_request.mutable_cookie();
496
    auto const event_cookie = raise_request.mutable_cookie();
1329
496
497
1332
497
    event_cookie->set_timestamp(cookie.timestamp);
498
    event_cookie->set_cookie(cookie->blob().data(), cookie->size());
1331
498
    event_cookie->set_mac(cookie.mac);
1333
499
499
1335
500
    server->raise_surface_with_cookie(
500
    server->raise_surface(
1336
501
        &raise_request,
501
        &raise_request,
1337
502
        void_response.get(),
502
        void_response.get(),
1338
503
        google::protobuf::NewCallback(google::protobuf::DoNothing));
503
        google::protobuf::NewCallback(google::protobuf::DoNothing));
1339
504
504
1340
=== modified file 'src/client/mir_surface.h'
1341
--- src/client/mir_surface.h	2016-01-20 23:59:18 +0000
1342
+++ src/client/mir_surface.h	2016-01-25 13:42:04 +0000
1343
@@ -31,7 +31,6 @@
1344
31
#include "mir_toolkit/common.h"
31
#include "mir_toolkit/common.h"
1345
32
#include "mir_toolkit/mir_client_library.h"
32
#include "mir_toolkit/mir_client_library.h"
1346
33
#include "mir/graphics/native_buffer.h"
33
#include "mir/graphics/native_buffer.h"
1347
34
#include "mir/cookie_factory.h"
1348
35
34
1349
36
#include <memory>
35
#include <memory>
1350
37
#include <functional>
36
#include <functional>
1351
@@ -175,7 +174,7 @@
1352
175
    MirOrientation get_orientation() const;
174
    MirOrientation get_orientation() const;
1353
176
    MirWaitHandle* set_preferred_orientation(MirOrientationMode mode);
175
    MirWaitHandle* set_preferred_orientation(MirOrientationMode mode);
1354
177
176
1356
178
    void raise_surface_with_cookie(MirCookie const& cookie);
177
    void raise_surface(MirCookie const* cookie);
1357
179
178
1358
180
    MirWaitHandle* configure_cursor(MirCursorConfiguration const* cursor);
179
    MirWaitHandle* configure_cursor(MirCursorConfiguration const* cursor);
1359
181
180
1360
182
181
1361
=== modified file 'src/client/mir_surface_api.cpp'
1362
--- src/client/mir_surface_api.cpp	2016-01-20 23:59:18 +0000
1363
+++ src/client/mir_surface_api.cpp	2016-01-25 13:42:04 +0000
1364
@@ -20,7 +20,6 @@
1365
20
20
1366
21
#include "mir_toolkit/mir_surface.h"
21
#include "mir_toolkit/mir_surface.h"
1367
22
#include "mir_toolkit/mir_wait.h"
22
#include "mir_toolkit/mir_wait.h"
1368
23
#include "mir_toolkit/cookie.h"
1369
24
#include "mir/require.h"
23
#include "mir/require.h"
1370
25
24
1371
26
#include "mir_connection.h"
25
#include "mir_connection.h"
1372
@@ -486,13 +485,13 @@
1373
486
    return result;
485
    return result;
1374
487
}
486
}
1375
488
487
1377
489
void mir_surface_raise_with_cookie(MirSurface* surf, MirCookie const cookie)
488
void mir_surface_raise(MirSurface* surf, MirCookie const* cookie)
1378
490
{
489
{
1379
491
    mir::require(mir_surface_is_valid(surf));
490
    mir::require(mir_surface_is_valid(surf));
1380
492
491
1381
493
    try
492
    try
1382
494
    {
493
    {
1384
495
        surf->raise_surface_with_cookie(cookie);
494
        surf->raise_surface(cookie);
1385
496
    }
495
    }
1386
497
    catch (std::exception const& ex)
496
    catch (std::exception const& ex)
1387
498
    {
497
    {
1388
499
498
1389
=== modified file 'src/client/rpc/mir_display_server.cpp'
1390
--- src/client/rpc/mir_display_server.cpp	2016-01-20 23:59:18 +0000
1391
+++ src/client/rpc/mir_display_server.cpp	2016-01-25 13:42:04 +0000
1392
@@ -210,7 +210,7 @@
1393
210
{
210
{
1394
211
    channel->call_method(std::string(__func__), request, response, done);
211
    channel->call_method(std::string(__func__), request, response, done);
1395
212
}
212
}
1397
213
void mclr::DisplayServer::raise_surface_with_cookie(
213
void mclr::DisplayServer::raise_surface(
1398
214
    mir::protobuf::RaiseRequest const* request,
214
    mir::protobuf::RaiseRequest const* request,
1399
215
    mir::protobuf::Void* response,
215
    mir::protobuf::Void* response,
1400
216
    google::protobuf::Closure* done)
216
    google::protobuf::Closure* done)
1401
217
217
1402
=== modified file 'src/client/rpc/mir_display_server.h'
1403
--- src/client/rpc/mir_display_server.h	2016-01-20 23:59:18 +0000
1404
+++ src/client/rpc/mir_display_server.h	2016-01-25 13:42:04 +0000
1405
@@ -139,7 +139,7 @@
1406
139
        mir::protobuf::StreamConfiguration const* request,
139
        mir::protobuf::StreamConfiguration const* request,
1407
140
        mir::protobuf::Void* response,
140
        mir::protobuf::Void* response,
1408
141
        google::protobuf::Closure* done) override;
141
        google::protobuf::Closure* done) override;
1410
142
    void raise_surface_with_cookie(
142
    void raise_surface(
1411
143
        mir::protobuf::RaiseRequest const* request,
143
        mir::protobuf::RaiseRequest const* request,
1412
144
        mir::protobuf::Void* response,
144
        mir::protobuf::Void* response,
1413
145
        google::protobuf::Closure* done) override;
145
        google::protobuf::Closure* done) override;
1414
146
146
1415
=== modified file 'src/client/symbols.map'
1416
--- src/client/symbols.map	2016-01-23 03:16:06 +0000
1417
+++ src/client/symbols.map	2016-01-25 13:42:04 +0000
1418
@@ -210,6 +210,13 @@
1419
210
MIR_CLIENT_unreleased {
210
MIR_CLIENT_unreleased {
1420
211
  global:
211
  global:
1421
212
    mir_connection_get_graphics_module;
212
    mir_connection_get_graphics_module;
1422
213
    mir_surface_raise;
1423
214
    mir_input_event_has_cookie;
1424
215
    mir_cookie_buffer_size;
1425
216
    mir_input_event_get_cookie;
1426
217
    mir_cookie_to_buffer;
1427
218
    mir_cookie_from_buffer;
1428
219
    mir_cookie_release;
1429
213
    mir_keymap_event_get_keymap_buffer;
220
    mir_keymap_event_get_keymap_buffer;
1430
214
    mir_keymap_event_get_device_id;
221
    mir_keymap_event_get_device_id;
1431
215
  local:
222
  local:
1432
216
223
1433
=== modified file 'src/cookie/CMakeLists.txt'
1434
--- src/cookie/CMakeLists.txt	2016-01-22 03:09:31 +0000
1435
+++ src/cookie/CMakeLists.txt	2016-01-25 13:42:04 +0000
1436
@@ -12,17 +12,19 @@
1437
12
)
12
)
1438
13
13
1439
14
include_directories(
14
include_directories(
1440
15
  ${PROJECT_SOURCE_DIR}/src/include/cookie
1441
15
  ${PROJECT_SOURCE_DIR}/include/cookie
16
  ${PROJECT_SOURCE_DIR}/include/cookie
1442
16
  ${NETTLE_INCLUDE_DIRS}
17
  ${NETTLE_INCLUDE_DIRS}
1443
17
)
18
)
1444
18
19
1446
19
set(MIRCOOKIE_ABI 1)
20
set(MIRCOOKIE_ABI 2)
1447
20
set(symbol_map ${CMAKE_SOURCE_DIR}/src/cookie/symbols.map)
21
set(symbol_map ${CMAKE_SOURCE_DIR}/src/cookie/symbols.map)
1448
21
22
1449
22
mir_add_library_with_symbols(mircookie SHARED
23
mir_add_library_with_symbols(mircookie SHARED
1450
23
24
1451
24
  ${symbol_map}
25
  ${symbol_map}
1453
25
  cookie_factory.cpp
26
  authority.cpp
1454
27
  hmac_cookie.cpp
1455
26
)
28
)
1456
27
29
1457
28
set_target_properties(mircookie
30
set_target_properties(mircookie
1458
@@ -41,7 +43,7 @@
1459
41
  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
43
  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
1460
42
44
1461
43
install(
45
install(
1463
44
  DIRECTORY ${CMAKE_SOURCE_DIR}/include/cookie/mir ${CMAKE_SOURCE_DIR}/include/cookie/mir_toolkit
46
  DIRECTORY ${CMAKE_SOURCE_DIR}/include/cookie/mir
1464
45
  DESTINATION "include/mircookie"
47
  DESTINATION "include/mircookie"
1465
46
)
48
)
1466
47
49
1467
48
50
1468
=== renamed file 'src/cookie/cookie_factory.cpp' => 'src/cookie/authority.cpp'
1469
--- src/cookie/cookie_factory.cpp	2016-01-20 23:59:18 +0000
1470
+++ src/cookie/authority.cpp	2016-01-25 13:42:04 +0000
1471
@@ -1,5 +1,5 @@
1472
1
/*
1
/*
1474
2
 * Copyright © 2015 Canonical Ltd.
2
 * Copyright © 2015-2016 Canonical Ltd.
1475
3
 *
3
 *
1476
4
 * This program is free software: you can redistribute it and/or modify
4
 * This program is free software: you can redistribute it and/or modify
1477
5
 * it under the terms of the GNU General Public License version 3 as
5
 * it under the terms of the GNU General Public License version 3 as
1478
@@ -14,9 +14,13 @@
1479
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1480
15
 *
15
 *
1481
16
 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
16
 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
1482
17
 *              Brandon Schaefer <brandon.schaefer@canonical.com>
1483
17
 */
18
 */
1484
18
19
1486
19
#include "mir/cookie_factory.h"
20
#include "mir/cookie/authority.h"
1487
21
#include "mir/cookie/blob.h"
1488
22
#include "hmac_cookie.h"
1489
23
#include "format.h"
1490
20
24
1491
21
#include <algorithm>
25
#include <algorithm>
1492
22
#include <random>
26
#include <random>
1493
@@ -29,6 +33,7 @@
1494
29
#include <sys/stat.h>
33
#include <sys/stat.h>
1495
30
#include <fcntl.h>
34
#include <fcntl.h>
1496
31
#include <sys/select.h>
35
#include <sys/select.h>
1497
36
#include <string.h>
1498
32
37
1499
33
#include <boost/throw_exception.hpp>
38
#include <boost/throw_exception.hpp>
1500
34
39
1501
@@ -37,6 +42,19 @@
1502
37
std::string const random_device_path{"/dev/random"};
42
std::string const random_device_path{"/dev/random"};
1503
38
std::string const urandom_device_path{"/dev/urandom"};
43
std::string const urandom_device_path{"/dev/urandom"};
1504
39
int const wait_seconds{30};
44
int const wait_seconds{30};
1505
45
1506
46
size_t cookie_size_from_format(mir::cookie::Format const& format)
1507
47
{
1508
48
    switch (format)
1509
49
    {
1510
50
        case mir::cookie::Format::hmac_sha_1_8:
1511
51
            return mir::cookie::default_blob_size;
1512
52
        default:
1513
53
            break;
1514
54
    }
1515
55
1516
56
    return 0;
1517
57
}
1518
40
}
58
}
1519
41
59
1520
42
static mir::cookie::Secret get_random_data(unsigned size)
60
static mir::cookie::Secret get_random_data(unsigned size)
1521
@@ -94,10 +112,15 @@
1522
94
    return buffer;
112
    return buffer;
1523
95
}
113
}
1524
96
114
1526
97
class CookieFactoryNettle : public mir::cookie::CookieFactory
115
mir::cookie::SecurityCheckError::SecurityCheckError() :
1527
116
    runtime_error("Invalid Cookie")
1528
117
{
1529
118
}
1530
119
1531
120
class AuthorityNettle : public mir::cookie::Authority
1532
98
{
121
{
1533
99
public:
122
public:
1535
100
    CookieFactoryNettle(mir::cookie::Secret const& secret)
123
    AuthorityNettle(mir::cookie::Secret const& secret)
1536
101
    {
124
    {
1537
102
        if (secret.size() < minimum_secret_size)
125
        if (secret.size() < minimum_secret_size)
1538
103
            BOOST_THROW_EXCEPTION(std::logic_error("Secret size " + std::to_string(secret.size()) + " is to small, require " +
126
            BOOST_THROW_EXCEPTION(std::logic_error("Secret size " + std::to_string(secret.size()) + " is to small, require " +
1539
@@ -106,41 +129,83 @@
1540
106
        hmac_sha1_set_key(&ctx, secret.size(), secret.data());
129
        hmac_sha1_set_key(&ctx, secret.size(), secret.data());
1541
107
    }
130
    }
1542
108
131
1549
109
    virtual ~CookieFactoryNettle() noexcept = default;
132
    virtual ~AuthorityNettle() noexcept = default;
1550
110
133
1551
111
    MirCookie timestamp_to_cookie(uint64_t const& timestamp) override
134
1552
112
    {
135
    std::unique_ptr<mir::cookie::Cookie> make_cookie(uint64_t const& timestamp) override
1553
113
        MirCookie cookie { timestamp, 0 };
136
    {
1554
114
        calculate_mac(cookie);
137
        return std::make_unique<mir::cookie::HMACCookie>(timestamp, calculate_cookie(timestamp), mir::cookie::Format::hmac_sha_1_8);
1555
138
    }
1556
139
1557
140
    std::unique_ptr<mir::cookie::Cookie> make_cookie(std::vector<uint8_t> const& raw_cookie) override
1558
141
    {
1559
142
        /*
1560
143
        SHA_1 Format:
1561
144
        1 byte  = FORMAT
1562
145
        8 btyes = TIMESTAMP
1563
146
        8 BYTES = MAC
1564
147
        */
1565
148
1566
149
        if (raw_cookie.size() != cookie_size_from_format(mir::cookie::Format::hmac_sha_1_8))
1567
150
        {
1568
151
           BOOST_THROW_EXCEPTION(mir::cookie::SecurityCheckError());
1569
152
        }
1570
153
1571
154
        mir::cookie::Format format = static_cast<mir::cookie::Format>(raw_cookie[0]);
1572
155
        if (format != mir::cookie::Format::hmac_sha_1_8)
1573
156
        {
1574
157
            BOOST_THROW_EXCEPTION(mir::cookie::SecurityCheckError());
1575
158
        }
1576
159
1577
160
        uint64_t timestamp = 0;
1578
161
1579
162
        auto ptr = raw_cookie.data();
1580
163
        ptr++;
1581
164
1582
165
        memcpy(&timestamp, ptr, 8);
1583
166
        ptr += sizeof(timestamp);
1584
167
1585
168
        // FIXME Soon to be 20 bytes
1586
169
        std::vector<uint8_t> mac(8);
1587
170
        memcpy(mac.data(), ptr, mac.size());
1588
171
1589
172
        std::unique_ptr<mir::cookie::Cookie> cookie =
1590
173
            std::make_unique<mir::cookie::HMACCookie>(timestamp, mac, mir::cookie::Format::hmac_sha_1_8);
1591
174
1592
175
        if (!verify_cookie(timestamp, cookie))
1593
176
        {
1594
177
            BOOST_THROW_EXCEPTION(mir::cookie::SecurityCheckError());
1595
178
        }
1596
179
1597
115
        return cookie;
180
        return cookie;
1598
116
    }
181
    }
1599
117
182
1600
118
    bool attest_timestamp(MirCookie const& cookie) override
1601
119
    {
1602
120
        return verify_mac(cookie);
1603
121
    }
1604
122
1605
123
private:
183
private:
1607
124
    void calculate_mac(MirCookie& cookie)
184
    std::vector<uint8_t> calculate_cookie(uint64_t const& timestamp)
1608
125
    {
185
    {
1611
126
        hmac_sha1_update(&ctx, sizeof(cookie.timestamp), reinterpret_cast<uint8_t*>(&cookie.timestamp));
186
        // FIXME Soon to change to 160bits, for now uint64_t
1612
127
        hmac_sha1_digest(&ctx, sizeof(cookie.mac), reinterpret_cast<uint8_t*>(&cookie.mac));
187
        std::vector<uint8_t> mac(sizeof(uint64_t));
1613
188
        hmac_sha1_update(&ctx, sizeof(timestamp), reinterpret_cast<uint8_t const*>(&timestamp));
1614
189
        hmac_sha1_digest(&ctx, sizeof(uint64_t), reinterpret_cast<uint8_t*>(mac.data()));
1615
190
1616
191
        return mac;
1617
128
    }
192
    }
1618
129
193
1620
130
    bool verify_mac(MirCookie const& cookie)
194
    bool verify_cookie(uint64_t const& timestamp, std::unique_ptr<mir::cookie::Cookie> const& cookie)
1621
131
    {
195
    {
1628
132
        decltype(cookie.mac) calculated_mac;
196
        auto const calculated_cookie = make_cookie(timestamp);
1629
133
        uint8_t* message = reinterpret_cast<uint8_t*>(const_cast<decltype(cookie.timestamp)*>(&cookie.timestamp));
197
1630
134
        hmac_sha1_update(&ctx, sizeof(cookie.timestamp), message);
198
        auto const this_stream  = cookie->serialize();
1631
135
        hmac_sha1_digest(&ctx, sizeof(calculated_mac), reinterpret_cast<uint8_t*>(&calculated_mac));
199
        auto const other_stream = calculated_cookie->serialize();
1632
136
200
1633
137
        return calculated_mac == cookie.mac;
201
        // FIXME Need to do a constant memcmp here!
1634
202
        return std::equal(std::begin(this_stream), std::end(this_stream), std::begin(other_stream));
1635
138
    }
203
    }
1636
139
204
1637
140
    struct hmac_sha1_ctx ctx;
205
    struct hmac_sha1_ctx ctx;
1638
141
};
206
};
1639
142
207
1641
143
size_t mir::cookie::CookieFactory::optimal_secret_size()
208
size_t mir::cookie::Authority::optimal_secret_size()
1642
144
{
209
{
1643
145
    // Secret keys smaller than this are internally zero-extended to this size.
210
    // Secret keys smaller than this are internally zero-extended to this size.
1644
146
    // Secret keys larger than this are internally hashed to this size.
211
    // Secret keys larger than this are internally hashed to this size.
1645
@@ -148,19 +213,19 @@
1646
148
    return hmac_sha1_block_size;
213
    return hmac_sha1_block_size;
1647
149
}
214
}
1648
150
215
1650
151
std::unique_ptr<mir::cookie::CookieFactory> mir::cookie::CookieFactory::create_from_secret(mir::cookie::Secret const& secret)
216
std::unique_ptr<mir::cookie::Authority> mir::cookie::Authority::create_from(mir::cookie::Secret const& secret)
1651
152
{
217
{
1653
153
  return std::make_unique<CookieFactoryNettle>(secret);
218
  return std::make_unique<AuthorityNettle>(secret);
1654
154
}
219
}
1655
155
220
1657
156
std::unique_ptr<mir::cookie::CookieFactory> mir::cookie::CookieFactory::create_saving_secret(mir::cookie::Secret& save_secret)
221
std::unique_ptr<mir::cookie::Authority> mir::cookie::Authority::create_saving(mir::cookie::Secret& save_secret)
1658
157
{
222
{
1659
158
  save_secret = get_random_data(optimal_secret_size());
223
  save_secret = get_random_data(optimal_secret_size());
1661
159
  return std::make_unique<CookieFactoryNettle>(save_secret);
224
  return std::make_unique<AuthorityNettle>(save_secret);
1662
160
}
225
}
1663
161
226
1665
162
std::unique_ptr<mir::cookie::CookieFactory> mir::cookie::CookieFactory::create_keeping_secret()
227
std::unique_ptr<mir::cookie::Authority> mir::cookie::Authority::create()
1666
163
{
228
{
1667
164
  auto secret = get_random_data(optimal_secret_size());
229
  auto secret = get_random_data(optimal_secret_size());
1669
165
  return std::make_unique<CookieFactoryNettle>(secret);
230
  return std::make_unique<AuthorityNettle>(secret);
1670
166
}
231
}
1671
167
232
1672
=== added file 'src/cookie/format.h'
1673
--- src/cookie/format.h	1970-01-01 00:00:00 +0000
1674
+++ src/cookie/format.h	2016-01-25 13:42:04 +0000
1675
@@ -0,0 +1,35 @@
1676
1
/*
1677
2
 * Copyright © 2016 Canonical Ltd.
1678
3
 *
1679
4
 * This program is free software: you can redistribute it and/or modify
1680
5
 * it under the terms of the GNU General Public License version 3 as
1681
6
 * published by the Free Software Foundation.
1682
7
 *
1683
8
 * This program is distributed in the hope that it will be useful,
1684
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1685
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1686
11
 * GNU General Public License for more details.
1687
12
 *
1688
13
 * You should have received a copy of the GNU General Public License
1689
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1690
15
 *
1691
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
1692
17
 */
1693
18
1694
19
#ifndef MIR_COOKIE_COOKIE_FORMAT_H_
1695
20
#define MIR_COOKIE_COOKIE_FORMAT_H_
1696
21
1697
22
#include <stdint.h>
1698
23
1699
24
namespace mir
1700
25
{
1701
26
namespace cookie
1702
27
{
1703
28
enum class Format : uint8_t
1704
29
{
1705
30
    hmac_sha_1_8,
1706
31
};
1707
32
}
1708
33
}
1709
34
1710
35
#endif // MIR_COOKIE_COOKIE_FORMAT_H_
1711
0
36
1712
=== added file 'src/cookie/hmac_cookie.cpp'
1713
--- src/cookie/hmac_cookie.cpp	1970-01-01 00:00:00 +0000
1714
+++ src/cookie/hmac_cookie.cpp	2016-01-25 13:42:04 +0000
1715
@@ -0,0 +1,53 @@
1716
1
/*
1717
2
 * Copyright © 2016 Canonical Ltd.
1718
3
 *
1719
4
 * This program is free software: you can redistribute it and/or modify
1720
5
 * it under the terms of the GNU General Public License version 3 as
1721
6
 * published by the Free Software Foundation.
1722
7
 *
1723
8
 * This program is distributed in the hope that it will be useful,
1724
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1725
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1726
11
 * GNU General Public License for more details.
1727
12
 *
1728
13
 * You should have received a copy of the GNU General Public License
1729
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1730
15
 *
1731
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
1732
17
 */
1733
18
1734
19
#include "hmac_cookie.h"
1735
20
1736
21
#include <string.h>
1737
22
1738
23
mir::cookie::HMACCookie::HMACCookie(uint64_t const& timestamp,
1739
24
                                    std::vector<uint8_t> const& mac,
1740
25
                                    mir::cookie::Format const& format) :
1741
26
    timestamp_(timestamp),
1742
27
    mac_(mac),
1743
28
    format_(format)
1744
29
{
1745
30
}
1746
31
1747
32
uint64_t mir::cookie::HMACCookie::timestamp() const
1748
33
{
1749
34
    return timestamp_;
1750
35
}
1751
36
1752
37
std::vector<uint8_t> mir::cookie::HMACCookie::serialize() const
1753
38
{
1754
39
    std::vector<uint8_t> serialized_cookie(sizeof(format_) + sizeof(timestamp_) + mac_.size());
1755
40
1756
41
    auto cookie_ptr = serialized_cookie.data();
1757
42
1758
43
    cookie_ptr[0] = static_cast<uint8_t>(format_);
1759
44
    cookie_ptr += sizeof(format_);
1760
45
1761
46
    auto timestamp_ptr = reinterpret_cast<uint8_t const*>(&timestamp_);
1762
47
    memcpy(cookie_ptr, timestamp_ptr, sizeof(timestamp_));
1763
48
    cookie_ptr += sizeof(timestamp_);
1764
49
1765
50
    memcpy(cookie_ptr, mac_.data(), mac_.size());
1766
51
    
1767
52
    return serialized_cookie;
1768
53
}
1769
0
54
1770
=== added file 'src/cookie/hmac_cookie.h'
1771
--- src/cookie/hmac_cookie.h	1970-01-01 00:00:00 +0000
1772
+++ src/cookie/hmac_cookie.h	2016-01-25 13:42:04 +0000
1773
@@ -0,0 +1,51 @@
1774
1
/*
1775
2
 * Copyright © 2016 Canonical Ltd.
1776
3
 *
1777
4
 * This program is free software: you can redistribute it and/or modify
1778
5
 * it under the terms of the GNU General Public License version 3 as
1779
6
 * published by the Free Software Foundation.
1780
7
 *
1781
8
 * This program is distributed in the hope that it will be useful,
1782
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1783
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1784
11
 * GNU General Public License for more details.
1785
12
 *
1786
13
 * You should have received a copy of the GNU General Public License
1787
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1788
15
 *
1789
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
1790
17
 */
1791
18
1792
19
#ifndef MIR_COOKIE_HMAC_COOKIE_H_
1793
20
#define MIR_COOKIE_HMAC_COOKIE_H_
1794
21
1795
22
#include "mir/cookie/cookie.h"
1796
23
#include "format.h"
1797
24
1798
25
namespace mir
1799
26
{
1800
27
namespace cookie
1801
28
{
1802
29
1803
30
class HMACCookie : public mir::cookie::Cookie
1804
31
{
1805
32
public:
1806
33
    HMACCookie() = delete;
1807
34
1808
35
    explicit HMACCookie(uint64_t const& timestamp,
1809
36
                        std::vector<uint8_t> const& mac,
1810
37
                        mir::cookie::Format const& format);
1811
38
1812
39
    uint64_t timestamp() const override;
1813
40
    std::vector<uint8_t> serialize() const override;
1814
41
1815
42
private:
1816
43
    uint64_t timestamp_;
1817
44
    std::vector<uint8_t> mac_;
1818
45
    mir::cookie::Format format_;
1819
46
};
1820
47
1821
48
}
1822
49
}
1823
50
1824
51
#endif // MIR_COOKIE_HMAC_COOKIE_H_
1825
0
52
1826
=== modified file 'src/cookie/symbols.map'
1827
--- src/cookie/symbols.map	2016-01-20 23:59:18 +0000
1828
+++ src/cookie/symbols.map	2016-01-25 13:42:04 +0000
1829
@@ -1,10 +1,10 @@
1831
1
MIR_COOKIE_1 {
1
MIR_COOKIE_2 {
1832
2
 global:
2
 global:
1833
3
  extern "C++" {
3
  extern "C++" {
1838
4
    mir::cookie::CookieFactory::optimal_secret_size*;
4
    mir::cookie::Authority::optimal_secret_size*;
1839
5
    mir::cookie::CookieFactory::create_from_secret*;
5
    mir::cookie::Authority::create_from*;
1840
6
    mir::cookie::CookieFactory::create_saving_secret*;
6
    mir::cookie::Authority::create_saving*;
1841
7
    mir::cookie::CookieFactory::create_keeping_secret*;
7
    mir::cookie::Authority::create*;
1842
8
  };
8
  };
1843
9
 local: *;
9
 local: *;
1844
10
};
10
};
1845
11
11
1846
=== modified file 'src/include/common/mir/events/event_private.h'
1847
--- src/include/common/mir/events/event_private.h	2016-01-23 03:16:06 +0000
1848
+++ src/include/common/mir/events/event_private.h	2016-01-25 13:42:04 +0000
1849
@@ -29,10 +29,10 @@
1850
29
#include <stdint.h>
29
#include <stdint.h>
1851
30
#include "mir_toolkit/event.h"
30
#include "mir_toolkit/event.h"
1852
31
#include "mir_toolkit/common.h"
31
#include "mir_toolkit/common.h"
1853
32
#include "mir/cookie/blob.h"
1854
32
33
1855
33
#include <xkbcommon/xkbcommon.h>
34
#include <xkbcommon/xkbcommon.h>
1858
34
#include <chrono>
35
#include <array>
1857
35
1859
36
#include <chrono>
36
#include <chrono>
1860
37
37
1861
38
#ifdef __cplusplus
38
#ifdef __cplusplus
1862
@@ -61,7 +61,7 @@
1863
61
    int32_t scan_code;
61
    int32_t scan_code;
1864
62
62
1865
63
    std::chrono::nanoseconds event_time;
63
    std::chrono::nanoseconds event_time;
1867
64
    uint64_t mac;
64
    mir::cookie::Blob cookie;
1868
65
};
65
};
1869
66
66
1870
67
typedef struct
67
typedef struct
1871
@@ -99,7 +99,7 @@
1872
99
99
1873
100
    MirPointerButtons buttons;
100
    MirPointerButtons buttons;
1874
101
    std::chrono::nanoseconds event_time;
101
    std::chrono::nanoseconds event_time;
1876
102
    uint64_t mac;
102
    mir::cookie::Blob cookie;
1877
103
103
1878
104
    size_t pointer_count;
104
    size_t pointer_count;
1879
105
    MirMotionPointer pointer_coordinates[MIR_INPUT_EVENT_MAX_POINTER_COUNT];
105
    MirMotionPointer pointer_coordinates[MIR_INPUT_EVENT_MAX_POINTER_COUNT];
1880
106
106
1881
=== modified file 'src/include/common/mir/protobuf/display_server.h'
1882
--- src/include/common/mir/protobuf/display_server.h	2016-01-20 23:59:18 +0000
1883
+++ src/include/common/mir/protobuf/display_server.h	2016-01-25 13:42:04 +0000
1884
@@ -135,7 +135,7 @@
1885
135
        mir::protobuf::StreamConfiguration const* request,
135
        mir::protobuf::StreamConfiguration const* request,
1886
136
        mir::protobuf::Void* response,
136
        mir::protobuf::Void* response,
1887
137
        google::protobuf::Closure* done) = 0;
137
        google::protobuf::Closure* done) = 0;
1889
138
    virtual void raise_surface_with_cookie(
138
    virtual void raise_surface(
1890
139
        mir::protobuf::RaiseRequest const* request,
139
        mir::protobuf::RaiseRequest const* request,
1891
140
        mir::protobuf::Void* response,
140
        mir::protobuf::Void* response,
1892
141
        google::protobuf::Closure* done) = 0;
141
        google::protobuf::Closure* done) = 0;
1893
142
142
1894
=== added directory 'src/include/cookie'
1895
=== added directory 'src/include/cookie/mir'
1896
=== added directory 'src/include/cookie/mir/cookie'
1897
=== renamed file 'include/cookie/mir_toolkit/cookie.h' => 'src/include/cookie/mir/cookie/blob.h'
1898
--- include/cookie/mir_toolkit/cookie.h	2015-09-17 08:57:46 +0000
1899
+++ src/include/cookie/mir/cookie/blob.h	2016-01-25 13:42:04 +0000
1900
@@ -1,5 +1,5 @@
1901
1
/*
1
/*
1903
2
 * Copyright © 2015 Canonical Ltd.
2
 * Copyright © 2015-2016 Canonical Ltd.
1904
3
 *
3
 *
1905
4
 * This program is free software: you can redistribute it and/or modify
4
 * This program is free software: you can redistribute it and/or modify
1906
5
 * it under the terms of the GNU General Public License version 3 as
5
 * it under the terms of the GNU General Public License version 3 as
1907
@@ -13,32 +13,21 @@
1908
13
 * You should have received a copy of the GNU General Public License
13
 * You should have received a copy of the GNU General Public License
1909
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1910
15
 *
15
 *
1940
16
 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
1941
17
 */
17
 */
1942
18
18
1943
19
#ifndef MIR_TOOLKIT_COOKIE_FACTORY_H_
19
#ifndef MIR_COOKIE_BLOB_H_
1944
20
#define MIR_TOOLKIT_COOKIE_FACTORY_H_
20
#define MIR_COOKIE_BLOB_H_
1945
21
21
1946
22
#include <stdint.h>
22
#include <array>
1947
23
23
1948
24
/**
24
namespace mir
1949
25
 * \addtogroup mir_toolkit
25
{
1950
26
 * @{
26
namespace cookie
1951
27
 */
27
{
1952
28
/* This is C code. Not C++. */
28
size_t const default_blob_size = 17;
1953
29
#ifdef __cplusplus
29
using Blob = std::array<uint8_t, default_blob_size>;
1954
30
extern "C" {
30
}
1955
31
#endif
31
}
1956
32
32
1957
33
typedef struct MirCookie
33
#endif // MIR_COOKIE_BLOB_H_
1929
34
{
1930
35
    uint64_t timestamp;
1931
36
    uint64_t mac;
1932
37
} MirCookie;
1933
38
1934
39
#ifdef __cplusplus
1935
40
}
1936
41
#endif
1937
42
/**@}*/
1938
43
1939
44
#endif // MIR_TOOLKIT_COOKIE_FACTORY_H_
1958
45
34
1959
=== modified file 'src/include/server/mir/default_server_configuration.h'
1960
--- src/include/server/mir/default_server_configuration.h	2016-01-20 23:59:18 +0000
1961
+++ src/include/server/mir/default_server_configuration.h	2016-01-25 13:42:04 +0000
1962
@@ -33,7 +33,7 @@
1963
33
33
1964
34
namespace cookie
34
namespace cookie
1965
35
{
35
{
1967
36
class CookieFactory;
36
class Authority;
1968
37
}
37
}
1969
38
namespace dispatch
38
namespace dispatch
1970
39
{
39
{
1971
@@ -170,7 +170,7 @@
1972
170
    std::shared_ptr<graphics::Platform>     the_graphics_platform() override;
170
    std::shared_ptr<graphics::Platform>     the_graphics_platform() override;
1973
171
    std::shared_ptr<input::InputDispatcher> the_input_dispatcher() override;
171
    std::shared_ptr<input::InputDispatcher> the_input_dispatcher() override;
1974
172
    std::shared_ptr<EmergencyCleanup>       the_emergency_cleanup() override;
172
    std::shared_ptr<EmergencyCleanup>       the_emergency_cleanup() override;
1976
173
    std::shared_ptr<cookie::CookieFactory>  the_cookie_factory() override;
173
    std::shared_ptr<cookie::Authority>      the_cookie_authority() override;
1977
174
    /**
174
    /**
1978
175
     * Function to call when a "fatal" error occurs. This implementation allows
175
     * Function to call when a "fatal" error occurs. This implementation allows
1979
176
     * the default strategy to be overridden by --on-fatal-error-abort to force a
176
     * the default strategy to be overridden by --on-fatal-error-abort to force a
1980
@@ -416,7 +416,7 @@
1981
416
    CachedPtr<shell::Shell> shell;
416
    CachedPtr<shell::Shell> shell;
1982
417
    CachedPtr<shell::ShellReport> shell_report;
417
    CachedPtr<shell::ShellReport> shell_report;
1983
418
    CachedPtr<scene::ApplicationNotRespondingDetector> application_not_responding_detector;
418
    CachedPtr<scene::ApplicationNotRespondingDetector> application_not_responding_detector;
1985
419
    CachedPtr<cookie::CookieFactory> cookie_factory;
419
    CachedPtr<cookie::Authority> cookie_authority;
1986
420
420
1987
421
private:
421
private:
1988
422
    std::shared_ptr<options::Configuration> const configuration_options;
422
    std::shared_ptr<options::Configuration> const configuration_options;
1989
423
423
1990
=== removed file 'src/include/server/mir/frontend/security_check_failed.h'
1991
--- src/include/server/mir/frontend/security_check_failed.h	2015-10-30 17:24:29 +0000
1992
+++ src/include/server/mir/frontend/security_check_failed.h	1970-01-01 00:00:00 +0000
1993
@@ -1,34 +0,0 @@
1994
1
/*
1995
2
 * Copyright © 2015 Canonical Ltd.
1996
3
 *
1997
4
 * This program is free software: you can redistribute it and/or modify
1998
5
 * it under the terms of the GNU General Public License version 3 as
1999
6
 * published by the Free Software Foundation.
2000
7
 *
2001
8
 * This program is distributed in the hope that it will be useful,
2002
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2003
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2004
11
 * GNU General Public License for more details.
2005
12
 *
2006
13
 * You should have received a copy of the GNU General Public License
2007
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2008
15
 *
2009
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
2010
17
 */
2011
18
2012
19
#ifndef MIR_SECURITY_CHECK_FAILED_H_
2013
20
#define MIR_SECURITY_CHECK_FAILED_H_
2014
21
2015
22
#include <stdexcept>
2016
23
2017
24
namespace mir
2018
25
{
2019
26
2020
27
struct SecurityCheckFailed : std::runtime_error
2021
28
{
2022
29
    SecurityCheckFailed();
2023
30
};
2024
31
2025
32
}
2026
33
2027
34
#endif /* MIR_SECURITY_CHECK_FAILED_H_ */
2028
35
0
2029
=== modified file 'src/include/server/mir/frontend/shell.h'
2030
--- src/include/server/mir/frontend/shell.h	2016-01-20 23:59:18 +0000
2031
+++ src/include/server/mir/frontend/shell.h	2016-01-25 13:42:04 +0000
2032
@@ -82,7 +82,7 @@
2033
82
        SurfaceId surface_id,
82
        SurfaceId surface_id,
2034
83
        MirSurfaceAttrib attrib) = 0;
83
        MirSurfaceAttrib attrib) = 0;
2035
84
84
2037
85
    virtual void raise_surface_with_timestamp(
85
    virtual void raise_surface(
2038
86
        std::shared_ptr<Session> const& session,
86
        std::shared_ptr<Session> const& session,
2039
87
        SurfaceId surface_id,
87
        SurfaceId surface_id,
2040
88
        uint64_t timestamp) = 0;
88
        uint64_t timestamp) = 0;
2041
89
89
2042
=== modified file 'src/include/server/mir/frontend/template_protobuf_message_processor.h'
2043
--- src/include/server/mir/frontend/template_protobuf_message_processor.h	2016-01-20 23:59:18 +0000
2044
+++ src/include/server/mir/frontend/template_protobuf_message_processor.h	2016-01-25 13:42:04 +0000
2045
@@ -21,7 +21,7 @@
2046
21
#define MIR_FRONTEND_TEMPLATE_PROTOBUF_MESSAGE_PROCESSOR_H_
21
#define MIR_FRONTEND_TEMPLATE_PROTOBUF_MESSAGE_PROCESSOR_H_
2047
22
22
2048
23
#include "mir/frontend/message_processor.h"
23
#include "mir/frontend/message_processor.h"
2050
24
#include "mir/frontend/security_check_failed.h"
24
#include "mir/cookie/authority.h"
2051
25
25
2052
26
#include <google/protobuf/stubs/common.h>
26
#include <google/protobuf/stubs/common.h>
2053
27
#include <boost/exception/diagnostic_information.hpp>
27
#include <boost/exception/diagnostic_information.hpp>
2054
@@ -76,7 +76,7 @@
2055
76
            &result_message,
76
            &result_message,
2056
77
            callback.get());
77
            callback.get());
2057
78
    }
78
    }
2059
79
    catch (mir::SecurityCheckFailed const& /*err*/)
79
    catch (mir::cookie::SecurityCheckError const& /*err*/)
2060
80
    {
80
    {
2061
81
        throw;
81
        throw;
2062
82
    }
82
    }
2063
83
83
2064
=== modified file 'src/include/server/mir/server_configuration.h'
2065
--- src/include/server/mir/server_configuration.h	2016-01-20 23:59:18 +0000
2066
+++ src/include/server/mir/server_configuration.h	2016-01-25 13:42:04 +0000
2067
@@ -24,7 +24,7 @@
2068
24
{
24
{
2069
25
namespace cookie
25
namespace cookie
2070
26
{
26
{
2072
27
class CookieFactory;
27
class Authority;
2073
28
}
28
}
2074
29
namespace compositor
29
namespace compositor
2075
30
{
30
{
2076
@@ -79,7 +79,7 @@
2077
79
    virtual std::shared_ptr<DisplayChanger> the_display_changer() = 0;
79
    virtual std::shared_ptr<DisplayChanger> the_display_changer() = 0;
2078
80
    virtual std::shared_ptr<graphics::Platform>  the_graphics_platform() = 0;
80
    virtual std::shared_ptr<graphics::Platform>  the_graphics_platform() = 0;
2079
81
    virtual std::shared_ptr<EmergencyCleanup> the_emergency_cleanup() = 0;
81
    virtual std::shared_ptr<EmergencyCleanup> the_emergency_cleanup() = 0;
2081
82
    virtual std::shared_ptr<cookie::CookieFactory> the_cookie_factory() = 0;
82
    virtual std::shared_ptr<cookie::Authority> the_cookie_authority() = 0;
2082
83
    virtual auto the_fatal_error_strategy() -> void (*)(char const* reason, ...) = 0;
83
    virtual auto the_fatal_error_strategy() -> void (*)(char const* reason, ...) = 0;
2083
84
    virtual std::shared_ptr<scene::ApplicationNotRespondingDetector> the_application_not_responding_detector() = 0;
84
    virtual std::shared_ptr<scene::ApplicationNotRespondingDetector> the_application_not_responding_detector() = 0;
2084
85
85
2085
86
86
2086
=== modified file 'src/protobuf/mir_protobuf.proto'
2087
--- src/protobuf/mir_protobuf.proto	2016-01-20 23:59:18 +0000
2088
+++ src/protobuf/mir_protobuf.proto	2016-01-25 13:42:04 +0000
2089
@@ -343,8 +343,7 @@
2090
343
}
343
}
2091
344
344
2092
345
message Cookie {
345
message Cookie {
2095
346
  required uint64 timestamp = 1;
346
  required bytes cookie = 1;
2094
347
  required uint64 mac = 2;
2096
348
}
347
}
2097
349
348
2098
350
message RaiseRequest {
349
message RaiseRequest {
2099
351
350
2100
=== modified file 'src/server/CMakeLists.txt'
2101
--- src/server/CMakeLists.txt	2016-01-22 03:09:31 +0000
2102
+++ src/server/CMakeLists.txt	2016-01-25 13:42:04 +0000
2103
@@ -14,6 +14,7 @@
2104
14
  ${PROJECT_SOURCE_DIR}/src/include/client
14
  ${PROJECT_SOURCE_DIR}/src/include/client
2105
15
  ${PROJECT_SOURCE_DIR}/src/include/server
15
  ${PROJECT_SOURCE_DIR}/src/include/server
2106
16
  ${PROJECT_SOURCE_DIR}/include/cookie
16
  ${PROJECT_SOURCE_DIR}/include/cookie
2107
17
  ${PROJECT_SOURCE_DIR}/src/include/cookie
2108
17
  ${GLIB_INCLUDE_DIRS}
18
  ${GLIB_INCLUDE_DIRS}
2109
18
)
19
)
2110
19
add_definitions(-DMIR_SERVER_INPUT_PLATFORM_VERSION="${MIR_SERVER_INPUT_PLATFORM_VERSION}")
20
add_definitions(-DMIR_SERVER_INPUT_PLATFORM_VERSION="${MIR_SERVER_INPUT_PLATFORM_VERSION}")
2111
20
21
2112
=== modified file 'src/server/default_server_configuration.cpp'
2113
--- src/server/default_server_configuration.cpp	2016-01-20 23:59:18 +0000
2114
+++ src/server/default_server_configuration.cpp	2016-01-25 13:42:04 +0000
2115
@@ -24,7 +24,7 @@
2116
24
#include "mir/default_server_status_listener.h"
24
#include "mir/default_server_status_listener.h"
2117
25
#include "mir/emergency_cleanup.h"
25
#include "mir/emergency_cleanup.h"
2118
26
#include "mir/default_configuration.h"
26
#include "mir/default_configuration.h"
2120
27
#include "mir/cookie_factory.h"
27
#include "mir/cookie/authority.h"
2121
28
28
2122
29
#include "mir/logging/dumb_console_logger.h"
29
#include "mir/logging/dumb_console_logger.h"
2123
30
#include "mir/options/program_option.h"
30
#include "mir/options/program_option.h"
2124
@@ -186,15 +186,15 @@
2125
186
        });
186
        });
2126
187
}
187
}
2127
188
188
2129
189
std::shared_ptr<mir::cookie::CookieFactory> mir::DefaultServerConfiguration::the_cookie_factory()
189
std::shared_ptr<mir::cookie::Authority> mir::DefaultServerConfiguration::the_cookie_authority()
2130
190
{
190
{
2132
191
    return cookie_factory(
191
    return cookie_authority(
2133
192
        []()
192
        []()
2134
193
        {
193
        {
2136
194
            static_assert(secret_size >= mir::cookie::CookieFactory::minimum_secret_size,
194
            static_assert(secret_size >= mir::cookie::Authority::minimum_secret_size,
2137
195
                          "Secret size is smaller then the minimum secret size");
195
                          "Secret size is smaller then the minimum secret size");
2138
196
196
2140
197
            return mir::cookie::CookieFactory::create_keeping_secret();
197
            return mir::cookie::Authority::create();
2141
198
        });
198
        });
2142
199
}
199
}
2143
200
200
2144
201
201
2145
=== modified file 'src/server/frontend/CMakeLists.txt'
2146
--- src/server/frontend/CMakeLists.txt	2016-01-20 23:59:18 +0000
2147
+++ src/server/frontend/CMakeLists.txt	2016-01-25 13:42:04 +0000
2148
@@ -28,7 +28,6 @@
2149
28
  reordering_message_sender.cpp
28
  reordering_message_sender.cpp
2150
29
  reordering_message_sender.h
29
  reordering_message_sender.h
2151
30
  event_sink_factory.h
30
  event_sink_factory.h
2152
31
  security_check_failed.cpp
2153
32
)
31
)
2154
33
32
2155
34
add_library(
33
add_library(
2156
35
34
2157
=== modified file 'src/server/frontend/default_configuration.cpp'
2158
--- src/server/frontend/default_configuration.cpp	2016-01-20 23:59:18 +0000
2159
+++ src/server/frontend/default_configuration.cpp	2016-01-25 13:42:04 +0000
2160
@@ -163,5 +163,5 @@
2161
163
                the_cursor_images(),
163
                the_cursor_images(),
2162
164
                the_coordinate_translator(),
164
                the_coordinate_translator(),
2163
165
                the_application_not_responding_detector(),
165
                the_application_not_responding_detector(),
2165
166
                the_cookie_factory());
166
                the_cookie_authority());
2166
167
}
167
}
2167
168
168
2168
=== modified file 'src/server/frontend/default_ipc_factory.cpp'
2169
--- src/server/frontend/default_ipc_factory.cpp	2016-01-20 23:59:18 +0000
2170
+++ src/server/frontend/default_ipc_factory.cpp	2016-01-25 13:42:04 +0000
2171
@@ -26,7 +26,7 @@
2172
26
#include "mir/frontend/session_authorizer.h"
26
#include "mir/frontend/session_authorizer.h"
2173
27
#include "mir/frontend/event_sink.h"
27
#include "mir/frontend/event_sink.h"
2174
28
#include "mir/graphics/graphic_buffer_allocator.h"
28
#include "mir/graphics/graphic_buffer_allocator.h"
2176
29
#include "mir/cookie_factory.h"
29
#include "mir/cookie/authority.h"
2177
30
30
2178
31
namespace mf = mir::frontend;
31
namespace mf = mir::frontend;
2179
32
namespace mg = mir::graphics;
32
namespace mg = mir::graphics;
2180
@@ -44,7 +44,7 @@
2181
44
    std::shared_ptr<mi::CursorImages> const& cursor_images,
44
    std::shared_ptr<mi::CursorImages> const& cursor_images,
2182
45
    std::shared_ptr<scene::CoordinateTranslator> const& translator,
45
    std::shared_ptr<scene::CoordinateTranslator> const& translator,
2183
46
    std::shared_ptr<scene::ApplicationNotRespondingDetector> const& anr_detector,
46
    std::shared_ptr<scene::ApplicationNotRespondingDetector> const& anr_detector,
2185
47
    std::shared_ptr<mir::cookie::CookieFactory> const& cookie_factory) :
47
    std::shared_ptr<mir::cookie::Authority> const& cookie_authority) :
2186
48
    shell(shell),
48
    shell(shell),
2187
49
    no_prompt_shell(std::make_shared<NoPromptShell>(shell)),
49
    no_prompt_shell(std::make_shared<NoPromptShell>(shell)),
2188
50
    sm_report(sm_report),
50
    sm_report(sm_report),
2189
@@ -57,7 +57,7 @@
2190
57
    cursor_images(cursor_images),
57
    cursor_images(cursor_images),
2191
58
    translator{translator},
58
    translator{translator},
2192
59
    anr_detector{anr_detector},
59
    anr_detector{anr_detector},
2194
60
    cookie_factory(cookie_factory)
60
    cookie_authority(cookie_authority)
2195
61
{
61
{
2196
62
}
62
}
2197
63
63
2198
@@ -132,5 +132,5 @@
2199
132
        cursor_images,
132
        cursor_images,
2200
133
        translator,
133
        translator,
2201
134
        anr_detector,
134
        anr_detector,
2203
135
        cookie_factory);
135
        cookie_authority);
2204
136
}
136
}
2205
137
137
2206
=== modified file 'src/server/frontend/default_ipc_factory.h'
2207
--- src/server/frontend/default_ipc_factory.h	2016-01-20 23:59:18 +0000
2208
+++ src/server/frontend/default_ipc_factory.h	2016-01-25 13:42:04 +0000
2209
@@ -25,7 +25,7 @@
2210
25
{
25
{
2211
26
namespace cookie
26
namespace cookie
2212
27
{
27
{
2214
28
class CookieFactory;
28
class Authority;
2215
29
}
29
}
2216
30
namespace graphics
30
namespace graphics
2217
31
{
31
{
2218
@@ -66,7 +66,7 @@
2219
66
        std::shared_ptr<input::CursorImages> const& cursor_images,
66
        std::shared_ptr<input::CursorImages> const& cursor_images,
2220
67
        std::shared_ptr<scene::CoordinateTranslator> const& translator,
67
        std::shared_ptr<scene::CoordinateTranslator> const& translator,
2221
68
        std::shared_ptr<scene::ApplicationNotRespondingDetector> const& anr_detector,
68
        std::shared_ptr<scene::ApplicationNotRespondingDetector> const& anr_detector,
2223
69
        std::shared_ptr<cookie::CookieFactory> const& cookie_factory);
69
        std::shared_ptr<cookie::Authority> const& cookie_authority);
2224
70
70
2225
71
    std::shared_ptr<detail::DisplayServer> make_ipc_server(
71
    std::shared_ptr<detail::DisplayServer> make_ipc_server(
2226
72
        SessionCredentials const &creds,
72
        SessionCredentials const &creds,
2227
@@ -101,7 +101,7 @@
2228
101
    std::shared_ptr<input::CursorImages> const cursor_images;
101
    std::shared_ptr<input::CursorImages> const cursor_images;
2229
102
    std::shared_ptr<scene::CoordinateTranslator> const translator;
102
    std::shared_ptr<scene::CoordinateTranslator> const translator;
2230
103
    std::shared_ptr<scene::ApplicationNotRespondingDetector> const anr_detector;
103
    std::shared_ptr<scene::ApplicationNotRespondingDetector> const anr_detector;
2232
104
    std::shared_ptr<cookie::CookieFactory> const cookie_factory;
104
    std::shared_ptr<cookie::Authority> const cookie_authority;
2233
105
};
105
};
2234
106
}
106
}
2235
107
}
107
}
2236
108
108
2237
=== modified file 'src/server/frontend/protobuf_message_processor.cpp'
2238
--- src/server/frontend/protobuf_message_processor.cpp	2016-01-20 23:59:18 +0000
2239
+++ src/server/frontend/protobuf_message_processor.cpp	2016-01-25 13:42:04 +0000
2240
@@ -18,7 +18,7 @@
2241
18
18
2242
19
#include "display_server.h"
19
#include "display_server.h"
2243
20
#include "protobuf_message_processor.h"
20
#include "protobuf_message_processor.h"
2245
21
#include "mir/frontend/security_check_failed.h"
21
#include "mir/cookie/authority.h"
2246
22
#include "mir/frontend/message_processor_report.h"
22
#include "mir/frontend/message_processor_report.h"
2247
23
#include "mir/frontend/protobuf_message_sender.h"
23
#include "mir/frontend/protobuf_message_sender.h"
2248
24
#include "mir/frontend/template_protobuf_message_processor.h"
24
#include "mir/frontend/template_protobuf_message_processor.h"
2249
@@ -136,7 +136,7 @@
2250
136
            result_message.get(),
136
            result_message.get(),
2251
137
            callback);
137
            callback);
2252
138
    }
138
    }
2254
139
    catch (mir::SecurityCheckFailed const& /*err*/)
139
    catch (mir::cookie::SecurityCheckError const& /*err*/)
2255
140
    {
140
    {
2256
141
        throw;
141
        throw;
2257
142
    }
142
    }
2258
@@ -315,9 +315,9 @@
2259
315
        {
315
        {
2260
316
            invoke(this, display_server.get(), &DisplayServer::configure_buffer_stream, invocation);
316
            invoke(this, display_server.get(), &DisplayServer::configure_buffer_stream, invocation);
2261
317
        }
317
        }
2263
318
        else if ("raise_surface_with_cookie" == invocation.method_name())
318
        else if ("raise_surface" == invocation.method_name())
2264
319
        {
319
        {
2266
320
            invoke(this, display_server.get(), &DisplayServer::raise_surface_with_cookie, invocation);
320
            invoke(this, display_server.get(), &DisplayServer::raise_surface, invocation);
2267
321
        }
321
        }
2268
322
        else if ("translate_surface_to_screen" == invocation.method_name())
322
        else if ("translate_surface_to_screen" == invocation.method_name())
2269
323
        {
323
        {
2270
324
324
2271
=== removed file 'src/server/frontend/security_check_failed.cpp'
2272
--- src/server/frontend/security_check_failed.cpp	2015-10-30 17:24:29 +0000
2273
+++ src/server/frontend/security_check_failed.cpp	1970-01-01 00:00:00 +0000
2274
@@ -1,24 +0,0 @@
2275
1
/*
2276
2
 * Copyright © 2015 Canonical Ltd.
2277
3
 *
2278
4
 * This program is free software: you can redistribute it and/or modify it
2279
5
 * under the terms of the GNU General Public License version 3,
2280
6
 * as published by the Free Software Foundation.
2281
7
 *
2282
8
 * This program is distributed in the hope that it will be useful,
2283
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2284
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2285
11
 * GNU General Public License for more details.
2286
12
 *
2287
13
 * You should have received a copy of the GNU General Public License
2288
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2289
15
 *
2290
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
2291
17
 */
2292
18
2293
19
#include "mir/frontend/security_check_failed.h"
2294
20
2295
21
mir::SecurityCheckFailed::SecurityCheckFailed() :
2296
22
    runtime_error("Invalid MirCookie")
2297
23
{
2298
24
}
2299
25
0
2300
=== modified file 'src/server/frontend/session_mediator.cpp'
2301
--- src/server/frontend/session_mediator.cpp	2016-01-20 23:59:18 +0000
2302
+++ src/server/frontend/session_mediator.cpp	2016-01-25 13:42:04 +0000
2303
@@ -46,10 +46,9 @@
2304
46
#include "mir/frontend/screencast.h"
46
#include "mir/frontend/screencast.h"
2305
47
#include "mir/frontend/prompt_session.h"
47
#include "mir/frontend/prompt_session.h"
2306
48
#include "mir/frontend/buffer_stream.h"
48
#include "mir/frontend/buffer_stream.h"
2307
49
#include "mir/frontend/security_check_failed.h"
2308
50
#include "mir/scene/prompt_session_creation_parameters.h"
49
#include "mir/scene/prompt_session_creation_parameters.h"
2309
51
#include "mir/fd.h"
50
#include "mir/fd.h"
2311
52
#include "mir/cookie_factory.h"
51
#include "mir/cookie/authority.h"
2312
53
#include "mir/module_properties.h"
52
#include "mir/module_properties.h"
2313
54
53
2314
55
#include "mir/geometry/rectangles.h"
54
#include "mir/geometry/rectangles.h"
2315
@@ -90,7 +89,7 @@
2316
90
    std::shared_ptr<mi::CursorImages> const& cursor_images,
89
    std::shared_ptr<mi::CursorImages> const& cursor_images,
2317
91
    std::shared_ptr<scene::CoordinateTranslator> const& translator,
90
    std::shared_ptr<scene::CoordinateTranslator> const& translator,
2318
92
    std::shared_ptr<scene::ApplicationNotRespondingDetector> const& anr_detector,
91
    std::shared_ptr<scene::ApplicationNotRespondingDetector> const& anr_detector,
2320
93
    std::shared_ptr<mir::cookie::CookieFactory> const& cookie_factory) :
92
    std::shared_ptr<mir::cookie::Authority> const& cookie_authority) :
2321
94
    client_pid_(0),
93
    client_pid_(0),
2322
95
    shell(shell),
94
    shell(shell),
2323
96
    ipc_operations(ipc_operations),
95
    ipc_operations(ipc_operations),
2324
@@ -106,7 +105,7 @@
2325
106
    cursor_images(cursor_images),
105
    cursor_images(cursor_images),
2326
107
    translator{translator},
106
    translator{translator},
2327
108
    anr_detector{anr_detector},
107
    anr_detector{anr_detector},
2329
109
    cookie_factory(cookie_factory),
108
    cookie_authority(cookie_authority),
2330
110
    buffer_stream_tracker{static_cast<size_t>(client_buffer_cache_size)}
109
    buffer_stream_tracker{static_cast<size_t>(client_buffer_cache_size)}
2331
111
{
110
{
2332
112
}
111
}
2333
@@ -1022,7 +1021,7 @@
2334
1022
    done->Run();
1021
    done->Run();
2335
1023
}
1022
}
2336
1024
1023
2338
1025
void mf::SessionMediator::raise_surface_with_cookie(
1024
void mf::SessionMediator::raise_surface(
2339
1026
    mir::protobuf::RaiseRequest const* request,
1025
    mir::protobuf::RaiseRequest const* request,
2340
1027
    mir::protobuf::Void*,
1026
    mir::protobuf::Void*,
2341
1028
    google::protobuf::Closure* done)
1027
    google::protobuf::Closure* done)
2342
@@ -1034,11 +1033,12 @@
2343
1034
    auto const cookie     = request->cookie();
1033
    auto const cookie     = request->cookie();
2344
1035
    auto const surface_id = request->surface_id();
1034
    auto const surface_id = request->surface_id();
2345
1036
1035
2351
1037
    MirCookie const mir_cookie = {cookie.timestamp(), cookie.mac()};
1036
    auto cookie_string = cookie.cookie();
2352
1038
    if (!cookie_factory->attest_timestamp(mir_cookie))
1037
2353
1039
        throw mir::SecurityCheckFailed();
1038
    std::vector<uint8_t> cookie_bytes(cookie_string.begin(), cookie_string.end());
2354
1040
1039
    auto const cookie_ptr = cookie_authority->make_cookie(cookie_bytes);
2355
1041
    shell->raise_surface_with_timestamp(session, mf::SurfaceId{surface_id.value()}, cookie.timestamp());
1040
2356
1041
    shell->raise_surface(session, mf::SurfaceId{surface_id.value()}, cookie_ptr->timestamp());
2357
1042
1042
2358
1043
    done->Run();
1043
    done->Run();
2359
1044
}
1044
}
2360
1045
1045
2361
=== modified file 'src/server/frontend/session_mediator.h'
2362
--- src/server/frontend/session_mediator.h	2016-01-20 23:59:18 +0000
2363
+++ src/server/frontend/session_mediator.h	2016-01-25 13:42:04 +0000
2364
@@ -40,7 +40,7 @@
2365
40
{
40
{
2366
41
namespace cookie
41
namespace cookie
2367
42
{
42
{
2369
43
class CookieFactory;
43
class Authority;
2370
44
}
44
}
2371
45
namespace graphics
45
namespace graphics
2372
46
{
46
{
2373
@@ -105,7 +105,7 @@
2374
105
        std::shared_ptr<input::CursorImages> const& cursor_images,
105
        std::shared_ptr<input::CursorImages> const& cursor_images,
2375
106
        std::shared_ptr<scene::CoordinateTranslator> const& translator,
106
        std::shared_ptr<scene::CoordinateTranslator> const& translator,
2376
107
        std::shared_ptr<scene::ApplicationNotRespondingDetector> const& anr_detector,
107
        std::shared_ptr<scene::ApplicationNotRespondingDetector> const& anr_detector,
2378
108
        std::shared_ptr<cookie::CookieFactory> const& cookie_factory);
108
        std::shared_ptr<cookie::Authority> const& cookie_authority);
2379
109
109
2380
110
    ~SessionMediator() noexcept;
110
    ~SessionMediator() noexcept;
2381
111
111
2382
@@ -215,7 +215,7 @@
2383
215
        mir::protobuf::StreamConfiguration const* request,
215
        mir::protobuf::StreamConfiguration const* request,
2384
216
        mir::protobuf::Void*,
216
        mir::protobuf::Void*,
2385
217
        google::protobuf::Closure* done) override;
217
        google::protobuf::Closure* done) override;
2387
218
    void raise_surface_with_cookie(
218
    void raise_surface(
2388
219
        mir::protobuf::RaiseRequest const* request,
219
        mir::protobuf::RaiseRequest const* request,
2389
220
        mir::protobuf::Void*,
220
        mir::protobuf::Void*,
2390
221
        google::protobuf::Closure* done) override;
221
        google::protobuf::Closure* done) override;
2391
@@ -259,7 +259,7 @@
2392
259
    std::shared_ptr<input::CursorImages> const cursor_images;
259
    std::shared_ptr<input::CursorImages> const cursor_images;
2393
260
    std::shared_ptr<scene::CoordinateTranslator> const translator;
260
    std::shared_ptr<scene::CoordinateTranslator> const translator;
2394
261
    std::shared_ptr<scene::ApplicationNotRespondingDetector> const anr_detector;
261
    std::shared_ptr<scene::ApplicationNotRespondingDetector> const anr_detector;
2396
262
    std::shared_ptr<cookie::CookieFactory> const cookie_factory;
262
    std::shared_ptr<cookie::Authority> const cookie_authority;
2397
263
263
2398
264
    BufferStreamTracker buffer_stream_tracker;
264
    BufferStreamTracker buffer_stream_tracker;
2399
265
265
2400
266
266
2401
=== modified file 'src/server/frontend/shell_wrapper.cpp'
2402
--- src/server/frontend/shell_wrapper.cpp	2016-01-20 23:59:18 +0000
2403
+++ src/server/frontend/shell_wrapper.cpp	2016-01-25 13:42:04 +0000
2404
@@ -99,10 +99,10 @@
2405
99
    return wrapped->get_surface_attribute(session, surface_id, attrib);
99
    return wrapped->get_surface_attribute(session, surface_id, attrib);
2406
100
}
100
}
2407
101
101
2409
102
void mf::ShellWrapper::raise_surface_with_timestamp(
102
void mf::ShellWrapper::raise_surface(
2410
103
    std::shared_ptr<Session> const& session,
103
    std::shared_ptr<Session> const& session,
2411
104
    SurfaceId surface_id,
104
    SurfaceId surface_id,
2412
105
    uint64_t timestamp)
105
    uint64_t timestamp)
2413
106
{
106
{
2415
107
    wrapped->raise_surface_with_timestamp(session, surface_id, timestamp);
107
    wrapped->raise_surface(session, surface_id, timestamp);
2416
108
}
108
}
2417
109
109
2418
=== modified file 'src/server/frontend/shell_wrapper.h'
2419
--- src/server/frontend/shell_wrapper.h	2016-01-20 23:59:18 +0000
2420
+++ src/server/frontend/shell_wrapper.h	2016-01-25 13:42:04 +0000
2421
@@ -75,7 +75,7 @@
2422
75
        SurfaceId surface_id,
75
        SurfaceId surface_id,
2423
76
        MirSurfaceAttrib attrib) override;
76
        MirSurfaceAttrib attrib) override;
2424
77
77
2426
78
    void raise_surface_with_timestamp(
78
    void raise_surface(
2427
79
        std::shared_ptr<Session> const& session,
79
        std::shared_ptr<Session> const& session,
2428
80
        SurfaceId surface_id,
80
        SurfaceId surface_id,
2429
81
        uint64_t timestamp) override;
81
        uint64_t timestamp) override;
2430
82
82
2431
=== modified file 'src/server/input/android/input_sender.cpp'
2432
--- src/server/input/android/input_sender.cpp	2016-01-20 23:59:18 +0000
2433
+++ src/server/input/android/input_sender.cpp	2016-01-25 13:42:04 +0000
2434
@@ -247,7 +247,7 @@
2435
247
                                     mir_keyboard_event_scan_code(key_event),
247
                                     mir_keyboard_event_scan_code(key_event),
2436
248
                                     mia::android_modifiers_from_mir(mir_keyboard_event_modifiers(key_event)),
248
                                     mia::android_modifiers_from_mir(mir_keyboard_event_modifiers(key_event)),
2437
249
                                     repeat_count,
249
                                     repeat_count,
2439
250
                                     event.key.mac,
250
                                     event.key.cookie,
2440
251
                                     event_time,
251
                                     event_time,
2441
252
                                     event_time);
252
                                     event_time);
2442
253
}
253
}
2443
@@ -324,7 +324,7 @@
2444
324
        ret = publisher.publishMotionEvent(seq, mir_input_event_get_device_id(input_event), AINPUT_SOURCE_TOUCHSCREEN,
324
        ret = publisher.publishMotionEvent(seq, mir_input_event_get_device_id(input_event), AINPUT_SOURCE_TOUCHSCREEN,
2445
325
                                           state_change.android_action, flags, edge_flags,
325
                                           state_change.android_action, flags, edge_flags,
2446
326
                                           mia::android_modifiers_from_mir(mir_touch_event_modifiers(touch)),
326
                                           mia::android_modifiers_from_mir(mir_touch_event_modifiers(touch)),
2448
327
                                           button_state, x_offset, y_offset, x_precision, y_precision, event.motion.mac,
327
                                           button_state, x_offset, y_offset, x_precision, y_precision, event.motion.cookie,
2449
328
                                           event_time, event_time, contacts_in_event, properties, coords);
328
                                           event_time, event_time, contacts_in_event, properties, coords);
2450
329
    }
329
    }
2451
330
330
2452
@@ -361,7 +361,7 @@
2453
361
        mia::android_pointer_action_from_mir(mir_pointer_event_action(pointer), mir_pointer_event_buttons(pointer)),
361
        mia::android_pointer_action_from_mir(mir_pointer_event_action(pointer), mir_pointer_event_buttons(pointer)),
2454
362
        flags, edge_flags, mia::android_modifiers_from_mir(mir_pointer_event_modifiers(pointer)),
362
        flags, edge_flags, mia::android_modifiers_from_mir(mir_pointer_event_modifiers(pointer)),
2455
363
        mia::android_pointer_buttons_from_mir(mir_pointer_event_buttons(pointer)), x_offset, y_offset, x_precision,
363
        mia::android_pointer_buttons_from_mir(mir_pointer_event_buttons(pointer)), x_offset, y_offset, x_precision,
2457
364
        y_precision, event.motion.mac, event_time, event_time, 1, &pointer_properties, &pointer_coord);
364
        y_precision, event.motion.cookie, event_time, event_time, 1, &pointer_properties, &pointer_coord);
2458
365
}
365
}
2459
366
366
2460
367
367
2461
368
368
2462
=== modified file 'src/server/input/default_configuration.cpp'
2463
--- src/server/input/default_configuration.cpp	2016-01-20 23:59:18 +0000
2464
+++ src/server/input/default_configuration.cpp	2016-01-25 13:42:04 +0000
2465
@@ -147,7 +147,7 @@
2466
147
            auto enable_repeat = options->get<bool>(options::enable_key_repeat_opt);
147
            auto enable_repeat = options->get<bool>(options::enable_key_repeat_opt);
2467
148
148
2468
149
            return std::make_shared<mi::KeyRepeatDispatcher>(
149
            return std::make_shared<mi::KeyRepeatDispatcher>(
2470
150
                the_event_filter_chain_dispatcher(), the_main_loop(), the_cookie_factory(),
150
                the_event_filter_chain_dispatcher(), the_main_loop(), the_cookie_authority(),
2471
151
                enable_repeat, key_repeat_timeout, key_repeat_delay);
151
                enable_repeat, key_repeat_timeout, key_repeat_delay);
2472
152
        });
152
        });
2473
153
}
153
}
2474
@@ -278,7 +278,7 @@
2475
278
                                            the_touch_visualizer(),
278
                                            the_touch_visualizer(),
2476
279
                                            the_cursor_listener(),
279
                                            the_cursor_listener(),
2477
280
                                            the_input_region(),
280
                                            the_input_region(),
2479
281
                                            the_cookie_factory());
281
                                            the_cookie_authority());
2480
282
                                    });
282
                                    });
2481
283
}
283
}
2482
284
284
2483
@@ -293,6 +293,6 @@
2484
293
                                            the_touch_visualizer(),
293
                                            the_touch_visualizer(),
2485
294
                                            the_cursor_listener(),
294
                                            the_cursor_listener(),
2486
295
                                            the_input_region(),
295
                                            the_input_region(),
2488
296
                                            the_cookie_factory());
296
                                            the_cookie_authority());
2489
297
                                    });
297
                                    });
2490
298
}
298
}
2491
299
299
2492
=== modified file 'src/server/input/default_event_builder.cpp'
2493
--- src/server/input/default_event_builder.cpp	2016-01-20 23:59:18 +0000
2494
+++ src/server/input/default_event_builder.cpp	2016-01-25 13:42:04 +0000
2495
@@ -19,29 +19,31 @@
2496
19
19
2497
20
#include "default_event_builder.h"
20
#include "default_event_builder.h"
2498
21
#include "mir/events/event_builders.h"
21
#include "mir/events/event_builders.h"
2500
22
#include "mir/cookie_factory.h"
22
#include "mir/cookie/authority.h"
2501
23
#include "mir/events/event_private.h"
23
#include "mir/events/event_private.h"
2502
24
24
2503
25
#include <algorithm>
2504
26
2505
25
namespace me = mir::events;
27
namespace me = mir::events;
2506
26
namespace mi = mir::input;
28
namespace mi = mir::input;
2507
27
29
2508
28
mi::DefaultEventBuilder::DefaultEventBuilder(MirInputDeviceId device_id,
30
mi::DefaultEventBuilder::DefaultEventBuilder(MirInputDeviceId device_id,
2510
29
                                             std::shared_ptr<mir::cookie::CookieFactory> const& cookie_factory)
31
                                             std::shared_ptr<mir::cookie::Authority> const& cookie_authority)
2511
30
    : device_id(device_id),
32
    : device_id(device_id),
2513
31
      cookie_factory(cookie_factory)
33
      cookie_authority(cookie_authority)
2514
32
{
34
{
2515
33
}
35
}
2516
34
36
2517
35
mir::EventUPtr mi::DefaultEventBuilder::key_event(Timestamp timestamp, MirKeyboardAction action, xkb_keysym_t key_code,
37
mir::EventUPtr mi::DefaultEventBuilder::key_event(Timestamp timestamp, MirKeyboardAction action, xkb_keysym_t key_code,
2518
36
                                                  int scan_code)
38
                                                  int scan_code)
2519
37
{
39
{
2522
38
    uint64_t mac = cookie_factory->timestamp_to_cookie(timestamp.count()).mac;
40
    auto const cookie = cookie_authority->make_cookie(timestamp.count());
2523
39
    return me::make_event(device_id, timestamp, mac, action, key_code, scan_code, mir_input_event_modifier_none);
41
    return me::make_event(device_id, timestamp, cookie->serialize(), action, key_code, scan_code, mir_input_event_modifier_none);
2524
40
}
42
}
2525
41
43
2526
42
mir::EventUPtr mi::DefaultEventBuilder::touch_event(Timestamp timestamp)
44
mir::EventUPtr mi::DefaultEventBuilder::touch_event(Timestamp timestamp)
2527
43
{
45
{
2529
44
    return me::make_event(device_id, timestamp, 0, mir_input_event_modifier_none);
46
    return me::make_event(device_id, timestamp, std::vector<uint8_t>{}, mir_input_event_modifier_none);
2530
45
}
47
}
2531
46
48
2532
47
void mi::DefaultEventBuilder::add_touch(MirEvent& event, MirTouchId touch_id, MirTouchAction action,
49
void mi::DefaultEventBuilder::add_touch(MirEvent& event, MirTouchId touch_id, MirTouchAction action,
2533
@@ -51,8 +53,9 @@
2534
51
{
53
{
2535
52
    if (action == mir_touch_action_up || action == mir_touch_action_down)
54
    if (action == mir_touch_action_up || action == mir_touch_action_down)
2536
53
    {
55
    {
2539
54
        auto cookie = cookie_factory->timestamp_to_cookie(event.motion.event_time.count());
56
        auto const cookie = cookie_authority->make_cookie(event.motion.event_time.count());
2540
55
        event.motion.mac = cookie.mac;
57
        auto const serialized_cookie = cookie->serialize();
2541
58
        std::copy_n(std::begin(serialized_cookie), event.motion.cookie.size(), std::begin(event.motion.cookie));
2542
56
    }
59
    }
2543
57
60
2544
58
    me::add_touch(event, touch_id, action, tooltype, x_axis_value, y_axis_value, pressure_value, touch_major_value,
61
    me::add_touch(event, touch_id, action, tooltype, x_axis_value, y_axis_value, pressure_value, touch_major_value,
2545
@@ -65,10 +68,14 @@
2546
65
{
68
{
2547
66
    const float x_axis_value = 0;
69
    const float x_axis_value = 0;
2548
67
    const float y_axis_value = 0;
70
    const float y_axis_value = 0;
2550
68
    uint64_t mac = 0;
71
    std::vector<uint8_t> vec_cookie{};
2551
72
    // FIXME Moving to 160bits soon
2552
69
    if (action == mir_pointer_action_button_up || action == mir_pointer_action_button_down)
73
    if (action == mir_pointer_action_button_up || action == mir_pointer_action_button_down)
2555
70
        mac = cookie_factory->timestamp_to_cookie(timestamp.count()).mac;
74
    {
2556
71
    return me::make_event(device_id, timestamp, mac, mir_input_event_modifier_none, action, buttons_pressed, x_axis_value, y_axis_value,
75
        auto const cookie = cookie_authority->make_cookie(timestamp.count());
2557
76
        vec_cookie = cookie->serialize();
2558
77
    }
2559
78
    return me::make_event(device_id, timestamp, vec_cookie, mir_input_event_modifier_none, action, buttons_pressed, x_axis_value, y_axis_value,
2560
72
                          hscroll_value, vscroll_value, relative_x_value, relative_y_value);
79
                          hscroll_value, vscroll_value, relative_x_value, relative_y_value);
2561
73
}
80
}
2562
74
81
2563
75
82
2564
=== modified file 'src/server/input/default_event_builder.h'
2565
--- src/server/input/default_event_builder.h	2016-01-20 23:59:18 +0000
2566
+++ src/server/input/default_event_builder.h	2016-01-25 13:42:04 +0000
2567
@@ -27,7 +27,7 @@
2568
27
{
27
{
2569
28
namespace cookie
28
namespace cookie
2570
29
{
29
{
2572
30
class CookieFactory;
30
class Authority;
2573
31
}
31
}
2574
32
namespace input
32
namespace input
2575
33
{
33
{
2576
@@ -35,7 +35,7 @@
2577
35
{
35
{
2578
36
public:
36
public:
2579
37
    explicit DefaultEventBuilder(MirInputDeviceId device_id,
37
    explicit DefaultEventBuilder(MirInputDeviceId device_id,
2581
38
                                 std::shared_ptr<cookie::CookieFactory> const& cookie_factory);
38
                                 std::shared_ptr<cookie::Authority> const& cookie_authority);
2582
39
39
2583
40
    EventUPtr key_event(Timestamp timestamp, MirKeyboardAction action, xkb_keysym_t key_code, int scan_code) override;
40
    EventUPtr key_event(Timestamp timestamp, MirKeyboardAction action, xkb_keysym_t key_code, int scan_code) override;
2584
41
41
2585
@@ -52,7 +52,7 @@
2586
52
52
2587
53
private:
53
private:
2588
54
    MirInputDeviceId const device_id;
54
    MirInputDeviceId const device_id;
2590
55
    std::shared_ptr<cookie::CookieFactory> const cookie_factory;
55
    std::shared_ptr<cookie::Authority> const cookie_authority;
2591
56
};
56
};
2592
57
}
57
}
2593
58
}
58
}
2594
59
59
2595
=== modified file 'src/server/input/default_input_device_hub.cpp'
2596
--- src/server/input/default_input_device_hub.cpp	2016-01-20 23:59:18 +0000
2597
+++ src/server/input/default_input_device_hub.cpp	2016-01-25 13:42:04 +0000
2598
@@ -29,7 +29,7 @@
2599
29
#include "mir/dispatch/multiplexing_dispatchable.h"
29
#include "mir/dispatch/multiplexing_dispatchable.h"
2600
30
#include "mir/dispatch/action_queue.h"
30
#include "mir/dispatch/action_queue.h"
2601
31
#include "mir/server_action_queue.h"
31
#include "mir/server_action_queue.h"
2603
32
#include "mir/cookie_factory.h"
32
#include "mir/cookie/authority.h"
2604
33
#define MIR_LOG_COMPONENT "Input"
33
#define MIR_LOG_COMPONENT "Input"
2605
34
#include "mir/log.h"
34
#include "mir/log.h"
2606
35
35
2607
@@ -49,13 +49,13 @@
2608
49
    std::shared_ptr<TouchVisualizer> const& touch_visualizer,
49
    std::shared_ptr<TouchVisualizer> const& touch_visualizer,
2609
50
    std::shared_ptr<CursorListener> const& cursor_listener,
50
    std::shared_ptr<CursorListener> const& cursor_listener,
2610
51
    std::shared_ptr<InputRegion> const& input_region,
51
    std::shared_ptr<InputRegion> const& input_region,
2612
52
    std::shared_ptr<mir::cookie::CookieFactory> const& cookie_factory)
52
    std::shared_ptr<mir::cookie::Authority> const& cookie_authority)
2613
53
    : input_dispatcher(input_dispatcher),
53
    : input_dispatcher(input_dispatcher),
2614
54
      input_dispatchable{input_multiplexer},
54
      input_dispatchable{input_multiplexer},
2615
55
      observer_queue(observer_queue),
55
      observer_queue(observer_queue),
2616
56
      device_queue(std::make_shared<dispatch::ActionQueue>()),
56
      device_queue(std::make_shared<dispatch::ActionQueue>()),
2617
57
      input_region(input_region),
57
      input_region(input_region),
2619
58
      cookie_factory(cookie_factory),
58
      cookie_authority(cookie_authority),
2620
59
      seat(touch_visualizer, cursor_listener, input_region),
59
      seat(touch_visualizer, cursor_listener, input_region),
2621
60
      device_id_generator{0}
60
      device_id_generator{0}
2622
61
{
61
{
2623
@@ -78,7 +78,7 @@
2624
78
    {
78
    {
2625
79
        // send input device info to observer loop..
79
        // send input device info to observer loop..
2626
80
        devices.push_back(std::make_unique<RegisteredDevice>(
80
        devices.push_back(std::make_unique<RegisteredDevice>(
2628
81
            device, create_new_device_id(), input_dispatcher, input_dispatchable, cookie_factory, this, &seat));
81
            device, create_new_device_id(), input_dispatcher, input_dispatchable, cookie_authority, this, &seat));
2629
82
82
2630
83
        auto const& dev = devices.back();
83
        auto const& dev = devices.back();
2631
84
        seat.add_device(dev->id());
84
        seat.add_device(dev->id());
2632
@@ -142,10 +142,10 @@
2633
142
    MirInputDeviceId device_id,
142
    MirInputDeviceId device_id,
2634
143
    std::shared_ptr<InputDispatcher> const& dispatcher,
143
    std::shared_ptr<InputDispatcher> const& dispatcher,
2635
144
    std::shared_ptr<dispatch::MultiplexingDispatchable> const& multiplexer,
144
    std::shared_ptr<dispatch::MultiplexingDispatchable> const& multiplexer,
2637
145
    std::shared_ptr<mir::cookie::CookieFactory> const& cookie_factory,
145
    std::shared_ptr<mir::cookie::Authority> const& cookie_authority,
2638
146
    DefaultInputDeviceHub* hub,
146
    DefaultInputDeviceHub* hub,
2639
147
    Seat* seat)
147
    Seat* seat)
2641
148
    : device_id(device_id), builder(device_id, cookie_factory), device(dev), dispatcher(dispatcher),
148
    : device_id(device_id), builder(device_id, cookie_authority), device(dev), dispatcher(dispatcher),
2642
149
      multiplexer(multiplexer), hub(hub), seat(seat)
149
      multiplexer(multiplexer), hub(hub), seat(seat)
2643
150
{
150
{
2644
151
}
151
}
2645
152
152
2646
=== modified file 'src/server/input/default_input_device_hub.h'
2647
--- src/server/input/default_input_device_hub.h	2016-01-20 23:59:18 +0000
2648
+++ src/server/input/default_input_device_hub.h	2016-01-25 13:42:04 +0000
2649
@@ -38,7 +38,7 @@
2650
38
class ServerActionQueue;
38
class ServerActionQueue;
2651
39
namespace cookie
39
namespace cookie
2652
40
{
40
{
2654
41
class CookieFactory;
41
class Authority;
2655
42
}
42
}
2656
43
namespace dispatch
43
namespace dispatch
2657
44
{
44
{
2658
@@ -65,7 +65,7 @@
2659
65
                          std::shared_ptr<TouchVisualizer> const& touch_visualizer,
65
                          std::shared_ptr<TouchVisualizer> const& touch_visualizer,
2660
66
                          std::shared_ptr<CursorListener> const& cursor_listener,
66
                          std::shared_ptr<CursorListener> const& cursor_listener,
2661
67
                          std::shared_ptr<InputRegion> const& input_region,
67
                          std::shared_ptr<InputRegion> const& input_region,
2663
68
                          std::shared_ptr<cookie::CookieFactory> const& cookie_factory);
68
                          std::shared_ptr<cookie::Authority> const& cookie_authority);
2664
69
69
2665
70
    // InputDeviceRegistry - calls from mi::Platform
70
    // InputDeviceRegistry - calls from mi::Platform
2666
71
    void add_device(std::shared_ptr<InputDevice> const& device) override;
71
    void add_device(std::shared_ptr<InputDevice> const& device) override;
2667
@@ -85,7 +85,7 @@
2668
85
    std::shared_ptr<ServerActionQueue> const observer_queue;
85
    std::shared_ptr<ServerActionQueue> const observer_queue;
2669
86
    std::shared_ptr<dispatch::ActionQueue> const device_queue;
86
    std::shared_ptr<dispatch::ActionQueue> const device_queue;
2670
87
    std::shared_ptr<InputRegion> const input_region;
87
    std::shared_ptr<InputRegion> const input_region;
2672
88
    std::shared_ptr<cookie::CookieFactory> const cookie_factory;
88
    std::shared_ptr<cookie::Authority> const cookie_authority;
2673
89
    Seat seat;
89
    Seat seat;
2674
90
90
2675
91
    struct RegisteredDevice : public InputSink
91
    struct RegisteredDevice : public InputSink
2676
@@ -95,7 +95,7 @@
2677
95
                         MirInputDeviceId dev_id,
95
                         MirInputDeviceId dev_id,
2678
96
                         std::shared_ptr<InputDispatcher> const& dispatcher,
96
                         std::shared_ptr<InputDispatcher> const& dispatcher,
2679
97
                         std::shared_ptr<dispatch::MultiplexingDispatchable> const& multiplexer,
97
                         std::shared_ptr<dispatch::MultiplexingDispatchable> const& multiplexer,
2681
98
                         std::shared_ptr<cookie::CookieFactory> const& cookie_factory,
98
                         std::shared_ptr<cookie::Authority> const& cookie_authority,
2682
99
                         DefaultInputDeviceHub* hub,
99
                         DefaultInputDeviceHub* hub,
2683
100
                         Seat* seat);
100
                         Seat* seat);
2684
101
        void handle_input(MirEvent& event) override;
101
        void handle_input(MirEvent& event) override;
2685
102
102
2686
=== modified file 'src/server/input/key_repeat_dispatcher.cpp'
2687
--- src/server/input/key_repeat_dispatcher.cpp	2016-01-20 23:59:18 +0000
2688
+++ src/server/input/key_repeat_dispatcher.cpp	2016-01-25 13:42:04 +0000
2689
@@ -21,10 +21,11 @@
2690
21
#include "mir/time/alarm_factory.h"
21
#include "mir/time/alarm_factory.h"
2691
22
#include "mir/time/alarm.h"
22
#include "mir/time/alarm.h"
2692
23
#include "mir/events/event_private.h"
23
#include "mir/events/event_private.h"
2694
24
#include "mir/cookie_factory.h"
24
#include "mir/cookie/authority.h"
2695
25
25
2696
26
#include <boost/throw_exception.hpp>
26
#include <boost/throw_exception.hpp>
2697
27
27
2698
28
#include <algorithm>
2699
28
#include <stdexcept>
29
#include <stdexcept>
2700
29
#include <string.h>
30
#include <string.h>
2701
30
31
2702
@@ -33,13 +34,13 @@
2703
33
mi::KeyRepeatDispatcher::KeyRepeatDispatcher(
34
mi::KeyRepeatDispatcher::KeyRepeatDispatcher(
2704
34
    std::shared_ptr<mi::InputDispatcher> const& next_dispatcher,
35
    std::shared_ptr<mi::InputDispatcher> const& next_dispatcher,
2705
35
    std::shared_ptr<mir::time::AlarmFactory> const& factory,
36
    std::shared_ptr<mir::time::AlarmFactory> const& factory,
2707
36
    std::shared_ptr<mir::cookie::CookieFactory> const& cookie_factory,
37
    std::shared_ptr<mir::cookie::Authority> const& cookie_authority,
2708
37
    bool repeat_enabled,
38
    bool repeat_enabled,
2709
38
    std::chrono::milliseconds repeat_timeout,
39
    std::chrono::milliseconds repeat_timeout,
2710
39
    std::chrono::milliseconds repeat_delay)
40
    std::chrono::milliseconds repeat_delay)
2711
40
    : next_dispatcher(next_dispatcher),
41
    : next_dispatcher(next_dispatcher),
2712
41
      alarm_factory(factory),
42
      alarm_factory(factory),
2714
42
      cookie_factory(cookie_factory),
43
      cookie_authority(cookie_authority),
2715
43
      repeat_enabled(repeat_enabled),
44
      repeat_enabled(repeat_enabled),
2716
44
      repeat_timeout(repeat_timeout),
45
      repeat_timeout(repeat_timeout),
2717
45
      repeat_delay(repeat_delay)
46
      repeat_delay(repeat_delay)
2718
@@ -119,7 +120,9 @@
2719
119
                std::lock_guard<std::mutex> lg(repeat_state_mutex);
120
                std::lock_guard<std::mutex> lg(repeat_state_mutex);
2720
120
121
2721
121
                ev.key.event_time = std::chrono::steady_clock::now().time_since_epoch();
122
                ev.key.event_time = std::chrono::steady_clock::now().time_since_epoch();
2723
122
                ev.key.mac = cookie_factory->timestamp_to_cookie(ev.key.event_time.count()).mac;
123
                auto const cookie = cookie_authority->make_cookie(ev.key.event_time.count());
2724
124
                auto const serialized_cookie = cookie->serialize();
2725
125
                std::copy_n(std::begin(serialized_cookie), ev.key.cookie.size(), std::begin(ev.key.cookie));
2726
123
                next_dispatcher->dispatch(ev);
126
                next_dispatcher->dispatch(ev);
2727
124
127
2728
125
                capture_alarm->reschedule_in(repeat_delay);
128
                capture_alarm->reschedule_in(repeat_delay);
2729
126
129
2730
=== modified file 'src/server/input/key_repeat_dispatcher.h'
2731
--- src/server/input/key_repeat_dispatcher.h	2016-01-20 23:59:18 +0000
2732
+++ src/server/input/key_repeat_dispatcher.h	2016-01-25 13:42:04 +0000
2733
@@ -30,7 +30,7 @@
2734
30
{
30
{
2735
31
namespace cookie
31
namespace cookie
2736
32
{
32
{
2738
33
class CookieFactory;
33
class Authority;
2739
34
}
34
}
2740
35
namespace time
35
namespace time
2741
36
{
36
{
2742
@@ -45,7 +45,7 @@
2743
45
public:
45
public:
2744
46
    KeyRepeatDispatcher(std::shared_ptr<InputDispatcher> const& next_dispatcher,
46
    KeyRepeatDispatcher(std::shared_ptr<InputDispatcher> const& next_dispatcher,
2745
47
                        std::shared_ptr<time::AlarmFactory> const& factory,
47
                        std::shared_ptr<time::AlarmFactory> const& factory,
2747
48
                        std::shared_ptr<cookie::CookieFactory> const& cookie_factory,
48
                        std::shared_ptr<cookie::Authority> const& cookie_authority,
2748
49
                        bool repeat_enabled,
49
                        bool repeat_enabled,
2749
50
                        std::chrono::milliseconds repeat_timeout, /* timeout before sending first repeat */
50
                        std::chrono::milliseconds repeat_timeout, /* timeout before sending first repeat */
2750
51
                        std::chrono::milliseconds repeat_delay /* delay between repeated keys */);
51
                        std::chrono::milliseconds repeat_delay /* delay between repeated keys */);
2751
@@ -60,7 +60,7 @@
2752
60
60
2753
61
    std::shared_ptr<InputDispatcher> const next_dispatcher;
61
    std::shared_ptr<InputDispatcher> const next_dispatcher;
2754
62
    std::shared_ptr<time::AlarmFactory> const alarm_factory;
62
    std::shared_ptr<time::AlarmFactory> const alarm_factory;
2756
63
    std::shared_ptr<cookie::CookieFactory> const cookie_factory;
63
    std::shared_ptr<cookie::Authority> const cookie_authority;
2757
64
    bool const repeat_enabled;
64
    bool const repeat_enabled;
2758
65
    std::chrono::milliseconds repeat_timeout;
65
    std::chrono::milliseconds repeat_timeout;
2759
66
    std::chrono::milliseconds repeat_delay;
66
    std::chrono::milliseconds repeat_delay;
2760
67
67
2761
=== modified file 'src/server/input/surface_input_dispatcher.cpp'
2762
--- src/server/input/surface_input_dispatcher.cpp	2016-01-20 23:59:18 +0000
2763
+++ src/server/input/surface_input_dispatcher.cpp	2016-01-25 13:42:04 +0000
2764
@@ -24,7 +24,6 @@
2765
24
#include "mir/scene/surface.h"
24
#include "mir/scene/surface.h"
2766
25
#include "mir/events/event_builders.h"
25
#include "mir/events/event_builders.h"
2767
26
#include "mir/events/event_private.h"
26
#include "mir/events/event_private.h"
2768
27
#include "mir/cookie_factory.h"
2769
28
27
2770
29
#include <string.h>
28
#include <string.h>
2771
30
29
2772
@@ -221,7 +220,7 @@
2773
221
    
220
    
2774
222
    deliver(surface, &*mev::make_event(mir_input_event_get_device_id(iev),
221
    deliver(surface, &*mev::make_event(mir_input_event_get_device_id(iev),
2775
223
        std::chrono::nanoseconds(mir_input_event_get_event_time(iev)),
222
        std::chrono::nanoseconds(mir_input_event_get_event_time(iev)),
2777
224
        0, // FIXME Revet cookie API, fix incoming for 0.19
223
        std::vector<uint8_t>{},
2778
225
        mir_pointer_event_modifiers(pev),
224
        mir_pointer_event_modifiers(pev),
2779
226
        action, mir_pointer_event_buttons(pev),
225
        action, mir_pointer_event_buttons(pev),
2780
227
        mir_pointer_event_axis_value(pev,mir_pointer_axis_x),
226
        mir_pointer_event_axis_value(pev,mir_pointer_axis_x),
2781
228
227
2782
=== modified file 'src/server/input/validator.cpp'
2783
--- src/server/input/validator.cpp	2016-01-20 23:59:18 +0000
2784
+++ src/server/input/validator.cpp	2016-01-25 13:42:04 +0000
2785
@@ -244,7 +244,7 @@
2786
244
    MirTouchEvent const* last_ev = nullptr;
244
    MirTouchEvent const* last_ev = nullptr;
2787
245
    auto default_ev = mev::make_event(id,
245
    auto default_ev = mev::make_event(id,
2788
246
        std::chrono::high_resolution_clock::now().time_since_epoch(),
246
        std::chrono::high_resolution_clock::now().time_since_epoch(),
2790
247
        0, /* No need for a mac, since there's no pointer count for a default event */
247
        std::vector<uint8_t>{}, /* No need for a mac, since there's no pointer count for a default event */
2791
248
        mir_input_event_modifier_none); 
248
        mir_input_event_modifier_none); 
2792
249
249
2793
250
    if (it == last_event_by_device.end())
250
    if (it == last_event_by_device.end())
2794
251
251
2795
=== modified file 'src/server/server.cpp'
2796
--- src/server/server.cpp	2016-01-20 23:59:18 +0000
2797
+++ src/server/server.cpp	2016-01-25 13:42:04 +0000
2798
@@ -31,7 +31,7 @@
2799
31
#include "mir/main_loop.h"
31
#include "mir/main_loop.h"
2800
32
#include "mir/report_exception.h"
32
#include "mir/report_exception.h"
2801
33
#include "mir/run_mir.h"
33
#include "mir/run_mir.h"
2803
34
#include "mir/cookie_factory.h"
34
#include "mir/cookie/authority.h"
2804
35
35
2805
36
// TODO these are used to frig a stub renderer when running headless
36
// TODO these are used to frig a stub renderer when running headless
2806
37
#include "mir/compositor/renderer.h"
37
#include "mir/compositor/renderer.h"
2807
@@ -67,7 +67,7 @@
2808
67
    MACRO(session_mediator_report)\
67
    MACRO(session_mediator_report)\
2809
68
    MACRO(shell)\
68
    MACRO(shell)\
2810
69
    MACRO(application_not_responding_detector)\
69
    MACRO(application_not_responding_detector)\
2812
70
    MACRO(cookie_factory)\
70
    MACRO(cookie_authority)\
2813
71
    MACRO(coordinate_translator)
71
    MACRO(coordinate_translator)
2814
72
72
2815
73
#define FOREACH_ACCESSOR(MACRO)\
73
#define FOREACH_ACCESSOR(MACRO)\
2816
74
74
2817
=== modified file 'src/server/shell/abstract_shell.cpp'
2818
--- src/server/shell/abstract_shell.cpp	2016-01-20 23:59:18 +0000
2819
+++ src/server/shell/abstract_shell.cpp	2016-01-25 13:42:04 +0000
2820
@@ -164,7 +164,7 @@
2821
164
    return surface->query(attrib);
164
    return surface->query(attrib);
2822
165
}
165
}
2823
166
166
2825
167
void msh::AbstractShell::raise_surface_with_timestamp(
167
void msh::AbstractShell::raise_surface(
2826
168
    std::shared_ptr<ms::Session> const& session,
168
    std::shared_ptr<ms::Session> const& session,
2827
169
    std::shared_ptr<ms::Surface> const& surface,
169
    std::shared_ptr<ms::Surface> const& surface,
2828
170
    uint64_t timestamp)
170
    uint64_t timestamp)
2829
171
171
2830
=== modified file 'src/server/shell/frontend_shell.cpp'
2831
--- src/server/shell/frontend_shell.cpp	2016-01-20 23:59:18 +0000
2832
+++ src/server/shell/frontend_shell.cpp	2016-01-25 13:42:04 +0000
2833
@@ -148,12 +148,12 @@
2834
148
    return wrapped->get_surface_attribute(surface, attrib);
148
    return wrapped->get_surface_attribute(surface, attrib);
2835
149
}
149
}
2836
150
150
2838
151
void msh::FrontendShell::raise_surface_with_timestamp(
151
void msh::FrontendShell::raise_surface(
2839
152
    std::shared_ptr<mf::Session> const& session,
152
    std::shared_ptr<mf::Session> const& session,
2840
153
    mf::SurfaceId surface_id,
153
    mf::SurfaceId surface_id,
2841
154
    uint64_t timestamp)
154
    uint64_t timestamp)
2842
155
{
155
{
2843
156
    auto const scene_session = std::dynamic_pointer_cast<ms::Session>(session);
156
    auto const scene_session = std::dynamic_pointer_cast<ms::Session>(session);
2844
157
    auto const surface = scene_session->surface(surface_id);
157
    auto const surface = scene_session->surface(surface_id);
2846
158
    wrapped->raise_surface_with_timestamp(scene_session, surface, timestamp);
158
    wrapped->raise_surface(scene_session, surface, timestamp);
2847
159
}
159
}
2848
160
160
2849
=== modified file 'src/server/shell/frontend_shell.h'
2850
--- src/server/shell/frontend_shell.h	2016-01-20 23:59:18 +0000
2851
+++ src/server/shell/frontend_shell.h	2016-01-25 13:42:04 +0000
2852
@@ -87,7 +87,7 @@
2853
87
        mf::SurfaceId surface_id,
87
        mf::SurfaceId surface_id,
2854
88
        MirSurfaceAttrib attrib) override;
88
        MirSurfaceAttrib attrib) override;
2855
89
89
2857
90
    void raise_surface_with_timestamp(
90
    void raise_surface(
2858
91
        std::shared_ptr<mf::Session> const& session,
91
        std::shared_ptr<mf::Session> const& session,
2859
92
        mf::SurfaceId surface_id,
92
        mf::SurfaceId surface_id,
2860
93
        uint64_t timestamp) override;
93
        uint64_t timestamp) override;
2861
94
94
2862
=== modified file 'src/server/shell/shell_wrapper.cpp'
2863
--- src/server/shell/shell_wrapper.cpp	2016-01-20 23:59:18 +0000
2864
+++ src/server/shell/shell_wrapper.cpp	2016-01-25 13:42:04 +0000
2865
@@ -112,12 +112,12 @@
2866
112
    return wrapped->get_surface_attribute(surface, attrib);
112
    return wrapped->get_surface_attribute(surface, attrib);
2867
113
}
113
}
2868
114
114
2870
115
void msh::ShellWrapper::raise_surface_with_timestamp(
115
void msh::ShellWrapper::raise_surface(
2871
116
    std::shared_ptr<ms::Session> const& session,
116
    std::shared_ptr<ms::Session> const& session,
2872
117
    std::shared_ptr<ms::Surface> const& surface,
117
    std::shared_ptr<ms::Surface> const& surface,
2873
118
    uint64_t timestamp)
118
    uint64_t timestamp)
2874
119
{
119
{
2876
120
    wrapped->raise_surface_with_timestamp(session, surface, timestamp);
120
    wrapped->raise_surface(session, surface, timestamp);
2877
121
}
121
}
2878
122
122
2879
123
void msh::ShellWrapper::add_display(geometry::Rectangle const& area)
123
void msh::ShellWrapper::add_display(geometry::Rectangle const& area)
2880
124
124
2881
=== modified file 'src/server/symbols.map'
2882
--- src/server/symbols.map	2016-01-20 23:59:18 +0000
2883
+++ src/server/symbols.map	2016-01-25 13:42:04 +0000
2884
@@ -165,7 +165,7 @@
2885
165
    mir::Server::open_prompt_socket*;
165
    mir::Server::open_prompt_socket*;
2886
166
    mir::Server::override_the_application_not_responding_detector*;
166
    mir::Server::override_the_application_not_responding_detector*;
2887
167
    mir::Server::override_the_compositor*;
167
    mir::Server::override_the_compositor*;
2889
168
    mir::Server::override_the_cookie_factory*;
168
    mir::Server::override_the_cookie_authority*;
2890
169
    mir::Server::override_the_coordinate_translator*;
169
    mir::Server::override_the_coordinate_translator*;
2891
170
    mir::Server::override_the_cursor_images*;
170
    mir::Server::override_the_cursor_images*;
2892
171
    mir::Server::override_the_display_buffer_compositor_factory*;
171
    mir::Server::override_the_display_buffer_compositor_factory*;
2893
@@ -240,7 +240,7 @@
2894
240
    mir::shell::AbstractShell::modify_surface*;
240
    mir::shell::AbstractShell::modify_surface*;
2895
241
    mir::shell::AbstractShell::open_session*;
241
    mir::shell::AbstractShell::open_session*;
2896
242
    mir::shell::AbstractShell::raise*;
242
    mir::shell::AbstractShell::raise*;
2898
243
    mir::shell::AbstractShell::raise_surface_with_timestamp*;
243
    mir::shell::AbstractShell::raise_surface*;
2899
244
    mir::shell::AbstractShell::remove_display*;
244
    mir::shell::AbstractShell::remove_display*;
2900
245
    mir::shell::AbstractShell::set_focus_to*;
245
    mir::shell::AbstractShell::set_focus_to*;
2901
246
    mir::shell::AbstractShell::set_surface_attribute*;
246
    mir::shell::AbstractShell::set_surface_attribute*;
2902
@@ -282,7 +282,7 @@
2903
282
    mir::shell::ShellWrapper::modify_surface*;
282
    mir::shell::ShellWrapper::modify_surface*;
2904
283
    mir::shell::ShellWrapper::open_session*;
283
    mir::shell::ShellWrapper::open_session*;
2905
284
    mir::shell::ShellWrapper::raise*;
284
    mir::shell::ShellWrapper::raise*;
2907
285
    mir::shell::ShellWrapper::raise_surface_with_timestamp*;
285
    mir::shell::ShellWrapper::raise_surface*;
2908
286
    mir::shell::ShellWrapper::remove_display*;
286
    mir::shell::ShellWrapper::remove_display*;
2909
287
    mir::shell::ShellWrapper::set_focus_to*;
287
    mir::shell::ShellWrapper::set_focus_to*;
2910
288
    mir::shell::ShellWrapper::set_surface_attribute*;
288
    mir::shell::ShellWrapper::set_surface_attribute*;
2911
@@ -395,7 +395,7 @@
2912
395
    non-virtual?thunk?to?mir::shell::AbstractShell::modify_surface*;
395
    non-virtual?thunk?to?mir::shell::AbstractShell::modify_surface*;
2913
396
    non-virtual?thunk?to?mir::shell::AbstractShell::open_session*;
396
    non-virtual?thunk?to?mir::shell::AbstractShell::open_session*;
2914
397
    non-virtual?thunk?to?mir::shell::AbstractShell::raise*;
397
    non-virtual?thunk?to?mir::shell::AbstractShell::raise*;
2916
398
    non-virtual?thunk?to?mir::shell::AbstractShell::raise_surface_with_timestamp*;
398
    non-virtual?thunk?to?mir::shell::AbstractShell::raise_surface*;
2917
399
    non-virtual?thunk?to?mir::shell::AbstractShell::remove_display*;
399
    non-virtual?thunk?to?mir::shell::AbstractShell::remove_display*;
2918
400
    non-virtual?thunk?to?mir::shell::AbstractShell::set_focus_to*;
400
    non-virtual?thunk?to?mir::shell::AbstractShell::set_focus_to*;
2919
401
    non-virtual?thunk?to?mir::shell::AbstractShell::set_surface_attribute*;
401
    non-virtual?thunk?to?mir::shell::AbstractShell::set_surface_attribute*;
2920
@@ -422,7 +422,7 @@
2921
422
    non-virtual?thunk?to?mir::shell::ShellWrapper::modify_surface*;
422
    non-virtual?thunk?to?mir::shell::ShellWrapper::modify_surface*;
2922
423
    non-virtual?thunk?to?mir::shell::ShellWrapper::open_session*;
423
    non-virtual?thunk?to?mir::shell::ShellWrapper::open_session*;
2923
424
    non-virtual?thunk?to?mir::shell::ShellWrapper::raise*;
424
    non-virtual?thunk?to?mir::shell::ShellWrapper::raise*;
2925
425
    non-virtual?thunk?to?mir::shell::ShellWrapper::raise_surface_with_timestamp*;
425
    non-virtual?thunk?to?mir::shell::ShellWrapper::raise_surface*;
2926
426
    non-virtual?thunk?to?mir::shell::ShellWrapper::remove_display*;
426
    non-virtual?thunk?to?mir::shell::ShellWrapper::remove_display*;
2927
427
    non-virtual?thunk?to?mir::shell::ShellWrapper::set_focus_to*;
427
    non-virtual?thunk?to?mir::shell::ShellWrapper::set_focus_to*;
2928
428
    non-virtual?thunk?to?mir::shell::ShellWrapper::set_surface_attribute*;
428
    non-virtual?thunk?to?mir::shell::ShellWrapper::set_surface_attribute*;
2929
@@ -677,7 +677,7 @@
2930
677
    mir::DefaultServerConfiguration::the_buffer_stream_factory*;
677
    mir::DefaultServerConfiguration::the_buffer_stream_factory*;
2931
678
    mir::DefaultServerConfiguration::the_clock*;
678
    mir::DefaultServerConfiguration::the_clock*;
2932
679
    mir::DefaultServerConfiguration::the_composite_event_filter*;
679
    mir::DefaultServerConfiguration::the_composite_event_filter*;
2934
680
    mir::DefaultServerConfiguration::the_cookie_factory*;
680
    mir::DefaultServerConfiguration::the_cookie_authority*;
2935
681
    mir::DefaultServerConfiguration::the_event_filter_chain_dispatcher*;
681
    mir::DefaultServerConfiguration::the_event_filter_chain_dispatcher*;
2936
682
    mir::DefaultServerConfiguration::the_surface_input_dispatcher;
682
    mir::DefaultServerConfiguration::the_surface_input_dispatcher;
2937
683
    mir::DefaultServerConfiguration::the_compositor*;
683
    mir::DefaultServerConfiguration::the_compositor*;
2938
684
684
2939
=== modified file 'tests/acceptance-tests/test_client_cookie.cpp'
2940
--- tests/acceptance-tests/test_client_cookie.cpp	2016-01-20 23:59:18 +0000
2941
+++ tests/acceptance-tests/test_client_cookie.cpp	2016-01-25 13:42:04 +0000
2942
@@ -1,5 +1,5 @@
2943
1
/*
1
/*
2945
2
 * Copyright © 2015 Canonical Ltd.
2
 * Copyright © 2015-2016 Canonical Ltd.
2946
3
 *
3
 *
2947
4
 * This program is free software: you can redistribute it and/or modify
4
 * This program is free software: you can redistribute it and/or modify
2948
5
 * it under the terms of the GNU General Public License version 3 as
5
 * it under the terms of the GNU General Public License version 3 as
2949
@@ -23,12 +23,14 @@
2950
23
#include "mir_test_framework/stub_server_platform_factory.h"
23
#include "mir_test_framework/stub_server_platform_factory.h"
2951
24
#include "mir_test_framework/connected_client_with_a_surface.h"
24
#include "mir_test_framework/connected_client_with_a_surface.h"
2952
25
#include "mir/test/spin_wait.h"
25
#include "mir/test/spin_wait.h"
2954
26
#include "mir/cookie_factory.h"
26
#include "mir/cookie/authority.h"
2955
27
27
2956
28
#include "boost/throw_exception.hpp"
28
#include "boost/throw_exception.hpp"
2957
29
29
2958
30
#include <linux/input.h>
30
#include <linux/input.h>
2959
31
31
2960
32
#include <mutex>
2961
33
2962
32
namespace mtf = mir_test_framework;
34
namespace mtf = mir_test_framework;
2963
33
namespace mt = mir::test;
35
namespace mt = mir::test;
2964
34
namespace mi = mir::input;
36
namespace mi = mir::input;
2965
@@ -45,8 +47,8 @@
2966
45
public:
47
public:
2967
46
    ClientCookies()
48
    ClientCookies()
2968
47
    {
49
    {
2971
48
        server.override_the_cookie_factory([this] ()
50
        server.override_the_cookie_authority([this] ()
2972
49
            { return mir::cookie::CookieFactory::create_saving_secret(cookie_secret); });
51
            { return mir::cookie::Authority::create_saving(cookie_secret); });
2973
50
    }
52
    }
2974
51
53
2975
52
    void SetUp() override
54
    void SetUp() override
2976
@@ -63,9 +65,6 @@
2977
63
        mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
65
        mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
2978
64
    }
66
    }
2979
65
67
2980
66
    std::vector<uint8_t> cookie_secret;
2981
67
    std::vector<MirCookie> out_cookies;
2982
68
2983
69
    std::unique_ptr<mtf::FakeInputDevice> fake_keyboard{
68
    std::unique_ptr<mtf::FakeInputDevice> fake_keyboard{
2984
70
        mtf::add_fake_input_device(mi::InputDeviceInfo{"keyboard", "keyboard-uid" , mi::DeviceCapability::keyboard})
69
        mtf::add_fake_input_device(mi::InputDeviceInfo{"keyboard", "keyboard-uid" , mi::DeviceCapability::keyboard})
2985
71
        };
70
        };
2986
@@ -76,21 +75,49 @@
2987
76
       mtf::add_fake_input_device(mi::InputDeviceInfo{
75
       mtf::add_fake_input_device(mi::InputDeviceInfo{
2988
77
       "touch screen", "touch-screen-uid", mi::DeviceCapability::touchscreen | mi::DeviceCapability::multitouch})
76
       "touch screen", "touch-screen-uid", mi::DeviceCapability::touchscreen | mi::DeviceCapability::multitouch})
2989
78
       };
77
       };
2990
78
2991
79
    std::vector<std::vector<uint8_t>> out_cookies;
2992
80
    std::vector<uint8_t> cookie_secret;
2993
81
    size_t event_count{0};
2994
82
    mutable std::mutex mutex;
2995
79
};
83
};
2996
80
84
2997
81
namespace
85
namespace
2998
82
{
86
{
3001
83
// FIXME Removing the public API calls for the mir cookie, fix coming in 0.19
87
3002
84
void cookie_capturing_callback(MirSurface*, MirEvent const* /*ev*/, void* /*ctx*/)
88
void cookie_capturing_callback(MirSurface*, MirEvent const* ev, void* ctx)
3003
85
{
89
{
3004
90
    auto const event_type = mir_event_get_type(ev);
3005
91
    auto client_cookie = static_cast<ClientCookies*>(ctx);
3006
92
3007
93
    if (event_type == mir_event_type_input)
3008
94
    {
3009
95
        auto const* iev = mir_event_get_input_event(ev);
3010
96
3011
97
        std::lock_guard<std::mutex> lk(client_cookie->mutex);
3012
98
        if (mir_input_event_has_cookie(iev))
3013
99
        {
3014
100
            auto cookie = mir_input_event_get_cookie(iev);
3015
101
            size_t size = mir_cookie_buffer_size(cookie);
3016
102
3017
103
            std::vector<uint8_t> cookie_bytes(size);
3018
104
            mir_cookie_to_buffer(cookie, cookie_bytes.data(), size);
3019
105
3020
106
            mir_cookie_release(cookie);
3021
107
            client_cookie->out_cookies.push_back(cookie_bytes);
3022
108
        }
3023
109
3024
110
        client_cookie->event_count++;
3025
111
    }
3026
86
}
112
}
3027
87
113
3029
88
bool wait_for_n_events(size_t n, std::vector<MirCookie>& cookies)
114
bool wait_for_n_events(size_t n, ClientCookies* client_cookie)
3030
89
{
115
{
3031
90
    bool all_events = mt::spin_wait_for_condition_or_timeout(
116
    bool all_events = mt::spin_wait_for_condition_or_timeout(
3033
91
        [&n, &cookies]
117
        [&n, &client_cookie]
3034
92
        {
118
        {
3036
93
            return cookies.size() >= n;
119
            std::lock_guard<std::mutex> lk(client_cookie->mutex);
3037
120
            return client_cookie->event_count >= n;
3038
94
        },
121
        },
3039
95
        std::chrono::seconds{max_wait});
122
        std::chrono::seconds{max_wait});
3040
96
123
3041
@@ -99,41 +126,52 @@
3042
99
}
126
}
3043
100
}
127
}
3044
101
128
3047
102
// FIXME Removing the public API calls for the mir cookie, fix coming in 0.19
129
TEST_F(ClientCookies, keyboard_events_have_cookies)
3046
103
TEST_F(ClientCookies, DISABLED_keyboard_events_have_attestable_cookies)
3048
104
{
130
{
3049
105
    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_M));
131
    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_M));
3051
106
    if (wait_for_n_events(1, out_cookies))
132
3052
133
    int events = 1;
3053
134
    if (wait_for_n_events(events, this))
3054
107
    {
135
    {
3057
108
        auto factory = mir::cookie::CookieFactory::create_from_secret(cookie_secret);
136
        std::lock_guard<std::mutex> lk(mutex);
3058
109
        EXPECT_TRUE(factory->attest_timestamp(out_cookies.back()));
137
3059
138
        ASSERT_FALSE(out_cookies.empty());
3060
139
        auto authority = mir::cookie::Authority::create_from(cookie_secret);
3061
140
3062
141
        EXPECT_NO_THROW(authority->make_cookie(out_cookies.back()));
3063
110
    }
142
    }
3064
111
}
143
}
3065
112
144
3068
113
// FIXME Removing the public API calls for the mir cookie, fix coming in 0.19
145
TEST_F(ClientCookies, pointer_motion_events_do_not_have_cookies)
3067
114
TEST_F(ClientCookies, DISABLED_pointer_motion_events_do_not_have_attestable_cookies)
3069
115
{
146
{
3070
147
    // with movement generates 2 events
3071
116
    fake_pointer->emit_event(mis::a_pointer_event().with_movement(1, 1));
148
    fake_pointer->emit_event(mis::a_pointer_event().with_movement(1, 1));
3073
117
    if (wait_for_n_events(1, out_cookies))
149
3074
150
    int events = 2;
3075
151
    if (wait_for_n_events(events, this))
3076
118
    {
152
    {
3079
119
        auto factory = mir::cookie::CookieFactory::create_from_secret(cookie_secret);
153
        std::lock_guard<std::mutex> lk(mutex);
3080
120
        EXPECT_FALSE(factory->attest_timestamp(out_cookies.back()));
154
        EXPECT_EQ(event_count, events);
3081
155
        EXPECT_TRUE(out_cookies.empty());
3082
121
    }
156
    }
3083
122
}
157
}
3084
123
158
3086
124
TEST_F(ClientCookies, DISABLED_pointer_click_events_have_attestable_cookies)
159
TEST_F(ClientCookies, pointer_click_events_have_cookies)
3087
125
{
160
{
3088
126
    fake_pointer->emit_event(mis::a_button_down_event().of_button(BTN_LEFT).with_action(mis::EventAction::Down));
161
    fake_pointer->emit_event(mis::a_button_down_event().of_button(BTN_LEFT).with_action(mis::EventAction::Down));
3089
127
    fake_pointer->emit_event(mis::a_button_up_event().of_button(BTN_LEFT));
162
    fake_pointer->emit_event(mis::a_button_up_event().of_button(BTN_LEFT));
3091
128
    if (wait_for_n_events(2, out_cookies))
163
3092
164
    int events = 2;
3093
165
    if (wait_for_n_events(events, this))
3094
129
    {
166
    {
3097
130
        auto factory = mir::cookie::CookieFactory::create_from_secret(cookie_secret);
167
        std::lock_guard<std::mutex> lk(mutex);
3098
131
        EXPECT_TRUE(factory->attest_timestamp(out_cookies.back()));
168
        ASSERT_FALSE(out_cookies.empty());
3099
169
        auto authority = mir::cookie::Authority::create_from(cookie_secret);
3100
170
        EXPECT_NO_THROW(authority->make_cookie(out_cookies.back()));
3101
132
    }
171
    }
3102
133
}
172
}
3103
134
173
3106
135
// FIXME Removing the public API calls for the mir cookie, fix coming in 0.19
174
TEST_F(ClientCookies, touch_motion_events_do_not_have_cookies)
3105
136
TEST_F(ClientCookies, DISABLED_touch_motion_events_do_not_have_attestable_cookies)
3107
137
{
175
{
3108
138
    fake_touch_screen->emit_event(
176
    fake_touch_screen->emit_event(
3109
139
         mis::a_touch_event()
177
         mis::a_touch_event()
3110
@@ -146,24 +184,11 @@
3111
146
        .at_position({1, 1})
184
        .at_position({1, 1})
3112
147
        );
185
        );
3113
148
186
3133
149
    if (wait_for_n_events(2, out_cookies))
187
    int events = 1;
3134
150
    {
188
    if (wait_for_n_events(events, this))
3135
151
        auto factory = mir::cookie::CookieFactory::create_from_secret(cookie_secret);
189
    {
3136
152
        EXPECT_FALSE(factory->attest_timestamp(out_cookies.back()));
190
        std::lock_guard<std::mutex> lk(mutex);
3137
153
    }
191
        EXPECT_GE(event_count, events);
3138
154
}
192
        EXPECT_EQ(out_cookies.size(), 1);
3120
155
3121
156
// FIXME Removing the public API calls for the mir cookie, fix coming in 0.19
3122
157
TEST_F(ClientCookies, DISABLED_touch_click_events_have_attestable_cookies)
3123
158
{
3124
159
    fake_touch_screen->emit_event(
3125
160
         mis::a_touch_event()
3126
161
        .at_position({0, 0})
3127
162
        );
3128
163
3129
164
    if (wait_for_n_events(1, out_cookies))
3130
165
    {
3131
166
        auto factory = mir::cookie::CookieFactory::create_from_secret(cookie_secret);
3132
167
        EXPECT_TRUE(factory->attest_timestamp(out_cookies.back()));
3139
168
    }
193
    }
3140
169
}
194
}
3141
170
195
3142
=== modified file 'tests/acceptance-tests/test_client_input.cpp'
3143
--- tests/acceptance-tests/test_client_input.cpp	2016-01-23 03:16:06 +0000
3144
+++ tests/acceptance-tests/test_client_input.cpp	2016-01-25 13:42:04 +0000
3145
@@ -587,7 +587,7 @@
3146
587
    EXPECT_CALL(first_client, handle_input(mt::KeyDownEvent()))
587
    EXPECT_CALL(first_client, handle_input(mt::KeyDownEvent()))
3147
588
        .WillOnce(mt::WakeUp(&first_client.all_events_received));
588
        .WillOnce(mt::WakeUp(&first_client.all_events_received));
3148
589
589
3150
590
    auto key_event = mir::events::make_event(MirInputDeviceId{0}, 0ns, 0, mir_keyboard_action_down, 0, KEY_M,
590
    auto key_event = mir::events::make_event(MirInputDeviceId{0}, 0ns, std::vector<uint8_t>{}, mir_keyboard_action_down, 0, KEY_M,
3151
591
                                             mir_input_event_modifier_none);
591
                                             mir_input_event_modifier_none);
3152
592
592
3153
593
    server.the_shell()->focused_surface()->consume(key_event.get());
593
    server.the_shell()->focused_surface()->consume(key_event.get());
3154
594
594
3155
=== modified file 'tests/acceptance-tests/test_surface_modifications.cpp'
3156
--- tests/acceptance-tests/test_surface_modifications.cpp	2016-01-20 23:59:18 +0000
3157
+++ tests/acceptance-tests/test_surface_modifications.cpp	2016-01-25 13:42:04 +0000
3158
@@ -83,11 +83,10 @@
3159
83
        auto const hscroll_value = 0.0;
83
        auto const hscroll_value = 0.0;
3160
84
        auto const vscroll_value = 0.0;
84
        auto const vscroll_value = 0.0;
3161
85
        auto const action = mir_pointer_action_button_down;
85
        auto const action = mir_pointer_action_button_down;
3162
86
        auto const mac = 0;
3163
87
        auto const relative_x_value = 0.0;
86
        auto const relative_x_value = 0.0;
3164
88
        auto const relative_y_value = 0.0;
87
        auto const relative_y_value = 0.0;
3165
89
88
3167
90
        auto const click_event = mev::make_event(device_id, timestamp, mac, modifiers,
89
        auto const click_event = mev::make_event(device_id, timestamp, cookie, modifiers,
3168
91
            action, mir_pointer_button_tertiary, x_axis_value, y_axis_value,
90
            action, mir_pointer_button_tertiary, x_axis_value, y_axis_value,
3169
92
            hscroll_value, vscroll_value, relative_x_value, relative_y_value);
91
            hscroll_value, vscroll_value, relative_x_value, relative_y_value);
3170
93
92
3171
@@ -103,11 +102,10 @@
3172
103
        auto const hscroll_value = 0.0;
102
        auto const hscroll_value = 0.0;
3173
104
        auto const vscroll_value = 0.0;
103
        auto const vscroll_value = 0.0;
3174
105
        auto const action = mir_pointer_action_motion;
104
        auto const action = mir_pointer_action_motion;
3175
106
        auto const mac = 0;
3176
107
        auto const relative_x_value = 0.0;
105
        auto const relative_x_value = 0.0;
3177
108
        auto const relative_y_value = 0.0;
106
        auto const relative_y_value = 0.0;
3178
109
107
3180
110
        auto const drag_event = mev::make_event(device_id, timestamp, mac, modifiers,
108
        auto const drag_event = mev::make_event(device_id, timestamp, cookie, modifiers,
3181
111
            action, mir_pointer_button_tertiary, x_axis_value, y_axis_value,
109
            action, mir_pointer_button_tertiary, x_axis_value, y_axis_value,
3182
112
            hscroll_value, vscroll_value, relative_x_value, relative_y_value);
110
            hscroll_value, vscroll_value, relative_x_value, relative_y_value);
3183
113
111
3184
@@ -146,6 +144,7 @@
3185
146
    std::chrono::nanoseconds const timestamp = std::chrono::nanoseconds(39);
144
    std::chrono::nanoseconds const timestamp = std::chrono::nanoseconds(39);
3186
147
    NiceMock<MockSurfaceObserver> surface_observer;
145
    NiceMock<MockSurfaceObserver> surface_observer;
3187
148
    std::weak_ptr<ms::Surface> shell_surface;
146
    std::weak_ptr<ms::Surface> shell_surface;
3188
147
    std::vector<uint8_t> cookie;
3189
149
};
148
};
3190
150
149
3191
151
MATCHER_P(WidthEq, value, "")
150
MATCHER_P(WidthEq, value, "")
3192
152
151
3193
=== modified file 'tests/acceptance-tests/test_surface_placement.cpp'
3194
--- tests/acceptance-tests/test_surface_placement.cpp	2016-01-20 23:59:18 +0000
3195
+++ tests/acceptance-tests/test_surface_placement.cpp	2016-01-25 13:42:04 +0000
3196
@@ -127,12 +127,11 @@
3197
127
        auto const hscroll_value = 0.0;
127
        auto const hscroll_value = 0.0;
3198
128
        auto const vscroll_value = 0.0;
128
        auto const vscroll_value = 0.0;
3199
129
        auto const action = mir_pointer_action_button_down;
129
        auto const action = mir_pointer_action_button_down;
3200
130
        auto const mac = 0;
3201
131
        auto const relative_x_value = 0.0;
130
        auto const relative_x_value = 0.0;
3202
132
        auto const relative_y_value = 0.0;
131
        auto const relative_y_value = 0.0;
3203
133
132
3204
134
133
3206
135
        auto const click_event = mev::make_event(device_id, std::chrono::nanoseconds(1), mac, modifiers,
134
        auto const click_event = mev::make_event(device_id, std::chrono::nanoseconds(1), std::vector<uint8_t>{}, modifiers,
3207
136
            action, depressed_buttons, x_axis_value, y_axis_value, hscroll_value,
135
            action, depressed_buttons, x_axis_value, y_axis_value, hscroll_value,
3208
137
            vscroll_value, relative_x_value, relative_y_value);
136
            vscroll_value, relative_x_value, relative_y_value);
3209
138
137
3210
139
138
3211
=== modified file 'tests/acceptance-tests/test_surface_raise.cpp'
3212
--- tests/acceptance-tests/test_surface_raise.cpp	2015-11-30 21:08:18 +0000
3213
+++ tests/acceptance-tests/test_surface_raise.cpp	2016-01-25 13:42:04 +0000
3214
@@ -1,5 +1,5 @@
3215
1
/*
1
/*
3217
2
 * Copyright © 2015 Canonical Ltd.
2
 * Copyright © 2015-2016 Canonical Ltd.
3218
3
 *
3
 *
3219
4
 * This program is free software: you can redistribute it and/or modify
4
 * This program is free software: you can redistribute it and/or modify
3220
5
 * it under the terms of the GNU General Public License version 3 as
5
 * it under the terms of the GNU General Public License version 3 as
3221
@@ -24,7 +24,7 @@
3222
24
#include "mir_test_framework/any_surface.h"
24
#include "mir_test_framework/any_surface.h"
3223
25
#include "mir/test/wait_condition.h"
25
#include "mir/test/wait_condition.h"
3224
26
#include "mir/test/spin_wait.h"
26
#include "mir/test/spin_wait.h"
3226
27
#include "mir/cookie_factory.h"
27
#include "mir/cookie/authority.h"
3227
28
28
3228
29
#include "mir_toolkit/mir_client_library.h"
29
#include "mir_toolkit/mir_client_library.h"
3229
30
30
3230
@@ -33,6 +33,8 @@
3231
33
#include <gtest/gtest.h>
33
#include <gtest/gtest.h>
3232
34
#include <gmock/gmock.h>
34
#include <gmock/gmock.h>
3233
35
35
3234
36
#include <mutex>
3235
37
3236
36
namespace mtf = mir_test_framework;
38
namespace mtf = mir_test_framework;
3237
37
namespace mt = mir::test;
39
namespace mt = mir::test;
3238
38
namespace mi = mir::input;
40
namespace mi = mir::input;
3239
@@ -42,7 +44,6 @@
3240
42
{
44
{
3241
43
std::chrono::seconds const max_wait{4};
45
std::chrono::seconds const max_wait{4};
3242
44
void cookie_capturing_callback(MirSurface* surface, MirEvent const* ev, void* ctx);
46
void cookie_capturing_callback(MirSurface* surface, MirEvent const* ev, void* ctx);
3243
45
void lifecycle_changed(MirConnection* /* connection */, MirLifecycleState state, void* ctx);
3244
46
}
47
}
3245
47
48
3246
48
struct RaiseSurfaces : mtf::ConnectedClientHeadlessServer
49
struct RaiseSurfaces : mtf::ConnectedClientHeadlessServer
3247
@@ -77,17 +78,14 @@
3248
77
            std::chrono::seconds{max_wait});
78
            std::chrono::seconds{max_wait});
3249
78
79
3250
79
        EXPECT_TRUE(surface_fullscreen);
80
        EXPECT_TRUE(surface_fullscreen);
3251
80
3252
81
        mir_connection_set_lifecycle_event_callback(connection, lifecycle_changed, this);
3253
82
    }
81
    }
3254
83
82
3255
84
    MirSurface* surface1;
83
    MirSurface* surface1;
3256
85
    MirSurface* surface2;
84
    MirSurface* surface2;
3257
86
85
3262
87
    std::vector<MirCookie> key_cookies;
86
    std::vector<std::vector<uint8_t>> out_cookies;
3263
88
    std::vector<MirCookie> pointer_cookies;
87
    size_t event_count{0};
3264
89
88
    mutable std::mutex mutex;
3261
90
    MirLifecycleState lifecycle_state{mir_lifecycle_state_resumed};
3265
91
89
3266
92
    std::unique_ptr<mtf::FakeInputDevice> fake_keyboard{
90
    std::unique_ptr<mtf::FakeInputDevice> fake_keyboard{
3267
93
        mtf::add_fake_input_device(mi::InputDeviceInfo{"keyboard", "keyboard-uid", mi::DeviceCapability::keyboard})
91
        mtf::add_fake_input_device(mi::InputDeviceInfo{"keyboard", "keyboard-uid", mi::DeviceCapability::keyboard})
3268
@@ -99,23 +97,41 @@
3269
99
97
3270
100
namespace
98
namespace
3271
101
{
99
{
3284
102
// FIXME Removing the public API calls for the mir cookie, fix coming in 0.19
100
3285
103
void cookie_capturing_callback(MirSurface* /*surface*/, MirEvent const* /*ev*/, void* /*ctx*/)
101
void cookie_capturing_callback(MirSurface* /*surface*/, MirEvent const* ev, void* ctx)
3286
104
{
102
{
3287
105
}
103
    auto const event_type = mir_event_get_type(ev);
3288
106
104
    auto raise_surfaces = static_cast<RaiseSurfaces*>(ctx);
3289
107
void lifecycle_changed(MirConnection* /*connection*/, MirLifecycleState state, void* ctx)
105
    
3290
108
{
106
    if (event_type == mir_event_type_input)
3291
109
    auto client = reinterpret_cast<RaiseSurfaces*>(ctx);
107
    {   
3292
110
    client->lifecycle_state = state;
108
        auto const* iev = mir_event_get_input_event(ev);
3293
111
}
109
3294
112
110
        std::lock_guard<std::mutex> lk(raise_surfaces->mutex);
3295
113
bool wait_for_n_events(size_t n, std::vector<MirCookie>& cookies)
111
        if (mir_input_event_has_cookie(iev))
3296
112
        {
3297
113
            auto cookie = mir_input_event_get_cookie(iev);
3298
114
            size_t size = mir_cookie_buffer_size(cookie);
3299
115
3300
116
            std::vector<uint8_t> cookie_bytes(size);
3301
117
            mir_cookie_to_buffer(cookie, cookie_bytes.data(), size);
3302
118
3303
119
            mir_cookie_release(cookie);
3304
120
3305
121
            raise_surfaces->out_cookies.push_back(cookie_bytes);
3306
122
        }
3307
123
        
3308
124
        raise_surfaces->event_count++;
3309
125
    }
3310
126
}
3311
127
3312
128
bool wait_for_n_events(size_t n, RaiseSurfaces const* raise_surfaces)
3313
114
{
129
{
3314
115
    bool all_events = mt::spin_wait_for_condition_or_timeout(
130
    bool all_events = mt::spin_wait_for_condition_or_timeout(
3316
116
        [&n, &cookies]
131
        [&n, &raise_surfaces]
3317
117
        {
132
        {
3319
118
            return cookies.size() >= n;
133
            std::lock_guard<std::mutex> lk(raise_surfaces->mutex);
3320
134
            return raise_surfaces->event_count >= n;
3321
119
        },
135
        },
3322
120
        std::chrono::seconds{max_wait});
136
        std::chrono::seconds{max_wait});
3323
121
137
3324
@@ -123,30 +139,55 @@
3325
123
   return all_events;
139
   return all_events;
3326
124
}
140
}
3327
125
141
3332
126
}
142
bool attempt_focus(MirSurface* surface, MirCookie const* cookie)
3333
127
143
{
3334
128
// FIXME Removing the public API calls for the mir cookie, fix coming in 0.19
144
    mir_surface_raise(surface, cookie);
3335
129
TEST_F(RaiseSurfaces, DISABLED_key_event_with_cookie)
145
    bool surface_becomes_focused = mt::spin_wait_for_condition_or_timeout(
3336
146
        [&surface]
3337
147
        {
3338
148
            return mir_surface_get_focus(surface) == mir_surface_focused;
3339
149
        },
3340
150
        std::chrono::seconds{max_wait});
3341
151
 
3342
152
    return surface_becomes_focused;
3343
153
}
3344
154
3345
155
}
3346
156
3347
157
TEST_F(RaiseSurfaces, key_event_with_cookie)
3348
130
{
158
{
3349
131
    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_M));
159
    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_M));
3351
132
    if (wait_for_n_events(1, key_cookies))
160
3352
161
    int events = 1;
3353
162
    if (wait_for_n_events(events, this))
3354
133
    {
163
    {
3355
164
        std::lock_guard<std::mutex> lk(mutex);
3356
165
        ASSERT_FALSE(out_cookies.empty());
3357
134
        EXPECT_EQ(mir_surface_get_focus(surface2), mir_surface_focused);
166
        EXPECT_EQ(mir_surface_get_focus(surface2), mir_surface_focused);
3359
135
        // EXPECT_TRUE attempt_focus surface2 key_cookies.back()
167
3360
168
        MirCookie const* cookie = mir_cookie_from_buffer(out_cookies.back().data(), out_cookies.back().size());
3361
169
        attempt_focus(surface2, cookie);
3362
170
3363
171
        mir_cookie_release(cookie);
3364
136
    }
172
    }
3365
137
}
173
}
3366
138
174
3369
139
// FIXME Removing the public API calls for the mir cookie, fix coming in 0.19
175
TEST_F(RaiseSurfaces, older_timestamp_does_not_focus)
3368
140
TEST_F(RaiseSurfaces, DISABLED_older_timestamp_does_not_focus)
3370
141
{
176
{
3371
142
    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_M));
177
    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_M));
3372
143
    fake_keyboard->emit_event(mis::a_key_up_event().of_scancode(KEY_M));
178
    fake_keyboard->emit_event(mis::a_key_up_event().of_scancode(KEY_M));
3374
144
    if (wait_for_n_events(2, key_cookies))
179
3375
180
    int events = 2;
3376
181
    if (wait_for_n_events(events, this))
3377
145
    {
182
    {
3379
146
        EXPECT_TRUE(key_cookies.front().timestamp < key_cookies.back().timestamp);
183
        std::lock_guard<std::mutex> lk(mutex);
3380
184
        ASSERT_FALSE(out_cookies.empty());
3381
147
        EXPECT_EQ(mir_surface_get_focus(surface2), mir_surface_focused);
185
        EXPECT_EQ(mir_surface_get_focus(surface2), mir_surface_focused);
3382
148
186
3384
149
        // mir_surface_raise_with_cookie
187
        MirCookie const* cookie = mir_cookie_from_buffer(out_cookies.front().data(), out_cookies.front().size());
3385
188
        mir_surface_raise(surface1, cookie);
3386
189
3387
190
        mir_cookie_release(cookie);
3388
150
191
3389
151
        // Need to wait for this call to actually go through
192
        // Need to wait for this call to actually go through
3390
152
        std::this_thread::sleep_for(std::chrono::milliseconds{1000});
193
        std::this_thread::sleep_for(std::chrono::milliseconds{1000});
3391
@@ -154,33 +195,21 @@
3392
154
    }
195
    }
3393
155
}
196
}
3394
156
197
3397
157
// FIXME Removing the public API calls for the mir cookie, fix coming in 0.19
198
TEST_F(RaiseSurfaces, motion_events_dont_prevent_raise)
3396
158
TEST_F(RaiseSurfaces, DISABLED_motion_events_dont_prevent_raise)
3398
159
{
199
{
3399
160
    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_M));
200
    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_M));
3400
161
    fake_keyboard->emit_event(mis::a_key_up_event().of_scancode(KEY_M));
201
    fake_keyboard->emit_event(mis::a_key_up_event().of_scancode(KEY_M));
3402
162
    if (wait_for_n_events(2, key_cookies))
202
    if (wait_for_n_events(2, this))
3403
163
    {
203
    {
3404
164
        fake_pointer->emit_event(mis::a_pointer_event().with_movement(1, 1));
204
        fake_pointer->emit_event(mis::a_pointer_event().with_movement(1, 1));
3406
165
        if (wait_for_n_events(1, pointer_cookies))
205
        if (wait_for_n_events(1, this))
3407
166
        {
206
        {
3408
207
            std::lock_guard<std::mutex> lk(mutex);
3409
208
            ASSERT_FALSE(out_cookies.empty());
3410
167
            EXPECT_EQ(mir_surface_get_focus(surface2), mir_surface_focused);
209
            EXPECT_EQ(mir_surface_get_focus(surface2), mir_surface_focused);
3412
168
            // EXPECT_TRUE attempt_focus surface1 key_cookies.back()
210
            MirCookie const* cookie = mir_cookie_from_buffer(out_cookies.back().data(), out_cookies.back().size());
3413
211
            EXPECT_TRUE(attempt_focus(surface1, cookie));
3414
212
            mir_cookie_release(cookie);
3415
169
        }
213
        }
3416
170
    }
214
    }
3417
171
}
215
}
3418
172
3419
173
// FIXME Removing the public API calls for the mir cookie, fix coming in 0.19
3420
174
TEST_F(RaiseSurfaces, DISABLED_client_connection_close_invalid_cookie)
3421
175
{
3422
176
    // mir_surface_raise_with_cookie
3423
177
3424
178
    bool connection_close = mt::spin_wait_for_condition_or_timeout(
3425
179
        [this]
3426
180
        {
3427
181
            return lifecycle_state == mir_lifecycle_connection_lost;
3428
182
        },
3429
183
        std::chrono::seconds{max_wait});
3430
184
3431
185
    EXPECT_TRUE(connection_close);
3432
186
}
3433
187
216
3434
=== modified file 'tests/acceptance-tests/test_surface_specification.cpp'
3435
--- tests/acceptance-tests/test_surface_specification.cpp	2016-01-20 23:59:18 +0000
3436
+++ tests/acceptance-tests/test_surface_specification.cpp	2016-01-25 13:42:04 +0000
3437
@@ -116,11 +116,10 @@
3438
116
        auto const hscroll_value = 0.0;
116
        auto const hscroll_value = 0.0;
3439
117
        auto const vscroll_value = 0.0;
117
        auto const vscroll_value = 0.0;
3440
118
        auto const action = mir_pointer_action_button_down;
118
        auto const action = mir_pointer_action_button_down;
3441
119
        auto const mac = 0;
3442
120
        auto const relative_x_value = 0.0;
119
        auto const relative_x_value = 0.0;
3443
121
        auto const relative_y_value = 0.0;
120
        auto const relative_y_value = 0.0;
3444
122
121
3446
123
        auto const click_event = mev::make_event(device_id, timestamp, mac, modifiers,
122
        auto const click_event = mev::make_event(device_id, timestamp, cookie, modifiers,
3447
124
                                                 action, mir_pointer_button_tertiary,
123
                                                 action, mir_pointer_button_tertiary,
3448
125
                                                 x_axis_value, y_axis_value,
124
                                                 x_axis_value, y_axis_value,
3449
126
                                                 hscroll_value, vscroll_value,
125
                                                 hscroll_value, vscroll_value,
3450
@@ -138,11 +137,10 @@
3451
138
        auto const hscroll_value = 0.0;
137
        auto const hscroll_value = 0.0;
3452
139
        auto const vscroll_value = 0.0;
138
        auto const vscroll_value = 0.0;
3453
140
        auto const action = mir_pointer_action_motion;
139
        auto const action = mir_pointer_action_motion;
3454
141
        auto const mac = 0;
3455
142
        auto const relative_x_value = 0.0;
140
        auto const relative_x_value = 0.0;
3456
143
        auto const relative_y_value = 0.0;
141
        auto const relative_y_value = 0.0;
3457
144
142
3459
145
        auto const drag_event = mev::make_event(device_id, timestamp, mac, modifiers,
143
        auto const drag_event = mev::make_event(device_id, timestamp, cookie, modifiers,
3460
146
                                                action, mir_pointer_button_tertiary,
144
                                                action, mir_pointer_button_tertiary,
3461
147
                                                x_axis_value, y_axis_value,
145
                                                x_axis_value, y_axis_value,
3462
148
                                                hscroll_value, vscroll_value,
146
                                                hscroll_value, vscroll_value,
3463
@@ -172,6 +170,7 @@
3464
172
private:
170
private:
3465
173
    std::shared_ptr<mtd::WrapShellToTrackLatestSurface> shell;
171
    std::shared_ptr<mtd::WrapShellToTrackLatestSurface> shell;
3466
174
    mt::Signal signal_change;
172
    mt::Signal signal_change;
3467
173
    std::vector<uint8_t> cookie;
3468
175
174
3469
176
    void init_pixel_format()
175
    void init_pixel_format()
3470
177
    {
176
    {
3471
178
177
3472
=== modified file 'tests/include/mir/test/doubles/mock_shell.h'
3473
--- tests/include/mir/test/doubles/mock_shell.h	2016-01-20 23:59:18 +0000
3474
+++ tests/include/mir/test/doubles/mock_shell.h	2016-01-25 13:42:04 +0000
3475
@@ -70,7 +70,7 @@
3476
70
    MOCK_METHOD3(get_surface_attribute, int(std::shared_ptr<frontend::Session> const& session,
70
    MOCK_METHOD3(get_surface_attribute, int(std::shared_ptr<frontend::Session> const& session,
3477
71
        frontend::SurfaceId surface_id, MirSurfaceAttrib attrib));
71
        frontend::SurfaceId surface_id, MirSurfaceAttrib attrib));
3478
72
72
3480
73
    MOCK_METHOD3(raise_surface_with_timestamp, void(std::shared_ptr<frontend::Session> const& session,
73
    MOCK_METHOD3(raise_surface, void(std::shared_ptr<frontend::Session> const& session,
3481
74
        frontend::SurfaceId surface_id, uint64_t timestamp));
74
        frontend::SurfaceId surface_id, uint64_t timestamp));
3482
75
};
75
};
3483
76
76
3484
77
77
3485
=== modified file 'tests/include/mir/test/doubles/stub_display_server.h'
3486
--- tests/include/mir/test/doubles/stub_display_server.h	2016-01-20 23:59:18 +0000
3487
+++ tests/include/mir/test/doubles/stub_display_server.h	2016-01-25 13:42:04 +0000
3488
@@ -134,7 +134,7 @@
3489
134
        mir::protobuf::StreamConfiguration const* /*request*/,
134
        mir::protobuf::StreamConfiguration const* /*request*/,
3490
135
        mir::protobuf::Void* /*response*/,
135
        mir::protobuf::Void* /*response*/,
3491
136
        google::protobuf::Closure* /*done*/) {}
136
        google::protobuf::Closure* /*done*/) {}
3493
137
    void raise_surface_with_cookie(
137
    void raise_surface(
3494
138
        mir::protobuf::RaiseRequest const* /*request*/,
138
        mir::protobuf::RaiseRequest const* /*request*/,
3495
139
        mir::protobuf::Void* /*response*/,
139
        mir::protobuf::Void* /*response*/,
3496
140
        google::protobuf::Closure* /*done*/) {}
140
        google::protobuf::Closure* /*done*/) {}
3497
141
141
3498
=== modified file 'tests/integration-tests/CMakeLists.txt'
3499
--- tests/integration-tests/CMakeLists.txt	2016-01-20 23:59:18 +0000
3500
+++ tests/integration-tests/CMakeLists.txt	2016-01-25 13:42:04 +0000
3501
@@ -6,6 +6,7 @@
3502
6
  ${CMAKE_CURRENT_BINARY_DIR}
6
  ${CMAKE_CURRENT_BINARY_DIR}
3503
7
  ${PROJECT_SOURCE_DIR}/include/cookie
7
  ${PROJECT_SOURCE_DIR}/include/cookie
3504
8
  ${PROJECT_SOURCE_DIR}/src/include/platform
8
  ${PROJECT_SOURCE_DIR}/src/include/platform
3505
9
  ${PROJECT_SOURCE_DIR}/src/include/cookie
3506
9
  ${PROJECT_SOURCE_DIR}/src/include/common
10
  ${PROJECT_SOURCE_DIR}/src/include/common
3507
10
  ${PROJECT_SOURCE_DIR}/src/include/server
11
  ${PROJECT_SOURCE_DIR}/src/include/server
3508
11
  ${PROJECT_SOURCE_DIR}/src/include/client
12
  ${PROJECT_SOURCE_DIR}/src/include/client
3509
12
13
3510
=== modified file 'tests/integration-tests/input/test_single_seat_setup.cpp'
3511
--- tests/integration-tests/input/test_single_seat_setup.cpp	2016-01-11 10:23:20 +0000
3512
+++ tests/integration-tests/input/test_single_seat_setup.cpp	2016-01-25 13:42:04 +0000
3513
@@ -27,7 +27,7 @@
3514
27
#include "mir/test/fake_shared.h"
27
#include "mir/test/fake_shared.h"
3515
28
28
3516
29
#include "mir/dispatch/multiplexing_dispatchable.h"
29
#include "mir/dispatch/multiplexing_dispatchable.h"
3518
30
#include "mir/cookie_factory.h"
30
#include "mir/cookie/authority.h"
3519
31
31
3520
32
#include "mir/input/cursor_listener.h"
32
#include "mir/input/cursor_listener.h"
3521
33
#include "mir/input/device.h"
33
#include "mir/input/device.h"
3522
@@ -67,13 +67,13 @@
3523
67
    mtd::TriggeredMainLoop observer_loop;
67
    mtd::TriggeredMainLoop observer_loop;
3524
68
    NiceMock<mtd::MockInputDispatcher> mock_dispatcher;
68
    NiceMock<mtd::MockInputDispatcher> mock_dispatcher;
3525
69
    NiceMock<mtd::MockInputRegion> mock_region;
69
    NiceMock<mtd::MockInputRegion> mock_region;
3527
70
    std::shared_ptr<mir::cookie::CookieFactory> cookie_factory = mir::cookie::CookieFactory::create_keeping_secret();
70
    std::shared_ptr<mir::cookie::Authority> cookie_authority = mir::cookie::Authority::create();
3528
71
    NiceMock<MockCursorListener> mock_cursor_listener;
71
    NiceMock<MockCursorListener> mock_cursor_listener;
3529
72
    NiceMock<MockTouchVisualizer> mock_visualizer;
72
    NiceMock<MockTouchVisualizer> mock_visualizer;
3530
73
    mir::dispatch::MultiplexingDispatchable multiplexer;
73
    mir::dispatch::MultiplexingDispatchable multiplexer;
3531
74
    mi::DefaultInputDeviceHub hub{mt::fake_shared(mock_dispatcher), mt::fake_shared(multiplexer),
74
    mi::DefaultInputDeviceHub hub{mt::fake_shared(mock_dispatcher), mt::fake_shared(multiplexer),
3532
75
                                  mt::fake_shared(observer_loop), mt::fake_shared(mock_visualizer),
75
                                  mt::fake_shared(observer_loop), mt::fake_shared(mock_visualizer),
3534
76
                                  mt::fake_shared(mock_cursor_listener), mt::fake_shared(mock_region), cookie_factory};
76
                                  mt::fake_shared(mock_cursor_listener), mt::fake_shared(mock_region), cookie_authority};
3535
77
    NiceMock<mtd::MockInputDeviceObserver> mock_observer;
77
    NiceMock<mtd::MockInputDeviceObserver> mock_observer;
3536
78
    NiceMock<mtd::MockInputDevice> device{"device","dev-1", mi::DeviceCapability::unknown};
78
    NiceMock<mtd::MockInputDevice> device{"device","dev-1", mi::DeviceCapability::unknown};
3537
79
    NiceMock<mtd::MockInputDevice> another_device{"another_device","dev-2", mi::DeviceCapability::keyboard};
79
    NiceMock<mtd::MockInputDevice> another_device{"another_device","dev-2", mi::DeviceCapability::keyboard};
3538
80
80
3539
=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
3540
--- tests/mir_test_doubles/CMakeLists.txt	2016-01-20 23:59:18 +0000
3541
+++ tests/mir_test_doubles/CMakeLists.txt	2016-01-25 13:42:04 +0000
3542
@@ -4,6 +4,7 @@
3543
4
  ${PROJECT_SOURCE_DIR}/src/include/common
4
  ${PROJECT_SOURCE_DIR}/src/include/common
3544
5
  ${PROJECT_SOURCE_DIR}/src/include/server
5
  ${PROJECT_SOURCE_DIR}/src/include/server
3545
6
  ${PROJECT_SOURCE_DIR}/src/include/client
6
  ${PROJECT_SOURCE_DIR}/src/include/client
3546
7
  ${PROJECT_SOURCE_DIR}/src/include/cookie
3547
7
8
3548
8
    ${Boost_INCLUDE_DIRS}
9
    ${Boost_INCLUDE_DIRS}
3549
9
    ${CMAKE_SOURCE_DIR}
10
    ${CMAKE_SOURCE_DIR}
3550
10
11
3551
=== modified file 'tests/unit-tests/CMakeLists.txt'
3552
--- tests/unit-tests/CMakeLists.txt	2016-01-20 23:59:18 +0000
3553
+++ tests/unit-tests/CMakeLists.txt	2016-01-25 13:42:04 +0000
3554
@@ -26,6 +26,7 @@
3555
26
  ${UMOCKDEV_INCLUDE_DIRS}
26
  ${UMOCKDEV_INCLUDE_DIRS}
3556
27
27
3557
28
  ${PROJECT_SOURCE_DIR}/include/cookie
28
  ${PROJECT_SOURCE_DIR}/include/cookie
3558
29
  ${PROJECT_SOURCE_DIR}/src/include/cookie
3559
29
  ${PROJECT_SOURCE_DIR}/src/include/platform
30
  ${PROJECT_SOURCE_DIR}/src/include/platform
3560
30
  ${PROJECT_SOURCE_DIR}/src/include/server
31
  ${PROJECT_SOURCE_DIR}/src/include/server
3561
31
  ${PROJECT_SOURCE_DIR}/src/include/client
32
  ${PROJECT_SOURCE_DIR}/src/include/client
3562
32
33
3563
=== modified file 'tests/unit-tests/client/input/test_android_input_receiver.cpp'
3564
--- tests/unit-tests/client/input/test_android_input_receiver.cpp	2016-01-20 23:59:18 +0000
3565
+++ tests/unit-tests/client/input/test_android_input_receiver.cpp	2016-01-25 13:42:04 +0000
3566
@@ -69,7 +69,7 @@
3567
69
                                         testing_key_event_scan_code,
69
                                         testing_key_event_scan_code,
3568
70
                                         0 /* meta_state */,
70
                                         0 /* meta_state */,
3569
71
                                         0 /* repeat_count */,
71
                                         0 /* repeat_count */,
3571
72
                                         0 /* mac */,
72
                                         {{}} /* mac */,
3572
73
                                         std::chrono::nanoseconds(0) /* down_time */,
73
                                         std::chrono::nanoseconds(0) /* down_time */,
3573
74
                                         std::chrono::nanoseconds(0) /* event_time */);
74
                                         std::chrono::nanoseconds(0) /* event_time */);
3574
75
    }
75
    }
3575
@@ -96,7 +96,7 @@
3576
96
                                            0 /* y_offset */,
96
                                            0 /* y_offset */,
3577
97
                                            0 /* x_precision */,
97
                                            0 /* x_precision */,
3578
98
                                            0 /* y_precision */,
98
                                            0 /* y_precision */,
3580
99
                                            0 /* mac */,
99
                                            {{}} /* mac */,
3581
100
                                            std::chrono::nanoseconds(0) /* down_time */,
100
                                            std::chrono::nanoseconds(0) /* down_time */,
3582
101
                                            t,
101
                                            t,
3583
102
                                            default_pointer_count,
102
                                            default_pointer_count,
3584
103
103
3585
=== modified file 'tests/unit-tests/client/input/test_xkb_mapper.cpp'
3586
--- tests/unit-tests/client/input/test_xkb_mapper.cpp	2016-01-20 23:59:18 +0000
3587
+++ tests/unit-tests/client/input/test_xkb_mapper.cpp	2016-01-25 13:42:04 +0000
3588
@@ -35,8 +35,7 @@
3589
35
35
3590
36
static int map_key(mircv::XKBMapper &mapper, MirKeyboardAction action, int scan_code)
36
static int map_key(mircv::XKBMapper &mapper, MirKeyboardAction action, int scan_code)
3591
37
{
37
{
3594
38
    auto mac = 0;
38
    auto ev = mev::make_event(MirInputDeviceId(0), std::chrono::nanoseconds(0), std::vector<uint8_t>{}, action,
3593
39
    auto ev = mev::make_event(MirInputDeviceId(0), std::chrono::nanoseconds(0), mac, action,
3595
40
                              0, scan_code, mir_input_event_modifier_none);
39
                              0, scan_code, mir_input_event_modifier_none);
3596
41
40
3597
42
    mapper.update_state_and_map_event(*ev);
41
    mapper.update_state_and_map_event(*ev);
3598
43
42
3599
=== modified file 'tests/unit-tests/frontend/test_event_sender.cpp'
3600
--- tests/unit-tests/frontend/test_event_sender.cpp	2016-01-20 23:59:18 +0000
3601
+++ tests/unit-tests/frontend/test_event_sender.cpp	2016-01-25 13:42:04 +0000
3602
@@ -168,8 +168,7 @@
3603
168
{
168
{
3604
169
    using namespace testing;
169
    using namespace testing;
3605
170
170
3608
171
    auto mac = 0;
171
    auto ev = mev::make_event(MirInputDeviceId(), std::chrono::nanoseconds(0), std::vector<uint8_t>{}, MirKeyboardAction(),
3607
172
    auto ev = mev::make_event(MirInputDeviceId(), std::chrono::nanoseconds(0), mac, MirKeyboardAction(),
3609
173
                              0, 0, MirInputEventModifiers());
172
                              0, 0, MirInputEventModifiers());
3610
174
173
3611
175
    EXPECT_CALL(mock_msg_sender, send(_, _, _))
174
    EXPECT_CALL(mock_msg_sender, send(_, _, _))
3612
176
175
3613
=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
3614
--- tests/unit-tests/frontend/test_session_mediator.cpp	2016-01-20 23:59:18 +0000
3615
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2016-01-25 13:42:04 +0000
3616
@@ -59,8 +59,7 @@
3617
59
#include "mir/test/signal.h"
59
#include "mir/test/signal.h"
3618
60
#include "mir/frontend/connector.h"
60
#include "mir/frontend/connector.h"
3619
61
#include "mir/frontend/event_sink.h"
61
#include "mir/frontend/event_sink.h"
3622
62
#include "mir/frontend/security_check_failed.h"
62
#include "mir/cookie/authority.h"
3621
63
#include "mir/cookie_factory.h"
3623
64
#include "mir_protobuf.pb.h"
63
#include "mir_protobuf.pb.h"
3624
65
#include "mir_protobuf_wire.pb.h"
64
#include "mir_protobuf_wire.pb.h"
3625
66
65
3626
@@ -232,7 +231,7 @@
3627
232
            std::make_shared<mtd::NullMessageSender>(),
231
            std::make_shared<mtd::NullMessageSender>(),
3628
233
            resource_cache, stub_screencast, &connector, nullptr, nullptr,
232
            resource_cache, stub_screencast, &connector, nullptr, nullptr,
3629
234
            std::make_shared<mtd::NullANRDetector>(),
233
            std::make_shared<mtd::NullANRDetector>(),
3631
235
            mir::cookie::CookieFactory::create_keeping_secret()}
234
            mir::cookie::Authority::create()}
3632
236
    {
235
    {
3633
237
        using namespace ::testing;
236
        using namespace ::testing;
3634
238
237
3635
@@ -257,7 +256,7 @@
3636
257
            resource_cache, std::make_shared<mtd::NullScreencast>(),
256
            resource_cache, std::make_shared<mtd::NullScreencast>(),
3637
258
            nullptr, nullptr, nullptr,
257
            nullptr, nullptr, nullptr,
3638
259
            std::make_shared<mtd::NullANRDetector>(),
258
            std::make_shared<mtd::NullANRDetector>(),
3640
260
            mir::cookie::CookieFactory::create_keeping_secret());
259
            mir::cookie::Authority::create());
3641
261
    }
260
    }
3642
262
261
3643
263
    MockConnector connector;
262
    MockConnector connector;
3644
@@ -311,7 +310,7 @@
3645
311
        std::make_shared<mtd::NullMessageSender>(),
310
        std::make_shared<mtd::NullMessageSender>(),
3646
312
        resource_cache, stub_screencast, context, nullptr, nullptr,
311
        resource_cache, stub_screencast, context, nullptr, nullptr,
3647
313
        std::make_shared<mtd::NullANRDetector>(),
312
        std::make_shared<mtd::NullANRDetector>(),
3649
314
        mir::cookie::CookieFactory::create_keeping_secret()};
313
        mir::cookie::Authority::create()};
3650
315
314
3651
316
    EXPECT_THAT(connects_handled_count, Eq(0));
315
    EXPECT_THAT(connects_handled_count, Eq(0));
3652
317
316
3653
@@ -855,7 +854,7 @@
3654
855
        std::make_shared<mtd::NullMessageSender>(),
854
        std::make_shared<mtd::NullMessageSender>(),
3655
856
        mt::fake_shared(mock_cache), stub_screencast, &connector, nullptr, nullptr,
855
        mt::fake_shared(mock_cache), stub_screencast, &connector, nullptr, nullptr,
3656
857
        std::make_shared<mtd::NullANRDetector>(),
856
        std::make_shared<mtd::NullANRDetector>(),
3658
858
        mir::cookie::CookieFactory::create_keeping_secret()};
857
        mir::cookie::Authority::create()};
3659
859
858
3660
860
    mediator.connect(&connect_parameters, &connection, null_callback.get());
859
    mediator.connect(&connect_parameters, &connection, null_callback.get());
3661
861
    mediator.create_surface(&surface_parameters, &surface_response, null_callback.get());
860
    mediator.create_surface(&surface_parameters, &surface_response, null_callback.get());
3662
@@ -969,7 +968,7 @@
3663
969
        nullptr,
968
        nullptr,
3664
970
        nullptr,
969
        nullptr,
3665
971
        std::make_shared<mtd::NullANRDetector>(),
970
        std::make_shared<mtd::NullANRDetector>(),
3667
972
        mir::cookie::CookieFactory::create_keeping_secret()};
971
        mir::cookie::Authority::create()};
3668
973
972
3669
974
    mp::Void null;
973
    mp::Void null;
3670
975
    mp::BufferRequest request;
974
    mp::BufferRequest request;
3671
@@ -1060,7 +1059,7 @@
3672
1060
        std::make_shared<mtd::NullMessageSender>(),
1059
        std::make_shared<mtd::NullMessageSender>(),
3673
1061
        resource_cache, stub_screencast, nullptr, nullptr, nullptr,
1060
        resource_cache, stub_screencast, nullptr, nullptr, nullptr,
3674
1062
        std::make_shared<mtd::NullANRDetector>(),
1061
        std::make_shared<mtd::NullANRDetector>(),
3676
1063
        mir::cookie::CookieFactory::create_keeping_secret()};
1062
        mir::cookie::Authority::create()};
3677
1064
1063
3678
1065
    mp::Void null;
1064
    mp::Void null;
3679
1066
    mp::BufferRequest request;
1065
    mp::BufferRequest request;
3680
@@ -1204,7 +1203,7 @@
3681
1204
        mock_sender,
1203
        mock_sender,
3682
1205
        resource_cache, stub_screencast, nullptr, nullptr, nullptr,
1204
        resource_cache, stub_screencast, nullptr, nullptr, nullptr,
3683
1206
        std::make_shared<mtd::NullANRDetector>(),
1205
        std::make_shared<mtd::NullANRDetector>(),
3685
1207
        mir::cookie::CookieFactory::create_keeping_secret()};
1206
        mir::cookie::Authority::create()};
3686
1208
1207
3687
1209
    ON_CALL(*shell, create_surface( _, _, _))
1208
    ON_CALL(*shell, create_surface( _, _, _))
3688
1210
        .WillByDefault(
1209
        .WillByDefault(
3689
@@ -1308,6 +1307,6 @@
3690
1308
    mediator.connect(&connect_parameters, &connection, null_callback.get());
1307
    mediator.connect(&connect_parameters, &connection, null_callback.get());
3691
1309
1308
3692
1310
    EXPECT_THROW({
1309
    EXPECT_THROW({
3695
1311
        mediator.raise_surface_with_cookie(&raise_request, &void_response, null_callback.get());
1310
        mediator.raise_surface(&raise_request, &void_response, null_callback.get());
3696
1312
    }, mir::SecurityCheckFailed);
1311
    }, mir::cookie::SecurityCheckError);
3697
1313
}
1312
}
3698
1314
1313
3699
=== modified file 'tests/unit-tests/input/android/test_android_input_lexicon.cpp'
3700
--- tests/unit-tests/input/android/test_android_input_lexicon.cpp	2016-01-20 23:59:18 +0000
3701
+++ tests/unit-tests/input/android/test_android_input_lexicon.cpp	2016-01-25 13:42:04 +0000
3702
@@ -17,6 +17,7 @@
3703
17
 */
17
 */
3704
18
18
3705
19
#include "mir/input/android/android_input_lexicon.h"
19
#include "mir/input/android/android_input_lexicon.h"
3706
20
#include "mir/cookie/blob.h"
3707
20
21
3708
21
#include <androidfw/Input.h>
22
#include <androidfw/Input.h>
3709
22
23
3710
@@ -39,13 +40,13 @@
3711
39
    const int32_t scan_code = 6;
40
    const int32_t scan_code = 6;
3712
40
    const int32_t meta_state = AMETA_ALT_ON;
41
    const int32_t meta_state = AMETA_ALT_ON;
3713
41
    const int32_t repeat_count = 0;
42
    const int32_t repeat_count = 0;
3715
42
    const uint64_t mac = 11;
43
    const mir::cookie::Blob cookie{{14}};
3716
43
    auto const down_time = std::chrono::nanoseconds(9);
44
    auto const down_time = std::chrono::nanoseconds(9);
3717
44
    auto const event_time = std::chrono::nanoseconds(10);
45
    auto const event_time = std::chrono::nanoseconds(10);
3718
45
46
3719
46
    android_key_ev->initialize(device_id, source_id, action, flags, key_code,
47
    android_key_ev->initialize(device_id, source_id, action, flags, key_code,
3720
47
                               scan_code, meta_state, repeat_count,
48
                               scan_code, meta_state, repeat_count,
3722
48
                               mac, down_time, event_time);
49
                               cookie, down_time, event_time);
3723
49
50
3724
50
    auto mir_ev = mia::Lexicon::translate(android_key_ev);
51
    auto mir_ev = mia::Lexicon::translate(android_key_ev);
3725
51
52
3726
@@ -62,8 +63,6 @@
3727
62
    EXPECT_EQ(key_code, mir_keyboard_event_key_code(kev));
63
    EXPECT_EQ(key_code, mir_keyboard_event_key_code(kev));
3728
63
    EXPECT_EQ(scan_code, mir_keyboard_event_scan_code(kev));
64
    EXPECT_EQ(scan_code, mir_keyboard_event_scan_code(kev));
3729
64
65
3730
65
    // FIXME Test the mac value once the public API has landed in 0.19
3731
66
3732
67
    delete android_key_ev;
66
    delete android_key_ev;
3733
68
}
67
}
3734
69
68
3735
@@ -84,7 +83,7 @@
3736
84
    const float y_offset = 9;
83
    const float y_offset = 9;
3737
85
    const float x_precision = 10;
84
    const float x_precision = 10;
3738
86
    const float y_precision = 11;
85
    const float y_precision = 11;
3740
87
    const uint64_t mac = 14;
86
    const mir::cookie::Blob cookie{{14}};
3741
88
    auto const down_time = std::chrono::nanoseconds(12);
87
    auto const down_time = std::chrono::nanoseconds(12);
3742
89
    auto const event_time = std::chrono::nanoseconds(13);
88
    auto const event_time = std::chrono::nanoseconds(13);
3743
90
    const size_t pointer_count = 1;
89
    const size_t pointer_count = 1;
3744
@@ -115,7 +114,7 @@
3745
115
114
3746
116
    android_motion_ev->initialize(device_id, source_id, action, flags, edge_flags,
115
    android_motion_ev->initialize(device_id, source_id, action, flags, edge_flags,
3747
117
                                  meta_state, button_state, x_offset, y_offset,
116
                                  meta_state, button_state, x_offset, y_offset,
3749
118
                                  x_precision, y_precision, mac, down_time,
117
                                  x_precision, y_precision, cookie, down_time,
3750
119
                                  event_time, pointer_count, &pointer_properties, &pointer_coords);
118
                                  event_time, pointer_count, &pointer_properties, &pointer_coords);
3751
120
119
3752
121
    auto mir_ev = mia::Lexicon::translate(android_motion_ev);
120
    auto mir_ev = mia::Lexicon::translate(android_motion_ev);
3753
@@ -130,7 +129,6 @@
3754
130
129
3755
131
    auto tev = mir_input_event_get_touch_event(iev);
130
    auto tev = mir_input_event_get_touch_event(iev);
3756
132
    EXPECT_EQ(pointer_count, mir_touch_event_point_count(tev));
131
    EXPECT_EQ(pointer_count, mir_touch_event_point_count(tev));
3757
133
    // FIXME Test the mac value once the public API has landed in 0.19
3758
134
    
132
    
3759
135
    EXPECT_EQ(pointer_id, mir_touch_event_id(tev, 0));
133
    EXPECT_EQ(pointer_id, mir_touch_event_id(tev, 0));
3760
136
    // Notice these two coordinates are offset by x/y offset
134
    // Notice these two coordinates are offset by x/y offset
3761
@@ -161,7 +159,7 @@
3762
161
    const float y_offset = 9;
159
    const float y_offset = 9;
3763
162
    const float x_precision = 10;
160
    const float x_precision = 10;
3764
163
    const float y_precision = 11;
161
    const float y_precision = 11;
3766
164
    const uint64_t mac = 14;
162
    const mir::cookie::Blob cookie{{14}};
3767
165
    const std::chrono::nanoseconds down_time = std::chrono::nanoseconds(12);
163
    const std::chrono::nanoseconds down_time = std::chrono::nanoseconds(12);
3768
166
    const std::chrono::nanoseconds event_time = std::chrono::nanoseconds(13);
164
    const std::chrono::nanoseconds event_time = std::chrono::nanoseconds(13);
3769
167
    const size_t pointer_count = 2;
165
    const size_t pointer_count = 2;
3770
@@ -203,7 +201,7 @@
3771
203
    android_motion_ev->initialize(device_id, source_id, action, flags,
201
    android_motion_ev->initialize(device_id, source_id, action, flags,
3772
204
                                  edge_flags, meta_state, 0,
202
                                  edge_flags, meta_state, 0,
3773
205
                                  x_offset, y_offset, x_precision, y_precision,
203
                                  x_offset, y_offset, x_precision, y_precision,
3775
206
                                  mac, down_time, event_time, pointer_count,
204
                                  cookie, down_time, event_time, pointer_count,
3776
207
                                  pointer_properties, pointer_coords);
205
                                  pointer_properties, pointer_coords);
3777
208
206
3778
209
    auto mir_ev = mia::Lexicon::translate(android_motion_ev);
207
    auto mir_ev = mia::Lexicon::translate(android_motion_ev);
3779
@@ -218,7 +216,6 @@
3780
218
216
3781
219
    auto tev = mir_input_event_get_touch_event(iev);
217
    auto tev = mir_input_event_get_touch_event(iev);
3782
220
    EXPECT_EQ(pointer_count, mir_touch_event_point_count(tev));
218
    EXPECT_EQ(pointer_count, mir_touch_event_point_count(tev));
3783
221
    // FIXME Test the mac value once the public API has landed in 0.19
3784
222
219
3785
223
    for (unsigned i = 0; i < pointer_count; i++)
220
    for (unsigned i = 0; i < pointer_count; i++)
3786
224
    {
221
    {
3787
225
222
3788
=== modified file 'tests/unit-tests/input/android/test_android_input_sender.cpp'
3789
--- tests/unit-tests/input/android/test_android_input_sender.cpp	2016-01-20 23:59:18 +0000
3790
+++ tests/unit-tests/input/android/test_android_input_sender.cpp	2016-01-25 13:42:04 +0000
3791
@@ -31,11 +31,13 @@
3792
31
#include "mir/test/fake_shared.h"
31
#include "mir/test/fake_shared.h"
3793
32
#include "mir/test/event_matchers.h"
32
#include "mir/test/event_matchers.h"
3794
33
33
3795
34
3796
34
#include "androidfw/Input.h"
35
#include "androidfw/Input.h"
3797
35
#include "androidfw/InputTransport.h"
36
#include "androidfw/InputTransport.h"
3798
36
37
3799
37
#include "mir/input/input_report.h"
38
#include "mir/input/input_report.h"
3801
38
#include "mir/cookie_factory.h"
39
#include "mir/cookie/authority.h"
3802
40
#include "mir/cookie/blob.h"
3803
39
41
3804
40
#include <gtest/gtest.h>
42
#include <gtest/gtest.h>
3805
41
#include <gmock/gmock.h>
43
#include <gmock/gmock.h>
3806
@@ -89,15 +91,6 @@
3807
89
91
3808
90
    std::shared_ptr<ms::Observer> observer;
92
    std::shared_ptr<ms::Observer> observer;
3809
91
};
93
};
3810
92
3811
93
class StubCookieFactory : public mir::cookie::CookieFactory
3812
94
{
3813
95
public:
3814
96
    MirCookie timestamp_to_cookie(uint64_t const&) override { return {0, 0};}
3815
97
    bool attest_timestamp(MirCookie const&) override {return true;}
3816
98
    StubCookieFactory() = default;
3817
99
};
3818
100
3819
101
}
94
}
3820
102
95
3821
103
class AndroidInputSender : public ::testing::Test
96
class AndroidInputSender : public ::testing::Test
3822
@@ -113,11 +106,13 @@
3823
113
    float const minor = 4;
106
    float const minor = 4;
3824
114
    float const size = 8;
107
    float const size = 8;
3825
115
    mir::geometry::Displacement const movement{10, -10};
108
    mir::geometry::Displacement const movement{10, -10};
3828
116
    StubCookieFactory cookie_factory;
109
    std::shared_ptr<mir::cookie::Authority> const cookie_authority;
3829
117
    mi::DefaultEventBuilder builder{MirInputDeviceId(), mt::fake_shared(cookie_factory)};
110
    mi::DefaultEventBuilder builder;
3830
118
111
3831
119
    AndroidInputSender()
112
    AndroidInputSender()
3833
120
        : key_event(builder.key_event(std::chrono::nanoseconds(1), mir_keyboard_action_down, 7, test_scan_code)),
113
        : cookie_authority(mir::cookie::Authority::create_from({0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88})),
3834
114
          builder(MirInputDeviceId(), cookie_authority),
3835
115
          key_event(builder.key_event(std::chrono::nanoseconds(1), mir_keyboard_action_down, 7, test_scan_code)),
3836
121
          motion_event(builder.touch_event(std::chrono::nanoseconds(-1))),
116
          motion_event(builder.touch_event(std::chrono::nanoseconds(-1))),
3837
122
          pointer_event(builder.pointer_event(std::chrono::nanoseconds(123), mir_pointer_action_motion,
117
          pointer_event(builder.pointer_event(std::chrono::nanoseconds(123), mir_pointer_action_motion,
3838
123
                                        mir_pointer_button_primary, 0.0f, 0.0f,
118
                                        mir_pointer_button_primary, 0.0f, 0.0f,
3839
124
119
3840
=== modified file 'tests/unit-tests/input/evdev/test_libinput_device.cpp'
3841
--- tests/unit-tests/input/evdev/test_libinput_device.cpp	2016-01-21 22:09:00 +0000
3842
+++ tests/unit-tests/input/evdev/test_libinput_device.cpp	2016-01-25 13:42:04 +0000
3843
@@ -31,7 +31,7 @@
3844
31
#include "mir/test/doubles/mock_libinput.h"
31
#include "mir/test/doubles/mock_libinput.h"
3845
32
#include "mir/test/gmock_fixes.h"
32
#include "mir/test/gmock_fixes.h"
3846
33
#include "mir/udev/wrapper.h"
33
#include "mir/udev/wrapper.h"
3848
34
#include "mir/cookie_factory.h"
34
#include "mir/cookie/authority.h"
3849
35
#include "mir_test_framework/udev_environment.h"
35
#include "mir_test_framework/udev_environment.h"
3850
36
36
3851
37
#include <gmock/gmock.h>
37
#include <gmock/gmock.h>
3852
@@ -74,8 +74,8 @@
3853
74
74
3854
75
struct MockEventBuilder : mi::EventBuilder
75
struct MockEventBuilder : mi::EventBuilder
3855
76
{
76
{
3858
77
    std::shared_ptr<mir::cookie::CookieFactory> const cookie_factory = mir::cookie::CookieFactory::create_keeping_secret();
77
    std::shared_ptr<mir::cookie::Authority> const cookie_authority = mir::cookie::Authority::create();
3859
78
    mi::DefaultEventBuilder builder{MirInputDeviceId{3}, cookie_factory};
78
    mi::DefaultEventBuilder builder{MirInputDeviceId{3}, cookie_authority};
3860
79
    MockEventBuilder()
79
    MockEventBuilder()
3861
80
    {
80
    {
3862
81
        ON_CALL(*this, key_event(_,_,_,_))
81
        ON_CALL(*this, key_event(_,_,_,_))
3863
82
82
3864
=== modified file 'tests/unit-tests/input/test_default_input_device_hub.cpp'
3865
--- tests/unit-tests/input/test_default_input_device_hub.cpp	2016-01-20 23:59:18 +0000
3866
+++ tests/unit-tests/input/test_default_input_device_hub.cpp	2016-01-25 13:42:04 +0000
3867
@@ -28,11 +28,11 @@
3868
28
#include "mir/test/event_matchers.h"
28
#include "mir/test/event_matchers.h"
3869
29
#include "mir/test/fake_shared.h"
29
#include "mir/test/fake_shared.h"
3870
30
30
3871
31
#include "mir/cookie_factory.h"
3872
32
#include "mir/dispatch/action_queue.h"
31
#include "mir/dispatch/action_queue.h"
3873
33
#include "mir/dispatch/multiplexing_dispatchable.h"
32
#include "mir/dispatch/multiplexing_dispatchable.h"
3874
34
#include "mir/events/event_builders.h"
33
#include "mir/events/event_builders.h"
3875
35
#include "mir/input/cursor_listener.h"
34
#include "mir/input/cursor_listener.h"
3876
35
#include "mir/cookie/authority.h"
3877
36
#include "mir/input/device.h"
36
#include "mir/input/device.h"
3878
37
#include "mir/input/input_device.h"
37
#include "mir/input/input_device.h"
3879
38
38
3880
@@ -54,13 +54,13 @@
3881
54
    mtd::TriggeredMainLoop observer_loop;
54
    mtd::TriggeredMainLoop observer_loop;
3882
55
    Nice<mtd::MockInputDispatcher> mock_dispatcher;
55
    Nice<mtd::MockInputDispatcher> mock_dispatcher;
3883
56
    Nice<mtd::MockInputRegion> mock_region;
56
    Nice<mtd::MockInputRegion> mock_region;
3885
57
    std::shared_ptr<mir::cookie::CookieFactory> cookie_factory = mir::cookie::CookieFactory::create_keeping_secret();
57
    std::shared_ptr<mir::cookie::Authority> cookie_authority = mir::cookie::Authority::create();
3886
58
    mtd::StubCursorListener stub_cursor_listener;
58
    mtd::StubCursorListener stub_cursor_listener;
3887
59
    mtd::StubTouchVisualizer stub_visualizer;
59
    mtd::StubTouchVisualizer stub_visualizer;
3888
60
    mir::dispatch::MultiplexingDispatchable multiplexer;
60
    mir::dispatch::MultiplexingDispatchable multiplexer;
3889
61
    mi::DefaultInputDeviceHub hub{mt::fake_shared(mock_dispatcher), mt::fake_shared(multiplexer),
61
    mi::DefaultInputDeviceHub hub{mt::fake_shared(mock_dispatcher), mt::fake_shared(multiplexer),
3890
62
                                  mt::fake_shared(observer_loop), mt::fake_shared(stub_visualizer),
62
                                  mt::fake_shared(observer_loop), mt::fake_shared(stub_visualizer),
3892
63
                                  mt::fake_shared(stub_cursor_listener), mt::fake_shared(mock_region), cookie_factory};
63
                                  mt::fake_shared(stub_cursor_listener), mt::fake_shared(mock_region), cookie_authority};
3893
64
    Nice<mtd::MockInputDeviceObserver> mock_observer;
64
    Nice<mtd::MockInputDeviceObserver> mock_observer;
3894
65
    Nice<mtd::MockInputDevice> device{"device","dev-1", mi::DeviceCapability::unknown};
65
    Nice<mtd::MockInputDevice> device{"device","dev-1", mi::DeviceCapability::unknown};
3895
66
    Nice<mtd::MockInputDevice> another_device{"another_device","dev-2", mi::DeviceCapability::keyboard};
66
    Nice<mtd::MockInputDevice> another_device{"another_device","dev-2", mi::DeviceCapability::keyboard};
3896
67
67
3897
=== modified file 'tests/unit-tests/input/test_event_builders.cpp'
3898
--- tests/unit-tests/input/test_event_builders.cpp	2016-01-20 23:59:18 +0000
3899
+++ tests/unit-tests/input/test_event_builders.cpp	2016-01-25 13:42:04 +0000
3900
@@ -29,7 +29,7 @@
3901
29
{
29
{
3902
30
    MirInputDeviceId const device_id = 7;
30
    MirInputDeviceId const device_id = 7;
3903
31
    std::chrono::nanoseconds const timestamp = std::chrono::nanoseconds(39);
31
    std::chrono::nanoseconds const timestamp = std::chrono::nanoseconds(39);
3905
32
    uint64_t const mac = 12;
32
    std::vector<uint8_t> const cookie{};
3906
33
    MirInputEventModifiers const modifiers = mir_input_event_modifier_meta;
33
    MirInputEventModifiers const modifiers = mir_input_event_modifier_meta;
3907
34
};
34
};
3908
35
}
35
}
3909
@@ -41,7 +41,7 @@
3910
41
    int const scan_code = 17;
41
    int const scan_code = 17;
3911
42
42
3912
43
   auto ev = mev::make_event(device_id, timestamp,
43
   auto ev = mev::make_event(device_id, timestamp,
3914
44
       mac, action, key_code, scan_code, modifiers);
44
       cookie, action, key_code, scan_code, modifiers);
3915
45
   auto e = ev.get();
45
   auto e = ev.get();
3916
46
46
3917
47
   EXPECT_EQ(mir_event_type_input, mir_event_get_type(e));
47
   EXPECT_EQ(mir_event_type_input, mir_event_get_type(e));
3918
@@ -52,7 +52,6 @@
3919
52
   EXPECT_EQ(key_code, mir_keyboard_event_key_code(kev));
52
   EXPECT_EQ(key_code, mir_keyboard_event_key_code(kev));
3920
53
   EXPECT_EQ(scan_code, mir_keyboard_event_scan_code(kev));
53
   EXPECT_EQ(scan_code, mir_keyboard_event_scan_code(kev));
3921
54
   EXPECT_EQ(modifiers, mir_keyboard_event_modifiers(kev));
54
   EXPECT_EQ(modifiers, mir_keyboard_event_modifiers(kev));
3922
55
   // FIXME Test the mac value once the public API has landed in 0.19
3923
56
}
55
}
3924
57
56
3925
58
TEST_F(InputEventBuilder, makes_valid_touch_event)
57
TEST_F(InputEventBuilder, makes_valid_touch_event)
3926
@@ -69,7 +68,7 @@
3927
69
    float size_values[] = {4, 9, 6};
68
    float size_values[] = {4, 9, 6};
3928
70
69
3929
71
   auto ev = mev::make_event(device_id, timestamp,
70
   auto ev = mev::make_event(device_id, timestamp,
3931
72
       mac, modifiers);
71
       cookie, modifiers);
3932
73
   for (unsigned i = 0; i < touch_count; i++)
72
   for (unsigned i = 0; i < touch_count; i++)
3933
74
   {
73
   {
3934
75
       mev::add_touch(*ev, touch_ids[i], actions[i], tooltypes[i], x_axis_values[i], y_axis_values[i],
74
       mev::add_touch(*ev, touch_ids[i], actions[i], tooltypes[i], x_axis_values[i], y_axis_values[i],
3935
@@ -83,7 +82,6 @@
3936
83
   auto tev = mir_input_event_get_touch_event(ie);
82
   auto tev = mir_input_event_get_touch_event(ie);
3937
84
   EXPECT_EQ(modifiers, mir_touch_event_modifiers(tev));
83
   EXPECT_EQ(modifiers, mir_touch_event_modifiers(tev));
3938
85
   EXPECT_EQ(touch_count, mir_touch_event_point_count(tev));
84
   EXPECT_EQ(touch_count, mir_touch_event_point_count(tev));
3939
86
   // FIXME Test the mac value once the public API has landed in 0.19
3940
87
85
3941
88
   for (unsigned i = 0; i < touch_count; i++)
86
   for (unsigned i = 0; i < touch_count; i++)
3942
89
   {
87
   {
3943
@@ -106,7 +104,7 @@
3944
106
    float x_axis_value = 3.9, y_axis_value = 7.4, hscroll_value = .9, vscroll_value = .3;
104
    float x_axis_value = 3.9, y_axis_value = 7.4, hscroll_value = .9, vscroll_value = .3;
3945
107
    auto const relative_x_value = 0.0;
105
    auto const relative_x_value = 0.0;
3946
108
    auto const relative_y_value = 0.0;
106
    auto const relative_y_value = 0.0;
3948
109
    auto ev = mev::make_event(device_id, timestamp, mac, modifiers, 
107
    auto ev = mev::make_event(device_id, timestamp, cookie, modifiers, 
3949
110
        action, depressed_buttons, x_axis_value, y_axis_value,
108
        action, depressed_buttons, x_axis_value, y_axis_value,
3950
111
        hscroll_value, vscroll_value, relative_x_value, relative_y_value);
109
        hscroll_value, vscroll_value, relative_x_value, relative_y_value);
3951
112
    auto e = ev.get();
110
    auto e = ev.get();
3952
@@ -117,7 +115,6 @@
3953
117
    auto pev = mir_input_event_get_pointer_event(ie);
115
    auto pev = mir_input_event_get_pointer_event(ie);
3954
118
    EXPECT_EQ(modifiers, mir_pointer_event_modifiers(pev));
116
    EXPECT_EQ(modifiers, mir_pointer_event_modifiers(pev));
3955
119
    EXPECT_EQ(action, mir_pointer_event_action(pev));
117
    EXPECT_EQ(action, mir_pointer_event_action(pev));
3956
120
    // FIXME Test the mac value once the public API has landed in 0.19
3957
121
    EXPECT_TRUE(mir_pointer_event_button_state(pev, mir_pointer_button_back));
118
    EXPECT_TRUE(mir_pointer_event_button_state(pev, mir_pointer_button_back));
3958
122
    EXPECT_TRUE(mir_pointer_event_button_state(pev, mir_pointer_button_tertiary));
119
    EXPECT_TRUE(mir_pointer_event_button_state(pev, mir_pointer_button_tertiary));
3959
123
    EXPECT_FALSE(mir_pointer_event_button_state(pev, mir_pointer_button_primary));
120
    EXPECT_FALSE(mir_pointer_event_button_state(pev, mir_pointer_button_primary));
3960
@@ -136,7 +133,7 @@
3961
136
{
133
{
3962
137
    MirTouchAction action =  mir_touch_action_down;
134
    MirTouchAction action =  mir_touch_action_down;
3963
138
135
3965
139
    auto ev = mev::make_event(device_id, timestamp, mac, modifiers);
136
    auto ev = mev::make_event(device_id, timestamp, cookie, modifiers);
3966
140
    mev::add_touch(*ev, 0, action, mir_touch_tooltype_finger, 0, 0, 0, 0, 0, 0);
137
    mev::add_touch(*ev, 0, action, mir_touch_tooltype_finger, 0, 0, 0, 0, 0, 0);
3967
141
    auto e = ev.get();
138
    auto e = ev.get();
3968
142
139
3969
@@ -152,7 +149,7 @@
3970
152
{
149
{
3971
153
    MirTouchAction action =  mir_touch_action_up;
150
    MirTouchAction action =  mir_touch_action_up;
3972
154
151
3974
155
    auto ev = mev::make_event(device_id, timestamp, mac, modifiers);
152
    auto ev = mev::make_event(device_id, timestamp, cookie, modifiers);
3975
156
    mev::add_touch(*ev, 0, action, mir_touch_tooltype_finger, 0, 0, 0, 0, 0, 0);
153
    mev::add_touch(*ev, 0, action, mir_touch_tooltype_finger, 0, 0, 0, 0, 0, 0);
3976
157
    auto e = ev.get();
154
    auto e = ev.get();
3977
158
155
3978
@@ -162,7 +159,6 @@
3979
162
    auto tev = mir_input_event_get_touch_event(ie);
159
    auto tev = mir_input_event_get_touch_event(ie);
3980
163
160
3981
164
    EXPECT_EQ(action, mir_touch_event_action(tev, 0));
161
    EXPECT_EQ(action, mir_touch_event_action(tev, 0));
3982
165
    // FIXME Test the mac value once the public API has landed in 0.19
3983
166
}
162
}
3984
167
163
3985
168
TEST_F(InputEventBuilder, map_to_hover_if_no_button_pressed)
164
TEST_F(InputEventBuilder, map_to_hover_if_no_button_pressed)
3986
@@ -171,7 +167,7 @@
3987
171
    auto const relative_x_value = 0.0;
167
    auto const relative_x_value = 0.0;
3988
172
    auto const relative_y_value = 0.0;
168
    auto const relative_y_value = 0.0;
3989
173
    MirPointerAction action = mir_pointer_action_motion;
169
    MirPointerAction action = mir_pointer_action_motion;
3991
174
    auto ev = mev::make_event(device_id, timestamp, mac, modifiers,
170
    auto ev = mev::make_event(device_id, timestamp, cookie, modifiers,
3992
175
        action, 0, x_axis_value, y_axis_value,
171
        action, 0, x_axis_value, y_axis_value,
3993
176
        hscroll_value, vscroll_value, relative_x_value, relative_y_value);
172
        hscroll_value, vscroll_value, relative_x_value, relative_y_value);
3994
177
    auto e = ev.get();
173
    auto e = ev.get();
3995
@@ -181,5 +177,4 @@
3996
181
    auto pev = mir_input_event_get_pointer_event(ie);
177
    auto pev = mir_input_event_get_pointer_event(ie);
3997
182
    EXPECT_EQ(modifiers, mir_pointer_event_modifiers(pev));
178
    EXPECT_EQ(modifiers, mir_pointer_event_modifiers(pev));
3998
183
    EXPECT_EQ(action, mir_pointer_event_action(pev));
179
    EXPECT_EQ(action, mir_pointer_event_action(pev));
3999
184
    // FIXME Test the mac value once the public API has landed in 0.19
4000
185
}
180
}
4001
186
181
4002
=== modified file 'tests/unit-tests/input/test_event_filter_chain_dispatcher.cpp'
4003
--- tests/unit-tests/input/test_event_filter_chain_dispatcher.cpp	2016-01-20 23:59:18 +0000
4004
+++ tests/unit-tests/input/test_event_filter_chain_dispatcher.cpp	2016-01-25 13:42:04 +0000
4005
@@ -43,7 +43,7 @@
4006
43
struct EventFilterChainDispatcher : public ::testing::Test
43
struct EventFilterChainDispatcher : public ::testing::Test
4007
44
{
44
{
4008
45
    mir::EventUPtr const event = mir::events::make_event(MirInputDeviceId(),
45
    mir::EventUPtr const event = mir::events::make_event(MirInputDeviceId(),
4010
46
        std::chrono::nanoseconds(0), 0, MirKeyboardAction(),
46
        std::chrono::nanoseconds(0), std::vector<uint8_t>{}, MirKeyboardAction(),
4011
47
        xkb_keysym_t(), 0, MirInputEventModifiers());
47
        xkb_keysym_t(), 0, MirInputEventModifiers());
4012
48
};
48
};
4013
49
}
49
}
4014
50
50
4015
=== modified file 'tests/unit-tests/input/test_key_repeat_dispatcher.cpp'
4016
--- tests/unit-tests/input/test_key_repeat_dispatcher.cpp	2016-01-20 23:59:18 +0000
4017
+++ tests/unit-tests/input/test_key_repeat_dispatcher.cpp	2016-01-25 13:42:04 +0000
4018
@@ -22,7 +22,7 @@
4019
22
#include "mir/events/event_builders.h"
22
#include "mir/events/event_builders.h"
4020
23
#include "mir/time/alarm.h"
23
#include "mir/time/alarm.h"
4021
24
#include "mir/time/alarm_factory.h"
24
#include "mir/time/alarm_factory.h"
4023
25
#include "mir/cookie_factory.h"
25
#include "mir/cookie/authority.h"
4024
26
26
4025
27
#include "mir/test/event_matchers.h"
27
#include "mir/test/event_matchers.h"
4026
28
#include "mir/test/doubles/mock_input_dispatcher.h"
28
#include "mir/test/doubles/mock_input_dispatcher.h"
4027
@@ -62,12 +62,12 @@
4028
62
struct KeyRepeatDispatcher : public testing::Test
62
struct KeyRepeatDispatcher : public testing::Test
4029
63
{
63
{
4030
64
    KeyRepeatDispatcher()
64
    KeyRepeatDispatcher()
4032
65
        : dispatcher(mock_next_dispatcher, mock_alarm_factory, cookie_factory, true, repeat_time, repeat_delay)
65
        : dispatcher(mock_next_dispatcher, mock_alarm_factory, cookie_authority, true, repeat_time, repeat_delay)
4033
66
    {
66
    {
4034
67
    }
67
    }
4035
68
    std::shared_ptr<mtd::MockInputDispatcher> mock_next_dispatcher = std::make_shared<mtd::MockInputDispatcher>();
68
    std::shared_ptr<mtd::MockInputDispatcher> mock_next_dispatcher = std::make_shared<mtd::MockInputDispatcher>();
4036
69
    std::shared_ptr<MockAlarmFactory> mock_alarm_factory = std::make_shared<MockAlarmFactory>();
69
    std::shared_ptr<MockAlarmFactory> mock_alarm_factory = std::make_shared<MockAlarmFactory>();
4038
70
    std::shared_ptr<mir::cookie::CookieFactory> cookie_factory = mir::cookie::CookieFactory::create_keeping_secret();
70
    std::shared_ptr<mir::cookie::Authority> cookie_authority = mir::cookie::Authority::create();
4039
71
    std::chrono::milliseconds const repeat_time{2};
71
    std::chrono::milliseconds const repeat_time{2};
4040
72
    std::chrono::milliseconds const repeat_delay{1};
72
    std::chrono::milliseconds const repeat_delay{1};
4041
73
    mi::KeyRepeatDispatcher dispatcher;
73
    mi::KeyRepeatDispatcher dispatcher;
4042
@@ -90,11 +90,11 @@
4043
90
{
90
{
4044
91
mir::EventUPtr a_key_down_event()
91
mir::EventUPtr a_key_down_event()
4045
92
{
92
{
4047
93
    return mev::make_event(0, std::chrono::nanoseconds(0), 0, mir_keyboard_action_down, 0, 0, mir_input_event_modifier_alt);
93
    return mev::make_event(0, std::chrono::nanoseconds(0), std::vector<uint8_t>{}, mir_keyboard_action_down, 0, 0, mir_input_event_modifier_alt);
4048
94
}
94
}
4049
95
mir::EventUPtr a_key_up_event()
95
mir::EventUPtr a_key_up_event()
4050
96
{
96
{
4052
97
    return mev::make_event(0, std::chrono::nanoseconds(0), 0, mir_keyboard_action_up, 0, 0, mir_input_event_modifier_alt);
97
    return mev::make_event(0, std::chrono::nanoseconds(0), std::vector<uint8_t>{}, mir_keyboard_action_up, 0, 0, mir_input_event_modifier_alt);
4053
98
}
98
}
4054
99
}
99
}
4055
100
100
4056
101
101
4057
=== modified file 'tests/unit-tests/input/test_surface_input_dispatcher.cpp'
4058
--- tests/unit-tests/input/test_surface_input_dispatcher.cpp	2016-01-20 23:59:18 +0000
4059
+++ tests/unit-tests/input/test_surface_input_dispatcher.cpp	2016-01-25 13:42:04 +0000
4060
@@ -138,12 +138,12 @@
4061
138
    }
138
    }
4062
139
    mir::EventUPtr press(int scan_code = 7)
139
    mir::EventUPtr press(int scan_code = 7)
4063
140
    {
140
    {
4065
141
        return mev::make_event(id, std::chrono::nanoseconds(0), 0,
141
        return mev::make_event(id, std::chrono::nanoseconds(0), std::vector<uint8_t>{},
4066
142
	    mir_keyboard_action_down, 0, scan_code, mir_input_event_modifier_alt);
142
	    mir_keyboard_action_down, 0, scan_code, mir_input_event_modifier_alt);
4067
143
    }
143
    }
4068
144
    mir::EventUPtr release(int scan_code = 7)
144
    mir::EventUPtr release(int scan_code = 7)
4069
145
    {
145
    {
4071
146
        return mev::make_event(id, std::chrono::nanoseconds(0), 0,
146
        return mev::make_event(id, std::chrono::nanoseconds(0), std::vector<uint8_t>{},
4072
147
	    mir_keyboard_action_up, 0, scan_code, mir_input_event_modifier_alt);
147
	    mir_keyboard_action_up, 0, scan_code, mir_input_event_modifier_alt);
4073
148
    }
148
    }
4074
149
    MirInputDeviceId const id;
149
    MirInputDeviceId const id;
4075
@@ -159,7 +159,7 @@
4076
159
159
4077
160
    mir::EventUPtr move_to(geom::Point const& location)
160
    mir::EventUPtr move_to(geom::Point const& location)
4078
161
    {
161
    {
4080
162
        return mev::make_event(id, std::chrono::nanoseconds(0), 0,
162
        return mev::make_event(id, std::chrono::nanoseconds(0), std::vector<uint8_t>{},
4081
163
            0, mir_pointer_action_motion, buttons,
163
            0, mir_pointer_action_motion, buttons,
4082
164
            location.x.as_int(), location.y.as_int(),
164
            location.x.as_int(), location.y.as_int(),
4083
165
            0, 0, 0, 0);
165
            0, 0, 0, 0);
4084
@@ -168,7 +168,7 @@
4085
168
    {
168
    {
4086
169
        buttons &= ~button;
169
        buttons &= ~button;
4087
170
170
4089
171
        return mev::make_event(id, std::chrono::nanoseconds(0), 0,
171
        return mev::make_event(id, std::chrono::nanoseconds(0), std::vector<uint8_t>{},
4090
172
            0, mir_pointer_action_button_up, buttons,
172
            0, mir_pointer_action_button_up, buttons,
4091
173
            location.x.as_int(), location.y.as_int(),
173
            location.x.as_int(), location.y.as_int(),
4092
174
            0, 0, 0, 0);
174
            0, 0, 0, 0);
4093
@@ -177,7 +177,7 @@
4094
177
    {
177
    {
4095
178
        buttons |= button;
178
        buttons |= button;
4096
179
        
179
        
4098
180
        return mev::make_event(id, std::chrono::nanoseconds(0), 0,
180
        return mev::make_event(id, std::chrono::nanoseconds(0), std::vector<uint8_t>{},
4099
181
            0, mir_pointer_action_button_down, buttons,
181
            0, mir_pointer_action_button_down, buttons,
4100
182
            location.x.as_int(), location.y.as_int(),
182
            location.x.as_int(), location.y.as_int(),
4101
183
            0, 0, 0, 0);
183
            0, 0, 0, 0);
4102
@@ -196,7 +196,7 @@
4103
196
    
196
    
4104
197
    mir::EventUPtr move_to(geom::Point const& point)
197
    mir::EventUPtr move_to(geom::Point const& point)
4105
198
    {
198
    {
4107
199
        auto ev = mev::make_event(id, std::chrono::nanoseconds(0), 0, 0);
199
        auto ev = mev::make_event(id, std::chrono::nanoseconds(0), std::vector<uint8_t>{}, 0);
4108
200
        mev::add_touch(*ev, 0, mir_touch_action_change,
200
        mev::add_touch(*ev, 0, mir_touch_action_change,
4109
201
                       mir_touch_tooltype_finger, point.x.as_int(), point.y.as_int(),
201
                       mir_touch_tooltype_finger, point.x.as_int(), point.y.as_int(),
4110
202
                       touched ? 1.0 : 0.0,
202
                       touched ? 1.0 : 0.0,
4111
@@ -209,7 +209,7 @@
4112
209
    {
209
    {
4113
210
        touched = true;
210
        touched = true;
4114
211
        
211
        
4116
212
        auto ev = mev::make_event(id, std::chrono::nanoseconds(0), 0, 0);
212
        auto ev = mev::make_event(id, std::chrono::nanoseconds(0), std::vector<uint8_t>{}, 0);
4117
213
        mev::add_touch(*ev, 0, mir_touch_action_down,
213
        mev::add_touch(*ev, 0, mir_touch_action_down,
4118
214
                       mir_touch_tooltype_finger, point.x.as_int(), point.y.as_int(),
214
                       mir_touch_tooltype_finger, point.x.as_int(), point.y.as_int(),
4119
215
                       1.0, 1.0, 1.0, 1.0);
215
                       1.0, 1.0, 1.0, 1.0);
4120
@@ -219,7 +219,7 @@
4121
219
    {
219
    {
4122
220
        touched = true;
220
        touched = true;
4123
221
221
4125
222
        auto ev = mev::make_event(id, std::chrono::nanoseconds(0), 0, 0);
222
        auto ev = mev::make_event(id, std::chrono::nanoseconds(0), std::vector<uint8_t>{}, 0);
4126
223
        mev::add_touch(*ev, 0, mir_touch_action_down,
223
        mev::add_touch(*ev, 0, mir_touch_action_down,
4127
224
                       mir_touch_tooltype_finger, point1.x.as_int(), point1.y.as_int(),
224
                       mir_touch_tooltype_finger, point1.x.as_int(), point1.y.as_int(),
4128
225
                       1.0, 1.0, 1.0, 1.0);
225
                       1.0, 1.0, 1.0, 1.0);
4129
@@ -232,7 +232,7 @@
4130
232
    {
232
    {
4131
233
        touched = false;
233
        touched = false;
4132
234
        
234
        
4134
235
        auto ev = mev::make_event(id, std::chrono::nanoseconds(0), 0, 0);
235
        auto ev = mev::make_event(id, std::chrono::nanoseconds(0), std::vector<uint8_t>{}, 0);
4135
236
        mev::add_touch(*ev, 0, mir_touch_action_up,
236
        mev::add_touch(*ev, 0, mir_touch_action_up,
4136
237
                       mir_touch_tooltype_finger, point.x.as_int(), point.y.as_int(),
237
                       mir_touch_tooltype_finger, point.x.as_int(), point.y.as_int(),
4137
238
                       0.0, 0.0, 0.0, 0.0);
238
                       0.0, 0.0, 0.0, 0.0);
4138
@@ -242,7 +242,7 @@
4139
242
    {
242
    {
4140
243
        touched = false;
243
        touched = false;
4141
244
244
4143
245
        auto ev = mev::make_event(id, std::chrono::nanoseconds(0), 0, 0);
245
        auto ev = mev::make_event(id, std::chrono::nanoseconds(0), std::vector<uint8_t>{}, 0);
4144
246
        mev::add_touch(*ev, 0, mir_touch_action_up,
246
        mev::add_touch(*ev, 0, mir_touch_action_up,
4145
247
                       mir_touch_tooltype_finger, point1.x.as_int(), point1.y.as_int(),
247
                       mir_touch_tooltype_finger, point1.x.as_int(), point1.y.as_int(),
4146
248
                       1.0, 1.0, 1.0, 1.0);
248
                       1.0, 1.0, 1.0, 1.0);
4147
249
249
4148
=== modified file 'tests/unit-tests/input/test_validator.cpp'
4149
--- tests/unit-tests/input/test_validator.cpp	2016-01-20 23:59:18 +0000
4150
+++ tests/unit-tests/input/test_validator.cpp	2016-01-25 13:42:04 +0000
4151
@@ -67,7 +67,7 @@
4152
67
mir::EventUPtr make_touch(MirTouchId id, MirTouchAction action)
67
mir::EventUPtr make_touch(MirTouchId id, MirTouchAction action)
4153
68
{
68
{
4154
69
    auto ev = mev::make_event(MirInputDeviceId(0), std::chrono::nanoseconds(0),
69
    auto ev = mev::make_event(MirInputDeviceId(0), std::chrono::nanoseconds(0),
4156
70
                              0, mir_input_event_modifier_none);
70
                              std::vector<uint8_t>{}, mir_input_event_modifier_none);
4157
71
    add_another_touch(ev, id, action);
71
    add_another_touch(ev, id, action);
4158
72
    return ev;
72
    return ev;
4159
73
}
73
}
4160
74
74
4161
=== modified file 'tests/unit-tests/input/test_x11_platform.cpp'
4162
--- tests/unit-tests/input/test_x11_platform.cpp	2016-01-20 23:59:18 +0000
4163
+++ tests/unit-tests/input/test_x11_platform.cpp	2016-01-25 13:42:04 +0000
4164
@@ -32,7 +32,7 @@
4165
32
#include "mir/test/doubles/mock_x11.h"
32
#include "mir/test/doubles/mock_x11.h"
4166
33
#include "mir/test/doubles/mock_x11.h"
33
#include "mir/test/doubles/mock_x11.h"
4167
34
#include "mir/test/fake_shared.h"
34
#include "mir/test/fake_shared.h"
4169
35
#include "mir/cookie_factory.h"
35
#include "mir/cookie/authority.h"
4170
36
#include "mir/test/event_matchers.h"
36
#include "mir/test/event_matchers.h"
4171
37
37
4172
38
namespace md = mir::dispatch;
38
namespace md = mir::dispatch;
4173
@@ -51,7 +51,7 @@
4174
51
    NiceMock<mtd::MockInputSink> mock_keyboard_sink;
51
    NiceMock<mtd::MockInputSink> mock_keyboard_sink;
4175
52
    NiceMock<mtd::MockX11> mock_x11;
52
    NiceMock<mtd::MockX11> mock_x11;
4176
53
    NiceMock<mtd::MockInputDeviceRegistry> mock_registry;
53
    NiceMock<mtd::MockInputDeviceRegistry> mock_registry;
4178
54
    mir::input::DefaultEventBuilder builder{0, mir::cookie::CookieFactory::create_keeping_secret()};
54
    mir::input::DefaultEventBuilder builder{0, mir::cookie::Authority::create()};
4179
55
55
4180
56
    mir::input::X::XInputPlatform x11_platform{
56
    mir::input::X::XInputPlatform x11_platform{
4181
57
        mt::fake_shared(mock_registry),
57
        mt::fake_shared(mock_registry),
4182
58
58
4183
=== modified file 'tests/unit-tests/scene/test_abstract_shell.cpp'
4184
--- tests/unit-tests/scene/test_abstract_shell.cpp	2016-01-20 23:59:18 +0000
4185
+++ tests/unit-tests/scene/test_abstract_shell.cpp	2016-01-25 13:42:04 +0000
4186
@@ -144,7 +144,7 @@
4187
144
    }
144
    }
4188
145
145
4189
146
    std::chrono::nanoseconds const event_timestamp = std::chrono::nanoseconds(0);
146
    std::chrono::nanoseconds const event_timestamp = std::chrono::nanoseconds(0);
4191
147
    uint64_t const mac = 0;
147
    std::vector<uint8_t> const cookie;
4192
148
};
148
};
4193
149
}
149
}
4194
150
150
4195
@@ -286,7 +286,7 @@
4196
286
    auto const event = mir::events::make_event(
286
    auto const event = mir::events::make_event(
4197
287
        mir_input_event_type_key,
287
        mir_input_event_type_key,
4198
288
        event_timestamp,
288
        event_timestamp,
4200
289
        mac,
289
        cookie,
4201
290
        action,
290
        action,
4202
291
        key_code,
291
        key_code,
4203
292
        scan_code,
292
        scan_code,
4204
@@ -307,7 +307,7 @@
4205
307
    auto const event = mir::events::make_event(
307
    auto const event = mir::events::make_event(
4206
308
        mir_input_event_type_touch,
308
        mir_input_event_type_touch,
4207
309
        event_timestamp,
309
        event_timestamp,
4209
310
        mac,
310
        cookie,
4210
311
        modifiers);
311
        modifiers);
4211
312
312
4212
313
    EXPECT_CALL(*wm, handle_touch_event(_))
313
    EXPECT_CALL(*wm, handle_touch_event(_))
4213
@@ -333,7 +333,7 @@
4214
333
    auto const event = mir::events::make_event(
333
    auto const event = mir::events::make_event(
4215
334
        mir_input_event_type_pointer,
334
        mir_input_event_type_pointer,
4216
335
        event_timestamp,
335
        event_timestamp,
4218
336
        mac,
336
        cookie,
4219
337
        modifiers,
337
        modifiers,
4220
338
        action,
338
        action,
4221
339
        buttons_pressed,
339
        buttons_pressed,
4222
340
340
4223
=== modified file 'tests/unit-tests/scene/test_surface.cpp'
4224
--- tests/unit-tests/scene/test_surface.cpp	2016-01-20 23:59:18 +0000
4225
+++ tests/unit-tests/scene/test_surface.cpp	2016-01-25 13:42:04 +0000
4226
@@ -407,9 +407,9 @@
4227
407
        std::shared_ptr<mg::CursorImage>(),
407
        std::shared_ptr<mg::CursorImage>(),
4228
408
        report);
408
        report);
4229
409
409
4231
410
    auto key_event = mev::make_event(MirInputDeviceId(0), std::chrono::nanoseconds(0), 0,
410
    auto key_event = mev::make_event(MirInputDeviceId(0), std::chrono::nanoseconds(0), std::vector<uint8_t>{},
4232
411
                                     mir_keyboard_action_down, 0, 0, mir_input_event_modifier_none);
411
                                     mir_keyboard_action_down, 0, 0, mir_input_event_modifier_none);
4234
412
    auto touch_event = mev::make_event(MirInputDeviceId(0), std::chrono::nanoseconds(0), 0,
412
    auto touch_event = mev::make_event(MirInputDeviceId(0), std::chrono::nanoseconds(0), std::vector<uint8_t>{},
4235
413
                                       mir_input_event_modifier_none);
413
                                       mir_input_event_modifier_none);
4236
414
    mev::add_touch(*touch_event, 0, mir_touch_action_down, mir_touch_tooltype_finger, 0, 0,
414
    mev::add_touch(*touch_event, 0, mir_touch_action_down, mir_touch_tooltype_finger, 0, 0,
4237
415
        0, 0, 0, 0);
415
        0, 0, 0, 0);
4238
416
416
4239
=== modified file 'tests/unit-tests/test_mir_cookie.cpp'
4240
--- tests/unit-tests/test_mir_cookie.cpp	2016-01-20 23:59:18 +0000
4241
+++ tests/unit-tests/test_mir_cookie.cpp	2016-01-25 13:42:04 +0000
4242
@@ -16,94 +16,102 @@
4243
16
 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
16
 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
4244
17
 */
17
 */
4245
18
18
4247
19
#include "mir/cookie_factory.h"
19
#include "mir/cookie/authority.h"
4248
20
#include "mir/cookie/cookie.h"
4249
20
21
4250
21
#include <gtest/gtest.h>
22
#include <gtest/gtest.h>
4251
22
#include <gmock/gmock.h>
23
#include <gmock/gmock.h>
4252
23
24
4254
24
TEST(MirCookieFactory, attests_real_timestamp)
25
TEST(MirCookieAuthority, attests_real_timestamp)
4255
25
{
26
{
4256
26
    std::vector<uint8_t> secret{ 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xde, 0x01 };
27
    std::vector<uint8_t> secret{ 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xde, 0x01 };
4258
27
    auto factory = mir::cookie::CookieFactory::create_from_secret(secret);
28
    auto authority = mir::cookie::Authority::create_from(secret);
4259
28
29
4260
29
    uint64_t mock_timestamp{0x322322322332};
30
    uint64_t mock_timestamp{0x322322322332};
4261
30
31
4265
31
    auto cookie = factory->timestamp_to_cookie(mock_timestamp);
32
    auto cookie = authority->make_cookie(mock_timestamp);
4266
32
33
    EXPECT_NO_THROW({
4267
33
    EXPECT_TRUE(factory->attest_timestamp(cookie));
34
        authority->make_cookie(cookie->serialize());
4268
35
    });
4269
34
}
36
}
4270
35
37
4272
36
TEST(MirCookieFactory, doesnt_attest_faked_timestamp)
38
TEST(MirCookieAuthority, doesnt_attest_faked_mac)
4273
37
{
39
{
4274
38
    std::vector<uint8_t> secret{ 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xde, 0x01 };
40
    std::vector<uint8_t> secret{ 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xde, 0x01 };
4280
39
    auto factory = mir::cookie::CookieFactory::create_from_secret(secret);
41
    auto authority = mir::cookie::Authority::create_from(secret);
4281
40
42
4282
41
    MirCookie bad_client_no_biscuit{ 0x33221100, 0x33221100 };
43
    std::vector<uint8_t> cookie{ 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xde, 0x01 };
4283
42
44
4284
43
    EXPECT_FALSE(factory->attest_timestamp(bad_client_no_biscuit));
45
    EXPECT_THROW({
4285
46
        authority->make_cookie(cookie);
4286
47
    }, mir::cookie::SecurityCheckError);
4287
44
}
48
}
4288
45
49
4290
46
TEST(MirCookieFactory, timestamp_trusted_with_different_secret_doesnt_attest)
50
TEST(MirCookieAuthority, timestamp_trusted_with_different_secret_doesnt_attest)
4291
47
{
51
{
4292
48
    std::vector<uint8_t> alice{ 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xde, 0x01 };
52
    std::vector<uint8_t> alice{ 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xde, 0x01 };
4293
49
    std::vector<uint8_t> bob{ 0x01, 0x02, 0x44, 0xd8, 0xee, 0x0f, 0xde, 0x01 };
53
    std::vector<uint8_t> bob{ 0x01, 0x02, 0x44, 0xd8, 0xee, 0x0f, 0xde, 0x01 };
4294
50
54
4297
51
    auto alices_factory = mir::cookie::CookieFactory::create_from_secret(alice);
55
    auto alices_authority = mir::cookie::Authority::create_from(alice);
4298
52
    auto bobs_factory   = mir::cookie::CookieFactory::create_from_secret(bob);
56
    auto bobs_authority   = mir::cookie::Authority::create_from(bob);
4299
53
57
4300
54
    uint64_t mock_timestamp{0x01020304};
58
    uint64_t mock_timestamp{0x01020304};
4301
55
59
4304
56
    auto alices_cookie = alices_factory->timestamp_to_cookie(mock_timestamp);
60
    EXPECT_THROW({
4305
57
    auto bobs_cookie = bobs_factory->timestamp_to_cookie(mock_timestamp);
61
        auto alices_cookie = alices_authority->make_cookie(mock_timestamp);
4306
62
        auto bobs_cookie   = bobs_authority->make_cookie(mock_timestamp);
4307
58
63
4310
59
    EXPECT_FALSE(alices_factory->attest_timestamp(bobs_cookie));
64
        alices_authority->make_cookie(bobs_cookie->serialize());
4311
60
    EXPECT_FALSE(bobs_factory->attest_timestamp(alices_cookie));
65
        bobs_authority->make_cookie(alices_cookie->serialize());
4312
66
    }, mir::cookie::SecurityCheckError);
4313
61
}
67
}
4314
62
68
4316
63
TEST(MirCookieFactory, throw_when_secret_size_to_small)
69
TEST(MirCookieAuthority, throw_when_secret_size_to_small)
4317
64
{
70
{
4319
65
    std::vector<uint8_t> bob(mir::cookie::CookieFactory::minimum_secret_size - 1);
71
    std::vector<uint8_t> bob(mir::cookie::Authority::minimum_secret_size - 1);
4320
66
    EXPECT_THROW({
72
    EXPECT_THROW({
4322
67
        auto factory = mir::cookie::CookieFactory::create_from_secret(bob);
73
        auto authority = mir::cookie::Authority::create_from(bob);
4323
68
    }, std::logic_error);
74
    }, std::logic_error);
4324
69
}
75
}
4325
70
76
4327
71
TEST(MirCookieFactory, saves_a_secret)
77
TEST(MirCookieAuthority, saves_a_secret)
4328
72
{
78
{
4329
73
    using namespace testing;
79
    using namespace testing;
4330
74
    std::vector<uint8_t> secret;
80
    std::vector<uint8_t> secret;
4331
75
81
4333
76
    mir::cookie::CookieFactory::create_saving_secret(secret);
82
    mir::cookie::Authority::create_saving(secret);
4334
77
83
4336
78
    EXPECT_THAT(secret.size(), Ge(mir::cookie::CookieFactory::minimum_secret_size));
84
    EXPECT_THAT(secret.size(), Ge(mir::cookie::Authority::minimum_secret_size));
4337
79
}
85
}
4338
80
86
4340
81
TEST(MirCookieFactory, timestamp_trusted_with_saved_secret_does_attest)
87
TEST(MirCookieAuthority, timestamp_trusted_with_saved_secret_does_attest)
4341
82
{
88
{
4342
83
    uint64_t timestamp   = 23;
89
    uint64_t timestamp   = 23;
4343
84
    std::vector<uint8_t> secret;
90
    std::vector<uint8_t> secret;
4344
85
91
4348
86
    auto source_factory = mir::cookie::CookieFactory::create_saving_secret(secret);
92
    auto source_authority = mir::cookie::Authority::create_saving(secret);
4349
87
    auto sink_factory   = mir::cookie::CookieFactory::create_from_secret(secret);
93
    auto sink_authority   = mir::cookie::Authority::create_from(secret);
4350
88
    auto cookie = source_factory->timestamp_to_cookie(timestamp);
94
    auto cookie = source_authority->make_cookie(timestamp);
4351
89
95
4353
90
    EXPECT_TRUE(sink_factory->attest_timestamp(cookie));
96
    EXPECT_NO_THROW({
4354
97
        sink_authority->make_cookie(cookie->serialize());
4355
98
    });
4356
91
}
99
}
4357
92
100
4359
93
TEST(MirCookieFactory, internally_generated_secret_has_optimum_size)
101
TEST(MirCookieAuthority, internally_generated_secret_has_optimum_size)
4360
94
{
102
{
4361
95
    using namespace testing;
103
    using namespace testing;
4362
96
    std::vector<uint8_t> secret;
104
    std::vector<uint8_t> secret;
4363
97
105
4365
98
    mir::cookie::CookieFactory::create_saving_secret(secret);
106
    mir::cookie::Authority::create_saving(secret);
4366
99
107
4368
100
    EXPECT_THAT(secret.size(), Eq(mir::cookie::CookieFactory::optimal_secret_size()));
108
    EXPECT_THAT(secret.size(), Eq(mir::cookie::Authority::optimal_secret_size()));
4369
101
}
109
}
4370
102
110
4372
103
TEST(MirCookieFactory, optimal_secret_size_is_larger_than_minimum_size)
111
TEST(MirCookieAuthority, optimal_secret_size_is_larger_than_minimum_size)
4373
104
{
112
{
4374
105
    using namespace testing;
113
    using namespace testing;
4375
106
114
4378
107
    EXPECT_THAT(mir::cookie::CookieFactory::optimal_secret_size(),
115
    EXPECT_THAT(mir::cookie::Authority::optimal_secret_size(),
4379
108
        Ge(mir::cookie::CookieFactory::minimum_secret_size));
116
        Ge(mir::cookie::Authority::minimum_secret_size));
4380
109
}
117
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2016-01-26
Alan Griffiths			Abstain on 2016-01-25
Mir CI Bot	continuous-integration		Approve on 2016-01-25
Andreas Pokorny (community)			Approve on 2016-01-23
Alexandros Frantzis (community)			Needs Fixing on 2016-01-22
Alberto Aguirre (community)			Approve on 2016-01-22
Chris Halse Rogers		2016-01-12	Approve on 2016-01-21
Daniel van Vugt			Abstain on 2016-01-21
Kevin DuBois (community)			Approve on 2016-01-14
Review via email: mp+282279@code.launchpad.net