Merge lp:~pete-woods/indicator-network/wapi-lp1597681 into lp:indicator-network

[Pete Woods]

Add support for new WAPI settings keys

Add support for new WAPI settings keys

[lp:~pete-woods/indicator-network/wapi-lp1597681]

610. By Pete Woods on 2016-07-14

Log which URLs are dispatched to USS

Unmerged revisions

610. By Pete Woods on 2016-07-14

Log which URLs are dispatched to USS

609. By Pete Woods on 2016-07-11

Add support for new WAPI settings keys

=== modified file 'po/indicator-network.pot'
--- po/indicator-network.pot	2016-04-29 14:08:19 +0000
+++ po/indicator-network.pot	2016-07-14 10:02:10 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-29 12:38+0300\n"
+"POT-Creation-Date: 2016-07-11 09:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -30,72 +30,63 @@
 msgid "WEP"
 msgstr ""
 
-#: ../src/agent/SecretRequest.cpp:74
+#: ../src/agent/SecretRequest.cpp:70
+msgid "WAPI"
+msgstr ""
+
+#: ../src/agent/SecretRequest.cpp:76
 msgid "Connect"
 msgstr ""
 
-#: ../src/agent/SecretRequest.cpp:75
+#: ../src/agent/SecretRequest.cpp:77
 msgid "Cancel"
 msgstr ""
 
-#: ../src/indicator/menuitems/wifi-link-item.cpp:109
-msgid "Other network…"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:90
-msgid "No SIM"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:97
-msgid "SIM Error"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:105
-msgid "SIM Locked"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:118
-msgid "Unregistered"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:123
-msgid "Unknown"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:128
-msgid "Denied"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:133
-msgid "Searching"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:145
-msgid "No Signal"
-msgstr ""
-
-#: ../src/indicator/menuitems/wwan-link-item.cpp:157
-#: ../src/indicator/menuitems/wwan-link-item.cpp:164
-msgid "Offline"
-msgstr ""
-
-#. TODO Move this into a new class
-#: ../src/indicator/factory.cpp:187
-msgid "Wi-Fi"
-msgstr ""
-
-#. TODO Move this into a new class
-#: ../src/indicator/factory.cpp:198
-msgid "Flight Mode"
-msgstr ""
-
-#: ../src/indicator/factory.cpp:208
-msgid "Cellular data"
-msgstr ""
-
-#. TODO Move this into a new class
-#: ../src/indicator/factory.cpp:219
-msgid "Hotspot"
+#: ../src/indicator/vpn-status-notifier.cpp:48
+msgid "The VPN connection '%1' failed."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:50
+msgid ""
+"The VPN connection '%1' failed because the network connection was "
+"interrupted."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:51
+msgid ""
+"The VPN connection '%1' failed because the VPN service stopped unexpectedly."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:52
+msgid ""
+"The VPN connection '%1' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:53
+msgid ""
+"The VPN connection '%1' failed because the connection attempt timed out."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:54
+msgid ""
+"The VPN connection '%1' failed because the VPN service did not start in time."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:55
+msgid "The VPN connection '%1' failed because the VPN service failed to start."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:56
+msgid "The VPN connection '%1' failed because there were no valid VPN secrets."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:57
+msgid "The VPN connection '%1' failed because of invalid VPN secrets."
+msgstr ""
+
+#: ../src/indicator/vpn-status-notifier.cpp:68
+msgid "VPN Connection Failed"
 msgstr ""
 
 #: ../src/indicator/sim-unlock-dialog.cpp:144
@@ -186,70 +177,83 @@
 msgid "PIN codes did not match."
 msgstr ""
 
-#: ../src/indicator/vpn-status-notifier.cpp:48
-msgid "The VPN connection '%1' failed."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:50
-msgid ""
-"The VPN connection '%1' failed because the network connection was "
-"interrupted."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:51
-msgid ""
-"The VPN connection '%1' failed because the VPN service stopped unexpectedly."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:52
-msgid ""
-"The VPN connection '%1' failed because the VPN service returned invalid "
-"configuration."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:53
-msgid ""
-"The VPN connection '%1' failed because the connection attempt timed out."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:54
-msgid ""
-"The VPN connection '%1' failed because the VPN service did not start in time."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:55
-msgid "The VPN connection '%1' failed because the VPN service failed to start."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:56
-msgid "The VPN connection '%1' failed because there were no valid VPN secrets."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:57
-msgid "The VPN connection '%1' failed because of invalid VPN secrets."
-msgstr ""
-
-#: ../src/indicator/vpn-status-notifier.cpp:68
-msgid "VPN Connection Failed"
-msgstr ""
-
-#: ../src/indicator/sections/wwan-section.cpp:99
+#: ../src/indicator/nmofono/vpn/vpn-manager.cpp:81
+msgid "VPN connection %1"
+msgstr ""
+
+#: ../src/indicator/menuitems/wifi-link-item.cpp:109
+msgid "Other network…"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:90
+msgid "No SIM"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:97
+msgid "SIM Error"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:105
+msgid "SIM Locked"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:118
+msgid "Unregistered"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:123
+msgid "Unknown"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:128
+msgid "Denied"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:133
+msgid "Searching"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:145
+msgid "No Signal"
+msgstr ""
+
+#: ../src/indicator/menuitems/wwan-link-item.cpp:157
+#: ../src/indicator/menuitems/wwan-link-item.cpp:164
+msgid "Offline"
+msgstr ""
+
+#. TRANSLATORS: this is the indicator title shown on the top header of the indicator area
+#: ../src/indicator/root-state.cpp:306
+msgid "Network"
+msgstr ""
+
+#. TODO Move this into a new class
+#: ../src/indicator/factory.cpp:187
+msgid "Wi-Fi"
+msgstr ""
+
+#. TODO Move this into a new class
+#: ../src/indicator/factory.cpp:198
+msgid "Flight Mode"
+msgstr ""
+
+#: ../src/indicator/factory.cpp:208
+msgid "Cellular data"
+msgstr ""
+
+#. TODO Move this into a new class
+#: ../src/indicator/factory.cpp:221
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/indicator/sections/wwan-section.cpp:102
 msgid "Cellular settings…"
 msgstr ""
 
+#: ../src/indicator/sections/wifi-section.cpp:65
+msgid "Wi-Fi settings…"
+msgstr ""
+
 #: ../src/indicator/sections/vpn-section.cpp:140
 msgid "VPN settings…"
 msgstr ""
-
-#: ../src/indicator/sections/wifi-section.cpp:65
-msgid "Wi-Fi settings…"
-msgstr ""
-
-#. TRANSLATORS: this is the indicator title shown on the top header of the indicator area
-#: ../src/indicator/root-state.cpp:306
-msgid "Network"
-msgstr ""
-
-#: ../src/indicator/nmofono/vpn/vpn-manager.cpp:81
-msgid "VPN connection %1"
-msgstr ""
 
=== modified file 'src/agent/SecretAgent.h'
--- src/agent/SecretAgent.h	2016-02-15 09:31:38 +0000
+++ src/agent/SecretAgent.h	2016-07-14 10:02:10 +0000
@@ -90,6 +90,7 @@
 	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";
+	static constexpr char const* NM_KEY_MGMT_WAPI_PSK = "wapi-psk";
 
 	explicit SecretAgent(std::shared_ptr<notify::NotificationManager> notificationManager,
 			CredentialStore::SPtr credentialStore,
 
=== modified file 'src/agent/SecretRequest.cpp'
--- src/agent/SecretRequest.cpp	2016-02-15 09:31:38 +0000
+++ src/agent/SecretRequest.cpp	2016-07-14 10:02:10 +0000
@@ -66,7 +66,9 @@
 		subject = _("WPA");
 	} else if (keyMgmt == SecretAgent::NM_KEY_MGMT_NONE) {
 		subject = _("WEP");
-	}
+	} else if (keyMgmt == SecretAgent::NM_KEY_MGMT_WAPI_PSK) {
+        subject = _("WAPI");
+    }
 
 	m_notification = m_secretAgent.notifications()->notify(
 			title.arg(conn[SecretAgent::NM_CONNECTION_ID].toString()), subject,
@@ -104,7 +106,8 @@
 			wirelessSecurity->value(SecretAgent::NM_WIRELESS_SECURITY_KEY_MGMT).toString());
 
 	if (keyMgmt == SecretAgent::NM_KEY_MGMT_WPA_NONE
-			|| keyMgmt == SecretAgent::NM_KEY_MGMT_WPA_PSK) {
+			|| keyMgmt == SecretAgent::NM_KEY_MGMT_WPA_PSK
+			|| keyMgmt == SecretAgent::NM_KEY_MGMT_WAPI_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);
 
=== modified file 'src/indicator/menuitems/access-point-item.cpp'
--- src/indicator/menuitems/access-point-item.cpp	2015-10-06 10:14:57 +0000
+++ src/indicator/menuitems/access-point-item.cpp	2016-07-14 10:02:10 +0000
@@ -61,7 +61,7 @@
         m_item->setAttribute("x-canonical-type", TypedVariant<std::string>("unity.widgets.systemsettings.tablet.accesspoint"));
         m_item->setAttribute("x-canonical-wifi-ap-is-adhoc", TypedVariant<bool>(m_accessPoint->adhoc()));
         m_item->setAttribute("x-canonical-wifi-ap-is-secure", TypedVariant<bool>(m_accessPoint->secured()));
