Merge pull request #8 from tabassassin/retab/2212

Retab rapid7#2212

Author: dmaloney-r7

.gitignore

@@ -40,3 +40,5 @@ tags
 *.orig
 *.rej
 *~
+# Ignore backups of retabbed files
+*.notab

modules/post/windows/manage/smart_migrate.rb

@@ -10,62 +10,62 @@
 
 class Metasploit3 < Msf::Post
 
-	def initialize(info={})
-		super( update_info( info,
-			'Name'          => 'Windows Manage Smart Process Migration',
-			'Description'   => %q{ This module will migrate a Meterpreter session.
-				It will first attempt to migrate to winlogon.exe . If that fails it will
-				then look at all of the explorer.exe processes. If there is one that exists
-				for the user context the session is already in it will try that. Failing that it will fall back
-				and try any other explorer.exe processes it finds},
-			'License'       => MSF_LICENSE,
-			'Author'        => [ 'thelightcosine'],
-			'Platform'      => [ 'win' ],
-			'SessionTypes'  => [ 'meterpreter' ]
-		))
+  def initialize(info={})
+    super( update_info( info,
+      'Name'          => 'Windows Manage Smart Process Migration',
+      'Description'   => %q{ This module will migrate a Meterpreter session.
+        It will first attempt to migrate to winlogon.exe . If that fails it will
+        then look at all of the explorer.exe processes. If there is one that exists
+        for the user context the session is already in it will try that. Failing that it will fall back
+        and try any other explorer.exe processes it finds},
+      'License'       => MSF_LICENSE,
+      'Author'        => [ 'thelightcosine'],
+      'Platform'      => [ 'win' ],
+      'SessionTypes'  => [ 'meterpreter' ]
+    ))
 
 
-	end
+  end
 
-	def run
-		server = client.sys.process.open
-		original_pid = server.pid
-		print_status("Current server process: #{server.name} (#{server.pid})")
+  def run
+    server = client.sys.process.open
+    original_pid = server.pid
+    print_status("Current server process: #{server.name} (#{server.pid})")
 
-		uid = client.sys.config.getuid
+    uid = client.sys.config.getuid
 
-		processes = client.sys.process.get_processes
+    processes = client.sys.process.get_processes
 
-		uid_explorer_procs = []
-		explorer_procs = []
-		winlogon_procs = []
-		processes.each do |proc|
-			uid_explorer_procs << proc if proc['name'] == "explorer.exe" and proc["user"] == uid
-			explorer_procs << proc if proc['name'] == "explorer.exe" and proc["user"] != uid
-			winlogon_procs << proc if proc['name'] == "winlogon.exe"
-		end
+    uid_explorer_procs = []
+    explorer_procs = []
+    winlogon_procs = []
+    processes.each do |proc|
+      uid_explorer_procs << proc if proc['name'] == "explorer.exe" and proc["user"] == uid
+      explorer_procs << proc if proc['name'] == "explorer.exe" and proc["user"] != uid
+      winlogon_procs << proc if proc['name'] == "winlogon.exe"
+    end
 
     print_status "Attempting to move into explorer.exe for current user..."
-		uid_explorer_procs.each { |proc| return if attempt_migration(proc['pid']) }
+    uid_explorer_procs.each { |proc| return if attempt_migration(proc['pid']) }
     print_status "Attempting to move into explorer.exe for other users..."
-		explorer_procs.each { |proc| return if attempt_migration(proc['pid']) }
+    explorer_procs.each { |proc| return if attempt_migration(proc['pid']) }
     print_status "Attempting to move into winlogon.exe"
     winlogon_procs.each { |proc| return if attempt_migration(proc['pid']) }
 
-		print_error "Was unable to sucessfully migrate into any of our likely candidates"
-	end
+    print_error "Was unable to sucessfully migrate into any of our likely candidates"
+  end
 
 
-	def attempt_migration(target_pid)
-		begin
-			print_good("Migrating to #{target_pid}")
-			client.core.migrate(target_pid)
-			print_good("Successfully migrated to process #{}")
-			return true
-		rescue ::Exception => e
-			print_error("Could not migrate in to process.")
-			print_error(e.to_s)
-			return false
-		end
-	end
+  def attempt_migration(target_pid)
+    begin
+      print_good("Migrating to #{target_pid}")
+      client.core.migrate(target_pid)
+      print_good("Successfully migrated to process #{}")
+      return true
+    rescue ::Exception => e
+      print_error("Could not migrate in to process.")
+      print_error(e.to_s)
+      return false
+    end
+  end
 end

tools/dev/retab.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+# -*- coding: binary -*-
+
+# Replace leading tabs with 2-width spaces.
+# I'm sure there's a sed/awk/perl oneliner that's
+# a million times better but this is more readable for me.
+
+require 'fileutils'
+require 'find'
+
+dir = ARGV[0] || "."
+raise ArgumentError, "Need a filename or directory" unless (dir and File.readable? dir)
+
+Find.find(dir) do |infile|
+  next unless File.file? infile
+  next unless infile =~ /rb$/
+outfile = infile
+backup = "#{infile}.notab"
+FileUtils.cp infile, backup
+
+data = File.open(infile, "rb") {|f| f.read f.stat.size}
+fixed = []
+data.each_line do |line|
+  fixed << line
+  next unless line =~ /^\x09/
+  index = []
+  i = 0
+  line.each_char do |char|
+    break unless char =~ /[\x20\x09]/
+    index << i if char == "\x09"
+    i += 1
+  end
+  index.reverse.each do |idx|
+    line[idx] = "  "
+  end
+  fixed[-1] = line
+end
+
+fh = File.open(outfile, "wb")
+fh.write fixed.join
+fh.close
+puts "Retabbed #{fh.path}"
+end