From 1289e8ea1dbeb91012c262fcb6f014ec73d4c690 Mon Sep 17 00:00:00 2001

From: Jonathan Kang <jonathankang@gnome.org>

Date: Wed, 9 Sep 2020 14:58:06 +0800

Subject: [PATCH 5/8] network: complete SAE support

Added WirelessSecuritySAE class to fully implement SAE support.

Heavily modifid and based on the 3.28.2 version of the WPA PSK widget.

(cherry picked from commit 918838f567740172591ff1f2c32d8227c348be72)

---

 .../connection-editor/ce-page-security.c      |   8 +-

 panels/network/wireless-security/meson.build  |   3 +

 .../wireless-security.gresource.xml           |   1 +

 .../wireless-security/wireless-security.h     |   1 +

 panels/network/wireless-security/ws-sae.c     | 214 ++++++++++++++++++

 panels/network/wireless-security/ws-sae.h     |  30 +++

 panels/network/wireless-security/ws-sae.ui    | 117 ++++++++++

 7 files changed, 370 insertions(+), 4 deletions(-)

 create mode 100644 panels/network/wireless-security/ws-sae.c

 create mode 100644 panels/network/wireless-security/ws-sae.h

 create mode 100644 panels/network/wireless-security/ws-sae.ui

diff --git a/panels/network/connection-editor/ce-page-security.c b/panels/network/connection-editor/ce-page-security.c

index 5104d7442..37b1e1286 100644

--- a/panels/network/connection-editor/ce-page-security.c

+++ b/panels/network/connection-editor/ce-page-security.c

@@ -343,11 +343,11 @@ finish_setup (CEPageSecurity *page)

 #if NM_CHECK_VERSION(1,20,6)

         if (nm_utils_security_valid (NMU_SEC_SAE, dev_caps, FALSE, is_adhoc, 0, 0, 0)) {

-                WirelessSecurityWPAPSK *ws_wpa_psk;

+                WirelessSecuritySAE *ws_sae;

-                ws_wpa_psk = ws_wpa_psk_new (connection, FALSE);

-                if (ws_wpa_psk) {

-                        add_security_item (page, WIRELESS_SECURITY (ws_wpa_psk), sec_model,

+                ws_sae = ws_sae_new (connection, FALSE);

+                if (ws_sae) {

+                        add_security_item (page, WIRELESS_SECURITY (ws_sae), sec_model,

                                            &iter, _("WPA3 Personal"), FALSE);

                         if ((active < 0) && ((default_type == NMU_SEC_SAE)))

                                 active = item;

diff --git a/panels/network/wireless-security/meson.build b/panels/network/wireless-security/meson.build

index 47def7a63..6036f56af 100644

--- a/panels/network/wireless-security/meson.build

+++ b/panels/network/wireless-security/meson.build

@@ -14,6 +14,7 @@ nm_applet_headers = [

   'wireless-security.h',

   'ws-leap.h',

   'ws-dynamic-wep.h',

+  'ws-sae.h',

   'ws-wep-key.h',

   'ws-wpa-eap.h',

   'ws-wpa-psk.h'

@@ -31,6 +32,7 @@ nm_applet_sources = [

   'wireless-security.c',

   'ws-leap.c',

   'ws-dynamic-wep.c',

+  'ws-sae.c',

   'ws-wep-key.c',

   'ws-wpa-eap.c',

   'ws-wpa-psk.c'

@@ -47,6 +49,7 @@ nm_resource_data = [

   'eap-method-ttls.ui',

   'ws-dynamic-wep.ui',

   'ws-leap.ui',

+  'ws-sae.ui',

   'ws-wep-key.ui',

   'ws-wpa-eap.ui',

   'ws-wpa-psk.ui'

diff --git a/panels/network/wireless-security/wireless-security.gresource.xml b/panels/network/wireless-security/wireless-security.gresource.xml

index a483d06a0..fa1a965ad 100644

--- a/panels/network/wireless-security/wireless-security.gresource.xml

+++ b/panels/network/wireless-security/wireless-security.gresource.xml

@@ -9,6 +9,7 @@

     <file preprocess="xml-stripblanks">eap-method-ttls.ui</file>

     <file preprocess="xml-stripblanks">ws-dynamic-wep.ui</file>

     <file preprocess="xml-stripblanks">ws-leap.ui</file>

+    <file preprocess="xml-stripblanks">ws-sae.ui</file>

     <file preprocess="xml-stripblanks">ws-wep-key.ui</file>

     <file preprocess="xml-stripblanks">ws-wpa-eap.ui</file>

     <file preprocess="xml-stripblanks">ws-wpa-psk.ui</file>

diff --git a/panels/network/wireless-security/wireless-security.h b/panels/network/wireless-security/wireless-security.h

index 975e750f6..c5508ad1b 100644

--- a/panels/network/wireless-security/wireless-security.h

+++ b/panels/network/wireless-security/wireless-security.h

@@ -102,6 +102,7 @@ GType wireless_security_get_type (void);

 #include "ws-wep-key.h"

 #include "ws-wpa-psk.h"

 #include "ws-leap.h"

+#include "ws-sae.h"

 #include "ws-wpa-eap.h"

 #include "ws-dynamic-wep.h"

diff --git a/panels/network/wireless-security/ws-sae.c b/panels/network/wireless-security/ws-sae.c

new file mode 100644

index 000000000..96138d522

--- /dev/null

+++ b/panels/network/wireless-security/ws-sae.c

@@ -0,0 +1,214 @@

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

+/* NetworkManager Applet -- allow user control over networking

+ *

+ * Dan Williams <dcbw@redhat.com>

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * 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 General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License along

+ * with this program; if not, write to the Free Software Foundation, Inc.,

+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+ *

+ * Copyright 2007 - 2014 Red Hat, Inc.

+ */

+

+#include "nm-default.h"

+

+#include <ctype.h>

+#include <string.h>

+

+#include "wireless-security.h"

+#include "helpers.h"

+#include "nma-ui-utils.h"

+#include "utils.h"

+

+#define WPA_PMK_LEN 32

+

+struct _WirelessSecuritySAE {

+	WirelessSecurity parent;

+

+	gboolean editing_connection;

+	const char *password_flags_name;

+};

+

+static void

+show_toggled_cb (GtkCheckButton *button, WirelessSecurity *sec)

+{

+	GtkWidget *widget;

+	gboolean visible;

+

+	widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, "sae_entry"));

+	g_assert (widget);

+

+	visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));

+	gtk_entry_set_visibility (GTK_ENTRY (widget), visible);

+}

+

+static gboolean

+validate (WirelessSecurity *parent, GError **error)

+{

+	GtkWidget *entry;

+	const char *key;

+

+	entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "sae_entry"));

+	g_assert (entry);

+

+	key = gtk_entry_get_text (GTK_ENTRY (entry));

+	if (key == NULL || key[0] == '\0') {

+		widget_set_error (entry);

+		g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Wi-Fi password is missing."));

+		return FALSE;

+	}

+	widget_unset_error (entry);

+

+	/* passphrase can be between 8 and 63 characters inclusive */

+

+	return TRUE;

+}

+

+static void

+add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)

