bind9mgr 0.3.13 → 0.3.14

data/History.txt

@@ -87,3 +87,9 @@
 
 * Parser fix: TXT records with spaces are parsed without failure
 * test added
+
+=== 0.3.14 / 2013-03-05
+
+* Parser fix: TXT, SRV, MX parse algorithm rewrited
+* Parser rules definition optimized
+* test zone contents updated

data/lib/bind9mgr.rb

@@ -6,7 +6,7 @@ require File.join( File.dirname(__FILE__), 'resource_record' )
 require File.join( File.dirname(__FILE__), 'parser' )
 
 module Bind9mgr
-  VERSION = '0.3.13'
+  VERSION = '0.3.14'
 
   ZONES_BIND_SUBDIR = 'primary'
 

data/lib/parser.rb

@@ -1,6 +1,6 @@
 module Bind9mgr
   # this TYPES will be parsed with simplified state_rules chain
-  TYPES = %w{A CNAME PTR NS SRV} # SOA, MX, TXT - are different
+  TYPES = %w{A CNAME PTR NS} # SOA, MX, TXT, SRV - are different
   class Parser
 
     attr_reader :state
@@ -10,26 +10,40 @@ module Bind9mgr
       @state = :start
       @result = Zone.new
 
+      @SHARED_RULES = {
+        :txt => Proc.new{ |t| t == 'TXT' ? update_last_rr(nil, nil, nil, t, nil) : false },
+        :mx  => Proc.new{ |t| t == 'MX'  ? update_last_rr(nil, nil, nil, t, nil) : false },
+        :srv => Proc.new{ |t| t == 'SRV' ? update_last_rr(nil, nil, nil, t, nil) : false }
+      }
+
       @STATE_RULES = 
         # [current_state, target_state, proc to perform(token will be passe in)
-        [ [:start, :origin, Proc.new{ |t| t == '$ORIGIN' }],
-          [:origin, :last_token_in_a_row, Proc.new{ |t| set_origin t }],
-          [:start, :ttl,    Proc.new{ |t| t == '$TTL' }],
+        [ [:origin, :last_token_in_a_row, Proc.new{ |t| set_origin t }],
           [:ttl, :last_token_in_a_row,    Proc.new{ |t| set_ttl t }],
           [:last_token_in_a_row, :start, Proc.new{ |t| t == "\n" ? true : false }],
-          [:start, :type,   Proc.new{ |t| TYPES.include?(t) ? add_rr(nil, nil, nil, t, nil) : false }],
-          [:start, :klass,  Proc.new{ |t| KLASSES.include?(t) ? add_rr(nil, nil, t, nil, nil) : false }],
-          [:start, :rttl,   Proc.new{ |t| t.match(/^\d+$/) ? add_rr(nil, t, nil, nil, nil) : false }],
-          [:start, :owner,  Proc.new{ |t| add_rr(t, nil, nil, nil, nil) }],
           [:owner, :rttl,   Proc.new{ |t| t.match(/^\d+$/) ? update_last_rr(nil, t, nil, nil, nil) : false }],
           [:owner, :klass,  Proc.new{ |t| KLASSES.include?(t) ? update_last_rr(nil, nil, t, nil, nil) : false }],
           [:owner, :type,   Proc.new{ |t| TYPES.include?(t) ? update_last_rr(nil, nil, nil, t, nil) : false }],
-          [:owner, :mx,     Proc.new{ |t| t == 'MX' ? update_last_rr(nil, nil, nil, t, nil) : false }],
-          [:owner, :txt,    Proc.new{ |t| t == 'TXT' ? update_last_rr(nil, nil, nil, t, nil) : false }],
+          [:owner, :mx,     @SHARED_RULES[:mx]],
+          [:owner, :srv,    @SHARED_RULES[:srv]],
+          [:owner, :txt,    @SHARED_RULES[:txt]],
           [:rttl,  :klass,  Proc.new{ |t| KLASSES.include?(t) ? update_last_rr(nil, nil, t, nil, nil) : false }],
+          [:rttl,  :txt,    @SHARED_RULES[:txt]],
+          [:rttl,  :srv,    @SHARED_RULES[:srv]],
+          [:klass, :mx,     @SHARED_RULES[:mx]],
+          [:klass, :txt,    @SHARED_RULES[:txt]],
+          [:klass, :srv,    @SHARED_RULES[:srv]],
           [:klass, :type,   Proc.new{ |t| TYPES.include?(t) ? update_last_rr(nil, nil, nil, t, nil) : false }],
-          [:type, :last_token_in_a_row,   Proc.new{ |t| update_last_rr(nil, nil, nil, nil, t)  }],
           [:klass, :soa,    Proc.new{ |t| t == 'SOA' ? update_last_rr(nil, nil, nil, t, nil) : false }],
+          [:type,  :last_token_in_a_row,   Proc.new{ |t| update_last_rr(nil, nil, nil, nil, t)  }],
+          [:start, :type,   Proc.new{ |t| TYPES.include?(t) ? add_rr(nil, nil, nil, t, nil) : false }],
+          [:start, :klass,  Proc.new{ |t| KLASSES.include?(t) ? add_rr(nil, nil, t, nil, nil) : false }],
+          [:start, :rttl,   Proc.new{ |t| t.match(/^\d+$/) ? add_rr(nil, t, nil, nil, nil) : false }],
+          [:start, :origin, Proc.new{ |t| t == '$ORIGIN' }],
+          [:start, :ttl,    Proc.new{ |t| t == '$TTL' }],
+          [:start,  :srv,    @SHARED_RULES[:srv]],
+          [:start,  :txt,    @SHARED_RULES[:txt]],
+          [:start, :owner,  Proc.new{ |t| add_rr(t, nil, nil, nil, nil) }],
           [:soa, :last_token_in_a_row,    Proc.new{ |t| rdata = [t] + @tokens.shift(@tokens.index(')'))
              rdata.select!{|tt| tt != "\n" }
              raise ParserError, "Zone parsing error: parentices expected in SOA record.\n#{@content}" if (rdata[2] != '(') && (@tokens.first != ')')
@@ -43,8 +57,8 @@ module Bind9mgr
              update_last_rr(nil, nil, nil, nil, rdata)
              @tokens.shift
            }],
-          [:klass, :mx,     Proc.new{ |t| t == 'MX' ? update_last_rr(nil, nil, nil, t, nil) : false }],
           [:mx, :last_token_in_a_row,     Proc.new{ |t| update_last_rr(nil, nil, nil, nil, [t] + [@tokens.shift]) }], 
+          [:srv, :last_token_in_a_row,     Proc.new{ |t| update_last_rr(nil, nil, nil, nil, [t] + [@tokens.shift(3)]) }], 
           [:txt, :last_token_in_a_row,     Proc.new{ |t| update_last_rr(nil, nil, nil, nil, ([t] + [@tokens.shift(@tokens.index("\n"))]).join(" ")) }] # '\t' symbol is lost here! may be a BUG
         ]
     end
@@ -84,6 +98,7 @@ module Bind9mgr
     private
 
     def tokenize str
+      str.squeeze!("\n\t\r")
       dirty_tokens = str.gsub(/;.*$/, '').split(/[ \t\r]/)
 
       puts dirty_tokens.inspect
@@ -91,8 +106,6 @@ module Bind9mgr
       tokens = []
       dirty_tokens.each do |t|
 
-        
-
         if t.index("\n")
           puts "n found: #{t.inspect}"
           while t.index("\n") do

data/spec/parser_spec.rb

@@ -21,6 +21,22 @@ www CNAME @
 cloud.ru.	IN	A	192.168.1.1
 human-txt     TXT 'this is text with spases'
 
+
+
+dev-office 300 IN TXT 'v=spf1 mx mx:mail.dev-office.o7russia.ru ~all'
+dev-office2 300 TXT 'v=spf2 mx mx:mail.dev-office.o7russia.ru ~all'
+dev-office3 IN TXT 'v=spf3 mx mx:mail.dev-office.o7russia.ru ~all'
+dev-office4 TXT 'v=spf4 mx mx:mail.dev-office.o7russia.ru ~all'
+TXT 'v=spf5 mx mx:mail.dev-office.o7russia.ru ~all'
+
+test-srv 444 IN SRV 0 1 555 46.61.233.44
+test-srv2 444 SRV 0 2 555 46.61.233.44
+test-srv3 IN SRV 0 3 555 46.61.233.44
+test-srv4 SRV 0 4 555 46.61.233.44
+SRV 0 5 555 46.61.233.44
+
+_sip._tls.dev-office SRV 0 5 443 sip.dev-office
+
 NS ns2.cloud.ru
 manager		IN	A	192.168.1.20
 director	IN	A	192.168.1.23

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc