Skip to content

Fix OTP popup disappears when password is stored #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielguterding wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix OTP popup disappears when password is stored #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edfe17e
Ask for OTP if configured
danielguterding Mar 23, 2026
4aa6850
Fix otp request parsing
danielguterding Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions src/nm-fortisslvpn-service.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,21 @@ handle_set_ip4_config (NMDBusFortisslvpnPpp *object,
return TRUE;
}

static const char *
normalize_secret_hint (const char *hint)
{
if (!hint)
return NULL;

if (strcmp (hint, NM_FORTISSLVPN_KEY_OTP) == 0 || g_str_has_suffix (hint, "_otp"))
return NM_FORTISSLVPN_KEY_OTP;

if (strcmp (hint, NM_FORTISSLVPN_KEY_PASSWORD) == 0 || g_str_has_suffix (hint, "_password"))
return NM_FORTISSLVPN_KEY_PASSWORD;

return hint;
}

static gboolean
handle_get_pin (NMDBusFortisslvpnPpp *object,
GDBusMethodInvocation *invocation,
Expand All @@ -331,9 +346,10 @@ handle_get_pin (NMDBusFortisslvpnPpp *object,
{
NMFortisslvpnPlugin *plugin = NM_FORTISSLVPN_PLUGIN (user_data);
NMFortisslvpnPluginPrivate *priv = NM_FORTISSLVPN_PLUGIN_GET_PRIVATE (plugin);
const char *hints[] = { arg_hint, NULL };
const char *secret_hint = normalize_secret_hint (arg_hint);
const char *hints[] = { secret_hint, NULL };

_LOGI ("FORTISSLVPN service (%s) password request received.", arg_hint);
_LOGI ("FORTISSLVPN service (%s -> %s) password request received.", arg_hint, secret_hint);

if (!priv->interactive) {
g_dbus_method_invocation_return_error_literal (invocation,
Expand All @@ -343,20 +359,20 @@ handle_get_pin (NMDBusFortisslvpnPpp *object,
return TRUE;
}

if (strcmp (arg_hint, NM_FORTISSLVPN_KEY_OTP) == 0) {
if (strcmp (secret_hint, NM_FORTISSLVPN_KEY_OTP) == 0) {
NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
NMSetting *s_vpn = nm_connection_get_setting (priv->connection, NM_TYPE_SETTING_VPN);

g_return_val_if_fail (NM_IS_SETTING_VPN (s_vpn), FALSE);
nm_setting_get_secret_flags (s_vpn, arg_hint, &flags, NULL);
nm_setting_get_secret_flags (s_vpn, secret_hint, &flags, NULL);
if ((flags & NM_SETTING_SECRET_FLAG_NOT_SAVED) == 0) {
g_dbus_method_invocation_return_error (invocation,
NMV_EDITOR_PLUGIN_ERROR,
NMV_EDITOR_PLUGIN_ERROR_FAILED,
"Secret '%s' is not configured as required", arg_hint);
"Secret '%s' is not configured as required", secret_hint);
return TRUE;
}
} else if (strcmp (arg_hint, NM_FORTISSLVPN_KEY_PASSWORD) != 0) {
} else if (strcmp (secret_hint, NM_FORTISSLVPN_KEY_PASSWORD) != 0) {
/* nm_fortisslvpn_properties_validate_secrets()() is not tolerant
* towards unknown secrets. Don't make NetworkManager add one. */
g_dbus_method_invocation_return_error (invocation,
Expand Down Expand Up @@ -557,6 +573,7 @@ real_new_secrets (NMVpnServicePlugin *plugin, NMConnection *connection, GError *
goto out;
}

hint = normalize_secret_hint (hint);
pin = nm_setting_vpn_get_secret (s_vpn, hint);
if (!pin) {
g_dbus_method_invocation_return_error (priv->get_pin_invocation,
Expand Down