latte 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -3,6 +3,7 @@ PATH
   specs:
     latte (0.0.1)
       bindata
+      net-dns
       null_logger
       pethau (>= 0.0.2)
 
@@ -10,8 +11,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     bindata (1.4.3)
+    net-dns (0.6.1)
     null_logger (0.0.1)
-    pethau (0.0.2)
+    pethau (0.0.3)
 
 PLATFORMS
   ruby

data/latte.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "pethau", ">= 0.0.2"
+  s.add_runtime_dependency "net-dns"
   s.add_runtime_dependency "null_logger"
   s.add_runtime_dependency "bindata"
 end

data/lib/latte/query.rb

@@ -1,129 +1,56 @@
 module Latte
   class Query
-    # QTYPE codes:
-    # A 1 a host address
-    # NS 2 an authoritative name server
-    # MD 3 a mail destination (Obsolete - use MX)
-    # MF 4 a mail forwarder (Obsolete - use MX)
-    # CNAME 5 the canonical name for an alias
-    # SOA 6 marks the start of a zone of authority
-    # MB 7 a mailbox domain name (EXPERIMENTAL)
-    # MG 8 a mail group member (EXPERIMENTAL)
-    # MR 9 a mail rename domain name (EXPERIMENTAL)
-    # NULL 10 a null RR (EXPERIMENTAL)
-    # WKS 11 a well known service description
-    # PTR 12 a domain name pointer
-    # HINFO 13 host information
-    # MINFO 14 mailbox or mail list information
-    # MX 15 mail exchange
-    # TXT 16 text strings
+    include Enumerable
+    initialize_with :raw_query, :logger
 
-    initialize_with :raw_query
+    class Question
+      initialize_with :wrapped_question
 
-    # DNS MESSAGE FORMAT
-    #
-    # Header
-    # Question
-    # Answer
-    # Authority
-    # Additional
-    #
-    # DNS HEADER FORMAT
-    #
-    # OCTET 1,2             ID
-    # OCTET 3,4             QR(1 bit) + OPCODE(4 bit)+ AA(1 bit) + TC(1 bit) +
-    #                       RD(1 bit)+ RA(1 bit) + Z(3 bit) + RCODE(4 bit)
-    # OCTET 5,6             QDCOUNT
-    # OCTET 7,8             ANCOUNT
-    # OCTET 9,10            NSCOUNT
-    # OCTET 11,12           ARCOUNT
-    #
-    # QUESTION FORMAT
-    #
-    # OCTET 1,2,…n          QNAME
-    # OCTET n+1,n+2         QTYPE
-    # OCTET n+3,n+4         QCLASS
-    #
-    # ANSWER, AUTHORITY, ADDITIONAL FORMAT
-    #
-    # OCTET 1,2,..n         NAME
-    # OCTET n+1,n+2         TYPE
-    # OCTET n+3,n+4         CLASS
-    # OCTET n+5,n+6,n+7,n+8 TTL
-    # OCTET n+9,n+10        RDLENGTH
-    # OCTET n+11,n+12,…..   RDATA
-    class QueryHeader < BinData::Record
-      endian :big
-      uint16 :id
-      bit1   :qr
-      bit4   :opcode
-      bit1   :aa
-      bit1   :tc
-      bit1   :rd
-      bit1   :ra
-      bit3   :z
-      bit4   :rcode
-      uint16 :qdcount
-      uint16 :ancount
-      uint16 :nscount
-      uint16 :arcount
-    end
+      def qname
+	wrapped_question.qName
+      end
 
-    class QueryRequest < QueryHeader
-      stringz :qname
-      uint16 :qtype
-      uint16 :qclass
-    end
+      def qclass
+	wrapped_question.qClass
+      end
 
-    def parsed_header
-      @parsed_header ||= build_header
+      def qtype
+	wrapped_question.qType
+      end
     end
-    private :parsed_header
 
-    def build_header
-      QueryHeader.read raw_query
+    def to_s
+      packet.to_s
     end
-    private :build_header
 
-    def parsed_record
-      @parsed_record ||= build_record
+    def <=> other
+      to_s <=> other.to_s
     end
-    private :parsed_record
 
-    def build_record
-      case parsed_header.qr.value
-      when 0
-        QueryRequest.read raw_query
-      else
-        raise "Unhandled QR value: #{parsed_header.qr.value}"
+    def each
+      questions.each do |q|
+        question = Question.new q
+        yield question
       end
     end
