From: Debasish Patra Date: Sat, 29 Aug 2020 17:58:16 -0400 Subject: Add User Agent to Openconnect VPN for NetworkManager Origin: https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/-/commit/b5e154c06fd9013a925f85c2aa38d88e4ee53db0 Bug-Debian: https://bugs.debian.org/1053467 --- auth-dialog/main.c | 3 +- properties/nm-openconnect-dialog.ui | 73 +++++++++++++++++------ properties/nm-openconnect-editor-plugin.c | 5 ++ properties/nm-openconnect-editor.c | 15 +++++ shared/nm-service-defines.h | 1 + 5 files changed, 79 insertions(+), 18 deletions(-) diff --git a/auth-dialog/main.c b/auth-dialog/main.c index 99cab7cd921f..305b568650ba 100644 --- a/auth-dialog/main.c +++ b/auth-dialog/main.c @@ -1853,6 +1853,7 @@ static void build_main_dialog(auth_ui_data *ui_data) static auth_ui_data *init_ui_data (char *vpn_name, GHashTable *options, GHashTable *secrets, char *vpn_uuid) { + char *vpn_useragent = g_hash_table_lookup(options, "useragent"); auth_ui_data *ui_data; ui_data = g_slice_new0(auth_ui_data); @@ -1883,7 +1884,7 @@ static auth_ui_data *init_ui_data (char *vpn_name, GHashTable *options, GHashTab g_unix_set_fd_nonblocking(ui_data->cancel_pipes[0], TRUE, NULL); g_unix_set_fd_nonblocking(ui_data->cancel_pipes[1], TRUE, NULL); - ui_data->vpninfo = (void *)openconnect_vpninfo_new("OpenConnect VPN Agent (NetworkManager)", + ui_data->vpninfo = (void *)openconnect_vpninfo_new(vpn_useragent ?: "OpenConnect VPN Agent (NetworkManager)", validate_peer_cert, write_new_config, nm_process_auth_form, write_progress, ui_data); diff --git a/properties/nm-openconnect-dialog.ui b/properties/nm-openconnect-dialog.ui index 43beb44a34a9..f32afcd5899f 100644 --- a/properties/nm-openconnect-dialog.ui +++ b/properties/nm-openconnect-dialog.ui @@ -105,6 +105,45 @@ 2 + + + True + _User Agent: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + user_agent_entry + PANGO_ELLIPSIZE_NONE + -1 + False + + + 0 + 3 + + + + + True + True + True + True + 0 + + True + • + False + True + + + 1 + 3 + + 13 @@ -114,7 +153,7 @@ 0 - 3 + 4 2 @@ -136,7 +175,7 @@ 0 - 4 + 5 @@ -154,7 +193,7 @@ 1 - 4 + 5 @@ -170,7 +209,7 @@ 0 - 5 + 6 2 @@ -192,7 +231,7 @@ 0 - 6 + 7 @@ -210,7 +249,7 @@ 1 - 6 + 7 @@ -232,7 +271,7 @@ 0 - 7 + 8 @@ -250,7 +289,7 @@ 1 - 7 + 8 @@ -273,7 +312,7 @@ 0 - 8 + 9 2 @@ -286,7 +325,7 @@ 0 - 9 + 10 2 @@ -303,7 +342,7 @@ 0 - 11 + 12 2 @@ -320,7 +359,7 @@ 0 - 12 + 13 2 @@ -344,7 +383,7 @@ 0 - 13 + 14 2 @@ -366,7 +405,7 @@ 0 - 14 + 15 @@ -384,7 +423,7 @@ 1 - 14 + 15 @@ -406,7 +445,7 @@ 0 - 15 + 16 @@ -420,7 +459,7 @@ 0 - 16 + 17 2 diff --git a/properties/nm-openconnect-editor-plugin.c b/properties/nm-openconnect-editor-plugin.c index 90dd5af55e1e..3f3c7c55b4b4 100644 --- a/properties/nm-openconnect-editor-plugin.c +++ b/properties/nm-openconnect-editor-plugin.c @@ -229,6 +229,11 @@ import (NMVpnEditorPlugin *iface, const char *path, GError **error) if (buf) nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_PROXY, buf); + /* UserAgent */ + buf = g_key_file_get_string (keyfile, "openconnect", "UserAgent", NULL); + if (buf) + nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_USERAGENT, buf); + /* Cisco Secure Desktop */ bval = g_key_file_get_boolean (keyfile, "openconnect", "CSDEnable", NULL); if (bval) diff --git a/properties/nm-openconnect-editor.c b/properties/nm-openconnect-editor.c index de0c27a1b14d..813ff4c010e3 100644 --- a/properties/nm-openconnect-editor.c +++ b/properties/nm-openconnect-editor.c @@ -344,6 +344,16 @@ init_editor_plugin (OpenconnectEditor *self, NMConnection *connection, GError ** } g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); + widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_agent_entry")); + g_return_val_if_fail (widget, FALSE); + + if (s_vpn) { + value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_USERAGENT); + if (value) + gtk_entry_set_text (GTK_ENTRY (widget), value); + } + g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); + widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "fsid_button")); g_return_val_if_fail (widget, FALSE); @@ -460,6 +470,11 @@ update_connection (NMVpnEditor *iface, if (str && strlen (str)) nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_PROXY, str); + widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_agent_entry")); + str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); + if (str && strlen (str)) + nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_USERAGENT, str); + widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "fsid_button")); str = gtk_check_button_get_active (GTK_CHECK_BUTTON (widget))?"yes":"no"; nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID, str); diff --git a/shared/nm-service-defines.h b/shared/nm-service-defines.h index 4e7d48132824..21e1ce4f555a 100644 --- a/shared/nm-service-defines.h +++ b/shared/nm-service-defines.h @@ -46,6 +46,7 @@ #define NM_OPENCONNECT_KEY_PROTOCOL "protocol" #define NM_OPENCONNECT_KEY_PROXY "proxy" #define NM_OPENCONNECT_KEY_CSD_ENABLE "enable_csd_trojan" +#define NM_OPENCONNECT_KEY_USERAGENT "useragent" #define NM_OPENCONNECT_KEY_CSD_WRAPPER "csd_wrapper" #define NM_OPENCONNECT_KEY_TOKEN_MODE "stoken_source" #define NM_OPENCONNECT_KEY_TOKEN_SECRET "stoken_string" -- 2.42.0