Use secure desktop when asking for full masterkey

LockAssist allows to define an expiry time for the SoftLock pin. Once expired, the full masterkey is requested.
The "Enter master key on secure desktop" setting is considered now.

Closes #16

Author: Rookiestyle

src/Config/LockAssistConfig.cs

@@ -2,7 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Windows.Forms;
+using KeePass.UI;
 using KeePassLib;
+using KeePassLib.Delegates;
 
 namespace LockAssist
 {
@@ -12,3 +15,56 @@ internal partial class LockAssistConfig
     public static KeePass.App.Configuration.AceCustomConfig _config = KeePass.Program.Config.CustomConfig;
   }
 }
+
+namespace PluginTools
+{
+  public static partial class Tools
+  {
+    public static DialogResult ShowDialog<TForm, TResult>(bool bProtect,
+      GFunc<TForm> fnConstruct, GFunc<TForm, TResult> fnResultBuilder,
+      out TResult r)
+      where TForm : Form
+      where TResult : class
+    {
+      if (fnConstruct == null) { throw new ArgumentNullException("fnConstruct"); }
+      if (fnResultBuilder == null) { throw new ArgumentNullException("fnResultBuilder"); }
+
+      r = null;
+
+      if (!bProtect)
+      {
+        TForm tf = fnConstruct();
+        if (tf == null) { return DialogResult.None; }
+
+        try
+        {
+          DialogResult drDirect = tf.ShowDialog();
+          r = fnResultBuilder(tf); // Always
+          return drDirect;
+        }
+        finally { UIUtil.DestroyForm(tf); }
+      }
+
+      UIFormConstructor fnUifC = delegate (object objParam)
+      {
+        return fnConstruct();
+      };
+
+      UIFormResultBuilder fnUifRB = delegate (Form f)
+      {
+        TForm tf = (f as TForm);
+        if (tf == null) { return null; }
+
+        return fnResultBuilder(tf);
+      };
+
+      ProtectedDialog dlg = new ProtectedDialog(fnUifC, fnUifRB);
+
+      object objResult;
+      DialogResult dr = dlg.ShowDialog(out objResult, null);
+      r = (objResult as TResult);
+      return dr;
+    }
+
+  }
+}

src/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.4")]
-[assembly: AssemblyFileVersion("3.4")]
+[assembly: AssemblyVersion("3.5")]
+[assembly: AssemblyFileVersion("3.5")]

src/SoftLock.cs

@@ -217,22 +217,48 @@ private void DisableSoftlockUsingQU()
 
     private void DisableSoftlockUsingFullPassword()
     {
-      using (KeyPromptForm kpf = new KeyPromptForm())
+      ProtectedBinary pbKey = null;
+      ProtectedBinary pbKeyDB = null;
+
+      try
       {
-        kpf.InitEx(Program.MainForm.ActiveDatabase.IOConnectionInfo, false, false);
-        kpf.Load += (o, e1) => { kpf.Text = "Softlock - " + kpf.Text; };
-        if (kpf.ShowDialog(Program.MainForm) == DialogResult.OK)
+        KeePassLib.Delegates.GFunc<KeyPromptForm> gfKeyPromptForm = delegate ()
         {
-          ProtectedBinary pbKey = QuickUnlockKeyProv.CreateMasterKeyHash(kpf.CompositeKey);
-          ProtectedBinary pbKeyDB = QuickUnlockKeyProv.CreateMasterKeyHash(Program.MainForm.ActiveDatabase.MasterKey);
-          if (pbKey.Equals(pbKeyDB))
-          {
-            SetVisibility(true);
-            if (LockAssistConfig.SL_IsActive) m_SLTimer.Interval = LockAssistConfig.SL_Seconds * 1000;
-          }
-          else PluginDebug.AddError("Deactivate SoftLock", "Deactivation failed", "Invalid key provided");
+          var f = new KeyPromptForm();
+          f.InitEx(Program.MainForm.ActiveDatabase.IOConnectionInfo, false, false);
+          f.Load += (o, e1) => { f.Text = "Softlock - " + f.Text; };
+          return f;
+        };
+        KeePassLib.Delegates.GFunc<KeyPromptForm, KeePassLib.Keys.CompositeKey> gfKeyPromptFormResult = delegate (KeyPromptForm f)
+        {
+          var rCK = f.CompositeKey;
+          UIUtil.DestroyForm(f);
+          return rCK;
+        };
+
+        KeePassLib.Keys.CompositeKey ckMasterkey = null;
+        var dr = Tools.ShowDialog(Program.Config.Security.MasterKeyOnSecureDesktop, gfKeyPromptForm, gfKeyPromptFormResult, out ckMasterkey);
+        if (dr != DialogResult.OK) return;
+        pbKey = QuickUnlockKeyProv.CreateMasterKeyHash(ckMasterkey);
+        pbKeyDB = QuickUnlockKeyProv.CreateMasterKeyHash(Program.MainForm.ActiveDatabase.MasterKey);
+      }
+      catch
+      {
+        using (KeyPromptForm kpf = new KeyPromptForm())
+        {
+          kpf.InitEx(Program.MainForm.ActiveDatabase.IOConnectionInfo, false, false);
+          kpf.Load += (o, e1) => { kpf.Text = "Softlock - " + kpf.Text; };
+          if (kpf.ShowDialog(Program.MainForm) != DialogResult.OK) return;
+          pbKey = QuickUnlockKeyProv.CreateMasterKeyHash(kpf.CompositeKey);
+          pbKeyDB = QuickUnlockKeyProv.CreateMasterKeyHash(Program.MainForm.ActiveDatabase.MasterKey);
         }
       }
+      if (pbKey.Equals(pbKeyDB))
+      {
+        SetVisibility(true);
+        if (LockAssistConfig.SL_IsActive) m_SLTimer.Interval = LockAssistConfig.SL_Seconds * 1000;
+      }
+      else PluginDebug.AddError("Deactivate SoftLock", "Deactivation failed", "Invalid key provided");
     }
 
     private bool RequestFullPassword()

version.info

@@ -1,5 +1,5 @@
 :
-LockAssist:3.4
+LockAssist:3.5
 LockAssist!de:5
 LockAssist!pt:4
 LockAssist!zh:5