New option for dealing with empty passwords

mihaifm · Jan 4, 2025 · 4064e65 · 4064e65
1 parent d3e19a9
commit 4064e65
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 31 deletions.
diff --git a/HIBPOfflineCheck/HIBPOfflineCheckExt.cs b/HIBPOfflineCheck/HIBPOfflineCheckExt.cs
@@ -186,7 +186,8 @@ public Options LoadOptions()
                 WarningDialog = config.GetBool(Options.Names.WARNING_DIALOG, false),
                 AutoCheck = config.GetBool(Options.Names.AUTO_CHECK, true),
                 WarningDialogText = XmlUnescape(config.GetString(Options.Names.WARNING_DIALOG_TEXT) ?? "WARNING - INSECURE PASSWORD\r\n\r\nThis password is insecure and publicly known"),
-                BloomFilter = config.GetString(Options.Names.BLOOM_FILTER) ?? ""
+                BloomFilter = config.GetString(Options.Names.BLOOM_FILTER) ?? "",
+                MarkEmptyPasswords = (Options.EmptyPwdDefault) config.GetLong(Options.Names.MARK_EMPTY_PASSWORDS, (long) Options.EmptyPwdDefault.Secure)
             };
 
             this.options = options;
@@ -212,6 +213,7 @@ public void SaveOptions(Options options)
             config.SetBool(Options.Names.AUTO_CHECK, options.AutoCheck);
             config.SetString(Options.Names.WARNING_DIALOG_TEXT, XmlEscape(options.WarningDialogText));
             config.SetString(Options.Names.BLOOM_FILTER, options.BloomFilter);
+            config.SetLong(Options.Names.MARK_EMPTY_PASSWORDS, (long) options.MarkEmptyPasswords);
 
             this.options = options;
             prov.PluginOptions = options;

diff --git a/HIBPOfflineCheck/HIBPOfflineCheckOptions.Designer.cs b/HIBPOfflineCheck/HIBPOfflineCheckOptions.Designer.cs
diff --git a/HIBPOfflineCheck/HIBPOfflineCheckOptions.cs b/HIBPOfflineCheck/HIBPOfflineCheckOptions.cs
@@ -34,6 +34,7 @@ private bool CommitOptions()
             options.WarningDialog = checkBoxWarningDialog.Checked;
             options.AutoCheck = checkBoxAutoCheck.Checked;
             options.WarningDialogText = textBoxWarningDialog.Text;
+            options.MarkEmptyPasswords = (Options.EmptyPwdDefault) comboBoxEmptyPw.SelectedIndex;
 
             bool bloomFilterChanged = (options.BloomFilter != textBoxBloomFilter.Text);
             options.BloomFilter = textBoxBloomFilter.Text;
@@ -89,6 +90,7 @@ private void HIBPOfflineCheckOptions_Load(object sender, EventArgs e)
             textBoxBloomFilter.Enabled = radioButtonBloom.Checked;
             buttonCreateBloom.Enabled = radioButtonBloom.Checked;
             buttonBrowseBloom.Enabled = radioButtonBloom.Checked;
+            comboBoxEmptyPw.SelectedIndex = (int) options.MarkEmptyPasswords;
 
             textBoxFileName.Select();
             textBoxFileName.Select(0, 0);

diff --git a/HIBPOfflineCheck/HIBPOfflineColumnProv.cs b/HIBPOfflineCheck/HIBPOfflineColumnProv.cs
@@ -50,6 +50,19 @@ private void GetPasswordStatus()
                 return;
             }
 
+            if (IsEmptyPassword())
+            {
+                if (PluginOptions.MarkEmptyPasswords == Options.EmptyPwdDefault.Secure)
+                    Status = PluginOptions.SecureText;
+                else if (PluginOptions.MarkEmptyPasswords == Options.EmptyPwdDefault.Pwned)
+                    Status = PluginOptions.InsecureText;
+                else if (PluginOptions.MarkEmptyPasswords == Options.EmptyPwdDefault.Excluded)
+                    Status = PluginOptions.ExcludedText;
+
+                receivedStatus = true;
+                return;
+            }
+
             if (PluginOptions.CheckMode == Options.CheckModeType.Offline)
             {
                 GetOfflineStatus();
@@ -72,7 +85,7 @@ private string GetPasswordSHA()
             {
                 var context = new SprContext(PasswordEntry, Host.Database, SprCompileFlags.All);
                 var password = SprEngine.Compile(PasswordEntry.Strings.GetSafe(PwDefs.PasswordField).ReadString(), context);
-
+                
                 var pwdShaBytes = sha1.ComputeHash(Encoding.UTF8.GetBytes(password));
                 var sb = new StringBuilder(2 * pwdShaBytes.Length);
 
@@ -85,6 +98,11 @@ private string GetPasswordSHA()
             }
         }
 
+        private bool IsEmptyPassword()
+        {
+            return PasswordEntry.Strings.GetSafe(PwDefs.PasswordField).IsEmpty;
+        }
+
         private void GetOnlineStatus()
         {
             var pwdSha = GetPasswordSHA();

diff --git a/HIBPOfflineCheck/Options.cs b/HIBPOfflineCheck/Options.cs
@@ -9,6 +9,13 @@ public enum CheckModeType
             BloomFilter = 2
         }
 
+        public enum EmptyPwdDefault
+        {
+            Secure = 0,
+            Pwned = 1,
+            Excluded = 2
+        }
+
         public static class Names
         {
             private const string PLUGIN_NAMESPACE = "HIBPOfflineCheck";
@@ -26,6 +33,7 @@ public static class Names
             public const string CHECK_MODE = PLUGIN_NAMESPACE + ".CheckMode";
             public const string BLOOM_FILTER = PLUGIN_NAMESPACE + ".BloomFilter";
             public const string AUTO_CHECK = PLUGIN_NAMESPACE + ".AutoCheck";
+            public const string MARK_EMPTY_PASSWORDS = PLUGIN_NAMESPACE + ".MarkEmptyPasswords";
         }
 
         public string HIBPFileName { get; set; }
@@ -41,5 +49,6 @@ public static class Names
         public CheckModeType CheckMode { get; set; }
         public string BloomFilter { get; set; }
         public bool AutoCheck { get; set; }
+        public EmptyPwdDefault MarkEmptyPasswords { get; set; }
     }
 }
diff --git a/HIBPOfflineCheck/Properties/AssemblyInfo.cs b/HIBPOfflineCheck/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("1.7.10.0")]
-[assembly: AssemblyFileVersion("1.7.10.0")]
+[assembly: AssemblyVersion("1.7.11.0")]
+[assembly: AssemblyFileVersion("1.7.11.0")]
diff --git a/version.txt b/version.txt
@@ -1,3 +1,3 @@
 :
-HIBPOfflineCheck:1.7.10.0
+HIBPOfflineCheck:1.7.11.0
 :