Merge lp:~indicator-applet-developers/indicator-network/secret-agent into lp:indicator-network/13.10

[Pete Woods]

Move the secret agent code over into this package

Move the secret agent code over into this package

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:276
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/30/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-network-ci/40/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:277
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/31/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-network-ci/41/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:278
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/32/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-network-ci/42/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:279
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-amd64-ci/33
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/33/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-network-ci/43/rebuild

review: Needs Fixing (continuous-integration)

[lp:~indicator-applet-developers/indicator-network/secret-agent]

275. By PS Jenkins bot on 2013-08-27

Releasing 0.5.0+13.10.20130827.3-0ubuntu1 (revision 273 from lp:indicator-network).

Approved by PS Jenkins bot.

[Charles Kerr (charlesk)]

> W: Failed to fetch bzip2:/var/lib/apt/lists/partial/ppa.launchpad.net_ubuntu-unity_daily-build_ubuntu_dists_saucy_main_binary-armhf_Packages Hash Sum mismatch

That's not right. Kicking off a rebuild.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:279
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-saucy-armhf-ci/34/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-network-ci/44/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[lp:~indicator-applet-developers/indicator-network/secret-agent]

276. By Pete Woods on 2013-08-27

Move the secret agent code over into this package.

Approved by Charles Kerr, PS Jenkins bot.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-27 13:48:41 +0000
+++ CMakeLists.txt	2013-08-27 16:07:33 +0000
@@ -5,7 +5,7 @@
 
 set(PACKAGE ${CMAKE_PROJECT_NAME})
 set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
-set(GNOMELOCALEDIR "${CMAKE_INSTALL_FULL_DATADIR}/locale")
+set(LOCALE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/locale")
 
 add_definitions( -DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" )
 
@@ -20,8 +20,7 @@
   set(CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}")
 endif()
 
-set(SOURCE_DIR "${CMAKE_SOURCE_DIR}/src")
-set(SOURCE_BINARY_DIR "${CMAKE_BINARY_DIR}/src")
+set(DATA_DIR "${CMAKE_SOURCE_DIR}/data")
 
 set(GLIB_REQUIRED_VERSION 2.26)
 
@@ -41,12 +40,36 @@
 )
 include_directories(${NM_INCLUDE_DIRS})
 
+
+find_package(Qt5Core REQUIRED)
+include_directories(${Qt5Core_INCLUDE_DIRS})
+
+find_package(Qt5DBus COMPONENTS Qt5DBusMacros REQUIRED)
+include_directories(${Qt5DBus_INCLUDE_DIRS})
+
+find_package(Qt5Test REQUIRED)
+include_directories(${Qt5Test_INCLUDE_DIRS})
+
+pkg_check_modules(NM REQUIRED NetworkManager REQUIRED)
+include_directories(${NM_INCLUDE_DIRS})
+
+pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1 REQUIRED)
+include_directories(${QTDBUSTEST_INCLUDE_DIRS})
+
+pkg_check_modules(QTDBUSMOCK REQUIRED libqtdbusmock-1 REQUIRED)
+include_directories(${QTDBUSMOCK_INCLUDE_DIRS})
+
+pkg_check_modules(QMENUMODEL REQUIRED qmenumodel REQUIRED)
+include_directories(${QMENUMODEL_INCLUDE_DIRS})
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 find_package(Vala 0.18)
 
 find_package(GObjectIntrospection 0.9.12)
 
-include_directories(${SOURCE_DIR})
-include_directories(${SOURCE_BINARY_DIR})
+include_directories(${CMAKE_BINARY_DIR})
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
@@ -57,12 +80,18 @@
 
 configure_file(
   "config.h.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/config.h"
+  "config.h"
 )
 
 add_subdirectory(data)
 add_subdirectory(network)
+add_subdirectory(secret-agent)
 
 enable_testing()
 add_subdirectory(tests)
 
+ADD_CUSTOM_TARGET(
+        check
+        ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
+)
+

