SSH Agent: Fix Windows agent selection, radio buttons

keepassxreboot · Apr 2, 2022 · 8ad6a30 · 8ad6a30
1 parent aca197a
commit 8ad6a30
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/core/Config.cpp b/src/core/Config.cpp
@@ -170,7 +170,7 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
     // SSHAgent
     {Config::SSHAgent_Enabled, {QS("SSHAgent/Enabled"), Roaming, false}},
     {Config::SSHAgent_UseOpenSSH, {QS("SSHAgent/UseOpenSSH"), Roaming, false}},
-    {Config::SSHAgent_UsePageant, {QS("SSHAgent/UsePageant"), Roaming, false} },
+    {Config::SSHAgent_UsePageant, {QS("SSHAgent/UsePageant"), Roaming, true} },
     {Config::SSHAgent_AuthSockOverride, {QS("SSHAgent/AuthSockOverride"), Local, {}}},
     {Config::SSHAgent_SecurityKeyProviderOverride, {QS("SSHAgent/SecurityKeyProviderOverride"), Local, {}}},
 

diff --git a/src/sshagent/AgentSettingsWidget.cpp b/src/sshagent/AgentSettingsWidget.cpp
@@ -28,6 +28,7 @@ AgentSettingsWidget::AgentSettingsWidget(QWidget* parent)
 #ifndef Q_OS_WIN
     m_ui->usePageantCheckBox->setVisible(false);
     m_ui->useOpenSSHCheckBox->setVisible(false);
+    m_ui->useBothCheckBox->setVisible(false);
 #else
     m_ui->sshAuthSockWidget->setVisible(false);
 #endif
@@ -47,8 +48,9 @@ void AgentSettingsWidget::loadSettings()
 
     m_ui->enableSSHAgentCheckBox->setChecked(sshAgentEnabled);
 #ifdef Q_OS_WIN
-    m_ui->usePageantCheckBox->setChecked(sshAgent()->usePageant());
-    m_ui->useOpenSSHCheckBox->setChecked(sshAgent()->useOpenSSH());
+    m_ui->usePageantRadioButton->setChecked(sshAgent()->usePageant());
+    m_ui->useOpenSSHRadioButton->setChecked(sshAgent()->useOpenSSH());
+    m_ui->useBothRadioButton->setChecked(sshAgent()->usePageant() && sshAgent()->useOpenSSH());
     sshAgentEnabled = sshAgentEnabled && (sshAgent()->usePageant() || sshAgent()->useOpenSSH());
 #else
     auto sshAuthSock = sshAgent()->socketPath(false);
@@ -93,8 +95,8 @@ void AgentSettingsWidget::saveSettings()
     auto sshSecurityKeyProviderOverride = m_ui->sshSecurityKeyProviderOverrideEdit->text();
     sshAgent()->setSecurityKeyProviderOverride(sshSecurityKeyProviderOverride);
 #ifdef Q_OS_WIN
-    sshAgent()->setUsePageant(m_ui->usePageantCheckBox->isChecked());
-    sshAgent()->setUseOpenSSH(m_ui->useOpenSSHCheckBox->isChecked());
+    sshAgent()->setUsePageant(m_ui->usePageantRadioButton->isChecked() || m_ui->useBothRadioButton->isChecked());
+    sshAgent()->setUseOpenSSH(m_ui->useOpenSSHRadioButton->isChecked() || m_ui->useBothRadioButton->isChecked());
 #endif
     sshAgent()->setEnabled(m_ui->enableSSHAgentCheckBox->isChecked());
 }

diff --git a/src/sshagent/AgentSettingsWidget.ui b/src/sshagent/AgentSettingsWidget.ui
@@ -72,20 +72,27 @@
       <property name="bottomMargin">
        <number>0</number>
       </property>
-	  <item>
-       <widget class="QCheckBox" name="usePageantCheckBox">
+      <item>
+       <widget class="QRadioButton" name="usePageantRadioButton">
         <property name="text">
          <string>Use Pageant</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="useOpenSSHCheckBox">
+       <widget class="QRadioButton" name="useOpenSSHRadioButton">
         <property name="text">
          <string>Use OpenSSH</string>
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QRadioButton" name="useBothRadioButton">
+        <property name="text">
+         <string>Use both agents</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <layout class="QGridLayout" name="agentValues">
         <property name="topMargin">