dnsruby 1.42 → 1.43

data/lib/Dnsruby/resource/NAPTR.rb

@@ -46,6 +46,10 @@ module Dnsruby
       def from_data(data) #:nodoc: all
         @order,  @preference, @flags, @service, @regexp, @replacement = data
       end
+
+      def regexp=(s)
+        @regexp = TXT.parse(s)[0]
+      end
       
       def from_string(input) #:nodoc: all
         if (input.length > 0)
@@ -54,9 +58,7 @@ module Dnsruby
           @preference = values [1].to_i
           @flags = values [2].gsub!("\"", "")
           @service = values [3].gsub!("\"", "")
-          re = values [4].gsub!("\"", "")
-          re.gsub!("\\\\", "\\")
-          @regexp = re
+          @regexp = TXT.parse(values[4])[0]
           @replacement = Name.create(values[5])
         end
       end
@@ -64,15 +66,9 @@ module Dnsruby
       def rdata_to_string #:nodoc: all
         if (@order!=nil)
           ret =  "#{@order} #{@preference} \"#{@flags}\" \"#{@service}\" \""
-          ##{@regexp}
-          @regexp.each_byte {|b|
-            c = b.chr
-            if (c == "\\")
-              ret += "\\"
-            end
-            ret += c
-          }
+          ret += TXT.display(@regexp)
           ret += "\" #{@replacement}"
+
           return ret
         else
           return ""

data/lib/Dnsruby/resource/TSIG.rb

@@ -142,6 +142,12 @@ module Dnsruby
       
       def calculate_mac(algorithm, data)
         mac=nil
+#+ if (key_size > max_digest_len) {
+#+   EVP_DigestInit(&ectx, digester);
+#+   EVP_DigestUpdate(&ectx, (const void*) key_bytes, key_size);
+#+   EVP_DigestFinal(&ectx, key_bytes, NULL);
+#+   key_size = max_digest_len;
+#+ }
         key = @key.gsub(" ", "")
  #       key = Base64::decode64(key)
         key = key.unpack("m*")[0]

data/lib/Dnsruby/resource/TXT.rb

@@ -14,7 +14,7 @@
 #limitations under the License.
 #++
 begin
-require 'jcode'
+  require 'jcode'
 rescue LoadError => e
 end
 module Dnsruby
@@ -46,6 +46,10 @@ module Dnsruby
       ESCAPE_CODES = ESCAPE_CHARS.invert
       
       def from_string(input)
+        @strings = TXT.parse(input)
+      end
+
+      def TXT.parse(input)
         # Need to look out for special characters.
         # Need to split the input up into strings (which are defined by non-escaped " characters)
         # Then need to fix up any \ escape characters (should just be " and ; and binary?)
@@ -112,8 +116,10 @@ module Dnsruby
                   strings[count]+=c
                 else
                   # Must be building up three digit string to identify binary value?
-                  current_binary += c
-                  if (current_binary.length == 3)
+#                  if (c >= "0" && c <= "9")
+                    current_binary += c
+#                  end
+                  if ((current_binary.length == 3) ) # || (c < "0" || c > "9"))
                     strings[count]+=current_binary.to_i.chr
                     in_escaped = false
                     current_binary = ""
@@ -126,39 +132,45 @@ module Dnsruby
           end
           pos += 1
         }
-        @strings=strings
+        return strings
+      end
+
+      def TXT.display(str, do_escapes = true)
+        output = ""
+        # Probably need to scan through each string manually
+        # Make sure to remember to escape binary characters.
+        # Go through copying to output, and adding "\" characters as necessary?
+        str.each_byte {|c|
+          if (c == 34) || (c == 92) # || (c == 59)
+            if (do_escapes)
+            output+='\\'
+            end
+            output+=c.chr
+          elsif (c < 32) # c is binary
+            if (ESCAPE_CODES[c])
+              output +=  c.chr
+            else
+              output+= '\\'
+              num = c.to_i.to_s
+              (3-num.length).times {|i|
+                num="0"+num
+              }
+              output+= num # Need a 3 digit number here.
+            end
+
+          else
+            output += c.chr
+          end
+        }
+        return output
       end
       
       def rdata_to_string
         if (defined?@strings)
           temp = []
           @strings.each {|str|
-            output = "\""
-            # Probably need to scan through each string manually
-            # Make sure to remember to escape binary characters.
-            # Go through copying to output, and adding "\" characters as necessary?
-            str.each_byte {|c|
-              if (c == 34) || (c == 92) # || (c == 59)
-                output+='\\'
-                output+=c.chr
-              elsif (c < 32) # c is binary
-                if (ESCAPE_CODES[c])
-                  output +=  c.chr
-                else
-                output+= '\\'
-                num = c.to_i.to_s
-                (3-num.length).times {|i|
-                  num="0"+num
-                }
-                output+= num # Need a 3 digit number here.
-                end
-
-              else
-                output += c.chr
-              end
-            }
-            output+="\""
-            temp.push(output)
+            output = TXT.display(str)
+            temp.push("\"#{output}\"")
           }
           return temp.join(' ')
         end