+{

+	GtkWidget *widget;

+

+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "sae_type_label"));

+	gtk_size_group_add_widget (group, widget);

+

+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "sae_label"));

+	gtk_size_group_add_widget (group, widget);

+}

+

+static void

+fill_connection (WirelessSecurity *parent, NMConnection *connection)

+{

+	WirelessSecuritySAE *sae = (WirelessSecuritySAE *) parent;

+	GtkWidget *widget, *passwd_entry;

+	const char *key;

+	NMSettingWireless *s_wireless;

+	NMSettingWirelessSecurity *s_wireless_sec;

+	NMSettingSecretFlags secret_flags;

+	const char *mode;

+	gboolean is_adhoc = FALSE;

+

+	s_wireless = nm_connection_get_setting_wireless (connection);

+	g_assert (s_wireless);

+

+	mode = nm_setting_wireless_get_mode (s_wireless);

+	if (mode && !strcmp (mode, "adhoc"))

+		is_adhoc = TRUE;

+

+	/* Blow away the old security setting by adding a clear one */

+	s_wireless_sec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();

+	nm_connection_add_setting (connection, (NMSetting *) s_wireless_sec);

+

+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "sae_entry"));

+	passwd_entry = widget;

+	key = gtk_entry_get_text (GTK_ENTRY (widget));

+	g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL);

+

+	/* Save PSK_FLAGS to the connection */

+	secret_flags = nma_utils_menu_to_secret_flags (passwd_entry);

+	nm_setting_set_secret_flags (NM_SETTING (s_wireless_sec), NM_SETTING_WIRELESS_SECURITY_PSK,

+	                             secret_flags, NULL);

