Merge pull request #19 from andrew-schofield/ignore-deleted-entries

Ignore deleted entries. Fix #14
andrew-schofield · Apr 8, 2017 · d28c20f · d28c20f
2 parents 7c37dc1 + b49e7fa
commit d28c20f
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 16 deletions.
diff --git a/HaveIBeenPwned.plgx b/HaveIBeenPwned.plgx
diff --git a/HaveIBeenPwned/BaseChecker.cs b/HaveIBeenPwned/BaseChecker.cs
@@ -21,7 +21,7 @@ protected BaseChecker(PwDatabase database, HttpClient httpClient, IPluginHost pl
             this.pluginHost = pluginHost;
         }
 
-        public abstract Task<List<BreachedEntry>> CheckDatabase(bool expireEntries, bool oldEntriesOnly);
+        public abstract Task<List<BreachedEntry>> CheckDatabase(bool expireEntries, bool oldEntriesOnly, bool ignoreDeleted);
 
         public abstract Image BreachLogo { get; }
 

diff --git a/HaveIBeenPwned/CheckerPrompt.Designer.cs b/HaveIBeenPwned/CheckerPrompt.Designer.cs
diff --git a/HaveIBeenPwned/CheckerPrompt.cs b/HaveIBeenPwned/CheckerPrompt.cs
@@ -21,5 +21,10 @@ public bool OnlyCheckOldEntries
         {
             get { return checkOldEntries.Checked; }
         }
+
+        public bool IgnoreDeletedEntries
+        {
+            get { return ignoreDeletedEntries.Checked; }
+        }
     }
 }
diff --git a/HaveIBeenPwned/CloudbleedChecker.cs b/HaveIBeenPwned/CloudbleedChecker.cs
@@ -29,10 +29,10 @@ public override string BreachTitle
             get { return "Cloudbleed Vulnerability"; }
         }
 
-        public async override Task<List<BreachedEntry>> CheckDatabase(bool expireEntries, bool oldEntriesOnly)
+        public async override Task<List<BreachedEntry>> CheckDatabase(bool expireEntries, bool oldEntriesOnly, bool ignoreDeleted)
         {
             var breaches = await GetBreaches();
-            var entries = passwordDatabase.RootGroup.GetEntries(true);
+            var entries = passwordDatabase.RootGroup.GetEntries(true).Where(e => !ignoreDeleted || !e.IsDeleted(pluginHost));
             var breachedEntries = new List<BreachedEntry>();
             StatusProgressForm progressForm = new StatusProgressForm();
             var cloudbleedEntry = new CloudbleedEntry();

diff --git a/HaveIBeenPwned/HaveIBeenPwnedChecker.cs b/HaveIBeenPwned/HaveIBeenPwnedChecker.cs
@@ -29,10 +29,10 @@ public override string BreachTitle
             get { return "Have I Been Pwned"; }
         }
 
-        public async override Task<List<BreachedEntry>> CheckDatabase(bool expireEntries, bool oldEntriesOnly)
+        public async override Task<List<BreachedEntry>> CheckDatabase(bool expireEntries, bool oldEntriesOnly, bool ignoreDeleted)
         {
             var breaches = await GetBreaches();
-            var entries = passwordDatabase.RootGroup.GetEntries(true);
+            var entries = passwordDatabase.RootGroup.GetEntries(true).Where(e => !ignoreDeleted || !e.IsDeleted(pluginHost));
             var breachedEntries = new List<BreachedEntry>();
             StatusProgressForm progressForm = new StatusProgressForm();
 

diff --git a/HaveIBeenPwned/HaveIBeenPwnedExt.cs b/HaveIBeenPwned/HaveIBeenPwnedExt.cs
@@ -98,7 +98,7 @@ private void CheckBreaches(BaseChecker breachChecker)
             var dialog = new CheckerPrompt(breachChecker.BreachLogo, breachChecker.BreachTitle);
             if (dialog.ShowDialog() == DialogResult.OK)
             {
-                var breachedEntries = breachChecker.CheckDatabase(dialog.ExpireEntries, dialog.OnlyCheckOldEntries);
+                var breachedEntries = breachChecker.CheckDatabase(dialog.ExpireEntries, dialog.OnlyCheckOldEntries, dialog.IgnoreDeletedEntries);
                 breachedEntries.ContinueWith((result) =>
                 {
                     // make sure any exceptions we aren't catching ourselves (like URIFormatException) are thrown correctly

diff --git a/HaveIBeenPwned/Properties/AssemblyInfo.cs b/HaveIBeenPwned/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.7.0")]
-[assembly: AssemblyFileVersion("0.2.7.0")]
+[assembly: AssemblyVersion("0.2.8.0")]
+[assembly: AssemblyFileVersion("0.2.8.0")]
diff --git a/HaveIBeenPwned/PwEntryExtension.cs b/HaveIBeenPwned/PwEntryExtension.cs
@@ -1,4 +1,5 @@
-using KeePassLib;
+using KeePass.Plugins;
+using KeePassLib;
 using System;
 using System.Linq;
 
@@ -23,5 +24,10 @@ public static DateTime GetPasswordLastModified(this PwEntry entry)
 
             return entry.LastModificationTime;
         }
+
+        public static bool IsDeleted(this PwEntry entry, IPluginHost pluginHost)
+        {
+            return entry.ParentGroup.Uuid.CompareTo(pluginHost.Database.RecycleBinUuid) == 0;
+        }
     }
 }
diff --git a/VERSION b/VERSION
@@ -1,3 +1,3 @@
 :
-HaveIBeenPwned checker:0.2.7
+HaveIBeenPwned checker:0.2.8
 :
diff --git a/mono/HaveIBeenPwned.dll b/mono/HaveIBeenPwned.dll