ipscannerplus 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4427d15b369e6288e581b80a0828c732592015eac6e14cf362e9f2cd976f87d9
-  data.tar.gz: 635bfe4623b24fe9af2d21dfe5b017b9b08acb90b737e586454ea6c970444d99
+  metadata.gz: 1b367772cae655f1f155bdfe1489dcc2c28287a748e974ca37e095ba9ba93943
+  data.tar.gz: 9e7411b5a2df45e6018fded5c4fe99bb7a464cdb98f46d582efc9c504ad37690
 SHA512:
-  metadata.gz: 07563a5226b8f2280bf2628e34d761ca2716b7d4bd1289fdc6f0d62e21c333bc70a39408be65ea1bc96a4b85c4cbd510df51ec31d7aad2086912973d290255fd
-  data.tar.gz: 79f6cab959f7d41e24e069a1650324df4aaf32f4f12b6904946ab4acb1bc7c76031a3246ccad065836a61401aba6ce9dd5ff9ce9c1b1afe84c3c38144429afa2
+  metadata.gz: 7022e7cbcc9e9bd8ecb911f3fc9c11cfd38082738e17297a09c824a8a6ede5a28fdacae03f1ff2729a7b4799f1764e4a6c195e3f9a938aab630fbe231c13812c
+  data.tar.gz: f5f3e34f474794512f661248669235c0e7b129aa7dd4bc298c15477e896ff6ba42c0305721eecf7105d8467b9ae967a4474d85be4efe7ada0f0ad92fbc919277

data/lib/ipscannerplus.rb

@@ -3,6 +3,7 @@
 # file: ipscannerplus.rb
 
 require 'ipscanner'
+require 'resolv'
 require 'fast_port_scanner'
 
 
@@ -240,6 +241,7 @@ class IPScannerPlus
     end.to_h
     
     @ports = @known_ports.merge(@custom_ports)
+    @nameserver = Resolv::DNS::Config.new.lazy_initialize.nameserver_port[0][0]
     
   end
   
@@ -252,7 +254,20 @@ class IPScannerPlus
     end
     
   end
-
+  
+  def ipscan()
+    
+    @result = IPScanner.scan.map do |ip|
+      
+      deviceid = @devices[ip[/\d+$/]] || [nslookup(ip)]
+      
+      [
+        [ip, deviceid], 
+      ]      
+    end
+    
+  end
+  
   def scan()
     
     @result = IPScanner.scan.map do |ip| 
@@ -260,8 +275,10 @@ class IPScannerPlus
       ports = FastPortScanner.scan(ip, ports: (1..1000).to_a \
                                    + @custom_ports.keys.map(&:to_i))
       
+      deviceid = @devices[ip[/\d+$/]] || [nslookup(ip)]
+      
       [
-        [ip, @devices[ip[/\d+$/]]], 
+        [ip, deviceid], 
          ports.map { |port| [port, @ports[port.to_s]] }
       ]
       
@@ -277,8 +294,9 @@ class IPScannerPlus
 
       #header = "" % rawheader.join(' ')
       header = [
-        rawheader[0].green,
-        rawheader[1].to_a[0].to_s.length > 1 ? rawheader[1][0].brown.bold : '',
+        rawheader[0][/\d+$/].green,
+        rawheader[1].to_a[0].to_s.length > 1 ? rawheader[1][0].brown.bold : \
+          'unknown'.red,
         rawheader[1] ? rawheader[1][1] : ''
       ].join(' ')
 
@@ -288,16 +306,37 @@ class IPScannerPlus
         header
       end
 
-      head + "\n\n" + body.map do |x|
-        desc = x[1].to_s.length > 38 ? (x[1][0..34] + '...') : x[1]
-        colour = (x[0].to_i < 1024) ? :gray : :cyan
-        "   %+14s %s" % [x[0].to_s.send(colour), desc]
-      end.join("\n") + "\n"
+      if body then
+        
+        head + "\n\n" + body.map do |x|
+          desc = x[1].to_s.length > 38 ? (x[1][0..34] + '...') : x[1]
+          colour = (x[0].to_i < 1024) ? :gray : :cyan
+          "   %+14s %s" % [x[0].to_s.send(colour), desc]
+        end.join("\n") + "\n"
+        
+      else
+        
+        head
+        
+      end
 
     end
 
-    lines.length.to_s + ' devices found' + "\n\n" + lines.join("\n")    
+    "%s devices found on subnet %s\n\n%s " % [lines.length.to_s, 
+                                              @result[0][0][0][/\d+\.\d+\.\d+/], 
+                                              lines.join("\n") ]
     
   end
   
+  private
+  
+  def nslookup(ip)
+    #`nslookup #{ip}`.strip.lines.last[/(?<=\tname = ).*(?=\.$)/]
+    begin
+      Resolv::DNS.new(:nameserver => [@nameserver]).getname(ip).to_s
+    rescue
+      nil
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipscannerplus
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwMjEwMDAzNzAzWhcN
-  MjEwMjA5MDAzNzAzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDmxKpW
-  xXjk2pc/BW0+agc2jcx30eYPOvezUUvrJzS/+JPQRhD+HBWEu+cw98DDMrdx8ZmL
-  xBC89bL+mXC5rvoJVgqZItEy2ir9w8FfA6VThtI5N1A4WaaZqpXa9MRLfz6/E7Gf
-  rIEUUtf+Z5v7WuWTtmkSt202vIFK6+fbjsrLTOApMRS55mkJPmSCvbnhugpYGzMC
-  pTTgJtymixePIykXukt40Hb4iQ2Fx8L7OTQydaCDGKwSgE4agJYzF5wjygpx9IDQ
-  d+WDZIhlMzzIUpSt1TPsXeZ5nNPfzy/uctamxk+utEqAbk3G0zI9UDulOfcAn8Jp
-  4NBF76F0JWVqTcy+p0AkWsjzthXCeKYuP9tDXIA7fo8pzyhMeXzCjYB65apw1EL4
-  KHb1CF3b002LZNgk9qEyjB3Mr/8pz0e66GreaYx/xeaXXEy74yLmBXJMATd1vZG+
-  KvWKtIoRRMRtzcGw4gcnyFUy9nwLYzpj6S3IYcMgtYab3aNh5/+2mUQbMvsCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUHN/C/+Sx
-  NM70I5nA6oIhDO5YXKUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwNDI4MTkzMjQyWhcN
+  MjIwNDI4MTkzMjQyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCncR+u
+  zH8mX+XlvMlZ7Nm7h664XU3pgxgR7pIaSGoWnHCw4CguukZkFvOtfDHF7HH8y2mt
+  1ke1saeccwPwjlE0Wai9B9YC07GVDKvRZY93Gpg7Lze1CqZS26qPwxWIdALDwhPU
+  /pltojb7nQtCJEKtxV+qdiVm+HDJ66h2MW2TSLZUoLJaNOs4ReZtvgN/JkkQ/GYh
+  6c/ZSIgxGHhUj/d4k3/XnZQoiIWgd7vGbbNFbR3eNHkoBeZc0+jNZt2Vh1Js7e0o
+  gh6+iM+nIzOCGIsI0hm0tcHuy1JXjkZF2sgsvGWFGLJCNosg8ba1ofqvRvtFeYlR
+  sfWYevin9G+OwVd9zeZYsF9SoTA3RVOX+/culsasRVxqa+2fDNx56d4XWqc0v+MZ
+  oDFR/fbVqIEB5FEe0d3nCVDYn9TXWplEuPRd1VOl0US3H4Bt2u5xYaR27Ta5LPcG
+  1THEvsS5G/L9XhKCUcOpLNwP7MLUm/29P878Sfrb/3pIteGdoAnA4BXJG/8CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUfHwfjOTm
+  pRSvCTjwa6cZ9EoxOAQwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAGZbZURBsAPFwugAj6p43zQbD8dmc0o6BfBKQGNfO
-  phe9stTsamBTURA3Pyzpn5kglbD7qVvsR52dPiWZk9cdDZ8O+kdmQcmIDjdMhpMi
-  Ldf/md7NjwV3pVFTs7u6PLe83Iysyml83PKyVrVdYyPZJvlCiPGy81GTRb138ntg
-  3UyfY1tqPyy/0bp0jvOJ2IMN+W2VJ+89x3Vwz3y2F/Ux0Y0nG4e9ETrc1O+9mEsR
-  J7ytqcZZdqFFpIs68iNN1uszYsWnp6ZWCJa1Li8lwDsBCBJADNxrs8K+9QimkqJi
-  EfBSoCtcinIHlgEnulqGK7r5clwXB/GdIBTOSlUe0vP0K3SYP9j1/WYRgtDdNYkF
-  KEioxU2JqOP6fUhQpXnxQUk/kIw9YUWG9a9Biq/2NylKx7kKNjp0RVFUvIgFMGvV
-  Q36Io7+P0a6/QUCyXyvqOV7+wdwLRxZI/xovFVhCo5vfEQjzXPOnLCyyADtrr287
-  GYf+zjxtwaOh87Ywi7PjCu3D
+  BgkqhkiG9w0BAQsFAAOCAYEAmCcN+CHUx+/Fggy2JZoaX2HnUvDumH6pb6GaL9iR
+  aUbWD5jHwxJlbBsiwfvf10VldPNAko06I0A0NPwXuYPMoDl4WJ2SnorjAhRsEnRa
+  tJL596fgFzSx35kjnKwlI9WsiR2TDSSkqFZeXDayDEchakFb7iEn7ubAf10yo+OQ
+  C2XwWGJ5b6gN19X/MoPdeU13ymkHOrhD1EBtGeFAG4ujetF+ekBx9q1in4HLsyMY
+  JB+XD9/5TIq7gic6A1HStWDS8yPnSRg1W9WIFzP/jLBbtfYwqiUAS+mvNt9YN27L
+  adc3NjRCEVCOxdol7j/fA6K7+R7xiediU216461GfFnubI8SdcR9nbF/tTSV9Yvr
+  so6OHP0PByaRr2sr2WnWzx8/iKEMpoS5dTJ16/MSCOuF9pR0tEo76VQgtAEslDj+
+  5XCa8qokYdaepmBuLObywPjFpRcRusI0j3NgiF0ow38uCK770MWzz6jN4Ua02LHt
+  ovz7KRk7grgIsQ4FhE9JNCPb
   -----END CERTIFICATE-----
-date: 2020-08-23 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ipscanner
@@ -103,7 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Helps find out what service is running where in the network.