=== added file 'cmake/FindGMock.cmake'
--- cmake/FindGMock.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGMock.cmake	2013-08-27 16:07:33 +0000
@@ -0,0 +1,10 @@
+# Build with system gmock and embedded gtest
+set (GMOCK_INCLUDE_DIRS "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
+set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
+set (GTEST_INCLUDE_DIRS "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
+
+add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+
+set(GTEST_LIBRARIES gtest)
+set(GTEST_MAIN_LIBRARIES gtest_main)
+set(GMOCK_LIBRARIES gmock gmock_main)

=== added file 'cmake/FindValgrind.cmake'
--- cmake/FindValgrind.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindValgrind.cmake	2013-08-27 16:07:33 +0000
@@ -0,0 +1,34 @@
+
+option(
+  ENABLE_MEMCHECK_OPTION
+  "If set to ON, enables automatic creation of memcheck targets"
+  OFF
+)
+
+find_program(
+	VALGRIND_PROGRAM
+	NAMES valgrind
+)
+
+if(VALGRIND_PROGRAM)
+	set(VALGRIND_PROGRAM_OPTIONS
+		"--suppressions=${CMAKE_SOURCE_DIR}/tests/data/valgrind.suppression"
+		"--error-exitcode=1"
+		"--leak-check=full"
+		"--gen-suppressions=all"
+		"--quiet"
+	)
+endif()
+
+find_package_handle_standard_args(
+	VALGRIND DEFAULT_MSG
+	VALGRIND_PROGRAM
+)
+
+function(add_valgrind_test NAME EXECUTABLE)
+	if(ENABLE_MEMCHECK_OPTION)
+		add_test(${NAME} ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}")
+	else()
+		add_test(${NAME} ${EXECUTABLE})
+	endif()
+endfunction()

=== modified file 'config.h.in'
--- config.h.in	2013-08-27 13:48:41 +0000
+++ config.h.in	2013-08-27 16:07:33 +0000
@@ -20,6 +20,7 @@
 #define INDICATOR_NETWORK_CONFIG_H_
 
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
-#define GNOMELOCALEDIR "@GNOMELOCALEDIR@"
+#define GNOMELOCALEDIR "@LOCALE_DIR@"
+#define LOCALE_DIR "@LOCALE_DIR@"
 
 #endif // INDICATOR_NETWORK_CONFIG_H_

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-08-27 13:55:21 +0000
+++ data/CMakeLists.txt	2013-08-27 16:07:33 +0000
@@ -2,7 +2,7 @@
 add_subdirectory(icons)
 
 ###########################
-# Indicator service
+# Indicator-network service
 ###########################
 
 set(
@@ -17,7 +17,7 @@
 )
 
 ###########################
-# Upstart job
+# Indicator-network upstart job
 ###########################
 
 set(
@@ -36,3 +36,18 @@
   DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/sessions/"
 )
 
+###########################
+# Secret agent upstart job
+###########################
+
+configure_file (
+	indicator-secret-agent.conf.in
+	indicator-secret-agent.conf
+	@ONLY
+)
+
+install (
+	FILES ${CMAKE_CURRENT_BINARY_DIR}/indicator-secret-agent.conf
+	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions
+)
+	

=== added file 'data/indicator-secret-agent.conf.in'
--- data/indicator-secret-agent.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-secret-agent.conf.in	2013-08-27 16:07:33 +0000
@@ -0,0 +1,8 @@
+description "Secret agent to repsond to Network Manager password requests"
+
+start on starting indicator-network
+stop on stopping indicator-network
+
+respawn
+
+exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-secret-agent

=== added file 'data/nm-agent-manager.xml'
--- data/nm-agent-manager.xml	1970-01-01 00:00:00 +0000
+++ data/nm-agent-manager.xml	2013-08-27 16:07:33 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/org/freedesktop/NetworkManager/AgentManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <interface name="org.freedesktop.NetworkManager.AgentManager">
+
+    <method name="Register">
+      <tp:docstring>
+        Called by secret Agents to register their ability to provide and save
+        network secrets.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_agent_manager_register"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="identifier" type="s" direction="in">
+        <tp:docstring>
+          Identifies this agent; only one agent in each user session may use the
+          same identifier.  Identifier formatting follows the same rules as
+          D-Bus bus names with the exception that the ':' character is not
+          allowed.  The valid set of characters is "[A-Z][a-z][0-9]_-." and the
+          identifier is limited in length to 255 characters with a minimum
+          of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+          (without quotes).
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="Unregister">
+      <tp:docstring>
+        Called by secret Agents to notify NetworkManager that they will no
+        longer handle requests for network secrets.  Agents are automatically
+        unregistered when they disconnect from D-Bus.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_agent_manager_unregister"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+    </method>
+
+  </interface>
+</node>
+

=== added file 'data/nm-secret-agent.xml'
--- data/nm-secret-agent.xml	1970-01-01 00:00:00 +0000
+++ data/nm-secret-agent.xml	2013-08-27 16:07:33 +0000
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+
+    <interface name="org.freedesktop.NetworkManager.SecretAgent">
+        <tp:docstring>
+            Private D-Bus interface used by secret agents that store and provide
+            secrets to NetworkManager.  If an agent provides secrets to
+            NetworkManager as part of connection creation, and the some of those
+            secrets are "agent owned" the agent should store those secrets
+            itself and should not expect its SaveSecrets() method to be called.
+            SaveSecrets() will be called eg if some program other than the
+            agent itself (like a connection editor) changes the secrets out of
+            band.
+        </tp:docstring>
+
+        <method name="GetSecrets">
+            <tp:docstring>
+                Retrieve and return stored secrets, if any, or request new
+                secrets from the agent's user.  If user interaction is allowed
+                and the user enters new secrets, the agent is expected to save
+                the new secrets to persistent storage (if the secret's flags
+                include AGENT_OWNED) as NetworkManager will not send these
+                secrets back to the same agent via a SaveSecrets() call.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_get_secrets"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantDictMap"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantDictMap"/>
+            <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
+                <tp:docstring>
+                    Nested settings maps containing the connection for which
+                    secrets are being requested.  This may contain system-owned
+                    secrets if the agent has successfully authenticated to
+                    modify system network settings and the GetSecrets request
+                    flags allow user interaction.
+                </tp:docstring>
+            </arg>
+            <arg name="connection_path" type="o" direction="in">
+                <tp:docstring>
+                    Object path of the connection for which secrets are being
+                    requested.
+                </tp:docstring>
+            </arg>
+            <arg name="setting_name" type="s" direction="in">
+                <tp:docstring>
+                    Setting name for which secrets are being requested.
+                </tp:docstring>
+            </arg>
+            <arg name="hints" type="as" direction="in">
+                <tp:docstring>
+                    Array of strings of key names in the requested setting for
+                    which NetworkManager thinks a secrets may be required,
+                    and/or well-known identifiers and data that may be useful
+                    to the client in processing the secrets request.  Note that
+                    it's not always possible to determine which secret is
+                    required, so in some cases no hints may be given.  The Agent
+                    should return any secrets it has, or that it thinks are
+                    required, regardless of what hints NetworkManager sends
+                    in this request.
+                </tp:docstring>
+            </arg>
+            <arg name="flags" type="u" direction="in" tp:type="NM_SECRET_AGENT_GET_SECRETS_FLAGS">
+                <tp:docstring>
+                    Flags which modify the behavior of the secrets request.
+                    If true, new secrets are assumed to be invalid or incorrect,
+                    and the agent should ask the user for new secrets.  If false,
+                    existing secrets should be retrieved from storage and 
+                    returned without interrupting the user.
+                </tp:docstring>
+            </arg>
+
+            <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
+                <tp:docstring>
+                    Nested settings maps containing secrets.  Each setting MUST
+                    contain at least the 'name' field, containing the name of
+                    the setting, and one or more secrets.
+                </tp:docstring>
+            </arg>
+        </method>
+
+        <tp:flags name="NM_SECRET_AGENT_GET_SECRETS_FLAGS" value-prefix="NM_SECRET_AGENT_GET_SECRETS_FLAG" type="u">
+          <tp:docstring>
+            Flags modifying the behavior of GetSecrets request.
+          </tp:docstring>
+          <tp:flag suffix="NONE" value="0x0">
+            <tp:docstring>
+              No special behavior; by default no user interaction is allowed and
+              requests for secrets are fulfilled from persistent storage, or
+              if no secrets are available an error is returned.
+            </tp:docstring>
+          </tp:flag>
+          <tp:flag suffix="ALLOW_INTERACTION" value="0x1">
+            <tp:docstring>
+              Allows the request to interact with the user, possibly prompting
+              via UI for secrets if any are required, or if none are found in
+              persistent storage.
+            </tp:docstring>
+          </tp:flag>
+          <tp:flag suffix="REQUEST_NEW" value="0x2">
+            <tp:docstring>
+              Explicitly prompt for new secrets from the user.  This flag
+              signals that NetworkManager thinks any existing secrets are
+              invalid or wrong.  This flag implies that interaction is allowed.
+            </tp:docstring>
+          </tp:flag>
+          <tp:flag suffix="USER_REQUESTED" value="0x4">
+            <tp:docstring>
+              Set if the request was initiated by user-requested action via the
+              D-Bus interface, as opposed to automatically initiated by
+              NetworkManager in response to (for example) scan results or
+              carrier changes.
+            </tp:docstring>
+          </tp:flag>
+        </tp:flags>
+
+        <method name="CancelGetSecrets">
+            <tp:docstring>
+                Cancel a pending GetSecrets request for secrets of the given
+                connection.  Any GetSecrets request with the same
+                'connection_path' and 'setting_name' that are given in a
+                CancelGetSecrets request should be canceled.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_cancel_get_secrets"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+            <arg name="connection_path" type="o" direction="in">
+                <tp:docstring>
+                    Object path of the connection for which, if secrets for
+                    the given 'setting_name' are being requested, the request
+                    should be canceled.
+                </tp:docstring>
+            </arg>
+            <arg name="setting_name" type="s" direction="in">
+                <tp:docstring>
+                    Setting name for which secrets for this connection were
+                    originally being requested.
+                </tp:docstring>
+            </arg>
+        </method>
+
+        <method name="SaveSecrets">
+            <tp:docstring>
+                Save given secrets to backing storage.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_save_secrets"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantDictMap"/>
+            <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
+                <tp:docstring>
+                    Nested settings maps containing the entire connection
+                    (including secrets), for which the agent should save the
+                    secrets to backing storage.  This method will not be called
+                    when the agent itself is the process creating or updating
+                    a connection; in that case the agent is assumed to have
+                    already saved those secrets since it had them already.
+                </tp:docstring>
+            </arg>
+            <arg name="connection_path" type="o" direction="in">
+                <tp:docstring>
+                    Object path of the connection for which the agent should
+                    save secrets to backing storage.
+                </tp:docstring>
+            </arg>
+        </method>
+
+        <method name="DeleteSecrets">
+            <tp:docstring>
+                Delete secrets from backing storage.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_delete_secrets"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantDictMap"/>
+            <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
+                <tp:docstring>
+                    Nested settings maps containing the connection properties
+                    (sans secrets), for which the agent should delete the
+                    secrets from backing storage.
+                </tp:docstring>
+            </arg>
+            <arg name="connection_path" type="o" direction="in">
+                <tp:docstring>
+                    Object path of the connection for which the agent should
+                    delete secrets from backing storage.
+                </tp:docstring>
+            </arg>
+        </method>
+
+    </interface>
+
+</node>

=== modified file 'debian/control'
--- debian/control	2013-08-27 13:48:41 +0000
+++ debian/control	2013-08-27 16:07:33 +0000
@@ -3,19 +3,23 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Ken VanDine <[e-mail]>
-Build-Depends: debhelper (>= 9.0.0),
-               cmake,
-               gnome-common,
-               pkg-config,
+Build-Depends: cmake,
                dbus,
+               debhelper (>= 9.0.0),
+               google-mock (>= 1.6.0+svn437),
+               libglib2.0-dev,
                libnm-glib-dev (>= 0.9),
                libnm-util-dev (>= 0.9),
-               libglib2.0-dev,
+               libqmenumodel-dev,
+               libqtdbusmock1-dev,
+               libqtdbustest1-dev,
                liburl-dispatcher1-dev,
+               network-manager-dev,
+               pkg-config,
+               python3-dbusmock,
+               qtbase5-dev,
                valac (>= 0.18),
-               python3,
-               python3-dbusmock,
-               dbus-test-runner,
+               valgrind,
 Standards-Version: 3.9.3
 # If you aren't a member of ~indicator-applet-developers but need to upload
 # packaging changes, just go ahead. ~indicator-applet-developers will notice
@@ -26,10 +30,10 @@
 
 Package: indicator-network
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-Conflicts: indicators-client-plugin-network,
-           chewie,
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Conflicts: chewie,
+           indicators-client-plugin-network,
 Description: Systems settings menu service - Network indicator
  The Indicator-network service is responsible for exporting the system settings
  menu through dbus.

=== modified file 'network/CMakeLists.txt'
--- network/CMakeLists.txt	2013-08-27 13:55:21 +0000
+++ network/CMakeLists.txt	2013-08-27 16:07:33 +0000
@@ -5,7 +5,6 @@
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR})
 
 ###########################
 # libnetwork

