resolv 0.6.2 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f3223ba332f64c3b4b3af1b7044b9fb1369f6da74e05d74d4704fa5d1235d3c
-  data.tar.gz: 205750363ae9e6014d7cf7daa1e81010525543d7178fc3258ae4eaee4b007afb
+  metadata.gz: 38de4f14ddb183350d35593550caa34f9694644fb9d2fc79bd275d92d17ee338
+  data.tar.gz: 00d4977e89fb7cd8ec4a772c481d63e49fd4441b90c7ec5be42a79294ab3da19
 SHA512:
-  metadata.gz: 7cb060b5cac5331a0c1a719e1c436588230636687f655487d01cbe6c028fb704e425c90b63480bd12eff8c6c798653ad593b8315a108305e91db61c69a9704e0
-  data.tar.gz: 05d23a3d86214475e34406c614b611d5898ca66f49cebf9ff0507e0afa46acd85cab72d8b162f7a3d702bdb4c22577ee8a88bdbdefeb76bfca3757aed3b553b5
+  metadata.gz: 175ca63aa1f82ebabc499bbcd8eedf17c33ff220c439187a1c5778ca2e74926d15651a720c0bb5f615a698747252d8f9cd82c5db5fb25d28a4d1e63cb696acf1
+  data.tar.gz: 8789721febc5b7a96a8bcfdc51dd503afefa648a6d7057e6951b77d1fb514c613e35524ef9680e4ef6d4ad49e310a0fa2d1e92a972eae0e8f23969519c7db1d9

data/.document

@@ -0,0 +1,4 @@
+BSDL
+COPYING
+README.md
+lib/

data/ext/win32/resolv/extconf.rb

@@ -1,5 +1,6 @@
 require 'mkmf'
-if RUBY_ENGINE == "ruby" and have_library('iphlpapi', 'GetNetworkParams')
+if RUBY_ENGINE == "ruby" and have_library('iphlpapi', 'GetNetworkParams', ['windows.h', 'iphlpapi.h'])
+  have_library('advapi32', 'RegGetValueW', ['windows.h'])
   create_makefile('win32/resolv')
 else
   File.write('Makefile', "all clean install:\n\t@echo Done: $(@)\n")

data/ext/win32/resolv/lib/resolv.rb

@@ -4,8 +4,23 @@
 
 =end
 
+require 'win32/resolv.so'
+
 module Win32
   module Resolv
+    # Error at Win32 API
+    class Error < StandardError
+      # +code+ Win32 Error code
+      # +message+ Formatted message for +code+
+      def initialize(code, message)
+        super(message)
+        @code = code
+      end
+
+      # Win32 error code
+      attr_reader :code
+    end
+
     def self.get_hosts_path
       path = get_hosts_dir
       path = File.expand_path('hosts', path)
@@ -29,115 +44,62 @@ module Win32
       end
       [ search, nameserver ]
     end
-  end
-end
-
-begin
-  require 'win32/resolv.so'
-rescue LoadError
-end
-
-module Win32
-#====================================================================
-# Windows NT
-#====================================================================
-  module Resolv
-    begin
-      require 'win32/registry'
-      module SZ
-        refine Registry do
-          # ad hoc workaround for broken registry
-          def read_s(key)
-            type, str = read(key)
-            unless type == Registry::REG_SZ
-              warn "Broken registry, #{name}\\#{key} was #{Registry.type2name(type)}, ignored"
-              return String.new
-            end
-            str
-          end
-        end
-      end
-      using SZ
-    rescue LoadError
-      require "open3"
-    end
-
-    TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
 
     class << self
       private
       def get_hosts_dir
-        get_item_property(TCPIP_NT, 'DataBasePath', expand: true)
+        tcpip_params do |params|
+          params.value('DataBasePath')
+        end
       end
 
       def get_info
         search = nil
         nameserver = get_dns_server_list
 
-        slist = get_item_property(TCPIP_NT, 'SearchList')
-        search = slist.split(/,\s*/) unless slist.empty?
+        tcpip_params do |params|
+          slist = params.value('SearchList')
+          search = slist.split(/,\s*/) if slist and !slist.empty?
 
-        if add_search = search.nil?
-          search = []
-          nvdom = get_item_property(TCPIP_NT, 'NV Domain')
+          if add_search = search.nil?
+            search = []
+            domain = params.value('Domain')
 
