Prevent duplicates

modules/host/detect_cups/module.rb

@@ -23,11 +23,16 @@ class Detect_cups < BeEF::Core::Command
         ip = $2
         port = $3
         session_id = @datastore['beefhook']
+        type = 'CUPS'
         cid = @datastore['cid'].to_i
-        if BeEF::Filters.is_valid_ip?(ip)
+        if BeEF::Filters.is_valid_ip?(ip) && BeEF::Core::Models::NetworkService.all(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => type).empty?
           print_debug("Hooked browser found 'CUPS' [proto: #{proto}, ip: #{ip}, port: #{port}]")
-          r = BeEF::Core::Models::NetworkService.new(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => 'CUPS', :cid => cid)
+          r = BeEF::Core::Models::NetworkService.new(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => type, :cid => cid)
           r.save
+          if BeEF::Core::Models::NetworkHost.all(:hooked_browser_id => session_id, :ip => ip).empty?
+            r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
+            r.save
+          end
         end
       end
     end

modules/host/get_internal_ip/module.rb

@@ -30,9 +30,11 @@ class Get_internal_ip < BeEF::Core::Command
       # save the network host
       if @datastore['results'] =~ /^([\d\.]+)$/
         ip = $1
-        print_debug("Hooked browser has network interface #{ip}")
-        r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
-        r.save
+        if BeEF::Core::Models::NetworkHost.all(:hooked_browser_id => session_id, :ip => ip).empty? # prevent duplicates
+          print_debug("Hooked browser has network interface #{ip}")
+          r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
+          r.save
+        end
       end
     end
 

modules/host/get_internal_ip_webrtc/module.rb

@@ -25,7 +25,7 @@ class Get_internal_ip_webrtc < BeEF::Core::Command
             next unless ip =~ /^[\d\.]+$/
             next if ip =~ /^0\.0\.0\.0$/
             next unless BeEF::Filters.is_valid_ip?(ip)
-            if BeEF::Core::Models::NetworkHost.all(:ip => ip).empty? # prevent duplicates
+            if BeEF::Core::Models::NetworkHost.all(:hooked_browser_id => session_id, :ip => ip).empty? # prevent duplicates
               print_debug("Hooked browser has network interface #{ip}")
               r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :os => os, :cid => cid)
               r.save

modules/network/cross_origin_scanner/module.rb

@@ -20,10 +20,16 @@ class Cross_origin_scanner < BeEF::Core::Command
       if @datastore['results'] =~ /ip=(.+)&port=([\d]+)&status/
         ip = $1
         port = $2
+        proto = 'http'
+        type = 'HTTP Server (CORS)'
         print_debug("Hooked browser found HTTP server #{ip}:#{port}")
-        if !ip.nil? && !port.nil? && BeEF::Filters.is_valid_ip?(ip)
-          r = BeEF::Core::Models::NetworkService.new(:hooked_browser_id => session_id, :proto => 'http', :ip => ip, :port => port, :type => 'HTTP Server (CORS)', :cid => cid)
+        if !ip.nil? && !port.nil? && BeEF::Filters.is_valid_ip?(ip) && BeEF::Core::Models::NetworkService.all(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => type).empty?
+          r = BeEF::Core::Models::NetworkService.new(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => type, :cid => cid)
           r.save
+          if BeEF::Core::Models::NetworkHost.all(:hooked_browser_id => session_id, :ip => ip).empty?
+            r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
+            r.save
+          end
         end
       end
     end

modules/network/get_http_servers/module.rb

@@ -37,6 +37,10 @@ class Get_http_servers < BeEF::Core::Command
           print_debug("Hooked browser found HTTP Server [proto: #{proto}, ip: #{ip}, port: #{port}]")
           r = BeEF::Core::Models::NetworkService.new(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => "HTTP Server", :cid => cid)
           r.save
+          if BeEF::Core::Models::NetworkHost.all(:hooked_browser_id => session_id, :ip => ip).empty?
+            r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
+            r.save
+          end
         end
       end
 

modules/network/identify_lan_subnets/module.rb

@@ -37,9 +37,11 @@ class Identify_lan_subnets < BeEF::Core::Command
           next if ip.nil?
           next unless ip.to_s =~ /^([\d\.]+)$/
           next unless BeEF::Filters.is_valid_ip?(ip)
-          print_debug("Hooked browser found host #{ip}")
-          r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
-          r.save
+          if BeEF::Core::Models::NetworkHost.all(:hooked_browser_id => session_id, :ip => ip).empty? # prevent duplicates
+            print_debug("Hooked browser found host #{ip}")
+            r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
+            r.save
+          end
         end
       end
     end

