Adds 141 passing specs to Msf::Module#search_filter.
* tests exclusion functionality, type: matching, port: matching, app: matching, platform: matching, author: matching, text: matching, name: matching, and path: matching. [RM #4790]unstable
Joe Vennix
parent
54af2929f5
commit
f4b0ab8184
|
|
@ -110,10 +110,8 @@ class Module
|
|||
# hash.
|
||||
#
|
||||
def initialize(info = {})
|
||||
|
||||
@module_info_copy = info.dup
|
||||
|
||||
|
||||
self.module_info = info
|
||||
generate_uuid
|
||||
|
||||
|
|
@ -133,6 +131,7 @@ class Module
|
|||
|
||||
# Create and initialize the option container for this module
|
||||
self.options = OptionContainer.new
|
||||
|
||||
self.options.add_options(info['Options'], self.class)
|
||||
self.options.add_advanced_options(info['AdvancedOptions'], self.class)
|
||||
self.options.add_evasion_options(info['EvasionOptions'], self.class)
|
||||
|
|
@ -680,9 +679,6 @@ class Module
|
|||
k = res
|
||||
|
||||
refs = self.references.map{|x| [x.ctx_id, x.ctx_val].join("-") }
|
||||
is_exploit = (self.type == "exploit")
|
||||
is_auxiliary = (self.type == "auxiliary")
|
||||
is_post = (self.type == "post")
|
||||
is_server = (self.respond_to?(:stance) and self.stance == "aggressive")
|
||||
is_client = (self.respond_to?(:stance) and self.stance == "passive")
|
||||
|
||||
|
|
@ -719,9 +715,7 @@ class Module
|
|||
when 'port'
|
||||
match = [t,w] if self.datastore['RPORT'].to_s =~ r
|
||||
when 'type'
|
||||
match = [t,w] if (w == "exploit" and is_exploit)
|
||||
match = [t,w] if (w == "auxiliary" and is_auxiliary)
|
||||
match = [t,w] if (w == "post" and is_post)
|
||||
match = [t,w] if Msf::MODULE_TYPES.any? { |modt| w == modt and self.type == modt }
|
||||
when 'app'
|
||||
match = [t,w] if (w == "server" and is_server)
|
||||
match = [t,w] if (w == "client" and is_client)
|
||||
|
|
@ -741,7 +735,7 @@ class Module
|
|||
return true
|
||||
end
|
||||
end
|
||||
# Filter this module if we matched an exlusion keyword (-value)
|
||||
# Filter this module if we matched an exclusion keyword (-value)
|
||||
if mode == 1 and match
|
||||
return true
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,166 @@
|
|||
# -*- coding:binary -*-
|
||||
require 'spec_helper'
|
||||
require 'msf/core/module'
|
||||
require 'msf/core/module/platform_list'
|
||||
|
||||
shared_examples "search_filter" do |opts|
|
||||
accept = opts[:accept] || []
|
||||
reject = opts[:reject] || []
|
||||
|
||||
accept.each do |query|
|
||||
it "should accept a query containing '#{query}'" do
|
||||
# if the subject matches, search_filter returns false ("don't filter me out!")
|
||||
subject.search_filter(query).should be_false
|
||||
end
|
||||
|
||||
unless opts.has_key?(:test_inverse) and not opts[:test_inverse]
|
||||
it "should reject a query containing '-#{query}'" do
|
||||
subject.search_filter("-#{query}").should be_true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
reject.each do |query|
|
||||
it "should reject a query containing '#{query}'" do
|
||||
# if the subject doesn't matches, search_filter returns true ("filter me out!")
|
||||
subject.search_filter(query).should be_true
|
||||
end
|
||||
|
||||
unless opts.has_key?(:test_inverse) and not opts[:test_inverse]
|
||||
it "should accept a query containing '-#{query}'" do
|
||||
subject.search_filter("-#{query}").should be_true # what? why?
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
describe Msf::Module do
|
||||
describe '#search_filter' do
|
||||
before { subject.stub(:type => 'server') }
|
||||
let(:opts) { Hash.new }
|
||||
subject { Msf::Module.new(opts) }
|
||||
|
||||
accept = []
|
||||
reject = []
|
||||
|
||||
context 'on a blank query' do
|
||||
it_should_behave_like 'search_filter', :accept => [''], :test_inverse => false
|
||||
end
|
||||
|
||||
context 'on a client module' do
|
||||
before { subject.stub(:stance => 'passive') }
|
||||
accept = %w(app:client)
|
||||
reject = %w(app:server)
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
|
||||
context 'on a server module' do
|
||||
before { subject.stub(:stance => 'aggressive') }
|
||||
accept = %w(app:server)
|
||||
reject = %w(app:client)
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
|
||||
context 'on a module with the author "joev"' do
|
||||
let(:opts) { ({ 'Author' => ['joev'] }) }
|
||||
accept = %w(author:joev author:joe)
|
||||
reject = %w(author:unrelated)
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
|
||||
context 'on a module with the authors "joev" and "blarg"' do
|
||||
let(:opts) { ({ 'Author' => ['joev', 'blarg'] }) }
|
||||
accept = %w(author:joev author:joe)
|
||||
reject = %w(author:sinn3r)
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
|
||||
context 'on a module that supports the osx platform' do
|
||||
let(:opts) { ({ 'Platform' => %w(osx) }) }
|
||||
accept = %w(platform:osx)
|
||||
reject = %w(platform:bsd platform:windows platform:unix)
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
|
||||
context 'on a module that supports the linux platform' do
|
||||
let(:opts) { ({ 'Platform' => %w(linux) }) }
|
||||
accept = %w(platform:linux)
|
||||
reject = %w(platform:bsd platform:windows platform:unix)
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
|
||||
context 'on a module that supports the windows platform' do
|
||||
let(:opts) { ({ 'Platform' => %w(windows) }) }
|
||||
accept = %w(platform:windows)
|
||||
reject = %w(platform:bsd platform:osx platform:unix)
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
|
||||
context 'on a module that supports the osx and linux platforms' do
|
||||
let(:opts) { ({ 'Platform' => %w(osx linux) }) }
|
||||
accept = %w(platform:osx platform:linux)
|
||||
reject = %w(platform:bsd platform:windows platform:unix)
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
|
||||
context 'on a module that supports the windows and irix platforms' do
|
||||
let(:opts) { ({ 'Platform' => %w(windows irix) }) }
|
||||
accept = %w(platform:windows platform:irix)
|
||||
reject = %w(platform:bsd platform:osx platform:linux)
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
|
||||
context 'on a module with a default RPORT of 5555' do
|
||||
before { subject.stub(:datastore => { 'RPORT' => 5555 }) }
|
||||
accept = %w(port:5555)
|
||||
reject = %w(port:5556)
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
|
||||
context 'on a module with a #name of "blah"' do
|
||||
before { subject.stub(:name => 'blah') }
|
||||
it_should_behave_like 'search_filter', :accept => %w(text:blah), :reject => %w(text:foo)
|
||||
it_should_behave_like 'search_filter', :accept => %w(name:blah), :reject => %w(name:foo)
|
||||
end
|
||||
|
||||
context 'on a module with a #fullname of "blah"' do
|
||||
before { subject.stub(:fullname => 'blah/blah') }
|
||||
it_should_behave_like 'search_filter', :accept => %w(text:blah), :reject => %w(text:foo)
|
||||
it_should_behave_like 'search_filter', :accept => %w(path:blah), :reject => %w(path:foo)
|
||||
end
|
||||
|
||||
context 'on a module with a #description of "blah"' do
|
||||
before { subject.stub(:description => 'blah') }
|
||||
it_should_behave_like 'search_filter', :accept => %w(text:blah), :reject => %w(text:foo)
|
||||
end
|
||||
|
||||
context 'when filtering by module #type' do
|
||||
all_module_types = Msf::MODULE_TYPES
|
||||
all_module_types.each do |mtype|
|
||||
context "on a #{mtype} module" do
|
||||
before(:each) { subject.stub(:type => mtype) }
|
||||
|
||||
accept = ["type:#{mtype}"]
|
||||
reject = all_module_types.reject { |t| t == mtype }.map { |t| "type:#{t}" }
|
||||
|
||||
it_should_behave_like 'search_filter', :accept => accept, :reject => reject
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
#
|
||||
# Still missing 'cve:', 'bid:', 'osvdb:', and 'edb:' test cases...
|
||||
#
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue