infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This massive commit changes the metasploit 3 module format. The new syntax allows for greater scalability and future improvements to the metasploit module loader. This change also makes it easier for users to add new modules, since the class name no longer needs to match the directory structure. 

git-svn-id: file:///home/svn/framework3/trunk@5709 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2008-10-02 05:23:59 +00:00
parent 2dcffdc3ed
commit fd256ec4a1
513 changed files with 1779 additions and 2756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/msf/core/module.rb
View File

@ -444,6 +444,13 @@ class Module
return (type == MODULE_AUX) return (type == MODULE_AUX)
end end
#
# Returns false since this is the real module
#
def self.cached?
false
end
# #
# The array of zero or more authors. # The array of zero or more authors.
# #

180
lib/msf/core/module_manager.rb
View File

@ -4,10 +4,11 @@ module Msf
# #
# Define used for a place-holder module that is used to indicate that the # Define used for a place-holder module that is used to indicate that the
# module has not yet been demand-loaded. # module has not yet been demand-loaded. Soon to go away.
# #
SymbolicModule = "__SYMBOLIC__" SymbolicModule = "__SYMBOLIC__"
### ###
# #
# A module set contains zero or more named module classes of an arbitrary # A module set contains zero or more named module classes of an arbitrary
@ -233,6 +234,7 @@ protected
block.call(name, mod) block.call(name, mod)
} }
end end
# #
# Ranks modules based on their constant rank value, if they have one. # Ranks modules based on their constant rank value, if they have one.
@ -501,7 +503,6 @@ class ModuleManager < ModuleSet
@modcache['ModuleTypeCounts'].clear @modcache['ModuleTypeCounts'].clear
MODULE_TYPES.each { |type| MODULE_TYPES.each { |type|
module_sets[type] ||= []
@modcache['ModuleTypeCounts'][type] = module_sets[type].length.to_s @modcache['ModuleTypeCounts'][type] = module_sets[type].length.to_s
} }
end end
@ -560,9 +561,9 @@ class ModuleManager < ModuleSet
# #
# Synchronizes the module cache information # Synchronizes the module cache information
# #
def update_module_cache_info(fullname, modinfo) def update_module_cache_info(fullname, mod, modinfo)
return if (modinfo and modinfo['noup'] == true) return if (modinfo and modinfo['noup'] == true)
if (@modcache) if (@modcache)
if (fullname) if (fullname)
@modcache.add_group(fullname) @modcache.add_group(fullname)
@ -570,14 +571,21 @@ class ModuleManager < ModuleSet
@modcache[fullname]['FileNames'] = modinfo['files'].join(',') @modcache[fullname]['FileNames'] = modinfo['files'].join(',')
@modcache[fullname]['FilePaths'] = modinfo['paths'].join(',') @modcache[fullname]['FilePaths'] = modinfo['paths'].join(',')
@modcache[fullname]['Type'] = modinfo['type'] @modcache[fullname]['Type'] = modinfo['type']
# Deep cache classes (ignore payloads)
# if(mod.class == ::Class and mod.cached?)
# @modcache[fullname]['CacheData'] = [Marshal.dump(mod.infos)].pack("m").gsub(/\s+/, '')
# end
end end
modinfo['files'].each { |p| modinfo['files'].each do |f|
begin begin
@modcache['FileModificationTimes'][p] = File::Stat.new(p).mtime.to_i.to_s @modcache['FileModificationTimes'][f] = File::Stat.new(f).mtime.to_i.to_s
rescue Errno::ENOENT rescue Errno::ENOENT
end end
} end
end end
end end
@ -661,27 +669,39 @@ class ModuleManager < ModuleSet
dlog("Reloading module #{refname}...", 'core') dlog("Reloading module #{refname}...", 'core')
if (mod.file_path)
begin # Set the target file
if (!load(mod.file_path)) file = mod.file_path
elog("Failed to load module from #{mod.file_path}")
self.module_failed[mod.file_path] = "Failed to reload the module" # Load the module into a new Module wrapper
return nil begin
end wrap = ::Module.new
self.module_failed.delete(mod.file_path) wrap.module_eval(File.read(file, File.size(file)))
rescue rescue ::Exception => e
elog("Failed to reload module #{mod} from #{mod.file_path}: #{$!}") elog("Failed to reload module from #{file}: #{e.class} #{e}")
raise $! self.module_failed[mod.file_path] = "Failed to reload the module"
end return nil
end end
if(not wrap.const_defined?('Metasploit3'))
elog("Reloaded file did not contain a valid module (#{file}).")
self.module_failed[mod.file_path] = "Failed to reload the module"
return nil
end
added = wrap.const_get('Metasploit3')
self.module_failed.delete(mod.file_path)
# Remove the original reference to this module # Remove the original reference to this module
self.delete(mod.refname) self.delete(mod.refname)
# Indicate that the module is being loaded again so that any necessary # Indicate that the module is being loaded again so that any necessary
# steps can be taken to extend it properly. # steps can be taken to extend it properly.
on_module_load(mod.orig_cls, mod.type, refname, { on_module_load(added, mod.type, refname, {
'files' => [ mod.file_path ], 'files' => [ mod.file_path ],
'noup' => true}) 'noup' => true})
@ -712,7 +732,7 @@ class ModuleManager < ModuleSet
# If the module cache is not being used, update the cache with # If the module cache is not being used, update the cache with
# information about the files that are associated with this module. # information about the files that are associated with this module.
if (!using_cache) if (!using_cache)
update_module_cache_info(dup.fullname, file_paths) update_module_cache_info(dup.fullname, mod, file_paths)
end end
# Automatically subscribe a wrapper around this module to the necessary # Automatically subscribe a wrapper around this module to the necessary
@ -783,7 +803,7 @@ protected
Rex::Find.find(path) { |file| Rex::Find.find(path) { |file|
# Skip non-ruby files # Skip non-ruby files
next if (file !~ /\.rb$/) next if (file !~ /\.rb$/i)
# Skip unit test files # Skip unit test files
next if (file =~ /rb\.(ut|ts)\.rb$/) next if (file =~ /rb\.(ut|ts)\.rb$/)
@ -794,6 +814,7 @@ protected
begin begin
load_module_from_file(path, file, loaded, recalc, counts, demand) load_module_from_file(path, file, loaded, recalc, counts, demand)
rescue NameError rescue NameError
# As of Jan-06-2007 this code isn't hit with the official module tree # As of Jan-06-2007 this code isn't hit with the official module tree
# If we get a name error, it's possible that this module depends # If we get a name error, it's possible that this module depends
@ -838,15 +859,9 @@ protected
} }
# Perform any required recalculations for the individual module types # Perform any required recalculations for the individual module types
# that actually had load changes. Remove modules which generate # that actually had load changes
# exceptions during the recalculation phase.
recalc.each_key { |key| recalc.each_key { |key|
begin module_sets[key].recalculate
module_sets[key].recalculate
rescue ::Exception => e
elog("Module #{key} threw exception #{e.class} #{e}: removing.")
module_sets.delete(key)
end
} }
# Return per-module loaded counts # Return per-module loaded counts
@ -874,9 +889,6 @@ protected
# Chop off the file name # Chop off the file name
path_base.sub!(/(.+)(#{File::SEPARATOR}.+)(.rb?)$/, '\1') path_base.sub!(/(.+)(#{File::SEPARATOR}.+)(.rb?)$/, '\1')
# Extract the module's namespace from its path
mod = mod_from_name(path_base)
if (m = path_base.match(/^(.+?)#{File::SEPARATOR}+?/)) if (m = path_base.match(/^(.+?)#{File::SEPARATOR}+?/))
type = m[1] type = m[1]
else else
@ -885,70 +897,30 @@ protected
type.sub!(/s$/, '') type.sub!(/s$/, '')
#
# If the cached version of the file is still okay, then we just return
# as we don't need to load it yet. We do not currently support demand
# loading of encoders and nops due to some API assumptions
# (EncodedPayload assumes it can enumerate through all encoders/nops).
#
# FIXME: support demand loading of encoders/nops
#
if ((demand == false) and
(check_cache(file)) and
([ MODULE_ENCODER, MODULE_NOP ].include?(type) == false))
return false
end
# Get the module and grab the current number of constants
old_constants = mod.constants
# Load the file like it aint no thang added = nil
# Load the module into a new Module wrapper
begin begin
if (!load(file)) wrap = ::Module.new
elog("Failed to load module from #{file}") wrap.module_eval(File.read(file, File.size(file)))
return false
end
rescue NameError
added = mod.constants - old_constants
# Super hack. If a constant was added (which will represent the
# module), then we need to remove it so that our logic for
# detecting new classes in the future will work when we
# subsequently try to reload it.
r = mod.module_eval { remove_const(added[0]) } if (added[0])
# Re-raise the name error so that the caller catches it and adds this
# file path to the list of files that are to be delay loaded.
raise $!
rescue LoadError
elog("LoadError: #{$!}.")
return false
rescue ::Exception => e rescue ::Exception => e
elog("Failed to load module from #{file}: #{e.class} #{e} #{e.backtrace}") errmsg = "#{e.class} #{e}"
self.module_failed[file] = e self.module_failed[file] = errmsg
elog(errmsg)
return false return false
end end
added = mod.constants - old_constants if(not wrap.const_defined?('Metasploit3'))
errmsg = "Missing Metasploit3 constant"
if (added.length > 1) self.module_failed[file] = errmsg
elog("Loaded file contained more than one class (#{file}).") elog(errmsg)
return false return false
end end
added = wrap.const_get('Metasploit3')
# If nothing was added, check to see if there's anything
# in the cache
if (added.empty?)
if (module_history[file])
added = module_history[file]
else
elog("Loaded #{file} but no classes were added.")
self.module_failed[file] = "Loaded file, but no classes were registered"
return false
end
else
added = mod.const_get(added[0])
end
# If the module indicates that it is not usable on this system, then we # If the module indicates that it is not usable on this system, then we
# will not try to use it. # will not try to use it.
@ -964,14 +936,13 @@ protected
end end
# Synchronize the modification time for this file. # Synchronize the modification time for this file.
update_module_cache_info(nil, { update_module_cache_info(nil, added, {
'paths' => [ path ], 'paths' => [ path ],
'files' => [ file ], 'files' => [ file ],
'type' => type}) if (!using_cache) 'type' => type}) if (!using_cache)
if (usable == false) if (usable == false)
ilog("Skipping module in #{file} because is_usable returned false.", ilog("Skipping module in #{file} because is_usable returned false.", 'core', LEV_1)
'core', LEV_1)
return false return false
end end
@ -1015,33 +986,6 @@ protected
end end
end end
#
# Returns the module object that is associated with the supplied module
# name.
#
def mod_from_name(name)
# The root namespace
obj = ::Msf
# Build up a module container
name.split(File::SEPARATOR).each do |m|
# Up-case the first letter and any prefixed by _
m.gsub!(/^[a-z]/) { |s| s.upcase }
m.gsub!(/(_[a-z])/) { |s| s[1..1].upcase }
if(obj.const_defined?(m))
obj = obj.const_get(m)
else
elog("Setting module constant #{obj}::#{m}")
obj = obj.const_set(m, ::Module.new)
end
end
return obj
end
# #
# Called when a module is initially loaded such that it can be # Called when a module is initially loaded such that it can be
# categorized accordingly. # categorized accordingly.

9
modules/auxiliary/admin/backupexec/dump.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Admin::Backupexec::FileAccess < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::NDMP include Msf::Exploit::Remote::NDMP
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -283,4 +282,4 @@ class Auxiliary::Admin::Backupexec::FileAccess < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/admin/backupexec/registry.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Admin::Backupexec::RegistryAccess < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::DCERPC include Msf::Exploit::Remote::DCERPC
include Rex::Platforms::Windows include ::Rex::Platforms::Windows
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -282,4 +281,4 @@ class Auxiliary::Admin::Backupexec::RegistryAccess < Msf::Auxiliary
end end
end end
end

6
modules/auxiliary/admin/cisco/ios_http_auth_bypass.rb
View File

@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Admin::Cisco::IOS_HTTP_Auth_Bypass < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -82,7 +81,6 @@ class Auxiliary::Admin::Cisco::IOS_HTTP_Auth_Bypass < Msf::Auxiliary
end end
end end
end
=begin =begin

7
modules/auxiliary/admin/emc/alphastor_devicemanager_exec.rb
View File

@ -7,11 +7,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Admin::Emc::ALPHASTOR_DEVICEMANAGER_EXEC < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -62,4 +61,4 @@ class Auxiliary::Admin::Emc::ALPHASTOR_DEVICEMANAGER_EXEC < Msf::Auxiliary
end end
end end
end

9
modules/auxiliary/admin/maxdb/maxdb_cons_exec.rb
View File

@ -11,11 +11,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Admin::Maxdb::MaxDB_Cons_Exec < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -26,7 +25,7 @@ class Auxiliary::Admin::Maxdb::MaxDB_Cons_Exec < Msf::Auxiliary
}, },
'Author' => [ 'MC' ], 'Author' => [ 'MC' ],
'License' => MSF_LICENSE, 'License' => MSF_LICENSE,
'Version' => '$Revision:$', 'Version' => '$Revision$',
'References' => 'References' =>
[ [
['BID', '27206'], ['BID', '27206'],
@ -83,4 +82,4 @@ class Auxiliary::Admin::Maxdb::MaxDB_Cons_Exec < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/admin/pop2/uw_fileretrieval.rb
View File

@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Admin::Pop2::Uw_FileRetrieval < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Pop2 include Msf::Exploit::Remote::Pop2
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -64,4 +63,4 @@ class Auxiliary::Admin::Pop2::Uw_FileRetrieval < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/admin/serverprotect/file.rb
View File

@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Admin::Serverprotect::FileAccess < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::DCERPC include Msf::Exploit::Remote::DCERPC
include Rex::Platforms::Windows include Rex::Platforms::Windows
def initialize(info = {}) def initialize(info = {})
@ -410,4 +409,4 @@ class Auxiliary::Admin::Serverprotect::FileAccess < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/admin/webmin/file_disclosure.rb
View File

@ -11,11 +11,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Admin::Webmin::File_Disclosure < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -87,4 +86,4 @@ class Auxiliary::Admin::Webmin::File_Disclosure < Msf::Auxiliary
end end
end end
end

6
modules/auxiliary/dos/cisco/ios_http_percentpercent.rb
View File

@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Cisco::IOS_HTTP_PercentPercent < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -58,7 +57,6 @@ class Auxiliary::Dos::Cisco::IOS_HTTP_PercentPercent < Msf::Auxiliary
end end
end end
end
=begin =begin

9
modules/auxiliary/dos/freebsd/nfsd/nfsd_mount.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Freebsd::Nfsd::Nfs_Mount < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -53,4 +52,4 @@ class Auxiliary::Dos::Freebsd::Nfsd::Nfs_Mount < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/dos/samba/lsa_addprivs_heap.rb
View File

@ -12,13 +12,12 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Samba::LSA_AddPrivs_Heap < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Dos include Msf::Auxiliary::Dos
include Exploit::Remote::DCERPC include Msf::Exploit::Remote::DCERPC
include Exploit::Remote::SMB include Msf::Exploit::Remote::SMB
def initialize(info = {}) def initialize(info = {})
@ -88,4 +87,4 @@ class Auxiliary::Dos::Samba::LSA_AddPrivs_Heap < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/dos/samba/lsa_transnames_heap.rb
View File

@ -12,13 +12,12 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Samba::LSA_TransNames_Heap < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Dos include Msf::Auxiliary::Dos
include Exploit::Remote::DCERPC include Msf::Exploit::Remote::DCERPC
include Exploit::Remote::SMB include Msf::Exploit::Remote::SMB
def initialize(info = {}) def initialize(info = {})
@ -90,4 +89,4 @@ class Auxiliary::Dos::Samba::LSA_TransNames_Heap < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/dos/solaris/lpd/cascade_delete.rb
View File

@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Solaris::Lpd::CascadeDelete < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -115,4 +114,4 @@ class Auxiliary::Dos::Solaris::Lpd::CascadeDelete < Msf::Auxiliary
end end
end end
end

9
modules/auxiliary/dos/windows/appian/appian_bpm.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Windows::Appian::AppianBPM < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Dos include Msf::Auxiliary::Dos
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -100,4 +99,4 @@ class Auxiliary::Dos::Windows::Appian::AppianBPM < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/dos/windows/ftp/winftp230_nlst.rb
View File

@ -1,9 +1,8 @@
require 'msf/core' require 'msf/core'
module Msf class Metasploit3 < Msf::Auxiliary
class Auxiliary::Dos::Windows::Ftp::Winftp230_nlst < Msf::Auxiliary
include Exploit::Remote::Ftp include Msf::Exploit::Remote::Ftp
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -33,5 +32,5 @@ class Auxiliary::Dos::Windows::Ftp::Winftp230_nlst < Msf::Auxiliary
disconnect disconnect
end end
end end
end

9
modules/auxiliary/dos/windows/nat/nat_helper.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Windows::Nat::Nat_Helper < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Udp include Msf::Exploit::Remote::Udp
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -56,4 +55,4 @@ class Auxiliary::Dos::Windows::Nat::Nat_Helper < Msf::Auxiliary
end end
end end
end

13
modules/auxiliary/dos/windows/smb/ms05_047_pnp.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,13 +12,12 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Windows::Smb::MS05_047_PNP < Msf::Exploit::Remote class Metasploit3 < Msf::Exploit::Remote
include Auxiliary::Dos include Msf::Auxiliary::Dos
include Exploit::Remote::DCERPC include Msf::Exploit::Remote::DCERPC
include Exploit::Remote::SMB include Msf::Exploit::Remote::SMB
def initialize(info = {}) def initialize(info = {})
@ -117,4 +116,4 @@ class Auxiliary::Dos::Windows::Smb::MS05_047_PNP < Msf::Exploit::Remote
end end
end end
end

11
modules/auxiliary/dos/windows/smb/ms06_035_mailslot.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Windows::Smb::MS06_035_SRVSYS_CORRUPT < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Dos include Msf::Auxiliary::Dos
include Exploit::Remote::SMB include Msf::Exploit::Remote::SMB
def initialize(info = {}) def initialize(info = {})
@ -105,4 +104,4 @@ class Auxiliary::Dos::Windows::Smb::MS06_035_SRVSYS_CORRUPT < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/dos/windows/smb/ms06_063_trans.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Windows::Smb::TRANS_PIPE_NONULL < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Dos include Msf::Auxiliary::Dos
include Exploit::Remote::SMB include Msf::Exploit::Remote::SMB
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -72,4 +71,4 @@ class Auxiliary::Dos::Windows::Smb::TRANS_PIPE_NONULL < Msf::Auxiliary
end end
end end
end

13
modules/auxiliary/dos/windows/smb/rras_vls_null_deref.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,13 +12,12 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Windows::Smb::RRAS_VLS_NULL_DEREF < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Dos include Msf::Auxiliary::Dos
include Exploit::Remote::DCERPC include Msf::Exploit::Remote::DCERPC
include Exploit::Remote::SMB include Msf::Exploit::Remote::SMB
def initialize(info = {}) def initialize(info = {})
@ -83,4 +82,4 @@ class Auxiliary::Dos::Windows::Smb::RRAS_VLS_NULL_DEREF < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/dos/windows/smtp/ms06_019_exchange.rb
View File

@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Windows::Smtp::MS06_019_EXCHANGE < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Smtp include Msf::Exploit::Remote::Smtp
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -121,4 +120,4 @@ class Auxiliary::Dos::Windows::Smtp::MS06_019_EXCHANGE < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/dos/wireless/cts_rts_flood.rb
View File

@ -1,9 +1,8 @@
require 'msf/core' require 'msf/core'
module Msf class Metasploit3 < Msf::Auxiliary
class Auxiliary::Dos::Wireless::CTSRTSFLOOD < Msf::Auxiliary
include Exploit::Lorcon include Msf::Exploit::Lorcon
def initialize(info ={}) def initialize(info ={})
super(update_info(info, super(update_info(info,
@ -72,5 +71,5 @@ class Auxiliary::Dos::Wireless::CTSRTSFLOOD < Msf::Auxiliary
return frame return frame
end end
end end
end

8
modules/auxiliary/dos/wireless/daringphucball.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Wireless::DaringPhucball < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Lorcon include Msf::Exploit::Lorcon
def initialize(info = {}) def initialize(info = {})
@ -87,7 +86,6 @@ class Auxiliary::Dos::Wireless::DaringPhucball < Msf::Auxiliary
end end
end end
end
=begin =begin

7
modules/auxiliary/dos/wireless/deauth.rb
View File

@ -1,9 +1,8 @@
require 'msf/core' require 'msf/core'
module Msf class Metasploit3 < Msf::Auxiliary
class Auxiliary::Dos::Wireless::DEAUTH_Flood < Msf::Auxiliary
include Exploit::Lorcon include Msf::Exploit::Lorcon
def initialize(info ={}) def initialize(info ={})
super(update_info(info, super(update_info(info,
@ -58,5 +57,5 @@ class Auxiliary::Dos::Wireless::DEAUTH_Flood < Msf::Auxiliary
return frame return frame
end end
end end
end

9
modules/auxiliary/dos/wireless/fakeap.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Wireless::APFlood < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Lorcon include Msf::Exploit::Lorcon
def initialize(info = {}) def initialize(info = {})
@ -83,4 +82,4 @@ class Auxiliary::Dos::Wireless::APFlood < Msf::Auxiliary
end end
end end
end

9
modules/auxiliary/dos/wireless/fuzz_beacon.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Wireless::FuzzBeacon < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Lorcon include Msf::Exploit::Lorcon
def initialize(info = {}) def initialize(info = {})
@ -133,4 +132,4 @@ class Auxiliary::Dos::Wireless::FuzzBeacon < Msf::Auxiliary
end end
end end
end

9
modules/auxiliary/dos/wireless/fuzz_proberesp.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Wireless::FuzzProbeResp < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Lorcon include Msf::Exploit::Lorcon
def initialize(info = {}) def initialize(info = {})
@ -132,4 +131,4 @@ class Auxiliary::Dos::Wireless::FuzzProbeResp < Msf::Auxiliary
end end
end end
end

8
modules/auxiliary/dos/wireless/netgear_ma521_rates.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Wireless::Netgear_MA521_Rates < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Lorcon include Msf::Exploit::Lorcon
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -104,7 +103,6 @@ class Auxiliary::Dos::Wireless::Netgear_MA521_Rates < Msf::Auxiliary
end end
end end
end
=begin =begin
******************************************************************************* *******************************************************************************

8
modules/auxiliary/dos/wireless/netgear_wg311pci.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Wireless::Netgear_WG311_SSID < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Lorcon include Msf::Exploit::Lorcon
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -102,7 +101,6 @@ class Auxiliary::Dos::Wireless::Netgear_WG311_SSID < Msf::Auxiliary
end end
end end
end
=begin =begin
******************************************************************************* *******************************************************************************

9
modules/auxiliary/dos/wireless/probe_resp_null_ssid.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Wireless::NullSSIDProbeResponse < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Lorcon include Msf::Exploit::Lorcon
def initialize(info = {}) def initialize(info = {})
@ -84,4 +83,4 @@ class Auxiliary::Dos::Wireless::NullSSIDProbeResponse < Msf::Auxiliary
end end
end end
end

9
modules/auxiliary/dos/wireless/wifun.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Dos::Wireless::WiFun < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Lorcon include Msf::Exploit::Lorcon
def initialize(info = {}) def initialize(info = {})
@ -39,4 +38,4 @@ class Auxiliary::Dos::Wireless::WiFun < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/dos/wireshark/ldap.rb
View File

@ -8,11 +8,10 @@
require 'msf/core' require 'msf/core'
require 'scruby' require 'scruby'
module Msf
class Auxiliary::Dos::Wireshark::Ldap < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Ip include Msf::Exploit::Remote::Ip
def initialize def initialize
super( super(
@ -64,4 +63,4 @@ class Auxiliary::Dos::Wireshark::Ldap < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/scanner/dcerpc/endpoint_mapper.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,15 +12,14 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Dcerpc::ENDPOINT_MAPPER < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
# Exploit mixins should be called first # Exploit mixins should be called first
include Exploit::Remote::DCERPC include Msf::Exploit::Remote::DCERPC
# Scanner mixin should be near last # Scanner mixin should be near last
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -68,5 +67,5 @@ class Auxiliary::Scanner::Dcerpc::ENDPOINT_MAPPER < Msf::Auxiliary
end end
end

11
modules/auxiliary/scanner/dcerpc/hidden.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,15 +12,14 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Dcerpc::RPC_HIDDEN < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
# Exploit mixins should be called first # Exploit mixins should be called first
include Exploit::Remote::DCERPC include Msf::Exploit::Remote::DCERPC
# Scanner mixin should be near last # Scanner mixin should be near last
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -124,5 +123,5 @@ class Auxiliary::Scanner::Dcerpc::RPC_HIDDEN < Msf::Auxiliary
end end
end

11
modules/auxiliary/scanner/dcerpc/management.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,15 +12,14 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Dcerpc::RPC_MGMT < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
# Exploit mixins should be called first # Exploit mixins should be called first
include Exploit::Remote::DCERPC include Msf::Exploit::Remote::DCERPC
# Scanner mixin should be near last # Scanner mixin should be near last
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -74,5 +73,5 @@ class Auxiliary::Scanner::Dcerpc::RPC_MGMT < Msf::Auxiliary
end end
end

11
modules/auxiliary/scanner/discovery/sweep_udp.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Discovery::SweepUDP < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Report include Msf::Auxiliary::Report
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -173,7 +172,7 @@ class Auxiliary::Scanner::Discovery::SweepUDP < Msf::Auxiliary
# Parse a asn1 buffer into a hash tree # Parse a asn1 buffer into a hash tree
# #
class ASNData < Hash class ASNData < ::Hash
def initialize(data) def initialize(data)
_parse_asn1(data, self) _parse_asn1(data, self)
@ -335,4 +334,4 @@ class Auxiliary::Scanner::Discovery::SweepUDP < Msf::Auxiliary
return ["\x7a\x00\x00\x00\x00\x00", 5093] return ["\x7a\x00\x00\x00\x00\x00", 5093]
end end
end end
end

8
modules/auxiliary/scanner/ftp/anonymous.rb
View File

@ -8,12 +8,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Ftp::Anonymous < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Ftp include Msf::Exploit::Remote::Ftp
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -57,4 +56,3 @@ class Auxiliary::Scanner::Ftp::Anonymous < Msf::Auxiliary
disconnect disconnect
end end
end end
end

11
modules/auxiliary/scanner/http/frontpage.rb
View File

@ -8,13 +8,12 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Http::FrontPage < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
include Auxiliary::WMAPScanServer include Msf::Auxiliary::WMAPScanServer
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -63,4 +62,4 @@ class Auxiliary::Scanner::Http::FrontPage < Msf::Auxiliary
end end
end end
end end
end

11
modules/auxiliary/scanner/http/frontpage_login.rb
View File

@ -8,13 +8,12 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Http::FrontPage_login < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
include Auxiliary::WMAPScanServer include Msf::Auxiliary::WMAPScanServer
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -122,4 +121,4 @@ class Auxiliary::Scanner::Http::FrontPage_login < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/scanner/http/lucky_punch.rb
View File

@ -12,14 +12,13 @@
require 'rex/proto/http' require 'rex/proto/http'
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Http::Lucky_Punch < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
include Auxiliary::WMAPScanQuery include Msf::Auxiliary::WMAPScanQuery
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize(info = {}) def initialize(info = {})
@ -121,4 +120,4 @@ DECLARE @T varchar(255),@C varchar(255)
end end
end end
end

11
modules/auxiliary/scanner/http/version.rb
View File

@ -12,15 +12,14 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Http::Version < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
# Exploit mixins should be called first # Exploit mixins should be called first
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
include Auxiliary::WMAPScanServer include Msf::Auxiliary::WMAPScanServer
# Scanner mixin should be near last # Scanner mixin should be near last
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -95,4 +94,4 @@ class Auxiliary::Scanner::Http::Version < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/scanner/http/wmap_backup_file.rb
View File

@ -12,14 +12,13 @@
require 'rex/proto/http' require 'rex/proto/http'
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Http::Wmap_Backup_File < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
include Auxiliary::WMAPScanFile include Msf::Auxiliary::WMAPScanFile
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -74,4 +73,4 @@ class Auxiliary::Scanner::Http::Wmap_Backup_File < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/scanner/http/wmap_blind_sql_query.rb
View File

@ -13,14 +13,13 @@ require 'rex/proto/http'
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Http::Wmap_Blind_SQL < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
include Auxiliary::WMAPScanUniqueQuery include Msf::Auxiliary::WMAPScanUniqueQuery
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize(info = {}) def initialize(info = {})
@ -161,4 +160,4 @@ class Auxiliary::Scanner::Http::Wmap_Blind_SQL < Msf::Auxiliary
end end
end end
end end
end

12
modules/auxiliary/scanner/http/wmap_brute_dirs.rb
View File

@ -12,14 +12,13 @@
require 'rex/proto/http' require 'rex/proto/http'
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Http::Wmap_Brute_Dirs < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
include Auxiliary::WMAPScanDir include Msf::Auxiliary::WMAPScanDir
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -97,7 +96,8 @@ class Auxiliary::Scanner::Http::Wmap_Brute_Dirs < Msf::Auxiliary
end end
end end
end
# #
# Used module to do the basic brute forcing. # Used module to do the basic brute forcing.

11
modules/auxiliary/scanner/http/wmap_files_dir.rb
View File

@ -12,13 +12,12 @@
require 'rex/proto/http' require 'rex/proto/http'
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Http::Wmap_Files_Dir < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
include Auxiliary::WMAPScanDir include Msf::Auxiliary::WMAPScanDir
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -73,4 +72,4 @@ class Auxiliary::Scanner::Http::Wmap_Files_Dir < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/scanner/http/wmap_replace_ext.rb
View File

@ -13,14 +13,13 @@ require 'rex/proto/http'
require 'msf/core' require 'msf/core'
require 'pathname' require 'pathname'
module Msf
class Auxiliary::Scanner::Http::Wmap_Replace_Ext < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
include Auxiliary::WMAPScanFile include Msf::Auxiliary::WMAPScanFile
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -86,4 +85,4 @@ class Auxiliary::Scanner::Http::Wmap_Replace_Ext < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/scanner/http/wmap_vhost_scanner.rb
View File

@ -17,14 +17,13 @@ require 'msf/core'
# #
require 'cgi' require 'cgi'
module Msf
class Auxiliary::Scanner::Http::Wmap_Vhost_Scanner < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
include Auxiliary::WMAPScanServer include Msf::Auxiliary::WMAPScanServer
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize(info = {}) def initialize(info = {})
@ -117,4 +116,4 @@ module Msf
end end
end end
end

11
modules/auxiliary/scanner/http/writable.rb
View File

@ -12,15 +12,14 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Http::Writable < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
# Exploit mixins should be called first # Exploit mixins should be called first
include Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
include Auxiliary::WMAPScanDir include Msf::Auxiliary::WMAPScanDir
# Scanner mixin should be near last # Scanner mixin should be near last
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -97,4 +96,4 @@ class Auxiliary::Scanner::Http::Writable < Msf::Auxiliary
end end
end end
end

9
modules/auxiliary/scanner/misc/ib_service_mgr_info.rb
View File

@ -12,14 +12,13 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Misc::Ib_Service_Mgr_Info < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
# Scanner mixin should be near last # Scanner mixin should be near last
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -228,4 +227,4 @@ class Auxiliary::Scanner::Misc::Ib_Service_Mgr_Info < Msf::Auxiliary
end end
end

9
modules/auxiliary/scanner/mssql/mssql_login.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Mssql::Mssql_login < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::MSSQL include Msf::Exploit::Remote::MSSQL
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -46,4 +45,4 @@ class Auxiliary::Scanner::Mssql::Mssql_login < Msf::Auxiliary
end end
end end
end

11
modules/auxiliary/scanner/mssql/mssql_ping.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Mssql::Mssql_ping < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::MSSQL include Msf::Exploit::Remote::MSSQL
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -48,4 +47,4 @@ class Auxiliary::Scanner::Mssql::Mssql_ping < Msf::Auxiliary
end end
end end
end end
end

9
modules/auxiliary/scanner/smb/pipe_auditor.rb
View File

@ -12,15 +12,14 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Smb::Pipe_Auditor < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
# Exploit mixins should be called first # Exploit mixins should be called first
include Exploit::Remote::SMB include Msf::Exploit::Remote::SMB
# Scanner mixin should be near last # Scanner mixin should be near last
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -106,4 +105,4 @@ class Auxiliary::Scanner::Smb::Pipe_Auditor < Msf::Auxiliary
end end
end

11
modules/auxiliary/scanner/smb/pipe_dcerpc_auditor.rb
View File

@ -12,16 +12,15 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Smb::Pipe_DCERPC_Auditor < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
# Exploit mixins should be called first # Exploit mixins should be called first
include Exploit::Remote::SMB include Msf::Exploit::Remote::SMB
include Exploit::Remote::DCERPC include Msf::Exploit::Remote::DCERPC
# Scanner mixin should be near last # Scanner mixin should be near last
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -305,5 +304,5 @@ class Auxiliary::Scanner::Smb::Pipe_DCERPC_Auditor < Msf::Auxiliary
end end
end

9
modules/auxiliary/scanner/smb/version.rb
View File

@ -12,20 +12,19 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Smb::Version < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
# Exploit mixins should be called first # Exploit mixins should be called first
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
# We can't use SMB here, since the SMB mixin # We can't use SMB here, since the SMB mixin
# is not thread-safe and will not become so # is not thread-safe and will not become so
# without a ton of work (self.sock, etc). # without a ton of work (self.sock, etc).
# Scanner mixin should be near last # Scanner mixin should be near last
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
# Aliases for common classes # Aliases for common classes
SIMPLE = Rex::Proto::SMB::SimpleClient SIMPLE = Rex::Proto::SMB::SimpleClient
@ -144,4 +143,4 @@ class Auxiliary::Scanner::Smb::Version < Msf::Auxiliary
end end
end end
end

8
modules/auxiliary/scanner/vnc/vnc_none_auth.rb
View File

@ -8,12 +8,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Scanner::Vnc::Vnc_None_Auth < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -99,4 +98,3 @@ class Auxiliary::Scanner::Vnc::Vnc_None_Auth < Msf::Auxiliary
disconnect disconnect
end end
end end
end

9
modules/auxiliary/server/browser_autopwn.rb
View File

@ -13,12 +13,11 @@
require 'msf/core' require 'msf/core'
require 'rex/exploitation/javascriptosdetect.rb' require 'rex/exploitation/javascriptosdetect.rb'
module Msf
class Auxiliary::Server::BrowserAutoPwn < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::HttpServer::HTML include Msf::Exploit::Remote::HttpServer::HTML
include Auxiliary::Report include Msf::Auxiliary::Report
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -625,5 +624,5 @@ class Auxiliary::Server::BrowserAutoPwn < Msf::Auxiliary
return ret return ret
end end
end end
end

9
modules/auxiliary/server/capture/ftp.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Server::Capture::Ftp < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::TcpServer include Msf::Exploit::Remote::TcpServer
include Auxiliary::Report include Msf::Auxiliary::Report
def initialize def initialize
@ -105,4 +104,4 @@ class Auxiliary::Server::Capture::Ftp < Msf::Auxiliary
end end
end

9
modules/auxiliary/server/capture/http.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Server::Capture::HTTP < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::TcpServer include Msf::Exploit::Remote::TcpServer
include Auxiliary::Report include Msf::Auxiliary::Report
def initialize def initialize
@ -437,4 +436,4 @@ class Auxiliary::Server::Capture::HTTP < Msf::Auxiliary
end end
end end
end

9
modules/auxiliary/server/capture/imap.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Server::Capture::Imap < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::TcpServer include Msf::Exploit::Remote::TcpServer
include Auxiliary::Report include Msf::Auxiliary::Report
def initialize def initialize
@ -99,4 +98,4 @@ class Auxiliary::Server::Capture::Imap < Msf::Auxiliary
end end
end

9
modules/auxiliary/server/capture/pop3.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Server::Capture::Pop3 < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::TcpServer include Msf::Exploit::Remote::TcpServer
include Auxiliary::Report include Msf::Auxiliary::Report
def initialize def initialize
@ -117,4 +116,4 @@ class Auxiliary::Server::Capture::Pop3 < Msf::Auxiliary
end end
end

9
modules/auxiliary/server/capture/smb.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Server::Capture::SMBSniffer < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Report include Msf::Auxiliary::Report
include Exploit::Remote::SMBServer include Msf::Exploit::Remote::SMBServer
def initialize def initialize
super( super(
@ -285,4 +284,4 @@ class Auxiliary::Server::Capture::SMBSniffer < Msf::Auxiliary
end end
end

9
modules/auxiliary/server/capture/smtp.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Server::Capture::Smtp < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::TcpServer include Msf::Exploit::Remote::TcpServer
include Auxiliary::Report include Msf::Auxiliary::Report
def initialize def initialize
@ -143,4 +142,4 @@ class Auxiliary::Server::Capture::Smtp < Msf::Auxiliary
end end
end

7
modules/auxiliary/server/dns/spoofhelper.rb
View File

@ -13,11 +13,10 @@
require 'msf/core' require 'msf/core'
require 'resolv' require 'resolv'
module Msf
class Auxiliary::Server::Dns::SpoofHelper < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Report include Msf::Auxiliary::Report
def initialize def initialize
@ -113,4 +112,4 @@ class Auxiliary::Server::Dns::SpoofHelper < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/server/fakedns.rb
View File

@ -13,11 +13,10 @@
require 'msf/core' require 'msf/core'
require 'resolv' require 'resolv'
module Msf
class Auxiliary::Server::FakeDNS < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Report include Msf::Auxiliary::Report
def initialize def initialize
@ -200,4 +199,4 @@ class Auxiliary::Server::FakeDNS < Msf::Auxiliary
end end
end end
end

9
modules/auxiliary/server/socks_unc.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Server::SocksProxyUNC < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::TcpServer include Msf::Exploit::Remote::TcpServer
include Auxiliary::Report include Msf::Auxiliary::Report
def initialize def initialize
@ -169,4 +168,4 @@ class Auxiliary::Server::SocksProxyUNC < Msf::Auxiliary
end end
end

7
modules/auxiliary/spoof/dns/bailiwicked_domain.rb
View File

@ -3,11 +3,10 @@ require 'net/dns'
require 'scruby' require 'scruby'
require 'resolv' require 'resolv'
module Msf
class Auxiliary::Spoof::Dns::BailiWickedDomain < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Ip include Msf::Exploit::Remote::Ip
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -490,4 +489,4 @@ class Auxiliary::Spoof::Dns::BailiWickedDomain < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/spoof/dns/bailiwicked_host.rb
View File

@ -3,11 +3,10 @@ require 'net/dns'
require 'scruby' require 'scruby'
require 'resolv' require 'resolv'
module Msf
class Auxiliary::Spoof::Dns::BailiWickedHost < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Ip include Msf::Exploit::Remote::Ip
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -482,4 +481,4 @@ class Auxiliary::Spoof::Dns::BailiWickedHost < Msf::Auxiliary
end end
end end
end

5
modules/auxiliary/spoof/dns/compare_results.rb
View File

@ -3,9 +3,8 @@ require 'net/dns'
require 'scruby' require 'scruby'
require 'resolv' require 'resolv'
module Msf
class Auxiliary::Spoof::Dns::CompareResults < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
def initialize(info = {}) def initialize(info = {})
super(update_info(info, super(update_info(info,
@ -174,4 +173,4 @@ class Auxiliary::Spoof::Dns::CompareResults < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/test/capture.rb
View File

@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Test::TestPcap < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Report include Msf::Auxiliary::Report
include Msf::Exploit::Capture include Msf::Exploit::Capture
def initialize def initialize
@ -63,4 +62,4 @@ class Auxiliary::Test::TestPcap < Msf::Auxiliary
end end
end

9
modules/auxiliary/test/ip_spoof.rb
View File

@ -13,12 +13,11 @@
require 'msf/core' require 'msf/core'
require 'scruby' require 'scruby'
module Msf
class Auxiliary::Test::IP_Spoof < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Ip include Msf::Exploit::Remote::Ip
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -52,4 +51,4 @@ class Auxiliary::Test::IP_Spoof < Msf::Auxiliary
end end
end

9
modules/auxiliary/test/recon_passive.rb
View File

@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Test::ReconTestPassive < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Report include Msf::Auxiliary::Report
include Exploit::Remote::Tcp include Msf::Exploit::Remote::Tcp
def initialize def initialize
super( super(
@ -80,4 +79,4 @@ class Auxiliary::Test::ReconTestPassive < Msf::Auxiliary
end end
end

7
modules/auxiliary/test/scanner_batch.rb
View File

@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Test::BatchTest < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -43,4 +42,4 @@ class Auxiliary::Test::BatchTest < Msf::Auxiliary
end end
end end
end

7
modules/auxiliary/test/scanner_host.rb
View File

@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Test::HostTest < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -40,4 +39,4 @@ class Auxiliary::Test::HostTest < Msf::Auxiliary
end end
end

7
modules/auxiliary/test/scanner_range.rb
View File

@ -12,11 +12,10 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Test::RangeTest < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -40,4 +39,4 @@ class Auxiliary::Test::RangeTest < Msf::Auxiliary
end end
end

11
modules/auxiliary/voip/sip_invite_spoof.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,12 +12,11 @@
require 'msf/core' require 'msf/core'
module Msf
class Auxiliary::Voip::SipSpoof < Msf::Auxiliary class Metasploit3 < Msf::Auxiliary
include Exploit::Remote::Udp include Msf::Exploit::Remote::Udp
include Auxiliary::Scanner include Msf::Auxiliary::Scanner
def initialize def initialize
super( super(
@ -62,4 +61,4 @@ class Auxiliary::Voip::SipSpoof < Msf::Auxiliary
end end
end end
end end
end

9
modules/encoders/cmd/generic_sh.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,8 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module Cmd
class GenericSh < Msf::Encoder class Metasploit3 < Msf::Encoder
def initialize def initialize
super( super(
@ -131,4 +128,4 @@ class GenericSh < Msf::Encoder
end end
end end end

7
modules/encoders/generic/none.rb
View File

@ -12,11 +12,8 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module Generic
class None < Msf::Encoder class Metasploit3 < Msf::Encoder
def initialize def initialize
super( super(
@ -40,4 +37,4 @@ class None < Msf::Encoder
end end
end end end

4
modules/encoders/generic/none.rb.ut.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -20,7 +20,7 @@ require 'rex/ui'
require 'msf/core' require 'msf/core'
require 'none' require 'none'
class Msf::Encoders::Generic::None::UnitTest < Test::Unit::TestCase class Metasploit3 < Msf::Test::Unit::TestCase
Klass = Msf::Encoders::Generic::None Klass = Msf::Encoders::Generic::None

7
modules/encoders/mipsbe/longxor.rb
View File

@ -13,11 +13,8 @@
require 'msf/core' require 'msf/core'
require 'metasm' require 'metasm'
module Msf
module Encoders
module Mipsbe
class LongXor < Msf::Encoder::Xor class Metasploit3 < Msf::Encoder::Xor
def initialize def initialize
super( super(
@ -156,4 +153,4 @@ EOS
end end
end end end

7
modules/encoders/mipsle/longxor.rb
View File

@ -13,11 +13,8 @@
require 'msf/core' require 'msf/core'
require 'metasm' require 'metasm'
module Msf
module Encoders
module Mipsle
class LongXor < Msf::Encoder::Xor class Metasploit3 < Msf::Encoder::Xor
def initialize def initialize
super( super(
@ -156,4 +153,4 @@ EOS
end end
end end end

7
modules/encoders/php/base64.rb
View File

@ -12,11 +12,8 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module Php
class Base64 < Msf::Encoder class Metasploit3 < Msf::Encoder
def initialize def initialize
super( super(
@ -69,4 +66,4 @@ class Base64 < Msf::Encoder
end end
end end end

9
modules/encoders/ppc/longxor.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,8 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module Ppc
class LongXor < Msf::Encoder::Xor class Metasploit3 < Msf::Encoder::Xor
def initialize def initialize
super( super(
@ -80,4 +77,4 @@ class LongXor < Msf::Encoder::Xor
end end
end end end

9
modules/encoders/ppc/longxor_tag.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,8 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module Ppc
class LongXorTag < Msf::Encoder::Xor class Metasploit3 < Msf::Encoder::Xor
def initialize def initialize
super( super(
@ -80,4 +77,4 @@ class LongXorTag < Msf::Encoder::Xor
end end
end end end

9
modules/encoders/sparc/longxor_tag.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,8 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module Sparc
class LongXorTag < Msf::Encoder::XorAdditiveFeedback class Metasploit3 < Msf::Encoder::XorAdditiveFeedback
def initialize def initialize
super( super(
@ -73,4 +70,4 @@ class LongXorTag < Msf::Encoder::XorAdditiveFeedback
end end
end end end

9
modules/encoders/x86/alpha_mixed.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -13,11 +13,8 @@
require 'msf/core' require 'msf/core'
require 'rex/encoder/alpha2/alpha_mixed' require 'rex/encoder/alpha2/alpha_mixed'
module Msf
module Encoders
module X86
class AlphaMixed < Msf::Encoder::Alphanum class Metasploit3 < Msf::Encoder::Alphanum
Rank = LowRanking Rank = LowRanking
@ -76,4 +73,4 @@ class AlphaMixed < Msf::Encoder::Alphanum
end end
end end
end end end

9
modules/encoders/x86/alpha_upper.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -13,11 +13,8 @@
require 'msf/core' require 'msf/core'
require 'rex/encoder/alpha2/alpha_upper' require 'rex/encoder/alpha2/alpha_upper'
module Msf
module Encoders
module X86
class AlphaUpper < Msf::Encoder::Alphanum class Metasploit3 < Msf::Encoder::Alphanum
Rank = LowRanking Rank = LowRanking
@ -76,4 +73,4 @@ class AlphaUpper < Msf::Encoder::Alphanum
end end
end end
end end end

7
modules/encoders/x86/avoid_utf8_tolower.rb
View File

@ -12,9 +12,6 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module X86
# #
# NOTE: Read this if you plan on using this encoder: # NOTE: Read this if you plan on using this encoder:
@ -97,7 +94,7 @@ module X86
# 0000004A 3401 xor al,0x1 # 0000004A 3401 xor al,0x1
# 0000004C 7F db 0x7F # 0000004C 7F db 0x7F
# #
class AvoidUtf8 < Msf::Encoder class Metasploit3 < Msf::Encoder
# #
# In some cases, payloads can be an invalid size that is incompatible with # In some cases, payloads can be an invalid size that is incompatible with
@ -284,4 +281,4 @@ class AvoidUtf8 < Msf::Encoder
end end
end end end

9
modules/encoders/x86/call4_dword_xor.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,8 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module X86
class Call4Dword < Msf::Encoder::Xor class Metasploit3 < Msf::Encoder::Xor
def initialize def initialize
super( super(
@ -56,4 +53,4 @@ class Call4Dword < Msf::Encoder::Xor
end end
end end end

4
modules/encoders/x86/call4_dword_xor.rb.ut.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -20,7 +20,7 @@ require 'rex/ui'
require 'msf/core' require 'msf/core'
require 'call4_dword_xor' require 'call4_dword_xor'
class Msf::Encoders::X86::Call4Dword::UnitTest < Test::Unit::TestCase class Metasploit3 < Msf::Test::Unit::TestCase
Klass = Msf::Encoders::X86::Call4Dword Klass = Msf::Encoders::X86::Call4Dword

9
modules/encoders/x86/countdown.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,8 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module X86
class Countdown < Msf::Encoder::Xor class Metasploit3 < Msf::Encoder::Xor
def initialize def initialize
super( super(
@ -69,4 +66,4 @@ class Countdown < Msf::Encoder::Xor
end end
end end end

4
modules/encoders/x86/countdown.rb.ut.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -20,7 +20,7 @@ require 'rex/ui'
require 'msf/core' require 'msf/core'
require 'countdown' require 'countdown'
class Msf::Encoders::X86::Countdown::UnitTest < Test::Unit::TestCase class Metasploit3 < Msf::Test::Unit::TestCase
Klass = Msf::Encoders::X86::Countdown Klass = Msf::Encoders::X86::Countdown

9
modules/encoders/x86/fnstenv_mov.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,11 +12,8 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module X86
class FnstenvMov < Msf::Encoder::Xor class Metasploit3 < Msf::Encoder::Xor
def initialize def initialize
super( super(
@ -60,4 +57,4 @@ class FnstenvMov < Msf::Encoder::Xor
end end
end end end

4
modules/encoders/x86/fnstenv_mov.rb.ut.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -20,7 +20,7 @@ require 'rex/ui'
require 'msf/core' require 'msf/core'
require 'fnstenv_mov' require 'fnstenv_mov'
class Msf::Encoders::X86::FnstenvMov::UnitTest < Test::Unit::TestCase class Metasploit3 < Msf::Test::Unit::TestCase
Klass = Msf::Encoders::X86::FnstenvMov Klass = Msf::Encoders::X86::FnstenvMov

9
modules/encoders/x86/jmp_call_additive.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -12,9 +12,6 @@
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module X86
### ###
# #
@ -32,7 +29,7 @@ module X86
# "\xe8\xef\xff\xff\xff", # call 0x8 # "\xe8\xef\xff\xff\xff", # call 0x8
# #
### ###
class JmpCallAdditive < Msf::Encoder::XorAdditiveFeedback class Metasploit3 < Msf::Encoder::XorAdditiveFeedback
Rank = GreatRanking Rank = GreatRanking
@ -125,4 +122,4 @@ protected
end end
end end end

9
modules/encoders/x86/nonalpha.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -13,11 +13,8 @@
require 'msf/core' require 'msf/core'
require 'rex/encoder/nonalpha' require 'rex/encoder/nonalpha'
module Msf
module Encoders
module X86
class NonAlpha < Msf::Encoder::NonAlpha class Metasploit3 < Msf::Encoder::NonAlpha
Rank = LowRanking Rank = LowRanking
@ -70,4 +67,4 @@ class NonAlpha < Msf::Encoder::NonAlpha
end end
end end
end end end

9
modules/encoders/x86/nonupper.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -13,11 +13,8 @@
require 'msf/core' require 'msf/core'
require 'rex/encoder/nonupper' require 'rex/encoder/nonupper'
module Msf
module Encoders
module X86
class NonUpper < Msf::Encoder::NonUpper class Metasploit3 < Msf::Encoder::NonUpper
Rank = LowRanking Rank = LowRanking
@ -70,4 +67,4 @@ class NonUpper < Msf::Encoder::NonUpper
end end
end end
end end end

7
modules/encoders/x86/shikata_ga_nai.rb
View File

@ -13,11 +13,8 @@
require 'rex/poly' require 'rex/poly'
require 'msf/core' require 'msf/core'
module Msf
module Encoders
module X86
class ShikataGaNai < Msf::Encoder::XorAdditiveFeedback class Metasploit3 < Msf::Encoder::XorAdditiveFeedback
# The shikata encoder has an excellent ranking because it is polymorphic. # The shikata encoder has an excellent ranking because it is polymorphic.
# Party time, excellent! # Party time, excellent!
@ -200,4 +197,4 @@ protected
end end
end end end

9
modules/encoders/x86/unicode_mixed.rb
View File

@ -1,5 +1,5 @@
## ##
# $Id:$ # $Id$
## ##
## ##
@ -13,11 +13,8 @@
require 'msf/core' require 'msf/core'
require 'rex/encoder/alpha2/unicode_mixed' require 'rex/encoder/alpha2/unicode_mixed'
module Msf
module Encoders
module X86
class UnicodeMixed < Msf::Encoder::Alphanum class Metasploit3 < Msf::Encoder::Alphanum
Rank = ManualRanking Rank = ManualRanking
@ -76,4 +73,4 @@ class UnicodeMixed < Msf::Encoder::Alphanum
end end
end end end

Some files were not shown because too many files have changed in this diff Show More