From cc51e2c2949e0eed6f9c196ca167cc74bcd99959 Mon Sep 17 00:00:00 2001
From: Phil Grohe <phil.grohe@gmail.com>
Date: Sat, 22 Feb 2014 11:18:12 -0500
Subject: [PATCH 1/3] Initial revision of beef.dom.createIframe()  Removed
 'method' parameter and code path that creates a form and uses created iframe
 as target.

---
 .gitignore              |  4 +++-
 core/main/client/dom.js | 13 +++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7dacad784..d912f00f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,7 @@ custom-config.yaml
 .DS_Store
 .gitignore
 .rvmrc
+beef.sublime-project
+beef.sublime-workspace
 
-*.lock
+*.lock
\ No newline at end of file
diff --git a/core/main/client/dom.js b/core/main/client/dom.js
index 27b98a64e..9774a7423 100644
--- a/core/main/client/dom.js
+++ b/core/main/client/dom.js
@@ -111,14 +111,17 @@ beef.dom = {
 	 * @param: {Function} a callback function to fire once the iFrame has loaded
 	 * @return: {Object} the inserted iFrame
 	 */
-	createIframe: function(type, method, params, styles, onload) {
+	createIframe: function(type, params, styles, onload) {
 		var css = {};
-		var form_submit = (method.toLowerCase() == 'post') ? true : false; 
+
+
+		/*var form_submit = (method.toLowerCase() == 'post') ? true : false; 
 		if (form_submit && params['src'])
 		{
 			var form_action = params['src'];
 			params['src'] = '';
-		}
+		}*/
+
 		if (type == 'hidden') {
 			css = $j.extend(true, {'border':'none', 'width':'1px', 'height':'1px', 'display':'none', 'visibility':'hidden'}, styles);
 		} else if (type == 'fullscreen') {
@@ -130,13 +133,15 @@ beef.dom = {
 		}
 		var iframe = $j('<iframe />').attr(params).css(css).load(onload).prependTo('body');
 		
-		if (form_submit && form_action)
+	   /*	
+        if (form_submit && form_action)
 		{
 			var id = beef.dom.generateID();
 			$j(iframe).attr({'id': id, 'name':id});
 			var form = beef.dom.createForm({'action':form_action, 'method':'get', 'target':id}, false);
 			$j(form).prependTo('body').submit();
 		}
+        */
 		return iframe;
 	},
 

From f274001a65d8fb6456053cedd9e92a0338cab5ea Mon Sep 17 00:00:00 2001
From: Phil Grohe <phil.grohe@gmail.com>
Date: Sat, 22 Feb 2014 11:57:56 -0500
Subject: [PATCH 2/3] Revised comments on beef.dom.createIframe() to reflect
 removal of 'method' parameter & form submitting behavior. Updated existing
 function calls to beef.dom.createIframe() to remove 'method' parameter.

---
 core/main/client/dom.js                       | 24 ++++---------------
 extensions/customhook/html/index.html         |  2 +-
 .../site_redirect_iframe/command.js           |  2 +-
 .../local_host/java_payload/command.js        |  2 +-
 modules/misc/iframe_keylogger/command.js      |  2 +-
 .../fake_lastpass/command.js                  |  4 ++--
 6 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/core/main/client/dom.js b/core/main/client/dom.js
index 9774a7423..4f0519438 100644
--- a/core/main/client/dom.js
+++ b/core/main/client/dom.js
@@ -102,26 +102,19 @@ beef.dom = {
 	},
 	
 	/**
-     * Create and iFrame element. In case it's create with POST method, the iFrame is automatically added to the DOM and submitted.
-     * example usage in the code: beef.dom.createIframe('fullscreen', 'get', {'src':$j(this).attr('href')}, {}, null);
+     * Create an iFrame element and prepend to document body. URI passed via 'src' property of function's 'params' parameter
+     * is assigned to created iframe tag's src attribute resulting in GET request to that URI.
+     * example usage in the code: beef.dom.createIframe('fullscreen', {'src':$j(this).attr('href')}, {}, null);
 	 * @param: {String} type: can be 'hidden' or 'fullScreen'. defaults to normal
-	 * @param: {String} method: can be 'GET' or 'POST'. defaults to GET
 	 * @param: {Hash} params: list of params that will be sent in request.
 	 * @param: {Hash} styles: css styling attributes, these are merged with the defaults specified in the type parameter
 	 * @param: {Function} a callback function to fire once the iFrame has loaded
 	 * @return: {Object} the inserted iFrame
+     *
 	 */
 	createIframe: function(type, params, styles, onload) {
 		var css = {};
 
-
-		/*var form_submit = (method.toLowerCase() == 'post') ? true : false; 
-		if (form_submit && params['src'])
-		{
-			var form_action = params['src'];
-			params['src'] = '';
-		}*/
-
 		if (type == 'hidden') {
 			css = $j.extend(true, {'border':'none', 'width':'1px', 'height':'1px', 'display':'none', 'visibility':'hidden'}, styles);
 		} else if (type == 'fullscreen') {
@@ -133,15 +126,6 @@ beef.dom = {
 		}
 		var iframe = $j('<iframe />').attr(params).css(css).load(onload).prependTo('body');
 		
-	   /*	
-        if (form_submit && form_action)
-		{
-			var id = beef.dom.generateID();
-			$j(iframe).attr({'id': id, 'name':id});
-			var form = beef.dom.createForm({'action':form_action, 'method':'get', 'target':id}, false);
-			$j(form).prependTo('body').submit();
-		}
-        */
 		return iframe;
 	},
 
diff --git a/extensions/customhook/html/index.html b/extensions/customhook/html/index.html
index 52150e454..a76f0ed9e 100644
--- a/extensions/customhook/html/index.html
+++ b/extensions/customhook/html/index.html
@@ -18,7 +18,7 @@
 
 <body>
 	<script>
-		setTimeout("beef.dom.createIframe('fullscreen','get',{'src':'<%= @customhook_target %>'},{},null)",2000);
+		setTimeout("beef.dom.createIframe('fullscreen', {'src':'<%= @customhook_target %>'},{},null)",2000);
 		document.body.scroll = "no";
 		document.documentElement.style.overflow = 'hidden';
 		//Porco dio - and away we go!
diff --git a/modules/browser/hooked_domain/site_redirect_iframe/command.js b/modules/browser/hooked_domain/site_redirect_iframe/command.js
index 3261748be..2a24b7ace 100644
--- a/modules/browser/hooked_domain/site_redirect_iframe/command.js
+++ b/modules/browser/hooked_domain/site_redirect_iframe/command.js
@@ -14,7 +14,7 @@ beef.execute(function() {
 
 	$j("iframe").remove();
 	
-	beef.dom.createIframe('fullscreen', 'get', {'src':iframe_src}, {}, function() { if(!sent) { sent = true; document.title = title; beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+result); } });
+	beef.dom.createIframe('fullscreen', {'src':iframe_src}, {}, function() { if(!sent) { sent = true; document.title = title; beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+result); } });
 	document.body.scroll = "no";
 	document.documentElement.style.overflow = 'hidden';
 	beef.browser.changeFavicon(iframe_favicon);
diff --git a/modules/exploits/local_host/java_payload/command.js b/modules/exploits/local_host/java_payload/command.js
index f2db9249e..676d09ef8 100755
--- a/modules/exploits/local_host/java_payload/command.js
+++ b/modules/exploits/local_host/java_payload/command.js
@@ -28,7 +28,7 @@ beef.execute(function() {
 //    1. use the MITB code (currently doesn't work on IE)
 //    2. create an overlay iFrame while having the applet runnin in the background
 //
-//    1. setTimeout(beef.dom.createIframe('fullscreen', 'get', {'src':"<%= @iFrameSrc %>", 'id':"overlayiframe", 'name':"overlayiframe"}, {}, null), 4000);
+//    1. setTimeout(beef.dom.createIframe('fullscreen', {'src':"<%= @iFrameSrc %>", 'id':"overlayiframe", 'name':"overlayiframe"}, {}, null), 4000);
 //    2. beef.mitb.init("<%= @command_url %>", <%= @command_id %>);
 //		var MITBload = setInterval(function(){
 //				if(beef.pageIsLoaded){
diff --git a/modules/misc/iframe_keylogger/command.js b/modules/misc/iframe_keylogger/command.js
index 3bbbbd67f..707d35977 100644
--- a/modules/misc/iframe_keylogger/command.js
+++ b/modules/misc/iframe_keylogger/command.js
@@ -20,7 +20,7 @@ beef.execute(function() {
     }
 
     // creates the overlay 100% width/height iFrame
-    overlay = beef.dom.createIframe('fullscreen', 'get', {'src':"<%= @iFrameSrc %>", 'id':"overlayiframe", 'name':"overlayiframe"}, {}, null);
+    overlay = beef.dom.createIframe('fullscreen', {'src':"<%= @iFrameSrc %>", 'id':"overlayiframe", 'name':"overlayiframe"}, {}, null);
 
     if(beef.browser.isIE()){
        // listen for keypress events on the iFrame
diff --git a/modules/social_engineering/fake_lastpass/command.js b/modules/social_engineering/fake_lastpass/command.js
index c36154cb3..9a0b5bd28 100755
--- a/modules/social_engineering/fake_lastpass/command.js
+++ b/modules/social_engineering/fake_lastpass/command.js
@@ -22,11 +22,11 @@ beef.execute(function() {
 	},false);	
 
 	if (beef.browser.isC()) {
-		beef.dom.createIframe('custom','get',{'src':beef.net.httpproto+'://'+beef.net.host+':'+beef.net.port+'/lp/index.html','id':'LPIFRAME'}, {'width':'375px','height':'415px','position':'fixed','right':'0px','top':'0px','z-index':beef.dom.getHighestZindex()+1,'border':'1px solid white','overflow':'hidden'}); 
+		beef.dom.createIframe('custom', {'src':beef.net.httpproto+'://'+beef.net.host+':'+beef.net.port+'/lp/index.html','id':'LPIFRAME'}, {'width':'375px','height':'415px','position':'fixed','right':'0px','top':'0px','z-index':beef.dom.getHighestZindex()+1,'border':'1px solid white','overflow':'hidden'}); 
 		beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result=Chrome IFrame Created .. awaiting messages');	
 	} else {
 		// Don't know how NON Chrome browsers look - so just going to pop the FF dialog
-		beef.dom.createIframe('custom','get',{'src':beef.net.httpproto+'://'+beef.net.host+':'+beef.net.port+'/lp/indexFF.html','id':'LPIFRAME'}, {'width':'260px','height':'300px','position':'fixed','left':(($j(window).width()/2)-130)+'px','top':'0px','z-index':beef.dom.getHighestZindex()+1,'border':'0px solid black','overflow':'hidden'}); 
+		beef.dom.createIframe('custom' ,{'src':beef.net.httpproto+'://'+beef.net.host+':'+beef.net.port+'/lp/indexFF.html','id':'LPIFRAME'}, {'width':'260px','height':'300px','position':'fixed','left':(($j(window).width()/2)-130)+'px','top':'0px','z-index':beef.dom.getHighestZindex()+1,'border':'0px solid black','overflow':'hidden'}); 
 		beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result=Non-Chrome IFrame Created .. awaiting messages');	
 	}
 

From d050198afa762045f4a65f4294d85dded2a58ff7 Mon Sep 17 00:00:00 2001
From: Phil Grohe <phil.grohe@gmail.com>
Date: Sun, 23 Feb 2014 12:04:52 -0500
Subject: [PATCH 3/3] Clean up .gitignore file.  Accidentally committed changes
 to it to exclude my Sublime Text 2 project files.

---
 .gitignore | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d912f00f7..7dacad784 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,5 @@ custom-config.yaml
 .DS_Store
 .gitignore
 .rvmrc
-beef.sublime-project
-beef.sublime-workspace
 
-*.lock
\ No newline at end of file
+*.lock