smart_proxy_ipam 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03e5b4db2d3b9f5ffad35e382585f0d632c7bf312c9a0b643ff24989d11283d8
-  data.tar.gz: 34960551000adc62f823b7d66f81d3429530b0f39cc3b8f9301d92207c6c5a7b
+  metadata.gz: e15677a434645d7983b2d76599f64846fd15676de6752fd552939463156e406c
+  data.tar.gz: a9905c07b628625af2f3d69507f8388d92cfec0cb16fb5bd4583e59ce488147f
 SHA512:
-  metadata.gz: da0f3c2643eac27f95a041b8181097b874aadee8d1a46a8d549862870328cb9f40766d0def9688ff487cb27fc00b8a178522a75f90e2e813b60c99256e3b0068
-  data.tar.gz: 1f3f74603ab6822061a29018a2eb4ef98fd1071cb15c0af0e252da93cbbfe15b7fdc2e396d1a5a3ff3e9b29de97580ce46edae20b8c5357c76d317154ee4ce7d
+  metadata.gz: ca743342ca290e14d6c4116475b3106ae71cffff89d7192b7b9873082a5ccaa80b406b25c3d31676b6d51c6cb50efc94c4d821226214de93e1a3c654bb24caf7
+  data.tar.gz: a550aab54cfeff4b727a088cf34cb97deb6e3df0575572d6e007699b248e542840de35aa01ec587f5e75c4d9ed48f5b3ea03fcdefbe332ef76a9ee2478a5ad5c

data/lib/smart_proxy_ipam/phpipam/phpipam_client.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'net/http'
 require 'monitor'
 require 'concurrent'
+require 'time'
 require 'smart_proxy_ipam/ipam'
 require 'smart_proxy_ipam/ipam_main'
 require 'smart_proxy_ipam/phpipam/phpipam_helper'
@@ -125,10 +126,11 @@ module Proxy::Phpipam
       return response if response['message']
 
       if subnet_hash && subnet_hash.key?(mac.to_sym)
-        response['next_ip'] = @@ip_cache[cidr.to_sym][mac.to_sym]
+        response['next_ip'] = @@ip_cache[cidr.to_sym][mac.to_sym][:ip]
       else
+        next_ip = nil
         new_ip = response['data']
-        ip_not_in_cache = subnet_hash && subnet_hash.key(new_ip).nil?
+        ip_not_in_cache = subnet_hash && !subnet_hash.to_s.include?(new_ip.to_s)  
 
         if ip_not_in_cache
           next_ip = new_ip.to_s
@@ -164,28 +166,47 @@ module Proxy::Phpipam
     # @@ip_cache structure
     # {  
     #   "100.55.55.0/24":{  
-    #      "00:0a:95:9d:68:10": "100.55.55.1"
+    #      "00:0a:95:9d:68:10": {"ip": "100.55.55.1", "timestamp": "2019-09-17 12:03:43 -D400"}
     #   },
     #   "123.11.33.0/24":{  
-    #     "00:0a:95:9d:68:33": "123.11.33.1",
-    #     "00:0a:95:9d:68:34": "123.11.33.2",
-    #     "00:0a:95:9d:68:35": "123.11.33.3"
+    #      "00:0a:95:9d:68:33": {"ip": "123.11.33.1", "timestamp": "2019-09-17 12:04:43 -0400"}
+    #      "00:0a:95:9d:68:34": {"ip": "123.11.33.2", "timestamp": "2019-09-17 12:05:48 -0400"}
+    #      "00:0a:95:9d:68:35": {"ip": "123.11.33.3", "timestamp:: "2019-09-17 12:06:50 -0400"}
     #   }
     # }
     def init_cache
       logger.debug("Clearing ip cache.")
       @@m.synchronize do
-        @@ip_cache = {}
+        if @@ip_cache and not @@ip_cache.empty?
+          @@ip_cache.each do |key, values|
+            values.each do |mac, value|
+              if Time.now - Time.parse(value[:timestamp]) > DEFAULT_CLEANUP_INTERVAL
+                @@ip_cache[key].delete(mac)
+              end
+            end
+            @@ip_cache.delete(key) if @@ip_cache[key].nil? or @@ip_cache[key].empty?
+          end
+        else
+          @@ip_cache = {}
+        end
       end
     end
 
     def add_ip_to_cache(ip, mac, cidr)
       logger.debug("Adding IP #{ip} to cache for subnet #{cidr}")
       @@m.synchronize do
+        #clear cache data which has the same mac and ip with the new one 
+        @@ip_cache.each do |key, values|
+          if values.keys.include? mac.to_sym
+            @@ip_cache[key].delete(mac.to_sym)
+          end
+          @@ip_cache.delete(key) if @@ip_cache[key].nil? or @@ip_cache[key].empty?
+        end   
+        
         if @@ip_cache.key?(cidr.to_sym)
-          @@ip_cache[cidr.to_sym][mac.to_sym] = ip.to_s
+          @@ip_cache[cidr.to_sym][mac.to_sym] = {:ip => ip.to_s, :timestamp => Time.now.to_s}
         else
-          @@ip_cache = @@ip_cache.merge({cidr.to_sym => {mac.to_sym => ip.to_s}})
+          @@ip_cache = @@ip_cache.merge({cidr.to_sym => {mac.to_sym => {:ip => ip.to_s, :timestamp => Time.now.to_s}}})
         end
       end
     end
@@ -203,7 +224,7 @@ module Proxy::Phpipam
         verify_ip = JSON.parse(ip_exists(new_ip, subnet_id))
 
         # If new IP doesn't exist in IPAM and not in the cache
-        if verify_ip['exists'] == false && !ip_exists_in_cache(new_ip, cidr)
+        if verify_ip['exists'] == false && !ip_exists_in_cache(new_ip, cidr, mac)
           found_ip = new_ip.to_s
           add_ip_to_cache(found_ip, mac, cidr)
           break
@@ -224,8 +245,8 @@ module Proxy::Phpipam
       IPAddr.new(ip.to_s).succ.to_s
     end
 
-    def ip_exists_in_cache(ip, cidr)
-      @@ip_cache[cidr.to_sym] && !@@ip_cache[cidr.to_sym].key(ip).nil?
+    def ip_exists_in_cache(ip, cidr, mac)
+      @@ip_cache[cidr.to_sym] && @@ip_cache[cidr.to_sym].to_s.include?(ip.to_s)      
     end
 
     # Checks if given IP is within a subnet. Broadcast address is considered unusable
@@ -289,4 +310,4 @@ module Proxy::Phpipam
       @token = response['data']['token']
     end    
   end
-end
+end

data/lib/smart_proxy_ipam/version.rb

@@ -1,6 +1,6 @@
 
 module Proxy
   module Ipam
-    VERSION = '0.0.12'
+    VERSION = '0.0.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ipam
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Christopher Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies: []
 description: Smart proxy plugin for IPAM integration with various IPAM providers
 email: chrisjsmith001@gmail.com
@@ -29,7 +29,6 @@ files:
 - lib/smart_proxy_ipam/phpipam/phpipam_client.rb
 - lib/smart_proxy_ipam/phpipam/phpipam_helper.rb
 - lib/smart_proxy_ipam/version.rb
-- settings.d/external_ipam.yml
 - settings.d/external_ipam.yml.example
 homepage: http://github.com/grizzthedj/smart_proxy_ipam
 licenses:

data/settings.d/external_ipam.yml

@@ -1,8 +0,0 @@
----
-:enabled: true
-
-:external_ipam:
-  :phpipam:
-    :url: 'http://172.16.16.217'
-    :user: 'foreman'
-    :password: 'Test1234!'