smart_proxy_dns_infoblox 0.0.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3627c36c141f563073ac1b0893b4b454844a022e5cec3c42d0c57eb57d5a8762
-  data.tar.gz: 2c0c75a15f114bdb535cd159b013047d8b9b2851fc77b0cd59e0a108bd977982
+  metadata.gz: f0cd133f133a42e4d8bb583d7566d3ef78caaf9f088a95f589c950f5abc73d99
+  data.tar.gz: b6a90cd39ac38ff25d40c557a4f615b6d4339a3841015157dfb99525890d7973
 SHA512:
-  metadata.gz: 12acbf20909ba59bfe173405613f2234b81932ef33865d267b693cf8a91e51012cef1d025a579cf1b171722196c5edc194cda7583899c3316837ad316ef9a193
-  data.tar.gz: 3274584a890ac371c59b7892942fe26131fb089d65945e94f6872db4c40e5e9da83700d9fde9c7c0df34e8caf27cedaddd092e46b3d717cb4791e9bd545b2e8b
+  metadata.gz: de50121fbebd43ca08d483bd1332988e7c2ab6b4659d7605b16de613ac6cbbd6b1190c680b449cc4c11073187d148c4cfe32818a9a2b2a1fa7d48a0137a574a8
+  data.tar.gz: 63865b57418f08551a82af80ff526c62b3c78ba364bfe9136d9f0dc8bea8e7489aa23fc3d6af80c596940609ac09ec25f58e66a3a2b75352e771e5854f170a12

data/config/dns_infoblox.yml.example

@@ -5,8 +5,12 @@
 :username: "admin"
 :password: "infoblox"
 
-# Hostname or IP address of the Infoblox appliance (without https:// or port)
-:dns_server: "infoblox.example.com"
+# Connection, read and write HTTP timeout
+#:timeout: 60
+
+# IP address of the Infoblox appliance (without https:// or port). If set
+# to hostname, make sure it resolves correctly.
+:dns_server: "1.2.3.4"
 
 # View used for records, usually 'default.myview' for custom names.
 #:dns_view: 'default'

data/lib/smart_proxy_dns_infoblox/dns_infoblox_main.rb

@@ -20,8 +20,72 @@ module Proxy::Dns::Infoblox
       send(method, name)
     end
 
+    # -1 = no conflict and create the record
+    #  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
+      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
+
+    def record_conflicts_name(fqdn, type, content)
+      if type == Resolv::DNS::Resource::IN::PTR
+        record_conflicts_ip(content, type, fqdn)
+      else
+        record_conflicts_ip(fqdn, type, content)
+      end
+    end
+
     private
 
+    def ib_find_a_record(fqdn, address = nil)
+      params = {
+        :_max_results => 1,
+        :view => dns_view,
+        :name => fqdn
+      }
+      params[:ipv4addr] = address if address
+      Infoblox::Arecord.find(connection, params)
+    end
+
+    def ib_find_aaaa_record(fqdn, address = nil)
+      params = {
+        :_max_results => 1,
+        :view => dns_view,
+        :name => fqdn
+      }
+      params[:ipv6addr] = address if address
+      Infoblox::AAAArecord.find(connection, params)
+    end
+
+    def ib_find_ptr_record(fqdn, ptr = nil)
+      params = {
+        :_max_results => 1,
+        :view => dns_view,
+        :ptrdname => fqdn
+      }
+      if ptr
+        ip = IPAddr.new(ptr_to_ip(ptr))
+        params["ipv#{ip.ipv4? ? 4 : 6}addr".to_sym] = ip.to_s
+        params[:name] = ptr
+      end
+      Infoblox::Ptr.find(connection, params)
+    end
+
+    def ib_find_cname_record(fqdn, address = nil)
+      params = {
+        :_max_results => 1,
+        :view => dns_view,
+        :name => fqdn
+      }
+      params[:canonical] = address if address
+      Infoblox::Cname.find(connection, params)
+    end
+
     def ib_create_a_record(fqdn, address)
       ib_create(Infoblox::Arecord, :name => fqdn, :ipv4addr => address)
     end

data/lib/smart_proxy_dns_infoblox/dns_infoblox_plugin.rb

@@ -2,7 +2,7 @@ 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'
+    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 = '0.0.9'.freeze
+      VERSION = '1.0.0'.freeze
     end
   end
 end

data/lib/smart_proxy_dns_infoblox/plugin_configuration.rb

@@ -15,6 +15,7 @@ module Proxy::Dns::Infoblox
                                                                  :password => settings[:password],
                                                                  :host => settings[:dns_server],
                                                                  :ssl_opts => { :verify => true },
+                                                                 :timeout => settings[:timeout],
                                                                  :logger => ::Proxy::LogBuffer::Decorator.instance)
                                     end)
       container_instance.dependency :dns_provider,

data/test/infoblox_test.rb

@@ -13,6 +13,74 @@ class InfobloxTest < Test::Unit::TestCase
     @provider = Proxy::Dns::Infoblox::Record.new('a_host', nil, 999, 'default.test')
   end
 
+  def test_conflict_a_ok
+    @provider.expects(:ib_find_a_record).with("test.example.com").returns([])
+    assert_equal(-1, @provider.record_conflicts_ip("test.example.com", Resolv::DNS::Resource::IN::A, "1.2.3.4"))
+  end
+
+  def test_conflict_a_already_exists
+    @provider.expects(:ib_find_a_record).with("test.example.com").returns([true])
+    @provider.expects(:ib_find_a_record).with("test.example.com", "1.2.3.4").returns([true])
+    assert_equal(0, @provider.record_conflicts_ip("test.example.com", Resolv::DNS::Resource::IN::A, "1.2.3.4"))
+  end
+
+  def test_conflict_a_conflict
+    @provider.expects(:ib_find_a_record).with("test.example.com").returns([false])
+    @provider.expects(:ib_find_a_record).with("test.example.com", "1.2.3.4").returns([false])
+    assert_equal(1, @provider.record_conflicts_ip("test.example.com", Resolv::DNS::Resource::IN::A, "1.2.3.4"))
+  end
+
+  def test_conflict_aaaa_ok
+    @provider.expects(:ib_find_aaaa_record).with("test.example.com").returns([])
+    assert_equal(-1, @provider.record_conflicts_ip("test.example.com", Resolv::DNS::Resource::IN::AAAA, "1.2.3.4"))
+  end
+
+  def test_conflict_aaaa_already_exists
+    @provider.expects(:ib_find_aaaa_record).with("test.example.com").returns([true])
+    @provider.expects(:ib_find_aaaa_record).with("test.example.com", "1.2.3.4").returns([true])
+    assert_equal(0, @provider.record_conflicts_ip("test.example.com", Resolv::DNS::Resource::IN::AAAA, "1.2.3.4"))
+  end
+
+  def test_conflict_aaaa_conflict
+    @provider.expects(:ib_find_aaaa_record).with("test.example.com").returns([false])
+    @provider.expects(:ib_find_aaaa_record).with("test.example.com", "1.2.3.4").returns([false])
+    assert_equal(1, @provider.record_conflicts_ip("test.example.com", Resolv::DNS::Resource::IN::AAAA, "1.2.3.4"))
+  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"))
+  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"))
+  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"))
+  end
+
+  def test_conflict_cname_ok
+    @provider.expects(:ib_find_cname_record).with("test.example.com").returns([])
+    assert_equal(-1, @provider.record_conflicts_ip("test.example.com", Resolv::DNS::Resource::IN::CNAME, "alias.example.com"))
+  end
+
+  def test_conflict_cname_already_exists
+    @provider.expects(:ib_find_cname_record).with("test.example.com").returns([true])
+    @provider.expects(:ib_find_cname_record).with("test.example.com", "alias.example.com").returns([true])
+    assert_equal(0, @provider.record_conflicts_ip("test.example.com", Resolv::DNS::Resource::IN::CNAME, "alias.example.com"))
+  end
+
+  def test_conflict_cname_conflict
+    @provider.expects(:ib_find_cname_record).with("test.example.com").returns([false])
+    @provider.expects(:ib_find_cname_record).with("test.example.com", "alias.example.com").returns([false])
+    assert_equal(1, @provider.record_conflicts_ip("test.example.com", Resolv::DNS::Resource::IN::CNAME, "alias.example.com"))
+  end
+
   def test_create_a
     fqdn = 'test.example.com'
     ip = '10.1.1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dns_infoblox
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Matthew Nicholson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -64,13 +64,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 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/integration_test.rb
 - test/infoblox_test.rb
+- test/integration_test.rb