-          unless nvdom.empty?
-            @search = [ nvdom ]
-            udmnd = get_item_property(TCPIP_NT, 'UseDomainNameDevolution').to_i
-            if udmnd != 0
-              if /^\w+\./ =~ nvdom
-                devo = $'
+            if domain and !domain.empty?
+              search = [ domain ]
+              udmnd = params.value('UseDomainNameDevolution')
+              if udmnd&.nonzero?
+                if /^\w+\./ =~ domain
+                  devo = $'
+                end
               end
             end
           end
-        end
 
-        ifs = if defined?(Win32::Registry)
-                Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT + '\Interfaces') do |reg|
-                  reg.keys
-                rescue Registry::Error
-                  []
-                end
-              else
-                cmd = "Get-ChildItem 'HKLM:\\#{TCPIP_NT}\\Interfaces' | ForEach-Object { $_.PSChildName }"
-                output, _ = Open3.capture2('powershell', '-Command', cmd)
-                output.split(/\n+/)
+          params.open('Interfaces') do |reg|
+            reg.each_key do |iface|
+              next unless ns = %w[NameServer DhcpNameServer].find do |key|
+                ns = iface.value(key)
+                break ns.split(/[,\s]\s*/) if ns and !ns.empty?
               end
 
-        ifs.each do |iface|
-          next unless ns = %w[NameServer DhcpNameServer].find do |key|
-            ns = get_item_property(TCPIP_NT + '\Interfaces' + "\\#{iface}", key)
-            break ns.split(/[,\s]\s*/) unless ns.empty?
-          end
+              next if (nameserver & ns).empty?
 
-          next if (nameserver & ns).empty?
-
-          if add_search
-            [ 'Domain', 'DhcpDomain' ].each do |key|
-              dom = get_item_property(TCPIP_NT + '\Interfaces' + "\\#{iface}", key)
-              unless dom.empty?
-                search.concat(dom.split(/,\s*/))
-                break
+              if add_search
+                [ 'Domain', 'DhcpDomain' ].each do |key|
+                  dom = iface.value(key)
+                  if dom and !dom.empty?
+                    search.concat(dom.split(/,\s*/))
+                    break
+                  end
+                end
               end
             end
           end
-        end
-        search << devo if add_search and devo
-        [ search.uniq, nameserver.uniq ]
-      end
 
-      def get_item_property(path, name, expand: false)
-        if defined?(Win32::Registry)
-          Registry::HKEY_LOCAL_MACHINE.open(path) do |reg|
-            expand ? reg.read_s_expand(name) : reg.read_s(name)
-          rescue Registry::Error
-            ""
-          end
-        else
-          cmd = "Get-ItemProperty -Path 'HKLM:\\#{path}' -Name '#{name}' -ErrorAction SilentlyContinue | Select-Object -ExpandProperty '#{name}'"
-          output, _ = Open3.capture2('powershell', '-Command', cmd)
-          output.strip
+          search << devo if add_search and devo
         end
+        [ search.uniq, nameserver.uniq ]
       end
     end
   end

data/ext/win32/resolv/resolv.c

@@ -1,24 +1,56 @@
 #include <ruby.h>
 #include <ruby/encoding.h>
 #include <windows.h>
+#include <windns.h>
 #ifndef NTDDI_VERSION
 #define NTDDI_VERSION 0x06000000
 #endif
 #include <iphlpapi.h>
 
+#ifndef numberof
+#define numberof(array) ((int)(sizeof(array) / sizeof((array)[0])))
+#endif
+
 static VALUE
 w32error_make_error(DWORD e)
 {
-    VALUE code = ULONG2NUM(e);
-    return rb_class_new_instance(1, &code, rb_path2class("Win32::Resolv::Error"));
+    char buffer[512], *p;
+    DWORD source = 0;
+    VALUE args[2];
+    if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
+                       FORMAT_MESSAGE_IGNORE_INSERTS, &source, e,
+                       MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+                       buffer, sizeof(buffer), NULL)) {
+        snprintf(buffer, sizeof(buffer), "Unknown Error %lu", (unsigned long)e);
+    }
+    p = buffer;
+    while ((p = strpbrk(p, "\r\n")) != NULL) {
+        memmove(p, p + 1, strlen(p));
+        if (!p[1]) {
+            p[0] = '\0';
+            break;
+        }
+    }
+    args[0] = ULONG2NUM(e);
+    args[1] = rb_str_new_cstr(buffer);
+    return rb_class_new_instance(2, args, rb_path2class("Win32::Resolv::Error"));
 }
 
-NORETURN(static void w32error_raise(DWORD e));
-
 static void
-w32error_raise(DWORD e)
+w32error_check(DWORD e)
+{
+    if (e != NO_ERROR) {
+        rb_exc_raise(w32error_make_error(e));
+    }
+}
+
+static VALUE
+wchar_to_utf8(const WCHAR *w, int n)
 {
-    rb_exc_raise(w32error_make_error(e));
+    int clen = WideCharToMultiByte(CP_UTF8, 0, w, n, NULL, 0, NULL, NULL);
+    VALUE str = rb_enc_str_new(NULL, clen, rb_utf8_encoding());
+    WideCharToMultiByte(CP_UTF8, 0, w, n, RSTRING_PTR(str), clen, NULL, NULL);
+    return str;
 }
 
 static VALUE
@@ -30,9 +62,7 @@ get_dns_server_list(VALUE self)
     VALUE buf, nameservers = Qnil;
 
     ret = GetNetworkParams(NULL, &buflen);
-    if (ret != NO_ERROR && ret != ERROR_BUFFER_OVERFLOW) {
-        w32error_raise(ret);
-    }
+    if (ret != ERROR_BUFFER_OVERFLOW) w32error_check(ret);
     fixedinfo = ALLOCV(buf, buflen);
     ret = GetNetworkParams(fixedinfo, &buflen);
     if (ret == NO_ERROR) {
@@ -46,18 +76,181 @@ get_dns_server_list(VALUE self)
         } while ((ipaddr = ipaddr->Next) != NULL);
     }
     ALLOCV_END(buf);
-    if (ret != NO_ERROR) w32error_raise(ret);
+    w32error_check(ret);
 
     return nameservers;
 }
 
