From c966eea7e658a061f59c91ed00c00cf887525938 Mon Sep 17 00:00:00 2001 From: Nex Date: Fri, 30 Jul 2021 11:40:09 +0200 Subject: [PATCH] Sorted imports --- dev/mvt-android | 1 + dev/mvt-ios | 1 + mvt/android/cli.py | 10 +++-- mvt/android/download_apks.py | 4 +- mvt/android/lookups/koodous.py | 8 ++-- mvt/android/lookups/virustotal.py | 9 +++-- mvt/android/modules/adb/__init__.py | 4 +- mvt/android/modules/adb/base.py | 9 +++-- mvt/android/modules/adb/chrome_history.py | 5 ++- .../modules/adb/dumpsys_batterystats.py | 2 +- mvt/android/modules/adb/dumpsys_packages.py | 2 +- mvt/android/modules/adb/dumpsys_procstats.py | 2 +- mvt/android/modules/adb/packages.py | 3 +- mvt/android/modules/adb/rootbinaries.py | 3 +- mvt/android/modules/adb/sms.py | 5 ++- mvt/android/modules/adb/whatsapp.py | 7 ++-- mvt/android/modules/backup/sms.py | 6 +-- mvt/common/indicators.py | 3 +- mvt/common/module.py | 8 ++-- mvt/common/options.py | 3 +- mvt/common/utils.py | 5 ++- mvt/ios/cli.py | 7 ++-- mvt/ios/decrypt.py | 5 ++- mvt/ios/modules/fs/__init__.py | 38 +++++++++---------- mvt/ios/modules/fs/base.py | 7 ++-- mvt/ios/modules/fs/cache_files.py | 1 + mvt/ios/modules/fs/calls.py | 1 + mvt/ios/modules/fs/chrome_favicon.py | 3 +- mvt/ios/modules/fs/chrome_history.py | 3 +- mvt/ios/modules/fs/filesystem.py | 3 +- mvt/ios/modules/fs/firefox_favicon.py | 2 +- mvt/ios/modules/fs/firefox_history.py | 2 +- mvt/ios/modules/fs/idstatuscache.py | 7 ++-- mvt/ios/modules/fs/locationd.py | 3 +- mvt/ios/modules/fs/manifest.py | 6 ++- mvt/ios/modules/fs/net_base.py | 3 +- mvt/ios/modules/fs/safari_browserstate.py | 7 ++-- mvt/ios/modules/fs/sms.py | 4 +- mvt/ios/modules/fs/sms_attachments.py | 4 +- mvt/ios/modules/fs/version_history.py | 2 +- mvt/ios/modules/fs/webkit_base.py | 5 ++- .../fs/webkit_resource_load_statistics.py | 6 +-- .../modules/fs/webkit_session_resource_log.py | 3 +- mvt/ios/modules/fs/whatsapp.py | 5 ++- setup.py | 3 +- 45 files changed, 133 insertions(+), 97 deletions(-) diff --git a/dev/mvt-android b/dev/mvt-android index 4ac6a2f..bd1ef58 100755 --- a/dev/mvt-android +++ b/dev/mvt-android @@ -10,4 +10,5 @@ import sys sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from mvt import android + android.cli() diff --git a/dev/mvt-ios b/dev/mvt-ios index ab89c1e..70a016e 100755 --- a/dev/mvt-ios +++ b/dev/mvt-ios @@ -10,4 +10,5 @@ import sys sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from mvt import ios + ios.cli() diff --git a/mvt/android/cli.py b/mvt/android/cli.py index e7aaa2d..50c3762 100644 --- a/mvt/android/cli.py +++ b/mvt/android/cli.py @@ -3,15 +3,17 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os -import sys -import click import argparse import logging +import os +import sys + +import click from rich.logging import RichHandler -from mvt.common.module import run_module, save_timeline from mvt.common.indicators import Indicators +from mvt.common.module import run_module, save_timeline + from .download_apks import DownloadAPKs from .lookups.koodous import koodous_lookup from .lookups.virustotal import virustotal_lookup diff --git a/mvt/android/download_apks.py b/mvt/android/download_apks.py index 6213ef9..e2855f6 100644 --- a/mvt/android/download_apks.py +++ b/mvt/android/download_apks.py @@ -3,13 +3,15 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import json import logging +import os + import pkg_resources from tqdm import tqdm from mvt.common.utils import get_sha256_from_file_path + from .modules.adb.base import AndroidExtraction log = logging.getLogger(__name__) diff --git a/mvt/android/lookups/koodous.py b/mvt/android/lookups/koodous.py index 78f5c0f..7fb94e9 100644 --- a/mvt/android/lookups/koodous.py +++ b/mvt/android/lookups/koodous.py @@ -3,13 +3,13 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import requests import logging -from rich.text import Text -from rich.table import Table -from rich.progress import track +import requests from rich.console import Console +from rich.progress import track +from rich.table import Table +from rich.text import Text log = logging.getLogger(__name__) diff --git a/mvt/android/lookups/virustotal.py b/mvt/android/lookups/virustotal.py index eaac727..d1f4440 100644 --- a/mvt/android/lookups/virustotal.py +++ b/mvt/android/lookups/virustotal.py @@ -3,12 +3,13 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import requests import logging -from rich.text import Text -from rich.table import Table -from rich.progress import track + +import requests from rich.console import Console +from rich.progress import track +from rich.table import Table +from rich.text import Text log = logging.getLogger(__name__) diff --git a/mvt/android/modules/adb/__init__.py b/mvt/android/modules/adb/__init__.py index ddca6b4..175d81e 100644 --- a/mvt/android/modules/adb/__init__.py +++ b/mvt/android/modules/adb/__init__.py @@ -7,11 +7,11 @@ from .chrome_history import ChromeHistory from .dumpsys_batterystats import DumpsysBatterystats from .dumpsys_packages import DumpsysPackages from .dumpsys_procstats import DumpsysProcstats +from .packages import Packages from .processes import Processes +from .rootbinaries import RootBinaries from .sms import SMS from .whatsapp import Whatsapp -from .packages import Packages -from .rootbinaries import RootBinaries ADB_MODULES = [ChromeHistory, SMS, Whatsapp, Processes, DumpsysBatterystats, DumpsysProcstats, diff --git a/mvt/android/modules/adb/base.py b/mvt/android/modules/adb/base.py index aa0c0a7..92853a9 100644 --- a/mvt/android/modules/adb/base.py +++ b/mvt/android/modules/adb/base.py @@ -3,18 +3,19 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE +import logging import os import random import string import sys -import time -import logging import tempfile +import time + from adb_shell.adb_device import AdbDeviceUsb from adb_shell.auth.keygen import keygen, write_public_keyfile from adb_shell.auth.sign_pythonrsa import PythonRSASigner -from adb_shell.exceptions import DeviceAuthError, AdbCommandFailureException -from usb1 import USBErrorBusy, USBErrorAccess +from adb_shell.exceptions import AdbCommandFailureException, DeviceAuthError +from usb1 import USBErrorAccess, USBErrorBusy from mvt.common.module import MVTModule diff --git a/mvt/android/modules/adb/chrome_history.py b/mvt/android/modules/adb/chrome_history.py index 6b223d2..211130d 100644 --- a/mvt/android/modules/adb/chrome_history.py +++ b/mvt/android/modules/adb/chrome_history.py @@ -3,11 +3,12 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE +import logging import os import sqlite3 -import logging -from mvt.common.utils import convert_chrometime_to_unix, convert_timestamp_to_iso +from mvt.common.utils import (convert_chrometime_to_unix, + convert_timestamp_to_iso) from .base import AndroidExtraction diff --git a/mvt/android/modules/adb/dumpsys_batterystats.py b/mvt/android/modules/adb/dumpsys_batterystats.py index ad90027..d272af8 100644 --- a/mvt/android/modules/adb/dumpsys_batterystats.py +++ b/mvt/android/modules/adb/dumpsys_batterystats.py @@ -3,8 +3,8 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import logging +import os from .base import AndroidExtraction diff --git a/mvt/android/modules/adb/dumpsys_packages.py b/mvt/android/modules/adb/dumpsys_packages.py index 45fbf68..7324e44 100644 --- a/mvt/android/modules/adb/dumpsys_packages.py +++ b/mvt/android/modules/adb/dumpsys_packages.py @@ -3,8 +3,8 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import logging +import os from .base import AndroidExtraction diff --git a/mvt/android/modules/adb/dumpsys_procstats.py b/mvt/android/modules/adb/dumpsys_procstats.py index 416f01f..051762c 100644 --- a/mvt/android/modules/adb/dumpsys_procstats.py +++ b/mvt/android/modules/adb/dumpsys_procstats.py @@ -3,8 +3,8 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import logging +import os from .base import AndroidExtraction diff --git a/mvt/android/modules/adb/packages.py b/mvt/android/modules/adb/packages.py index dcdc375..a28b2b7 100644 --- a/mvt/android/modules/adb/packages.py +++ b/mvt/android/modules/adb/packages.py @@ -3,8 +3,9 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import logging +import os + import pkg_resources from .base import AndroidExtraction diff --git a/mvt/android/modules/adb/rootbinaries.py b/mvt/android/modules/adb/rootbinaries.py index b591603..babce47 100644 --- a/mvt/android/modules/adb/rootbinaries.py +++ b/mvt/android/modules/adb/rootbinaries.py @@ -3,8 +3,9 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import logging +import os + import pkg_resources from .base import AndroidExtraction diff --git a/mvt/android/modules/adb/sms.py b/mvt/android/modules/adb/sms.py index dcaccac..c5d491e 100644 --- a/mvt/android/modules/adb/sms.py +++ b/mvt/android/modules/adb/sms.py @@ -3,12 +3,13 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE +import logging import os import sqlite3 -import logging + +from mvt.common.utils import check_for_links, convert_timestamp_to_iso from .base import AndroidExtraction -from mvt.common.utils import convert_timestamp_to_iso, check_for_links log = logging.getLogger(__name__) diff --git a/mvt/android/modules/adb/whatsapp.py b/mvt/android/modules/adb/whatsapp.py index f8eacbd..3345072 100644 --- a/mvt/android/modules/adb/whatsapp.py +++ b/mvt/android/modules/adb/whatsapp.py @@ -3,13 +3,14 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE +import base64 +import logging import os import sqlite3 -import logging -import base64 + +from mvt.common.utils import check_for_links, convert_timestamp_to_iso from .base import AndroidExtraction -from mvt.common.utils import convert_timestamp_to_iso, check_for_links log = logging.getLogger(__name__) diff --git a/mvt/android/modules/backup/sms.py b/mvt/android/modules/backup/sms.py index 86cc54b..5426498 100644 --- a/mvt/android/modules/backup/sms.py +++ b/mvt/android/modules/backup/sms.py @@ -3,13 +3,13 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import json +import os import zlib from mvt.common.module import MVTModule -from mvt.common.utils import check_for_links -from mvt.common.utils import convert_timestamp_to_iso +from mvt.common.utils import check_for_links, convert_timestamp_to_iso + class SMS(MVTModule): diff --git a/mvt/common/indicators.py b/mvt/common/indicators.py index 9532295..8ca747d 100644 --- a/mvt/common/indicators.py +++ b/mvt/common/indicators.py @@ -3,11 +3,12 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import json +import os from .url import URL + class Indicators: """This class is used to parse indicators from a STIX2 file and provide functions to compare extracted artifacts to the indicators. diff --git a/mvt/common/module.py b/mvt/common/module.py index cf391e3..2975812 100644 --- a/mvt/common/module.py +++ b/mvt/common/module.py @@ -3,16 +3,18 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import io -import os -import re import csv import glob +import io import logging +import os +import re + import simplejson as json from .indicators import Indicators + class DatabaseNotFoundError(Exception): pass diff --git a/mvt/common/options.py b/mvt/common/options.py index bc0842b..794c704 100644 --- a/mvt/common/options.py +++ b/mvt/common/options.py @@ -5,7 +5,8 @@ # From: https://gist.github.com/stanchan/bce1c2d030c76fe9223b5ff6ad0f03db -from click import command, option, Option, UsageError +from click import Option, UsageError, command, option + class MutuallyExclusiveOption(Option): """This class extends click to support mutually exclusive options. diff --git a/mvt/common/utils.py b/mvt/common/utils.py index 6805704..b3061b9 100644 --- a/mvt/common/utils.py +++ b/mvt/common/utils.py @@ -3,10 +3,11 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os -import re import datetime import hashlib +import os +import re + def convert_mactime_to_unix(timestamp, from_2001=True): """Converts Mac Standard Time to a Unix timestamp. diff --git a/mvt/ios/cli.py b/mvt/ios/cli.py index 3e265bf..22a2981 100644 --- a/mvt/ios/cli.py +++ b/mvt/ios/cli.py @@ -4,16 +4,17 @@ # https://github.com/mvt-project/mvt/blob/main/LICENSE import errno +import logging import os import sys -import click import tarfile -import logging + +import click from rich.logging import RichHandler +from mvt.common.indicators import Indicators from mvt.common.module import run_module, save_timeline from mvt.common.options import MutuallyExclusiveOption -from mvt.common.indicators import Indicators from .decrypt import DecryptBackup from .modules.fs import BACKUP_MODULES, FS_MODULES diff --git a/mvt/ios/decrypt.py b/mvt/ios/decrypt.py index 7b1acb0..385a3a9 100644 --- a/mvt/ios/decrypt.py +++ b/mvt/ios/decrypt.py @@ -3,11 +3,12 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE +import binascii +import logging import os import shutil import sqlite3 -import logging -import binascii + from iOSbackup import iOSbackup log = logging.getLogger(__name__) diff --git a/mvt/ios/modules/fs/__init__.py b/mvt/ios/modules/fs/__init__.py index 1c72e74..94620f3 100644 --- a/mvt/ios/modules/fs/__init__.py +++ b/mvt/ios/modules/fs/__init__.py @@ -3,32 +3,32 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -from .manifest import Manifest -from .contacts import Contacts -from .net_netusage import Netusage -from .net_datausage import Datausage -from .safari_history import SafariHistory -from .safari_favicon import SafariFavicon -from .safari_browserstate import SafariBrowserState -from .webkit_indexeddb import WebkitIndexedDB -from .webkit_localstorage import WebkitLocalStorage -from .webkit_safariviewservice import WebkitSafariViewService -from .webkit_session_resource_log import WebkitSessionResourceLog -from .webkit_resource_load_statistics import WebkitResourceLoadStatistics -from .chrome_history import ChromeHistory +from .cache_files import CacheFiles +from .calls import Calls from .chrome_favicon import ChromeFavicon -from .firefox_history import FirefoxHistory +from .chrome_history import ChromeHistory +from .contacts import Contacts +from .filesystem import Filesystem from .firefox_favicon import FirefoxFavicon -from .version_history import IOSVersionHistory +from .firefox_history import FirefoxHistory from .idstatuscache import IDStatusCache -from .locationd import LocationdClients from .interactionc import InteractionC +from .locationd import LocationdClients +from .manifest import Manifest +from .net_datausage import Datausage +from .net_netusage import Netusage +from .safari_browserstate import SafariBrowserState +from .safari_favicon import SafariFavicon +from .safari_history import SafariHistory from .sms import SMS from .sms_attachments import SMSAttachments -from .calls import Calls +from .version_history import IOSVersionHistory +from .webkit_indexeddb import WebkitIndexedDB +from .webkit_localstorage import WebkitLocalStorage +from .webkit_resource_load_statistics import WebkitResourceLoadStatistics +from .webkit_safariviewservice import WebkitSafariViewService +from .webkit_session_resource_log import WebkitSessionResourceLog from .whatsapp import Whatsapp -from .cache_files import CacheFiles -from .filesystem import Filesystem BACKUP_MODULES = [SafariBrowserState, SafariHistory, Datausage, SMS, SMSAttachments, ChromeHistory, ChromeFavicon, WebkitSessionResourceLog, diff --git a/mvt/ios/modules/fs/base.py b/mvt/ios/modules/fs/base.py index c0dcee3..a93a770 100644 --- a/mvt/ios/modules/fs/base.py +++ b/mvt/ios/modules/fs/base.py @@ -3,15 +3,16 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE +import glob import io import os -import glob import shutil import sqlite3 import subprocess -from mvt.common.module import MVTModule -from mvt.common.module import DatabaseNotFoundError, DatabaseCorruptedError +from mvt.common.module import (DatabaseCorruptedError, DatabaseNotFoundError, + MVTModule) + class IOSExtraction(MVTModule): """This class provides a base for all iOS filesystem/backup extraction modules.""" diff --git a/mvt/ios/modules/fs/cache_files.py b/mvt/ios/modules/fs/cache_files.py index ef35931..eff3421 100644 --- a/mvt/ios/modules/fs/cache_files.py +++ b/mvt/ios/modules/fs/cache_files.py @@ -8,6 +8,7 @@ import sqlite3 from .base import IOSExtraction + class CacheFiles(IOSExtraction): def __init__(self, file_path=None, base_folder=None, output_folder=None, diff --git a/mvt/ios/modules/fs/calls.py b/mvt/ios/modules/fs/calls.py index 2ed3de5..974fcb2 100644 --- a/mvt/ios/modules/fs/calls.py +++ b/mvt/ios/modules/fs/calls.py @@ -6,6 +6,7 @@ import sqlite3 from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso + from .base import IOSExtraction CALLS_BACKUP_IDS = [ diff --git a/mvt/ios/modules/fs/chrome_favicon.py b/mvt/ios/modules/fs/chrome_favicon.py index 666e7c8..dc50b8a 100644 --- a/mvt/ios/modules/fs/chrome_favicon.py +++ b/mvt/ios/modules/fs/chrome_favicon.py @@ -5,7 +5,8 @@ import sqlite3 -from mvt.common.utils import convert_chrometime_to_unix, convert_timestamp_to_iso +from mvt.common.utils import (convert_chrometime_to_unix, + convert_timestamp_to_iso) from .base import IOSExtraction diff --git a/mvt/ios/modules/fs/chrome_history.py b/mvt/ios/modules/fs/chrome_history.py index 557b196..39a878a 100644 --- a/mvt/ios/modules/fs/chrome_history.py +++ b/mvt/ios/modules/fs/chrome_history.py @@ -5,7 +5,8 @@ import sqlite3 -from mvt.common.utils import convert_chrometime_to_unix, convert_timestamp_to_iso +from mvt.common.utils import (convert_chrometime_to_unix, + convert_timestamp_to_iso) from .base import IOSExtraction diff --git a/mvt/ios/modules/fs/filesystem.py b/mvt/ios/modules/fs/filesystem.py index fc170f6..6198516 100644 --- a/mvt/ios/modules/fs/filesystem.py +++ b/mvt/ios/modules/fs/filesystem.py @@ -3,13 +3,14 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import datetime +import os from mvt.common.utils import convert_timestamp_to_iso from .base import IOSExtraction + class Filesystem(IOSExtraction): """This module extracts creation and modification date of files from a full file-system dump.""" diff --git a/mvt/ios/modules/fs/firefox_favicon.py b/mvt/ios/modules/fs/firefox_favicon.py index ad0c09d..225c7a6 100644 --- a/mvt/ios/modules/fs/firefox_favicon.py +++ b/mvt/ios/modules/fs/firefox_favicon.py @@ -4,8 +4,8 @@ # https://github.com/mvt-project/mvt/blob/main/LICENSE import sqlite3 - from datetime import datetime + from mvt.common.url import URL from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso diff --git a/mvt/ios/modules/fs/firefox_history.py b/mvt/ios/modules/fs/firefox_history.py index 8d9bff9..d6dcfcd 100644 --- a/mvt/ios/modules/fs/firefox_history.py +++ b/mvt/ios/modules/fs/firefox_history.py @@ -4,8 +4,8 @@ # https://github.com/mvt-project/mvt/blob/main/LICENSE import sqlite3 - from datetime import datetime + from mvt.common.url import URL from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso diff --git a/mvt/ios/modules/fs/idstatuscache.py b/mvt/ios/modules/fs/idstatuscache.py index b447e58..443b623 100644 --- a/mvt/ios/modules/fs/idstatuscache.py +++ b/mvt/ios/modules/fs/idstatuscache.py @@ -3,10 +3,11 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os -import glob -import biplist import collections +import glob +import os + +import biplist from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso diff --git a/mvt/ios/modules/fs/locationd.py b/mvt/ios/modules/fs/locationd.py index 799bb36..62fcd77 100644 --- a/mvt/ios/modules/fs/locationd.py +++ b/mvt/ios/modules/fs/locationd.py @@ -3,8 +3,9 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import glob +import os + import biplist from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso diff --git a/mvt/ios/modules/fs/manifest.py b/mvt/ios/modules/fs/manifest.py index 64484ec..67b38a7 100644 --- a/mvt/ios/modules/fs/manifest.py +++ b/mvt/ios/modules/fs/manifest.py @@ -3,16 +3,18 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE +import datetime import io import os -import biplist import sqlite3 -import datetime + +import biplist from mvt.common.utils import convert_timestamp_to_iso from .base import IOSExtraction + class Manifest(IOSExtraction): """This module extracts information from a backup Manifest.db file.""" diff --git a/mvt/ios/modules/fs/net_base.py b/mvt/ios/modules/fs/net_base.py index 01c385c..c9b1dd6 100644 --- a/mvt/ios/modules/fs/net_base.py +++ b/mvt/ios/modules/fs/net_base.py @@ -3,14 +3,15 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import sqlite3 import operator +import sqlite3 from pathlib import Path from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso from .base import IOSExtraction + class NetBase(IOSExtraction): """This class provides a base for DataUsage and NetUsage extraction modules.""" diff --git a/mvt/ios/modules/fs/safari_browserstate.py b/mvt/ios/modules/fs/safari_browserstate.py index 98d6bcb..8e79ce7 100644 --- a/mvt/ios/modules/fs/safari_browserstate.py +++ b/mvt/ios/modules/fs/safari_browserstate.py @@ -4,11 +4,12 @@ # https://github.com/mvt-project/mvt/blob/main/LICENSE import io -import biplist import sqlite3 -from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso -from mvt.common.utils import keys_bytes_to_string +import biplist + +from mvt.common.utils import (convert_mactime_to_unix, + convert_timestamp_to_iso, keys_bytes_to_string) from .base import IOSExtraction diff --git a/mvt/ios/modules/fs/sms.py b/mvt/ios/modules/fs/sms.py index 1208074..b94dbed 100644 --- a/mvt/ios/modules/fs/sms.py +++ b/mvt/ios/modules/fs/sms.py @@ -6,8 +6,8 @@ import sqlite3 from base64 import b64encode -from mvt.common.utils import check_for_links -from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso +from mvt.common.utils import (check_for_links, convert_mactime_to_unix, + convert_timestamp_to_iso) from .base import IOSExtraction diff --git a/mvt/ios/modules/fs/sms_attachments.py b/mvt/ios/modules/fs/sms_attachments.py index 57cb8c1..89f0cf3 100644 --- a/mvt/ios/modules/fs/sms_attachments.py +++ b/mvt/ios/modules/fs/sms_attachments.py @@ -6,8 +6,8 @@ import sqlite3 from base64 import b64encode -from mvt.common.utils import check_for_links -from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso +from mvt.common.utils import (check_for_links, convert_mactime_to_unix, + convert_timestamp_to_iso) from .base import IOSExtraction diff --git a/mvt/ios/modules/fs/version_history.py b/mvt/ios/modules/fs/version_history.py index 70dc054..a9bf2cd 100644 --- a/mvt/ios/modules/fs/version_history.py +++ b/mvt/ios/modules/fs/version_history.py @@ -3,8 +3,8 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import json import datetime +import json from mvt.common.utils import convert_timestamp_to_iso diff --git a/mvt/ios/modules/fs/webkit_base.py b/mvt/ios/modules/fs/webkit_base.py index 2adb717..ff1c8ef 100644 --- a/mvt/ios/modules/fs/webkit_base.py +++ b/mvt/ios/modules/fs/webkit_base.py @@ -3,12 +3,13 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import datetime +import os + +from mvt.common.utils import convert_timestamp_to_iso from .base import IOSExtraction -from mvt.common.utils import convert_timestamp_to_iso class WebkitBase(IOSExtraction): """This class is a base for other WebKit-related modules.""" diff --git a/mvt/ios/modules/fs/webkit_resource_load_statistics.py b/mvt/ios/modules/fs/webkit_resource_load_statistics.py index 2c15c65..4ac91ec 100644 --- a/mvt/ios/modules/fs/webkit_resource_load_statistics.py +++ b/mvt/ios/modules/fs/webkit_resource_load_statistics.py @@ -3,14 +3,14 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE +import datetime import os import sqlite3 -import datetime - -from .base import IOSExtraction from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso +from .base import IOSExtraction + WEBKIT_RESOURCELOADSTATICS_BACKUP_RELPATH = "Library/WebKit/WebsiteData/ResourceLoadStatistics/observations.db" WEBKIT_RESOURCELOADSTATICS_ROOT_PATHS = [ "private/var/mobile/Containers/Data/Application/*/Library/WebKit/WebsiteData/ResourceLoadStatistics/observations.db", diff --git a/mvt/ios/modules/fs/webkit_session_resource_log.py b/mvt/ios/modules/fs/webkit_session_resource_log.py index b8d36ff..5f5f7b3 100644 --- a/mvt/ios/modules/fs/webkit_session_resource_log.py +++ b/mvt/ios/modules/fs/webkit_session_resource_log.py @@ -3,8 +3,9 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import os import glob +import os + import biplist from mvt.common.utils import convert_timestamp_to_iso diff --git a/mvt/ios/modules/fs/whatsapp.py b/mvt/ios/modules/fs/whatsapp.py index fb962bb..afdd9e7 100644 --- a/mvt/ios/modules/fs/whatsapp.py +++ b/mvt/ios/modules/fs/whatsapp.py @@ -3,10 +3,11 @@ # See the file 'LICENSE' for usage and copying permissions, or find a copy at # https://github.com/mvt-project/mvt/blob/main/LICENSE -import sqlite3 import logging +import sqlite3 -from mvt.common.utils import convert_mactime_to_unix, convert_timestamp_to_iso, check_for_links +from mvt.common.utils import (check_for_links, convert_mactime_to_unix, + convert_timestamp_to_iso) from .base import IOSExtraction diff --git a/setup.py b/setup.py index 2768cea..edbf8cc 100755 --- a/setup.py +++ b/setup.py @@ -4,7 +4,8 @@ # https://github.com/mvt-project/mvt/blob/main/LICENSE import os -from setuptools import setup, find_packages + +from setuptools import find_packages, setup __package_name__ = "mvt" __version__ = "1.0.13"