modules/network/internal_network_fingerprinting/module.rb

@@ -39,6 +39,10 @@ class Internal_network_fingerprinting < BeEF::Core::Command
           print_debug("Hooked browser found '#{discovered}' [ip: #{ip}]")
           r = BeEF::Core::Models::NetworkService.new(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => discovered, :cid => cid)
           r.save
+          if BeEF::Core::Models::NetworkHost.all(:hooked_browser_id => session_id, :ip => ip).empty?
+            r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
+            r.save
+          end
         end
       end
 

modules/network/jslanscanner/module.rb

@@ -25,7 +25,7 @@ class Fingerprint_routers < BeEF::Core::Command
         service = $4
         session_id = @datastore['beefhook']
         cid = @datastore['cid'].to_i
-        if !ip.nil?
+        if !ip.nil? && BeEF::Filters.is_valid_ip?(ip) && BeEF::Core::Models::NetworkService.all(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => service).empty?
           print_debug("Hooked browser found network service " + service + " [proto: #{proto}, ip: #{ip}, port: #{port}]")
           r = BeEF::Core::Models::NetworkService.new(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => service, :cid => cid)
           r.save
@@ -35,7 +35,7 @@ class Fingerprint_routers < BeEF::Core::Command
         device = $2
         session_id = @datastore['beefhook']
         cid = @datastore['cid'].to_i
-        if !ip.nil? && BeEF::Filters.is_valid_ip?(ip)
+        if !ip.nil? && BeEF::Filters.is_valid_ip?(ip) && BeEF::Core::Models::NetworkHost.all(:hooked_browser_id => session_id, :ip => ip, :type => device).empty?
           print_debug("Hooked browser found network device " + device + " [ip: #{ip}]")
           r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :type => device, :cid => cid)
           r.save

modules/network/ping_sweep/module.rb

@@ -37,9 +37,11 @@ class Ping_sweep < BeEF::Core::Command
       if @datastore['results'] =~ /host=([\d\.]+) is alive/
         ip = $1
         if BeEF::Filters.is_valid_ip?(ip)
-          print_debug("Hooked browser has network interface #{ip}")
-          r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
-          r.save
+          if BeEF::Core::Models::NetworkHost.all(:hooked_browser_id => session_id, :ip => ip).empty? # prevent duplicates
+            print_debug("Hooked browser has network interface #{ip}")
+            r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
+            r.save
+          end
         end
       end
     end

modules/network/port_scanner/module.rb

@@ -15,7 +15,7 @@ class Port_scanner < BeEF::Core::Command
     return [
         {'name' => 'ipHost', 'ui_label' => 'Scan IP or Hostname', 'value' => '192.168.1.10'},
         {'name' => 'ports' , 'ui_label' => 'Specific port(s) to scan', 'value' => 'default'},
-	      {'name' => 'closetimeout' , 'ui_label' => 'Closed port timeout (ms)', 'value' => '1100'},
+        {'name' => 'closetimeout' , 'ui_label' => 'Closed port timeout (ms)', 'value' => '1100'},
         {'name' => 'opentimeout', 'ui_label' => 'Open port timeout (ms)', 'value' => '2500'},
         {'name' => 'delay', 'ui_label' => 'Delay between requests (ms)', 'value' => '600'},
         {'name' => 'debug', 'ui_label' => 'Debug', 'value' => 'false'}
@@ -37,11 +37,16 @@ class Port_scanner < BeEF::Core::Command
         port = $3
         service = $4
         session_id = @datastore['beefhook']
+        proto = 'http'
         cid = @datastore['cid'].to_i
-        if !ip.nil? && BeEF::Filters.is_valid_ip?(ip)
+        if !ip.nil? && BeEF::Filters.is_valid_ip?(ip) && BeEF::Core::Models::NetworkService.all(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => service).empty?
           print_debug("Hooked browser found network service [ip: #{ip}, port: #{port}]")
-          r = BeEF::Core::Models::NetworkService.new(:hooked_browser_id => session_id, :proto => 'http', :ip => ip, :port => port, :type => service, :cid => cid)
+          r = BeEF::Core::Models::NetworkService.new(:hooked_browser_id => session_id, :proto => proto, :ip => ip, :port => port, :type => service, :cid => cid)
           r.save
+          if BeEF::Core::Models::NetworkHost.all(:hooked_browser_id => session_id, :ip => ip).empty?
+            r = BeEF::Core::Models::NetworkHost.new(:hooked_browser_id => session_id, :ip => ip, :cid => cid)
+            r.save
+          end
         end
       end