+
+static const WCHAR TCPIP_Params[] = L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters";
+
+static void
+hkey_finalize(void *p)
+{
+    RegCloseKey((HKEY)p);
+}
+
+static const rb_data_type_t hkey_type = {
+    "RegKey",
+    {0, hkey_finalize},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static VALUE
+hkey_close(VALUE self)
+{
+    RegCloseKey((HKEY)DATA_PTR(self));
+    DATA_PTR(self) = 0;
+    return self;
+}
+
+static VALUE reg_key_class;
+
+static VALUE
+reg_open_key(VALUE klass, HKEY hkey, const WCHAR *wname)
+{
+    VALUE k = TypedData_Wrap_Struct(klass, &hkey_type, NULL);
+    DWORD e = RegOpenKeyExW(hkey, wname, 0, KEY_READ, (HKEY *)&DATA_PTR(k));
+    if (e == ERROR_FILE_NOT_FOUND) return Qnil;
+    w32error_check(e);
+    return rb_ensure(rb_yield, k, hkey_close, k);
+}
+
+static VALUE
+tcpip_params_open(VALUE klass)
+{
+    return reg_open_key(reg_key_class, HKEY_LOCAL_MACHINE, TCPIP_Params);
+}
+
+static int
+to_wname(VALUE *name, WCHAR *wname, int wlen)
+{
+    const char *n = StringValueCStr(*name);
+    int nlen = RSTRING_LEN(*name);
+    int len = MultiByteToWideChar(CP_UTF8, 0, n, nlen, wname, wlen - 1);
+    if (len == 0) w32error_check(GetLastError());
+    if (len >= wlen) rb_raise(rb_eArgError, "too long name");
+    wname[len] = L'\0';
+    return len;
+}
+
+static VALUE
+reg_open(VALUE self, VALUE name)
+{
+    HKEY hkey = DATA_PTR(self);
+    WCHAR wname[256];
+    to_wname(&name, wname, numberof(wname));
+    return reg_open_key(CLASS_OF(self), hkey, wname);
+}
+
+
+static VALUE
+reg_each_key(VALUE self)
+{
+    WCHAR wname[256];
+    HKEY hkey = DATA_PTR(self);
+    VALUE k = TypedData_Wrap_Struct(CLASS_OF(self), &hkey_type, NULL);
+    DWORD i, e, n;
+    for (i = 0; n = numberof(wname), (e = RegEnumKeyExW(hkey, i, wname, &n, NULL, NULL, NULL, NULL)) == ERROR_SUCCESS; i++) {
+        e = RegOpenKeyExW(hkey, wname, 0, KEY_READ, (HKEY *)&DATA_PTR(k));
+        w32error_check(e);
+        rb_ensure(rb_yield, k, hkey_close, k);
+    }
+    if (e != ERROR_NO_MORE_ITEMS) w32error_check(e);
+    return self;
+}
+
+static inline DWORD
+swap_dw(DWORD x)
+{
+#if defined(_MSC_VER)
+    return _byteswap_ulong(x);
+#else
+    return __builtin_bswap32(x);
+#endif
+}
+
+static VALUE
+reg_value(VALUE self, VALUE name)
+{
+    HKEY hkey = DATA_PTR(self);
+    DWORD type = 0, size = 0, e;
+    VALUE result, value_buffer;
+    void *buffer;
+    WCHAR wname[256];
+    to_wname(&name, wname, numberof(wname));
+    e = RegGetValueW(hkey, NULL, wname, RRF_RT_ANY, &type, NULL, &size);
+    if (e == ERROR_FILE_NOT_FOUND) return Qnil;
+    w32error_check(e);
+# define get_value_2nd(data, dsize) do { \
+        DWORD type2 = type; \
+        w32error_check(RegGetValueW(hkey, NULL, wname, RRF_RT_ANY, &type2, data, dsize)); \
+        if (type != type2) { \
+            rb_raise(rb_eRuntimeError, "registry value type changed %lu -> %lu", \
+                     (unsigned long)type, (unsigned long)type2); \
+        } \
+    } while (0)
+
+    switch (type) {
+      case REG_DWORD: case REG_DWORD_BIG_ENDIAN:
+        {
+            DWORD d;
+            if (size != sizeof(d)) rb_raise(rb_eRuntimeError, "invalid size returned: %lu", (unsigned long)size);
+            w32error_check(RegGetValueW(hkey, NULL, wname, RRF_RT_REG_DWORD, &type, &d, &size));
+            if (type == REG_DWORD_BIG_ENDIAN) d = swap_dw(d);
+            return ULONG2NUM(d);
+        }
+      case REG_QWORD:
+        {
+            QWORD q;
+            if (size != sizeof(q)) rb_raise(rb_eRuntimeError, "invalid size returned: %lu", (unsigned long)size);
+            w32error_check(RegGetValueW(hkey, NULL, wname, RRF_RT_REG_QWORD, &type, &q, &size));
+            return ULL2NUM(q);
+        }
+      case REG_SZ: case REG_MULTI_SZ: case REG_EXPAND_SZ:
+        if (size % sizeof(WCHAR)) rb_raise(rb_eRuntimeError, "invalid size returned: %lu", (unsigned long)size);
+        buffer = ALLOCV_N(char, value_buffer, size);
+        get_value_2nd(buffer, &size);
+        if (type == REG_MULTI_SZ) {
+            const WCHAR *w = (WCHAR *)buffer;
+            result = rb_ary_new();
+            size /= sizeof(WCHAR);
+            size -= 1;
+            for (size_t i = 0; i < size; ++i) {
+                int n = lstrlenW(w+i);
+                rb_ary_push(result, wchar_to_utf8(w+i, n));
+                i += n;
+            }
+        }
+        else {
+            result = wchar_to_utf8((WCHAR *)buffer, lstrlenW((WCHAR *)buffer));
+        }
+        ALLOCV_END(value_buffer);
+        break;
+      default:
+        result = rb_str_new(0, size);
+        get_value_2nd(RSTRING_PTR(result), &size);
+        rb_str_set_len(result, size);
+        break;
+    }
+    return result;
+}
+
 void
 InitVM_resolv(void)
 {
     VALUE mWin32 = rb_define_module("Win32");
     VALUE resolv = rb_define_module_under(mWin32, "Resolv");
     VALUE singl = rb_singleton_class(resolv);
+    VALUE regkey = rb_define_class_under(resolv, "registry key", rb_cObject);
+
+    reg_key_class = regkey;
+    rb_undef_alloc_func(regkey);
     rb_define_private_method(singl, "get_dns_server_list", get_dns_server_list, 0);
+    rb_define_private_method(singl, "tcpip_params", tcpip_params_open, 0);
+    rb_define_method(regkey, "open", reg_open, 1);
+    rb_define_method(regkey, "each_key", reg_each_key, 0);
+    rb_define_method(regkey, "value", reg_value, 1);
 }
 
 void

data/lib/resolv.rb

@@ -4,6 +4,7 @@ require 'socket'
 require 'timeout'
 require 'io/wait'
 require 'securerandom'
+require 'rbconfig'
 
 # Resolv is a thread-aware DNS resolver library written in Ruby.  Resolv can
 # handle multiple DNS requests concurrently without blocking the entire Ruby
@@ -33,7 +34,8 @@ require 'securerandom'
 
 class Resolv
 
-  VERSION = "0.6.2"
+  # The version string
+  VERSION = "0.7.2"
 
   ##
   # Looks up the first IP address for +name+.
@@ -173,21 +175,19 @@ class Resolv
 
   class ResolvTimeout < Timeout::Error; end
 
-  WINDOWS = /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM || ::RbConfig::CONFIG['host_os'] =~ /mswin/
-  private_constant :WINDOWS
-
   ##
   # Resolv::Hosts is a hostname resolver that uses the system hosts file.
 
   class Hosts
-    if WINDOWS
+    if /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM || ::RbConfig::CONFIG['host_os'] =~ /mswin/
       begin
         require 'win32/resolv' unless defined?(Win32::Resolv)
-        DefaultFileName = Win32::Resolv.get_hosts_path || IO::NULL
+        hosts = Win32::Resolv.get_hosts_path || IO::NULL
       rescue LoadError
       end
     end
-    DefaultFileName ||= '/etc/hosts'
+    # The default file name for host names
+    DefaultFileName = hosts || '/etc/hosts'
 
     ##
     # Creates a new Resolv::Hosts, using +filename+ for its data source.
@@ -487,13 +487,18 @@ class Resolv
     # * Resolv::DNS::Resource::IN::A
     # * Resolv::DNS::Resource::IN::AAAA
     # * Resolv::DNS::Resource::IN::ANY
+    # * Resolv::DNS::Resource::IN::CAA
     # * Resolv::DNS::Resource::IN::CNAME
     # * Resolv::DNS::Resource::IN::HINFO
+    # * Resolv::DNS::Resource::IN::HTTPS
+    # * Resolv::DNS::Resource::IN::LOC
     # * Resolv::DNS::Resource::IN::MINFO
     # * Resolv::DNS::Resource::IN::MX
     # * Resolv::DNS::Resource::IN::NS
     # * Resolv::DNS::Resource::IN::PTR
     # * Resolv::DNS::Resource::IN::SOA
+    # * Resolv::DNS::Resource::IN::SRV
+    # * Resolv::DNS::Resource::IN::SVCB
     # * Resolv::DNS::Resource::IN::TXT
     # * Resolv::DNS::Resource::IN::WKS
     #
@@ -525,6 +530,8 @@ class Resolv
       }
     end
 
+    # :stopdoc:
+
     def fetch_resource(name, typeclass)
       lazy_initialize
       truncated = {}
@@ -719,7 +726,8 @@ class Resolv
           begin
             reply, from = recv_reply(select_result[0])
           rescue Errno::ECONNREFUSED, # GNU/Linux, FreeBSD
-                 Errno::ECONNRESET # Windows
+                 Errno::ECONNRESET, # Windows
+                 EOFError
             # No name server running on the server?
             # Don't wait anymore.
             raise ResolvTimeout
@@ -928,8 +936,11 @@ class Resolv
         end
 
         def recv_reply(readable_socks)
-          len = readable_socks[0].read(2).unpack('n')[0]
+          len_data = readable_socks[0].read(2)
+          raise EOFError if len_data.nil? || len_data.bytesize != 2
+          len = len_data.unpack('n')[0]
           reply = @socks[0].read(len)
+          raise EOFError if reply.nil? || reply.bytesize != len
           return reply, nil
         end
 
@@ -1021,8 +1032,7 @@ class Resolv
       def Config.default_config_hash(filename="/etc/resolv.conf")
         if File.exist? filename
           Config.parse_resolv_conf(filename)
-        elsif WINDOWS
-          require 'win32/resolv' unless defined?(Win32::Resolv)
+        elsif defined?(Win32::Resolv)
           search, nameserver = Win32::Resolv.get_resolv_info
           config_hash = {}
           config_hash[:nameserver] = nameserver if nameserver
@@ -1243,6 +1253,13 @@ class Resolv
 
       class Str # :nodoc:
         def initialize(string)
+          # A label is limited to 63 octets. [RFC 1035 2.3.4] Checking it here
+          # makes it an invariant of the object: every label, however it was
+          # built, fits in its length octet and cannot wrap it. Callers turn
+          # this into the error their own contract promises.
+          if string.bytesize > 63
+            raise ArgumentError, "DNS label is too long (#{string.bytesize} bytes, max 63): #{string.inspect}"
+          end
           @string = string
           # case insensivity of DNS labels doesn't apply non-ASCII characters. [RFC 4343]
           # This assumes @string is given in ASCII compatible encoding.
@@ -1288,7 +1305,26 @@ class Resolv
         when Name
           return arg
         when String
-          return Name.new(Label.split(arg), /\.\z/ =~ arg ? true : false)
+          # A hostname is runtime data rather than a programming mistake, so
+          # both size limits surface as ResolvError to stay rescuable alongside
+          # the rest of name resolution. The type check below is a caller
+          # mistake and keeps raising ArgumentError.
+          begin
+            labels = Label.split(arg)
+          rescue ArgumentError => e
+            raise ResolvError.new(e.message)
+          end
+          # Label::Str enforces the per-label limit. Only the total is knowable
+          # here, and it counts the encoded form, so size starts at 1 for the
+          # root label's terminating zero octet. [RFC 1035 2.3.4, 3.1]
+          size = 1
+          labels.each do |label|
+            size += 1 + label.string.bytesize
+            if size > 255
+              raise ResolvError.new("DNS name is too long (#{size} octets, max 255): #{arg.inspect}")
+            end
+          end
+          return Name.new(labels, /\.\z/ =~ arg ? true : false)
         else
           raise ArgumentError.new("cannot interpret as DNS name: #{arg.inspect}")
         end
@@ -1410,12 +1446,24 @@ class Resolv
                @rd == other.rd &&
                @ra == other.ra &&
                @rcode == other.rcode &&
-               @question == other.question &&
+               question_equal?(other.question) &&
                @answer == other.answer &&
                @authority == other.authority &&
                @additional == other.additional
       end
 
+      # A question holds the resource class itself, and decoding creates a fresh
+      # class for each unknown type, so the classes cannot be compared by
+      # identity alone.
+      private def question_equal?(other_question) # :nodoc:
+        return false unless @question.length == other_question.length
+        @question.zip(other_question) {|(name, typeclass), (o_name, o_typeclass)|
+          return false unless name == o_name &&
+                              Resource::Generic.type_class_equal?(typeclass, o_typeclass)
+        }
+        return true
+      end
+
       def add_question(name, typeclass)
         @question << [Name.create(name), typeclass]
       end
@@ -1522,8 +1570,15 @@ class Resolv
         end
 
         def put_string(d)
-          self.put_pack("C", d.length)
-          @data << d
+          s = d.to_s
+          # A character-string is prefixed by a single length octet, so it can
+          # hold at most 255 octets. [RFC 1035 3.3] Reject anything longer to
+          # avoid silently truncating the length to its low 8 bits (mod 256).
+          if s.bytesize > 255
+            raise ArgumentError, "character-string is too long (#{s.bytesize} bytes, max 255): #{s.inspect}"
+          end
+          self.put_pack("C", s.bytesize)
+          @data << s
         end
 
         def put_string_list(ds)
@@ -1553,7 +1608,17 @@ class Resolv
         end
 
         def put_label(d)
-          self.put_string(d.to_s)
+          s = d.to_s
+          # Label::Str applies this limit when a label is built, so what is left
+          # for here is a raw string handed straight to put_labels. The two ways
+          # an over-long label goes wrong differ: 64 to 255 octets write a length
+          # octet in the reserved or compression pointer range, and 256 or more
+          # wrap it mod 256. Either way the encoded name stops being the name the
+          # caller asked for. [RFC 1035 2.3.4, 4.1.4]
+          if s.bytesize > 63
+            raise ArgumentError, "DNS label is too long (#{s.bytesize} bytes, max 63): #{s.inspect}"
+          end
+          self.put_string(s)
         end
       end
 
@@ -1679,7 +1744,9 @@ class Resolv
           prev_index = @index
           save_index = nil
           d = []
-          size = -1
+          # size counts the encoded form, so it starts at 1 for the root
+          # label's terminating zero octet. [RFC 1035 3.1]
+          size = 1
           while true
             raise DecodeError.new("limit exceeded") if @limit <= @index
             case @data.getbyte(@index)
@@ -1710,6 +1777,11 @@ class Resolv
 
         def get_label
           return Label::Str.new(self.get_string)
+        rescue ArgumentError => e
+          # A length octet of 64..191 is reserved rather than a label length,
+          # but this decoder used to read it as one. [RFC 1035 4.1.4] Report it
+          # the way the rest of a malformed message is reported.
+          raise DecodeError.new(e.message)
         end
 
         def get_question