=== added directory 'secret-agent'
=== added file 'secret-agent/CMakeLists.txt'
--- secret-agent/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ secret-agent/CMakeLists.txt	2013-08-27 16:07:33 +0000
@@ -0,0 +1,59 @@
+
+set(
+	INDICATOR_SECRET_AGENT_SOURCES
+	SecretAgent.cpp
+	SecretAgentAdaptor.cpp
+	SecretRequest.cpp
+)
+
+qt5_add_dbus_adaptor(
+	INDICATOR_SECRET_AGENT_SOURCES
+	"${DATA_DIR}/nm-secret-agent.xml"
+	SecretAgentInclude.h
+	SecretAgent
+	SecretAgentAdaptor
+)
+
+qt5_add_dbus_interface(
+	INDICATOR_SECRET_AGENT_SOURCES
+	"${DATA_DIR}/nm-agent-manager.xml"
+	AgentManagerInterface
+)
+
+add_library(
+	indicator-secret-agent
+	STATIC
+	${INDICATOR_SECRET_AGENT_SOURCES}
+)
+
+qt5_use_modules(
+	indicator-secret-agent
+	Core
+	DBus
+)
+
+add_executable(
+	indicator-secret-agent-bin
+	main.cpp
+)
+
+set_target_properties(
+	indicator-secret-agent-bin
+	PROPERTIES
+	OUTPUT_NAME indicator-secret-agent
+)
+
+qt5_use_modules(
+	indicator-secret-agent-bin
+	Core
+)
+
+target_link_libraries(
+	indicator-secret-agent-bin
+	indicator-secret-agent
+)
+
+install(
+	TARGETS indicator-secret-agent-bin
+	RUNTIME DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}"
+)

=== added file 'secret-agent/DBusTypes.h'
--- secret-agent/DBusTypes.h	1970-01-01 00:00:00 +0000
+++ secret-agent/DBusTypes.h	2013-08-27 16:07:33 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#ifndef DBUSTYPES_H_
+#define DBUSTYPES_H_
+
+#include <QtDBus>
+#include <QMap>
+
+typedef QMap<QString, QVariantMap> QVariantDictMap;
+Q_DECLARE_METATYPE(QVariantDictMap)
+
+class DBusTypes {
+public:
+	static void registerMetaTypes() {
+		qRegisterMetaType<QVariantDictMap>("QVariantDictMap");
+
+		qDBusRegisterMetaType<QVariantDictMap>();
+	}
+};
+
+#endif /* DBUSTYPES_H_ */

=== added file 'secret-agent/Localisation.h'
--- secret-agent/Localisation.h	1970-01-01 00:00:00 +0000
+++ secret-agent/Localisation.h	2013-08-27 16:07:33 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#ifndef DAEMON_LOCALISATION_H_
+#define DAEMON_LOCALISATION_H_
+
+#include <libintl.h>
+
+inline char* _(const char *__msgid) {
+	return gettext(__msgid);
+}
+
+#endif // DAEMON_LOCALISATION_H_

=== added file 'secret-agent/SecretAgent.cpp'
--- secret-agent/SecretAgent.cpp	1970-01-01 00:00:00 +0000
+++ secret-agent/SecretAgent.cpp	2013-08-27 16:07:33 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2013 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 <Localisation.h>
+#include <SecretAgent.h>
+#include <SecretAgentAdaptor.h>
+
+#include <NetworkManager.h>
+
+#include <stdexcept>
+
+using namespace std;
+using namespace org::freedesktop::NetworkManager;
+
+const QString SecretAgent::WIRELESS_SECURITY_SETTING_NAME(
+		"802-11-wireless-security");
+
+const QString SecretAgent::WIRELESS_SECURITY_PSK("psk");
+const QString SecretAgent::WIRELESS_SECURITY_WEP_KEY0("wep-key0");
+
+const QString SecretAgent::WIRELESS_SECURITY_KEY_MGMT("key-mgmt");
+
+const QString SecretAgent::KEY_MGMT_WPA_NONE("wpa-none");
+const QString SecretAgent::KEY_MGMT_WPA_PSK("wpa-psk");
+const QString SecretAgent::KEY_MGMT_NONE("none");
+
+SecretAgent::SecretAgent(const QDBusConnection &connection, QObject *parent) :
+		QObject(parent), m_adaptor(new SecretAgentAdaptor(this)), m_connection(
+				connection), m_agentManager(NM_DBUS_SERVICE,
+				NM_DBUS_PATH_AGENT_MANAGER, m_connection), m_requestCounter(0) {
+	if (!m_connection.registerObject(NM_DBUS_PATH_SECRET_AGENT, this)) {
+		throw logic_error(
+				_("Unable to register user secret agent object on DBus"));
+	}
+
+	m_agentManager.Register("com.canonical.indicator.SecretAgent").waitForFinished();
+}
+
+SecretAgent::~SecretAgent() {
+	m_agentManager.Unregister().waitForFinished();
+	m_connection.unregisterObject(NM_DBUS_PATH_SECRET_AGENT);
+}
+
+/**
+ * Example call:
+ * [Argument: a{sa{sv}}
+ *   {
+ *     "802-11-wireless" = [Argument: a{sv} {
+ *       "security" = [Variant(QString): "802-11-wireless-security"],
+ *       "ssid" = [Variant(QByteArray): {83, 119, 97, 108, 108, 111, 119, 115, 32, 66, 97, 114, 110}],
+ *       "mode" = [Variant(QString): "infrastructure"],
+ *       "mac-address" = [Variant(QByteArray): {8, 212, 43, 19, 139, 130}]
+ *     }],
+ *     "connection" = [Argument: a{sv} {
+ *       "id" = [Variant(QString): "Swallows Barn"],
+ *       "uuid" = [Variant(QString): "40fdd8b6-e119-41ae-87a3-7bfc8044f753"],
+ *       "type" = [Variant(QString): "802-11-wireless"]
+ *     }],
+ *     "ipv4" = [Argument: a{sv} {
+ *       "addresses" = [Variant: [Argument: aau {}]],
+ *       "dns" = [Variant: [Argument: au {}]],
+ *       "method" = [Variant(QString): "auto"],
+ *       "routes" = [Variant: [Argument: aau {}]]
+ *     }],
+ *     "802-11-wireless-security" = [Argument: a{sv} {
+ *       "auth-alg" = [Variant(QString): "open"],
+ *       "key-mgmt" = [Variant(QString): "wpa-psk"]
+ *     }],
+ *     "ipv6" = [Argument: a{sv} {
+ *       "addresses" = [Variant: [Argument: a(ayuay) {}]],
+ *       "dns" = [Variant: [Argument: aay {}]],
+ *       "method" = [Variant(QString): "auto"],
+ *       "routes" = [Variant: [Argument: a(ayuayu) {}]]
+ *     }]
+ *   }
+ * ],
+ * [ObjectPath: /org/freedesktop/NetworkManager/Settings/0],
+ * "802-11-wireless-security",
+ * {},
+ * 5
+ */
+QVariantDictMap SecretAgent::GetSecrets(const QVariantDictMap &connection,
+		const QDBusObjectPath &connectionPath, const QString &settingName,
+		const QStringList &hints, uint flags) {
+
+	setDelayedReply(true);
+
+	if (flags == 0) {
+		m_connection.send(
+				message().createErrorReply(QDBusError::InternalError,
+						"No password found for this connection."));
+	} else {
+		SecretRequestPtr request(
+				new SecretRequest(m_requestCounter, *this, connection,
+						connectionPath, settingName, hints, flags, message()));
+		m_requests.insert(m_requestCounter, request);
+
+		++m_requestCounter;
+	}
+
+	return QVariantDictMap();
+}
+
+void SecretAgent::FinishGetSecrets(SecretRequest &request) {
+	m_connection.send(
+			request.message().createReply(
+					QVariant::fromValue(request.connection())));
+	m_requests.remove(request.requestId());
+}
+
+void SecretAgent::CancelGetSecrets(const QDBusObjectPath &connectionPath,
+		const QString &settingName) {
+}
+
+void SecretAgent::DeleteSecrets(const QVariantDictMap &connection,
+		const QDBusObjectPath &connectionPath) {
+}
+
+void SecretAgent::SaveSecrets(const QVariantDictMap &connection,
+		const QDBusObjectPath &connectionPath) {
+}

=== added file 'secret-agent/SecretAgent.h'
--- secret-agent/SecretAgent.h	1970-01-01 00:00:00 +0000
+++ secret-agent/SecretAgent.h	2013-08-27 16:07:33 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#ifndef SECRETAGENT_H_
+#define SECRETAGENT_H_
+
+#include <QScopedPointer>
+#include <QDBusConnection>
+#include <QtDBus>
+#include <QMap>
+
+#include <DBusTypes.h>
+#include <SecretRequest.h>
+#include <AgentManagerInterface.h>
+
+class SecretAgentAdaptor;
+
+class SecretAgent: public QObject, protected QDBusContext {
+Q_OBJECT
+
+public:
+	static const QString WIRELESS_SECURITY_SETTING_NAME;
+
+	static const QString WIRELESS_SECURITY_PSK;
+	static const QString WIRELESS_SECURITY_WEP_KEY0;
+
+	static const QString WIRELESS_SECURITY_KEY_MGMT;
+
+	static const QString KEY_MGMT_WPA_NONE;
+	static const QString KEY_MGMT_WPA_PSK;
+	static const QString KEY_MGMT_NONE;
+
+	explicit SecretAgent(const QDBusConnection &connection,
+			QObject *parent = 0);
+
+	virtual ~SecretAgent();
+
+public Q_SLOTS:
+	QVariantDictMap GetSecrets(const QVariantDictMap &connection,
+			const QDBusObjectPath &connectionPath, const QString &settingName,
+			const QStringList &hints, uint flags);
+
+	void FinishGetSecrets(SecretRequest &request);
+
+	void CancelGetSecrets(const QDBusObjectPath &connectionPath,
+			const QString &settingName);
+
+	void DeleteSecrets(const QVariantDictMap &connection,
+			const QDBusObjectPath &connectionPath);
+
+	void SaveSecrets(const QVariantDictMap &connection,
+			const QDBusObjectPath &connectionPath);
+
+protected:
+	QScopedPointer<SecretAgentAdaptor> m_adaptor;
+
+	QDBusConnection m_connection;
+
+	org::freedesktop::NetworkManager::AgentManager m_agentManager;
+
+	QMap<unsigned long long, SecretRequestPtr> m_requests;
+
+	unsigned long long m_requestCounter;
+};
+
+#endif /* SECRETAGENT_H_ */

=== added file 'secret-agent/SecretAgentInclude.h'
--- secret-agent/SecretAgentInclude.h	1970-01-01 00:00:00 +0000
+++ secret-agent/SecretAgentInclude.h	2013-08-27 16:07:33 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#ifndef SECRETAGENTINCLUDE_H_
+#define SECRETAGENTINCLUDE_H_
+
+#include <DBusTypes.h>
+#include <SecretAgent.h>
+
+#endif /* SECRETAGENTINCLUDE_H_ */

=== added file 'secret-agent/SecretRequest.cpp'
--- secret-agent/SecretRequest.cpp	1970-01-01 00:00:00 +0000
+++ secret-agent/SecretRequest.cpp	2013-08-27 16:07:33 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 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 "SecretRequest.h"
+#include "SecretAgent.h"
+
+SecretRequest::SecretRequest(unsigned int requestId, SecretAgent &secretAgent,
+		const QVariantDictMap &connection,
+		const QDBusObjectPath &connectionPath, const QString &settingName,
+		const QStringList &hints, uint flags, const QDBusMessage &message,
+		QObject *parent) :
+		QObject(parent), m_requestId(requestId), m_secretAgent(secretAgent), m_connection(
+				connection), m_connectionPath(connectionPath), m_settingName(
+				settingName), m_hints(hints), m_flags(flags), m_message(message) {
+
+	QTimer::singleShot(0, this, SLOT(FinishRequest()));
+}
+
+SecretRequest::~SecretRequest() {
+}
+
+void SecretRequest::FinishRequest() {
+	//FIXME: Hard-coded - use system dialogue call to populate it
+	QString key("hard-coded-password");
+
+	auto wirelessSecurity = m_connection.find(m_settingName);
+	QString keyMgmt(
+			wirelessSecurity->value(SecretAgent::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);
+	}
+
+	m_secretAgent.FinishGetSecrets(*this);
+}
+
+unsigned int SecretRequest::requestId() const {
+	return m_requestId;
+}
+
+const QVariantDictMap & SecretRequest::connection() const {
+	return m_connection;
+}
+
+const QDBusMessage & SecretRequest::message() const {
+	return m_message;
+}

=== added file 'secret-agent/SecretRequest.h'
--- secret-agent/SecretRequest.h	1970-01-01 00:00:00 +0000
+++ secret-agent/SecretRequest.h	2013-08-27 16:07:33 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2013 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]>
+ */
+
+#ifndef SECRETREQUEST_H_
+#define SECRETREQUEST_H_
+
+#include <DBusTypes.h>
+
+#include <QtDBus>
+#include <QSharedPointer>
+
+class SecretRequest;
+class SecretAgent;
+
+typedef QSharedPointer<SecretRequest> SecretRequestPtr;
+
+class SecretRequest: public QObject {
+Q_OBJECT
+public:
+	explicit SecretRequest(unsigned int requestId, SecretAgent &secretAgent,
+			const QVariantDictMap &connection,
+			const QDBusObjectPath &connectionPath, const QString &settingName,
+			const QStringList &hints, uint flags, const QDBusMessage &reply,
+			QObject *parent = 0);
+
+	virtual ~SecretRequest();
+
+public Q_SLOTS:
+	void FinishRequest();
+
+public:
+	unsigned int requestId() const;
+
+	const QVariantDictMap & connection() const;
+
+	const QDBusMessage & message() const;
+
+protected:
+	const unsigned int m_requestId;
+
+	SecretAgent &m_secretAgent;
+
+	QVariantDictMap m_connection;
+
+	QDBusObjectPath m_connectionPath;
+
+	QString m_settingName;
+
+	QStringList m_hints;
+
+	uint m_flags;
+
+	QDBusMessage m_message;
+};
+
+#endif /* SECRETREQUEST_H_ */

=== added file 'secret-agent/main.cpp'
--- secret-agent/main.cpp	1970-01-01 00:00:00 +0000
+++ secret-agent/main.cpp	2013-08-27 16:07:33 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2013 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 <config.h>
+#include <Localisation.h>
+#include <SecretAgent.h>
+#include <DBusTypes.h>
+
+#include <QCoreApplication>
+#include <csignal>
+#include <iostream>
+
+using namespace std;
+
+static void exitQt(int sig) {
+	Q_UNUSED(sig);
+	QCoreApplication::exit(0);
+}
+
+int main(int argc, char *argv[]) {
+	QCoreApplication application(argc, argv);
+	DBusTypes::registerMetaTypes();
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+	textdomain(GETTEXT_PACKAGE);
+
+	signal(SIGINT, &exitQt);
+	signal(SIGTERM, &exitQt);
+
+	SecretAgent secretAgent(QDBusConnection::systemBus());
+
+	if (argc == 2 && QString("--print-address") == argv[1]) {
+		cout << QDBusConnection::systemBus().baseService().toStdString()
+				<< endl;
+	}
+
+	return application.exec();
+}

