Hiddenden/beef
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Christian Frichot
2013-07-01 16:22:20 +08:00
parent 570a8266ed f6ebe9fac0
commit 0b1c753bd3
9 changed files with 0 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/main/client/browser.js
View File

@@ -1094,47 +1094,6 @@ beef.browser = {
}
},
/**
* Checks if the zombie has the Unity Web Player plugin installed.
* @return: {Boolean} true or false.
*
* @example: if ( beef.browser.hasUnity() ) { ... }
*/
hasUnity:function () {
var unity = false;
// Not Internet Explorer
if (!this.type().IE) {
if (navigator.mimeTypes["application/vnd.unity"].enabledPlugin &&
navigator.plugins &&
navigator.plugins["Unity Player"]) {
unity = true;
}
// Internet Explorer
} else {
try {
var qt_test = new ActiveXObject('UnityWebPlayer.UnityWebPlayer.1');
} catch (e) {
}
if (qt_test) {
unity = true;
}
}
return unity;
},
/**
* Checks if the zombie has the QuickTime plugin installed.
* @return: {Boolean} true or false.
@@ -1586,11 +1545,6 @@ beef.browser = {
version = control.getVariable('$version').substring(4);
return 'Flash Player v' + version.replace(/,/g, ".");
}},
'Unity':{
'control':'UnityWebPlayer.UnityWebPlayer.1',
'return':function (control) {
return 'Unity Web Player';
}},
'Quicktime':{
'control':'QuickTime.QuickTime',
'return':function (control) {
@@ -1704,7 +1658,6 @@ beef.browser = {
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_unity = (beef.browser.hasUnity()) ? "Yes" : "No";
var has_phonegap = (beef.browser.hasPhonegap()) ? "Yes" : "No";
var has_googlegears = (beef.browser.hasGoogleGears()) ? "Yes" : "No";
var has_web_socket = (beef.browser.hasWebSocket()) ? "Yes" : "No";
@@ -1752,7 +1705,6 @@ beef.browser = {
if (java_enabled) details['JavaEnabled'] = java_enabled;
if (vbscript_enabled) details['VBScriptEnabled'] = vbscript_enabled;
if (has_flash) details['HasFlash'] = has_flash;
if (has_unity) details['HasUnity'] = has_unity;
if (has_phonegap) details['HasPhonegap'] = has_phonegap;
if (has_web_socket) details['HasWebSocket'] = has_web_socket;
if (has_googlegears) details['HasGoogleGears'] = has_googlegears;

8
core/main/handlers/browserdetails.rb
View File

@@ -222,14 +222,6 @@ module BeEF
else
self.err_msg "Invalid value for HasFlash returned from the hook browser's initial connection."
end
# get and store the yes|no value for HasUnity
has_unity = get_param(@data['results'], 'HasUnity')
if BeEF::Filters.is_valid_yes_no?(has_unity)
BD.set(session_id, 'HasUnity', has_unity)
else
self.err_msg "Invalid value for HasUnity returned from the hook browser's initial connection."
end
# get and store the yes|no value for HasPhonegap
has_phonegap = get_param(@data['results'], 'HasPhonegap')

1
extensions/admin_ui/controllers/modules/modules.rb
View File

@@ -75,7 +75,6 @@ class Modules < BeEF::Extension::AdminUI::HttpController
# Browser Components
['Browser Components', 'Flash', 'HasFlash'],
['Browser Components', 'Unity Web Player', 'HasUnity'],
['Browser Components', 'Java', 'JavaEnabled'],
['Browser Components', 'VBScript', 'VBScriptEnabled'],
['Browser Components', 'PhoneGap', 'HasPhonegap'],

2
extensions/admin_ui/controllers/panel/panel.rb
View File

@@ -85,7 +85,6 @@ module BeEF
hw_name = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'Hardware')
domain = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HostName')
has_flash = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasFlash')
has_unity = BeEF::Core::Models::BrowserDetails.get(hooked_browser.session, 'HasUnity')
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')
@@ -112,7 +111,6 @@ module BeEF
'hw_icon' => hw_icon,
'hw_name' => hw_name,
'has_flash' => has_flash,
'has_unity' => has_unity,
'has_web_sockets' => has_web_sockets,
'has_googlegears' => has_googlegears,
'has_java' => has_java,

2
extensions/admin_ui/media/javascript/ui/panel/ZombiesMgr.js
View File

@@ -24,7 +24,6 @@ var ZombiesMgr = function(zombies_tree_lists) {
var domain = zombie_array[index]["domain"];
var port = zombie_array[index]["port"];
var has_flash = zombie_array[index]["has_flash"];
var has_unity = zombie_array[index]["has_unity"];
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"];
@@ -49,7 +48,6 @@ var ZombiesMgr = function(zombies_tree_lists) {
balloon_text+= "<br/>Hardware: " + hw_name;
balloon_text+= "<br/>Domain: " + domain + ":" + port;
balloon_text+= "<br/>Flash: " + has_flash;
balloon_text+= "<br/>Unity Web Player: " + has_unity;
balloon_text+= "<br/>Java: " + has_java;
balloon_text+= "<br/>Web Sockets: " + has_web_sockets;
balloon_text+= "<br/>WebRTC: " + has_webrtc;

1
extensions/console/lib/shellinterface.rb
View File

@@ -291,7 +291,6 @@ class ShellInterface
# Browser Components
['Browser Components', 'Flash', 'HasFlash'],
['Browser Components', 'Unity Web Player', 'HasUnity'],
['Browser Components', 'Java', 'JavaEnabled'],
['Browser Components', 'VBScript', 'VBScriptEnabled'],
['Browser Components', 'PhoneGap', 'HasPhonegap'],

14
modules/browser/detect_unity/command.js
View File

@@ -1,14 +0,0 @@
//
// Copyright (c) 2006-2013 Wade Alcorn - wade@bindshell.net
// Browser Exploitation Framework (BeEF) - http://beefproject.com
// See the file 'doc/COPYING' for copying permission
//
beef.execute(function() {
var result = (beef.browser.hasUnity())? "Yes" : "No";
beef.net.send("<%= @command_url %>", <%= @command_id %>, "unity="+result);
});

15
modules/browser/detect_unity/config.yaml
View File

@@ -1,15 +0,0 @@
#
# Copyright (c) 2006-2013 Wade Alcorn - wade@bindshell.net
# Browser Exploitation Framework (BeEF) - http://beefproject.com
# See the file 'doc/COPYING' for copying permission
#
beef:
module:
detect_unity:
enable: true
category: "Browser"
name: "Detect Unity Web Player"
description: "This module will check if the browser has Unity support."
authors: ["gcattani"]
target:
working: ["All"]

14
modules/browser/detect_unity/module.rb
View File

@@ -1,14 +0,0 @@
#
# Copyright (c) 2006-2013 Wade Alcorn - wade@bindshell.net
# Browser Exploitation Framework (BeEF) - http://beefproject.com
# See the file 'doc/COPYING' for copying permission
#
class Detect_unity < BeEF::Core::Command
def post_execute
content = {}
content['unity'] = @datastore['unity']
save content
end
end