Add description to output

Author: NeffIsBack

nxc/data/veeam_dump_module/veeam_dump_mssql.ps1

@@ -60,7 +60,9 @@ $rows | ForEach-Object -Process {
 			$pw_string = "COULD_NOT_DECRYPT"
 		}
 	}
+	$_.user = $_.user -replace '\s', 'WHITESPACE_ERROR'
 	$_.password = $pw_string
+	$_.description = $_.description -replace '\s', 'WHITESPACE_ERROR'
 }
 
-Write-Output $rows | Format-Table -HideTableHeaders | Out-String
+Write-Output $output | Format-Table -HideTableHeaders | Out-String -Width 10000

nxc/data/veeam_dump_module/veeam_dump_postgresql.ps1

@@ -42,7 +42,9 @@ $output | ForEach-Object -Process {
 			$pw_string = "COULD_NOT_DECRYPT"
 		}
 	}
+	$_.user = $_.user -replace '\s', 'WHITESPACE_ERROR'
 	$_.password = $pw_string
+	$_.description = $_.description -replace '\s', 'WHITESPACE_ERROR'
 }
 
-Write-Output $output | Format-Table -HideTableHeaders | Out-String
+Write-Output $output | Format-Table -HideTableHeaders | Out-String -Width 10000

nxc/modules/veeam.py

@@ -167,13 +167,19 @@ def printCreds(self, context, output):
         # When powershell returns something else than the usernames and passwords account.split() will throw a ValueError.
         # This is likely an error thrown by powershell, so we print the error and the output for debugging purposes.
         try:
+            context.log.highlight(f"{'Username':<30} {'Password':<30} {'Description'}")
+            context.log.highlight(f"{'--------':<30} {'--------':<30} {'-----------'}")
             for account in output_stripped:
-                user, password = account.split(" ", 1)
-                password = password.strip().replace("WHITESPACE_ERROR", " ")
-                user = user.strip()
-                context.log.highlight(f"{user}:{password}")
-                if " " in password:
-                    context.log.fail(f'Password contains whitespaces! The password for user "{user}" is: "{password}"')
+                # Remove multiple whitespaces
+                account = " ".join(account.split())
+                try:
+                    user, password, description = account.split(" ", 2)
+                except ValueError:
+                    user, password = account.split(" ", 1)
+                user = user.strip().replace("WHITESPACE_ERROR", " ").strip()
+                password = password.strip().replace("WHITESPACE_ERROR", " ").strip()
+                description = description.strip().replace("WHITESPACE_ERROR", " ").strip()
+                context.log.highlight(f"{user:<30} {password:<30} {description}")
         except ValueError:
             context.log.fail(f"Powershell returned unexpected output: {output_stripped}")
             context.log.fail("Please report this issue on GitHub!")