=== removed directory 'test'
=== removed file 'test/network.py'
--- test/network.py	2013-07-30 14:52:40 +0000
+++ test/network.py	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-#!/usr/bin/env python3
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
-
-# Copyright 2013 Canonical Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authors:
-#      Alberto Ruiz <[e-mail]>
-
-import unittest
-import dbus
-import dbusmock
-import subprocess
-import os
-import sys
-import time
-import functools
-
-ACTIVATED = 100
-AP_PREFIX = "/org/freedesktop/NetworkManager/AccessPoint/"
-
-def check_aps_actions(self, ret, aps):
-    for ap in aps:
-        ap_action = "wlan0." + AP_PREFIX + ap
-        strength_action = ap_action + "::strength"
-        self.assertTrue(ap_action in ret)
-        self.assertTrue(strength_action in ret)
-
-def check_aps_in_menu(self, ret, aps):
-    ap_items = []
-    for group in ret:
-        a, b, items = group
-        for item in items:
-            if 'x-canonical-wifi-ap-dbus-path' in item:
-                print("Found AP item: %s" % (item['x-canonical-wifi-ap-dbus-path']))
-                ap_items.append(item)
-
-    self.assertTrue(len(ap_items) > 0)
-
-    for ap in aps:
-        ap_path = AP_PREFIX + ap
-        items_map = map(lambda item: item['x-canonical-wifi-ap-dbus-path'] == ap_path, ap_items)
-        has_ap = functools.reduce(lambda a, b: a or b, items_map)
-        self.assertTrue (has_ap)
-
-
-class TestNetworkMenu(dbusmock.DBusTestCase):
-    '''Test network menu'''
-
-    @classmethod
-    def setUpClass(klass):
-        klass.start_system_bus()
-        klass.dbus_con = klass.get_dbus(True)
-
-    def setUp(self):
-        (self.p_mock, self.obj_networkmanager) = self.spawn_server_template(
-                'networkmanager',
-                {'NetworkingEnabled': True, 'WwanEnabled': False},
-                stdout=subprocess.PIPE)
-        self.dbusmock = dbus.Interface(self.obj_networkmanager,
-                                       dbusmock.MOCK_IFACE)
-
-    def tearDown(self):
-        self.p_mock.terminate()
-        self.p_mock.wait()
-
-    def test_phone_one_wlan(self):
-        aps   = ['mock_ap',]
-        wifi1 = self.dbusmock.AddWiFiDevice('mock_wifi0', 'wlan0', ACTIVATED)
-
-        self.dbusmock.AddAccessPoint (wifi1, 'mock_ap',
-                'myap', '00:23:f8:7e:12:ba', 0, 2425, 5400, 80, 0x400)
-        
-        p = subprocess.Popen(['indicator-network-service'])
-        time.sleep (0.6)
-
-        bus = dbus.SessionBus ()
-
-        actions = bus.get_object ('com.canonical.indicator.network',
-                                  '/com/canonical/indicator/network')
-        phone   = bus.get_object ('com.canonical.indicator.network',
-                                  '/com/canonical/indicator/network/phone')
-
-        actions_iface    = dbus.Interface(actions, dbus_interface='org.gtk.Actions')
-        phone_menu_iface = dbus.Interface(phone,   dbus_interface='org.gtk.Menus')
-
-        check_aps_actions (self, actions_iface.List(), aps)
-        check_aps_in_menu (self, phone_menu_iface.Start([0, 1]), aps)
-
-        p.terminate()
-        p.wait()
-
-if __name__ == '__main__':
-    unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-08-27 13:48:41 +0000
+++ tests/CMakeLists.txt	2013-08-27 16:07:33 +0000
@@ -0,0 +1,61 @@
+
+set(CMAKE_AUTOMOC OFF)
+include(FindGMock)
+set(CMAKE_AUTOMOC ON)
+
+find_package("Valgrind" REQUIRED)
+
+include_directories("${CMAKE_SOURCE_DIR}/secret-agent")
+include_directories("${CMAKE_BINARY_DIR}/secret-agent")
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${GMOCK_INCLUDE_DIRS})
+include_directories(${GTEST_INCLUDE_DIRS})
+
+add_definitions(-DSECRET_AGENT_BIN="${CMAKE_BINARY_DIR}/secret-agent/indicator-secret-agent")
+add_definitions(-DNETWORK_SERVICE_BIN="${CMAKE_BINARY_DIR}/network/indicator-network-service")
+
+set(
+	UNIT_TESTS_SRC
+	TestIndicatorNetworkService.cpp
+	TestSecretAgent.cpp
+	main.cpp
+)
+
+set_source_files_properties(
+	"${DATA_DIR}/nm-secret-agent.xml"
+	PROPERTIES
+	INCLUDE "DBusTypes.h"
+)
+
+qt5_add_dbus_interface(
+	UNIT_TESTS_SRC
+	"${DATA_DIR}/nm-secret-agent.xml"
+	SecretAgentInterface
+)
+
+add_executable(
+	unit-tests
+	${UNIT_TESTS_SRC}
+)
+
+qt5_use_modules(
+	unit-tests
+	Core
+	DBus
+	Test
+)
+
+target_link_libraries(
+	unit-tests
+	indicator-secret-agent
+	${QTDBUSMOCK_LIBRARIES}
+	${QTDBUSTEST_LIBRARIES}
+	${GTEST_LIBRARIES}
+	${GMOCK_LIBRARIES}
+)
+
+add_valgrind_test(
+	unit-tests
+	unit-tests
+)

=== added file 'tests/TestIndicatorNetworkService.cpp'
--- tests/TestIndicatorNetworkService.cpp	1970-01-01 00:00:00 +0000
+++ tests/TestIndicatorNetworkService.cpp	2013-08-27 16:07:33 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2013 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 <libqtdbustest/DBusTestRunner.h>
+#include <libqtdbustest/QProcessDBusService.h>
+#include <libqtdbusmock/DBusMock.h>
+#include <NetworkManager.h>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace testing;
+using namespace QtDBusTest;
+using namespace QtDBusMock;
+
+namespace {
+
+class TestIndicatorNetworkService: public Test {
+protected:
+	TestIndicatorNetworkService() :
+			dbusMock(dbusTestRunner) {
+
+		dbusMock.registerNetworkManager();
+		dbusTestRunner.startServices();
+
+		DBusServicePtr indicator(
+				new QProcessDBusService("com.canonical.indicator.network",
+						QDBusConnection::SessionBus, NETWORK_SERVICE_BIN,
+						QStringList()));
+	}
+
+	virtual ~TestIndicatorNetworkService() {
+	}
+
+	DBusTestRunner dbusTestRunner;
+
+	DBusMock dbusMock;
+};
+
+TEST_F(TestIndicatorNetworkService, Foo) {
+	//FIXME: Port the python test
+}
+
+} // namespace