+    alias_method :each_question, :each
 
-    def method_missing *args
-      result = parsed_record.send *args
-      return result.value if result.respond_to? :value
-      result
-    end
-
-    def header
-      "ID=#{id} QR=#{qr} TC=#{tc} RD=#{rd} RA=#{ra} Z=#{z} " + \
-      "RCODE=#{rcode} QDCOUNT=#{qdcount} ANCOUNT=#{ancount} " + \
-      "NSCOUNT=#{nscount} ARCOUNT=#{arcount}"
+    def id
+      packet.header.id
     end
 
-    def human_qname
-      value = parsed_record.qname.value.dup
-      value.gsub! /^[\x00-\x1f]/, ''
-      value.gsub! /[\x00-\x1f]/, '.'
-      value + '.'
+    def packet
+      @packet ||= build_packet
     end
 
-    def query
-      "QNAME=#{human_qname} QTYPE=#{qtype} QCLASS=#{qclass}"
+    def build_packet
+      Net::DNS::Packet.parse raw_query
     end
+    private :build_packet
 
-    def to_s
-      [ header, query ].join " "
+    def questions
+      packet.question
     end
+    private :questions
   end
 end

data/lib/latte/response.rb

@@ -1,191 +1,29 @@
 module Latte
   class Response
-    initialize_with :query
+    initialize_with :query, :logger
 
-    class BigEndianRecord < BinData::Record
-      endian :big
+    def add_answer record
+      rr = parse_rr_string record
+      packet.answer << rr
     end
 
-    class ResponseHeader < BigEndianRecord
-      uint16 :id
-      bit1   :qr
-      bit4   :opcode
-      bit1   :aa
-      bit1   :tc
-      bit1   :rd
-      bit1   :ra
-      bit3   :z, :value => 0 # Reserved for future use
-      bit4   :rcode
-      uint16 :qdcount
-      uint16 :ancount
-      uint16 :nscount
-      uint16 :arcount
+    def data
+      packet.data
     end
 
-    class Question < BigEndianRecord
-      stringz :qname
-      uint16 :qtype
-      uint16 :qclass
-    end
-
-    class Answer < BigEndianRecord
-      stringz :qname
-      uint16 :qtype
-      uint16 :qclass
-      uint32 :ttl
-      uint16 :rdlength, :value => lambda { rdata.length }
-      string :rdata
-    end
-
-    def header
-      ResponseHeader.new.tap { |h|
-        h.id = query.id
-        h.qr = 1 # I'm a response
-        h.opcode = 0 # I'm a standard query
-        h.aa = 0 # I'm not authoritative
-        h.tc = 0 # I wasn't truncated
-        h.rd = 0 # Please don't recursively query
-        h.ra = 0 # Recursion isn't welcome here
-        h.rcode = 0 # There are no errors here
-        h.qdcount = 1 # I'm answering one query
-        h.ancount = answers.size # The number of answer records I'm sending
-        h.nscount = 0 # There are 0 NS records in the authority part
-        h.arcount = 0 # How many additional records am I sending?
-      }
-    end
-
-    def question
-      Question.new.tap { |q|
-        q.qname = query.qname
-        q.qtype = query.qtype
-        q.qclass = query.qclass
-      }
-    end
-
-    def answers
-      @answers ||= [ ]
-    end
-
-    class RecordParser
-      initialize_with :record_string
-      private_attr_accessor :record
-      public :record
-
-      # QTYPE codes:
-      # A 1 a host address
-      # NS 2 an authoritative name server
-      # MD 3 a mail destination (Obsolete - use MX)
-      # MF 4 a mail forwarder (Obsolete - use MX)
-      # CNAME 5 the canonical name for an alias
-      # SOA 6 marks the start of a zone of authority
-      # MB 7 a mailbox domain name (EXPERIMENTAL)
-      # MG 8 a mail group member (EXPERIMENTAL)
-      # MR 9 a mail rename domain name (EXPERIMENTAL)
-      # NULL 10 a null RR (EXPERIMENTAL)
-      # WKS 11 a well known service description
-      # PTR 12 a domain name pointer
-      # HINFO 13 host information
-      # MINFO 14 mailbox or mail list information
-      # MX 15 mail exchange
-      # TXT 16 text strings
-
-      def qname
-        parts[0]
-      end
-
-      def qclass
-        parts[1]
-      end
-
-      def encoded_qclass
-        {
-          'IN' => 1,
-          'CH' => 3,
-          'HS' => 4
-        }[qclass]
-      end
-
-      def qtype
-        parts[2]
-      end
-
-      def encoded_qtype
-        {
-          'A'     => 1,
-          'NS'    => 2,
-          'CNAME' => 5,
-          'SOA'   => 6,
-          'PTR'   => 12,
-          'HINFO' => 13,
-          'MINFO' => 14,
-          'MX'    => 15,
-          'TXT'   => 16
-        }[qtype]
-      end
-
-      def ttl
-        parts[3].to_i
-      end
-
-      def rdata
-        parts[4]
-      end
-
-      def encode_name name
-        parts = name.split /\./
-        parts.map! { |p| BinData::Uint8.new(p.length).to_binary_s + p }
-        parts << BinData::Uint8.new(0).to_binary_s
-        parts.join ''
-      end
-
-      def encoded_qname
-        encode_name qname
-      end
-
-      def encoded_rdata
-        # FIXME: Extract this case statment into separate encoders
-        case qtype
-        when 'A', 'PTR'
-          parts = rdata.split /\./
-          parts.map! { |o| BinData::Uint8.new(o.to_i).to_binary_s }
-          parts.join ''
-        when 'NS', 'CNAME'
-          encode_name rdata
-        else
-          raise "I don't know how to encode QTYPE #{qtype.inspect}"
-        end
-      end
-
-      def parts
-        string = record_string.dup
-        string.strip!
-        parts = string.split /\s+/, 5
-        parts.map! { |p| p.strip }
-        parts
-      end
-
-      def execute
-        self.record = Answer.new.tap { |a|
-          a.qname = encoded_qname
-          a.qtype = encoded_qtype
-          a.qclass = encoded_qclass
-          a.ttl = ttl
-          a.rdata = encoded_rdata
-        }
-      end
+    def to_s
+      packet.to_s
     end
 
