crt0mega/mvt
1
0
Fork 0
mirror of https://github.com/mvt-project/mvt.git synced 2024-06-01 18:55:31 +00:00
Code Issues Projects Releases Wiki Activity

Replaced getpass with Prompt

Browse Source
This commit is contained in:
Nex 2022-06-30 10:58:50 +02:00
parent 3fb37b4f30
commit cdd9b74cbc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mvt/android/cmd_check_backup.py
View File

@ -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:

4
mvt/android/modules/adb/base.py
View File

@ -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