Added detection for Chrome 16, updated Chrome Extensions modules and

split the Details tab "Browser Hook Initialization" into "Hooked Page",
"Browser" and "Host"

core/main/client/browser.js

@@ -277,13 +277,21 @@ beef.browser = {
 	isC15: function() {
 		return (!!window.chrome && !window.webkitPerformance) && ((parseInt(window.navigator.appVersion.match(/Chrome\/(\d+)\./)[1], 10)==15)?true:false);
 	},
-	
+
+	/**
+	 * Returns true if Chrome 16.
+	 * @example: beef.browser.isC16()
+	 */
+	isC16: function() {
+		return (!!window.chrome && !window.webkitPerformance) && ((parseInt(window.navigator.appVersion.match(/Chrome\/(\d+)\./)[1], 10)==16)?true:false);
+	},
+
 	/**
 	 * Returns true if Chrome.
 	 * @example: beef.browser.isC()
 	 */
 	isC: function() {
-		return this.isC5() || this.isC6() || this.isC7() || this.isC8() || this.isC9() || this.isC10() || this.isC11() || this.isC12() || this.isC13() || this.isC14() || this.isC15();
+		return this.isC5() || this.isC6() || this.isC7() || this.isC8() || this.isC9() || this.isC10() || this.isC11() || this.isC12() || this.isC13() || this.isC14() || this.isC15() || this.isC16();
 	},
 
 	/**
@@ -346,6 +354,7 @@ beef.browser = {
 			C13:	this.isC13(),	// Chrome 13
 			C14:	this.isC14(),	// Chrome 14
 			C15:    this.isC15(),   // Chrome 15
+			C16:	this.isC16(),	// Chrome 16
 			C:	this.isC(), 	// Chrome any version
 
 			FF2:	this.isFF2(),	// Firefox 2
@@ -398,6 +407,7 @@ beef.browser = {
 		if (this.isC13())	{ return '13' }; 	// Chrome 13
 		if (this.isC14())	{ return '14' }; 	// Chrome 14
 		if (this.isC15())	{ return '15' }; 	// Chrome 15
+		if (this.isC16())	{ return '16' };	// Chrome 16
 
 
 		if (this.isFF2())	{ return '2'  };	// Firefox 2

extensions/admin_ui/controllers/modules/modules.rb

@@ -66,7 +66,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_page_title_hash = { 'Page Title' => encoded_page_title }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Hooked Page',
         'data' => encoded_page_title_hash,
         'from' => 'Initialization'
       }
@@ -81,7 +81,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_page_uri_hash = { 'Page URI' => encoded_page_uri }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Hooked Page',
         'data' => encoded_page_uri_hash,
         'from' => 'Initialization'
       }
@@ -96,7 +96,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_page_referrer_hash = { 'Page Referrer' => encoded_page_referrer }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Hooked Page',
         'data' => encoded_page_referrer_hash,
         'from' => 'Initialization'
       }
@@ -111,7 +111,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_host_name_hash = { 'Hostname/IP' => encoded_host_name }
     
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Hooked Page',
         'data' => encoded_host_name_hash,
         'from' => 'Initialization'
       }
@@ -126,7 +126,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_os_name_hash = { 'OS Name' => encoded_os_name }
     
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Host',
         'data' => encoded_os_name_hash,
         'from' => 'Initialization'
       }
@@ -141,7 +141,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       browser_name_hash = { 'Browser Name' => friendly_browser_name }
 
       browser_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => browser_name_hash,
         'from' => 'Initialization'
       }
@@ -156,7 +156,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       browser_version_hash = { 'Browser Version' => encoded_browser_version }
 
       browser_version_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
          'data' => browser_version_hash,
         'from' => 'Initialization'
       }
@@ -170,7 +170,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       browser_uastring_hash = { 'Browser UA String' => browser_uastring }
 
       browser_uastring_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
          'data' => browser_uastring_hash,
         'from' => 'Initialization'
       }
@@ -185,7 +185,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_cookies_hash = { 'Cookies' => encoded_cookies }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Hooked Page',
         'data' => encoded_cookies_hash,
         'from' => 'Initialization'
       }
@@ -200,7 +200,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_browser_plugins_hash = { 'Browser Plugins' => encoded_browser_plugins }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_browser_plugins_hash,
         'from' => 'Initialization'
       }
@@ -215,7 +215,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_internal_ip_hash = { 'Internal IP' => encoded_internal_ip }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Host',
         'data' => encoded_internal_ip_hash,
         'from' => 'Initialization'
       }
@@ -230,7 +230,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_internal_hostname_hash = { 'Internal Hostname' => encoded_internal_hostname }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Host',
         'data' => encoded_internal_hostname_hash,
         'from' => 'Initialization'
       }
@@ -245,7 +245,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_system_platform_hash = { 'System Platform' => encoded_system_platform }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Host',
         'data' => encoded_system_platform_hash,
         'from' => 'Initialization'
       }
@@ -270,7 +270,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_screen_params_hash = { 'Screen Params' => encoded_screen_params }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Host',
         'data' => encoded_screen_params_hash,
         'from' => 'Initialization'
       }
@@ -293,7 +293,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_window_size_hash = { 'Window Size' => encoded_window_size }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_window_size_hash,
         'from' => 'Initialization'
       }
@@ -308,7 +308,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_java_enabled_hash = { 'Java Enabled' => encoded_java_enabled }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_java_enabled_hash,
         'from' => 'Initialization'
       }
@@ -323,7 +323,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_vbscript_enabled_hash = { 'VBScript Enabled' => encoded_vbscript_enabled }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_vbscript_enabled_hash,
         'from' => 'Initialization'
       }
@@ -338,7 +338,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_has_flash_hash = { 'Has Flash' => encoded_has_flash }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_flash_hash,
         'from' => 'Initialization'
       }
@@ -353,7 +353,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_has_googlegears_hash = { 'Has GoogleGears' => encoded_has_googlegears }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_googlegears_hash,
         'from' => 'Initialization'
       }
@@ -368,7 +368,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_has_web_socket_hash = { 'Has WebSockets' => encoded_has_web_socket }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_web_socket_hash,
         'from' => 'Initialization'
       }
@@ -383,7 +383,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_has_activex_hash = { 'Has ActiveX' => encoded_has_activex }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_activex_hash,
         'from' => 'Initialization'
       }
@@ -398,7 +398,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_has_session_cookies_hash = { 'Session Cookies' => encoded_has_session_cookies }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_session_cookies_hash,
         'from' => 'Initialization'
       }
@@ -413,7 +413,7 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       encoded_has_persistent_cookies_hash = { 'Persistent Cookies' => encoded_has_persistent_cookies }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_persistent_cookies_hash,
         'from' => 'Initialization'
       }

extensions/console/lib/shellinterface.rb

@@ -275,7 +275,7 @@ class ShellInterface
       encoded_page_title_hash = { 'Page Title' => encoded_page_title }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Hooked Page',
         'data' => encoded_page_title_hash,
         'from' => 'Initialization'
       }
@@ -290,7 +290,7 @@ class ShellInterface
       encoded_page_uri_hash = { 'Page URI' => encoded_page_uri }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Hooked Page',
         'data' => encoded_page_uri_hash,
         'from' => 'Initialization'
       }
@@ -305,7 +305,7 @@ class ShellInterface
       encoded_page_referrer_hash = { 'Page Referrer' => encoded_page_referrer }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Hooked Page',
         'data' => encoded_page_referrer_hash,
         'from' => 'Initialization'
       }
@@ -320,7 +320,7 @@ class ShellInterface
       encoded_host_name_hash = { 'Hostname/IP' => encoded_host_name }
     
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Hooked Page',
         'data' => encoded_host_name_hash,
         'from' => 'Initialization'
       }
@@ -335,7 +335,7 @@ class ShellInterface
       encoded_os_name_hash = { 'OS Name' => encoded_os_name }
     
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Host',
         'data' => encoded_os_name_hash,
         'from' => 'Initialization'
       }
@@ -350,7 +350,7 @@ class ShellInterface
       browser_name_hash = { 'Browser Name' => friendly_browser_name }
 
       browser_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => browser_name_hash,
         'from' => 'Initialization'
       }
@@ -365,7 +365,7 @@ class ShellInterface
       browser_version_hash = { 'Browser Version' => encoded_browser_version }
 
       browser_version_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
          'data' => browser_version_hash,
         'from' => 'Initialization'
       }
@@ -379,7 +379,7 @@ class ShellInterface
       browser_uastring_hash = { 'Browser UA String' => browser_uastring }
 
       browser_uastring_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
          'data' => browser_uastring_hash,
         'from' => 'Initialization'
       }
@@ -394,7 +394,7 @@ class ShellInterface
       encoded_cookies_hash = { 'Cookies' => encoded_cookies }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Hooked Page',
         'data' => encoded_cookies_hash,
         'from' => 'Initialization'
       }
@@ -409,7 +409,7 @@ class ShellInterface
       encoded_browser_plugins_hash = { 'Browser Plugins' => encoded_browser_plugins }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_browser_plugins_hash,
         'from' => 'Initialization'
       }
@@ -424,7 +424,7 @@ class ShellInterface
       encoded_internal_ip_hash = { 'Internal IP' => encoded_internal_ip }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Host',
         'data' => encoded_internal_ip_hash,
         'from' => 'Initialization'
       }
@@ -439,7 +439,7 @@ class ShellInterface
       encoded_system_platform_hash = { 'System Platform' => encoded_system_platform }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Host',
         'data' => encoded_system_platform_hash,
         'from' => 'Initialization'
       }
@@ -454,7 +454,7 @@ class ShellInterface
       encoded_internal_hostname_hash = { 'Internal Hostname' => encoded_internal_hostname }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Host',
         'data' => encoded_internal_hostname_hash,
         'from' => 'Initialization'
       }
@@ -476,7 +476,7 @@ class ShellInterface
       encoded_screen_params_hash = { 'Screen Params' => encoded_screen_params }
       
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Host',
         'data' => encoded_screen_params_hash,
         'from' => 'Initialization'
       }
@@ -497,7 +497,7 @@ class ShellInterface
       encoded_window_size_hash = { 'Window Size' => encoded_window_size }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_window_size_hash,
         'from' => 'Initialization'
       }
@@ -512,7 +512,7 @@ class ShellInterface
       encoded_java_enabled_hash = { 'Java Enabled' => encoded_java_enabled }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_java_enabled_hash,
         'from' => 'Initialization'
       }
@@ -527,7 +527,7 @@ class ShellInterface
       encoded_vbscript_enabled_hash = { 'VBScript Enabled' => encoded_vbscript_enabled }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_vbscript_enabled_hash,
         'from' => 'Initialization'
       }
@@ -542,7 +542,7 @@ class ShellInterface
       encoded_has_flash_hash = { 'Has Flash' => encoded_has_flash }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_flash_hash,
         'from' => 'Initialization'
       }
@@ -557,7 +557,7 @@ class ShellInterface
       encoded_has_googlegears_hash = { 'Has GoogleGears' => encoded_has_googlegears }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_googlegears_hash,
         'from' => 'Initialization'
       }
@@ -572,7 +572,7 @@ class ShellInterface
       encoded_has_web_socket_hash = { 'Has GoogleGears' => encoded_has_web_socket }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_web_socket_hash,
         'from' => 'Initialization'
       }
@@ -587,7 +587,7 @@ class ShellInterface
       encoded_has_activex_hash = { 'Has ActiveX' => encoded_has_activex }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_activex_hash,
         'from' => 'Initialization'
       }
@@ -602,7 +602,7 @@ class ShellInterface
       encoded_has_session_cookies_hash = { 'Session Cookies' => encoded_has_session_cookies }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_session_cookies_hash,
         'from' => 'Initialization'
       }
@@ -617,7 +617,7 @@ class ShellInterface
       encoded_has_persistent_cookies_hash = { 'Persistent Cookies' => encoded_has_persistent_cookies }
 
       page_name_row = {
-        'category' => 'Browser Hook Initialization',
+        'category' => 'Browser',
         'data' => encoded_has_persistent_cookies_hash,
         'from' => 'Initialization'
       }

modules/chrome_extensions/execute_tabs/config.yaml

@@ -22,5 +22,5 @@ beef:
             description: "Open a new tab and execute the Javascript code on it. The Chrome Extension needs to have the 'tabs' permission, as well as access to the domain."
             authors: ["Kos", "antisnatchor"]
             target:
-                working: ["C"]
                 user_notify: ["C"]
+                not_working: ["All"]

modules/chrome_extensions/grab_google_contacts/config.yaml

@@ -23,3 +23,4 @@ beef:
             authors: ["Kos", "antisnatchor"]
             target:
                 working: ["C"]
+                not_working: ["All"]

modules/chrome_extensions/inject_beef/config.yaml

@@ -8,3 +8,4 @@ beef:
             authors: ["Kos", "antisnatchor"]
             target:
                 working: ["C"]
+                not_working: ["All"]

modules/chrome_extensions/send_gvoice_sms/config.yaml

@@ -4,7 +4,8 @@ beef:
             enable: true
             category: "Chrome Extensions"
             name: "Send Gvoice SMS"
-            description: "Send a text message (SMS) through the Google Voice account of the victim, if she's logged in Google."
+            description: "Send a text message (SMS) through the Google Voice account of the victim, if she's logged in to Google."
             authors: ["Kos", "antisnatchor"]
             target:
-                user_notify: ["ALL"]
+                user_notify: ["C"]
+                not_working: ["ALL"]