smart_proxy_dns_infoblox 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0cd133f133a42e4d8bb583d7566d3ef78caaf9f088a95f589c950f5abc73d99
-  data.tar.gz: b6a90cd39ac38ff25d40c557a4f615b6d4339a3841015157dfb99525890d7973
+  metadata.gz: a8897b410d2961cdad8b275971188063eee2f43eb36d887acf3bb7b51acc4749
+  data.tar.gz: ab1c93e8b44f9e9583037d9e9ad770a667d81c56371148219f41b0b52e097119
 SHA512:
-  metadata.gz: de50121fbebd43ca08d483bd1332988e7c2ab6b4659d7605b16de613ac6cbbd6b1190c680b449cc4c11073187d148c4cfe32818a9a2b2a1fa7d48a0137a574a8
-  data.tar.gz: 63865b57418f08551a82af80ff526c62b3c78ba364bfe9136d9f0dc8bea8e7489aa23fc3d6af80c596940609ac09ec25f58e66a3a2b75352e771e5854f170a12
+  metadata.gz: eabe002514aeb1a4519ed1efccebf8f9ba6e28e5b5d474611d81cc9dcc0b57145554d75f3d3f6503d4448765dbd616f2bcfa1a0f6421de75f99e94de08c12254
+  data.tar.gz: 88aed8b900b4db24e55e5230be6afdc53a819ec87030cd49449f334c307531a9c4535e742bcad3667c10a063719e8f974a268144b6fb7f1af090591298d55855

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

@@ -24,7 +24,12 @@ 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?
@@ -62,15 +67,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,
+        :'name~' => 'in-addr\.arpa$'
+      }
+      if ptr
+        ip = IPAddr.new(ptr_to_ip(ptr))
+        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
+        :ptrdname => fqdn,
+        :'name~' => 'ip6\.arpa$'
       }
       if ptr
         ip = IPAddr.new(ptr_to_ip(ptr))
-        params["ipv#{ip.ipv4? ? 4 : 6}addr".to_sym] = ip.to_s
+        params[:ipv6addr] = ip.to_s
         params[:name] = ptr
       end
       Infoblox::Ptr.find(connection, params)

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.1.0'.freeze
     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

data/test/integration_test.rb

@@ -41,12 +41,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'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dns_infoblox
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthew Nicholson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: infoblox
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement