network_scanner 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df85f302beef579114f5b023815eeac21506567a
-  data.tar.gz: 36ee79cbda3628ae020fd95085ef1f2b5ea69eb7
+  metadata.gz: 523886c0cc9e935ee6629722850bf2aac37a2a94
+  data.tar.gz: a249a6aba70f6c99e6ac6ebb67e6a905f84c9afb
 SHA512:
-  metadata.gz: a41a44d4497ff35480e274e79ccc4d209ef985767fd0322df2b75d40d5dd97e98fde2c9173b8e5ed32abd92a7b248b656db746b46ab8c4e35da82b6325ebd7bb
-  data.tar.gz: 7354e64a16f28de01448fa4cb5b0e630d87fe8491fa8a921d17ba135c02b8a7793074cc689bebd25743f19b073c388bd0b3196fbdd65fb6b0eb68f7b6ea42c52
+  metadata.gz: 26091157cbe2b73b7faf985f049f8fe96d3dbe712a4ee487d59eb9a933d60459b6afa12b252c5c30ae8d56c868e6d73cd6d5a815be86f3fd093aeb16cb524af1
+  data.tar.gz: 618b76d95a7e2558ab2c8a80cc7fccc6457410b5670753320d8c495c703d5e306a7531233f135089cc40bbea8b4bf50a637885412e9ad1283aeb313f655f8b78

data/bin/network_scanner

@@ -5,7 +5,7 @@ require 'optparse'
 
 options = {}
 OptionParser.new do |opts|
-  opts.on('--cache FILE', String, 'Caches the IPs on the network in FILE') do |file|
+  opts.on('--cache FILE', String, 'Caches the IPs up on the network in FILE for quicker scanning') do |file|
     options[:cache] = file
   end
 
@@ -13,6 +13,10 @@ OptionParser.new do |opts|
     options[:interface] = interface
   end
 
+  opts.on('--range RANGE', String, 'Specify a range to scan(192.168.1.100-192.168.1.200)') do |range|
+    options[:range] = range
+  end
+
   opts.on('--portscan PORT', Integer, 'Port to scan for') do |port|
     options[:port] = port
   end
@@ -38,7 +42,11 @@ if options[:pool]
 end
 
 if options[:interface]
-  network_scanner.get_ips(options[:interface])
+  network_scanner.get_interface_ips(options[:interface])
+end
+
+if options[:range]
+  network_scanner.get_range_ips(options[:range])
 end
 
 if options[:cache]

data/lib/network_scanner/version.rb

@@ -1,3 +1,3 @@
 module NetworkScanner
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/network_scanner.rb

@@ -17,7 +17,7 @@ end
 
 module NetworkScanner
   class << self
-    # Avoids the user having to deal with namespacing. This is probably hacky
+    # Prevents the user from having to deal with namespacing. This is probably hacky
     def new(*args)
       Scanner.new(*args)
     end
@@ -30,7 +30,7 @@ module NetworkScanner
       @pool_size = 100
     end
 
-    def get_ips(interface)
+    def get_interface_ips(interface)
       ifconfig = `ifconfig`.split("\n\n").index_by{|x| x[/\w+/,0]}
       inet = ifconfig[interface][/inet addr:([^\s]*)/, 1].split('.')
       broadcast = ifconfig[interface][/Bcast:([^\s]*)/, 1].split('.')
@@ -45,27 +45,59 @@ module NetworkScanner
       second_range = start_second..broadcast[1].to_i
       third_range = start_third..broadcast[2].to_i
       fourth_range = start_fourth..broadcast[3].to_i
+      
+      @ips_to_check = []
 
-      @ips = []
+      first_range.each do |first|
+        second_range.each do |second|
+          third_range.each do |third|
+            fourth_range.each do |fourth|
+              @ips_to_check << "#{first}.#{second}.#{third}.#{fourth}"
+            end
+          end
+        end
+      end
 
-      pool = Thread.pool(@pool_size)
+      puts "Checking ips in (#{first_range}).(#{second_range}).(#{third_range}).(#{fourth_range})"
+      @ips = @ips_to_check
+      return @ips_to_check
+    end
 
-      ips_to_check = []
+    def get_range_ips(range)
+      start, finish = range.split('-', 2).map{|ip| ip.split('.')}
+      first_range = start[0]..finish[0]
+      second_range = start[1]..finish[1]
+      third_range = start[2]..finish[2]
+      fourth_range = start[3]..finish[3]
+
+      @ips_to_check = []
 
       first_range.each do |first|
         second_range.each do |second|
           third_range.each do |third|
             fourth_range.each do |fourth|
-              ips_to_check << "#{first}.#{second}.#{third}.#{fourth}"
+              @ips_to_check << "#{first}.#{second}.#{third}.#{fourth}"
             end
           end
         end
       end
 
-      puts "Checking for ips in (#{first_range}).(#{second_range}).(#{third_range}).(#{fourth_range})"
-      ips_to_check.each do |ip|
+      puts "Checking ips in (#{first_range}).(#{second_range}).(#{third_range}).(#{fourth_range})"
+      @ips = @ips_to_check
+      return @ips_to_check
+    end
+
+    def get_ips
+      raise Exception.new("Must specify an interface to get ips to check") unless @ips_to_check
+
+      @ips = []
+
+      pool = Thread.pool(@pool_size)
+
+      @ips_to_check.each do |ip|
         pool.process do
-          @ips << ip if system("ping -c 1 #{ip} >> /dev/null")
+          # For some reason &> isn't working, so pipe stdout and then stderr
+          @ips << ip if system("ping -c 1 #{ip} >> /dev/null 2> /dev/null")
         end
       end
 
@@ -85,32 +117,25 @@ module NetworkScanner
     end
 
     def check_ports(port)
-      queue = Queue.new
+      raise Exception.new("Must scan ips first (Specify an interface or cacheread)") unless @ips
 
       puts "Checking for ports out of a total of #{@ips.length} ips"
 
-      @ips.each do |ip|
-        queue << ip
-      end
-
-      pool = Thread.pool(200)
+      pool = Thread.pool(@pool_size)
 
-      until(queue.empty?)
+      @ips.each do |ip|
         pool.process do
-          unless queue.empty?
-            ip = queue.pop
-            puts ip if port_open?(ip, port)
-          end
+          puts ip if port_open?(ip, port)
         end
       end
 
-      pool.shutdown unless pool.done?
+      pool.shutdown
     end
 
     def cache(file)
-      if !@ips
-        raise Exception.new("Must scan ips before caching (Specify an interface)")
-      end
+      raise Exception.new("Must scan ips first (Specify an interface or cacheread)") unless @ips
+      get_ips
+
       File.open(file, 'w'){|f| f.puts(JSON.pretty_generate(@ips))}
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: network_scanner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Aaron Neyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler