pingable_ipam_plugin 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f252592af66182ea5caa67ee7e6277b0d6c9a93a746b28c2f949cc13019176
-  data.tar.gz: f5e007d453bd182a85d3e20bf0441c5276ae9365d9267fe9c8541d2fa187d731
+  metadata.gz: 901121ea8d35be4f887e6b29af60a66c5c893519c9e3deb5e68ce115c947eedf
+  data.tar.gz: 1debb5df608706ec4d0314eeeaede1d68bd007fd9e845f0ebd69e870713f481a
 SHA512:
-  metadata.gz: 001c810cfc73df2a3a3cf0d767b63c5e13f1b53d29d536d13248ee045ec26cf804474c7e71f903f70814d9143ddd431182d5b362b7a1317744ed336984f09542
-  data.tar.gz: 648e49b2f2884c8bdce12f7bb79b6df125f2d8c32d7cc4bb8c4ea272b063f712c9e881593b51974a35d8bcd178f9742447c3752908a3dd9602c35872156ca26e
+  metadata.gz: abb24c738c216d047affce4042bf78b7ddbf3fbbf48127c7e8c0258e8be0d18db81918a99cb1736591977b90eddf74d5daa789ff7681626c5706f224ced2783c
+  data.tar.gz: 5d45c0030cd6d41d75094b64d5cfa2084791dd0a49ea330bd30195a7401ecbef33cb3090cc35fbf10adf79706b1e241b367ea240c3978b2cdc0b76faa2777265

data/app/services/ipam/ping_random_db.rb

@@ -1,5 +1,6 @@
 require 'timeout'
 require 'socket'
+require 'resolv'
 
 module IPAM
   class PingRandomDb < Base
@@ -7,8 +8,8 @@ module IPAM
       @generator ||= Random.new(mac ? mac.delete(':').to_i(16) : Random.new_seed)
     end
 
-    def random_ip
-      IPAddr.new(generator.rand(subnet_range.first.to_i..subnet_range.last.to_i), subnet.family)
+    def random_ip(range)
+      IPAddr.new(range.sample)
     end
 
     def tcp_pingable?(ip)
@@ -32,34 +33,20 @@ module IPAM
       # Whether or not Errno::ECONNREFUSED is considered a successful ping
       @service_check = true
       @timeout = 1
-      @exception = nil
       bool = false
-      tcp = nil
 
       begin
-        Timeout.timeout(@timeout) do
-          begin
-            tcp = TCPSocket.new(ip, port)
-          rescue Errno::ECONNREFUSED => err
-            if @service_check
-              bool = true
-            else
-              @exception = err
-            end
-          rescue Exception => err
-            @exception = err
-          else
-            bool = true
-          end
+        bool = Socket.tcp(ip, port, connect_timeout: @timeout) { true }
+      rescue Errno::ECONNREFUSED
+        if @service_check
+          bool = true
         end
-      rescue Timeout::Error => err
-        @exception = err
-      ensure
-        tcp.close if tcp
+      rescue Exception
+        bool = false
       end
 
       if bool
-        logger.info "Succesful telnet ping #{ip}, port #{port}"
+        logger.info "[IPAM] Succesful telnet ping #{ip}, port #{port}"
       end
 
       bool
@@ -77,34 +64,62 @@ module IPAM
         system("ping -c 2 -W 1 #{ip} > /dev/null")
       end
     rescue => err
-      logger.debug "Unable to icmp ping #{ip} because #{err.inspect}."
+      logger.warn "[IPAM] Unable to icmp ping #{ip} because #{err.inspect}."
       true
     end
 
+    def ns_resolvable? ip
+      begin
+        name = Resolv.getname ip
+        logger.warn "[IPAM] Found a DNS resolvable IP #{ip}, resolved name: #{name}."
+        true
+      rescue StandardError
+        false
+      end
+    end
+
     # Safety check not to spend much CPU time when there are no many free IPs left. This gives up
     # in about a second on Ryzen 1700 running with Ruby 2.4.
     MAX_ITERATIONS = 100_000
 
     def suggest_ip
       iterations = 0
+      # Remove IPs already excluded or known.
+      range = subnet_range.to_a - excluded_ips.to_a
+      range -= subnet.known_ips.to_a
+
+      unless range.empty?
+        logger.info "[IPAM] IP range from #{range.first.to_s} to #{range.last.to_s}, total: #{range.length}"
+      end
+
       loop do
-        # next random IP from the sequence generated by MAC seed
-        candidate = random_ip
+        if range.empty?
+          errors.add(:subnet, _('no free IP could be found in our DB, enlarge subnet range'))
+          return nil
+        end
+
+        candidate = random_ip(range)
         iterations += 1
         break if iterations >= MAX_ITERATIONS
         # try to match it
         ip = candidate.to_s
+        # Check again if something has been changed.
         if !excluded_ips.include?(ip) && !subnet.known_ips.include?(ip)
-          logger.debug "Searching for free IP - pinging #{ip}."
+          logger.info "[IPAM] Searching for free IP - resolving #{ip}"
           if tcp_pingable?(ip) || icmp_pingable?(ip)
-            logger.warn("Found a pingable IP (#{ip}) address which not marked as known. Skipping it...")
+            logger.warn("[IPAM] Found a pingable IP (#{ip}) address which not marked as known. Skipping it...")
           else
-            logger.debug("Found #{ip} in #{iterations} iterations")
-            return ip
+            unless ns_resolvable?(ip)
+              logger.info("[IPAM] Found #{ip} in #{iterations} iterations")
+              return ip
+            end
           end
         end
+
+        range -= [ip]
       end
-      logger.debug("Not suggesting IP Address for #{subnet} as no free IP found in reasonable time (#{iterations} iterations)")
+
+      logger.warn("[IPAM] Not suggesting IP Address for #{subnet} as no free IP found in reasonable time (#{iterations} iterations)")
       errors.add(:subnet, _('no random free IP could be found in our DB, enlarge subnet range'))
       nil
     end

data/lib/pingable_ipam_plugin/version.rb

@@ -1,3 +1,3 @@
 module PingableIpamPlugin
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingable_ipam_plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - Pavel Parshin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop