smart_proxy_ipam 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7332a15117cab62b21214132d6e95eb6b97c025ed8ffd4b38b6ad053c1673a3c
-  data.tar.gz: 29f5d76007278fc6e0124ee2438e434d96cbbd02caf6375a4f8afdaf12a650a2
+  metadata.gz: 0f0b5b073c4b57b12c9ca83fd64a21422ec79a2ad2f9e2207a024e3d7a36ea27
+  data.tar.gz: dcee04479c5e2862e24b8195c4b22bf614869e865b35ca55516cb8c37e75b946
 SHA512:
-  metadata.gz: 69d737e1a77f8a9487793f8efed346539ce461433e222e94debcb4d43f9365b92a4d43dfd35966122377d4e90d5c34852a684ea91d1f8aeca866abc8f894947b
-  data.tar.gz: 2d0a3ff8288589413c3b896a849d747263ff78a4bba0736088282d0bdc09059578c20b34dc65bbacf7cd85fa21623a28e5b40a07af1e65476b77488bff0ba4fb
+  metadata.gz: b9b297ff0d4baa62b0d5423ec74b203aa114802f461eb4ab8a6cdb575d80bbc45b9695d5b7f1da9e7e069a2a48cf9bd06c700ca3c40e407f989d79e66ae8c19c
+  data.tar.gz: 4b4368f41022d1d9c778a9767d558f8a4c782165631dfddc06bb63c24f4b15a78fb0e28c6d189e81b6c5a0d95dfcec4391641bf169c1fecc0b15ff0cfe5b0539

data/lib/smart_proxy_ipam/phpipam/phpipam_api.rb

@@ -38,12 +38,12 @@ module Proxy::Phpipam
 
         subnet = JSON.parse(phpipam_client.get_subnet(cidr, section_name))
 
-        return {:code => subnet['code'], :error => subnet['error']}.to_json if no_subnets_found?(subnet)
+        return {:error => subnet['error']}.to_json if no_subnets_found?(subnet)
 
         ipaddr = phpipam_client.get_next_ip(subnet['data']['id'], mac, cidr, section_name)
         ipaddr_parsed = JSON.parse(ipaddr)
 
-        return {:code => 404, :error => ipaddr_parsed['error']}.to_json if no_free_ip_found?(ipaddr_parsed)
+        return {:error => ipaddr_parsed['error']}.to_json if no_free_ip_found?(ipaddr_parsed)
 
         ipaddr
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
@@ -113,7 +113,7 @@ module Proxy::Phpipam
         return auth_error unless phpipam_client.authenticated?
 
         sections = phpipam_client.get_sections
-        return {:code => 200, :data => []}.to_json if no_sections_found?(JSON.parse(sections))
+        return {:data => []}.to_json if no_sections_found?(JSON.parse(sections))
 
         sections
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
@@ -122,7 +122,7 @@ module Proxy::Phpipam
       end
     end
 
-    # Get a single sections from external ipam
+    # Get a single section from external ipam
     #
     # Input: Section name
     # Returns: A JSON section on success, hash with "error" key otherwise
@@ -146,9 +146,9 @@ module Proxy::Phpipam
         return auth_error unless phpipam_client.authenticated?
         
         section = JSON.parse(phpipam_client.get_section(params[:group]))
-        return {:code => section['code'], :message => section['message']}.to_json if no_section_found?(section)
+        return {}.to_json if no_section_found?(section)
 
-        section.to_json
+        section['data'].to_json
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
         logger.debug(errors[:no_connection])
         raise 
@@ -221,7 +221,7 @@ module Proxy::Phpipam
         return auth_error unless phpipam_client.authenticated?
 
         section = JSON.parse(phpipam_client.get_section(params[:group]))
-        return {:code => 404, :error => errors[:no_section]}.to_json if no_section_found?(section)
+        return {:error => errors[:no_section]}.to_json if no_section_found?(section)
 
         phpipam_client.get_subnets(section['data']['id'].to_s, false)
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
@@ -258,14 +258,15 @@ module Proxy::Phpipam
         return auth_error unless phpipam_client.authenticated?
         
         subnet = JSON.parse(phpipam_client.get_subnet(cidr, section_name))
-        return {:code => 404, :error => subnet['error']}.to_json if no_subnets_found?(subnet)
+        return {:error => subnet['error']}.to_json if no_subnets_found?(subnet)
 
-        ip_exists = JSON.parse(phpipam_client.ip_exists(ip, subnet['data']['id']))
+        response = phpipam_client.ip_exists(ip, subnet['data']['id'])
+        ip_exists = JSON.parse(response.body)
 
         if ip_exists['data']
-          return {:code => 200, :exists => true}.to_json
+          return Net::HTTPFound.new('HTTP/1.1', 200, 'Found').to_json
         else
-          return {:code => 404, :exists => false}.to_json 
+          return Net::HTTPNotFound.new('HTTP/1.1', 404, 'Not Found').to_json
         end
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
         logger.debug(errors[:no_connection])
@@ -302,14 +303,15 @@ module Proxy::Phpipam
         return auth_error unless phpipam_client.authenticated?
         
         subnet = JSON.parse(phpipam_client.get_subnet(cidr, section_name))
-        return {:code => 404, :error => subnet['error']}.to_json if no_subnets_found?(subnet)
+        return {:error => subnet['error']}.to_json if no_subnets_found?(subnet)
 
-        add_ip = JSON.parse(phpipam_client.add_ip_to_subnet(ip, subnet['data']['id'], 'Address auto added by Foreman'))
+        response = phpipam_client.add_ip_to_subnet(ip, subnet['data']['id'], 'Address auto added by Foreman')
+        add_ip = JSON.parse(response.body)
 
         if add_ip['message'] && add_ip['message'] == "Address created"
-          return {:code => 200}.to_json
+          return Net::HTTPCreated.new('HTTP/1.1', 201, 'Created').to_json
         else
-          return {:code => 500, :error => add_ip['message']}.to_json
+          return {:error => add_ip['message']}.to_json
         end
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
         logger.debug(errors[:no_connection])
@@ -343,14 +345,15 @@ module Proxy::Phpipam
         return auth_error unless phpipam_client.authenticated?
 
         subnet = JSON.parse(phpipam_client.get_subnet(cidr, section_name))
-        return {:code => 404, :error => subnet['error']}.to_json if no_subnets_found?(subnet)
+        return {:error => subnet['error']}.to_json if no_subnets_found?(subnet)
 
-        delete_ip = JSON.parse(phpipam_client.delete_ip_from_subnet(ip, subnet['data']['id']))
+        response = phpipam_client.delete_ip_from_subnet(ip, subnet['data']['id'])
+        delete_ip = JSON.parse(response.body)
 
         if delete_ip['message'] && delete_ip['message'] == "Address deleted"
-          return {:code => 200}.to_json
-        else 
-          return {:code => 500, :error => delete_ip['message']}.to_json
+          return Net::HTTPOK.new('HTTP/1.1', 200, 'Address Deleted').to_json
+        else
+          return {:error => delete_ip['message']}.to_json
         end
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
         logger.debug(errors[:no_connection])

data/lib/smart_proxy_ipam/phpipam/phpipam_client.rb

@@ -39,6 +39,9 @@ module Proxy::Phpipam
 
     def get_subnet_by_section(cidr, section_name, include_id = true)
       section = JSON.parse(get_section(section_name))
+
+      return {:error => "No section #{URI.unescape(section_name)} found"}.to_json if no_section_found?(section)
+
       subnets = JSON.parse(get_subnets(section['data']['id'], include_id))
       subnet_id = nil
 
@@ -47,12 +50,12 @@ module Proxy::Phpipam
         subnet_id = subnet['id'] if subnet_cidr == cidr
       end
       
-      return {:code => 404, :error => "No subnet #{cidr} found in section #{URI.unescape(section_name)}"}.to_json if subnet_id.nil?
-      
+      return {}.to_json if subnet_id.nil?
+
       response = get("subnets/#{subnet_id.to_s}/")
       json_body = JSON.parse(response.body)
       json_body['data'] = filter_hash(json_body['data'], [:id, :subnet, :mask, :description]) if json_body['data']
-      json_body = filter_hash(json_body, [:code, :data, :error, :message])
+      json_body = filter_hash(json_body, [:data, :error, :message])
       response.body = json_body.to_json
       response.header['Content-Length'] = json_body.to_s.length
       response.body
@@ -61,8 +64,9 @@ module Proxy::Phpipam
     def get_subnet_by_cidr(cidr)
       response = get("subnets/cidr/#{cidr.to_s}")
       json_body = JSON.parse(response.body)
+      return {}.to_json if json_body['data'].nil?
       json_body['data'] = filter_fields(json_body, [:id, :subnet, :description, :mask])[0]
-      json_body = filter_hash(json_body, [:code, :data, :error, :message])
+      json_body = filter_hash(json_body, [:data, :error, :message])
       response.body = json_body.to_json
       response.header['Content-Length'] = json_body.to_s.length
       response.body
@@ -72,7 +76,7 @@ module Proxy::Phpipam
       response = get("sections/#{section_name}/")
       json_body = JSON.parse(response.body)
       json_body['data'] = filter_hash(json_body['data'], [:id, :name, :description]) if json_body['data']
-      json_body = filter_hash(json_body, [:code, :data, :error, :message])
+      json_body = filter_hash(json_body, [:data, :error, :message])
       response.body = json_body.to_json
       response.header['Content-Length'] = json_body.to_s.length
       response.body
@@ -82,7 +86,7 @@ module Proxy::Phpipam
       response = get('sections/')
       json_body = JSON.parse(response.body)
       json_body['data'] = filter_fields(json_body, [:id, :name, :description]) if json_body['data']
-      json_body = filter_hash(json_body, [:code, :data, :error, :message])
+      json_body = filter_hash(json_body, [:data, :error, :message])
       response.body = json_body.to_json
       response.header['Content-Length'] = json_body.to_s.length
       response.body
@@ -94,7 +98,7 @@ module Proxy::Phpipam
       fields.push(:id) if include_id
       json_body = JSON.parse(response.body)
       json_body['data'] = filter_fields(json_body, fields) if json_body['data']
-      json_body = filter_hash(json_body, [:code, :data, :error, :message])
+      json_body = filter_hash(json_body, [:data, :error, :message])
       response.body = json_body.to_json
       response.header['Content-Length'] = json_body.to_s.length
       response.body
@@ -104,29 +108,29 @@ module Proxy::Phpipam
       response = get("subnets/#{subnet_id.to_s}/addresses/#{ip}/")
       json_body = JSON.parse(response.body)
       json_body['data'] = filter_fields(json_body, [:ip]) if json_body['data']
-      json_body = filter_hash(json_body, [:code, :data, :error, :message])
+      json_body = filter_hash(json_body, [:data, :error, :message])
       response.body = json_body.to_json
       response.header['Content-Length'] = json_body.to_s.length
-      response.body
+      response
     end
 
     def add_ip_to_subnet(ip, subnet_id, desc)
       data = {:subnetId => subnet_id, :ip => ip, :description => desc}
       response = post('addresses/', data)
       json_body = JSON.parse(response.body)
-      json_body = filter_hash(json_body, [:code, :error, :message])
+      json_body = filter_hash(json_body, [:error, :message])
       response.body = json_body.to_json
       response.header['Content-Length'] = json_body.to_s.length
-      response.body
+      response
     end
 
     def delete_ip_from_subnet(ip, subnet_id)
       response = delete("addresses/#{ip}/#{subnet_id.to_s}/") 
       json_body = JSON.parse(response.body)
-      json_body = filter_hash(json_body, [:code, :error, :message])
+      json_body = filter_hash(json_body, [:error, :message])
       response.body = json_body.to_json
       response.header['Content-Length'] = json_body.to_s.length
-      response.body
+      response
     end
 
     def get_next_ip(subnet_id, mac, cidr, section_name)
@@ -136,7 +140,7 @@ module Proxy::Phpipam
       @@ip_cache[section.to_sym] = {} if @@ip_cache[section.to_sym].nil?
       subnet_hash = @@ip_cache[section.to_sym][cidr.to_sym]
 
-      return {:code => json_body['code'], :error => json_body['message']}.to_json if json_body['message']
+      return {:error => json_body['message']}.to_json if json_body['message']
 
       if subnet_hash && subnet_hash.key?(mac.to_sym)
         json_body['data'] = @@ip_cache[section_name.to_sym][cidr.to_sym][mac.to_sym][:ip]
@@ -152,13 +156,13 @@ module Proxy::Phpipam
           next_ip = find_new_ip(subnet_id, new_ip, mac, cidr, section)
         end
 
-        return {:code => 404, :error => "Unable to find another available IP address in subnet #{cidr}"}.to_json if next_ip.nil?
-        return {:code => 404, :error => "It is possible that there are no more free addresses in subnet #{cidr}. Available IP's may be cached, and could become available after in-memory IP cache is cleared(up to #{DEFAULT_CLEANUP_INTERVAL} seconds)."}.to_json unless usable_ip(next_ip, cidr)
+        return {:error => "Unable to find another available IP address in subnet #{cidr}"}.to_json if next_ip.nil?
+        return {:error => "It is possible that there are no more free addresses in subnet #{cidr}. Available IP's may be cached, and could become available after in-memory IP cache is cleared(up to #{DEFAULT_CLEANUP_INTERVAL} seconds)."}.to_json unless usable_ip(next_ip, cidr)
 
         json_body['data'] = next_ip
       end
 
-      json_body = {:code => json_body['code'], :data => json_body['data']}
+      json_body = {:data => json_body['data']}
 
       response.body = json_body.to_json
       response.header['Content-Length'] = json_body.to_s.length
@@ -261,7 +265,7 @@ module Proxy::Phpipam
 
       loop do
         new_ip = increment_ip(temp_ip)
-        verify_ip = JSON.parse(ip_exists(new_ip, subnet_id))
+        verify_ip = JSON.parse(ip_exists(new_ip, subnet_id).body)
 
         # If new IP doesn't exist in IPAM and not in the cache
         if ip_not_found_in_ipam?(verify_ip) && !ip_exists_in_cache(new_ip, cidr, mac, section_name)

data/lib/smart_proxy_ipam/version.rb

@@ -1,6 +1,6 @@
 
 module Proxy
   module Ipam
-    VERSION = '0.0.21'
+    VERSION = '0.0.22'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ipam
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Christopher Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies: []
 description: Smart proxy plugin for IPAM integration with various IPAM providers
 email: chrisjsmith001@gmail.com