-) removed double entries in output

-) Output is now sorted
This commit is contained in:
Christian Mehlmauer
2012-09-16 00:35:06 +02:00
parent 08506b02c9
commit 611a6dd377
6 changed files with 26 additions and 9 deletions

View File

@@ -28,7 +28,7 @@ module WpPlugins
options[:vulns_xpath_2] = "//plugin"
options[:type] = "plugins"
result = WpDetector.aggressive_detection(options)
result
result.sort_by { |p| p.name }
end
private
@@ -51,7 +51,7 @@ module WpPlugins
:wp_content_dir => wp_content_dir
)
end
plugins
plugins.sort_by { |p| p.name }
end
end

View File

@@ -25,7 +25,7 @@ module WpThemes
options[:vulns_xpath_2] = "//theme"
options[:type] = "themes"
result = WpDetector.aggressive_detection(options)
result
result.sort_by { |t| t.name }
end
private
@@ -42,7 +42,7 @@ module WpThemes
:wp_content_dir => wp_content_dir
)
end
themes
themes.sort_by { |t| t.name }
end
end

View File

@@ -28,7 +28,17 @@ class WpDetector
enum_results = WpEnumerator.enumerate(options)
enum_results.each do |enum_result|
result << enum_result
already_present = false
result.each do |r|
# Already found via passive detection
if r.name == enum_result.name
already_present = true
break
end
end
if not already_present
result << enum_result
end
end
result
end

View File

@@ -21,6 +21,8 @@ require "#{WPSCAN_LIB_DIR}/vulnerable"
class WpPlugin < Vulnerable
include WpItem
attr_reader :name
def initialize(options = {})
@base_url = options[:url]
@path = options[:path]