Changeset 3820

Timestamp:

08/12/06 03:31:38 (2 years ago)

Author:

hdm

Message:

Major reworking of the recon stuff, there is a new mixin called Auxiliary::Scanner that
supports per-range, per-host, and per-batch requests. The reporting stuff has been moved
into a new mixin for it. The old recon stuff was pulled out and sample modules for the
scanner mixin were added. Almost time to re-import skape's old recon foo using Scanner :-)

Files:

• framework3/trunk/lib/msf/base/simple/auxiliary.rb (modified) (1 diff)
• framework3/trunk/lib/msf/core/auxiliary.rb (modified) (1 diff)
• framework3/trunk/lib/msf/core/auxiliary/recon.rb (deleted)
• framework3/trunk/lib/msf/core/auxiliary/report.rb (added)
• framework3/trunk/lib/msf/core/auxiliary/scanner.rb (added)
• framework3/trunk/lib/msf/core/option_container.rb (modified) (3 diffs)
• framework3/trunk/lib/msf/ui/console/command_dispatcher/core.rb (modified) (6 diffs)
• framework3/trunk/lib/rex/pescan/scanner.rb (modified) (1 diff)
• framework3/trunk/lib/rex/socket.rb (modified) (2 diffs)
• framework3/trunk/lib/rex/socket/range_walker.rb (added)
• framework3/trunk/lib/rex/socket/range_walker.rb.ut.rb (added)
• framework3/trunk/modules/auxiliary/recon.rb (deleted)
• framework3/trunk/modules/auxiliary/recon_passive.rb (added)
• framework3/trunk/modules/auxiliary/scanner_batch.rb (added)
• framework3/trunk/modules/auxiliary/scanner_host.rb (added)
• framework3/trunk/modules/auxiliary/scanner_range.rb (added)

framework3/trunk/lib/msf/base/simple/auxiliary.rb

@@ -47 +47 @@
-                
-                # Verify the ACTION
-
+mod.actions.length > 0 and 
-                        raise MissingActionError, "You must specify a valid Action", caller
-                end

framework3/trunk/lib/msf/core/auxiliary.rb

@@ -17 +17 @@
-        # Auxiliary mixins
-        #
-
+
+
-        require 'msf/core/auxiliary/dos'
-        

framework3/trunk/lib/msf/core/option_container.rb

@@ -1 +1 @@
-require 'resolv'
-require 'msf/core'
+require 'rex/socket'
-
-module Msf
@@ -134 +135 @@
-# OptInt     - An integer value
-# OptEnum    - Select from a set of valid values
+# OptAddressRange - A subnet or range of addresses
-#
-###
@@ -277 +279 @@
-                        begin
-                                Resolv.getaddress(value)
+                        rescue
+                                return false
+                        end
+                end
+
+                return super
+        end
+end
+
+###
+#
+# Network address range option.
+#
+###
+class OptAddressRange < OptBase
+        def type 
+                return 'addressrange' 
+        end
+
+        def normalize(value)
+
+                sets   = []
+                return '' if not value
+
+                ranges = value.split(',')               
+                ranges.each do |range|
+                        begin
+                        case range
+                        when /-/
+                                tmp = range.split('-')
+                                next if tmp.length != 2
+
+                                if (Rex::Socket.addr_atoi(tmp[0]) < Rex::Socket.addr_atoi(tmp[1]))
+                                        sets << tmp
+                                end
+        
+                        when /\//
+                                sets << Rex::Socket.cidr_crack(range)
+                        else
+                                tmp = Rex::Socket.addr_itoa(Rex::Socket.addr_atoi(range))
+                                sets << [tmp, tmp]
+                        end
+                        rescue
+                        end
+                end
+
+                return sets.map{|i| i[0]+'-'+i[1]}.join(',')
+        end
+        
+        def valid?(value)
+                if (value != nil and value.empty? == false)
+                        begin
+                                return (normalize(value).length > 0 ? true : false)
-                        rescue
-                                return false

framework3/trunk/lib/msf/ui/console/command_dispatcher/core.rb

@@ -700 +700 @@
-                # A value needs to be specified
-                if(words[1])
-words[1]
+str, words
-                end
-                
@@ -1043 +1043 @@
-        # Provide tab completion for option values
-        #
-
+
+
-                res = []
-                mod = active_module
@@ -1071 +1072 @@
-                # Is this option used by the active module?
-                if (mod.options.include?(opt))
-
+, str, words
-                end
-                
@@ -1078 +1079 @@
-                        p = framework.modules.create(mod.datastore['PAYLOAD'])
-                        if (p and p.options.include?(opt))
-
+, str, words
-                        end
-                end
@@ -1088 +1089 @@
-        # Provide possible option values based on type
-        #
-
+
+
-                res = []
-                res << o.default.to_s if o.default
@@ -1104 +1106 @@
-                                        else
-                                end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        when 'Msf::OptPort'
-                                case o.name

framework3/trunk/lib/rex/pescan/scanner.rb

@@ -22 +22 @@
-                                hits.each do |hit|
-                                        vma  = pe.rva_to_vma(hit[0])
-
+.is_a?(Array) ? hit[1].join(" ") : hit[1]
-                                        $stdout.puts pe.ptr_s(vma) + " " + msg
-                                end

framework3/trunk/lib/rex/socket.rb

@@ -24 +24 @@
-        require 'rex/socket/switch_board'
-        require 'rex/socket/subnet_walker'
+        require 'rex/socket/range_walker'
+        
+        # Handle systems without AF_INET6 defined
+        if (! ::Socket.constants.include?('AF_INET6'))
+                ::Socket.const_set('AF_INET6', 10)
+        end
-
-        ##
@@ -207 +213 @@
-
-        #
+        # Converts a dotted-quad address into an integer
+        #
+        def self.addr_atoi(addr)
+                addr.split('.').map{|i| i.to_i }.pack('C4').unpack('N')[0]
+        end
+
+        #
+        # Converts an integer into a dotted-quad
+        #
+        def self.addr_itoa(addr)
+                [addr].pack('N').unpack('C4').join('.')
+        end
+        
+        #
+        # Converts a CIDR subnet into an array (base, bcast)
+        #
+        def self.cidr_crack(cidr)
+                tmp = cidr.split('/')
+                addr = self.addr_atoi(tmp[0])
+                mask = (2 ** 32) - (2 ** (32 - tmp[1].to_i))
+                base = addr & mask
+                stop = base + (2 ** (32 - tmp[1].to_i)) - 1
+                return [self.addr_itoa(base), self.addr_itoa(stop)]     
+        end
+        
+        
+        #
-        # Converts a bitmask (28) into a netmask (255.255.255.240)
-        #