data/lib/Dnsruby/zone_reader.rb

@@ -161,6 +161,9 @@ module Dnsruby
           end
         else
           if (escaped)
+            if (c >= "0" && c <= "9") # rfc 1035 5.1 \DDD
+              pos = pos + 2
+            end
             escaped = false
             next
           else
@@ -215,11 +218,19 @@ module Dnsruby
       name = split[0].strip
       if (name.index"\\")
         old_name = name
-        name = Name.create(name).to_s
+
+        ls =[]
+        Name.create(name).labels.each {|el| ls.push(Name.decode(RR::TXT.display(el.to_s, false)))}
+        name = ls.join('.')
+
+
         if (/\.\z/ =~ old_name)
           name += "."
         end
-        line.sub!(old_name, name)
+        line = name + " "
+        (split.length - 1).times {|i| line += "#{split[i+1]} "}
+        line += "\n"
+        split = line.split
       end
       # o add $ORIGIN to it if it is not absolute
       if !(/\.\z/ =~ name)

data/lib/dnsruby.rb

@@ -104,7 +104,7 @@ require 'Dnsruby/TheLog'
 module Dnsruby
 
   # @TODO@ Remember to update version in dnsruby.gemspec!
-  VERSION = 1.42
+  VERSION = 1.43
   def Dnsruby.version
     return VERSION
   end

data/test/tc_naptr.rb

@@ -46,9 +46,15 @@ class TestNAPTR < Test::Unit::TestCase
   end
 
   def test_string
-    txt = 'all.rr.org. 7200 IN NAPTR 100 10 "" "" "/urn:cid:.+@([^\\.]+\\.)(.*)$/\\2/i" .'
+    txt = 'all.rr.org. 7200 IN NAPTR 100 10 "" "" "/urn:cid:.+@([^\\\\.]+\\\\.)(.*)$/\\\\2/i" .'
     rr = RR.create(txt)
     assert(rr.to_s.index('"/urn:cid:.+@([^\\\\.]+\\\\.)(.*)$/\\\\2/i"'), '"/urn:cid:.+@([^\\\\.]+\\\\.)(.*)$/\\\\2/i"' + "\n" + rr.to_s)
   end
 
+  def test_bad_string
+    txt = 'all.rr.binary.org.		IN	NAPTR		100   10   ""  ""  "/urn:cid:.+@([^\\.]+\\.)(.*)$/\\\\2/i"    .'
+    rr = RR.create(txt)
+    assert(rr.to_s.index('"/urn:cid:.+@([^.]+.)(.*)$/\\\\2/i"'), '"/urn:cid:.+@([^.]+.)(.*)$/\\\\2/i"' + "\n" + rr.to_s)
+  end
+
 end

data/test/tc_rr.rb

@@ -259,7 +259,7 @@ class TestRR < Test::Unit::TestCase
           end
         end
       end
-      
+
       rr2 = RR.new_from_string(rr.to_s)
       assert_equal(rr.to_s,   rr2.to_s, "#{type} - Parsing from string works")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsruby
 version: !ruby/object:Gem::Version 
-  version: "1.42"
+  version: "1.43"
 platform: ruby
 authors: 
 - AlexD
@@ -9,7 +9,7 @@ autorequire: dnsruby
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +00:00
+date: 2010-02-02 00:00:00 +00:00
 default_executable: 
 dependencies: []