Output Function - turn strict off (#207)

* proof of concept of an output depth parameter * remove output depth and instead allow arbitrary input for output function * revert * revert
BC-SECURITY · Aug 26, 2021 · b9e49e4 · b9e49e4
1 parent bd5b388
commit b9e49e4
Show file tree

Hide file tree

Showing 91 changed files with 92 additions and 92 deletions.
diff --git a/empire/server/common/modules.py b/empire/server/common/modules.py
@@ -249,7 +249,7 @@ def _generate_script_powershell(self, module: PydanticModule, params: Dict, obfu
         option_strings = []
         # This is where the code goes for all the modules that do not have a custom generate function.
         for key, value in params.items():
-            if key.lower() != "agent" and key.lower() != "computername" and key.lower() != "outputfunction":
+            if key.lower() not in ["agent", "computername", "outputfunction"]:
                 if value and value != '':
                     if value.lower() == "true":
                         # if we're just adding a switch

diff --git a/empire/server/modules/powershell/collection/get_sql_column_sample_data.yaml b/empire/server/modules/powershell/collection/get_sql_column_sample_data.yaml
@@ -44,7 +44,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/collection/vaults/add_keepass_config_trigger.yaml b/empire/server/modules/powershell/collection/vaults/add_keepass_config_trigger.yaml
@@ -37,7 +37,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/collection/vaults/find_keepass_config.yaml b/empire/server/modules/powershell/collection/vaults/find_keepass_config.yaml
@@ -24,7 +24,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/collection/vaults/get_keepass_config_trigger.yaml b/empire/server/modules/powershell/collection/vaults/get_keepass_config_trigger.yaml
@@ -24,7 +24,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/collection/vaults/keethief.yaml b/empire/server/modules/powershell/collection/vaults/keethief.yaml
@@ -24,7 +24,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/collection/vaults/remove_keepass_config_trigger.yaml b/empire/server/modules/powershell/collection/vaults/remove_keepass_config_trigger.yaml
@@ -23,7 +23,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/credentials/get_lapspasswords.yaml b/empire/server/modules/powershell/credentials/get_lapspasswords.yaml
@@ -23,7 +23,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/credentials/invoke_kerberoast.yaml b/empire/server/modules/powershell/credentials/invoke_kerberoast.yaml
@@ -61,7 +61,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/credentials/tokens.yaml b/empire/server/modules/powershell/credentials/tokens.yaml
@@ -70,7 +70,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/credentials/vault_credential.yaml b/empire/server/modules/powershell/credentials/vault_credential.yaml
@@ -23,7 +23,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/lateral_movement/invoke_psexec.yaml b/empire/server/modules/powershell/lateral_movement/invoke_psexec.yaml
@@ -71,7 +71,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/lateral_movement/invoke_smbexec.yaml b/empire/server/modules/powershell/lateral_movement/invoke_smbexec.yaml
@@ -85,7 +85,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/management/downgrade_account.yaml b/empire/server/modules/powershell/management/downgrade_account.yaml
@@ -39,7 +39,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/management/mailraider/disable_security.yaml b/empire/server/modules/powershell/management/mailraider/disable_security.yaml
@@ -41,7 +41,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/management/mailraider/get_emailitems.yaml b/empire/server/modules/powershell/management/mailraider/get_emailitems.yaml
@@ -31,7 +31,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/management/mailraider/get_subfolders.yaml b/empire/server/modules/powershell/management/mailraider/get_subfolders.yaml
@@ -27,7 +27,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/management/mailraider/mail_search.yaml b/empire/server/modules/powershell/management/mailraider/mail_search.yaml
@@ -48,7 +48,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/management/mailraider/search_gal.yaml b/empire/server/modules/powershell/management/mailraider/search_gal.yaml
@@ -44,7 +44,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/management/mailraider/send_mail.yaml b/empire/server/modules/powershell/management/mailraider/send_mail.yaml
@@ -54,7 +54,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/management/mailraider/view_email.yaml b/empire/server/modules/powershell/management/mailraider/view_email.yaml
@@ -32,7 +32,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/management/phant0m.yaml b/empire/server/modules/powershell/management/phant0m.yaml
@@ -23,7 +23,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/management/timestomp.yaml b/empire/server/modules/powershell/management/timestomp.yaml
@@ -46,7 +46,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/persistence/misc/add_netuser.yaml b/empire/server/modules/powershell/persistence/misc/add_netuser.yaml
@@ -43,7 +43,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/persistence/misc/get_ssps.yaml b/empire/server/modules/powershell/persistence/misc/get_ssps.yaml
@@ -22,7 +22,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/getsystem.yaml b/empire/server/modules/powershell/privesc/getsystem.yaml
@@ -47,7 +47,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/gpp.yaml b/empire/server/modules/powershell/privesc/gpp.yaml
@@ -23,7 +23,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/mcafee_sitelist.yaml b/empire/server/modules/powershell/privesc/mcafee_sitelist.yaml
@@ -23,7 +23,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/powerup/allchecks.yaml b/empire/server/modules/powershell/privesc/powerup/allchecks.yaml
@@ -27,7 +27,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/powerup/find_dllhijack.yaml b/empire/server/modules/powershell/privesc/powerup/find_dllhijack.yaml
@@ -40,7 +40,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/powerup/service_exe_restore.yaml b/empire/server/modules/powershell/privesc/powerup/service_exe_restore.yaml
@@ -35,7 +35,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/powerup/service_exe_useradd.yaml b/empire/server/modules/powershell/privesc/powerup/service_exe_useradd.yaml
@@ -44,7 +44,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/powerup/service_useradd.yaml b/empire/server/modules/powershell/privesc/powerup/service_useradd.yaml
@@ -44,7 +44,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/powerup/write_dllhijacker.yaml b/empire/server/modules/powershell/privesc/powerup/write_dllhijacker.yaml
@@ -66,7 +66,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/privesccheck.yaml b/empire/server/modules/powershell/privesc/privesccheck.yaml
@@ -30,7 +30,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/privesc/sherlock.yaml b/empire/server/modules/powershell/privesc/sherlock.yaml
@@ -22,7 +22,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/recon/find_fruit.yaml b/empire/server/modules/powershell/recon/find_fruit.yaml
@@ -55,7 +55,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/recon/http_login.yaml b/empire/server/modules/powershell/recon/http_login.yaml
@@ -58,7 +58,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/situational_awareness/host/antivirusproduct.yaml b/empire/server/modules/powershell/situational_awareness/host/antivirusproduct.yaml
@@ -27,7 +27,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/situational_awareness/host/applockerstatus.yaml b/empire/server/modules/powershell/situational_awareness/host/applockerstatus.yaml
@@ -33,7 +33,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/situational_awareness/host/computerdetails.yaml b/empire/server/modules/powershell/situational_awareness/host/computerdetails.yaml
@@ -47,7 +47,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/situational_awareness/host/dnsserver.yaml b/empire/server/modules/powershell/situational_awareness/host/dnsserver.yaml
@@ -23,7 +23,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/situational_awareness/host/findtrusteddocuments.yaml b/empire/server/modules/powershell/situational_awareness/host/findtrusteddocuments.yaml
@@ -25,7 +25,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json

diff --git a/empire/server/modules/powershell/situational_awareness/host/get_pathacl.yaml b/empire/server/modules/powershell/situational_awareness/host/get_pathacl.yaml
@@ -26,7 +26,7 @@ options:
     description: PowerShell's output function to use ("Out-String", "ConvertTo-Json", "ConvertTo-Csv", "ConvertTo-Html", "ConvertTo-Xml").
     required: false
     value: 'Out-String'
-    strict: true
+    strict: false
     suggested_values:
       - Out-String
       - ConvertTo-Json