smart_proxy_dns_inwx 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e923717a022d5cf2a26a482bf665c7e5076ec328
-  data.tar.gz: 7d089f6d2458990b2b481ebfd5b6b300ac543e57
+  metadata.gz: 7eac9c8252b1ec26260d1472e4deeef084f8b89f
+  data.tar.gz: 46f1c3b36d673b7dfa55f2424a765fa186db8751
 SHA512:
-  metadata.gz: 2405ca7b802617976cbe23ab1ed7a009a129c510ea82f7e529aa8837c85bf5227518bd46396a10026100304441ff7c8077487c384412c3c0f357909aee24e646
-  data.tar.gz: ef85642695fcc1b7839aad3ee5de6f5c33b2b19443613de00de3a1df6c4f6eb9edb64f45296f282e56070fc094ceb67c24ad4221f92786eae813ac82b0aa3224
+  metadata.gz: 2cbe8d753bda325c8e69e90bb8ca51d7a40de268a84101485f87a74b4e5ccf387af3303e5404f87cee370f29d2d813d44a3d206a19b59e1352a7580b620ea456
+  data.tar.gz: 027d3e202770bfd5b2514e6434daba1efa6bf52cc5f3869b2097c9b83504fd4fe4b712db69aba91d75c1f29b7b00ace5a572de68ac805eaefc871b062ecb58dc

data/lib/smart_proxy_dns_inwx/dns_inwx_main.rb

@@ -1,7 +1,7 @@
 require 'resolv'
 require 'resolv-replace'
 require 'yaml'
-require 'inwx/Domrobot'
+require 'inwx/domrobot'
 
 module Proxy::Dns::Inwx
   class Record < ::Proxy::Dns::Record
@@ -11,37 +11,37 @@ module Proxy::Dns::Inwx
     attr_accessor :domrobot
     attr_accessor :object
 
-    def initialize(inwx_user,inwx_pass)
+    def initialize(inwx_user, inwx_pass, ttl = nil)
       addr = "api.domrobot.com"
       @object = "nameserver"
       @domrobot = INWX::Domrobot.new(addr)
       result = self.domrobot.login(inwx_user,inwx_pass)
-      super(options)
+      super(nil, ttl)
     end
 
     # create({ :fqdn => "node01.lab", :value => "192.168.100.2"}
     # create({ :fqdn => "node01.lab", :value => "3.100.168.192.in-addr.arpa",
     #          :type => "PTR"}
-    def create
-      method = "createRecord"
-      ip, id = dns_find(@fqdn)
+    def do_create(name, value, type)
+      ip, id = dns_find(name)
       if ip
-        raise(Proxy::Dns::Collision, "#{@fqdn} is already used") unless ip == @value
+        raise(Proxy::Dns::Collision, "#{name} is already used") unless ip == value
       else
-        domain, name = split_fqdn(@fqdn)
-        params = {:domain => domain, :type => @type, :content => @value, :name => name }
+        domain, name = split_fqdn(name)
+        method = "createRecord"
+        params = {:domain => domain, :type => type, :content => value, :name => name }
         result = self.domrobot.call(self.object, method, params)
-        msg = "add #{@type} DNS entry #{name} => #{@value} to domain #{domain}"
+        msg = "add #{type} DNS entry #{name} => #{value} to domain #{domain}"
         report msg, result["msg"], false
       end
     end
 
     # remove({ :fqdn => "node01.lab", :value => "192.168.100.2"}
     # remove({ :fqdn => "node01.lab", :value => "3.100.168.192.in-addr.arpa"}
-    def remove
-      ip, id = dns_find(@fqdn)
-      raise Proxy::Dns::NotFound.new("Cannot find DNS entry for #{@fqdn}") unless id
-      msg = "remove DNS entry #{@fqdn} => #{@value}"
+    def do_remove(name, value)
+      ip, id = dns_find(name)
+      raise Proxy::Dns::NotFound.new("Cannot find DNS entry for #{name}") unless id
+      msg = "remove DNS entry #{name} => #{value}"
       method = "deleteRecord"
       params = { :id => id }
       result = self.domrobot.call(self.object, method, params)
@@ -50,7 +50,11 @@ module Proxy::Dns::Inwx
     end
 
     private
-    
+ 
+    def resolver
+      @resolver ||= Resolv::DNS.new
+    end
+ 
     def report msg, response, error_only=false
       if not response.include? "completed successfully"
         logger.error "Inwx failed:\n" + response.join("\n")
@@ -67,18 +71,23 @@ module Proxy::Dns::Inwx
     end
 
     def split_fqdn fqdn
-      domain = fqdn.split('.')[-2..-1].join('.')
-      name = fqdn.chomp(".#{domain}")
-      [domain,name]
+      method = "list"
+      params = { :pagelimit => 0 }
+      result = self.domrobot.call(self.object, method, params)
+      result["resData"]["domains"].each do |domain|
+        domain=domain["domain"]
+        if fqdn.end_with?(domain)
+          return [domain,fqdn.chomp(".#{domain}")]
+        end
+      end
+      raise Proxy::Dns::Error.new("Could not find domain for host #{fqdn}")
     end
 
     def dns_find fqdn
       domain, name = split_fqdn(fqdn)
       method = "info"
       params = { :domain => domain, :name => name }
-      logger.error params.inspect
       result = self.domrobot.call(self.object, method, params)
-      logger.error result.inspect
       return false if result["resData"]["record"].nil?
 
       return [ result["resData"]["record"][0]["content"], result["resData"]["record"][0]["id"] ]

data/lib/smart_proxy_dns_inwx/dns_inwx_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module Dns
     module Inwx
-      VERSION = '0.5.0'
+      VERSION = '0.6.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dns_inwx
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Clemens Bergmann