Clean reporting

Author: jvazquez-r7

modules/auxiliary/admin/mssql/mssql_enum_windows_domain_accounts.rb

@@ -92,44 +92,50 @@ def run
     # Get a list of windows users, groups, and computer accounts using SUSER_NAME()
     print_status("Brute forcing #{datastore['FuzzNum']} RIDs through the SQL Server, be patient...")
     win_domain_user_list = get_win_domain_users(windows_domain_sid)
+
+    disconnect
+
     if win_domain_user_list.nil? || win_domain_user_list.empty?
       print_error('Sorry, no Windows domain accounts were found, or DC could not be contacted.')
-      disconnect
       return
-    else
-
-      # Print number of objects found and write to a file
-      print_good("#{win_domain_user_list.length} user accounts, groups, and computer accounts were found.")
+    end
 
-      win_domain_user_list.sort.each do |windows_login|
-        vprint_status(" - #{windows_login}")
-      end
+    # Print number of objects found and write to a file
+    print_good("#{win_domain_user_list.length} user accounts, groups, and computer accounts were found.")
 
-      # Create table for report
-      windows_domain_login_table = Rex::Ui::Text::Table.new(
-        'Header'  => 'Windows Domain Accounts',
-        'Ident'   => 1,
-        'Columns' => ['name']
-      )
+    win_domain_user_list.sort.each do |windows_login|
+      vprint_status(" - #{windows_login}")
+    end
 
-      # Add brute forced names to table
-      win_domain_user_list.each do |object_name|
-        windows_domain_login_table << [object_name]
-      end
+    # Create table for report
+    windows_domain_login_table = Rex::Ui::Text::Table.new(
+      'Header'  => 'Windows Domain Accounts',
+      'Ident'   => 1,
+      'Columns' => ['name']
+    )
 
-      # Create output file
-      this_service = report_service(
-        :host  => rhost,
-        :port => rport,
-        :name => 'mssql',
-        :proto => 'tcp'
-      )
-      filename= "#{datastore['RHOST']}-#{datastore['RPORT']}_windows_domain_accounts.csv"
-      path = store_loot("windows_domain_accounts", "text/plain", datastore['RHOST'], windows_domain_login_table.to_csv, filename, "SQL Server query results",this_service)
-      print_status("Query results have been saved to: #{path}")
+    # Add brute forced names to table
+    win_domain_user_list.each do |object_name|
+      windows_domain_login_table << [object_name]
     end
 
-    disconnect
+    # Create output file
+    this_service = report_service(
+      :host  => rhost,
+      :port => rport,
+      :name => 'mssql',
+      :proto => 'tcp'
+    )
+    file_name = "#{datastore['RHOST']}-#{datastore['RPORT']}_windows_domain_accounts.csv"
+    path = store_loot(
+      'mssql.domain.accounts',
+      'text/plain',
+      datastore['RHOST'],
+      windows_domain_login_table.to_csv,
+      file_name,
+      'Domain Users enumerated through SQL Server',
+      this_service)
+    print_status("Query results have been saved to: #{path}")
   end
 
   # Checks if user is a sysadmin