@@ -1897,8 +1969,9 @@ class Resolv
           key_name = :"key#{key_number}"
           c.const_set(:KeyName, key_name)
           c.const_set(:KeyNumber, key_number)
-          self.const_set(:"Key#{key_number}", c)
-          ClassHash[key_name] = ClassHash[key_number] = c
+          # Not registered in a constant or in ClassHash. ClassHash creates a
+          # class for every unknown SvcParamKey, so registering them
+          # permanently would let a malicious response exhaust memory.
           return c
         end
       end
@@ -2205,12 +2278,28 @@ class Resolv
           return self.new(msg.get_bytes)
         end
 
+        # create makes a fresh class for each decoded resource, so the type and
+        # class values have to be compared instead of the class itself.
+        def self.type_class_equal?(klass, other) # :nodoc:
+          return true if klass.equal?(other)
+          Generic > klass && Generic > other &&
+            klass::TypeValue == other::TypeValue &&
+            klass::ClassValue == other::ClassValue
+        end
+
+        def ==(other) # :nodoc:
+          return other.is_a?(Generic) &&
+                 Generic.type_class_equal?(self.class, other.class) &&
+                 @data == other.data
+        end
+
         def self.create(type_value, class_value) # :nodoc:
           c = Class.new(Generic)
           c.const_set(:TypeValue, type_value)
           c.const_set(:ClassValue, class_value)
-          Generic.const_set("Type#{type_value}_Class#{class_value}", c)
-          ClassHash[[type_value, class_value]] = c
+          # Not registered in a constant or in ClassHash. get_class creates a
+          # class for every unknown (type, class) pair, so registering them
+          # permanently would let a malicious response exhaust memory.
           return c
         end
       end
@@ -2926,15 +3015,21 @@ class Resolv
 
   class IPv4
 
-    ##
-    # Regular expression IPv4 addresses must match.
-
     Regex256 = /0
                |1(?:[0-9][0-9]?)?
                |2(?:[0-4][0-9]?|5[0-5]?|[6-9])?
