From cdd9b74cbc805a4a94a093999a2e989e3d31195f Mon Sep 17 00:00:00 2001
From: Nex <nex@nex.sx>
Date: Thu, 30 Jun 2022 10:58:50 +0200
Subject: [PATCH] Replaced getpass with Prompt

---
 mvt/android/cmd_check_backup.py | 5 +++--
 mvt/android/modules/adb/base.py | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mvt/android/cmd_check_backup.py b/mvt/android/cmd_check_backup.py
index 148fb1e..ff524c8 100644
--- a/mvt/android/cmd_check_backup.py
+++ b/mvt/android/cmd_check_backup.py
@@ -3,7 +3,6 @@
 # Use of this software is governed by the MVT License 1.1 that can be found at
 #   https://license.mvt.re/1.1/
 
-import getpass
 import io
 import logging
 import os
@@ -11,6 +10,8 @@ import sys
 import tarfile
 from pathlib import Path
 
+from rich import Prompt
+
 from mvt.android.parsers.backup import (AndroidBackupParsingError,
                                         InvalidBackupPassword, parse_ab_header,
                                         parse_backup_file)
@@ -50,7 +51,7 @@ class CmdAndroidCheckBackup(Command):
 
             password = None
             if header["encryption"] != "none":
-                password = getpass.getpass(prompt="Backup Password: ", stream=None)
+                password = Prompt.ask("Enter backup password", password=True)
             try:
                 tardata = parse_backup_file(data, password=password)
             except InvalidBackupPassword:
diff --git a/mvt/android/modules/adb/base.py b/mvt/android/modules/adb/base.py
index 5dafc9d..be34e67 100644
--- a/mvt/android/modules/adb/base.py
+++ b/mvt/android/modules/adb/base.py
@@ -4,7 +4,6 @@
 #   https://license.mvt.re/1.1/
 
 import base64
-import getpass
 import logging
 import os
 import random
@@ -19,6 +18,7 @@ from adb_shell.auth.keygen import keygen, write_public_keyfile
 from adb_shell.auth.sign_pythonrsa import PythonRSASigner
 from adb_shell.exceptions import (AdbCommandFailureException, DeviceAuthError,
                                   UsbDeviceNotFoundError, UsbReadFailedError)
+from rich import Prompt
 from usb1 import USBErrorAccess, USBErrorBusy
 
 from mvt.android.parsers.backup import (InvalidBackupPassword, parse_ab_header,
@@ -270,7 +270,7 @@ class AndroidExtraction(MVTModule):
             return parse_backup_file(backup_output, password=None)
 
         for password_retry in range(0, 3):
-            backup_password = getpass.getpass(prompt="Backup password: ", stream=None)
+            backup_password = Prompt.ask("Enter backup password", password=True)
             try:
                 decrypted_backup_tar = parse_backup_file(backup_output, backup_password)
                 return decrypted_backup_tar