1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2013-10-01 19:55:26 +0000
3
+++ CMakeLists.txt	2013-10-03 13:04:10 +0000
4
@@ -63,6 +63,9 @@
5
63
pkg_check_modules(QMENUMODEL REQUIRED qmenumodel REQUIRED)
63
pkg_check_modules(QMENUMODEL REQUIRED qmenumodel REQUIRED)
6
64
include_directories(${QMENUMODEL_INCLUDE_DIRS})
64
include_directories(${QMENUMODEL_INCLUDE_DIRS})
7
65
65
8
66
pkg_check_modules(GIO REQUIRED gio-2.0>=${GLIB_REQUIRED_VERSION})
9
67
include_directories(${GIO_INCLUDE_DIRS})
10
68
11
66
set(CMAKE_AUTOMOC ON)
69
set(CMAKE_AUTOMOC ON)
12
67
set(CMAKE_INCLUDE_CURRENT_DIR ON)
70
set(CMAKE_INCLUDE_CURRENT_DIR ON)
13
68
71
14
69
72
15
=== modified file 'cmake/FindValgrind.cmake'
16
--- cmake/FindValgrind.cmake	2013-08-27 14:54:25 +0000
17
+++ cmake/FindValgrind.cmake	2013-10-03 13:04:10 +0000
18
@@ -14,7 +14,10 @@
19
14
	set(VALGRIND_PROGRAM_OPTIONS
14
	set(VALGRIND_PROGRAM_OPTIONS
20
15
		"--suppressions=${CMAKE_SOURCE_DIR}/tests/data/valgrind.suppression"
15
		"--suppressions=${CMAKE_SOURCE_DIR}/tests/data/valgrind.suppression"
21
16
		"--error-exitcode=1"
16
		"--error-exitcode=1"
22
17
		"--trace-children=yes"
23
18
		"--trace-children-skip=*/python*,python*"
24
17
		"--leak-check=full"
19
		"--leak-check=full"
25
20
		"--leak-resolution=high"
26
18
		"--gen-suppressions=all"
21
		"--gen-suppressions=all"
27
19
		"--quiet"
22
		"--quiet"
28
20
	)
23
	)
29
@@ -28,6 +31,10 @@
30
28
function(add_valgrind_test NAME EXECUTABLE)
31
function(add_valgrind_test NAME EXECUTABLE)
31
29
	if(ENABLE_MEMCHECK_OPTION)
32
	if(ENABLE_MEMCHECK_OPTION)
32
30
		add_test(${NAME} ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}")
33
		add_test(${NAME} ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}")
33
34
		set_tests_properties(
34
35
			${NAME}
35
36
			PROPERTIES ENVIRONMENT "G_SLICE=always-malloc G_DEBUG=gc-friendly"
36
37
		)
37
31
	else()
38
	else()
38
32
		add_test(${NAME} ${EXECUTABLE})
39
		add_test(${NAME} ${EXECUTABLE})
39
33
	endif()
40
	endif()
40
34
41
41
=== modified file 'data/indicator-secret-agent.conf.in'
42
--- data/indicator-secret-agent.conf.in	2013-08-29 17:03:33 +0000
43
+++ data/indicator-secret-agent.conf.in	2013-10-03 13:04:10 +0000
44
@@ -1,9 +1,6 @@
45
1
description "Secret agent to repsond to Network Manager password requests"
1
description "Secret agent to repsond to Network Manager password requests"
46
2
2
51
3
# Currently conflicts with the secret agent in Unity8
3
start on starting indicator-network
48
4
# so we're disabling until we can migrate fully.
49
5
# start on starting indicator-network
50
6
52
7
stop on stopping indicator-network
4
stop on stopping indicator-network
53
8
5
54
9
respawn
6
respawn
55
10
7
56
=== added file 'data/org.freedesktop.Notifications.xml'
57
--- data/org.freedesktop.Notifications.xml	1970-01-01 00:00:00 +0000
58
+++ data/org.freedesktop.Notifications.xml	2013-10-03 13:04:10 +0000
59
@@ -0,0 +1,47 @@
60
1
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
61
2
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
62
3
<node>
63
4
  <interface name="org.freedesktop.Notifications">
64
5
    <signal name="NotificationClosed">
65
6
      <arg name="id" type="u" direction="out"/>
66
7
      <arg name="reason" type="u" direction="out"/>
67
8
    </signal>
68
9
    <signal name="ActionInvoked">
69
10
      <arg name="id" type="u" direction="out"/>
70
11
      <arg name="action_key" type="s" direction="out"/>
71
12
    </signal>
72
13
    <signal name="dataChanged">
73
14
      <arg name="id" type="u" direction="out"/>
74
15
    </signal>
75
16
    <method name="CloseNotification">
76
17
      <arg name="id" type="u" direction="in"/>
77
18
    </method>
78
19
    <method name="GetServerInformation">
79
20
      <arg name="name" type="s" direction="out"/>
80
21
      <arg name="vendor" type="s" direction="out"/>
81
22
      <arg name="version" type="s" direction="out"/>
82
23
      <arg name="specVersion" type="s" direction="out"/>
83
24
    </method>
84
25
    <method name="GetCapabilities">
85
26
      <arg type="as" direction="out"/>
86
27
    </method>
87
28
    <method name="Notify">
88
29
      <arg type="u" direction="out"/>
89
30
      <arg name="app_name" type="s" direction="in"/>
90
31
      <arg name="replaces_id" type="u" direction="in"/>
91
32
      <arg name="app_icon" type="s" direction="in"/>
92
33
      <arg name="summary" type="s" direction="in"/>
93
34
      <arg name="body" type="s" direction="in"/>
94
35
      <arg name="actions" type="as" direction="in"/>
95
36
      <arg name="hints" type="a{sv}" direction="in"/>
96
37
      <annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/>
97
38
      <arg name="expire_timeout" type="i" direction="in"/>
98
39
    </method>
99
40
    <method name="onDataChanged">
100
41
      <arg name="id" type="u" direction="in"/>
101
42
    </method>
102
43
    <method name="onCompleted">
103
44
      <arg name="id" type="u" direction="in"/>
104
45
    </method>
105
46
  </interface>
106
47
</node>
107
0
48
108
=== modified file 'debian/changelog'
109
--- debian/changelog	2013-09-18 06:24:29 +0000
110
+++ debian/changelog	2013-10-03 13:04:10 +0000
111
@@ -1,3 +1,10 @@
112
1
indicator-network (0.5.1) UNRELEASED; urgency=low
113
2
114
3
  * Add network manager secret agent.
115
4
    * Interfaces with unity8's extended snap decisions.
116
5
117
6
 -- Pete Woods <pete.woods@canonical.com>  Thu, 03 Oct 2013 13:53:39 +0100
118
7
119
1
indicator-network (0.5.0+13.10.20130918-0ubuntu1) saucy; urgency=low
8
indicator-network (0.5.0+13.10.20130918-0ubuntu1) saucy; urgency=low
120
2
9
121
3
  [ Ted Gould ]
10
  [ Ted Gould ]
122
4
11
123
=== modified file 'debian/control'
124
--- debian/control	2013-09-30 19:01:52 +0000
125
+++ debian/control	2013-10-03 13:04:10 +0000
126
@@ -34,6 +34,7 @@
127
34
         ${shlibs:Depends},
34
         ${shlibs:Depends},
128
35
# For apport hook
35
# For apport hook
129
36
         python3-xdg,
36
         python3-xdg,
130
37
         unity8 (>= 7.82),
131
37
Conflicts: chewie,
38
Conflicts: chewie,
132
38
           indicators-client-plugin-network,
39
           indicators-client-plugin-network,
133
39
Description: Systems settings menu service - Network indicator
40
Description: Systems settings menu service - Network indicator
134
40
41
135
=== modified file 'secret-agent/CMakeLists.txt'
136
--- secret-agent/CMakeLists.txt	2013-08-27 14:54:25 +0000
137
+++ secret-agent/CMakeLists.txt	2013-10-03 13:04:10 +0000
138
@@ -4,6 +4,7 @@
139
4
	SecretAgent.cpp
4
	SecretAgent.cpp
140
5
	SecretAgentAdaptor.cpp
5
	SecretAgentAdaptor.cpp
141
6
	SecretRequest.cpp
6
	SecretRequest.cpp
142
7
	gtk/PasswordMenu.cpp
143
7
)
8
)
144
8
9
145
9
qt5_add_dbus_adaptor(
10
qt5_add_dbus_adaptor(
146
@@ -20,6 +21,18 @@
147
20
	AgentManagerInterface
21
	AgentManagerInterface
148
21
)
22
)
149
22
23
150
24
set_source_files_properties(
151
25
	"${DATA_DIR}/org.freedesktop.Notifications.xml"
152
26
	PROPERTIES
153
27
	INCLUDE "DBusTypes.h"
154
28
)
155
29
156
30
qt5_add_dbus_interface(
157
31
	INDICATOR_SECRET_AGENT_SOURCES
158
32
	"${DATA_DIR}/org.freedesktop.Notifications.xml"
159
33
	NotificationsInterface
160
34
)
161
35
162
23
add_library(
36
add_library(
163
24
	indicator-secret-agent
37
	indicator-secret-agent
164
25
	STATIC
38
	STATIC
165
@@ -32,6 +45,11 @@
166
32
	DBus
45
	DBus
167
33
)
46
)
168
34
47
169
48
target_link_libraries(
170
49
	indicator-secret-agent
171
50
	${GIO_LIBRARIES}
172
51
)
173
52
174
35
add_executable(
53
add_executable(
175
36
	indicator-secret-agent-bin
54
	indicator-secret-agent-bin
176
37
	main.cpp
55
	main.cpp
177
38
56
178
=== modified file 'secret-agent/DBusTypes.h'
179
--- secret-agent/DBusTypes.h	2013-08-27 14:54:25 +0000
180
+++ secret-agent/DBusTypes.h	2013-10-03 13:04:10 +0000
181
@@ -19,7 +19,7 @@
182
19
#ifndef DBUSTYPES_H_
19
#ifndef DBUSTYPES_H_
183
20
#define DBUSTYPES_H_
20
#define DBUSTYPES_H_
184
21
21
186
22
#include <QtDBus>
22
#include <QDBusMetaType>
187
23
#include <QMap>
23
#include <QMap>
188
24
24
189
25
typedef QMap<QString, QVariantMap> QVariantDictMap;
25
typedef QMap<QString, QVariantMap> QVariantDictMap;
190
@@ -29,7 +29,6 @@
191
29
public:
29
public:
192
30
	static void registerMetaTypes() {
30
	static void registerMetaTypes() {
193
31
		qRegisterMetaType<QVariantDictMap>("QVariantDictMap");
31
		qRegisterMetaType<QVariantDictMap>("QVariantDictMap");
194
32
195
33
		qDBusRegisterMetaType<QVariantDictMap>();
32
		qDBusRegisterMetaType<QVariantDictMap>();
196
34
	}
33
	}
197
35
};
34
};
198
36
35
199
=== modified file 'secret-agent/SecretAgent.cpp'
200
--- secret-agent/SecretAgent.cpp	2013-08-27 14:54:25 +0000
201
+++ secret-agent/SecretAgent.cpp	2013-10-03 13:04:10 +0000
202
@@ -27,9 +27,12 @@
203
27
using namespace std;
27
using namespace std;
204
28
using namespace org::freedesktop::NetworkManager;
28
using namespace org::freedesktop::NetworkManager;
205
29
29
206
30
const QString SecretAgent::CONNECTION_SETTING_NAME("connection");
207
30
const QString SecretAgent::WIRELESS_SECURITY_SETTING_NAME(
31
const QString SecretAgent::WIRELESS_SECURITY_SETTING_NAME(
208
31
		"802-11-wireless-security");
32
		"802-11-wireless-security");
209
32
33
210
34
const QString SecretAgent::CONNECTION_ID("id");
211
35
212
33
const QString SecretAgent::WIRELESS_SECURITY_PSK("psk");
36
const QString SecretAgent::WIRELESS_SECURITY_PSK("psk");
213
34
const QString SecretAgent::WIRELESS_SECURITY_WEP_KEY0("wep-key0");
37
const QString SecretAgent::WIRELESS_SECURITY_WEP_KEY0("wep-key0");
214
35
38
215
@@ -39,11 +42,15 @@
216
39
const QString SecretAgent::KEY_MGMT_WPA_PSK("wpa-psk");
42
const QString SecretAgent::KEY_MGMT_WPA_PSK("wpa-psk");
217
40
const QString SecretAgent::KEY_MGMT_NONE("none");
43
const QString SecretAgent::KEY_MGMT_NONE("none");
218
41
44
224
42
SecretAgent::SecretAgent(const QDBusConnection &connection, QObject *parent) :
45
SecretAgent::SecretAgent(const QDBusConnection &systemConnection,
225
43
		QObject(parent), m_adaptor(new SecretAgentAdaptor(this)), m_connection(
46
		const QDBusConnection &sessionConnection, QObject *parent) :
226
44
				connection), m_agentManager(NM_DBUS_SERVICE,
47
		QObject(parent), m_adaptor(new SecretAgentAdaptor(this)), m_systemConnection(
227
45
				NM_DBUS_PATH_AGENT_MANAGER, m_connection), m_requestCounter(0) {
48
				systemConnection), m_sessionConnection(sessionConnection), m_agentManager(
228
46
	if (!m_connection.registerObject(NM_DBUS_PATH_SECRET_AGENT, this)) {
49
		NM_DBUS_SERVICE, NM_DBUS_PATH_AGENT_MANAGER, m_systemConnection), m_notifications(
229
50
				"org.freedesktop.Notifications",
230
51
				"/org/freedesktop/Notifications", m_sessionConnection), m_requestCounter(
231
52
				0) {
232
53
	if (!m_systemConnection.registerObject(NM_DBUS_PATH_SECRET_AGENT, this)) {
233
47
		throw logic_error(
54
		throw logic_error(
234
48
				_("Unable to register user secret agent object on DBus"));
55
				_("Unable to register user secret agent object on DBus"));
235
49
	}
56
	}
236
@@ -53,7 +60,7 @@
237
53
60
238
54
SecretAgent::~SecretAgent() {
61
SecretAgent::~SecretAgent() {
239
55
	m_agentManager.Unregister().waitForFinished();
62
	m_agentManager.Unregister().waitForFinished();
241
56
	m_connection.unregisterObject(NM_DBUS_PATH_SECRET_AGENT);
63
	m_systemConnection.unregisterObject(NM_DBUS_PATH_SECRET_AGENT);
242
57
}
64
}
243
58
65
244
59
/**
66
/**
245
@@ -101,7 +108,7 @@
246
101
	setDelayedReply(true);
108
	setDelayedReply(true);
247
102
109
248
103
	if (flags == 0) {
110
	if (flags == 0) {
250
104
		m_connection.send(
111
		m_systemConnection.send(
251
105
				message().createErrorReply(QDBusError::InternalError,
112
				message().createErrorReply(QDBusError::InternalError,
252
106
						"No password found for this connection."));
113
						"No password found for this connection."));
253
107
	} else {
114
	} else {
254
@@ -117,7 +124,7 @@
255
117
}
124
}
256
118
125
257
119
void SecretAgent::FinishGetSecrets(SecretRequest &request) {
126
void SecretAgent::FinishGetSecrets(SecretRequest &request) {
259
120
	m_connection.send(
127
	m_systemConnection.send(
260
121
			request.message().createReply(
128
			request.message().createReply(
261
122
					QVariant::fromValue(request.connection())));
129
					QVariant::fromValue(request.connection())));
262
123
	m_requests.remove(request.requestId());
130
	m_requests.remove(request.requestId());
263
@@ -134,3 +141,7 @@
264
134
void SecretAgent::SaveSecrets(const QVariantDictMap &connection,
141
void SecretAgent::SaveSecrets(const QVariantDictMap &connection,
265
135
		const QDBusObjectPath &connectionPath) {
142
		const QDBusObjectPath &connectionPath) {
266
136
}
143
}
267
144
268
145
org::freedesktop::Notifications & SecretAgent::notifications() {
269
146
	return m_notifications;
270
147
}
271
137
148
272
=== modified file 'secret-agent/SecretAgent.h'
273
--- secret-agent/SecretAgent.h	2013-08-27 14:54:25 +0000
274
+++ secret-agent/SecretAgent.h	2013-10-03 13:04:10 +0000
275
@@ -21,12 +21,13 @@
276
21
21
277
22
#include <QScopedPointer>
22
#include <QScopedPointer>
278
23
#include <QDBusConnection>
23
#include <QDBusConnection>
280
24
#include <QtDBus>
24
#include <QDBusContext>
281
25
#include <QMap>
25
#include <QMap>
282
26
26
283
27
#include <DBusTypes.h>
27
#include <DBusTypes.h>
284
28
#include <SecretRequest.h>
28
#include <SecretRequest.h>
285
29
#include <AgentManagerInterface.h>
29
#include <AgentManagerInterface.h>
286
30
#include <NotificationsInterface.h>
287
30
31
288
31
class SecretAgentAdaptor;
32
class SecretAgentAdaptor;
289
32
33
290
@@ -34,8 +35,11 @@
291
34
Q_OBJECT
35
Q_OBJECT
292
35
36
293
36
public:
37
public:
294
38
	static const QString CONNECTION_SETTING_NAME;
295
37
	static const QString WIRELESS_SECURITY_SETTING_NAME;
39
	static const QString WIRELESS_SECURITY_SETTING_NAME;
296
38
40
297
41
	static const QString CONNECTION_ID;
298
42
299
39
	static const QString WIRELESS_SECURITY_PSK;
43
	static const QString WIRELESS_SECURITY_PSK;
300
40
	static const QString WIRELESS_SECURITY_WEP_KEY0;
44
	static const QString WIRELESS_SECURITY_WEP_KEY0;
301
41
45
302
@@ -45,8 +49,8 @@
303
45
	static const QString KEY_MGMT_WPA_PSK;
49
	static const QString KEY_MGMT_WPA_PSK;
304
46
	static const QString KEY_MGMT_NONE;
50
	static const QString KEY_MGMT_NONE;
305
47
51
308
48
	explicit SecretAgent(const QDBusConnection &connection,
52
	explicit SecretAgent(const QDBusConnection &systemConnection,
309
49
			QObject *parent = 0);
53
			const QDBusConnection &sessionConnection, QObject *parent = 0);
310
50
54
311
51
	virtual ~SecretAgent();
55
	virtual ~SecretAgent();
312
52
56
313
@@ -66,16 +70,23 @@
314
66
	void SaveSecrets(const QVariantDictMap &connection,
70
	void SaveSecrets(const QVariantDictMap &connection,
315
67
			const QDBusObjectPath &connectionPath);
71
			const QDBusObjectPath &connectionPath);
316
68
72
317
73
	org::freedesktop::Notifications & notifications();
318
74
319
69
protected:
75
protected:
320
70
	QScopedPointer<SecretAgentAdaptor> m_adaptor;
76
	QScopedPointer<SecretAgentAdaptor> m_adaptor;
321
71
77
323
72
	QDBusConnection m_connection;
78
	QDBusConnection m_systemConnection;
324
79
325
80
	QDBusConnection m_sessionConnection;
326
73
81
327
74
	org::freedesktop::NetworkManager::AgentManager m_agentManager;
82
	org::freedesktop::NetworkManager::AgentManager m_agentManager;
328
75
83
329
84
	org::freedesktop::Notifications m_notifications;
330
85
331
76
	QMap<unsigned long long, SecretRequestPtr> m_requests;
86
	QMap<unsigned long long, SecretRequestPtr> m_requests;
332
77
87
333
78
	unsigned long long m_requestCounter;
88
	unsigned long long m_requestCounter;
334
89
335
79
};
90
};
336
80
91
337
81
#endif /* SECRETAGENT_H_ */
92
#endif /* SECRETAGENT_H_ */
338
82
93
339
=== modified file 'secret-agent/SecretRequest.cpp'
340
--- secret-agent/SecretRequest.cpp	2013-08-27 14:54:25 +0000
341
+++ secret-agent/SecretRequest.cpp	2013-10-03 13:04:10 +0000
342
@@ -16,8 +16,9 @@
343
16
 * Author: Pete Woods <pete.woods@canonical.com>
16
 * Author: Pete Woods <pete.woods@canonical.com>
344
17
 */
17
 */
345
18
18
348
19
#include "SecretRequest.h"
19
#include <SecretRequest.h>
349
20
#include "SecretAgent.h"
20
#include <SecretAgent.h>
350
21
#include <Localisation.h>
351
21
22
352
22
SecretRequest::SecretRequest(unsigned int requestId, SecretAgent &secretAgent,
23
SecretRequest::SecretRequest(unsigned int requestId, SecretAgent &secretAgent,
353
23
		const QVariantDictMap &connection,
24
		const QVariantDictMap &connection,
354
@@ -26,17 +27,65 @@
355
26
		QObject *parent) :
27
		QObject *parent) :
356
27
		QObject(parent), m_requestId(requestId), m_secretAgent(secretAgent), m_connection(
28
		QObject(parent), m_requestId(requestId), m_secretAgent(secretAgent), m_connection(
357
28
				connection), m_connectionPath(connectionPath), m_settingName(
29
				connection), m_connectionPath(connectionPath), m_settingName(
361
29
				settingName), m_hints(hints), m_flags(flags), m_message(message) {
30
				settingName), m_hints(hints), m_flags(flags), m_message(
362
30
31
				message), m_menu(requestId) {
363
31
	QTimer::singleShot(0, this, SLOT(FinishRequest()));
32
364
33
	connect(&m_secretAgent.notifications(),
365
34
	SIGNAL(ActionInvoked(uint, const QString &)), this,
366
35
	SLOT(actionInvoked(uint, const QString &)));
367
36
368
37
	// indicate to the notification-daemon, that we want to use snap-decisions
369
38
	QVariantMap notificationHints;
370
39
	notificationHints["x-canonical-snap-decisions"] = "true";
371
40
	notificationHints["x-canonical-private-button-tint"] = "true";
372
41
373
42
	QVariantMap menuModelActions;
374
43
	menuModelActions["notifications"] = m_menu.actionPath();
375
44
376
45
	QVariantMap menuModelPaths;
377
46
	menuModelPaths["busName"] = m_menu.busName();
378
47
	menuModelPaths["menuPath"] = m_menu.menuPath();
379
48
	menuModelPaths["actions"] = menuModelActions;
380
49
381
50
	notificationHints["x-canonical-private-menu-model"] = menuModelPaths;
382
51
383
52
	const QVariantMap &conn = m_connection[SecretAgent::CONNECTION_SETTING_NAME];
384
53
385
54
	auto wirelessSecurity = m_connection.find(m_settingName);
386
55
	QString keyMgmt(
387
56
			wirelessSecurity->value(SecretAgent::WIRELESS_SECURITY_KEY_MGMT).toString());
388
57
389
58
	QString title(_("Connect to \"%1\""));
390
59
391
60
	QString subject;
392
61
	if (keyMgmt == SecretAgent::KEY_MGMT_WPA_NONE
393
62
			|| keyMgmt == SecretAgent::KEY_MGMT_WPA_PSK) {
394
63
		subject = _("WPA");
395
64
	} else if (keyMgmt == SecretAgent::KEY_MGMT_NONE) {
396
65
		subject = _("WEP");
397
66
	}
398
67
399
68
	m_notificationId = m_secretAgent.notifications().Notify("indicator-network",
400
69
			0, "wifi-full-secure",
401
70
			title.arg(conn[SecretAgent::CONNECTION_ID].toString()), subject,
402
71
			QStringList() << "connect_id" << _("Connect") << "cancel_id"
403
72
					<< _("Cancel"), notificationHints, 0);
404
32
}
73
}
405
33
74
406
34
SecretRequest::~SecretRequest() {
75
SecretRequest::~SecretRequest() {
407
35
}
76
}
408
36
77
412
37
void SecretRequest::FinishRequest() {
78
void SecretRequest::actionInvoked(uint id, const QString &actionKey) {
413
38
	//FIXME: Hard-coded - use system dialogue call to populate it
79
	// Ignore other requests' notifications
414
39
	QString key("hard-coded-password");
80
	if (id != m_notificationId) {
415
81
		return;
416
82
	}
417
83
418
84
	QString key("");
419
85
420
86
	if (actionKey == "connect_id") {
421
87
		key = m_menu.password();
422
88
	}
423
40
89
424
41
	auto wirelessSecurity = m_connection.find(m_settingName);
90
	auto wirelessSecurity = m_connection.find(m_settingName);
425
42
	QString keyMgmt(
91
	QString keyMgmt(
426
43
92
427
=== modified file 'secret-agent/SecretRequest.h'
428
--- secret-agent/SecretRequest.h	2013-08-27 14:54:25 +0000
429
+++ secret-agent/SecretRequest.h	2013-10-03 13:04:10 +0000
430
@@ -20,8 +20,10 @@
431
20
#define SECRETREQUEST_H_
20
#define SECRETREQUEST_H_
432
21
21
433
22
#include <DBusTypes.h>
22
#include <DBusTypes.h>
434
23
#include <gtk/PasswordMenu.h>
435
23
24
437
24
#include <QtDBus>
25
#include <QDBusMessage>
438
26
#include <QDBusObjectPath>
439
25
#include <QSharedPointer>
27
#include <QSharedPointer>
440
26
28
441
27
class SecretRequest;
29
class SecretRequest;
442
@@ -41,7 +43,7 @@
443
41
	virtual ~SecretRequest();
43
	virtual ~SecretRequest();
444
42
44
445
43
public Q_SLOTS:
45
public Q_SLOTS:
447
44
	void FinishRequest();
46
	void actionInvoked(uint id, const QString &actionKey);
448
45
47
449
46
public:
48
public:
450
47
	unsigned int requestId() const;
49
	unsigned int requestId() const;
451
@@ -53,6 +55,8 @@
452
53
protected:
55
protected:
453
54
	const unsigned int m_requestId;
56
	const unsigned int m_requestId;
454
55
57
455
58
	unsigned int m_notificationId;
456
59
457
56
	SecretAgent &m_secretAgent;
60
	SecretAgent &m_secretAgent;
458
57
61
459
58
	QVariantDictMap m_connection;
62
	QVariantDictMap m_connection;
460
@@ -66,6 +70,8 @@
461
66
	uint m_flags;
70
	uint m_flags;
462
67
71
463
68
	QDBusMessage m_message;
72
	QDBusMessage m_message;
464
73
465
74
	PasswordMenu m_menu;
466
69
};
75
};
467
70
76
468
71
#endif /* SECRETREQUEST_H_ */
77
#endif /* SECRETREQUEST_H_ */
469
72
78
470
=== added directory 'secret-agent/gtk'
471
=== added file 'secret-agent/gtk/PasswordMenu.cpp'
472
--- secret-agent/gtk/PasswordMenu.cpp	1970-01-01 00:00:00 +0000
473
+++ secret-agent/gtk/PasswordMenu.cpp	2013-10-03 13:04:10 +0000
474
@@ -0,0 +1,134 @@
475
1
/*
476
2
 * Copyright (C) 2013 Canonical, Ltd.
477
3
 *
478
4
 * This program is free software: you can redistribute it and/or modify it
479
5
 * under the terms of the GNU General Public License version 3, as published
480
6
 * by the Free Software Foundation.
481
7
 *
482
8
 * This program is distributed in the hope that it will be useful, but
483
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
484
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
485
11
 * PURPOSE.  See the GNU General Public License for more details.
486
12
 *
487
13
 * You should have received a copy of the GNU General Public License along
488
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
489
15
 *
490
16
 * Author: Pete Woods <pete.woods@canonical.com>
491
17
 */
492
18
493
19
#include <gtk/PasswordMenu.h>
494
20
#include <gio/gio.h>
495
21
496
22
#include <QString>
497
23
#include <QDebug>
498
24
499
25
static const QString PASSWORD_ACTION_PATH("/action/%1");
500
26
static const QString PASSWORD_MENU_PATH("/menu/%1");
501
27
502
28
class PasswordMenuPriv {
503
29
public:
504
30
	PasswordMenuPriv() :
505
31
			m_connection(g_bus_get_sync(G_BUS_TYPE_SESSION, NULL,
506
32
			NULL)), m_exportedActionGroupId(0), m_exportedMenuModelId(0) {
507
33
	}
508
34
509
35
	~PasswordMenuPriv() {
510
36
		g_object_unref(m_connection);
511
37
	}
512
38
513
39
	static void passwordChangedCallback(GAction *passwordAction,
514
40
			GVariant *variant, gpointer userData) {
515
41
		PasswordMenuPriv *self(reinterpret_cast<PasswordMenuPriv*>(userData));
516
42
		self->passwordChanged(variant);
517
43
	}
518
44
519
45
	void passwordChanged(GVariant *variant) {
520
46
		m_password = QString::fromUtf8(g_variant_get_string(variant, 0));
521
47
		if (qEnvironmentVariableIsSet("SECRET_AGENT_DEBUG_PASSWORD")) {
522
48
			qDebug() << "Password received";
523
49
		}
524
50
	}
525
51
526
52
	GDBusConnection *m_connection;
527
53
528
54
	QString m_busName;
529
55
530
56
	QString m_actionPath;
531
57
532
58
	QString m_menuPath;
533
59
534
60
	unsigned int m_exportedActionGroupId;
535
61
536
62
	unsigned int m_exportedMenuModelId;
537
63
538
64
	QString m_password;
539
65
540
66
};
541
67
542
68
PasswordMenu::PasswordMenu(unsigned int requestId) :
543
69
		p(new PasswordMenuPriv()) {
544
70
	p->m_busName = QString::fromUtf8(
545
71
			g_dbus_connection_get_unique_name(p->m_connection));
546
72
547
73
	p->m_actionPath = PASSWORD_ACTION_PATH.arg(requestId);
548
74
	p->m_menuPath = PASSWORD_MENU_PATH.arg(requestId);
549
75
550
76
	// menu
551
77
	GMenu *menu(g_menu_new());
552
78
553
79
	GMenuItem *passwordItem(g_menu_item_new("", "notifications.password"));
554
80
	g_menu_item_set_attribute_value(passwordItem, "x-canonical-type",
555
81
			g_variant_new_string("com.canonical.snapdecision.textfield"));
556
82
	g_menu_item_set_attribute_value(passwordItem, "x-echo-mode-password",
557
83
			g_variant_new_boolean(true));
558
84
559
85
	g_menu_append_item(menu, passwordItem);
560
86
561
87
	// actions
562
88
	GActionGroup *actions(G_ACTION_GROUP(g_simple_action_group_new()));
563
89
	GAction *passwordAction(G_ACTION(
564
90
			g_simple_action_new_stateful("password", G_VARIANT_TYPE_STRING,
565
91
					g_variant_new_string(""))));
566
92
567
93
	g_signal_connect(G_OBJECT(passwordAction), "change-state",
568
94
			G_CALLBACK(PasswordMenuPriv::passwordChangedCallback),
569
95
			reinterpret_cast<gpointer>(p.data()));
570
96
571
97
	g_action_map_add_action(G_ACTION_MAP(actions), passwordAction);
572
98
573
99
	p->m_exportedActionGroupId = g_dbus_connection_export_action_group(
574
100
			p->m_connection, p->m_actionPath.toUtf8().data(), actions, NULL);
575
101
576
102
	p->m_exportedMenuModelId = g_dbus_connection_export_menu_model(
577
103
			p->m_connection, p->m_menuPath.toUtf8().data(),
578
104
			G_MENU_MODEL(menu), NULL);
579
105
580
106
	g_object_unref(menu);
581
107
	g_object_unref(passwordItem);
582
108
583
109
	g_object_unref(actions);
584
110
	g_object_unref(passwordAction);
585
111
}
586
112
587
113
PasswordMenu::~PasswordMenu() {
588
114
	g_dbus_connection_unexport_action_group(p->m_connection,
589
115
			p->m_exportedActionGroupId);
590
116
	g_dbus_connection_unexport_menu_model(p->m_connection,
591
117
			p->m_exportedMenuModelId);
592
118
}
593
119
594
120
const QString & PasswordMenu::busName() const {
595
121
	return p->m_busName;
596
122
}
597
123
598
124
const QString & PasswordMenu::password() const {
599
125
	return p->m_password;
600
126
}
601
127
602
128
const QString & PasswordMenu::actionPath() const {
603
129
	return p->m_actionPath;
604
130
}
605
131
606
132
const QString & PasswordMenu::menuPath() const {
607
133
	return p->m_menuPath;
608
134
}
609
0
135
610
=== added file 'secret-agent/gtk/PasswordMenu.h'
611
--- secret-agent/gtk/PasswordMenu.h	1970-01-01 00:00:00 +0000
612
+++ secret-agent/gtk/PasswordMenu.h	2013-10-03 13:04:10 +0000
613
@@ -0,0 +1,45 @@
614
1
/*
615
2
 * Copyright (C) 2013 Canonical, Ltd.
616
3
 *
617
4
 * This program is free software: you can redistribute it and/or modify it
618
5
 * under the terms of the GNU General Public License version 3, as published
619
6
 * by the Free Software Foundation.
620
7
 *
621
8
 * This program is distributed in the hope that it will be useful, but
622
9
 * WITHOUT ANY WARRANTY; without even the implied warranties of
623
10
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
624
11
 * PURPOSE.  See the GNU General Public License for more details.
625
12
 *
626
13
 * You should have received a copy of the GNU General Public License along
627
14
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
628
15
 *
629
16
 * Author: Pete Woods <pete.woods@canonical.com>
630
17
 */
631
18
632
19
#ifndef PASSWORDMENU_H_
633
20
#define PASSWORDMENU_H_
634
21
635
22
#include <QString>
636
23
#include <QScopedPointer>
637
24
638
25
class PasswordMenuPriv;
639
26
640
27
class PasswordMenu {
641
28
public:
642
29
	PasswordMenu(unsigned int requestId);
643
30
644
31
	virtual ~PasswordMenu();
645
32
646
33
	const QString & busName() const;
647
34
648
35
	const QString & password() const;
649
36
650
37
	const QString & actionPath() const;
651
38
652
39
	const QString & menuPath() const;
653
40
654
41
protected:
655
42
	QScopedPointer<PasswordMenuPriv> p;
656
43
};
657
44
658
45
#endif /* PASSWORDMENU_H_ */
659
0
46
660
=== modified file 'secret-agent/main.cpp'
661
--- secret-agent/main.cpp	2013-08-27 14:54:25 +0000
662
+++ secret-agent/main.cpp	2013-10-03 13:04:10 +0000
663
@@ -43,7 +43,8 @@
664
43
	signal(SIGINT, &exitQt);
43
	signal(SIGINT, &exitQt);
665
44
	signal(SIGTERM, &exitQt);
44
	signal(SIGTERM, &exitQt);
666
45
45
668
46
	SecretAgent secretAgent(QDBusConnection::systemBus());
46
	SecretAgent secretAgent(QDBusConnection::systemBus(),
669
47
			QDBusConnection::sessionBus());
670
47
48
671
48
	if (argc == 2 && QString("--print-address") == argv[1]) {
49
	if (argc == 2 && QString("--print-address") == argv[1]) {
672
49
		cout << QDBusConnection::systemBus().baseService().toStdString()
50
		cout << QDBusConnection::systemBus().baseService().toStdString()
673
50
51
674
=== modified file 'tests/CMakeLists.txt'
675
--- tests/CMakeLists.txt	2013-08-27 15:18:46 +0000
676
+++ tests/CMakeLists.txt	2013-10-03 13:04:10 +0000
677
@@ -51,6 +51,7 @@
678
51
	indicator-secret-agent
51
	indicator-secret-agent
679
52
	${QTDBUSMOCK_LIBRARIES}
52
	${QTDBUSMOCK_LIBRARIES}
680
53
	${QTDBUSTEST_LIBRARIES}
53
	${QTDBUSTEST_LIBRARIES}
681
54
	${QMENUMODEL_LIBRARIES}
682
54
	${GTEST_LIBRARIES}
55
	${GTEST_LIBRARIES}
683
55
	${GMOCK_LIBRARIES}
56
	${GMOCK_LIBRARIES}
684
56
)
57
)
685
57
58
686
=== modified file 'tests/TestSecretAgent.cpp'
687
--- tests/TestSecretAgent.cpp	2013-08-27 14:54:25 +0000
688
+++ tests/TestSecretAgent.cpp	2013-10-03 13:04:10 +0000
689
@@ -16,12 +16,14 @@
690
16
 * Author: Pete Woods <pete.woods@canonical.com>
16
 * Author: Pete Woods <pete.woods@canonical.com>
691
17
 */
17
 */
692
18
18
693
19
#include <libqtdbustest/DBusTestRunner.h>
694
20
#include <libqtdbusmock/DBusMock.h>
695
21
#include <SecretAgent.h>
19
#include <SecretAgent.h>
696
22
#include <SecretAgentInterface.h>
20
#include <SecretAgentInterface.h>
697
23
#include <NetworkManager.h>
21
#include <NetworkManager.h>
698
24
22
699
23
#include <libqtdbustest/DBusTestRunner.h>
700
24
#include <libqtdbusmock/DBusMock.h>
701
25
#include <qmenumodel/unitymenumodel.h>
702
26
#include <QSignalSpy>
703
25
#include <gmock/gmock.h>
27
#include <gmock/gmock.h>
704
26
#include <gtest/gtest.h>
28
#include <gtest/gtest.h>
705
27
29
706
@@ -37,18 +39,32 @@
707
37
	TestSecretAgentCommon() :
39
	TestSecretAgentCommon() :
708
38
			dbusMock(dbusTestRunner) {
40
			dbusMock(dbusTestRunner) {
709
39
41
710
42
		dbusMock.registerCustomMock("org.freedesktop.Notifications",
711
43
				"/org/freedesktop/Notifications",
712
44
				OrgFreedesktopNotificationsInterface::staticInterfaceName(),
713
45
				QDBusConnection::SessionBus);
714
46
715
40
		dbusMock.registerNetworkManager();
47
		dbusMock.registerNetworkManager();
716
41
		dbusTestRunner.startServices();
48
		dbusTestRunner.startServices();
717
42
49
718
50
		QProcessEnvironment env(QProcessEnvironment::systemEnvironment());
719
51
		env.insert("SECRET_AGENT_DEBUG_PASSWORD", "1");
720
52
		secretAgent.setProcessEnvironment(env);
721
53
		secretAgent.setProcessChannelMode(QProcess::MergedChannels);
722
43
		secretAgent.start(SECRET_AGENT_BIN, QStringList() << "--print-address");
54
		secretAgent.start(SECRET_AGENT_BIN, QStringList() << "--print-address");
723
44
		secretAgent.waitForStarted();
55
		secretAgent.waitForStarted();
724
45
		secretAgent.waitForReadyRead();
56
		secretAgent.waitForReadyRead();
725
46
		agentBus = secretAgent.readAll().trimmed();
57
		agentBus = secretAgent.readAll().trimmed();
726
47
58
728
48
		interface.reset(
59
		agentInterface.reset(
729
49
				new OrgFreedesktopNetworkManagerSecretAgentInterface(agentBus,
60
				new OrgFreedesktopNetworkManagerSecretAgentInterface(agentBus,
732
50
						NM_DBUS_PATH_SECRET_AGENT,
61
				NM_DBUS_PATH_SECRET_AGENT, dbusTestRunner.systemConnection()));
733
51
						dbusTestRunner.systemConnection()));
62
734
63
		notificationsInterface.reset(
735
64
				new OrgFreedesktopDBusMockInterface(
736
65
						"org.freedesktop.Notifications",
737
66
						"/org/freedesktop/Notifications",
738
67
						dbusTestRunner.sessionConnection()));
739
52
	}
68
	}
740
53
69
741
54
	virtual ~TestSecretAgentCommon() {
70
	virtual ~TestSecretAgentCommon() {
742
@@ -61,9 +77,13 @@
743
61
		wirelessSecurity[SecretAgent::WIRELESS_SECURITY_KEY_MGMT] =
77
		wirelessSecurity[SecretAgent::WIRELESS_SECURITY_KEY_MGMT] =
744
62
				keyManagement;
78
				keyManagement;
745
63
79
746
80
		QVariantMap conn;
747
81
		conn[SecretAgent::CONNECTION_ID] = "the ssid";
748
82
749
64
		QVariantDictMap connection;
83
		QVariantDictMap connection;
750
65
		connection[SecretAgent::WIRELESS_SECURITY_SETTING_NAME] =
84
		connection[SecretAgent::WIRELESS_SECURITY_SETTING_NAME] =
751
66
				wirelessSecurity;
85
				wirelessSecurity;
752
86
		connection[SecretAgent::CONNECTION_SETTING_NAME] = conn;
753
67
87
754
68
		return connection;
88
		return connection;
755
69
	}
89
	}
756
@@ -76,9 +96,13 @@
757
76
				keyManagement;
96
				keyManagement;
758
77
		wirelessSecurity[keyName] = password;
97
		wirelessSecurity[keyName] = password;
759
78
98
760
99
		QVariantMap conn;
761
100
		conn[SecretAgent::CONNECTION_ID] = "the ssid";
762
101
763
79
		QVariantDictMap connection;
102
		QVariantDictMap connection;
764
80
		connection[SecretAgent::WIRELESS_SECURITY_SETTING_NAME] =
103
		connection[SecretAgent::WIRELESS_SECURITY_SETTING_NAME] =
765
81
				wirelessSecurity;
104
				wirelessSecurity;
766
105
		connection[SecretAgent::CONNECTION_SETTING_NAME] = conn;
767
82
106
768
83
		return connection;
107
		return connection;
769
84
	}
108
	}
770
@@ -91,7 +115,9 @@
771
91
115
772
92
	QString agentBus;
116
	QString agentBus;
773
93
117
775
94
	QScopedPointer<OrgFreedesktopNetworkManagerSecretAgentInterface> interface;
118
	QScopedPointer<OrgFreedesktopNetworkManagerSecretAgentInterface> agentInterface;
776
119
777
120
	QScopedPointer<OrgFreedesktopDBusMockInterface> notificationsInterface;
778
95
};
121
};
779
96
122
780
97
struct TestSecretAgentParams {
123
struct TestSecretAgentParams {
781
@@ -106,16 +132,95 @@
782
106
		public TestWithParam<TestSecretAgentParams> {
132
		public TestWithParam<TestSecretAgentParams> {
783
107
};
133
};
784
108
134
785
135
static void transform(QVariantMap &map);
786
136
787
137
static void transform(QVariant &variant) {
788
138
	if (variant.canConvert<QDBusArgument>()) {
789
139
		QDBusArgument value(variant.value<QDBusArgument>());
790
140
		if (value.currentType() == QDBusArgument::MapType) {
791
141
			QVariantMap map;
792
142
			value >> map;
793
143
			transform(map);
794
144
			variant = map;
795
145
		}
796
146
	}
797
147
}
798
148
799
149
static void transform(QVariantMap &map) {
800
150
	for (auto it(map.begin()); it != map.end(); ++it) {
801
151
		transform(*it);
802
152
	}
803
153
}
804
154
805
155
static void transform(QVariantList &list) {
806
156
	for (auto it(list.begin()); it != list.end(); ++it) {
807
157
		transform(*it);
808
158
	}
809
159
}
810
160
811
109
TEST_P(TestSecretAgentGetSecrets, ProvidesPasswordForWpaPsk) {
161
TEST_P(TestSecretAgentGetSecrets, ProvidesPasswordForWpaPsk) {
814
110
	QVariantDictMap reply(
162
	notificationsInterface->AddMethod(
815
111
			interface->GetSecrets(connection(GetParam().keyManagement),
163
			OrgFreedesktopNotificationsInterface::staticInterfaceName(),
816
164
			"Notify", "susssasa{sv}i", "u", "ret = 1").waitForFinished();
817
165
818
166
	QDBusPendingReply<QVariantDictMap> reply(
819
167
			agentInterface->GetSecrets(connection(GetParam().keyManagement),
820
112
					QDBusObjectPath("/connection/foo"),
168
					QDBusObjectPath("/connection/foo"),
821
113
					SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
169
					SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
822
114
					5));
170
					5));
823
115
171
824
172
	QSignalSpy notificationSpy(notificationsInterface.data(),
825
173
	SIGNAL(MethodCalled(const QString &, const QVariantList &)));
826
174
	notificationSpy.wait();
827
175
828
176
	ASSERT_EQ(1, notificationSpy.size());
829
177
	const QVariantList &call(notificationSpy.at(0));
830
178
	ASSERT_EQ("Notify", call.at(0));
831
179
832
180
	QVariantList args(call.at(1).toList());
833
181
	transform(args);
834
182
835
183
	ASSERT_EQ(8, args.size());
836
184
	EXPECT_EQ("indicator-network", args.at(0));
837
185
	EXPECT_EQ("Connect to \"the ssid\"", args.at(3).toString().toStdString());
838
186
839
187
	QVariantMap hints(args.at(6).toMap());
840
188
	QVariantMap menuInfo(hints["x-canonical-private-menu-model"].toMap());
841
189
842
190
	QString busName(menuInfo["busName"].toString());
843
191
	QString menuPath(menuInfo["menuPath"].toString());
844
192
	QVariantMap actions(menuInfo["actions"].toMap());
845
193
846
194
	{
847
195
		UnityMenuModel menuModel;
848
196
849
197
		QSignalSpy menuSpy(&menuModel,
850
198
		SIGNAL(rowsInserted(const QModelIndex&, int, int)));
851
199
852
200
		menuModel.setBusName(busName.toUtf8());
853
201
		menuModel.setMenuObjectPath(menuPath.toUtf8());
854
202
		menuModel.setActions(actions);
855
203
856
204
		menuSpy.wait();
857
205
858
206
		menuModel.changeState(0, "hard-coded-password");
859
207
860
208
		// It seems like UnityMenuModel or the GLib
861
209
		// DBus connection needs some grace time to
862
210
		// finish dispatching.
863
211
		secretAgent.waitForReadyRead();
864
212
		ASSERT_EQ("Password received", secretAgent.readAll().trimmed());
865
213
	}
866
214
867
215
	notificationsInterface->EmitSignal(
868
216
			OrgFreedesktopNotificationsInterface::staticInterfaceName(),
869
217
			"ActionInvoked", "us", QVariantList() << 1 << "connect_id");
870
218
871
219
	QVariantDictMap result(reply);
872
220
873
116
	EXPECT_EQ(
221
	EXPECT_EQ(
874
117
			expected(GetParam().keyManagement, GetParam().passwordKey,
222
			expected(GetParam().keyManagement, GetParam().passwordKey,
876
118
					GetParam().password), reply);
223
					GetParam().password), result);
877
119
}
224
}
878
120
225
879
121
INSTANTIATE_TEST_CASE_P(WpaPsk, TestSecretAgentGetSecrets,
226
INSTANTIATE_TEST_CASE_P(WpaPsk, TestSecretAgentGetSecrets,
880
@@ -137,7 +242,8 @@
881
137
242
882
138
TEST_F(TestSecretAgent, GetSecretsWithNone) {
243
TEST_F(TestSecretAgent, GetSecretsWithNone) {
883
139
	QDBusPendingReply<QVariantDictMap> reply(
244
	QDBusPendingReply<QVariantDictMap> reply(
885
140
			interface->GetSecrets(connection(SecretAgent::KEY_MGMT_WPA_PSK),
245
			agentInterface->GetSecrets(
886
246
					connection(SecretAgent::KEY_MGMT_WPA_PSK),
887
141
					QDBusObjectPath("/connection/foo"),
247
					QDBusObjectPath("/connection/foo"),
888
142
					SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
248
					SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
889
143
					0));
249
					0));
890
@@ -150,17 +256,17 @@
891
150
}
256
}
892
151
257
893
152
TEST_F(TestSecretAgent, CancelGetSecrets) {
258
TEST_F(TestSecretAgent, CancelGetSecrets) {
895
153
	interface->CancelGetSecrets(QDBusObjectPath("/connection/foo"),
259
	agentInterface->CancelGetSecrets(QDBusObjectPath("/connection/foo"),
896
154
			SecretAgent::WIRELESS_SECURITY_SETTING_NAME).waitForFinished();
260
			SecretAgent::WIRELESS_SECURITY_SETTING_NAME).waitForFinished();
897
155
}
261
}
898
156
262
899
157
TEST_F(TestSecretAgent, SaveSecrets) {
263
TEST_F(TestSecretAgent, SaveSecrets) {
901
158
	interface->SaveSecrets(QVariantDictMap(),
264
	agentInterface->SaveSecrets(QVariantDictMap(),
902
159
			QDBusObjectPath("/connection/foo")).waitForFinished();
265
			QDBusObjectPath("/connection/foo")).waitForFinished();
903
160
}
266
}
904
161
267
905
162
TEST_F(TestSecretAgent, DeleteSecrets) {
268
TEST_F(TestSecretAgent, DeleteSecrets) {
907
163
	interface->DeleteSecrets(QVariantDictMap(),
269
	agentInterface->DeleteSecrets(QVariantDictMap(),
908
164
			QDBusObjectPath("/connection/foo")).waitForFinished();
270
			QDBusObjectPath("/connection/foo")).waitForFinished();
909
165
}
271
}
910
166
272
911
167
273
912
=== modified file 'tests/data/valgrind.suppression'
913
--- tests/data/valgrind.suppression	2013-08-27 14:54:25 +0000
914
+++ tests/data/valgrind.suppression	2013-10-03 13:04:10 +0000
915
@@ -27,6 +27,20 @@
916
27
}
27
}
917
28
28
918
29
###############################
29
###############################
919
30
# DBus
920
31
###############################
921
32
922
33
{
923
34
   <insert_a_suppression_name_here>
924
35
   Memcheck:Param
925
36
   epoll_ctl(event)
926
37
   fun:epoll_ctl
927
38
   obj:/bin/dbus-daemon
928
39
   ...
929
40
   fun:(below main)
930
41
}
931
42
932
43
###############################
933
30
# GObject rules
44
# GObject rules
934
31
###############################
45
###############################
935
32
46
Status:	Merged
Approved by:	Pete Woods on 2013-10-03
Approved revision:	296
Merged at revision:	291
Proposed branch:	lp:~indicator-applet-developers/indicator-network/secret-agent
Merge into:	lp:indicator-network/13.10
Diff against target:	934 lines (+499/-42) 18 files modified CMakeLists.txt (+3/-0) cmake/FindValgrind.cmake (+7/-0) data/indicator-secret-agent.conf.in (+1/-4) data/org.freedesktop.Notifications.xml (+47/-0) debian/changelog (+7/-0) debian/control (+1/-0) secret-agent/CMakeLists.txt (+18/-0) secret-agent/DBusTypes.h (+1/-2) secret-agent/SecretAgent.cpp (+19/-8) secret-agent/SecretAgent.h (+15/-4) secret-agent/SecretRequest.cpp (+57/-8) secret-agent/SecretRequest.h (+8/-2) secret-agent/gtk/PasswordMenu.cpp (+134/-0) secret-agent/gtk/PasswordMenu.h (+45/-0) secret-agent/main.cpp (+2/-1) tests/CMakeLists.txt (+1/-0) tests/TestSecretAgent.cpp (+119/-13) tests/data/valgrind.suppression (+14/-0)
To merge this branch:	bzr merge lp:~indicator-applet-developers/indicator-network/secret-agent
Related bugs:	Link a bug report
Reviewer	Review Type	Status
PS Jenkins bot (community)	continuous-integration	Approve on 2013-10-03
Ted Gould (community)		Approve on 2013-10-03
Michał Sawicz		Needs Fixing on 2013-10-03
Pete Woods (community)		Abstain on 2013-09-06
Review via email: mp+182898@code.launchpad.net