-        m_item->setAttribute("x-canonical-wifi-ap-is-enterprise", TypedVariant<bool>(m_accessPoint->enterprise()));
+        m_item->setAttribute("x-canonical-wifi-ap-is-enterprise", TypedVariant<bool>(m_accessPoint->keyManagementType() != wifi::AccessPoint::KeyManagementType::psk));
         m_item->setAttribute("x-canonical-wifi-ap-strength-action", TypedVariant<std::string>(("indicator." + strengthActionId).toStdString()));
 
         m_actionStrength = std::make_shared<Action>(strengthActionId,
 
=== modified file 'src/indicator/nmofono/wifi/access-point-impl.cpp'
--- src/indicator/nmofono/wifi/access-point-impl.cpp	2015-07-06 12:59:21 +0000
+++ src/indicator/nmofono/wifi/access-point-impl.cpp	2016-07-14 10:02:10 +0000
@@ -22,6 +22,10 @@
 #include <QTextCodec>
 #include <NetworkManager.h>
 
+#ifndef NM_802_11_AP_SEC_KEY_MGMT_WAPI_CERT
+#define NM_802_11_AP_SEC_KEY_MGMT_WAPI_CERT 0x00002000
+#endif
+
 namespace nmofono {
 namespace wifi {
 
@@ -116,9 +120,21 @@
     return m_raw_ssid;
 }
 
-bool AccessPointImpl::enterprise() const
+AccessPoint::KeyManagementType AccessPointImpl::keyManagementType() const
 {
-    return (m_secflags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) > 0;
+    if ((m_secflags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) > 0)
+    {
+        return KeyManagementType::ieee8021x;
+    }
+    else if ((m_secflags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) > 0)
+    {
+        return KeyManagementType::wpa_eap;
+    }
+    else if ((m_secflags & NM_802_11_AP_SEC_KEY_MGMT_WAPI_CERT) > 0)
+    {
+        return KeyManagementType::wapi_cert;
+    }
+    return  KeyManagementType::psk;
 }
 
 bool AccessPointImpl::secured() const
 
=== modified file 'src/indicator/nmofono/wifi/access-point-impl.h'
--- src/indicator/nmofono/wifi/access-point-impl.h	2015-07-06 12:59:21 +0000
+++ src/indicator/nmofono/wifi/access-point-impl.h	2016-07-14 10:02:10 +0000
@@ -90,7 +90,7 @@
     std::uint32_t mode() const;
 
     bool secured() const override;
-    bool enterprise() const override;
+    KeyManagementType keyManagementType() const override;
     bool adhoc() const override;
 
     QDBusObjectPath object_path() const override;
 
=== modified file 'src/indicator/nmofono/wifi/access-point.h'
--- src/indicator/nmofono/wifi/access-point.h	2015-07-06 12:59:21 +0000
+++ src/indicator/nmofono/wifi/access-point.h	2016-07-14 10:02:10 +0000
@@ -37,8 +37,17 @@
 AccessPoint: public QObject
 {
     Q_OBJECT
+    Q_ENUMS(EnterpriseType)
 
 public:
+    enum KeyManagementType
+    {
+        psk,
+        ieee8021x,
+        wpa_eap,
+        wapi_cert
+    };
+
     typedef std::shared_ptr<AccessPoint> Ptr;
     AccessPoint();
     virtual ~AccessPoint();
@@ -54,7 +63,7 @@
     virtual QByteArray raw_ssid()     const = 0;
     virtual QDBusObjectPath object_path()     const = 0;
     virtual bool secured()            const = 0;
-    virtual bool enterprise()         const = 0;
+    virtual KeyManagementType keyManagementType()         const = 0;
     virtual bool adhoc()              const = 0;
 
 Q_SIGNALS:
 
=== modified file 'src/indicator/nmofono/wifi/grouped-access-point.cpp'
--- src/indicator/nmofono/wifi/grouped-access-point.cpp	2015-07-06 12:59:21 +0000
+++ src/indicator/nmofono/wifi/grouped-access-point.cpp	2016-07-14 10:02:10 +0000
@@ -199,14 +199,14 @@
     return p->aplist.at(0)->secured();
 }
 
-bool GroupedAccessPoint::enterprise() const
+AccessPoint::KeyManagementType GroupedAccessPoint::keyManagementType() const
 {
     if (p->aplist.empty())
     {
-        return false;
+        return KeyManagementType::psk;
     }
 
-    return p->aplist.at(0)->enterprise();
+    return p->aplist.at(0)->keyManagementType();
 }
 
 bool GroupedAccessPoint::adhoc() const
 
=== modified file 'src/indicator/nmofono/wifi/grouped-access-point.h'
--- src/indicator/nmofono/wifi/grouped-access-point.h	2015-07-06 12:59:21 +0000
+++ src/indicator/nmofono/wifi/grouped-access-point.h	2016-07-14 10:02:10 +0000
@@ -54,7 +54,7 @@
     QByteArray raw_ssid() const override;
 
     bool secured() const override;
-    bool enterprise() const override;
+    KeyManagementType keyManagementType() const override;
     bool adhoc() const override;
 
     QDBusObjectPath object_path() const override;
 
=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.cpp'
--- src/indicator/nmofono/wifi/wifi-link-impl.cpp	2016-05-26 13:51:39 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.cpp	2016-07-14 10:02:10 +0000
@@ -486,17 +486,31 @@
                                            QDBusObjectPath(d->m_dev->path()),
                                            accessPoint->object_path());
         } else {
-            if (accessPoint->enterprise()) {
+            auto keyManagementType = accessPoint->keyManagementType();
+            if (keyManagementType != AccessPoint::KeyManagementType::psk) {
                 qDebug() << "New connection to enterprise access point";
+
+                const static QMap<AccessPoint::KeyManagementType, QString> typeMap {
+                    {AccessPoint::KeyManagementType::ieee8021x, "ieee8021x"},
+                    {AccessPoint::KeyManagementType::wpa_eap, "wpa-eap"},
+                    {AccessPoint::KeyManagementType::wapi_cert, "wapi-cert"},
+                };
+
                 // activate system settings URI
                 QUrlQuery q;
                 q.addQueryItem("ssid", accessPoint->raw_ssid());
                 q.addQueryItem("bssid", accessPoint->bssid());
+                q.addQueryItem("key-mgmt", typeMap[keyManagementType]);
                 QString url = "settings:///system/wifi?" + q.query(QUrl::FullyEncoded);
 
                 UrlDispatcher::send(url.toStdString(), [](string url, bool success) {
-                    if (!success) {
-                        cerr << "URL Dispatcher failed on " << url << endl;
+                    if (success)
+                    {
+                        qDebug() << "Activated URL for USS" << QString::fromStdString(url);
+                    }
+                    else
+                    {
+                        qDebug() << "URL Dispatcher failed on" << QString::fromStdString(url);
                     }
                 });
             } else {
@@ -516,7 +530,7 @@
             }
         }
         // For enterprise access points, the system settings app will perform the connection
-        if (!accessPoint->enterprise()) {
+        if (accessPoint->keyManagementType() == AccessPoint::KeyManagementType::psk) {
             d->updateActiveConnection(ac);
         }
         d->m_connecting = false;
 
=== modified file 'tests/integration/test-indicator.cpp'
--- tests/integration/test-indicator.cpp	2016-06-13 10:57:46 +0000
+++ tests/integration/test-indicator.cpp	2016-07-14 10:02:10 +0000
@@ -2006,7 +2006,7 @@
             << QVariant("DispatchURL")
             << QVariant(
                 QVariantList()
-                    << QVariant("settings:///system/wifi?ssid=ABC&bssid=11:22:33:44:55:66")
+                    << QVariant("settings:///system/wifi?ssid=ABC&bssid=11:22:33:44:55:66&key-mgmt=wpa-eap")
                     << QVariant("")
                )
     );
 
=== modified file 'tests/unit/indicator/menuitems/test-access-point-item.cpp'
--- tests/unit/indicator/menuitems/test-access-point-item.cpp	2015-10-06 10:14:57 +0000
+++ tests/unit/indicator/menuitems/test-access-point-item.cpp	2016-07-14 10:02:10 +0000
@@ -48,7 +48,7 @@
 
     MOCK_CONST_METHOD0(secured, bool());
 
-    MOCK_CONST_METHOD0(enterprise, bool());
+    MOCK_CONST_METHOD0(keyManagementType, KeyManagementType());
 
     MOCK_CONST_METHOD0(adhoc, bool());
 
@@ -68,6 +68,7 @@
     ON_CALL(*accessPoint, ssid()).WillByDefault(Return(QString("the ssid")));
     ON_CALL(*accessPoint, secured()).WillByDefault(Return(true));
     ON_CALL(*accessPoint, adhoc()).WillByDefault(Return(false));
+    ON_CALL(*accessPoint, keyManagementType()).WillByDefault(Return(wifi::AccessPoint::KeyManagementType::psk));
     ON_CALL(*accessPoint, strength()).WillByDefault(Return(70.0));
 
     auto accessPointItem = make_shared<AccessPointItem>(accessPoint);