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

Rename 'System Platform' to 'Browser Platform'

Browse Source
This commit is contained in:
bcoles
2013-02-03 05:24:48 +10:30
parent 95970d5364
commit 449c6633aa
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -977,7 +977,7 @@ return !!window.devicePixelRatio && !!window.history.replaceState && window.navi
var os_name = beef.os.getName();
var hw_name = beef.hardware.getName();
var cpu_type = beef.hardware.cpuType();
var system_platform = (typeof(navigator.platform) != "undefined" && navigator.platform != "") ? navigator.platform : null;
var browser_platform = (typeof(navigator.platform) != "undefined" && navigator.platform != "") ? navigator.platform : null;
var browser_type = JSON.stringify(beef.browser.type(), function (key, value) {if (value == true) return value; else if (typeof value == 'object') return value; else return;});
var screen_size = beef.browser.getScreenSize();
var window_size = beef.browser.getWindowSize();
@@ -1006,7 +1006,7 @@ return !!window.devicePixelRatio && !!window.history.replaceState && window.navi
if(hw_name) details['Hardware'] = hw_name;
if(cpu_type) details['CPU'] = cpu_type;
if(date_stamp) details['DateStamp'] = date_stamp;
if(system_platform) details['SystemPlatform'] = system_platform;
if(browser_platform) details['BrowserPlatform'] = browser_platform;
if(browser_type) details['BrowserType'] = browser_type;
if(screen_size) details['ScreenSize'] = screen_size;
if(window_size) details['WindowSize'] = window_size;

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

@@ -168,11 +168,11 @@ module BeEF
end
# get and store the system platform
system_platform = get_param(@data['results'], 'SystemPlatform')
system_platform = get_param(@data['results'], 'BrowserPlatform')
if BeEF::Filters.is_valid_system_platform?(system_platform)
BD.set(session_id, 'SystemPlatform', system_platform)
BD.set(session_id, 'BrowserPlatform', system_platform)
else
self.err_msg "Invalid system platform returned from the hook browser's initial connection."
self.err_msg "Invalid browser platform returned from the hook browser's initial connection."
end
# get and store the hooked browser type

20
core/main/rest/handlers/hookedbrowsers.rb
View File

@@ -72,15 +72,15 @@ module BeEF
details = BeEF::Core::Models::BrowserDetails
{
'id' => hb.id,
'session' => hb.session,
'name' => details.get(hb.session, 'BrowserName'),
'version' => details.get(hb.session, 'BrowserVersion'),
'os' => details.get(hb.session, 'OsName'),
'platform' => details.get(hb.session, 'SystemPlatform'),
'ip' => hb.ip,
'domain' => details.get(hb.session, 'HostName'),
'port' => hb.port.to_s,
'id' => hb.id,
'session' => hb.session,
'name' => details.get(hb.session, 'BrowserName'),
'version' => details.get(hb.session, 'BrowserVersion'),
'os' => details.get(hb.session, 'OsName'),
'platform' => details.get(hb.session, 'BrowserPlatform'),
'ip' => hb.ip,
'domain' => details.get(hb.session, 'HostName'),
'port' => hb.port.to_s,
'page_uri' => details.get(hb.session, 'PageURI')
}
end
@@ -88,4 +88,4 @@ module BeEF
end
end
end
end
end

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

@@ -240,14 +240,14 @@ class Modules < BeEF::Extension::AdminUI::HttpController
summary_grid_hash['results'].push(page_name_row) # add the row
end
# set and add the System Platform
system_platform = BD.get(zombie_session, 'SystemPlatform')
# set and add the Browser Platform
system_platform = BD.get(zombie_session, 'BrowserPlatform')
if not system_platform.nil?
encoded_system_platform = CGI.escapeHTML(system_platform)
encoded_system_platform_hash = { 'System Platform' => encoded_system_platform }
page_name_row = {
'category' => 'Host',
'category' => 'Browser',
'data' => encoded_system_platform_hash,
'from' => 'Initialization'
}

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

@@ -455,13 +455,13 @@ class ShellInterface
end
# set and add the System Platform
system_platform = BD.get(self.targetsession, 'SystemPlatform')
system_platform = BD.get(self.targetsession, 'BrowserPlatform')
if not system_platform.nil?
encoded_system_platform = CGI.escapeHTML(system_platform)
encoded_system_platform_hash = { 'System Platform' => encoded_system_platform }
encoded_system_platform_hash = { 'Browser Platform' => encoded_system_platform }
page_name_row = {
'category' => 'Host',
'category' => 'Browser',
'data' => encoded_system_platform_hash,
'from' => 'Initialization'
}