smart_proxy_ipam 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6837d0021bc1780d407c415305028b4df44d06384f3ff5f832bbdce27eac9553
-  data.tar.gz: e6fd4ada7f80681809f337c78b543323da2d75eae3c647fc8a27bb3884ed3c02
+  metadata.gz: cf80d5537986cfb15d05ac927e2c0498a9cdcab10c98866dab18b4ead3a91131
+  data.tar.gz: 57d175cf91379394aae2f6ba477d0c89a84b4774363e9e391bc473fa9454bc5f
 SHA512:
-  metadata.gz: '068c6ae6cb3765c73e462c4dfa7b9d6fe40b593f1fbc910a1e081ee12adadc4780d2dd47c8916c993678e8c0c5b83777338afa308d0f9b7751e24712476c45f5'
-  data.tar.gz: d13ffd1797f101cb2a0c67d6c354794f8a43c16453c879cfedf07f1df77e219f3335aa7eb0e3ffb8196e4f1cddf7bc401560df4e0c44662e82cef383c1cfdf72
+  metadata.gz: 47f2404f8982398568a8d6d1984116658e7dd9eead7679f836c74bef9772bab678b084b82cdddfbfcc8d6b6b19adf3962510c5b566c0f7a1b80d53b9e9505da8
+  data.tar.gz: e3dc74e8020a7af4c7f660ef7204c03130088a58dd5fff23a0d18440061d3f602182f6a13f0a1d363429ad860499ce87ab33f71fa524a7f10f8006075f469e44

data/lib/smart_proxy_ipam.rb

@@ -1,3 +1,2 @@
-
 require 'smart_proxy_ipam/version'
 require 'smart_proxy_ipam/ipam'

data/lib/smart_proxy_ipam/ipam.rb

@@ -1,9 +1,9 @@
 
-module Proxy::ExternalIpam
+module Proxy::Ipam
   class NotFound < RuntimeError; end
 
   class Plugin < ::Proxy::Plugin
-    plugin 'external_ipam', Proxy::ExternalIpam::VERSION
+    plugin 'external_ipam', Proxy::Ipam::VERSION
 
     http_rackup_path File.expand_path('ipam_http_config.ru', File.expand_path('../', __FILE__))
     https_rackup_path File.expand_path('ipam_http_config.ru', File.expand_path('../', __FILE__))

data/lib/smart_proxy_ipam/ipam_main.rb

@@ -1,11 +1,11 @@
 
-module Proxy::ExternalIpam
+module Proxy::Ipam
   extend ::Proxy::Util
   extend ::Proxy::Log
 
   class << self
     def get_config
-      Proxy::ExternalIpam::Plugin.settings.external_ipam
+      Proxy::Ipam::Plugin.settings.external_ipam
     end
   end
 end

data/lib/smart_proxy_ipam/phpipam/phpipam_api.rb

@@ -13,26 +13,27 @@ module Proxy::Phpipam
 
       begin
         cidr = params[:cidr]
-        
+
         if not cidr
           return {error: "A 'cidr' parameter for the subnet must be provided(e.g. 100.10.10.0/24)"}.to_json
         end
 
-        response = PhpipamClient.get_subnet(cidr)
+        phpipam_client = PhpipamClient.new
+        response = phpipam_client.get_subnet(cidr)
 
         if response['message'] && response['message'].downcase == "no subnets found"
           return {error: "The specified subnet does not exist in phpIPAM."}.to_json
         end
   
         subnet_id = response['data'][0]['id']
-        response = PhpipamClient.get_next_ip(subnet_id)
+        response = phpipam_client.get_next_ip(subnet_id)
 
         if response['message'] && response['message'].downcase == "no free addresses found"
           return {error: "There are no more free addresses in subnet #{cidr}"}.to_json
         end
 
         {cidr: cidr, next_ip: response['data']}.to_json
-      rescue Errno::ECONNREFUSED => e
+      rescue Errno::ECONNREFUSED
         return {error: "Unable to connect to phpIPAM server"}.to_json
       end
     end
@@ -43,9 +44,14 @@ module Proxy::Phpipam
       begin
         cidr = params[:cidr]
 
-        subnet = PhpipamClient.get_subnet(cidr)
+        if not cidr
+          return {error: "A 'cidr' parameter for the subnet must be provided(e.g. 100.10.10.0/24)"}.to_json
+        end
+
+        phpipam_client = PhpipamClient.new
+        subnet = phpipam_client.get_subnet(cidr)
         subnet.to_json
-      rescue Errno::ECONNREFUSED => e
+      rescue Errno::ECONNREFUSED
         return {error: "Unable to connect to phpIPAM server"}.to_json
       end
     end
@@ -54,9 +60,10 @@ module Proxy::Phpipam
       content_type :json
 
       begin
-        sections = PhpipamClient.get_sections
+        phpipam_client = PhpipamClient.new
+        sections = phpipam_client.get_sections
         sections.to_json
-      rescue Errno::ECONNREFUSED => e
+      rescue Errno::ECONNREFUSED
         return {error: "Unable to connect to phpIPAM server"}.to_json
       end
     end
@@ -71,9 +78,10 @@ module Proxy::Phpipam
           return {error: "A 'section_id' must be provided"}.to_json
         end
 
-        subnets = PhpipamClient.get_subnets(section_id)
+        phpipam_client = PhpipamClient.new
+        subnets = phpipam_client.get_subnets(section_id)
         subnets.to_json
-      rescue Errno::ECONNREFUSED => e
+      rescue Errno::ECONNREFUSED
         return {error: "Unable to connect to phpIPAM server"}.to_json
       end
     end
@@ -88,14 +96,15 @@ module Proxy::Phpipam
         return {error: "Missing 'cidr' parameter. A CIDR IPv4 address must be provided(e.g. 100.10.10.0/24)"}.to_json if not cidr
         return {error: "Missing 'ip' parameter. An IPv4 address must be provided(e.g. 100.10.10.22)"}.to_json if not ip
 
-        subnet = PhpipamClient.get_subnet(cidr)
+        phpipam_client = PhpipamClient.new
+        subnet = phpipam_client.get_subnet(cidr)
 
         if subnet['message'] && subnet['message'].downcase == "no subnets found"
           return {error: "The specified subnet does not exist in phpIPAM."}.to_json
         end
 
         subnet_id = subnet['data'][0]['id']
-        usage = PhpipamClient.get_subnet_usage(subnet_id)
+        usage = phpipam_client.get_subnet_usage(subnet_id)
 
         # We need to check subnet usage first in the case there are zero ips in the subnet. Checking
         # the ip existence on an empty subnet returns a malformed response from phpIPAM, containing
@@ -103,7 +112,7 @@ module Proxy::Phpipam
         if usage['data']['used'] == "0"
           return {ip: ip, exists: false}.to_json
         else 
-          response = PhpipamClient.ip_exists(ip, subnet_id)
+          response = phpipam_client.ip_exists(ip, subnet_id)
       
           if response && response['message'] && response['message'].downcase == 'no addresses found'
             return {ip: ip, exists: false}.to_json
@@ -111,7 +120,7 @@ module Proxy::Phpipam
             return {ip: ip, exists: true}.to_json
           end
         end
-      rescue Errno::ECONNREFUSED => e
+      rescue Errno::ECONNREFUSED
         return {error: "Unable to connect to phpIPAM server"}.to_json
       end
     end
@@ -126,7 +135,8 @@ module Proxy::Phpipam
         return {error: "Missing 'cidr' parameter. A CIDR IPv4 address must be provided(e.g. 100.10.10.0/24)"}.to_json if not cidr
         return {error: "Missing 'ip' parameter. An IPv4 address must be provided(e.g. 100.10.10.22)"}.to_json if not ip
 
-        response = PhpipamClient.get_subnet(cidr)
+        phpipam_client = PhpipamClient.new
+        response = phpipam_client.get_subnet(cidr)
 
         if response['message'] && response['message'].downcase == "no subnets found"
           return {error: "The specified subnet does not exist in phpIPAM."}.to_json
@@ -134,10 +144,10 @@ module Proxy::Phpipam
 
         subnet_id = response['data'][0]['id']
 
-        PhpipamClient.add_ip_to_subnet(ip, subnet_id, 'Address auto added by Foreman')
+        phpipam_client.add_ip_to_subnet(ip, subnet_id, 'Address auto added by Foreman')
 
         {message: "IP #{ip} added to subnet #{cidr} successfully."}.to_json
-      rescue Errno::ECONNREFUSED => e
+      rescue Errno::ECONNREFUSED
         return {error: "Unable to connect to phpIPAM server"}.to_json
       end
     end
@@ -152,7 +162,8 @@ module Proxy::Phpipam
         return {error: "Missing 'cidr' parameter. A CIDR IPv4 address must be provided(e.g. 100.10.10.0/24)"}.to_json if not cidr
         return {error: "Missing 'ip' parameter. An IPv4 address must be provided(e.g. 100.10.10.22)"}.to_json if not ip
 
-        response = PhpipamClient.get_subnet(cidr)
+        phpipam_client = PhpipamClient.new
+        response = phpipam_client.get_subnet(cidr)
 
         if response['message'] && response['message'].downcase == "no subnets found"
           return {error: "The specified subnet does not exist in phpIPAM."}.to_json
@@ -160,10 +171,10 @@ module Proxy::Phpipam
 
         subnet_id = response['data'][0]['id']
 
-        PhpipamClient.delete_ip_from_subnet(ip, subnet_id)
+        phpipam_client.delete_ip_from_subnet(ip, subnet_id)
 
         {message: "IP #{ip} deleted from subnet #{cidr} successfully."}.to_json
-      rescue Errno::ECONNREFUSED => e
+      rescue Errno::ECONNREFUSED
         return {error: "Unable to connect to phpIPAM server"}.to_json
       end
     end

data/lib/smart_proxy_ipam/phpipam/phpipam_client.rb

@@ -7,50 +7,52 @@ require 'smart_proxy_ipam/ipam_main'
 
 module Proxy::Phpipam
   class PhpipamClient  
-    conf = Proxy::ExternalIpam.get_config[:phpipam]
-    @phpipam_config = {url: conf[:url], user: conf[:user], password: conf[:password]}
-    @api_base = conf[:url] + '/api/' + conf[:user] + '/'
-    @token = nil
+    def initialize 
+      conf = Proxy::Ipam.get_config[:phpipam]
+      @phpipam_config = {url: conf[:url], user: conf[:user], password: conf[:password]}
+      @api_base = conf[:url] + '/api/' + conf[:user] + '/'
+      @token = nil
+    end
 
-    def self.get_subnet(cidr)
+    def get_subnet(cidr)
       url = 'subnets/cidr/' + cidr.to_s + '/'
-      self.get(url) 
+      get(url) 
     end
 
-    def self.get_next_ip(subnet_id)
+    def get_next_ip(subnet_id)
       url = 'subnets/' + subnet_id.to_s + '/first_free/'
-      self.get(url)
+      get(url)
     end
 
-    def self.add_ip_to_subnet(ip, subnet_id, desc)
+    def add_ip_to_subnet(ip, subnet_id, desc)
       data = {'subnetId': subnet_id, 'ip': ip, 'description': desc}
-      self.post('addresses/', data) 
+      post('addresses/', data) 
     end
 
-    def self.get_sections
-      self.get('sections/')['data']
+    def get_sections
+      get('sections/')['data']
     end
 
-    def self.get_subnets(section_id)
-      self.get('sections/' + section_id.to_s + '/subnets/')
+    def get_subnets(section_id)
+      get('sections/' + section_id.to_s + '/subnets/')
     end
 
-    def self.ip_exists(ip, subnet_id)
-      self.get('subnets/' + subnet_id.to_s + '/addresses/' + ip + '/')
+    def ip_exists(ip, subnet_id)
+      get('subnets/' + subnet_id.to_s + '/addresses/' + ip + '/')
     end
 
-    def self.get_subnet_usage(subnet_id)
-      self.get('subnets/' + subnet_id.to_s + '/usage/')
+    def get_subnet_usage(subnet_id)
+      get('subnets/' + subnet_id.to_s + '/usage/')
     end
 
-    def self.delete_ip_from_subnet(ip, subnet_id)
-      self.delete('addresses/' + ip + '/' + subnet_id.to_s + '/') 
+    def delete_ip_from_subnet(ip, subnet_id)
+      delete('addresses/' + ip + '/' + subnet_id.to_s + '/') 
     end
 
     private
 
-    def self.get(path, body=nil)
-      self.authenticate
+    def get(path, body=nil)
+      authenticate
       uri = URI(@api_base + path)
       uri.query = URI.encode_www_form(body) if body
       request = Net::HTTP::Get.new(uri)
@@ -63,8 +65,8 @@ module Proxy::Phpipam
       JSON.parse(response.body)
     end
 
-    def self.delete(path, body=nil)
-      self.authenticate
+    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)
@@ -77,8 +79,8 @@ module Proxy::Phpipam
       JSON.parse(response.body)
     end
 
-    def self.post(path, body=nil)
-      self.authenticate
+    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)
@@ -91,7 +93,7 @@ module Proxy::Phpipam
       JSON.parse(response.body)
     end
 
-    def self.authenticate
+    def authenticate
       auth_uri = URI(@api_base + '/user/')
       request = Net::HTTP::Post.new(auth_uri)
       request.basic_auth @phpipam_config[:user], @phpipam_config[:password]

data/lib/smart_proxy_ipam/version.rb

@@ -1,6 +1,6 @@
 
 module Proxy
-  module ExternalIpam
-    VERSION = '0.0.3'
+  module Ipam
+    VERSION = '0.0.4'
   end
 end

metadata

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