+

+	/* Update secret flags and popup when editing the connection */

+	if (sae->editing_connection)

+		nma_utils_update_password_storage (passwd_entry, secret_flags,

+		                                   NM_SETTING (s_wireless_sec), sae->password_flags_name);

+

+	wireless_security_clear_ciphers (connection);

+	if (is_adhoc) {

+		/* Ad-Hoc settings as specified by the supplicant */

+		g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "sae", NULL);

+		nm_setting_wireless_security_add_proto (s_wireless_sec, "rsn");

+		nm_setting_wireless_security_add_pairwise (s_wireless_sec, "ccmp");

+		nm_setting_wireless_security_add_group (s_wireless_sec, "ccmp");

+	} else {

+		g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "sae", NULL);

+

+		/* Just leave ciphers and protocol empty, the supplicant will

+		 * figure that out magically based on the AP IEs and card capabilities.

+		 */

+	}

+}

+

+static void

+update_secrets (WirelessSecurity *parent, NMConnection *connection)

+{

+	helper_fill_secret_entry (connection,

+	                          parent->builder,

+	                          "sae_entry",

+	                          NM_TYPE_SETTING_WIRELESS_SECURITY,

+	                          (HelperSecretFunc) nm_setting_wireless_security_get_psk);

+}

+

+WirelessSecuritySAE *

+ws_sae_new (NMConnection *connection, gboolean secrets_only)

+{

+	WirelessSecurity *parent;

+	WirelessSecuritySAE *sec;

+	NMSetting *setting = NULL;

+	GtkWidget *widget;

+

+	parent = wireless_security_init (sizeof (WirelessSecuritySAE),

+	                                 validate,

+	                                 add_to_size_group,

+	                                 fill_connection,

+	                                 update_secrets,

+	                                 NULL,

+	                                 "/org/gnome/ControlCenter/network/ws-sae.ui",

+	                                 "sae_notebook",

+	                                 "sae_entry");

+	if (!parent)

+		return NULL;

+

+	parent->adhoc_compatible = FALSE;

+	sec = (WirelessSecuritySAE *) parent;

+	sec->editing_connection = secrets_only ? FALSE : TRUE;

+	sec->password_flags_name = NM_SETTING_WIRELESS_SECURITY_PSK;

+

+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "sae_entry"));

+	g_assert (widget);

+	g_signal_connect (G_OBJECT (widget), "changed",

+	                  (GCallback) wireless_security_changed_cb,

+	                  sec);

+	gtk_entry_set_width_chars (GTK_ENTRY (widget), 28);

+

+	/* Create password-storage popup menu for password entry under entry's secondary icon */

+	if (connection)

+		setting = (NMSetting *) nm_connection_get_setting_wireless_security (connection);

+	nma_utils_setup_password_storage (widget, 0, setting, sec->password_flags_name,

+	                                  FALSE, secrets_only);

+

+	/* Fill secrets, if any */

+	if (connection)

+		update_secrets (WIRELESS_SECURITY (sec), connection);

+

+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_wpa"));

+	g_assert (widget);

+	g_signal_connect (G_OBJECT (widget), "toggled",

+	                  (GCallback) show_toggled_cb,

+	                  sec);

+

+	/* Hide WPA/RSN for now since this can be autodetected by NM and the

+	 * supplicant when connecting to the AP.

+	 */

+

+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "sae_type_combo"));

+	g_assert (widget);

+	gtk_widget_hide (widget);

+

+	widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "sae_type_label"));

+	g_assert (widget);

+	gtk_widget_hide (widget);

+

+	return sec;

+}

diff --git a/panels/network/wireless-security/ws-sae.h b/panels/network/wireless-security/ws-sae.h

new file mode 100644

index 000000000..9a1262cd0

--- /dev/null

+++ b/panels/network/wireless-security/ws-sae.h

@@ -0,0 +1,30 @@

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

+/* NetworkManager Applet -- allow user control over networking

+ *

+ * Dan Williams <dcbw@redhat.com>

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * 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 General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License along

+ * with this program; if not, write to the Free Software Foundation, Inc.,

+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+ *

+ * Copyright 2007 - 2014 Red Hat, Inc.

+ */

+

+#ifndef WS_SAE_H

+#define WS_SAE_H

+

+typedef struct _WirelessSecuritySAE WirelessSecuritySAE;

+

+WirelessSecuritySAE * ws_sae_new (NMConnection *connection, gboolean secrets_only);

+

+#endif /* WS_SAE_H */

diff --git a/panels/network/wireless-security/ws-sae.ui b/panels/network/wireless-security/ws-sae.ui

new file mode 100644

index 000000000..d523f16c8

--- /dev/null

+++ b/panels/network/wireless-security/ws-sae.ui

@@ -0,0 +1,117 @@

+

+<interface>

+  <requires lib="gtk+" version="3.4"/>

+  <object class="GtkNotebook" id="sae_notebook">

+    <property name="visible">True</property>

+    <property name="can_focus">False</property>

+    <property name="show_tabs">False</property>

+    <property name="show_border">False</property>

+    <child>

+      <object class="GtkTable" id="sae_table">

+        <property name="visible">True</property>

+        <property name="can_focus">False</property>

+        <property name="n_rows">3</property>

+        <property name="n_columns">2</property>

+        <property name="column_spacing">6</property>

+        <property name="row_spacing">6</property>

+        <child>

+          <object class="GtkLabel" id="sae_label">

+            <property name="visible">True</property>

+            <property name="can_focus">False</property>

+            <property name="xalign">1</property>

+            <property name="label" translatable="yes">_Password</property>

+            <property name="use_underline">True</property>

+            <property name="mnemonic_widget">sae_entry</property>

+          </object>

+          <packing>

+            <property name="x_options">GTK_FILL</property>

+            <property name="y_options"/>

+          </packing>

+        </child>

+        <child>

+          <object class="GtkEntry" id="sae_entry">

+            <property name="visible">True</property>

+            <property name="can_focus">True</property>

+            <property name="max_length">64</property>

+            <property name="visibility">False</property>

+            <property name="activates_default">True</property>

+          </object>

+          <packing>

+            <property name="left_attach">1</property>

+            <property name="right_attach">2</property>

+            <property name="y_options"/>

+          </packing>

+        </child>

+        <child>

+          <object class="GtkLabel" id="sae_type_label">

+            <property name="visible">True</property>

+            <property name="can_focus">False</property>

+            <property name="xalign">1</property>

+            <property name="label" translatable="yes">_Type</property>

+            <property name="use_underline">True</property>

+            <property name="mnemonic_widget">sae_type_combo</property>

+          </object>

+          <packing>

+            <property name="top_attach">2</property>

+            <property name="bottom_attach">3</property>

+            <property name="x_options">GTK_FILL</property>

+            <property name="y_options"/>

+          </packing>

+        </child>

+        <child>

+          <object class="GtkLabel" id="label32">

+            <property name="visible">True</property>

+            <property name="can_focus">False</property>

+            <property name="xalign">0</property>

+          </object>

+          <packing>

+            <property name="top_attach">1</property>

+            <property name="bottom_attach">2</property>

+            <property name="x_options">GTK_FILL</property>

+            <property name="y_options"/>

+          </packing>

+        </child>

+        <child>

+          <object class="GtkCheckButton" id="show_checkbutton_wpa">

+            <property name="label" translatable="yes">Sho_w password</property>

+            <property name="visible">True</property>

+            <property name="can_focus">True</property>

+            <property name="receives_default">False</property>

+            <property name="use_underline">True</property>

+            <property name="draw_indicator">True</property>

+          </object>

+          <packing>

+            <property name="left_attach">1</property>

+            <property name="right_attach">2</property>

+            <property name="top_attach">1</property>

+            <property name="bottom_attach">2</property>

+            <property name="x_options">GTK_FILL</property>

+            <property name="y_options"/>

+          </packing>

+        </child>

+        <child>

+          <object class="GtkComboBox" id="sae_type_combo">

+            <property name="visible">True</property>

+            <property name="can_focus">False</property>

+          </object>

+          <packing>

+            <property name="left_attach">1</property>

+            <property name="right_attach">2</property>

+            <property name="top_attach">2</property>

+            <property name="bottom_attach">3</property>

+            <property name="y_options">GTK_FILL</property>

+          </packing>

+        </child>

+      </object>

+    </child>

+    <child type="tab">

+      <object class="GtkLabel" id="GtkLabel2">

+        <property name="visible">True</property>

+        <property name="can_focus">False</property>

+      </object>

+      <packing>

+        <property name="tab_fill">False</property>

+      </packing>

+    </child>

+  </object>

+</interface>

-- 

2.34.1