[FIX] Removed ability to select constraints when using Client Mode wi…

…th Pageant. Closes #34.

KeeAgent/KeeAgentExt.cs

@@ -230,7 +230,9 @@ private void mKeeAgentPwEntryContextMenuItem_Clicked(object aSender, EventArgs a
         if (entry.GetKeeAgentSettings().AllowUseOfSshKey) {
           try {
             var constraints = new List<Agent.KeyConstraint>();
-            if ((Control.ModifierKeys & Keys.Control) == Keys.Control) {
+            if (!(mAgent is PageantClient) &&
+                (Control.ModifierKeys & Keys.Control) == Keys.Control)
+            {
               var dialog = new ConstraintsInputDialog();
               dialog.ShowDialog();
               if (dialog.DialogResult == DialogResult.OK) {
@@ -562,7 +564,7 @@ private void MainForm_FileOpened(object aSender,
             break;
           }
           var settings = entry.GetKeeAgentSettings();
-          if (settings.AllowUseOfSshKey && settings.AddAtDatabaseOpen) {
+          if (settings.AllowUseOfSshKey && settings.AddAtDatabaseOpen) {            
             try {
               AddEntry(entry, null);
             } catch (Exception) {
@@ -638,15 +640,27 @@ public ISshKey AddEntry(PwEntry aEntry,
       var settings = aEntry.GetKeeAgentSettings();
       try {
         var key = aEntry.GetSshKey();
-        if (aConstraints != null) {
-          foreach (var constraint in aConstraints) {
-            key.AddConstraint(constraint);
+
+        if (mAgent is PageantClient) {
+          // Pageant errors if you try to add a key that is already loaded
+          // so try to remove the key first so that it behaves like other agents
+          try {
+            mAgent.RemoveKey(key);
+          } catch (Exception) {
+            // ignore failure
+          }
+        } else {
+          // also, Pageant does not support constraints
+          if (aConstraints != null) {
+            foreach (var constraint in aConstraints) {
+              key.AddConstraint(constraint);
+            }
+          }
+          if (Options.AlwasyConfirm &&
+              !key.HasConstraint(Agent.KeyConstraintType.SSH_AGENT_CONSTRAIN_CONFIRM))
+          {
+            key.addConfirmConstraint();
           }
-        }
-        if (Options.AlwasyConfirm &&
-            !key.HasConstraint(Agent.KeyConstraintType.SSH_AGENT_CONSTRAIN_CONFIRM))
-        {
-          key.addConfirmConstraint();
         }
         mAgent.AddKey(key);
         return key;

KeeAgent/UI/EntryPickerDialog.cs

@@ -35,10 +35,15 @@ public ICollection<Agent.KeyConstraint> Constraints
       }
     }
 
-    public EntryPickerDialog(IPluginHost aPluginHost)
+    public EntryPickerDialog(IPluginHost aPluginHost, bool aShowConstraintControls)
     {
       mPluginHost = aPluginHost;
       InitializeComponent();
+      if (!aShowConstraintControls) {
+        Controls.Remove(mTableLayoutPanel);
+        mCustomTreeViewEx.Height += mTableLayoutPanel.Height + 6;
+      }
+
 #if !__MonoCS__
       // TODO figure out why this crashes mono
       Icon = Properties.Resources.KeeAgent_ico;

KeeAgent/UI/EntryPickerDialog.resx

@@ -117,5 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 </root>

KeeAgent/UI/ManageDialog.cs

@@ -34,7 +34,9 @@ private void addButtonFromFileMenuItem_Click(object sender, EventArgs e)
 
     private void addButtonFromKeePassMenuItem_Click(object sender, EventArgs e)
     {
-      var entryPicker = new EntryPickerDialog(mExt.mPluginHost);
+      var showConstraintControls = !(mExt.mAgent is PageantClient);
+      var entryPicker =
+        new EntryPickerDialog(mExt.mPluginHost, showConstraintControls);
       var result = entryPicker.ShowDialog();
       if (result == DialogResult.OK) {
         try {