Merge lp:~pete-woods/indicator-network/keyring-support into lp:indicator-network

[Pete Woods]

Add keyring support to secret agent (requires libsecret)

Add keyring support to secret agent (requires libsecret)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-03 13:27:40 +0000
+++ CMakeLists.txt	2016-02-23 09:05:39 +0000
@@ -60,6 +60,18 @@
 )
 include_directories(${OFONO_INCLUDE_DIRS})
 
+pkg_check_modules(
+    NETWORKMANAGER REQUIRED
+    NetworkManager
+)
+include_directories(${NETWORKMANAGER_INCLUDE_DIRS})
+
+pkg_check_modules(
+  LIBSECRET REQUIRED
+  libsecret-1
+)
+include_directories(${LIBSECRET_INCLUDE_DIRS})
+
 find_package(Qt5Core REQUIRED)
 include_directories(${Qt5Core_INCLUDE_DIRS})
 
 
=== modified file 'debian/control'
--- debian/control	2016-02-23 09:05:39 +0000
+++ debian/control	2016-02-23 09:05:39 +0000
@@ -17,6 +17,7 @@
                libqofono-qt5-0,
                libqtdbusmock1-dev (>= 0.4),
                libqtdbustest1-dev,
+               libsecret-1-dev,
                liburl-dispatcher1-dev,
                libunity-api-dev,
                network-manager-dev,
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-07-28 08:26:51 +0000
+++ src/CMakeLists.txt	2016-02-23 09:05:39 +0000
@@ -1,6 +1,7 @@
 
 add_subdirectory(connectivity-api)
 
+add_subdirectory(agent)
 add_subdirectory(indicator)
 add_subdirectory(menumodel-cpp)
 add_subdirectory(qdbus-stubs)
@@ -8,3 +9,4 @@
 add_subdirectory(notify-cpp)
 add_subdirectory(sniffer)
 add_subdirectory(url-dispatcher-cpp)
+add_subdirectory(util)
 
=== renamed directory 'src/indicator/agent' => 'src/agent'
=== added file 'src/agent/CMakeLists.txt'
--- src/agent/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/agent/CMakeLists.txt	2016-02-23 09:05:39 +0000
@@ -0,0 +1,61 @@
+
+include_directories("${CMAKE_SOURCE_DIR}/src")
+include_directories("${CMAKE_BINARY_DIR}/src/qdbus-stubs")
+include_directories("${CMAKE_SOURCE_DIR}/src/qdbus-stubs")
+
+set(AGENT_SOURCES
+  CredentialStore.cpp
+  KeyringCredentialStore.cpp
+  SecretAgent.cpp
+  SecretRequest.cpp
+  PasswordMenu.cpp
+)
+
+qt5_add_dbus_adaptor(
+    AGENT_SOURCES
+    "${DATA_DIR}/nm-secret-agent.xml"
+    "agent/SecretAgentInclude.h"
+    "agent::SecretAgent"
+    SecretAgentAdaptor
+)
+
+add_library(
+  agent-static
+  STATIC
+  ${AGENT_SOURCES}
+)
+
+target_link_libraries(
+    agent-static
+    notify_cpp
+    util
+    Qt5::Core
+    Qt5::DBus
+    ${LIBSECRET_LDFLAGS}
+)
+
+###########################
+# Executables
+###########################
+
+add_executable(
+  indicator-network-secret-agent
+  agent-main.cpp
+)
+
+target_link_libraries(
+    indicator-network-secret-agent
+    agent-static
+    Qt5::Core
+    Qt5::DBus
+)
+
+###########################
+# Installation
+###########################
+
+install(
+  TARGETS
+    indicator-network-secret-agent
+  RUNTIME DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/indicator-network/"
+)
 
=== added file 'src/agent/CredentialStore.cpp'
--- src/agent/CredentialStore.cpp	1970-01-01 00:00:00 +0000
+++ src/agent/CredentialStore.cpp	2016-02-23 09:05:39 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <agent/CredentialStore.h>
+
+namespace agent {
+
+CredentialStore::CredentialStore() {
+}
+
+CredentialStore::~CredentialStore() {
+}
+
+}
 
=== added file 'src/agent/CredentialStore.h'
--- src/agent/CredentialStore.h	1970-01-01 00:00:00 +0000
+++ src/agent/CredentialStore.h	2016-02-23 09:05:39 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/util/DefinesPtrs.h>
+
+#include <QMap>
+#include <QString>
+
+namespace agent {
+
+class CredentialStore {
+public:
+	UNITY_DEFINES_PTRS(CredentialStore);
+
+	CredentialStore();
+
+	virtual ~CredentialStore();
+
+	virtual void save(const QString& uuid, const QString& settingName, const QString& settingKey,
+			const QString& displayName, const QString& secret) = 0;
+
+	virtual QMap<QString, QString> get(const QString& uuid, const QString& settingName) = 0;
+
+	virtual void clear(const QString& uuid) = 0;
+};
+
+}
 
