dploot 2.7.0__tar.gz → 2.7.2__tar.gz

{dploot-2.7.0 → dploot-2.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dploot
-Version: 2.7.0
+Version: 2.7.2
 Summary: DPAPI looting remotely in Python
 Home-page: https://github.com/zblurx/dploot
 License: MIT
@@ -66,18 +66,22 @@ If you don't know what is DPAPI, [check out this post](https://posts.specterops.
 
 ## Installation
 
-You can install dploot directly from PyPI:
+You can install dploot directly from PyPI with [pipx](https://github.com/pypa/pipx):
 
 ```text
-pip install dploot
+pipx install git+https://github.com/zblurx/dploot.git
 ```
 
 OR
 
 ```text
-git clone https://github.com/zblurx/dploot.git
-cd dploot
-make
+pipx install dploot
+```
+
+On [Kali Linux](https://www.kali.org/), you can install dploot from the repositories:
+
+```text
+sudo apt install python3-dploot
 ```
 
 ## Usage
@@ -749,7 +753,7 @@ The **mobaxterm** command will extract MobaXterm secrets and masterpassword key
 With `pvk`:
 
 ```text
-dploot rdg -d waza.local -u jsmith -p 'Password#123' 192.168.56.14 -pvk key.pvk
+dploot mobaxterm -d waza.local -u jsmith -p 'Password#123' 192.168.56.14 -pvk key.pvk
 [*] Connected to 192.168.56.14 as waza.local\jsmith (admin)
 
 [*] Triage ALL USERS masterkeys

{dploot-2.7.0 → dploot-2.7.2}/README.md

@@ -40,18 +40,22 @@ If you don't know what is DPAPI, [check out this post](https://posts.specterops.
 
 ## Installation
 
-You can install dploot directly from PyPI:
+You can install dploot directly from PyPI with [pipx](https://github.com/pypa/pipx):
 
 ```text
-pip install dploot
+pipx install git+https://github.com/zblurx/dploot.git
 ```
 
 OR
 
 ```text
-git clone https://github.com/zblurx/dploot.git
-cd dploot
-make
+pipx install dploot
+```
+
+On [Kali Linux](https://www.kali.org/), you can install dploot from the repositories:
+
+```text
+sudo apt install python3-dploot
 ```
 
 ## Usage
@@ -723,7 +727,7 @@ The **mobaxterm** command will extract MobaXterm secrets and masterpassword key
 With `pvk`:
 
 ```text
-dploot rdg -d waza.local -u jsmith -p 'Password#123' 192.168.56.14 -pvk key.pvk
+dploot mobaxterm -d waza.local -u jsmith -p 'Password#123' 192.168.56.14 -pvk key.pvk
 [*] Connected to 192.168.56.14 as waza.local\jsmith (admin)
 
 [*] Triage ALL USERS masterkeys

{dploot-2.7.0 → dploot-2.7.2}/dploot/triage/masterkeys.py

@@ -41,7 +41,7 @@ class MasterkeysTriage:
     system_masterkeys_generic_path = 'Windows\\System32\\Microsoft\\Protect'
     share = 'C$'
 
-    def __init__(self, target: Target, conn: DPLootSMBConnection, pvkbytes: bytes = None, passwords: Dict[str,str] = None, nthashes: Dict[str,str] = None, dpapiSystem: Dict[str,str] = {}) -> None:
+    def __init__(self, target: Target, conn: DPLootSMBConnection, pvkbytes: bytes = None, passwords: Dict[str,str] = None, nthashes: Dict[str,str] = None, dpapiSystem: Dict[str,str] = None) -> None:
         self.target = target
         self.conn = conn
         self.pvkbytes = pvkbytes
@@ -51,6 +51,8 @@ class MasterkeysTriage:
         self._users = None
         self.looted_files = dict()
         self.dpapiSystem = dpapiSystem
+        if self.dpapiSystem is None:
+            self.dpapiSystem = {}
         # should be {"MachineKey":"key","Userkey":"key"}
 
     def triage_system_masterkeys(self) -> List[Masterkey]:

{dploot-2.7.0 → dploot-2.7.2}/dploot/triage/mobaxterm.py

@@ -105,7 +105,7 @@ class MobaXtermTriage:
         self._users = None
         self.masterkeys = masterkeys
 
-    def triage_mobaxterm(self) -> Tuple[List[MobaXtermMasterPassword], List[MobaXtermCredential | MobaXtermPassword]]:
+    def triage_mobaxterm(self) -> Tuple[List[MobaXtermMasterPassword], List["MobaXtermCredential | MobaXtermPassword"]]:
         logging.getLogger("impacket").disabled = True
         mobaxterm_credentials = []
         mobaxterm_masterpassword_key = []
@@ -122,7 +122,7 @@ class MobaXtermTriage:
                     logging.debug(str(e))
         return mobaxterm_masterpassword_key, mobaxterm_credentials
     
-    def triage_mobaxterm_for_user(self, user: str, sid: str = None) -> Tuple[MobaXtermMasterPassword, List[MobaXtermCredential | MobaXtermPassword]]:
+    def triage_mobaxterm_for_user(self, user: str, sid: str = None) -> Tuple[MobaXtermMasterPassword, List["MobaXtermCredential | MobaXtermPassword"]]:
         mobaxterm_masterpassword = None
         mobaxterm_credentials = []
         try:
@@ -153,7 +153,7 @@ class MobaXtermTriage:
 
         return mobaxterm_masterpassword, mobaxterm_credentials
 
-    def extract_mobaxtermkeys_for_user_from_ntuser_dat(self, ntuser_dat_filename: str, user: str) -> Tuple[MobaXtermMasterPassword, List[MobaXtermCredential | MobaXtermPassword]]:
+    def extract_mobaxtermkeys_for_user_from_ntuser_dat(self, ntuser_dat_filename: str, user: str) -> Tuple[MobaXtermMasterPassword, List["MobaXtermCredential | MobaXtermPassword"]]:
         reg = winregistry.Registry(ntuser_dat_filename, isRemote=False)
         parent_key = reg.findKey(self.mobaxterm_registry_key_path)
         if parent_key is None:
@@ -239,10 +239,10 @@ class MobaXtermTriage:
             mobaxterm_masterpassword.entropy = entropy
         mobaxterm_masterpassword.decrypt_masterpassword_raw_value(masterkeys=self.masterkeys)
     
-    def decrypt_mobaxterm_password(self, mobaxterm_password: MobaXtermCredential|MobaXtermPassword, mobaxterm_masterpassword: MobaXtermMasterPassword) -> None:
+    def decrypt_mobaxterm_password(self, mobaxterm_password: "MobaXtermCredential|MobaXtermPassword", mobaxterm_masterpassword: MobaXtermMasterPassword) -> None:
         mobaxterm_password.decrypt(masterpassword_key=mobaxterm_masterpassword.masterpassword_decrypted)
     
-    def extract_mobaxtermkeys_for_user_from_remote_registry(self, user: str, sid: str) -> Tuple[MobaXtermMasterPassword, List[MobaXtermCredential | MobaXtermPassword]]:
+    def extract_mobaxtermkeys_for_user_from_remote_registry(self, user: str, sid: str) -> Tuple[MobaXtermMasterPassword, List["MobaXtermCredential | MobaXtermPassword"]]:
         self.conn.enable_remoteops()
 
         entropy = None

{dploot-2.7.0 → dploot-2.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dploot"
-version = "2.7.0"
+version = "2.7.2"
 description = "DPAPI looting remotely in Python"
 readme = "README.md"
 homepage = "https://github.com/zblurx/dploot"