=== added file 'tests/TestSecretAgent.cpp'
--- tests/TestSecretAgent.cpp	1970-01-01 00:00:00 +0000
+++ tests/TestSecretAgent.cpp	2013-08-27 16:07:33 +0000
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2013 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 <libqtdbustest/DBusTestRunner.h>
+#include <libqtdbusmock/DBusMock.h>
+#include <SecretAgent.h>
+#include <SecretAgentInterface.h>
+#include <NetworkManager.h>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace testing;
+using namespace QtDBusTest;
+using namespace QtDBusMock;
+
+namespace {
+
+class TestSecretAgentCommon {
+protected:
+	TestSecretAgentCommon() :
+			dbusMock(dbusTestRunner) {
+
+		dbusMock.registerNetworkManager();
+		dbusTestRunner.startServices();
+
+		secretAgent.start(SECRET_AGENT_BIN, QStringList() << "--print-address");
+		secretAgent.waitForStarted();
+		secretAgent.waitForReadyRead();
+		agentBus = secretAgent.readAll().trimmed();
+
+		interface.reset(
+				new OrgFreedesktopNetworkManagerSecretAgentInterface(agentBus,
+						NM_DBUS_PATH_SECRET_AGENT,
+						dbusTestRunner.systemConnection()));
+	}
+
+	virtual ~TestSecretAgentCommon() {
+		secretAgent.terminate();
+		secretAgent.waitForFinished();
+	}
+
+	QVariantDictMap connection(const QString &keyManagement) {
+		QVariantMap wirelessSecurity;
+		wirelessSecurity[SecretAgent::WIRELESS_SECURITY_KEY_MGMT] =
+				keyManagement;
+
+		QVariantDictMap connection;
+		connection[SecretAgent::WIRELESS_SECURITY_SETTING_NAME] =
+				wirelessSecurity;
+
+		return connection;
+	}
+
+	QVariantDictMap expected(const QString &keyManagement,
+			const QString &keyName, const QString &password) {
+
+		QVariantMap wirelessSecurity;
+		wirelessSecurity[SecretAgent::WIRELESS_SECURITY_KEY_MGMT] =
+				keyManagement;
+		wirelessSecurity[keyName] = password;
+
+		QVariantDictMap connection;
+		connection[SecretAgent::WIRELESS_SECURITY_SETTING_NAME] =
+				wirelessSecurity;
+
+		return connection;
+	}
+
+	DBusTestRunner dbusTestRunner;
+
+	DBusMock dbusMock;
+
+	QProcess secretAgent;
+
+	QString agentBus;
+
+	QScopedPointer<OrgFreedesktopNetworkManagerSecretAgentInterface> interface;
+};
+
+struct TestSecretAgentParams {
+	QString keyManagement;
+
+	QString passwordKey;
+
+	QString password;
+};
+
+class TestSecretAgentGetSecrets: public TestSecretAgentCommon,
+		public TestWithParam<TestSecretAgentParams> {
+};
+
+TEST_P(TestSecretAgentGetSecrets, ProvidesPasswordForWpaPsk) {
+	QVariantDictMap reply(
+			interface->GetSecrets(connection(GetParam().keyManagement),
+					QDBusObjectPath("/connection/foo"),
+					SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
+					5));
+
+	EXPECT_EQ(
+			expected(GetParam().keyManagement, GetParam().passwordKey,
+					GetParam().password), reply);
+}
+
+INSTANTIATE_TEST_CASE_P(WpaPsk, TestSecretAgentGetSecrets,
+		Values(TestSecretAgentParams( { SecretAgent::KEY_MGMT_WPA_PSK,
+				SecretAgent::WIRELESS_SECURITY_PSK, "hard-coded-password" })));
+
+INSTANTIATE_TEST_CASE_P(WpaNone, TestSecretAgentGetSecrets,
+		Values(TestSecretAgentParams( { SecretAgent::KEY_MGMT_WPA_NONE,
+				SecretAgent::WIRELESS_SECURITY_PSK, "hard-coded-password" })));
+
+INSTANTIATE_TEST_CASE_P(None, TestSecretAgentGetSecrets,
+		Values(
+				TestSecretAgentParams( { SecretAgent::KEY_MGMT_NONE,
+						SecretAgent::WIRELESS_SECURITY_WEP_KEY0,
+						"hard-coded-password" })));
+
+class TestSecretAgent: public TestSecretAgentCommon, public Test {
+};
+
+TEST_F(TestSecretAgent, GetSecretsWithNone) {
+	QDBusPendingReply<QVariantDictMap> reply(
+			interface->GetSecrets(connection(SecretAgent::KEY_MGMT_WPA_PSK),
+					QDBusObjectPath("/connection/foo"),
+					SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
+					0));
+	reply.waitForFinished();
+
+	ASSERT_TRUE(reply.isError());
+	EXPECT_EQ(QDBusError::InternalError, reply.error().type());
+	EXPECT_EQ("No password found for this connection.",
+			reply.error().message());
+}
+
+TEST_F(TestSecretAgent, CancelGetSecrets) {
+	interface->CancelGetSecrets(QDBusObjectPath("/connection/foo"),
+			SecretAgent::WIRELESS_SECURITY_SETTING_NAME).waitForFinished();
+}
+
+TEST_F(TestSecretAgent, SaveSecrets) {
+	interface->SaveSecrets(QVariantDictMap(),
+			QDBusObjectPath("/connection/foo")).waitForFinished();
+}
+
+TEST_F(TestSecretAgent, DeleteSecrets) {
+	interface->DeleteSecrets(QVariantDictMap(),
+			QDBusObjectPath("/connection/foo")).waitForFinished();
+}
+
+} // namespace

=== added directory 'tests/data'
=== added file 'tests/data/valgrind.suppression'
--- tests/data/valgrind.suppression	1970-01-01 00:00:00 +0000
+++ tests/data/valgrind.suppression	2013-08-27 16:07:33 +0000
@@ -0,0 +1,95 @@
+{
+   Ignore pthreads
+   Memcheck:Leak
+   ...
+   fun:pthread_create@@*
+}
+
+{
+   Glib memalign
+   Memcheck:Leak
+   ...
+   fun:posix_memalign
+}
+
+{
+   Ignore glib mainloop
+   Memcheck:Leak
+   ...
+   fun:g_main_context_push_thread_default
+}
+
+{
+   Ignore glib main context
+   Memcheck:Leak
+   ...
+   fun:g_main_context_new
+}
+
+###############################
+# GObject rules
+###############################
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:g_type_register_static
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:g_type_register_fundamental
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:type_node_fundamental_new_W
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:type_data_make_W
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:g_type_add_interface_static
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:type_iface_vtable_base_init_Wm
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:g_dbus_interface_skeleton_class_intern_init
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   ...
+   fun:g_signal_type_cclosure_new
+}
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:calloc
+   fun:g_malloc0
+   fun:g_type_class_ref
+}

=== added file 'tests/main.cpp'
--- tests/main.cpp	1970-01-01 00:00:00 +0000
+++ tests/main.cpp	2013-08-27 16:07:33 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2013 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 <config.h>
+
+#include <QCoreApplication>
+#include <gtest/gtest.h>
+
+#include <libqtdbusmock/DBusMock.h>
+#include <DBusTypes.h>
+
+using namespace QtDBusMock;
+
+int main(int argc, char **argv) {
+	qputenv("LANG", "C.UTF-8");
+	unsetenv("LC_ALL");
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+	textdomain(GETTEXT_PACKAGE);
+
+	QCoreApplication application(argc, argv);
+
+	DBusMock::registerMetaTypes();
+	DBusTypes::registerMetaTypes();
+
+	::testing::InitGoogleTest(&argc, argv);
+	return RUN_ALL_TESTS();
+}