From 97672966df75b72460be2d7b00bc52799cfb51fe Mon Sep 17 00:00:00 2001
From: Keith Lee <keith.lee2012@gmail.com>
Date: Wed, 7 Mar 2012 01:41:27 +0800
Subject: [PATCH 1/2] Fix for issues 567 and also remove multiple calls to
 beef.browser.hasJava() from /beef/core/main/client/net/local.js

---
 core/main/client/browser.js           |  26 ++++++++++++++++--
 core/main/client/net/local.js         |  38 ++++++++++++++++++--------
 extensions/demos/html/checkJava.class | Bin 0 -> 392 bytes
 extensions/demos/html/checkJava.jar   | Bin 0 -> 710 bytes
 extensions/demos/html/checkJava.java  |  19 +++++++++++++
 5 files changed, 70 insertions(+), 13 deletions(-)
 create mode 100644 extensions/demos/html/checkJava.class
 create mode 100644 extensions/demos/html/checkJava.jar
 create mode 100755 extensions/demos/html/checkJava.java

diff --git a/core/main/client/browser.js b/core/main/client/browser.js
index 36b7c8ebf..06a699e98 100644
--- a/core/main/client/browser.js
+++ b/core/main/client/browser.js
@@ -499,11 +499,33 @@ beef.browser = {
 	 *
 	 * @example: if(beef.browser.hasJava()) { ... }
 	 */
+ 	
 	hasJava: function() {
 		if(!this.type().IE && window.navigator.javaEnabled && window.navigator.javaEnabled()) {
-			return true;
+			//If chrome detected, return false.  Do not run java applet
+	                if(beef.browser.isC()){
+				return false;
+
+			}
+			
+			else{
+				//Create java applet here and test for execution
+				var applet_archive = 'http://'+beef.net.host+ ':' + beef.net.port + '/demos/checkJava.jar';
+    				var applet_id = 'checkJava';
+    				var applet_name = 'checkJava';
+    				var output;
+    				beef.dom.attachApplet(applet_id, 'Microsoft_Corporation', 'checkJava' ,
+  					null, applet_archive, null);
+    				output = document.Microsoft_Corporation.getInfo();
+				beef.dom.detachApplet('checkJava');
+				if(output=1){
+					return true;
+				}
+				else{
+					return false;
+				}
+			}	
 		}
-		return false;
 	},
 	
 	/**
diff --git a/core/main/client/net/local.js b/core/main/client/net/local.js
index 858b75bd0..5aa7087ec 100644
--- a/core/main/client/net/local.js
+++ b/core/main/client/net/local.js
@@ -21,6 +21,8 @@
 beef.net.local = {
 	
 	sock: false,
+	checkJava: false,
+	hasJava: false,
 	
 	/**
 	 * Initializes the java socket. We have to use this method because
@@ -29,16 +31,30 @@ beef.net.local = {
 	 * is invalid:
 	 * sock: new java.net.Socket();
 	 */
+
 	initializeSocket: function() {
-		if(! beef.browser.hasJava()) return -1;
-		
-		try {
-			this.sock = new java.net.Socket();
-		} catch(e) {
-			return -1;
+		if(this.checkJava){	
+			if(!beef.browser.hasJava()) {
+				this.checkJava=True;
+				this.hasJava=False;
+				return -1;
+			}else{
+				this.checkJava=True;
+				this.hasJava=True;
+				return 1;
+			}
+		}
+		else{
+			if(!this.hasJava) return -1;
+			else{	
+				try {
+					this.sock = new java.net.Socket();
+				} catch(e) {
+					return -1;
+				}
+				return 1;
+			}
 		}
-		
-		return 1;
 	},
 	
 	/**
@@ -47,7 +63,7 @@ beef.net.local = {
 	 * @error: return -1 if the internal ip cannot be retrieved.
 	 */
 	getLocalAddress: function() {
-		if(! beef.browser.hasJava()) return false;
+		if(!this.hasJava) return false;
 		
 		this.initializeSocket();
 		
@@ -65,7 +81,7 @@ beef.net.local = {
 	 * @error: return -1 if the hostname cannot be retrieved.
 	 */
 	getLocalHostname: function() {
-		if(! beef.browser.hasJava()) return false;
+		if(!this.hasJava) return false;
 		
 		this.initializeSocket();
 		
@@ -79,4 +95,4 @@ beef.net.local = {
 	
 };
 
-beef.regCmp('beef.net.local');
\ No newline at end of file
+beef.regCmp('beef.net.local');
diff --git a/extensions/demos/html/checkJava.class b/extensions/demos/html/checkJava.class
new file mode 100644
index 0000000000000000000000000000000000000000..29d25e0e23dda9fdf3f55168d0216d75cb39b9e2
GIT binary patch
literal 392
zcmZ9IKTE?<6vfX?Uj8<wwd&yDAULRlh0a9~L8yp};-1E*Mq^Ua#82g-4uXRpzz-#!
z_mB?FaPH%t-#J|J^ZWG;V2rI83hNPE3<GQg*c1efUUX%<5Xe;EPl~E&j|J}j!Hqzj
z*0);FzbGnw**(v6bDhmfZj`|ozSr%vx~nbEcsR++|AP3c?wVYm6$Vf92c18iXD`{&
zBPBtAFo6eO5G^gi(3qoaJ}-4UI<W)0JXY~|k|w~H;+uK90d_crTkr4_@@B!9>f2?H
z+FPRA)@9WymJ&;_MvaK<ahk?ZeZYB#^J-(JG=@VRn19I9bXja}FrVi#v09$c?9+5G
F_ya4gHNyY^

literal 0
HcmV?d00001

diff --git a/extensions/demos/html/checkJava.jar b/extensions/demos/html/checkJava.jar
new file mode 100644
index 0000000000000000000000000000000000000000..aac470619226b61d40fb283d0b350f14b79d7800
GIT binary patch
literal 710
zcmWIWW@Zs#-~d8T&U6O`B*4kQ!r<!~;;8HC=cfPf6axb@Lx49s2S^1IR9OH{%_2Y*
zaLvAsex7cw!6ACSZl8V6oc8h7)w{^+t*dqJ%=yhh23L$9JT21m^40P5y;!=6g>%MB
z$s^K{S{W8%B2SiRRXkIDo%yNgV-X|R_UXnejckBsgD}E&7c{5y17(vlQj@d263Y_x
zl5-M^i&H1qdmj!EIePx=|7C`2L)qEc4?4=~l;|~aIJw4%d^fQ(m6|+Btxik4R6ynr
zL!HLQJ?<PU@-4m>y?-yG_x|<o$HE6#q!ne>d`n1vl6>~~t^@0@Y&!XRsY4o5{w&eR
zT8$0m-`BC6E3910(!6<1!1J?@V?w8&w0VByqQu$ltLBNCFMXKFzbx|}TZ?#V@X}W*
zmn-JnTlwXoNu?LxJ59kF7QvW`rnv1wJzt9E=!orHb=-Yf!tCQ#HuIL4Z79BRIbZF7
z*y;_te!rg}&fFGqp6B<Ky7s(Ty8n_5O%Hi>zunT=_?hjs=(S?^_6;kX|F-k=*56$)
zKl}1WbDKqc5xP9};GkR8k+SR`Fkm_uK|#mJB*K6i@32S(#XBm1M<gf}pld~r5m2ln
tfGv;-*NT(|kWB!^9J0eeF^2%VflRb`4De=U11Vqz!d*c68_+il3;?MI(M|vW

literal 0
HcmV?d00001

diff --git a/extensions/demos/html/checkJava.java b/extensions/demos/html/checkJava.java
new file mode 100755
index 000000000..c618ce069
--- /dev/null
+++ b/extensions/demos/html/checkJava.java
@@ -0,0 +1,19 @@
+import java.io.*;  
+import java.util.*;
+import java.net.*;
+import java.applet.*;
+
+// Keith Lee
+// Twitter: @keith55
+// http://milo2012.wordpress.com
+// keith.lee2012[at]gmail.com
+
+public class checkJava extends Applet{  
+ 	public static int results = 0;
+	public void init() {
+	}
+        public int getInfo() {
+		results = 1;
+		return results;
+	}
+}	

From cc9756cf59aca3d35554c7dd62e5c04652e84aba Mon Sep 17 00:00:00 2001
From: Keith Lee <keith.lee2012@gmail.com>
Date: Wed, 7 Mar 2012 01:46:51 +0800
Subject: [PATCH 2/2] Fix for issues 567 and also remove multiple calls to
 beef.browser.hasJava() from /beef/core/main/client/net/local.js

---
 core/main/client/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/main/client/browser.js b/core/main/client/browser.js
index 06a699e98..b6c9e3b70 100644
--- a/core/main/client/browser.js
+++ b/core/main/client/browser.js
@@ -525,7 +525,7 @@ beef.browser = {
 					return false;
 				}
 			}	
-		}
+		}return false;
 	},
 	
 	/**