=== added file 'src/agent/KeyringCredentialStore.cpp'
--- src/agent/KeyringCredentialStore.cpp	1970-01-01 00:00:00 +0000
+++ src/agent/KeyringCredentialStore.cpp	2016-02-23 09:05:39 +0000
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <agent/KeyringCredentialStore.h>
+
+#include <libsecret/secret.h>
+#include <QDebug>
+
+#define KEYRING_UUID_TAG "connection-uuid"
+#define KEYRING_SN_TAG "setting-name"
+#define KEYRING_SK_TAG "setting-key"
+
+static const SecretSchema network_manager_secret_schema = {
+	"org.freedesktop.NetworkManager.Connection",
+	SECRET_SCHEMA_DONT_MATCH_NAME,
+	{
+		{KEYRING_UUID_TAG, SECRET_SCHEMA_ATTRIBUTE_STRING},
+		{KEYRING_SN_TAG, SECRET_SCHEMA_ATTRIBUTE_STRING},
+		{KEYRING_SK_TAG, SECRET_SCHEMA_ATTRIBUTE_STRING},
+		{NULL, (SecretSchemaAttributeType) 0},
+	},
+	// The below junk prevents compilation warnings for
+	// the uninitialised reserved values
+	0,
+	(gpointer) 0,
+	(gpointer) 0,
+	(gpointer) 0,
+	(gpointer) 0,
+	(gpointer) 0,
+	(gpointer) 0,
+	(gpointer) 0
+};
+
+using namespace std;
+
+namespace agent {
+
+KeyringCredentialStore::KeyringCredentialStore() {
+}
+
+KeyringCredentialStore::~KeyringCredentialStore() {
+}
+
+void KeyringCredentialStore::save(const QString& uuid,
+		const QString& settingName, const QString& settingKey,
+		const QString& displayName, const QString& secret) {
+	shared_ptr<GHashTable> attrs(
+			secret_attributes_build(&network_manager_secret_schema,
+			KEYRING_UUID_TAG, uuid.toUtf8().constData(),
+			KEYRING_SN_TAG, settingName.toUtf8().constData(),
+			KEYRING_SK_TAG, settingKey.toUtf8().constData(),
+			NULL), &g_hash_table_unref);
+
+	GError* error = NULL;
+	if (!secret_password_storev_sync(&network_manager_secret_schema,
+			attrs.get(),
+			NULL,
+			displayName.toUtf8().constData(),
+			secret.toUtf8().constData(),
+			NULL, &error)) {
+		QString message;
+		if (error != NULL) {
+			if (error->message) {
+				message = QString::fromUtf8(error->message);
+			}
+			g_error_free(error);
+		}
+		qCritical() << __PRETTY_FUNCTION__ << message;
+	}
+}
+
+QMap<QString, QString> KeyringCredentialStore::get(const QString& uuid, const QString& settingName) {
+	QMap<QString, QString> result;
+
+	shared_ptr<GHashTable> attrs(secret_attributes_build(
+					&network_manager_secret_schema,
+					KEYRING_UUID_TAG, uuid.toUtf8().constData(),
+					KEYRING_SN_TAG, settingName.toUtf8().constData(),
+					NULL), &g_hash_table_unref);
+
+	GError* error = NULL;
+	shared_ptr<GList> list(secret_service_search_sync(NULL,
+			&network_manager_secret_schema, attrs.get(),
+			(SecretSearchFlags) (SECRET_SEARCH_ALL | SECRET_SEARCH_UNLOCK
+					| SECRET_SEARCH_LOAD_SECRETS), NULL, &error), [](GList* list) {
+		g_list_free_full (list, g_object_unref);
+	});
+
+	if (list == NULL) {
+		if (error != NULL) {
+			string errorMessage;
+			if (error->message) {
+				errorMessage = error->message;
+			}
+			g_error_free(error);
+			throw domain_error(errorMessage);
+		}
+
+		return result;
+	}
+
+	for (GList* iter = list.get(); iter != NULL; iter = g_list_next(iter)) {
+		SecretItem *item = (SecretItem *) iter->data;
+		shared_ptr<SecretValue> secret(secret_item_get_secret(item), &secret_value_unref);
+		if (secret) {
+			shared_ptr<GHashTable> attributes(secret_item_get_attributes(item), &g_hash_table_unref);
+			const char *keyName = (const char *) g_hash_table_lookup(attributes.get(),
+					KEYRING_SK_TAG);
+			if (!keyName) {
+				continue;
+			}
+
+			QString keyString = QString::fromUtf8(keyName);
+			QString secretString = QString::fromUtf8(secret_value_get(secret.get(), NULL));
+
+			result[keyString] = secretString;
+		}
+	}
+
+	return result;
+}
+
+void KeyringCredentialStore::clear(const QString& uuid) {
+	GError *error = NULL;
+	if (!secret_password_clear_sync(&network_manager_secret_schema, NULL, &error,
+						   KEYRING_UUID_TAG, uuid.toUtf8().constData(),
+						   NULL)) {
+		if (error != NULL) {
+			QString message;
+			if (error->message) {
+				message = QString::fromUtf8(error->message);
+			}
+			g_error_free(error);
+			qCritical() << __PRETTY_FUNCTION__ << message;
+		}
+	}
+}
+
+}
 
=== added file 'src/agent/KeyringCredentialStore.h'
--- src/agent/KeyringCredentialStore.h	1970-01-01 00:00:00 +0000
+++ src/agent/KeyringCredentialStore.h	2016-02-23 09:05:39 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <agent/CredentialStore.h>
+
+#include <QList>
+#include <QPair>
+#include <QString>
+
+namespace agent {
+
+class KeyringCredentialStore: public CredentialStore {
+public:
+	KeyringCredentialStore();
+
+	~KeyringCredentialStore();
+
+	void save(const QString& uuid, const QString& settingName,
+			const QString& settingKey, const QString& displayName,
+			const QString& secret) override;
+
+	QMap<QString, QString> get(const QString& uuid, const QString& settingName) override;
+
+	void clear(const QString& uuid) override;
+};
+
+}
 
=== modified file 'src/agent/SecretAgent.cpp'
--- src/indicator/agent/SecretAgent.cpp	2015-11-20 13:14:50 +0000
+++ src/agent/SecretAgent.cpp	2016-02-23 09:05:39 +0000
@@ -25,6 +25,13 @@
 #include <NetworkManager.h>
 #include <stdexcept>
 
+#define NM_SECRET_AGENT_CAPABILITY_NONE 0
+
+#define NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE 0
+#define NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION 1
+#define NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW 2
+#define NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED 4
+
 using namespace std;
 
 namespace agent
@@ -34,16 +41,85 @@
 	Q_OBJECT
 
 public:
