lib/arachni/framework/parts/plugin.rb in arachni-1.3.2 vs lib/arachni/framework/parts/plugin.rb in arachni-1.4
- old
+ new
@@ -1,7 +1,7 @@
=begin
- Copyright 2010-2015 Tasos Laskos <tasos.laskos@arachni-scanner.com>
+ Copyright 2010-2016 Tasos Laskos <tasos.laskos@arachni-scanner.com>
This file is part of the Arachni Framework project and is subject to
redistribution and commercial restrictions. Please see the Arachni Framework
web site for more information on licensing and terms of use.
=end
@@ -30,11 +30,11 @@
begin
@plugins.clear
@plugins.available.map do |plugin|
path = @plugins.name_to_path( plugin )
- next if !list_plugin?( path, patterns )
+ next if patterns && !@plugins.matches_globs?( path, patterns )
@plugins[plugin].info.merge(
options: @plugins[plugin].info[:options] || [],
shortname: plugin,
path: path,
@@ -44,15 +44,9 @@
end.compact
ensure
@plugins.clear
@plugins.load loaded
end
- end
-
- private
-
- def list_plugin?( path, patterns = nil )
- regexp_array_match( patterns, path )
end
end
end