From bb123c23a10faed71874faf4ae9640623bbe5f79 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Thu, 16 Apr 2026 16:01:49 +0200
Subject: [PATCH] refactor(pw): Improve handling of password input

---
 commands/util/input_mgr.py        | 30 ++++++-------
 commands/util/password_manager.py | 70 +++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 18 deletions(-)
 create mode 100644 commands/util/password_manager.py

diff --git a/commands/util/input_mgr.py b/commands/util/input_mgr.py
index 01e5a19..2715bc1 100644
--- a/commands/util/input_mgr.py
+++ b/commands/util/input_mgr.py
@@ -1,7 +1,6 @@
 from typing import Optional
-import getpass
-import time
-import colorama
+
+from commands.util.password_manager import PasswordManager
 
 
 def choice(default: str, options: str, msg: str) -> str:
@@ -33,18 +32,13 @@ def confirm_overwrite(msg: Optional[str] = ""):
     )
 
 
-def password(msg: str = ""):
-    pw = ""
-    if msg != "":
-        pw = getpass.getpass(msg)
-    else:
-        pw = getpass.getpass()
-    if pw != "":
-        return pw
-    else:
-        time.sleep(1)
-        print(
-            colorama.Fore.RED + "Error:",
-            colorama.Style.RESET_ALL + "Password cannot be empty",
-        )
-        return password(msg)
+# Use class to store the password
+pw_manager = PasswordManager()
+
+
+def password():
+    return pw_manager.get()
+
+
+def unlock_sudo():
+    return pw_manager.validate()
diff --git a/commands/util/password_manager.py b/commands/util/password_manager.py
new file mode 100644
index 0000000..f6dcab7
--- /dev/null
+++ b/commands/util/password_manager.py
@@ -0,0 +1,70 @@
+import getpass
+import time
+import colorama
+import subprocess as sp
+
+
+class PasswordManager:
+    _pw = ""
+    _wrong_cnt = 0
+    _valid = False
+
+    def get(self, msg: str = ""):
+        """Get the user's password (uses cached password if PW is valid)
+        Otherwise prompts user
+
+        Args:
+            msg: The message to use for the password prompt
+
+        Returns:
+            The user's password
+        """
+        if self._valid or self.validate():
+            return self._pw
+
+        if msg != "":
+            self._pw = getpass.getpass(msg)
+        else:
+            self._pw = getpass.getpass()
+        if self._pw != "":
+            if not self.validate():
+                print(
+                    colorama.Fore.RED + "Error:",
+                    colorama.Style.RESET_ALL + "Invalid Password. Please try again",
+                )
+                return self.get(msg)
+            return self._pw
+        else:
+            time.sleep(1)
+            print(
+                colorama.Fore.RED + "Error:",
+                colorama.Style.RESET_ALL + "Password cannot be empty",
+            )
+            return self.get(msg)
+
+    def validate(self) -> bool:
+        """Validate that the password is correct by running sudo command
+
+        Returns:
+            True if password is valid, False otherwise
+        """
+
+        def helper():
+            if self._pw == "":
+                return False
+            try:
+                sp.run(
+                    ["sudo", "-k"], capture_output=True, text=True
+                ).check_returncode()
+                sp.run(
+                    ["sudo", "-S", "echo"],
+                    capture_output=True,
+                    input=self._pw,
+                    text=True,
+                ).check_returncode()
+            except Exception:
+                return False
+            return True
+
+        self._valid = helper()
+        return self._valid