Skip to content

Allow passing -P to sshpass #142

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

Merged
danfruehauf merged 1 commit into from
Apr 7, 2026
Merged

Allow passing -P to sshpass #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 39 additions & 0 deletions properties/advanced-dialog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ static const char *advanced_keys[] = {
NM_SSH_KEY_SOCKS_BIND_ADDRESS,
NM_SSH_KEY_LOCAL_BIND_ADDRESS,
NM_SSH_KEY_REMOTE_BIND_ADDRESS,
NM_SSH_KEY_SSHPASS_PROMPT,
NULL
};

Expand Down Expand Up @@ -177,6 +178,16 @@ remote_bind_address_toggled_cb (GtkWidget *check, gpointer user_data)
gtk_widget_set_sensitive (widget, gtk_check_button_get_active (GTK_CHECK_BUTTON (check)));
}

static void
sshpass_prompt_toggled_cb (GtkWidget *check, gpointer user_data)
{
GtkBuilder *builder = (GtkBuilder *) user_data;
GtkWidget *widget;

widget = GTK_WIDGET (gtk_builder_get_object (builder, "sshpass_prompt_entry"));
gtk_widget_set_sensitive (widget, gtk_check_button_get_active (GTK_CHECK_BUTTON (check)));
}

GtkWidget *
advanced_dialog_new (GHashTable *hash)
{
Expand Down Expand Up @@ -393,6 +404,25 @@ advanced_dialog_new (GHashTable *hash)
gtk_widget_set_sensitive (widget, FALSE);
}

widget = GTK_WIDGET (gtk_builder_get_object (builder, "sshpass_prompt_checkbutton"));
g_assert (widget);
g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (sshpass_prompt_toggled_cb), builder);

value = g_hash_table_lookup (hash, NM_SSH_KEY_SSHPASS_PROMPT);
if (value && strlen (value)) {
gtk_check_button_set_active (GTK_CHECK_BUTTON (widget), TRUE);

widget = GTK_WIDGET (gtk_builder_get_object (builder, "sshpass_prompt_entry"));
gtk_editable_set_text (GTK_EDITABLE (widget), value);
gtk_widget_set_sensitive (widget, TRUE);
} else {
gtk_check_button_set_active (GTK_CHECK_BUTTON (widget), FALSE);

widget = GTK_WIDGET (gtk_builder_get_object (builder, "sshpass_prompt_entry"));
gtk_editable_set_text (GTK_EDITABLE (widget), "");
gtk_widget_set_sensitive (widget, FALSE);
}

out:
return dialog;
}
Expand Down Expand Up @@ -497,5 +527,14 @@ advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error)
g_hash_table_insert (hash, g_strdup (NM_SSH_KEY_REMOTE_BIND_ADDRESS), g_strdup(remote_bind_address));
}

widget = GTK_WIDGET (gtk_builder_get_object (builder, "sshpass_prompt_checkbutton"));
if (gtk_check_button_get_active (GTK_CHECK_BUTTON (widget))) {
const gchar *sshpass_prompt;

widget = GTK_WIDGET (gtk_builder_get_object (builder, "sshpass_prompt_entry"));
sshpass_prompt = gtk_editable_get_text (GTK_EDITABLE (widget));
g_hash_table_insert (hash, g_strdup (NM_SSH_KEY_SSHPASS_PROMPT), g_strdup(sshpass_prompt));
}

return hash;
}
36 changes: 36 additions & 0 deletions properties/nm-ssh-dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,42 @@ ip tuntap add name TUN_DEVICE mode tun user USER</property>
<property name="position">10</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="sshpass_prompt_hbox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="sshpass_prompt_checkbutton">
<property name="label" translatable="yes">sshpass prompt match (-P flag):</property>
<property name="visible">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="sshpass_prompt_entry">
<property name="visible">True</property>
<property name="text"></property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">11</property>
</packing>
</child>
</object>
</child>
<child type="tab">
Expand Down
1 change: 1 addition & 0 deletions shared/nm-service-defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#define NM_SSH_KEY_AUTH_TYPE "auth-type"
#define NM_SSH_KEY_KEY_FILE "key-file"
#define NM_SSH_KEY_PASSWORD "password"
#define NM_SSH_KEY_SSHPASS_PROMPT "sshpass-prompt"

#define NM_SSH_DEFAULT_PORT 22
#define NM_SSH_DEFAULT_MTU 1500
Expand Down
7 changes: 7 additions & 0 deletions src/nm-ssh-service.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,6 +1020,13 @@ nm_ssh_start_ssh_binary (NMSshPlugin *plugin,
/* Use sshpass binary */
add_ssh_arg (args, sshpass_binary);

/* Custom password prompt match (-P flag) */
tmp = nm_setting_vpn_get_data_item (s_vpn, NM_SSH_KEY_SSHPASS_PROMPT);
if (tmp && strlen(tmp)) {
add_ssh_arg (args, "-P");
add_ssh_arg (args, tmp);
}

/* Get password */
password = nm_setting_vpn_get_secret (s_vpn, NM_SSH_KEY_PASSWORD);
if (password && strlen(password)) {
Expand Down
Loading