-    def add record
-      parser = RecordParser.new record
-      parser.execute
-      record = parser.record
-      answers << record
+    def parse_rr_string string
+      Net::DNS::RR.new string
     end
+    private :parse_rr_string
 
-    def to_s
-      [ header, question, *answers ].map { |part|
-        part.to_binary_s
-      }.join ''
+    def packet
+      query.packet
     end
+    private :packet
   end
 end
+

data/lib/latte/server.rb

@@ -59,11 +59,16 @@ module Latte
               begin
                 query = Query.new data
                 client_name = client.remote_address.ip_unpack.join ':'
-                logger.debug "#{client_name} > #{address}: #{HexPresenter.new(data)}"
-                response = Response.new query
-                resolver.call query, response
-                logger.debug "#{client_name} < #{address}: #{HexPresenter.new(response)}"
-                client.reply response.to_s
+                logger.info "#{client_name} > #{address}: Received query:\n#{query}"
+                logger.debug "#{client_name} > #{address}: Packet: #{HexPresenter.new(data)}"
+                response = Response.new query, logger
+                query.each_question do |question|
+                  resolver.call question, response
+                end
+                answer = response.data
+                logger.info "#{client_name} < #{address}: Sending repsonse:\n#{response}"
+                logger.debug "#{client_name} < #{address}: Packet: #{HexPresenter.new(answer)}"
+                client.reply answer
               rescue => e
                 logger.error [ e.message, e.backtrace ].flatten.join("\n")
               end

data/lib/latte/version.rb

@@ -1,3 +1,3 @@
 module Latte
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/latte.rb

@@ -2,6 +2,7 @@ require 'null_logger'
 require 'socket'
 require 'bindata'
 require 'pethau'
+require 'net/dns/packet'
 
 class Object
   include Pethau::InitializeWith

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: latte
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000Z
+date: 2011-10-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pethau
-  requirement: &70282543179020 !ruby/object:Gem::Requirement
+  requirement: &70193546165300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70282543179020
+  version_requirements: *70193546165300
+- !ruby/object:Gem::Dependency
+  name: net-dns
+  requirement: &70193546164880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70193546164880
 - !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: &70282539604060 !ruby/object:Gem::Requirement
+  requirement: &70193546164420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282539604060
+  version_requirements: *70193546164420
 - !ruby/object:Gem::Dependency
   name: bindata
-  requirement: &70282539603600 !ruby/object:Gem::Requirement
+  requirement: &70193546164000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282539603600
+  version_requirements: *70193546164000
 description: Talks DNS and passes queries back to a query resolver build by you that
   just talks Ruby
 email: