Fix load order in posts, hopefully forever

lib/msf/core/exploit/local.rb

@@ -1,9 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/core/post_mixin'
-
-module Msf
-class Exploit
 
 ###
 #
@@ -13,8 +9,9 @@ class Exploit
 # network communication.
 #
 ###
-class Local < Exploit
-	include PostMixin
+class Msf::Exploit::Local < Msf::Exploit
+	require 'msf/core/post_mixin'
+	include Msf::PostMixin
 
 	#
 	# Returns the fact that this exploit is a local exploit.
@@ -23,6 +20,3 @@ class Local < Exploit
 		Exploit::Type::Local
 	end
 end
-
-end
-end

lib/msf/core/post.rb

@@ -1,15 +1,22 @@
 # -*- coding: binary -*-
 
-require 'msf/core/post_mixin'
-
-module Msf
-
 #
 # A Post-exploitation module
 #
-#
-class Post < Msf::Module
-	include PostMixin
+class Msf::Post < Msf::Module
+
+	require 'msf/core/post/common'
+	require 'msf/core/post_mixin'
+
+	require 'msf/core/post/file'
+
+	require 'msf/core/post/linux'
+	require 'msf/core/post/osx'
+	require 'msf/core/post/solaris'
+	require 'msf/core/post/unix'
+	require 'msf/core/post/windows'
+
+	include Msf::PostMixin
 
 	def setup; end
 
@@ -39,6 +46,3 @@ class Post < Msf::Module
 		mod
 	end
 end
-
-end
-

lib/msf/core/post/common.rb

@@ -1,12 +1,6 @@
 # -*- coding: binary -*-
 
-require 'msf/core/post/file'
-
-module Msf
-class Post
-
-module Common
-
+module Msf::Post::Common
 
 	#
 	# Checks if the remote system has a process with ID +pid+
@@ -121,5 +115,3 @@ module Common
 	end
 
 end
-end
-end

lib/msf/core/post/linux.rb

@@ -0,0 +1,4 @@
+module Msf::Post::Linux
+	require 'msf/core/post/linux/priv'
+	require 'msf/core/post/linux/system'
+end

lib/msf/core/post/osx.rb

@@ -0,0 +1,5 @@
+
+module Msf::Post::OSX
+	require 'msf/core/post/osx/system'
+	require 'msf/core/post/osx/ruby_dl'
+end

lib/msf/core/post/osx/system.rb

@@ -1,11 +1,6 @@
 # -*- coding: binary -*-
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 
-module Msf
-class Post
-module OSX
-module System
+module Msf::Post::OSX::System
 	include ::Msf::Post::Common
 	include ::Msf::Post::File
 
@@ -108,7 +103,4 @@ module System
 		end
 		return groups
 	end
-end # System
-end # OSX
-end # Post
-end # Msf
+end

lib/msf/core/post/solaris.rb

@@ -0,0 +1,4 @@
+module Msf::Post::Solaris
+	require 'msf/core/post/solaris/priv'
+	require 'msf/core/post/solaris/system'
+end

lib/msf/core/post/unix.rb

@@ -1,8 +1,6 @@
 # -*- coding: binary -*-
 
-module Msf
-class Post
-module Unix
+module Msf::Post::Unix
 
 	#
 	# Returns an array of hashes each representing a user
@@ -83,6 +81,3 @@ module Unix
 	end
 
 end
-end
-end
-

lib/msf/core/post/windows.rb

@@ -0,0 +1,14 @@
+
+module Msf::Post::Windows
+	require 'msf/core/post/windows/accounts'
+	require 'msf/core/post/windows/cli_parse'
+	require 'msf/core/post/windows/file_info'
+	require 'msf/core/post/windows/powershell'
+	require 'msf/core/post/windows/priv'
+	require 'msf/core/post/windows/process'
+	require 'msf/core/post/windows/railgun'
+	require 'msf/core/post/windows/registry'
+	require 'msf/core/post/windows/services'
+	require 'msf/core/post/windows/shadowcopy'
+	require 'msf/core/post/windows/user_profiles'
+end

lib/msf/core/post/windows/priv.rb

@@ -2,12 +2,7 @@
 
 require 'msf/core/post/windows/accounts'
 
-module Msf
-class Post
-module Windows
-
-module Priv
-
+module Msf::Post::Windows::Priv
 	include ::Msf::Post::Windows::Accounts
 
 	#
@@ -90,7 +85,3 @@ module Priv
 	end
 
 end
-end
-end
-end
-

lib/msf/core/post_mixin.rb

@@ -2,16 +2,15 @@
 require 'msf/core'
 require 'msf/core/module'
 
-module Msf
-
 #
 # A mixin used for providing Modules with post-exploitation options and helper methods
 #
-module PostMixin
+module Msf::PostMixin
 
 	include Msf::Auxiliary::Report
 
 	include Msf::Module::HasActions
+	include Msf::Post::Common
 
 	def initialize(info={})
 		super
@@ -217,5 +216,3 @@ protected
 		end
 	end
 end
-
-end

modules/exploits/freebsd/local/mmap.rb

@@ -6,13 +6,11 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
 
 class Metasploit4 < Msf::Exploit::Local
 	Rank = GreatRanking
 
 	include Msf::Exploit::EXE
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Exploit::FileDropper
 

modules/exploits/linux/local/hp_smhstart.rb

@@ -7,7 +7,6 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
 require 'msf/core/exploit/local/linux'
 require 'msf/core/exploit/exe'
 
@@ -15,7 +14,6 @@ class Metasploit4 < Msf::Exploit::Local
 
 	include Msf::Exploit::EXE
 	include Msf::Post::File
-	include Msf::Post::Common
 
 	include Msf::Exploit::Local::Linux
 

modules/exploits/linux/local/kloxo_lxsuexec.rb

@@ -7,7 +7,6 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
 require 'msf/core/exploit/local/linux'
 require 'msf/core/exploit/exe'
 
@@ -15,7 +14,6 @@ class Metasploit4 < Msf::Exploit::Local
 
 	include Msf::Exploit::EXE
 	include Msf::Post::File
-	include Msf::Post::Common
 	include Msf::Exploit::FileDropper
 
 	include Msf::Exploit::Local::Linux

modules/exploits/linux/local/sock_sendpage.rb

@@ -7,9 +7,6 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/priv'
 require 'msf/core/exploit/local/linux_kernel'
 require 'msf/core/exploit/local/linux'
 require 'msf/core/exploit/local/unix'
@@ -25,7 +22,6 @@ class Metasploit4 < Msf::Exploit::Local
 
 	include Msf::Exploit::EXE
 	include Msf::Post::File
-	include Msf::Post::Common
 
 	include Msf::Exploit::Local::LinuxKernel
 	include Msf::Exploit::Local::Linux

modules/exploits/linux/local/udev_netlink.rb

@@ -7,9 +7,6 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/priv'
 require 'msf/core/exploit/local/linux_kernel'
 require 'msf/core/exploit/local/linux'
 require 'msf/core/exploit/local/unix'
@@ -25,7 +22,6 @@ class Metasploit4 < Msf::Exploit::Local
 
 	include Msf::Exploit::EXE
 	include Msf::Post::File
-	include Msf::Post::Common
 
 	include Msf::Exploit::Local::Linux
 	include Msf::Exploit::Local::Unix

modules/exploits/linux/local/vmware_mount.rb

@@ -7,13 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 
 class Metasploit4 < Msf::Exploit::Local
 
 	include Msf::Exploit::EXE
-	include Msf::Post::Common
 	include Msf::Post::File
 
 	def initialize(info={})

modules/exploits/linux/local/zpanel_zsudo.rb

@@ -7,9 +7,6 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/priv'
 require 'msf/core/exploit/exe'
 
 
@@ -18,7 +15,6 @@ class Metasploit4 < Msf::Exploit::Local
 
 	include Msf::Exploit::EXE
 	include Msf::Post::File
-	include Msf::Post::Common
 
 	def initialize(info={})
 		super( update_info( info, {

modules/exploits/osx/local/setuid_tunnelblick.rb

@@ -7,8 +7,6 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 require 'msf/core/exploit/exe'
 
 class Metasploit4 < Msf::Exploit::Local
@@ -16,7 +14,6 @@ class Metasploit4 < Msf::Exploit::Local
 
 	include Msf::Exploit::EXE
 	include Msf::Post::File
-	include Msf::Post::Common
 
 	def initialize(info={})
 		super( update_info( info, {

modules/exploits/osx/local/setuid_viscosity.rb

@@ -7,8 +7,6 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 require 'msf/core/exploit/exe'
 
 class Metasploit4 < Msf::Exploit::Local
@@ -16,7 +14,6 @@ class Metasploit4 < Msf::Exploit::Local
 
 	include Msf::Exploit::EXE
 	include Msf::Post::File
-	include Msf::Post::Common
 
 	def initialize(info={})
 		super( update_info( info, {

modules/exploits/osx/local/sudo_password_bypass.rb

@@ -14,7 +14,6 @@ class Metasploit3 < Msf::Exploit::Local
 	# it at his own risk
 	Rank = NormalRanking
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Exploit::EXE
 	include Msf::Exploit::FileDropper

modules/exploits/unix/local/setuid_nmap.rb

@@ -7,9 +7,6 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/priv'
 require 'msf/core/exploit/exe'
 
 
@@ -18,7 +15,6 @@ class Metasploit4 < Msf::Exploit::Local
 
 	include Msf::Exploit::EXE
 	include Msf::Post::File
-	include Msf::Post::Common
 
 	def initialize(info={})
 		super( update_info( info, {

modules/exploits/windows/local/adobe_sandbox_adobecollabsync.rb

@@ -7,15 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/windows/registry'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = GreatRanking
 
 	include Msf::Exploit::EXE
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Windows::Registry
 

modules/exploits/windows/local/always_install_elevated.rb

@@ -7,15 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/windows/registry'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = AverageRanking
 
 	include Msf::Exploit::EXE
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Windows::Registry
 	include Msf::Exploit::FileDropper

modules/exploits/windows/local/ask.rb

@@ -6,14 +6,11 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
 require 'msf/core/exploit/exe'
-require 'msf/core/post/file'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = ExcellentRanking
 
-	include Post::Common
 	include Exploit::EXE
 	include Post::File
 

modules/exploits/windows/local/bypassuac.rb

@@ -6,16 +6,13 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
 require 'msf/core/exploit/exe'
-require 'msf/core/post/file'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = ExcellentRanking
 
-	include Post::Common
 	include Exploit::EXE
-	include Post::File
+	include Msf::Post::File
 
 	def initialize(info={})
 		super( update_info( info,

modules/exploits/windows/local/current_user_psexec.rb

@@ -7,15 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/windows/services'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 require 'msf/core/exploit/exe'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = ExcellentRanking
 
-	include Post::Common
 	include Post::Windows::Services
 	include Exploit::EXE
 	include Post::File

modules/exploits/windows/local/ms10_092_schelevator.rb

@@ -6,18 +6,14 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
 require 'rex'
 require 'zlib'
 require 'msf/core/exploit/exe'
-require 'msf/core/post/file'
-
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = ExcellentRanking
 
 	include Msf::Exploit::EXE
-	include Msf::Post::Common
 	include Msf::Post::File
 
 	def initialize(info={})

modules/exploits/windows/local/ms11_080_afdjoinleaf.rb

@@ -7,8 +7,6 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/priv'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = AverageRanking
@@ -17,7 +15,6 @@ class Metasploit3 < Msf::Exploit::Local
 	# the system process that it was injected into to die then it's also
 	# possible that the system may become unstable.
 
-	include Msf::Post::Common
 	include Msf::Post::Windows::Priv
 
 	def initialize(info={})

modules/exploits/windows/local/novell_client_nicm.rb

@@ -7,14 +7,12 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
 require 'msf/core/post/windows/priv'
 require 'msf/core/post/windows/process'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = AverageRanking
 
-	include Msf::Post::Common
 	include Msf::Post::Windows::Priv
 	include Msf::Post::Windows::Process
 

modules/exploits/windows/local/novell_client_nwfs.rb

@@ -7,14 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/priv'
-require 'msf/core/post/windows/process'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = AverageRanking
 
-	include Msf::Post::Common
 	include Msf::Post::Windows::Priv
 	include Msf::Post::Windows::Process
 
@@ -383,4 +379,4 @@ end
 .text:00055148                 mov     [ebp+ms_exc.registration.TryLevel], eax
 .text:0005514B                 mov     dword ptr [ecx], 9 // Corruption
 
-=end
+=end

modules/exploits/windows/local/persistence.rb

@@ -7,16 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/windows/priv'
-require 'msf/core/post/windows/registry'
 require 'msf/core/exploit/exe'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = ExcellentRanking
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Windows::Priv
 	include Msf::Post::Windows::Registry

modules/exploits/windows/local/s4u_persistence.rb

@@ -7,15 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/windows/priv'
 require 'msf/core/exploit/exe'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = ExcellentRanking
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Windows::Priv
 	include Exploit::EXE

modules/exploits/windows/local/trusted_service_path.rb

@@ -6,18 +6,14 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/services'
 require 'msf/core/exploit/exe'
-require 'msf/core/post/file'
 
 class Metasploit3 < Msf::Exploit::Local
 	Rank = ExcellentRanking
 
 	include Msf::Exploit::EXE
-	include Msf::Post::Common
 	include Msf::Post::File
-	include Post::Windows::Services
+	include Msf::Post::Windows::Services
 
 	def initialize(info={})
 		super( update_info( info,

modules/post/aix/hashdump.rb

@@ -7,14 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/priv'
-
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Linux::Priv
 

modules/post/linux/gather/checkvm.rb

@@ -7,14 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/priv'
-require 'msf/core/post/linux/system'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Linux::Priv
 	include Msf::Post::Linux::System

modules/post/linux/gather/ecryptfs_creds.rb

@@ -7,14 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/unix'
 
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::File
-	include Msf::Post::Common
 	include Msf::Post::Unix
 
 	def initialize(info={})

modules/post/linux/gather/enum_configs.rb

@@ -6,16 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/system'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-	include Msf::Post::File
-	include Msf::Post::Linux::System
-
 	def initialize(info={})
 		super( update_info( info,
 			'Name'          => 'Linux Gather Configurations',

modules/post/linux/gather/enum_network.rb

@@ -7,14 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/priv'
-require 'msf/core/post/linux/system'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Linux::Priv
 	include Msf::Post::Linux::System

modules/post/linux/gather/enum_protections.rb

@@ -6,13 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/system'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Linux::System
 

modules/post/linux/gather/enum_system.rb

@@ -7,14 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 require 'msf/core/post/linux/system'
 require 'msf/core/post/linux/priv'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Linux::System
 

modules/post/linux/gather/enum_users_history.rb

@@ -7,14 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/system'
-require 'msf/core/post/linux/priv'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Linux::System
 

modules/post/linux/gather/enum_xchat.rb

@@ -6,12 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 
 	def initialize(info={})

modules/post/linux/gather/hashdump.rb

@@ -7,14 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/priv'
-
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Linux::Priv
 

modules/post/linux/gather/mount_cifs_creds.rb

@@ -6,12 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 
 	def initialize(info={})

modules/post/linux/gather/pptpd_chap_secrets.rb

@@ -6,11 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Auxiliary::Report
 
@@ -127,4 +125,4 @@ class Metasploit3 < Msf::Post
 		end
 	end
 
-end
+end

modules/post/linux/manage/download_exec.rb

@@ -7,14 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/system'
-require 'msf/core/post/linux/priv'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Linux::System
 

modules/post/multi/escalate/metasploit_pcaplog.rb

@@ -7,9 +7,6 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/linux/priv'
 require 'msf/core/exploit/local/linux'
 require 'msf/core/exploit/local/unix'
 
@@ -17,7 +14,6 @@ class Metasploit3 < Msf::Post
 	Rank = ManualRanking
 
 	include Msf::Post::File
-	include Msf::Post::Common
 
 	include Msf::Exploit::Local::Linux
 	include Msf::Exploit::Local::Unix

modules/post/multi/gather/dns_bruteforce.rb

@@ -7,14 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
 
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
-
 	def initialize(info={})
 		super( update_info( info,
 				'Name'          => 'Multi Gather DNS Forward Lookup Bruteforce',

modules/post/multi/gather/dns_reverse_lookup.rb

@@ -7,14 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
-
 	def initialize(info={})
 		super( update_info( info,
 				'Name'          => 'Multi Gather DNS Reverse Lookup Scan',

modules/post/multi/gather/dns_srv_lookup.rb

@@ -7,13 +7,8 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/auxiliary/report'
-
 
 class Metasploit3 < Msf::Post
-
-	include Msf::Post::Common
 	include Msf::Auxiliary::Report
 
 	def initialize(info={})

modules/post/multi/gather/fetchmailrc_creds.rb

@@ -12,7 +12,6 @@ require 'msf/core/post/unix'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Unix
 

modules/post/multi/gather/firefox_creds.rb

@@ -17,7 +17,6 @@ require 'msf/core/post/windows/user_profiles'
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::File
-	include Msf::Post::Common
 	include Msf::Auxiliary::Report
 	include Msf::Post::Windows::UserProfiles
 

modules/post/multi/gather/gpg_creds.rb

@@ -14,7 +14,6 @@ require 'msf/core/post/unix'
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::File
-	include Msf::Post::Common
 	include Msf::Post::Unix
 
 	def initialize(info={})

modules/post/multi/gather/multi_command.rb

@@ -11,8 +11,6 @@ require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
 	def initialize(info={})
 		super( update_info( info,
 				'Name'          => 'Multi Gather Run Shell Command Resource File',

modules/post/multi/gather/netrc_creds.rb

@@ -6,13 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/unix'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Unix
 

modules/post/multi/gather/pgpass_creds.rb

@@ -14,7 +14,6 @@ require 'msf/core/post/windows/user_profiles'
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::File
-	include Msf::Post::Common
 	include Msf::Post::Unix
 	include Msf::Post::Windows::UserProfiles
 

modules/post/multi/gather/ping_sweep.rb

@@ -7,14 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
-
 	def initialize(info={})
 		super( update_info( info,
 				'Name'          => 'Multi Gather Ping Sweep',

modules/post/multi/gather/skype_enum.rb

@@ -19,7 +19,6 @@ require 'msf/core/post/osx/system'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Windows::UserProfiles
 

modules/post/multi/gather/ssh_creds.rb

@@ -7,15 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/file'
-require 'msf/core/post/common'
-require 'msf/core/post/unix'
 require 'sshkey'
 
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::File
-	include Msf::Post::Common
 	include Msf::Post::Unix
 
 	def initialize(info={})

modules/post/multi/gather/thunderbird_creds.rb

@@ -6,14 +6,10 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/file'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/user_profiles'
 
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::File
-	include Msf::Post::Common
 	include Msf::Post::Windows::UserProfiles
 
 	def initialize(info={})

modules/post/multi/general/execute.rb

@@ -7,12 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
 	def initialize(info={})
 		super( update_info( info,
 			'Name'          => 'Multi Generic Operating System Session Command Execution',

modules/post/multi/manage/multi_post.rb

@@ -8,12 +8,8 @@
 require 'msf/core'
 require 'rex'
 
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 
 	def initialize(info={})

modules/post/multi/manage/sudo.rb

@@ -7,15 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/unix'
-require 'msf/core/post/linux/priv'
-require 'msf/core/post/linux/system'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Linux::Priv
 	include Msf::Post::Linux::System

modules/post/multi/manage/system_session.rb

@@ -7,12 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
 	def initialize(info={})
 		super( update_info( info,
 				'Name'          => 'Multi Manage System Remote TCP Shell Session',

modules/post/osx/admin/say.rb

@@ -6,12 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
 	def initialize(info={})
 		super( update_info( info,
 			'Name'          => "OS X Text to Speech Utility",
@@ -69,4 +66,4 @@ class Metasploit3 < Msf::Post
 		end
 	end
 
-end
+end

modules/post/osx/capture/keylog_recorder.rb

@@ -8,7 +8,6 @@
 require 'shellwords'
 
 class Metasploit3 < Msf::Post
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Auxiliary::Report
 
@@ -46,13 +45,13 @@ class Metasploit3 < Msf::Post
 
 		register_options(
 			[
-				OptInt.new('DURATION', 
+				OptInt.new('DURATION',
 					[ true, 'The duration in seconds.', 600 ]
 				),
-				OptInt.new('SYNCWAIT', 
+				OptInt.new('SYNCWAIT',
 					[ true, 'The time between transferring log chunks.', 10 ]
 				),
-				OptPort.new('LOGPORT', 
+				OptPort.new('LOGPORT',
 					[ false, 'Local port opened for momentarily for log transfer', 22899 ]
 				)
 			]

modules/post/osx/gather/enum_adium.rb

@@ -7,13 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 require 'msf/core/auxiliary/report'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Auxiliary::Report
 

modules/post/osx/gather/enum_airport.rb

@@ -6,12 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
 	def initialize(info={})
 		super(update_info(info,
 			'Name'          => 'OS X Gather Airport Wireless Preferences',

modules/post/osx/gather/enum_chicken_vnc_profile.rb

@@ -7,12 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 
 	def initialize(info={})

modules/post/osx/gather/enum_colloquy.rb

@@ -7,12 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 
 	def initialize(info={})

modules/post/osx/gather/enum_keychain.rb

@@ -6,12 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
 	def initialize(info={})
 		super(update_info(info,
 			'Name'          => 'OS X Gather Keychain Enumeration',

modules/post/osx/gather/enum_osx.rb

@@ -7,14 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 require 'msf/core/auxiliary/report'
 
-
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Auxiliary::Report
 

modules/post/osx/gather/hashdump.rb

@@ -7,14 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 require 'msf/core/auxiliary/report'
 
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Auxiliary::Report
 

modules/post/osx/gather/password_prompt_spoof.rb

@@ -7,11 +7,8 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
 
 class Metasploit3 < Msf::Post
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Auxiliary::Report
 

modules/post/osx/manage/record_mic.rb

@@ -7,10 +7,8 @@
 
 require 'msf/core'
 require 'shellwords'
-require 'msf/core/post/osx/ruby_dl'
 
 class Metasploit3 < Msf::Post
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Auxiliary::Report
 	include Msf::Post::OSX::RubyDL
@@ -38,7 +36,7 @@ class Metasploit3 < Msf::Post
 		register_options(
 			[
 				OptInt.new('MIC_INDEX', [true, 'The index of the mic to use. `set ACTION LIST` to get a list.', 0]),
-				OptString.new('TMP_FILE', 
+				OptString.new('TMP_FILE',
 					[true, 'The tmp file to use on the remote machine', '/tmp/.<random>/<random>']
 				),
 				OptString.new('AUDIO_COMPRESSION',
@@ -98,7 +96,7 @@ class Metasploit3 < Msf::Post
 								tmp_file = File.join(File.dirname(tmp_file), base+num+'.'+ext)
 								# store contents in file
 								title = "OSX Mic Recording "+i.to_s
-								f = store_loot(title, "audio/quicktime", session, contents, 
+								f = store_loot(title, "audio/quicktime", session, contents,
 									"osx_mic_rec#{i}.qt", title)
 								print_good "Record file captured and saved to #{f}"
 								print_status "Rolling record file. "

modules/post/osx/manage/webcam.rb

@@ -7,10 +7,8 @@
 
 require 'msf/core'
 require 'shellwords'
-require 'msf/core/post/osx/ruby_dl'
 
 class Metasploit3 < Msf::Post
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Auxiliary::Report
 	include Msf::Post::OSX::RubyDL
@@ -42,7 +40,7 @@ class Metasploit3 < Msf::Post
 				OptInt.new('CAMERA_INDEX', [true, 'The index of the webcam to use. `set ACTION LIST` to get a list.', 0]),
 				OptInt.new('MIC_INDEX', [true, 'The index of the mic to use. `set ACTION LIST` to get a list.', 0]),
 				OptString.new('JPG_QUALITY', [false, 'The compression factor for snapshotting a jpg (from 0 to 1)', "0.8"]),
-				OptString.new('TMP_FILE', 
+				OptString.new('TMP_FILE',
 					[true, 'The tmp file to use on the remote machine', '/tmp/.<random>/<random>']
 				),
 				OptBool.new('AUDIO_ENABLED', [false, 'Enable audio when recording', true]),
@@ -108,7 +106,7 @@ class Metasploit3 < Msf::Post
 								tmp_file = File.join(File.dirname(tmp_file), base+num+'.'+ext)
 								# store contents in file
 								title = "OSX Webcam Recording "+i.to_s
-								f = store_loot(title, "video/mov", session, contents, 
+								f = store_loot(title, "video/mov", session, contents,
 									"osx_webcam_rec#{i}.mov", title)
 								print_good "Record file captured and saved to #{f}"
 								print_status "Rolling movie file. "

modules/post/solaris/gather/checkvm.rb

@@ -7,13 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/solaris/priv'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Solaris::Priv
 

modules/post/solaris/gather/enum_packages.rb

@@ -7,13 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/solaris/system'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Solaris::System
 

modules/post/solaris/gather/enum_services.rb

@@ -7,14 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/solaris/system'
-
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Solaris::System
 

modules/post/solaris/gather/hashdump.rb

@@ -7,14 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-require 'msf/core/post/solaris/priv'
-
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Solaris::Priv
 

modules/post/windows/capture/keylog_recorder.rb

@@ -7,15 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/file'
-require 'msf/core/post/windows/priv'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::Windows::Priv
 	include Msf::Post::File
-	include Msf::Post::Common
 
 	def initialize(info={})
 		super( update_info( info,

modules/post/windows/gather/arp_scanner.rb

@@ -7,13 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
 require 'msf/core/auxiliary/report'
 
-
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Auxiliary::Report
 
 	OUI_LIST = Rex::Oui

modules/post/windows/gather/checkvm.rb

@@ -7,14 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/windows/registry'
-require 'msf/core/post/common'
 require 'msf/core/auxiliary/report'
 
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::Windows::Registry
-	include Msf::Post::Common
 	include Msf::Auxiliary::Report
 
 	def initialize(info={})

modules/post/windows/gather/credentials/credential_collector.rb

@@ -7,13 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
 require 'msf/core/auxiliary/report'
 
-
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Auxiliary::Report
 
 	def initialize(info={})

modules/post/windows/gather/credentials/razer_synapse.rb

@@ -7,13 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/user_profiles'
 require 'openssl'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::Windows::UserProfiles
 	include Msf::Post::File
 
@@ -118,4 +115,4 @@ class Metasploit3 < Msf::Post
 			end
 		end
 	end
-end
+end

modules/post/windows/gather/credentials/spark_im.rb

@@ -7,13 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/user_profiles'
 require 'openssl'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::Windows::UserProfiles
 
 	def initialize(info={})

modules/post/windows/gather/dumplinks.rb

@@ -7,14 +7,10 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/priv'
-require 'msf/core/post/windows/accounts'
 
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::Windows::Priv
-	include Msf::Post::Common
 	include Msf::Post::Windows::Accounts
 
 	def initialize(info={})

modules/post/windows/gather/enum_computers.rb

@@ -8,15 +8,8 @@
 require 'msf/core'
 require 'rex'
 
-# Multi platform requiere
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-
-require 'msf/core/post/windows/registry'
-
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 
 	include Msf::Post::Windows::Registry

modules/post/windows/gather/enum_db.rb

@@ -7,15 +7,11 @@
 
 require 'rex'
 require 'msf/core'
-require 'msf/core/post/file'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/registry'
 require 'msf/core/auxiliary/report'
 
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::File
-	include Msf::Post::Common
 	include Msf::Post::Windows::Registry
 	include Msf::Auxiliary::Report
 

modules/post/windows/gather/enum_dirperms.rb

@@ -6,12 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
 	def initialize(info={})
 		super(update_info(info,
 			'Name'           => "Windows Gather Directory Permissions Enumeration",

modules/post/windows/gather/enum_domain.rb

@@ -6,12 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/windows/priv'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 	include Msf::Post::Windows::Priv
-	include Msf::Post::Common
 
 	def initialize(info={})
 		super(update_info(info,

modules/post/windows/gather/enum_domain_group_users.rb

@@ -7,12 +7,9 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
-
 	def initialize(info={})
 		super( update_info( info,
 				'Name'          => 'Windows Gather Enumerate Domain Group',

modules/post/windows/gather/enum_domain_tokens.rb

@@ -8,15 +8,8 @@
 require 'msf/core'
 require 'rex'
 
-# Multi platform requiere
-require 'msf/core/post/common'
-require 'msf/core/post/file'
-
-require 'msf/core/post/windows/registry'
-
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::File
 	include Msf::Post::Windows::Registry
 

modules/post/windows/gather/enum_tokens.rb

@@ -6,12 +6,9 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/windows/priv'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 	include Msf::Post::Windows::Priv
-	include Msf::Post::Common
 
 	def initialize(info={})
 		super(update_info(info,

modules/post/windows/gather/enum_tomcat.rb

@@ -8,15 +8,11 @@
 require 'rex'
 require 'rexml/document'
 require 'msf/core'
-require 'msf/core/post/file'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/registry'
 require 'msf/core/auxiliary/report'
 
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::File
-	include Msf::Post::Common
 	include Msf::Post::Windows::Registry
 	include Msf::Auxiliary::Report
 

modules/post/windows/gather/forensics/duqu_check.rb

@@ -6,14 +6,10 @@
 ##
 
 require 'msf/core'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/registry'
-require 'msf/core/post/windows/priv'
 require 'msf/core/auxiliary/report'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
 	include Msf::Post::Windows::Registry
 	include Msf::Auxiliary::Report
 

modules/post/windows/gather/local_admin_search_enum.rb

@@ -8,14 +8,12 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::Windows::Priv
 	include Msf::Auxiliary::Report
 	include Msf::Auxiliary::Scanner
-	include Msf::Post::Common
 
 	def initialize(info={})
 		super(update_info(info,

modules/post/windows/gather/netlm_downgrade.rb

@@ -7,15 +7,11 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/windows/registry'
-require 'msf/core/post/windows/services'
-require 'msf/core/post/common'
 
 class Metasploit3 < Msf::Post
 
 	include Msf::Post::Windows::Registry
 	include Msf::Post::Windows::WindowsServices
-	include Msf::Post::Common
 	include Msf::Post::Windows::Priv
 
 	def initialize(info={})

modules/post/windows/gather/smart_hashdump.rb

@@ -7,21 +7,15 @@
 
 require 'msf/core'
 require 'rex'
-require 'msf/core/post/common'
-require 'msf/core/post/windows/priv'
-require 'msf/core/post/windows/registry'
-require 'msf/core/post/windows/accounts'
-require 'msf/core/post/file'
 require 'msf/core/auxiliary/report'
 
 class Metasploit3 < Msf::Post
 
-	include Msf::Post::Common
+	include Msf::Post::File
 	include Msf::Post::Windows::Priv
 	include Msf::Post::Windows::Registry
 	include Msf::Post::Windows::Accounts
 	include Msf::Auxiliary::Report
-	include Msf::Post::File
 
 	def initialize(info={})
 		super( update_info( info,