smart_proxy_ipam 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7cb97764734cee081d9609f4831b927e82ca0847a551b76823ec4ef3ee0e2cd
-  data.tar.gz: b999ef4b34cd6e971374120dcc0e972fd9e237bcf8424e017cb2ad09242a690f
+  metadata.gz: 7332a15117cab62b21214132d6e95eb6b97c025ed8ffd4b38b6ad053c1673a3c
+  data.tar.gz: 29f5d76007278fc6e0124ee2438e434d96cbbd02caf6375a4f8afdaf12a650a2
 SHA512:
-  metadata.gz: 0de79823f4095b58d45d888d1b402929365d76299a9b2c7624d006d6b01e8cd4e7b4f42de87c1ab687b0602b62e19f10b806ebb5c39a8d3ebfcc22b5b788ba88
-  data.tar.gz: 33c07cf01c766f08ebef1545b97512368a983035cdaf81067db71d45b2d7f385f6db5d779d9cc24814dfe44c7861f00e22da3460dd2b1b12254ac18a213cb7a0
+  metadata.gz: 69d737e1a77f8a9487793f8efed346539ce461433e222e94debcb4d43f9365b92a4d43dfd35966122377d4e90d5c34852a684ea91d1f8aeca866abc8f894947b
+  data.tar.gz: 2d0a3ff8288589413c3b896a849d747263ff78a4bba0736088282d0bdc09059578c20b34dc65bbacf7cd85fa21623a28e5b40a07af1e65476b77488bff0ba4fb

data/lib/smart_proxy_ipam/phpipam/phpipam_api.rb

@@ -34,6 +34,8 @@ module Proxy::Phpipam
         section_name = params[:group]
 
         phpipam_client = PhpipamClient.new
+        return auth_error unless phpipam_client.authenticated?
+
         subnet = JSON.parse(phpipam_client.get_subnet(cidr, section_name))
 
         return {:code => subnet['code'], :error => subnet['error']}.to_json if no_subnets_found?(subnet)
@@ -82,6 +84,8 @@ module Proxy::Phpipam
         cidr = params[:address] + '/' + params[:prefix]
 
         phpipam_client = PhpipamClient.new
+        return auth_error unless phpipam_client.authenticated?
+
         phpipam_client.get_subnet(cidr)
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
         logger.debug(errors[:no_connection])
@@ -106,8 +110,11 @@ module Proxy::Phpipam
 
       begin
         phpipam_client = PhpipamClient.new
+        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))
+
         sections
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
         logger.debug(errors[:no_connection])
@@ -136,9 +143,11 @@ module Proxy::Phpipam
         return err if err.length > 0
  
         phpipam_client = PhpipamClient.new
+        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)
+
         section.to_json
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
         logger.debug(errors[:no_connection])
@@ -209,8 +218,9 @@ module Proxy::Phpipam
         return err if err.length > 0
 
         phpipam_client = PhpipamClient.new
-        section = JSON.parse(phpipam_client.get_section(params[:group]))
+        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)
 
         phpipam_client.get_subnets(section['data']['id'].to_s, false)
@@ -243,9 +253,11 @@ module Proxy::Phpipam
         ip = params[:ip]
         cidr = params[:address] + '/' + params[:prefix]
         section_name = params[:group]
+
         phpipam_client = PhpipamClient.new
+        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)
 
         ip_exists = JSON.parse(phpipam_client.ip_exists(ip, subnet['data']['id']))
@@ -287,8 +299,9 @@ module Proxy::Phpipam
         section_name = URI.escape(params[:group])
 
         phpipam_client = PhpipamClient.new
+        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)
 
         add_ip = JSON.parse(phpipam_client.add_ip_to_subnet(ip, subnet['data']['id'], 'Address auto added by Foreman'))
@@ -327,8 +340,9 @@ module Proxy::Phpipam
         cidr = params[:address] + '/' + params[:prefix]
         section_name = URI.escape(params[:group])
         phpipam_client = PhpipamClient.new
-        subnet = JSON.parse(phpipam_client.get_subnet(cidr, section_name))
+        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)
 
         delete_ip = JSON.parse(phpipam_client.delete_ip_from_subnet(ip, subnet['data']['id']))
@@ -367,6 +381,8 @@ module Proxy::Phpipam
         cidr = params[:address] + '/' + params[:prefix]
 
         phpipam_client = PhpipamClient.new
+        return auth_error unless phpipam_client.authenticated?
+
         phpipam_client.get_subnet_by_section(cidr, params[:group])
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET
         logger.debug(errors[:no_connection])

data/lib/smart_proxy_ipam/phpipam/phpipam_client.rb

@@ -26,6 +26,7 @@ module Proxy::Phpipam
       @@m = Monitor.new
       init_cache if @@ip_cache.nil?
       start_cleanup_task if @@timer_task.nil?
+      authenticate
     end
 
     def get_subnet(cidr, section_name = nil)
@@ -170,6 +171,10 @@ module Proxy::Phpipam
       @@timer_task.execute
     end
 
+    def authenticated?
+      !@token.nil?
+    end
+
     private
 
     # @@ip_cache structure
@@ -291,7 +296,6 @@ module Proxy::Phpipam
     end
 
     def get(path)
-      authenticate
       uri = URI(@api_base + path)
       request = Net::HTTP::Get.new(uri)
       request['token'] = @token
@@ -302,7 +306,6 @@ module Proxy::Phpipam
     end
 
     def delete(path, body=nil)
-      authenticate
       uri = URI(@api_base + path)
       uri.query = URI.encode_www_form(body) if body
       request = Net::HTTP::Delete.new(uri)
@@ -314,7 +317,6 @@ module Proxy::Phpipam
     end
 
     def post(path, body=nil)
-      authenticate
       uri = URI(@api_base + path)
       uri.query = URI.encode_www_form(body) if body
       request = Net::HTTP::Post.new(uri)
@@ -335,7 +337,8 @@ module Proxy::Phpipam
       }
 
       response = JSON.parse(response.body)
-      @token = response['data']['token']
+      logger.warn(response['message']) if response['message']
+      @token = response.dig('data', 'token')
     end    
   end
 end

data/lib/smart_proxy_ipam/phpipam/phpipam_helper.rb

@@ -28,6 +28,10 @@ module PhpipamHelper
   def ip_not_found_in_ipam?(ip)
     ip && ip['message'] && ip['message'].downcase == 'no addresses found'
   end
+
+  def auth_error
+    {:code => 401, :error => "Invalid username and password for External IPAM"}.to_json
+  end
   
   # Returns an array of hashes with only the fields given in the fields param
   def filter_fields(json_body, fields)

data/lib/smart_proxy_ipam/version.rb

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

metadata

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