pdns-remotebackend 0.0.7 → 0.0.8

data/README.md

@@ -1,6 +1,6 @@
 # Pdns/Remotebackend
 
-This is a helper for PowerDNS remotebackend. It lets you create a backend with less hassle. 
+This is a helper for PowerDNS remotebackend. It lets you create a backend with less hassle. Also supports pipe backend.
 
 ## Installation
 
@@ -47,6 +47,13 @@ To start a pipe or unix server, do
     Pdns::Remotebackend::Pipe.new(MyHandlerClass).run
     Pdns::Remotebackend::Unix(MyHandlerClass, { :path => "/path/to/socket"} ).run
 
+To use it with PowerDNS pipe backend, use
+
+    Pdns::Remotebackend::Pipe.new(MyHandlerClass, { :abi => :pipe }).run
+    Pdns::Remotebackend::Unix(MyHandlerClass, { :path => "/path/to/socket", :abi => :pipe } ).run
+
+In this mode, it supports do\_lookup and do\_list. 
+
 ## Reference
 
 In addition to stubs for remotebackend, the Pdns::Remotebackend::Handler has following helpers for making records

data/contrib/example.rb

@@ -86,7 +86,7 @@ Coefficient: 5lP9IFknvFgaXKCs8MproehHSFhFTWac4557HIn03KrnlGOKDcY6DC/vgu1e42bEZ4J
               ]
      elsif args["qname"] == "example.com" and args["qtype"].downcase == "any"
        @result = [ 
-          record("SOA","example.com", "SOA", "sns.dns.icann.org noc.dns.icann.org 2013012485 7200 3600 1209600 3600"),
+          record("example.com", "SOA", "sns.dns.icann.org noc.dns.icann.org 2013012485 7200 3600 1209600 3600"),
           record("example.com", "NS", "sns.dns.icann.org"),
           record_prio("example.com", "MX", "test.example.com",10)
               ]

data/lib/pdns/remotebackend/version.rb

@@ -1,5 +1,5 @@
 module Pdns
  module Remotebackend
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
  end
 end

data/lib/pdns/remotebackend.rb

@@ -142,11 +142,123 @@ module Pdns
       @options = options
     end
 
+    # Reads one line at a time from pipebackend, and calls approriate method
+    #
+    # @param [Socket] reader Socket to read from
+    # @param [Socket] writer Socket to write to
+    def mainloop3(reader,writer)
+      h = @handler.new
+      state = :init
+      abi = 1
+      last_soa_name = nil
+
+      reader.each_line do |line|
+        h.log = []
+        h.result = false
+
+        # cannot continue anymore
+        if state == :fail
+          next
+        end
+
+        input = {}
+        line = line.strip
+        if (state == :init) 
+          if line.match "HELO[ \t]*([0-9])"
+            abi = $2.to_i
+            # synthesize empty init
+            h.do_initialize(input)
+
+            if h.result == false
+               state = :fail
+               h.log.each do |l| 
+                 writer.puts "LOG\t#{l}"
+               end
+               writer.puts "FAIL"
+            else
+               writer.puts "OK\tPowerDNS ruby remotebackend version #{Pdns::Remotebackend::VERSION} initialized"
+               state = :main 
+            end
+          else
+            writer.puts "FAIL"
+            state = :fail
+          end
+          next
+        end
+ 
+        # parse input
+        query = line.split /[\t ]+/
+        input["method"] = query[0]
+        if input["method"] == "Q"
+           input["method"] = "lookup"
+           input["parameters"] = {
+               "qname" => query[1], "qclass" => query[2],
+               "qtype" => query[3], "domain_id" => query[4].to_i,
+               "zone_id" => query[4].to_i, "remote" => query[5]
+           }
+           if abi > 1 
+             input["parameters"]["local"] = query[6]
+           end
+           if abi > 2
+             input["parameters"]["edns-subnet"] = query[7]
+           end
+           if input["parameters"]["qtype"] == "SOA"
+             last_soa_name = input["parameters"]["qname"]
+           end
+        elsif input["method"] == "AXFR"
+           input["method"] = "list"
+           input["parameters"] = { "zonename" => last_soa_name, "domain_id" => line[1].to_i }
+        else
+           writer.puts "FAIL"
+           next
+        end
+
+        method = "do_#{input["method"]}"
+        # try to call
+        if h.respond_to?(method.to_sym) == true
+          h.send(method, input["parameters"])
+        else
+          writer.puts "FAIL"
+          next
+        end
+
+        if (h.result != false) 
+          h.result.each do |r|
+             if r.has_key? :scopemask == false
+                r[:scopemask] = 0
+             end
+             if r.has_key?(:domain_id) == false
+                r[:domain_id] = input["parameters"]["domain_id"]
+             end
+
+             # fix content to contain prio if needed
+             if ["MX", "SRV", "NAPTR"].include? r[:qtype].upcase
+                if r.has_key?("prio")
+                   r[:content] = "#{r[:prio].to_i} #{r[:content]}"
+                else
+                   r[:content] = "0 #{r[:content]}"
+                end
+             end
+             if (abi < 3)
+                writer.puts "DATA\t#{r[:qname]}\tIN\t#{r[:qtype]}\t#{r[:ttl]}\t#{r[:domain_id]}\t#{r[:content]}"
+             else
+                writer.puts "DATA\t#{r[:scopemask]}\t#{r[:auth]}\t#{r[:qname]}\tIN\t#{r[:qtype]}\t#{r[:ttl]}\t#{r[:domain_id]}\t#{r[:content]}"
+             end
+          end
+        end
+
+        h.log.each do |l|
+          writer.puts "LOG\t#{l}"
+        end
+        writer.puts "END"
+      end
+    end
+
     # Reads one line at a time from remotebackend, and calls approriate method 
     #
-    # @param [Socket] reader Socket to read from'
+    # @param [Socket] reader Socket to read from
     # @param [Socket] writer Socket to write to
-    def mainloop(reader,writer)
+    def mainloop4(reader,writer)
       h = @handler.new
       
       reader.each_line do |line|
@@ -178,7 +290,11 @@ module Pdns
     def run
       begin
         STDOUT.sync=true
-        mainloop STDIN,STDOUT
+        if (@options.has_key? :abi and @options[:abi].to_sym == :pipe) 
+            mainloop3 STDIN,STDOUT
+        else
+            mainloop4 STDIN,STDOUT
+        end
       rescue SystemExit, Interrupt
       end
     end
@@ -190,7 +306,11 @@ module Pdns
       begin 
         Socket.unix_server_loop(@path) do |sock, client_addrinfo| 
           begin 
-            mainloop sock, sock
+            if (@options.has_key? :abi and @options[:abi].to_sym == :pipe)
+               mainloop3 sock,sock
+            else
+               mainloop4 sock,sock
+            end
           ensure
             sock.close
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdns-remotebackend
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7028380 !ruby/object:Gem::Requirement
+  requirement: &7027560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7028380
+  version_requirements: *7027560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7027960 !ruby/object:Gem::Requirement
+  requirement: &7027140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7027960
+  version_requirements: *7027140
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &7027540 !ruby/object:Gem::Requirement
+  requirement: &7026720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7027540
+  version_requirements: *7026720
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &7076460 !ruby/object:Gem::Requirement
+  requirement: &7075660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7076460
+  version_requirements: *7075660
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &7076040 !ruby/object:Gem::Requirement
+  requirement: &7075240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7076040
+  version_requirements: *7075240
 description: This gem provides a base class and helpers for writing remotebackend
   servers for pipe/unix/. It is intended to make using remotebackend easier. For http
   support, see pdns-remotebackend-http.