From 638e037e56e1e36659d949116c3486bbad5d2f8a Mon Sep 17 00:00:00 2001 From: bcoles Date: Sun, 6 Oct 2013 19:17:55 +1030 Subject: [PATCH] Remove Java and VLC detection from hook init --- core/main/client/browser.js | 4 ---- core/main/handlers/browserdetails.rb | 16 ---------------- extensions/admin_ui/controllers/panel/panel.rb | 4 ---- .../media/javascript/ui/panel/ZombiesMgr.js | 4 ---- 4 files changed, 28 deletions(-) diff --git a/core/main/client/browser.js b/core/main/client/browser.js index 69ad44975..10c5c7f51 100644 --- a/core/main/client/browser.js +++ b/core/main/client/browser.js @@ -1731,7 +1731,6 @@ beef.browser = { }); var screen_size = beef.browser.getScreenSize(); var window_size = beef.browser.getWindowSize(); - var java_enabled = (beef.browser.javaEnabled()) ? "Yes" : "No"; var vbscript_enabled = (beef.browser.hasVBScript()) ? "Yes" : "No"; var has_flash = (beef.browser.hasFlash()) ? "Yes" : "No"; var has_phonegap = (beef.browser.hasPhonegap()) ? "Yes" : "No"; @@ -1743,7 +1742,6 @@ beef.browser = { var has_quicktime = (beef.browser.hasQuickTime()) ? "Yes" : "No"; var has_realplayer = (beef.browser.hasRealPlayer()) ? "Yes" : "No"; var has_wmp = (beef.browser.hasWMP()) ? "Yes" : "No"; - var has_vlc = (beef.browser.hasVLC()) ? "Yes" : "No"; var has_foxit = (beef.browser.hasFoxit()) ? "Yes" : "No"; try{ var cookies = document.cookie; @@ -1778,7 +1776,6 @@ beef.browser = { if (browser_type) details['BrowserType'] = browser_type; if (screen_size) details['ScreenSize'] = screen_size; if (window_size) details['WindowSize'] = window_size; - if (java_enabled) details['JavaEnabled'] = java_enabled; if (vbscript_enabled) details['VBScriptEnabled'] = vbscript_enabled; if (has_flash) details['HasFlash'] = has_flash; if (has_phonegap) details['HasPhonegap'] = has_phonegap; @@ -1790,7 +1787,6 @@ beef.browser = { if (has_quicktime) details['HasQuickTime'] = has_quicktime; if (has_realplayer) details['HasRealPlayer'] = has_realplayer; if (has_wmp) details['HasWMP'] = has_wmp; - if (has_vlc) details['HasVLC'] = has_vlc; if (has_foxit) details['HasFoxit'] = has_foxit; return details; diff --git a/core/main/handlers/browserdetails.rb b/core/main/handlers/browserdetails.rb index 7f851c923..0e65168b0 100644 --- a/core/main/handlers/browserdetails.rb +++ b/core/main/handlers/browserdetails.rb @@ -250,14 +250,6 @@ module BeEF self.err_msg "Invalid window size returned from the hook browser's initial connection." end - # get and store the yes|no value for JavaEnabled - java_enabled = get_param(@data['results'], 'JavaEnabled') - if BeEF::Filters.is_valid_yes_no?(java_enabled) - BD.set(session_id, 'JavaEnabled', java_enabled) - else - self.err_msg "Invalid value for JavaEnabled returned from the hook browser's initial connection." - end - # get and store the yes|no value for VBScriptEnabled vbscript_enabled = get_param(@data['results'], 'VBScriptEnabled') if BeEF::Filters.is_valid_yes_no?(vbscript_enabled) @@ -354,14 +346,6 @@ module BeEF self.err_msg "Invalid value for HasWMP returned from the hook browser's initial connection." end - # get and store the yes|no value for HasVLC - has_vlc = get_param(@data['results'], 'HasVLC') - if BeEF::Filters.is_valid_yes_no?(has_vlc) - BD.set(session_id, 'HasVLC', has_vlc) - else - self.err_msg "Invalid value for HasVLC returned from the hook browser's initial connection." - end - # get and store the value for CPU cpu_type = get_param(@data['results'], 'CPU') if !cpu_type.nil? diff --git a/extensions/admin_ui/controllers/panel/panel.rb b/extensions/admin_ui/controllers/panel/panel.rb index 255deef34..ecc51755f 100644 --- a/extensions/admin_ui/controllers/panel/panel.rb +++ b/extensions/admin_ui/controllers/panel/panel.rb @@ -87,14 +87,12 @@ module BeEF has_flash = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasFlash') has_web_sockets = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasWebSocket') has_googlegears = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasGoogleGears') - has_java = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'JavaEnabled') has_webrtc = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasWebRTC') has_activex = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasActiveX') has_silverlight = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasSilverlight') has_quicktime = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasQuickTime') has_realplayer = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasRealPlayer') has_wmp = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasWMP') - has_vlc = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasVLC') has_foxit = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasFoxit') date_stamp = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'DateStamp') @@ -113,13 +111,11 @@ module BeEF 'has_flash' => has_flash, 'has_web_sockets' => has_web_sockets, 'has_googlegears' => has_googlegears, - 'has_java' => has_java, 'has_webrtc' => has_webrtc, 'has_activex' => has_activex, 'has_silverlight' => has_silverlight, 'has_quicktime' => has_quicktime, 'has_wmp' => has_wmp, - 'has_vlc' => has_vlc, 'has_foxit' => has_foxit, 'has_realplayer' => has_realplayer, 'date_stamp' => date_stamp diff --git a/extensions/admin_ui/media/javascript/ui/panel/ZombiesMgr.js b/extensions/admin_ui/media/javascript/ui/panel/ZombiesMgr.js index 02c2a4106..c05c42fe9 100644 --- a/extensions/admin_ui/media/javascript/ui/panel/ZombiesMgr.js +++ b/extensions/admin_ui/media/javascript/ui/panel/ZombiesMgr.js @@ -26,11 +26,9 @@ var ZombiesMgr = function(zombies_tree_lists) { var has_flash = zombie_array[index]["has_flash"]; var has_web_sockets = zombie_array[index]["has_web_sockets"]; var has_googlegears = zombie_array[index]["has_googlegears"]; - var has_java = zombie_array[index]["has_java"]; var has_webrtc = zombie_array[index]["has_webrtc"]; var has_activex = zombie_array[index]["has_activex"]; var has_wmp = zombie_array[index]["has_wmp"]; - var has_vlc = zombie_array[index]["has_vlc"]; var has_foxit = zombie_array[index]["has_foxit"]; var has_silverlight = zombie_array[index]["has_silverlight"]; var has_quicktime = zombie_array[index]["has_quicktime"]; @@ -48,14 +46,12 @@ var ZombiesMgr = function(zombies_tree_lists) { balloon_text+= "
Hardware: " + hw_name; balloon_text+= "
Domain: " + domain + ":" + port; balloon_text+= "
Flash: " + has_flash; - balloon_text+= "
Java: " + has_java; balloon_text+= "
Web Sockets: " + has_web_sockets; balloon_text+= "
WebRTC: " + has_webrtc; balloon_text+= "
ActiveX: " + has_activex; balloon_text+= "
Silverlight: " + has_silverlight; balloon_text+= "
QuickTime: " + has_quicktime; balloon_text+= "
Windows MediaPlayer: " + has_wmp; - balloon_text+= "
VLC: " + has_vlc; balloon_text+= "
Foxit: " + has_foxit; balloon_text+= "
RealPlayer: " + has_realplayer; balloon_text+= "
Google Gears: " + has_googlegears;