dploot 2.7.1__tar.gz → 2.7.3__tar.gz

{dploot-2.7.1 → dploot-2.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dploot
-Version: 2.7.1
+Version: 2.7.3
 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.1 → dploot-2.7.3}/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.1 → dploot-2.7.3}/dploot/action/masterkeys.py

@@ -77,7 +77,9 @@ def entry(options: argparse.Namespace) -> None:
     a.run()
 
 def parse_masterkeys_options(options: argparse.Namespace, target: Target) -> Tuple[bytes,Dict[str,str],Dict[str,str]]:
-    pvkbytes = passwords = nthashes = None
+    pvkbytes = None
+    passwords = {}
+    nthashes = {}
     if hasattr(options,'pvk') and options.pvk is not None:
         try:
             pvkbytes = open(options.pvk, 'rb').read()
@@ -98,16 +100,12 @@ def parse_masterkeys_options(options: argparse.Namespace, target: Target) -> Tup
         except Exception as e:
             logging.error(str(e))
             sys.exit(1)
+    if target.username:
+        if target.password != '':
+            passwords[target.username] = target.password
 
-    if target.password != '':
-        if passwords is None:
-            passwords = dict()
-        passwords[target.username] = target.password
-
-    if target.nthash != '':
-        if nthashes is None:
-            nthashes = dict()
-        nthashes[target.username] = target.nthash.lower()
+        if target.nthash != '':
+            nthashes[target.username] = target.nthash.lower()
 
     if nthashes is not None:
         nthashes = {k.lower():v.lower() for k, v in nthashes.items()}

{dploot-2.7.1 → dploot-2.7.3}/dploot/lib/smb.py

@@ -71,9 +71,9 @@ class DPLootSMBConnection:
                     if "STATUS_NOT_SUPPORTED" in str(e):
                         no_ntlm = True
                     pass
-                hostname = self.smb_session.getServerName() if not no_ntlm else self.target.address
+                hostname = self.smb_session.getServerDNSHostName() if not no_ntlm else self.target.address
                 self.smb_session.close()
-                self.target.address = hostname + "." + self.target.domain
+                self.target.address = hostname
                 logging.debug("Connecting to %s" % self.target.address)
                 if not self.create_conn_obj(self.target.address):
                     return None
@@ -88,6 +88,7 @@ class DPLootSMBConnection:
                     kdcHost=self.target.kdcHost,
                     useCache=self.target.use_kcache,
                     )
+                self.target.username = self.smb_session.getCredentials()[0]
             else:
                 logging.debug("Connecting to %s" % self.target.address)
                 if not self.create_conn_obj():

{dploot-2.7.1 → dploot-2.7.3}/dploot/lib/target.py

@@ -53,7 +53,7 @@ class Target:
             options.dc_ip = options.target
 
         self.domain = domain
-        self.username = username
+        self.username = username if username is not None else ""
         self.password = password
         self.address = options.target
         self.lmhash = lmhash
@@ -68,7 +68,7 @@ class Target:
 
     @staticmethod
     def create(domain: str = None,
-        username: str = None,
+        username: str = "",
         password: str = None,
         target: str = None,
         hashes: str = None,

{dploot-2.7.1 → dploot-2.7.3}/dploot/triage/certificates.py

@@ -210,6 +210,7 @@ class CertificatesTriage:
                 logging.debug("Found match between %s certificate and %s private key !" % (name, pkey[0]))
                 key = load_der_private_key(pkey[1].export_key('DER'), password=None)
                 pfx = self.create_pfx(key=key,cert=cert)
+                # TODO CAN BE NULL self.get_id_from_certificate(certificate=cert)[1]
                 username = self.get_id_from_certificate(certificate=cert)[1].replace('@','_')
                 clientauth = False
                 for i in cert.extensions.get_extension_for_oid(oid=ExtensionOID.EXTENDED_KEY_USAGE).value:
@@ -255,7 +256,7 @@ class CertificatesTriage:
         except Exception:
             pass
 
-        return None, None
+        return "", "SAN not found"
 
     @property
     def users(self) -> List[str]:

{dploot-2.7.1 → dploot-2.7.3}/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.1 → dploot-2.7.3}/pyproject.toml

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