smart_proxy_dns_infoblox 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0cd133f133a42e4d8bb583d7566d3ef78caaf9f088a95f589c950f5abc73d99
-  data.tar.gz: b6a90cd39ac38ff25d40c557a4f615b6d4339a3841015157dfb99525890d7973
+  metadata.gz: b3a0500e2d29b0e17690364666974cec3258457b8806c4ff743fc85179e9c67b
+  data.tar.gz: df9c2f18edb7a29ce56090ef1ca03f34e6454ec88d9c492c1e23d274e03717bb
 SHA512:
-  metadata.gz: de50121fbebd43ca08d483bd1332988e7c2ab6b4659d7605b16de613ac6cbbd6b1190c680b449cc4c11073187d148c4cfe32818a9a2b2a1fa7d48a0137a574a8
-  data.tar.gz: 63865b57418f08551a82af80ff526c62b3c78ba364bfe9136d9f0dc8bea8e7489aa23fc3d6af80c596940609ac09ec25f58e66a3a2b75352e771e5854f170a12
+  metadata.gz: eb8d100b528571220d9f08cda5d9772819114a2712bc2cfff82f5352d92bdeacd5163bad9465c51d6497aff9c346343d66207c7b2f579ce4c4eeee478af137bd
+  data.tar.gz: 916a54d5a0aa1610a4a9d034c27c913f922ad29172a10bf503f3403db182c91d2b20cbc3d250dc04a084ab8936d0f91f07cbdc454047d31fcfcde54f1b14adef

data/README.md

@@ -1,7 +1,5 @@
 # SmartProxyDnsInfoblox
 
-[![Build Status](https://travis-ci.org/theforeman/smart_proxy_dns_infoblox.svg?branch=master)](https://travis-ci.org/theforeman/smart_proxy_dns_infoblox)
-
 This plugin adds a new DNS provider for managing records in MyService.
 
 ## Installation

data/lib/smart_proxy_dns_infoblox/dns_infoblox_main.rb

@@ -11,12 +11,14 @@ module Proxy::Dns::Infoblox
     def do_create(name, value, type)
       method = "ib_create_#{type.downcase}_record".to_sym
       raise(Proxy::Dns::Error, "Creation of #{type} records not implemented") unless respond_to?(method, true)
+
       send(method, name, value)
     end
 
     def do_remove(name, type)
       method = "ib_remove_#{type.downcase}_record".to_sym
       raise(Proxy::Dns::Error, "Deletion of #{type} records not implemented") unless respond_to?(method, true)
+
       send(method, name)
     end
 
@@ -24,11 +26,17 @@ module Proxy::Dns::Infoblox
     #  0 = already exists and do nothing
     #  1 = conflict and error out
     def record_conflicts_ip(fqdn, type, address)
-      method = "ib_find_#{type.name.split('::').last.downcase}_record".to_sym
+      if type == Resolv::DNS::Resource::IN::PTR
+        ip = IPAddr.new(ptr_to_ip(address))
+        method = "ib_find_#{type.name.split('::').last.downcase}#{ip.ipv4? ? 4 : 6}_record".to_sym
+      else
+        method = "ib_find_#{type.name.split('::').last.downcase}_record".to_sym
+      end
       raise(Proxy::Dns::Error, "Finding of #{type} records not implemented") unless respond_to?(method, true)
 
       return -1 if send(method, fqdn).empty?
       return 0 if send(method, fqdn, address).any?
+
       1
     end
 
@@ -62,15 +70,31 @@ module Proxy::Dns::Infoblox
       Infoblox::AAAArecord.find(connection, params)
     end
 
-    def ib_find_ptr_record(fqdn, ptr = nil)
+    def ib_find_ptr4_record(fqdn, ptr = nil)
       params = {
         :_max_results => 1,
         :view => dns_view,
-        :ptrdname => fqdn
+        :ptrdname => fqdn,
+        :'name~' => 'in-addr\.arpa$'
       }
       if ptr
         ip = IPAddr.new(ptr_to_ip(ptr))
-        params["ipv#{ip.ipv4? ? 4 : 6}addr".to_sym] = ip.to_s
+        params[:ipv4addr] = ip.to_s
+        params[:name] = ptr
+      end
+      Infoblox::Ptr.find(connection, params)
+    end
+
+    def ib_find_ptr6_record(fqdn, ptr = nil)
+      params = {
+        :_max_results => 1,
+        :view => dns_view,
+        :ptrdname => fqdn,
+        :'name~' => 'ip6\.arpa$'
+      }
+      if ptr
+        ip = IPAddr.new(ptr_to_ip(ptr))
+        params[:ipv6addr] = ip.to_s
         params[:name] = ptr
       end
       Infoblox::Ptr.find(connection, params)
@@ -136,14 +160,15 @@ module Proxy::Dns::Infoblox
     end
 
     def ib_delete(clazz, params)
-      record = clazz.find(connection, params.merge(_max_results: 1, view: dns_view)).first
+      records = clazz.find(connection, params.merge(view: dns_view))
+      raise Proxy::Dns::NotFound, "Cannot find #{clazz.class.name} entry for #{params}" if records.empty?
 
-      raise Proxy::Dns::NotFound, "Cannot find #{clazz.class.name} entry for #{params}" if record.nil?
-      ret_value = record.delete || (raise Proxy::Dns::NotFound, "Cannot find #{clazz.class.name} entry for #{params}")
-
-      ib_clear_dns_cache(record)
+      records.each do |record|
+        record.delete
+        ib_clear_dns_cache(record)
+      end
 
-      ret_value
+      true
     end
 
     def ib_clear_dns_cache(record)
@@ -153,9 +178,9 @@ module Proxy::Dns::Infoblox
       MemberDns.all(connection).each do |member|
         member.clear_dns_cache(view: record.view, domain: record.name)
       end
-    rescue StandardError => ex
+    rescue StandardError => e
       # Failing to clear the DNS cache should never be an error
-      logger.warn("Exception #{ex} was raised when clearing DNS cache")
+      logger.warn("Exception #{e} was raised when clearing DNS cache")
     end
   end
 end

data/lib/smart_proxy_dns_infoblox/dns_infoblox_plugin.rb

@@ -2,7 +2,8 @@ module Proxy::Dns::Infoblox
   class Plugin < ::Proxy::Provider
     plugin :dns_infoblox, ::Proxy::Dns::Infoblox::VERSION
 
-    default_settings :username => 'infoblox', :password => 'infoblox', :dns_server => 'localhost', :dns_view => 'default', :timeout => 60
+    default_settings :username => 'infoblox', :password => 'infoblox', :dns_server => 'localhost',
+                     :dns_view => 'default', :timeout => 60
 
     requires :dns, '>= 1.12'
 

data/lib/smart_proxy_dns_infoblox/dns_infoblox_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module Dns
     module Infoblox
-      VERSION = '1.0.0'.freeze
+      VERSION = '1.2.0'.freeze
     end
   end
 end

data/lib/smart_proxy_dns_infoblox/infoblox_member_dns.rb

@@ -13,7 +13,7 @@ module Proxy::Dns::Infoblox
       post_body[:domain] = domain unless domain.nil?
       post_body[:view] = view unless view.nil?
 
-      JSON.parse(connection.post(resource_uri + "?_function=clear_dns_cache", post_body).body)
+      JSON.parse(connection.post("#{resource_uri}?_function=clear_dns_cache", post_body).body)
     end
   end
 end

data/test/infoblox_test.rb

@@ -48,20 +48,31 @@ class InfobloxTest < Test::Unit::TestCase
   end
 
   def test_conflict_ptr_ok
-    @provider.expects(:ib_find_ptr_record).with("13.202.168.192.in-addr.arpa").returns([])
-    assert_equal(-1, @provider.record_conflicts_ip("13.202.168.192.in-addr.arpa", Resolv::DNS::Resource::IN::PTR, "test.example.com"))
+    @provider.expects(:ib_find_ptr4_record).with("test.example.com").returns([])
+    assert_equal(-1, @provider.record_conflicts_name("13.202.168.192.in-addr.arpa", Resolv::DNS::Resource::IN::PTR, "test.example.com"))
+
+    @provider.expects(:ib_find_ptr6_record).with("test.example.com").returns([])
+    assert_equal(-1, @provider.record_conflicts_name("1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa", Resolv::DNS::Resource::IN::PTR, "test.example.com"))
   end
 
   def test_conflict_ptr_already_exists
-    @provider.expects(:ib_find_ptr_record).with("13.202.168.192.in-addr.arpa").returns([true])
-    @provider.expects(:ib_find_ptr_record).with("13.202.168.192.in-addr.arpa", "test.example.com").returns([true])
-    assert_equal(0, @provider.record_conflicts_ip("13.202.168.192.in-addr.arpa", Resolv::DNS::Resource::IN::PTR, "test.example.com"))
+    @provider.expects(:ib_find_ptr4_record).with("test.example.com").returns([true])
+    @provider.expects(:ib_find_ptr4_record).with("test.example.com", "13.202.168.192.in-addr.arpa").returns([true])
+    assert_equal(0, @provider.record_conflicts_name("13.202.168.192.in-addr.arpa", Resolv::DNS::Resource::IN::PTR, "test.example.com"))
+
+    @provider.expects(:ib_find_ptr6_record).with("test.example.com").returns([true])
+    @provider.expects(:ib_find_ptr6_record).with("test.example.com", "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa").returns([true])
+    assert_equal(0, @provider.record_conflicts_name("1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa", Resolv::DNS::Resource::IN::PTR, "test.example.com"))
   end
 
   def test_conflict_ptr_conflict
-    @provider.expects(:ib_find_ptr_record).with("13.202.168.192.in-addr.arpa").returns([false])
-    @provider.expects(:ib_find_ptr_record).with("13.202.168.192.in-addr.arpa", "test.example.com").returns([false])
-    assert_equal(1, @provider.record_conflicts_ip("13.202.168.192.in-addr.arpa", Resolv::DNS::Resource::IN::PTR, "test.example.com"))
+    @provider.expects(:ib_find_ptr4_record).with("test.example.com").returns([false])
+    @provider.expects(:ib_find_ptr4_record).with("test.example.com", "13.202.168.192.in-addr.arpa").returns([false])
+    assert_equal(1, @provider.record_conflicts_name("13.202.168.192.in-addr.arpa", Resolv::DNS::Resource::IN::PTR, "test.example.com"))
+
+    @provider.expects(:ib_find_ptr6_record).with("test.example.com").returns([false])
+    @provider.expects(:ib_find_ptr6_record).with("test.example.com", "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa").returns([false])
+    assert_equal(1, @provider.record_conflicts_name("1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa", Resolv::DNS::Resource::IN::PTR, "test.example.com"))
   end
 
   def test_conflict_cname_ok
@@ -160,6 +171,35 @@ class InfobloxTest < Test::Unit::TestCase
     @provider.do_remove(ptr, 'PTR')
   end
 
+  def test_wapi_remove_multi_a_records
+    address1 = '192.168.1.11'
+    address2 = '192.168.2.22'
+    fqdn = 'test.example.com'
+
+    record1 = Infoblox::Arecord.new name: fqdn, :ipv4addr => address1
+    record1.expects(:delete).returns(record1)
+    record2 = Infoblox::Arecord.new name: fqdn, :ipv4addr => address2
+    record2.expects(:delete).returns(record2)
+
+    Infoblox::Arecord.expects(:find).returns([record1, record2])
+    @provider.do_remove(fqdn, 'A')
+  end
+
+  def test_wapi_remove_multi_ptr_records
+    ptr = '1.1.1.10.in-addr.arpa'
+    ip = '10.1.1.1'
+    fqdn1 = 'test1.example.com'
+    fqdn2 = 'test2.example.com'
+
+    record1 = Infoblox::Ptr.new name: ptr, :ptrdname => fqdn1, :ipv4addr => ip
+    record1.expects(:delete).returns(record1)
+    record2 = Infoblox::Ptr.new name: ptr, :ptrdname => fqdn2, :ipv4addr => ip
+    record2.expects(:delete).returns(record2)
+
+    Infoblox::Ptr.expects(:find).returns([record1, record2])
+    @provider.do_remove(ptr, 'PTR')
+  end
+
   def test_wapi_old
     fqdn = 'test.example.com'
     record = Infoblox::Arecord.new name: fqdn

data/test/integration_test.rb

@@ -21,8 +21,11 @@ class IntegrationTest < ::Test::Unit::TestCase
   include Rack::Test::Methods
 
   class DnsProviderForTesting < Proxy::Dns::Infoblox::Record
+    # This explicitly doesn't want to do anything
+    # rubocop:disable Lint/MissingSuper Style/RedundantInitialize
     def initialize
     end
+    # rubocop:enable Lint/MissingSuper Style/RedundantInitialize
   end
 
   def app
@@ -41,12 +44,20 @@ class IntegrationTest < ::Test::Unit::TestCase
     assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
   end
 
-  def test_create_ptr_record
-    @server.expects(:create_ptr_record).with("test.com", "33.33.168.192.in-addr.arpa")
+  def test_create_ptr4_record
+    @server.expects(:ib_find_ptr4_record).with('test.com').returns([])
+    @server.expects(:ib_create_ptr_record).with('33.33.168.192.in-addr.arpa', 'test.com')
     post '/', :fqdn => 'test.com', :value => '33.33.168.192.in-addr.arpa', :type => 'PTR'
     assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
   end
 
+  def test_create_ptr6_record
+    @server.expects(:ib_find_ptr6_record).with('test.com').returns([])
+    @server.expects(:ib_create_ptr_record).with('1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa', 'test.com')
+    post '/', :fqdn => 'test.com', :value => '1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa', :type => 'PTR'
+    assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
+  end
+
   def test_delete_a_record
     @server.expects(:remove_a_record).with("test.com")
     delete '/test.com'

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'mocha/setup'
+require 'mocha/test_unit'
 require 'json'
 require 'ostruct'
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dns_infoblox
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Matthew Nicholson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: infoblox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '3.0'
 description: Infoblox DNS provider plugin for Foreman's smart proxy
 email:
 - matthew.a.nicholson@gmail.com
@@ -57,19 +57,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Infoblox DNS provider plugin for Foreman's smart proxy
 test_files:
-- test/test_helper.rb
 - test/configuration_test.rb
 - test/infoblox_test.rb
 - test/integration_test.rb
+- test/test_helper.rb