-	Priv(notify::NotificationManager::SPtr notificationManager, const QDBusConnection &systemConnection,
+	Priv(notify::NotificationManager::SPtr notificationManager,
+			agent::CredentialStore::SPtr credentialStore,
+			const QDBusConnection &systemConnection,
 			const QDBusConnection &sessionConnection) :
 			m_systemConnection(systemConnection),
 			m_sessionConnection(sessionConnection),
 			m_managerWatcher(NM_DBUS_SERVICE, m_systemConnection),
 			m_agentManager(NM_DBUS_SERVICE, NM_DBUS_PATH_AGENT_MANAGER, m_systemConnection),
 			m_notifications(notificationManager),
+			m_credentialStore(credentialStore),
 			m_request(nullptr) {
 	}
 
+	void saveSecret(const QString& id, const QString& uuid,
+			const QString& settingName, const QString& settingKey,
+			const QString& secret, const QString& inputDisplayName =
+					QString()) {
+
+		// TODO: Don't save always-ask or system-owned secrets
+
+		QString displayName(inputDisplayName);
+		if (displayName.isEmpty()) {
+			static const QString DISPLAY_NAME("Network secret for %s/%s/%s");
+			displayName = DISPLAY_NAME.arg(id, settingName, settingKey);
+		}
+
+		m_credentialStore->save(uuid, settingName, settingKey, displayName, secret);
+	}
+
+	static bool isSecret(const QString& settingName, const QString& key) {
+		static const QMap<QString, QSet<QString>> KNOWN_SECRETS{
+			{QString::fromUtf8(NM_802_1X_SETTING_NAME), {NM_802_1X_PASSWORD, NM_802_1X_PRIVATE_KEY_PASSWORD,
+					NM_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, NM_802_1X_PIN}},
+			{QString::fromUtf8(NM_ADSL_SETTING_NAME), {NM_ADSL_PASSWORD}},
+			{QString::fromUtf8(NM_CDMA_SETTING_NAME), {NM_CDMA_PASSWORD}},
+			{QString::fromUtf8(NM_GSM_SETTING_NAME), {NM_GSM_PASSWORD, NM_GSM_PIN}},
+			{QString::fromUtf8(NM_PPPOE_SETTING_NAME), {NM_PPPOE_PASSWORD}},
+			{QString::fromUtf8(NM_WIRELESS_SECURITY_SETTING_NAME), {NM_WIRELESS_SECURITY_WEP_KEY0,
+					NM_WIRELESS_SECURITY_WEP_KEY1, NM_WIRELESS_SECURITY_WEP_KEY2, NM_WIRELESS_SECURITY_WEP_KEY3,
+					NM_WIRELESS_SECURITY_PSK, NM_WIRELESS_SECURITY_LEAP_PASSWORD}}
+		};
+		auto it = KNOWN_SECRETS.constFind(settingName);
+		if (it != KNOWN_SECRETS.constEnd()) {
+			if (it->contains(key)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	void saveSettings(const QString& id, const QString& uuid,
+			const QString& settingName, const QVariantMap& setting) {
+
+		QMapIterator<QString, QVariant> iter(setting);
+		while (iter.hasNext()) {
+			iter.next();
+			if (isSecret(settingName, iter.key())) {
+				saveSecret(id, uuid, settingName, iter.key(),
+						iter.value().toString());
+			}
+		}
+	}
+
+	void saveVpnSettings(const QString& id, const QString& uuid,
+			const QString& settingName, const QVariantMap& setting) {
+		static const QString DISPLAY_NAME{"VPN %1 secret for %2/%3/%4"};
+
+		QString serviceType = setting[NM_VPN_SERVICE_TYPE].toString();
+		QStringMap secrets;
+		auto dbusArgument = qvariant_cast<QDBusArgument>(setting[NM_VPN_SECRETS]);
+		dbusArgument >> secrets;
+		QMapIterator<QString, QString> iter(secrets);
+		while(iter.hasNext()) {
+			iter.next();
+			saveSecret(id, uuid, settingName, iter.key(), iter.value(),
+					DISPLAY_NAME.arg(iter.key(), id, serviceType, NM_VPN_SETTING_NAME));
+		}
+	}
+
 public Q_SLOTS:
 	void serviceOwnerChanged(const QString &name, const QString &oldOwner,
 			const QString &newOwner)
@@ -53,7 +129,7 @@
 		if (!newOwner.isEmpty()) {
 			auto reply = m_agentManager.RegisterWithCapabilities(
 					"com.canonical.indicator.SecretAgent",
-					0 /*NM_SECRET_AGENT_CAPABILITY_NONE*/);
+					NM_SECRET_AGENT_CAPABILITY_NONE);
 			reply.waitForFinished();
 			if (reply.isError()) {
 				qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
@@ -72,13 +148,16 @@
 
 	notify::NotificationManager::SPtr m_notifications;
 
+	CredentialStore::SPtr m_credentialStore;
+
 	std::shared_ptr<SecretRequest> m_request;
 };
 
 SecretAgent::SecretAgent(notify::NotificationManager::SPtr notificationManager,
-        const QDBusConnection &systemConnection,
+		agent::CredentialStore::SPtr credentialStore,
+		const QDBusConnection &systemConnection,
 		const QDBusConnection &sessionConnection, QObject *parent) :
-		QObject(parent), d(new Priv(notificationManager, systemConnection, sessionConnection))
+		QObject(parent), d(new Priv(notificationManager, credentialStore, systemConnection, sessionConnection))
 	{
 	// Memory managed by Qt
 	new SecretAgentAdaptor(this);
@@ -94,7 +173,7 @@
 
 	auto reply = d->m_agentManager.RegisterWithCapabilities(
 						"com.canonical.indicator.SecretAgent",
-						0 /*NM_SECRET_AGENT_CAPABILITY_NONE*/);
+						NM_SECRET_AGENT_CAPABILITY_NONE);
 	reply.waitForFinished();
 	if (reply.isError()) {
 		qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
@@ -153,13 +232,66 @@
 
 	setDelayedReply(true);
 
-	if (flags != 0 && settingName == "802-11-wireless-security") {
+	qDebug() << __PRETTY_FUNCTION__ << connectionPath.path() << settingName << hints << flags;
+
+	// If we want a WiFi secret, and
+	if (settingName == NM_WIRELESS_SECURITY_SETTING_NAME &&
+			((flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION) > 0) &&
+			(
+				((flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW) > 0) ||
+				((flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED) > 0)
+			)) {
+		qDebug() << __PRETTY_FUNCTION__ << "Requesting secret from user";
 		d->m_request.reset(new SecretRequest(*this, connection,
 						connectionPath, settingName, hints, flags, message()));
+	} else if (((flags == NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE) ||
+				(flags == NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED))) {
+		qDebug() << __PRETTY_FUNCTION__ << "Retrieving secret from keyring";
+
+		bool isVpn = (settingName == NM_VPN_SETTING_NAME);
+
+		QString uuid = connection[NM_CONNECTION_SETTING_NAME][NM_CONNECTION_UUID].toString();
+
+		QStringMap secrets;
+
+		try {
+			secrets = d->m_credentialStore->get(uuid, settingName);
+		} catch (domain_error& e) {
+			d->m_systemConnection.send(
+					message().createErrorReply(
+							"org.freedesktop.NetworkManager.SecretAgent.InternalError",
+							e.what()));
+			return QVariantDictMap();
+		}
+
+		if (secrets.isEmpty()) {
+			d->m_systemConnection.send(
+					message().createErrorReply(
+							"org.freedesktop.NetworkManager.SecretAgent.NoSecrets",
+							"No secrets found for this connection."));
+			return QVariantDictMap();
+		}
+
+		QVariantDictMap newConnection;
+
+		if (isVpn) {
+			newConnection[settingName][NM_VPN_SECRETS] = QVariant::fromValue(
+					secrets);
+		} else {
+			QMapIterator<QString, QString> it(secrets);
+			while (it.hasNext()) {
+				it.next();
+				newConnection[settingName][it.key()] = it.value();
+			}
+		}
+
+		d->m_systemConnection.send(
+				message().createReply(QVariant::fromValue(newConnection)));
 	} else {
+		qDebug() << __PRETTY_FUNCTION__ << "Can't get secrets for this connection";
 		d->m_systemConnection.send(
-				message().createErrorReply(QDBusError::InternalError,
-						"No password found for this connection."));
+				message().createErrorReply("org.freedesktop.NetworkManager.SecretAgent.NoSecrets",
+						"No secrets found for this connection."));
 	}
 
 	return QVariantDictMap();
@@ -168,7 +300,7 @@
 void SecretAgent::FinishGetSecrets(SecretRequest &request, bool error) {
 	if (error) {
 		d->m_systemConnection.send(
-				request.message().createErrorReply(QDBusError::InternalError,
+				request.message().createErrorReply("org.freedesktop.NetworkManager.SecretAgent.NoSecrets",
 						"No password found for this connection."));
 	} else {
 		d->m_systemConnection.send(
@@ -181,21 +313,38 @@
 
 void SecretAgent::CancelGetSecrets(const QDBusObjectPath &connectionPath,
 		const QString &settingName) {
-	Q_UNUSED(connectionPath);
 	Q_UNUSED(settingName);
-	d->m_request.reset();
+
+	if (d->m_request && d->m_request->connectionPath() == connectionPath) {
+		d->m_request.reset();
+	}
 }
 
 void SecretAgent::DeleteSecrets(const QVariantDictMap &connection,
 		const QDBusObjectPath &connectionPath) {
-	Q_UNUSED(connection);
 	Q_UNUSED(connectionPath);
+
+	QString uuid = connection[NM_CONNECTION_SETTING_NAME][NM_CONNECTION_UUID].toString();
+	d->m_credentialStore->clear(uuid);
 }
 
 void SecretAgent::SaveSecrets(const QVariantDictMap &connection,
 		const QDBusObjectPath &connectionPath) {
-	Q_UNUSED(connection);
 	Q_UNUSED(connectionPath);
+
+	QString id = connection[NM_CONNECTION_SETTING_NAME][NM_CONNECTION_ID].toString();
+	QString uuid = connection[NM_CONNECTION_SETTING_NAME][NM_CONNECTION_UUID].toString();
+	QString type = connection[NM_CONNECTION_SETTING_NAME][NM_CONNECTION_TYPE].toString();
+
+	if (type == NM_VPN_SETTING_NAME) {
+		d->saveVpnSettings(id, uuid, NM_VPN_SETTING_NAME, connection[NM_VPN_SETTING_NAME]);
+	} else {
+		QMapIterator<QString, QVariantMap> iter(connection);
+		while (iter.hasNext()) {
+			iter.next();
+			d->saveSettings(id, uuid, iter.key(), iter.value());
+		}
+	}
 }
 
 notify::NotificationManager::SPtr SecretAgent::notifications() {
 
=== modified file 'src/agent/SecretAgent.h'
--- src/indicator/agent/SecretAgent.h	2015-08-03 13:27:40 +0000
+++ src/agent/SecretAgent.h	2016-02-23 09:05:39 +0000
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <dbus-types.h>
+#include <agent/CredentialStore.h>
 
 #include <memory>
 
@@ -48,21 +49,50 @@
 	typedef std::shared_ptr<SecretAgent> Ptr;
 	typedef std::unique_ptr<SecretAgent> UPtr;
 
-	static constexpr char const* CONNECTION_SETTING_NAME = "connection";
-	static constexpr char const* WIRELESS_SECURITY_SETTING_NAME = "802-11-wireless-security";
-
-	static constexpr char const* CONNECTION_ID = "id";
-
-	static constexpr char const* WIRELESS_SECURITY_PSK = "psk";
-	static constexpr char const* WIRELESS_SECURITY_WEP_KEY0 = "wep-key0";
-
-	static constexpr char const* WIRELESS_SECURITY_KEY_MGMT = "key-mgmt";
-
-	static constexpr char const* KEY_MGMT_WPA_NONE = "wpa-none";
-	static constexpr char const* KEY_MGMT_WPA_PSK = "wpa-psk";
-	static constexpr char const* KEY_MGMT_NONE = "none";
+	static constexpr char const* NM_CONNECTION_SETTING_NAME = "connection";
+
+	static constexpr char const* NM_CONNECTION_ID = "id";
+	static constexpr char const* NM_CONNECTION_UUID = "uuid";
+	static constexpr char const* NM_CONNECTION_TYPE = "type";
+
+	static constexpr char const* NM_ADSL_SETTING_NAME = "adsl";
+	static constexpr char const* NM_ADSL_PASSWORD = "password";
+
+	static constexpr char const* NM_GSM_SETTING_NAME = "gsm";
+	static constexpr char const* NM_GSM_PASSWORD = "password";
+	static constexpr char const* NM_GSM_PIN = "pin";
+
+	static constexpr char const* NM_802_1X_SETTING_NAME = "802-1x";
+	static constexpr char const* NM_802_1X_PASSWORD = "password";
+	static constexpr char const* NM_802_1X_PRIVATE_KEY_PASSWORD = "private-key-password";
+	static constexpr char const* NM_802_1X_PHASE2_PRIVATE_KEY_PASSWORD = "phase2-private-key-password";
+	static constexpr char const* NM_802_1X_PIN = "pin";
+
+	static constexpr char const* NM_CDMA_SETTING_NAME = "cdma";
+	static constexpr char const* NM_CDMA_PASSWORD = "password";
+
+	static constexpr char const* NM_PPPOE_SETTING_NAME = "pppoe";
+	static constexpr char const* NM_PPPOE_PASSWORD = "password";
+
+	static constexpr char const* NM_VPN_SETTING_NAME = "vpn";
+	static constexpr char const* NM_VPN_SERVICE_TYPE = "service-type";
+	static constexpr char const* NM_VPN_SECRETS = "secrets";
+
+	static constexpr char const* NM_WIRELESS_SECURITY_SETTING_NAME = "802-11-wireless-security";
+	static constexpr char const* NM_WIRELESS_SECURITY_KEY_MGMT = "key-mgmt";
+	static constexpr char const* NM_WIRELESS_SECURITY_WEP_KEY0 = "wep-key0";
+	static constexpr char const* NM_WIRELESS_SECURITY_WEP_KEY1 = "wep-key1";
+	static constexpr char const* NM_WIRELESS_SECURITY_WEP_KEY2 = "wep-key2";
+	static constexpr char const* NM_WIRELESS_SECURITY_WEP_KEY3 = "wep-key3";
+	static constexpr char const* NM_WIRELESS_SECURITY_PSK = "psk";
+	static constexpr char const* NM_WIRELESS_SECURITY_LEAP_PASSWORD = "leap-password";
+
+	static constexpr char const* NM_KEY_MGMT_WPA_NONE = "wpa-none";
+	static constexpr char const* NM_KEY_MGMT_WPA_PSK = "wpa-psk";
+	static constexpr char const* NM_KEY_MGMT_NONE = "none";
 
 	explicit SecretAgent(std::shared_ptr<notify::NotificationManager> notificationManager,
+			CredentialStore::SPtr credentialStore,
             const QDBusConnection &systemConnection,
             const QDBusConnection &sessionConnection, QObject *parent = 0);
 
 
=== modified file 'src/agent/SecretRequest.cpp'
--- src/indicator/agent/SecretRequest.cpp	2015-08-03 13:27:40 +0000
+++ src/agent/SecretRequest.cpp	2016-02-23 09:05:39 +0000
@@ -52,24 +52,24 @@
 
 	notificationHints["x-canonical-private-menu-model"] = menuModelPaths;
 
-	const QVariantMap &conn = m_connection[SecretAgent::CONNECTION_SETTING_NAME];
+	const QVariantMap &conn = m_connection[SecretAgent::NM_CONNECTION_SETTING_NAME];
 
 	auto wirelessSecurity = m_connection.find(m_settingName);
 	QString keyMgmt(
-			wirelessSecurity->value(SecretAgent::WIRELESS_SECURITY_KEY_MGMT).toString());
+			wirelessSecurity->value(SecretAgent::NM_WIRELESS_SECURITY_KEY_MGMT).toString());
 
 	QString title(_("Connect to “%1”"));
 
 	QString subject;
-	if (keyMgmt == SecretAgent::KEY_MGMT_WPA_NONE
-			|| keyMgmt == SecretAgent::KEY_MGMT_WPA_PSK) {
+	if (keyMgmt == SecretAgent::NM_KEY_MGMT_WPA_NONE
+			|| keyMgmt == SecretAgent::NM_KEY_MGMT_WPA_PSK) {
 		subject = _("WPA");
-	} else if (keyMgmt == SecretAgent::KEY_MGMT_NONE) {
+	} else if (keyMgmt == SecretAgent::NM_KEY_MGMT_NONE) {
 		subject = _("WEP");
 	}
 
 	m_notification = m_secretAgent.notifications()->notify(
-			title.arg(conn[SecretAgent::CONNECTION_ID].toString()), subject,
+			title.arg(conn[SecretAgent::NM_CONNECTION_ID].toString()), subject,
 			"wifi-full-secure",
 			QStringList() << "connect_id" << _("Connect") << "cancel_id"
 					<< _("Cancel"), notificationHints, 0);
@@ -101,13 +101,13 @@
 
 	auto wirelessSecurity = m_connection.find(m_settingName);
 	QString keyMgmt(
-			wirelessSecurity->value(SecretAgent::WIRELESS_SECURITY_KEY_MGMT).toString());
+			wirelessSecurity->value(SecretAgent::NM_WIRELESS_SECURITY_KEY_MGMT).toString());
 
-	if (keyMgmt == SecretAgent::KEY_MGMT_WPA_NONE
-			|| keyMgmt == SecretAgent::KEY_MGMT_WPA_PSK) {
-		wirelessSecurity->insert(SecretAgent::WIRELESS_SECURITY_PSK, key);
-	} else if (keyMgmt == SecretAgent::KEY_MGMT_NONE) {
-		wirelessSecurity->insert(SecretAgent::WIRELESS_SECURITY_WEP_KEY0, key);
+	if (keyMgmt == SecretAgent::NM_KEY_MGMT_WPA_NONE
+			|| keyMgmt == SecretAgent::NM_KEY_MGMT_WPA_PSK) {
+		wirelessSecurity->insert(SecretAgent::NM_WIRELESS_SECURITY_PSK, key);
+	} else if (keyMgmt == SecretAgent::NM_KEY_MGMT_NONE) {
+		wirelessSecurity->insert(SecretAgent::NM_WIRELESS_SECURITY_WEP_KEY0, key);
 	}
 
 	m_secretAgent.FinishGetSecrets(*this, false);
@@ -130,4 +130,8 @@
 	return m_message;
 }
 
+const QDBusObjectPath & SecretRequest::connectionPath() const {
+	return m_connectionPath;
+}
+
 }
 
=== modified file 'src/agent/SecretRequest.h'
--- src/indicator/agent/SecretRequest.h	2015-08-03 13:27:40 +0000
+++ src/agent/SecretRequest.h	2016-02-23 09:05:39 +0000
@@ -51,6 +51,8 @@
 
 	const QDBusMessage & message() const;
 
+	const QDBusObjectPath & connectionPath() const;
+
 protected:
 	notify::Notification::UPtr m_notification;
 
 
=== renamed file 'src/indicator/agent-main.cpp' => 'src/agent/agent-main.cpp'
--- src/indicator/agent-main.cpp	2015-11-20 13:14:50 +0000
+++ src/agent/agent-main.cpp	2016-02-23 09:05:39 +0000
@@ -17,7 +17,9 @@
  *     Antti Kaijanmäki <[e-mail]>
  */
 
-#include <factory.h>
+#include <notify-cpp/notification-manager.h>
+#include <agent/KeyringCredentialStore.h>
+#include <agent/SecretAgent.h>
 #include <util/unix-signal-handler.h>
 #include <dbus-types.h>
 
@@ -32,7 +34,6 @@
 #include <config.h>
 
 using namespace std;
-using namespace connectivity_service;
 
 int
 main(int argc, char **argv)
@@ -42,23 +43,20 @@
     Variant::registerMetaTypes();
     std::srand(std::time(0));
 
-    util::UnixSignalHandler handler([]{
-        QCoreApplication::exit(0);
-    });
-    handler.setupUnixSignalHandlers();
-
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
     setlocale(LC_ALL, "");
     bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
     textdomain(GETTEXT_PACKAGE);
 
-    if (argc == 2 && QString("--print-address") == argv[1])
-    {
-        qDebug() << QDBusConnection::systemBus().baseService();
-    }
+    util::UnixSignalHandler handler([]{
+		QCoreApplication::exit(0);
+	});
+	handler.setupUnixSignalHandlers();
 
-    Factory factory;
-    auto secretAgent = factory.newSecretAgent();
+    auto agent = make_unique<agent::SecretAgent>(
+            make_shared<notify::NotificationManager>(GETTEXT_PACKAGE),
+            make_shared<agent::KeyringCredentialStore>(),
+            QDBusConnection::systemBus(), QDBusConnection::sessionBus());
 
     return app.exec();
 }
 
=== modified file 'src/indicator/CMakeLists.txt'
--- src/indicator/CMakeLists.txt	2016-01-14 11:40:59 +0000
+++ src/indicator/CMakeLists.txt	2016-02-23 09:05:39 +0000
@@ -1,11 +1,5 @@
 
 pkg_check_modules(
-    NETWORKMANAGER REQUIRED
-    NetworkManager
-)
-include_directories(${NETWORKMANAGER_INCLUDE_DIRS})
-
-pkg_check_modules(
     QOFONO REQUIRED
     qofono-qt5
 )
@@ -43,10 +37,6 @@
     nmofono/vpn/vpn-connection.cpp
     nmofono/vpn/vpn-manager.cpp
 
-    agent/SecretAgent.cpp
-    agent/SecretRequest.cpp
-    agent/PasswordMenu.cpp
-
     factory.cpp
     indicator-menu.cpp
     icons.cpp
@@ -71,9 +61,6 @@
     menuitems/wifi-link-item.cpp
     menuitems/wwan-link-item.cpp
     menuitems/modem-info-item.cpp
-    
-    util/dbus-utils.cpp
-    util/unix-signal-handler.cpp
 )
 
 qt5_add_dbus_adaptor(
@@ -116,14 +103,6 @@
     PptpAdaptor
 )
 
-qt5_add_dbus_adaptor(
-    NETWORK_SERVICE_SOURCES
-    "${DATA_DIR}/nm-secret-agent.xml"
-    "agent/SecretAgentInclude.h"
-    "agent::SecretAgent"
-    SecretAgentAdaptor
-)
-
 add_library(
   indicator-network-service-static
   STATIC
@@ -137,9 +116,9 @@
     url_dispatcher_cpp
     qdbus-stubs
     qpowerd
-    ${DBUSCPP_LIBRARIES}
-    ${GLIB_LIBRARIES}
-    ${QOFONO_LIBRARIES}
+    util
+    ${GLIB_LDFLAGS}
+    ${QOFONO_LDFLAGS}
     Qt5::Core
     Qt5::DBus
 )
@@ -160,18 +139,6 @@
     Qt5::DBus
 )
 
-add_executable(
-  indicator-network-secret-agent
-  agent-main.cpp
-)
-
-target_link_libraries(
-    indicator-network-secret-agent
-    indicator-network-service-static
-    Qt5::Core
-    Qt5::DBus
-)
-
 ###########################
 # Installation
 ###########################
@@ -179,6 +146,5 @@
 install(
   TARGETS
     indicator-network-service
-    indicator-network-secret-agent
   RUNTIME DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/indicator-network/"
 )
 
=== modified file 'src/indicator/factory.cpp'
--- src/indicator/factory.cpp	2015-12-11 14:58:11 +0000
+++ src/indicator/factory.cpp	2016-02-23 09:05:39 +0000
@@ -221,13 +221,6 @@
     return make_unique<BusName>(name, acquired, lost, d->singletonSessionBus());
 }
 
-agent::SecretAgent::UPtr Factory::newSecretAgent()
-{
-    return make_unique<agent::SecretAgent>(d->singletonNotificationManager(),
-                                           QDBusConnection::systemBus(),
-                                           QDBusConnection::sessionBus());
-}
-
 VpnStatusNotifier::UPtr Factory::newVpnStatusNotifier()
 {
     return make_unique<VpnStatusNotifier>(d->singletonActiveConnectionManager(),
 
=== modified file 'src/indicator/factory.h'
--- src/indicator/factory.h	2015-12-11 14:58:11 +0000
+++ src/indicator/factory.h	2016-02-23 09:05:39 +0000
@@ -31,7 +31,6 @@
 #include <sections/wifi-section.h>
 #include <sections/wwan-section.h>
 #include <menuitems/switch-item.h>
-#include <agent/SecretAgent.h>
 
 #include <memory>
 
@@ -77,7 +76,6 @@
                                      std::function<void(std::string)> acquired,
                                      std::function<void(std::string)> lost);
 
-    virtual agent::SecretAgent::UPtr newSecretAgent();
 
     virtual VpnStatusNotifier::UPtr newVpnStatusNotifier();
 };
 
=== modified file 'src/indicator/nmofono/vpn/vpn-manager.cpp'
--- src/indicator/nmofono/vpn/vpn-manager.cpp	2016-01-14 11:40:59 +0000
+++ src/indicator/nmofono/vpn/vpn-manager.cpp	2016-02-23 09:05:39 +0000
@@ -251,7 +251,7 @@
         {"type", "vpn"},
         {"id", d->newConnectionName()},
         {"uuid", uuid},
-        {"autoconnect", "false"}
+        {"autoconnect", false}
 
     };
     connection["vpn"] = QVariantMap
 
=== modified file 'src/notify-cpp/CMakeLists.txt'
--- src/notify-cpp/CMakeLists.txt	2015-08-03 13:27:40 +0000
+++ src/notify-cpp/CMakeLists.txt	2016-02-23 09:05:39 +0000
@@ -11,5 +11,6 @@
 add_library(notify_cpp STATIC ${NOTIFY_CPP_SOURCES})
 target_link_libraries(
     notify_cpp
+    menumodel_cpp
     qdbus-stubs
 )
 
=== renamed directory 'src/indicator/util' => 'src/util'
=== added file 'src/util/CMakeLists.txt'
--- src/util/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/util/CMakeLists.txt	2016-02-23 09:05:39 +0000
@@ -0,0 +1,8 @@
+include_directories("${CMAKE_SOURCE_DIR}/src/")
+
+set(UTIL_SOURCES
+    dbus-utils.cpp
+    unix-signal-handler.cpp
+)
+
+add_library(util STATIC ${UTIL_SOURCES})
 
=== modified file 'tests/unit/CMakeLists.txt'
--- tests/unit/CMakeLists.txt	2015-11-20 11:21:59 +0000
+++ tests/unit/CMakeLists.txt	2016-02-23 09:05:39 +0000
@@ -27,7 +27,7 @@
 
 target_link_libraries(
     secret-agent-test-bin
-    indicator-network-service-static
+    agent-static
 )
 
 ###################
 
=== modified file 'tests/unit/secret-agent/secret-agent-main.cpp'
--- tests/unit/secret-agent/secret-agent-main.cpp	2015-04-21 10:59:52 +0000
+++ tests/unit/secret-agent/secret-agent-main.cpp	2016-02-23 09:05:39 +0000
@@ -19,19 +19,23 @@
 #include <config.h>
 #include <libintl.h>
 #include <config.h>
-#include <factory.h>
 #include <dbus-types.h>
+#include <notify-cpp/notification-manager.h>
+#include <agent/KeyringCredentialStore.h>
+#include <agent/SecretAgent.h>
 #include <util/unix-signal-handler.h>
 
 #include <QCoreApplication>
+#include <QDBusConnection>
 #include <iostream>
+#include <memory>
 
 using namespace std;
 
-
 int main(int argc, char *argv[]) {
     QCoreApplication application(argc, argv);
     DBusTypes::registerMetaTypes();
+    Variant::registerMetaTypes();
 
     setlocale(LC_ALL, "");
     bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
@@ -43,8 +47,10 @@
     });
     handler.setupUnixSignalHandlers();
 
-    Factory factory;
-    auto secretAgent = factory.newSecretAgent();
+    auto secretAgent = make_unique<agent::SecretAgent>(
+                make_shared<notify::NotificationManager>(GETTEXT_PACKAGE),
+				make_shared<agent::KeyringCredentialStore>(),
+                QDBusConnection::systemBus(), QDBusConnection::sessionBus());
 
     if (argc == 2 && QString("--print-address") == argv[1]) {
         cout << QDBusConnection::systemBus().baseService().toStdString()
 
=== modified file 'tests/unit/secret-agent/test-secret-agent.cpp'
--- tests/unit/secret-agent/test-secret-agent.cpp	2015-11-20 11:21:59 +0000
+++ tests/unit/secret-agent/test-secret-agent.cpp	2016-02-23 09:05:39 +0000
@@ -78,16 +78,16 @@
 
 	QVariantDictMap connection(const QString &keyManagement) {
 		QVariantMap wirelessSecurity;
-		wirelessSecurity[SecretAgent::WIRELESS_SECURITY_KEY_MGMT] =
+		wirelessSecurity[SecretAgent::NM_WIRELESS_SECURITY_KEY_MGMT] =
 				keyManagement;
 
 		QVariantMap conn;
-		conn[SecretAgent::CONNECTION_ID] = "the ssid";
+		conn[SecretAgent::NM_CONNECTION_ID] = "the ssid";
 
 		QVariantDictMap connection;
-		connection[SecretAgent::WIRELESS_SECURITY_SETTING_NAME] =
+		connection[SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME] =
 				wirelessSecurity;
-		connection[SecretAgent::CONNECTION_SETTING_NAME] = conn;
+		connection[SecretAgent::NM_CONNECTION_SETTING_NAME] = conn;
 
 		return connection;
 	}
@@ -96,17 +96,17 @@
 			const QString &keyName, const QString &password) {
 
 		QVariantMap wirelessSecurity;
-		wirelessSecurity[SecretAgent::WIRELESS_SECURITY_KEY_MGMT] =
+		wirelessSecurity[SecretAgent::NM_WIRELESS_SECURITY_KEY_MGMT] =
 				keyManagement;
 		wirelessSecurity[keyName] = password;
 
 		QVariantMap conn;
-		conn[SecretAgent::CONNECTION_ID] = "the ssid";
+		conn[SecretAgent::NM_CONNECTION_ID] = "the ssid";
 
 		QVariantDictMap connection;
-		connection[SecretAgent::WIRELESS_SECURITY_SETTING_NAME] =
+		connection[SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME] =
 				wirelessSecurity;
-		connection[SecretAgent::CONNECTION_SETTING_NAME] = conn;
+		connection[SecretAgent::NM_CONNECTION_SETTING_NAME] = conn;
 
 		return connection;
 	}
@@ -166,7 +166,7 @@
 	QDBusPendingReply<QVariantDictMap> reply(
 			agentInterface->GetSecrets(connection(GetParam().keyManagement),
 					QDBusObjectPath("/connection/foo"),
-					SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
+					SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
 					5));
 
 	QSignalSpy notificationSpy(notificationsInterface.data(),
@@ -230,21 +230,21 @@
 }
 
 INSTANTIATE_TEST_CASE_P(WpaPsk, TestSecretAgentGetSecrets,
-		Values(TestSecretAgentParams( { SecretAgent::KEY_MGMT_WPA_PSK,
-				SecretAgent::WIRELESS_SECURITY_PSK, "hard-coded-password" })));
+		Values(TestSecretAgentParams( { SecretAgent::NM_KEY_MGMT_WPA_PSK,
+				SecretAgent::NM_WIRELESS_SECURITY_PSK, "hard-coded-password" })));
 
 INSTANTIATE_TEST_CASE_P(WpaPskLongPassword, TestSecretAgentGetSecrets,
-		Values(TestSecretAgentParams( { SecretAgent::KEY_MGMT_WPA_PSK,
-				SecretAgent::WIRELESS_SECURITY_PSK, "123456789012345678901234567890123456789012345678901234" })));
+		Values(TestSecretAgentParams( { SecretAgent::NM_KEY_MGMT_WPA_PSK,
+				SecretAgent::NM_WIRELESS_SECURITY_PSK, "123456789012345678901234567890123456789012345678901234" })));
 
 INSTANTIATE_TEST_CASE_P(WpaNone, TestSecretAgentGetSecrets,
-		Values(TestSecretAgentParams( { SecretAgent::KEY_MGMT_WPA_NONE,
-				SecretAgent::WIRELESS_SECURITY_PSK, "hard-coded-password" })));
+		Values(TestSecretAgentParams( { SecretAgent::NM_KEY_MGMT_WPA_NONE,
+				SecretAgent::NM_WIRELESS_SECURITY_PSK, "hard-coded-password" })));
 
 INSTANTIATE_TEST_CASE_P(None, TestSecretAgentGetSecrets,
 		Values(
-				TestSecretAgentParams( { SecretAgent::KEY_MGMT_NONE,
-						SecretAgent::WIRELESS_SECURITY_WEP_KEY0,
+				TestSecretAgentParams( { SecretAgent::NM_KEY_MGMT_NONE,
+						SecretAgent::NM_WIRELESS_SECURITY_WEP_KEY0,
 						"hard-coded-password" })));
 
 class TestSecretAgent: public TestSecretAgentCommon, public Test {
@@ -254,9 +254,9 @@
 
 	QDBusPendingReply<QVariantDictMap> reply(
 			agentInterface->GetSecrets(
-					connection(SecretAgent::KEY_MGMT_WPA_PSK),
+					connection(SecretAgent::NM_KEY_MGMT_WPA_PSK),
 					QDBusObjectPath("/connection/foo"),
-					SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
+					SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
 					0));
 	reply.waitForFinished();
 
@@ -272,9 +272,9 @@
 	QSignalSpy notificationSpy(notificationsInterface.data(), SIGNAL(MethodCalled(const QString &, const QVariantList &)));
 
 	agentInterface->GetSecrets(
-			connection(SecretAgent::KEY_MGMT_WPA_PSK),
+			connection(SecretAgent::NM_KEY_MGMT_WPA_PSK),
 			QDBusObjectPath("/connection/foo"),
-			SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
+			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
 			5);
 
 	notificationSpy.wait();
@@ -286,7 +286,7 @@
 	notificationSpy.clear();
 
 	agentInterface->CancelGetSecrets(QDBusObjectPath("/connection/foo"),
-			SecretAgent::WIRELESS_SECURITY_SETTING_NAME);
+			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME);
 
 	notificationSpy.wait();
 
@@ -301,9 +301,9 @@
 	QSignalSpy notificationSpy(notificationsInterface.data(), SIGNAL(MethodCalled(const QString &, const QVariantList &)));
 
 	agentInterface->GetSecrets(
-			connection(SecretAgent::KEY_MGMT_WPA_PSK),
+			connection(SecretAgent::NM_KEY_MGMT_WPA_PSK),
 			QDBusObjectPath("/connection/foo"),
-			SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
+			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
 			5);
 
 	notificationSpy.wait();
@@ -315,9 +315,9 @@
 	notificationSpy.clear();
 
 	agentInterface->GetSecrets(
-			connection(SecretAgent::KEY_MGMT_WPA_PSK),
+			connection(SecretAgent::NM_KEY_MGMT_WPA_PSK),
 			QDBusObjectPath("/connection/foo2"),
-			SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
+			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
 			5);
 
 	notificationSpy.wait();