-               |[3-9][0-9]?/x
+               |[3-9][0-9]?/x # :nodoc:
+
+    ##
+    # Regular expression IPv4 addresses must match.
     Regex = /\A(#{Regex256})\.(#{Regex256})\.(#{Regex256})\.(#{Regex256})\z/
 
+    ##
+    # Creates a new IPv4 address from +arg+ which may be:
+    #
+    # IPv4:: returns +arg+.
+    # String:: +arg+ must match the IPv4::Regex constant
+
     def self.create(arg)
       case arg
       when IPv4
@@ -3243,13 +3338,15 @@ class Resolv
 
   end
 
-  module LOC
+  module LOC # :nodoc:
 
     ##
     # A Resolv::LOC::Size
 
     class Size
 
+      # Regular expression LOC size must match.
+
       Regex = /^(\d+\.*\d*)[m]$/
 
       ##
@@ -3275,6 +3372,7 @@ class Resolv
         end
       end
 
+      # Internal use; use self.create.
       def initialize(scalar)
         @scalar = scalar
       end
@@ -3312,6 +3410,8 @@ class Resolv
 
     class Coord
 
+      # Regular expression LOC Coord must match.
+
       Regex = /^(\d+)\s(\d+)\s(\d+\.\d+)\s([NESW])$/
 
       ##
@@ -3341,6 +3441,7 @@ class Resolv
         end
       end
 
+      # Internal use; use self.create.
       def initialize(coordinates,orientation)
         unless coordinates.kind_of?(String)
           raise ArgumentError.new("Coord must be a 32bit unsigned integer in hex format: #{coordinates.inspect}")
@@ -3403,6 +3504,8 @@ class Resolv
 
     class Alt
 
+      # Regular expression LOC Alt must match.
+
       Regex = /^([+-]*\d+\.*\d*)[m]$/
 
       ##
@@ -3428,6 +3531,7 @@ class Resolv
         end
       end
 
+      # Internal use; use self.create.
       def initialize(altitude)
         @altitude = altitude
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resolv
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.2
 platform: ruby
 authors:
 - Tanaka Akira
@@ -17,23 +17,14 @@ extensions:
 - ext/win32/resolv/extconf.rb
 extra_rdoc_files: []
 files:
-- ".git-blame-ignore-revs"
-- ".github/dependabot.yml"
-- ".github/workflows/push_gem.yml"
-- ".github/workflows/test.yml"
-- ".gitignore"
+- ".document"
 - BSDL
 - COPYING
-- Gemfile
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - ext/win32/resolv/extconf.rb
 - ext/win32/resolv/lib/resolv.rb
 - ext/win32/resolv/resolv.c
 - lib/resolv.rb
-- resolv.gemspec
 homepage: https://github.com/ruby/resolv
 licenses:
 - Ruby
@@ -55,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Thread-aware DNS resolver library in Ruby.
 test_files: []

data/.git-blame-ignore-revs

@@ -1,7 +0,0 @@
-# This is a file used by GitHub to ignore the following commits on `git blame`.
-#
-# You can also do the same thing in your local repository with:
-# $ git config --local blame.ignoreRevsFile .git-blame-ignore-revs
-
-# Expand tabs
-9ae210665a8524554e7c868d3ec67af54b0958bb

data/.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      interval: 'weekly'

data/.github/workflows/push_gem.yml

@@ -1,46 +0,0 @@
-name: Publish gem to rubygems.org
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-permissions:
-  contents: read
-
-jobs:
-  push:
-    if: github.repository == 'ruby/resolv'
-    runs-on: ubuntu-latest
-
-    environment:
-      name: rubygems.org
-      url: https://rubygems.org/gems/resolv
-
-    permissions:
-      contents: write
-      id-token: write
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
-        with:
-          bundler-cache: true
-          ruby-version: ruby
-
-      - name: Publish to RubyGems
-        uses: rubygems/release-gem@a25424ba2ba8b387abc8ef40807c2c85b96cbe32 # v1.1.1
-
-      - name: Create GitHub release
-        run: |
-          tag_name="$(git describe --tags --abbrev=0)"
-          gh release create "${tag_name}" --verify-tag --generate-notes
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/test.yml

@@ -1,52 +0,0 @@
-name: test
-
-on: [push, pull_request]
-
-jobs:
-  ruby-versions:
-    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
-    with:
-      engine: cruby-jruby
-      min_version: 2.5
-
-  build:
-    needs: ruby-versions
-    name: build (${{ matrix.ruby }} / ${{ matrix.os }})
-    strategy:
-      matrix:
-        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-        include:
-          - ruby: mswin
-            os: windows-latest
-        exclude:
-          - ruby: 2.5
-            os: macos-latest
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Run test
-      run: bundle exec rake test
-      timeout-minutes: 3
-      continue-on-error: ${{ startsWith(matrix.ruby, 'jruby') }}
-    - name: Build package
-      id: build
-      shell: bash
-      run: |
-        if ruby -e 'exit RUBY_VERSION>="3.0."'; then
-          bundle exec rake build
-          set pkg/*.gem
-          echo pkg=$1 >> $GITHUB_OUTPUT
-        fi
-    - name: Install gem
-      run: |
-        gem install ${{ steps.build.outputs.pkg }}
-        ruby -rresolv -e 'puts $LOADED_FEATURES.grep(/resolv/)'
-        ruby -rresolv -e 'puts Resolv::VERSION'
-      if: ${{ steps.build.outputs.pkg }}
-      continue-on-error: ${{ startsWith(matrix.ruby, 'jruby') }}

data/.gitignore

@@ -1,11 +0,0 @@
-/.build/
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-Gemfile.lock

data/Gemfile

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-gem "rake"
-gem "test-unit"
-gem "test-unit-ruby-core"
-gem "ruby-core-tasks", github: "ruby/ruby-core-tasks"

data/Rakefile

@@ -1,18 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-if RUBY_ENGINE == "ruby"
-  require "ruby-core/extensiontask"
-  helper = Bundler::GemHelper.instance
-  extask = RubyCore::ExtensionTask.new(helper.gemspec)
-  task :test => :compile
-end
-
-Rake::TestTask.new(:test) do |t|
-  t.libs.unshift(*extask.libs) if extask
-  t.libs << "test/lib"
-  t.ruby_opts << "-rhelper"
-  t.test_files = FileList["test/**/test_*.rb"]
-end
-
-task :default => :test

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "resolv"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/resolv.gemspec

@@ -1,30 +0,0 @@
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1).join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Tanaka Akira"]
-  spec.email         = ["akr@fsij.org"]
-
-  spec.summary       = %q{Thread-aware DNS resolver library in Ruby.}
-  spec.description   = %q{Thread-aware DNS resolver library in Ruby.}
-  spec.homepage      = "https://github.com/ruby/resolv"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-  spec.extensions << "ext/win32/resolv/extconf.rb"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = []
-  spec.require_paths = ["lib"]
-end