gitlab-net-dns 0.9.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7252fa3548673ea245bdc6c38a07b10ed922758881c52c4cb474573cf496632c
-  data.tar.gz: 7598048ebeb99e6e52c08ce0f182bbf4484b19ea8dceb2a4eff45a0fdf6259de
+  metadata.gz: 6894aeca8ca5a877a50f79dd5960888cf153cbf33ae1f367681185ab72eeed25
+  data.tar.gz: 6db68fc71b24701ebe82fb84e13f2a5a131a6aecba929af968b528d2e40650dd
 SHA512:
-  metadata.gz: 513489ab5947af35ea4c3290b694c1e0bbb99a4bf7124fee3a1d5ffd816cb4fa17b35e345e9445d33752559903a555d4d2619e9429004411e098bdcc1cbbc610
-  data.tar.gz: c31b0927a8c62717b0ffaef61d6eb1c531b815f1477dc00f6fa0c63b08aa03450fe41d2b362ee84ea618efcec5fd7d1ea6304361f130d9e6d66d4373021ceb69
+  metadata.gz: 9d3aae8c3e2868244e5cd5f4da8a89191901f440ca0a999280ee8b1f7b083f57aa10fc1aabe8fe38b13de99579bcfec4805a4ed4eb2c6c35c61d9003c5ea4076
+  data.tar.gz: e4d8e5f5dca3b4b9c704d0c4ff8c695b86f4620b48ccfa9ca505cbc0a5ac784517f045b6257ac2e76d15f3e4ad277385814e56905167ec044bed77f543cf645e

data/.gitlab-ci.yml

@@ -20,4 +20,4 @@ rspec:
     - bundle exec rake
   parallel:
     matrix:
-      - RUBY_VERSION: [ "2.7", "3.0" ]
+      - RUBY_VERSION: [ "3.0", "3.1", "3.2", "3.3", "3.4" ]

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Release 0.10.0
+
+- CHANGED: Update list of supported types (https://gitlab.com/gitlab-org/ruby/gems/gitlab-net-dns/-/merge_requests/7)
+
 ## Release 0.9.2
 
 - FIXED: Fixed TimeoutError deprecation warning (https://gitlab.com/gitlab-org/ruby/gems/gitlab-net-dns/-/merge_requests/4)

data/demo/check_soa.rb

@@ -18,7 +18,7 @@ domain = ARGV[0]
 res = Net::DNS::Resolver.new(defname: false, retry: 2)
 
 ns_req = res.query(domain, Net::DNS::NS)
-unless ns_req && (ns_req.header.anCount > 0)
+unless ns_req && ns_req.header.anCount.positive?
   raise ArgumentError, "No nameservers found for domain: #{res.errorstring}"
 end
 

data/gitlab-net-dns.gemspec

@@ -11,12 +11,13 @@ Gem::Specification.new do |s|
   s.description = "Net::DNS is a pure Ruby DNS library, with a clean OO interface and an extensible API."
   s.licenses    = ["Ruby"]
 
-  s.required_ruby_version = ">= 2.1"
+  s.required_ruby_version = ">= 3.0"
 
   s.require_paths    = ["lib"]
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.extra_rdoc_files = %w[LICENSE.txt]
+  s.add_dependency "logger"
 
   s.add_development_dependency "mocha"
   s.add_development_dependency "rake"

data/lib/net/dns/header.rb

@@ -674,20 +674,20 @@ module Net
         end
 
         arr = str.unpack("n C2 n4")
-        @id          =  arr[0]
-        @qr          = (arr[1] >> 7) & 0x01
-        @opCode      = (arr[1] >> 3) & 0x0F
-        @aa          = (arr[1] >> 2) & 0x01
-        @tc          = (arr[1] >> 1) & 0x01
-        @rd          =  arr[1] & 0x1
-        @ra          = (arr[2] >> 7) & 0x01
-        @ad          = (arr[2] >> 5) & 0x01
-        @cd          = (arr[2] >> 4) & 0x01
-        @rCode       = RCode.new(arr[2] & 0xf)
-        @qdCount     =  arr[3]
-        @anCount     =  arr[4]
-        @nsCount     =  arr[5]
-        @arCount     =  arr[6]
+        @id = arr[0]
+        @qr = (arr[1] >> 7) & 0x01
+        @opCode = (arr[1] >> 3) & 0x0F
+        @aa = (arr[1] >> 2) & 0x01
+        @tc = (arr[1] >> 1) & 0x01
+        @rd = arr[1] & 0x1
+        @ra = (arr[2] >> 7) & 0x01
+        @ad = (arr[2] >> 5) & 0x01
+        @cd = (arr[2] >> 4) & 0x01
+        @rCode = RCode.new(arr[2] & 0xf)
+        @qdCount = arr[3]
+        @anCount = arr[4]
+        @nsCount = arr[5]
+        @arCount = arr[6]
       end
 
       def new_from_hash(hash)

data/lib/net/dns/question.rb

@@ -173,6 +173,8 @@ module Net
       end
 
       def new_from_binary(data)
+        raise NameInvalid if data.size <= 4
+
         str, type, cls = data.unpack("a#{data.size - 4}nn")
         @qName = build_qName(str)
         @qType = Net::DNS::RR::Types.new type

data/lib/net/dns/resolver/socks.rb

@@ -142,7 +142,7 @@ class UdpRawSocket < RawSocket # :nodoc:
       [@src_port, 'n'], # source port
       [@dest_port, 'n'],       # destination port
       [8 + pay_size, 'n'],     # len
-      [0, 'n']                 # checksum (mandatory)
+      [0, 'n'], # checksum (mandatory)
     ])
   end
 end

data/lib/net/dns/resolver.rb

@@ -1074,14 +1074,560 @@ module Net
         if ENV['LOCALDOMAIN']
           self.domain = ENV['LOCALDOMAIN']
         end
-        if ENV['RES_OPTIONS']
-          ENV['RES_OPTIONS'].split(" ").each do |opt|
-            name, val = opt.split(":")
-            begin
-              eval("self.#{name} = #{val}")
-            rescue NoMethodError
-              raise ArgumentError, "Invalid ENV option #{name}"
-            end
+        # Resolver helper method.
+        #
+        # Calling the resolver directly:
+        #
+        #   puts Resolver("www.google.com").answer.size
+        #   # => 5
+        #
+        # An optional block can be passed yielding the Net::DNS::Packet object.
+        #
+        #   Resolver("www.google.com") { |packet| puts packet.size + " bytes" }
+        #   # => 484 bytes
+        #
+        # = Net::DNS::Resolver - DNS resolver class
+        #
+        # The Net::DNS::Resolver class implements a complete DNS resolver written
+        # in pure Ruby, without a single C line of code. It has all of the
+        # tipical properties of an evoluted resolver, and a bit of OO which
+        # comes from having used Ruby.
+        #
+        # This project started as a porting of the Net::DNS Perl module,
+        # written by Martin Fuhr, but turned out (in the last months) to be
+        # an almost complete rewriting. Well, maybe some of the features of
+        # the Perl version are still missing, but guys, at least this is
+        # readable code!
+        #
+        # == Environment
+        #
+        # The Following Environment variables can also be used to configure
+        # the resolver:
+        #
+        # * +RES_NAMESERVERS+: A space-separated list of nameservers to query.
+        #
+        #      # Bourne Shell
+        #      $ RES_NAMESERVERS="192.168.1.1 192.168.2.2 192.168.3.3"
+        #      $ export RES_NAMESERVERS
+        #
+        #      # C Shell
+        #      % setenv RES_NAMESERVERS "192.168.1.1 192.168.2.2 192.168.3.3"
+        #
+        # * +RES_SEARCHLIST+: A space-separated list of domains to put in the
+        #   search list.
+        #
+        #      # Bourne Shell
+        #      $ RES_SEARCHLIST="example.com sub1.example.com sub2.example.com"
+        #      $ export RES_SEARCHLIST
+        #
+        #      # C Shell
+        #      % setenv RES_SEARCHLIST "example.com sub1.example.com sub2.example.com"
+        #
+        # * +LOCALDOMAIN+: The default domain.
+        #
+        #      # Bourne Shell
+        #      $ LOCALDOMAIN=example.com
+        #      $ export LOCALDOMAIN
+        #
+        #      # C Shell
+        #      % setenv LOCALDOMAIN example.com
+        #
+        # * +RES_OPTIONS+: A space-separated list of resolver options to set.
+        #   Options that take values are specified as option:value.
+        #
+        #      # Bourne Shell
+        #      $ RES_OPTIONS="retrans:3 retry:2 debug"
+        #      $ export RES_OPTIONS
+        #
+        #      # C Shell
+        #      % setenv RES_OPTIONS "retrans:3 retry:2 debug"
+        #
+        # An hash with the defaults values of almost all the
+        # configuration parameters of a resolver object. See
+        # the description for each parameter to have an
+        # explanation of its usage.
+        # Quick resolver method. Bypass the configuration using
+        # the defaults.
+        #
+        #   Net::DNS::Resolver.start "www.google.com"
+        #
+        # Returns true if running on a Windows platform.
+        #
+        # Note. This method doesn't rely on the RUBY_PLATFORM constant
+        # because the comparison will fail when running on JRuby.
+        # On JRuby RUBY_PLATFORM == 'java'.
+        # Creates a new resolver object.
+        #
+        # Argument +config+ can either be empty or be an hash with
+        # some configuration parameters. To know what each parameter
+        # do, look at the description of each.
+        # Some example:
+        #
+        #   # Use the sistem defaults
+        #   res = Net::DNS::Resolver.new
+        #
+        #   # Specify a configuration file
+        #   res = Net::DNS::Resolver.new(:config_file => '/my/dns.conf')
+        #
+        #   # Set some option
+        #   res = Net::DNS::Resolver.new(:nameservers => "172.16.1.1",
+        #                                :recursive => false,
+        #                                :retry => 10)
+        #
+        # == Config file
+        #
+        # Net::DNS::Resolver uses a config file to read the usual
+        # values a resolver needs, such as nameserver list and
+        # domain names. On UNIX systems the defaults are read from the
+        # following files, in the order indicated:
+        #
+        # * /etc/resolv.conf
+        # * $HOME/.resolv.conf
+        # * ./.resolv.conf
+        #
+        # The following keywords are recognized in resolver configuration files:
+        #
+        # * domain: the default domain.
+        # * search: a space-separated list of domains to put in the search list.
+        # * nameserver: a space-separated list of nameservers to query.
+        #
+        # Files except for /etc/resolv.conf must be owned by the effective userid
+        # running the program or they won't be read.  In addition, several environment
+        # variables can also contain configuration information; see Environment
+        # in the main description for Resolver class.
+        #
+        # On Windows Systems, an attempt is made to determine the system defaults
+        # using the registry.  This is still a work in progress; systems with many
+        # dynamically configured network interfaces may confuse Net::DNS.
+        #
+        # You can include a configuration file of your own when creating a resolver
+        # object:
+        #
+        #   # Use my own configuration file
+        #   my $res = Net::DNS::Resolver->new(config_file => '/my/dns.conf');
+        #
+        # This is supported on both UNIX and Windows.  Values pulled from a custom
+        # configuration file override the the system's defaults, but can still be
+        # overridden by the other arguments to Resolver::new.
+        #
+        # Explicit arguments to Resolver::new override both the system's defaults
+        # and the values of the custom configuration file, if any.
+        #
+        # == Parameters
+        #
+        # The following arguments to Resolver::new are supported:
+        #
+        # * nameservers: an array reference of nameservers to query.
+        # * searchlist:  an array reference of domains.
+        # * recurse
+        # * debug
+        # * domain
+        # * port
+        # * srcaddr
+        # * srcport
+        # * tcp_timeout
+        # * udp_timeout
+        # * retrans
+        # * retry
+        # * usevc
+        # * stayopen
+        # * igntc
+        # * defnames
+        # * dnsrch
+        # * persistent_tcp
+        # * persistent_udp
+        # * dnssec
+        #
+        # For more information on any of these options, please consult the
+        # method of the same name.
+        #
+        # == Disclaimer
+        #
+        # Part of the above documentation is taken from the one in the
+        # Net::DNS::Resolver Perl module.
+        #
+        # New logger facility
+        #------------------------------------------------------------
+        # Resolver configuration will be set in order from:
+        # 1) initialize arguments
+        # 2) ENV variables
+        # 3) config file
+        # 4) defaults (and /etc/resolv.conf for config)
+        #------------------------------------------------------------
+        #------------------------------------------------------------
+        # Parsing config file
+        #------------------------------------------------------------
+        #------------------------------------------------------------
+        # Parsing ENV variables
+        #------------------------------------------------------------
+        #------------------------------------------------------------
+        # Parsing arguments
+        #------------------------------------------------------------
+        # Get the resolver search list, returned as an array of entries.
+        #
+        #   res.searchlist
+        #   #=> ["example.com","a.example.com","b.example.com"]
+        #
+        # Set the resolver searchlist.
+        # +arg+ can be a single string or an array of strings.
+        #
+        #   res.searchstring = "example.com"
+        #   res.searchstring = ["example.com","a.example.com","b.example.com"]
+        #
+        # Note that you can also append a new name to the searchlist.
+        #
+        #   res.searchlist << "c.example.com"
+        #   res.searchlist
+        #   #=> ["example.com","a.example.com","b.example.com","c.example.com"]
+        #
+        # The default is an empty array.
+        #
+        # Get the list of resolver nameservers, in a dotted decimal format-
+        #
+        #   res.nameservers
+        #     #=> ["192.168.0.1","192.168.0.2"]
+        #
+        # Set the list of resolver nameservers.
+        # +arg+ can be a single ip address or an array of addresses.
+        #
+        #   res.nameservers = "192.168.0.1"
+        #   res.nameservers = ["192.168.0.1","192.168.0.2"]
+        #
+        # If you want you can specify the addresses as IPAddr instances.
+        #
+        #   ip = IPAddr.new("192.168.0.3")
+        #   res.nameservers << ip
+        #   #=> ["192.168.0.1","192.168.0.2","192.168.0.3"]
+        #
+        # The default is 127.0.0.1 (localhost)
+        #
+        # arg is in the name form, not IP
+        # Return a string with the default domain.
+        # Set the domain for the query.
+        # Return the defined size of the packet.
+        # Get the port number to which the resolver sends queries.
+        #
+        #   puts "Sending queries to port #{res.port}"
+        #
+        # Set the port number to which the resolver sends queries.  This can be useful
+        # for testing a nameserver running on a non-standard port.
+        #
+        #   res.port = 10053
+        #
+        # The default is port 53.
+        #
+        # Get the value of the source port number.
+        #
+        #   puts "Sending queries using port #{res.source_port}"
+        #
+        # Set the local source port from which the resolver sends its queries.
+        #
+        #   res.source_port = 40000
+        #
+        # Note that if you want to set a port you need root priviledges, as
+        # raw sockets will be used to generate packets. The class will then
+        # generate the exception ResolverPermissionError if you're not root.
+        #
+        # The default is 0, which means that the port will be chosen by the
+        # underlaying layers.
+        #
+        # Get the local address from which the resolver sends queries
+        #
+        #   puts "Sending queries using source address #{res.source_address}"
+        #
+        # Get the local ipv6 address from which the resolver sends queries
+        #
+        # Set the local source address from which the resolver sends its queries.
+        #
+        #   res.source_address = "172.16.100.1"
+        #   res.source_address = IPAddr.new("172.16.100.1")
+        #
+        # You can specify +arg+ as either a string containing the ip address
+        # or an instance of IPAddr class.
+        #
+        # Normally this can be used to force queries out a specific interface
+        # on a multi-homed host. In this case, you should of course need to
+        # know the addresses of the interfaces.
+        #
+        # Another way to use this option is for some kind of spoofing attacks
+        # towards weak nameservers, to probe the security of your network.
+        # This includes specifing ranged attacks such as DoS and others. For
+        # a paper on DNS security, checks http://www.marcoceresa.com/security/
+        #
+        # Note that if you want to set a non-binded source address you need
+        # root priviledges, as raw sockets will be used to generate packets.
+        # The class will then generate an exception if you're not root.
+        #
+        # The default is 0.0.0.0, meaning any local address (chosen on routing needs).
+        #
+        # Port already in use!
+        # Address is not valid: raw socket
+        # Return the retrasmission interval (in seconds) the resolvers has
+        # been set on.
+        # Set the retrasmission interval in seconds. Default 5 seconds.
+        # The number of times the resolver will try a query.
+        #
+        #   puts "Will try a max of #{res.retry_number} queries"
+        #
+        # Set the number of times the resolver will try a query.
+        # Default 4 times.
+        # This method will return true if the resolver is configured to
+        # perform recursive queries.
+        #
+        #   print "The resolver will perform a "
+        #   print res.recursive? ? "" : "not "
+        #   puts "recursive query"
+        #
+        # Sets whether or not the resolver should perform recursive
+        # queries. Default is true.
+        #
+        #   res.recursive = false # perform non-recursive query
+        #
+        # Return a string representing the resolver state, suitable
+        # for printing on the screen.
+        #
+        #   puts "Resolver state:"
+        #   puts res.state
+        #
+        # Checks whether the +defname+ flag has been activate.
+        # Set the flag +defname+ in a boolean state. if +defname+ is true,
+        # calls to Resolver#query will append the default domain to names
+        # that contain no dots.
+        # Example:
+        #
+        #   # Domain example.com
+        #   res.defname = true
+        #   res.query("machine1")
+        #     #=> This will perform a query for machine1.example.com
+        #
+        # Default is true.
+        #
+        # Get the state of the dns_search flag.
+        # Set the flag +dns_search+ in a boolean state. If +dns_search+
+        # is true, when using the Resolver#search method will be applied
+        # the search list. Default is true.
+        # Get the state of the use_tcp flag.
+        #
+        # If +use_tcp+ is true, the resolver will perform all queries
+        # using TCP virtual circuits instead of UDP datagrams, which
+        # is the default for the DNS protocol.
+        #
+        #   res.use_tcp = true
+        #   res.query "host.example.com"
+        #     #=> Sending TCP segments...
+        #
+        # Default is false.
+        #
+        # Return an object representing the value of the stored TCP
+        # timeout the resolver will use in is queries. This object
+        # is an instance of the class +TcpTimeout+, and two methods
+        # are available for printing informations: TcpTimeout#to_s
+        # and TcpTimeout#pretty_to_s.
+        #
+        # Here's some example:
+        #
+        #   puts "Timeout of #{res.tcp_timeout} seconds" # implicit to_s
+        #     #=> Timeout of 150 seconds
+        #
+        #   puts "You set a timeout of " + res.tcp_timeout.pretty_to_s
+        #     #=> You set a timeout of 2 minutes and 30 seconds
+        #
+        # If the timeout is infinite, a string "infinite" will be returned.
+        #
+        # Set the value of TCP timeout for resolver queries that
+        # will be performed using TCP. A value of 0 means that
+        # the timeout will be infinite.
+        # The value is stored internally as a +TcpTimeout+ object, see
+        # the description for Resolver#tcp_timeout
+        #
+        # Default is 5 seconds.
+        #
+        # Return an object representing the value of the stored UDP
+        # timeout the resolver will use in is queries. This object
+        # is an instance of the class +UdpTimeout+, and two methods
+        # are available for printing information: UdpTimeout#to_s
+        # and UdpTimeout#pretty_to_s.
+        #
+        # Here's some example:
+        #
+        #   puts "Timeout of #{res.udp_timeout} seconds" # implicit to_s
+        #     #=> Timeout of 150 seconds
+        #
+        #   puts "You set a timeout of " + res.udp_timeout.pretty_to_s
+        #     #=> You set a timeout of 2 minutes and 30 seconds
+        #
+        # If the timeout is zero, a string "not defined" will
+        # be returned.
+        #
+        # Set the value of UDP timeout for resolver queries that
+        # will be performed using UDP. A value of 0 means that
+        # the timeout will not be used, and the resolver will use
+        # only +retry_number+ and +retry_interval+ parameters.
+        #
+        # Default is 5 seconds.
+        #
+        # The value is stored internally as a +UdpTimeout+ object, see
+        # the description for Resolver#udp_timeout.
+        #
+        # Set a new log file for the logger facility of the resolver
+        # class. Could be a file descriptor too:
+        #
+        #   res.log_file = $stderr
+        #
+        # Note that a new logging facility will be create, destroing
+        # the old one, which will then be impossibile to recover.
+        #
+        # This one permits to have a personal logger facility to handle
+        # resolver messages, instead of new built-in one, which is set up
+        # for a +$stdout+ (or +$stderr+) use.
+        #
+        # If you want your own logging facility you can create a new instance
+        # of the +Logger+ class:
+        #
+        #   log = Logger.new("/tmp/resolver.log","weekly",2*1024*1024)
+        #   log.level = Logger::DEBUG
+        #   log.progname = "ruby_resolver"
+        #
+        # and then pass it to the resolver:
+        #
+        #   res.logger = log
+        #
+        # Note that this will destroy the precedent logger.
+        #
+        # Set the log level for the built-in logging facility.
+        #
+        # The log level can be one of the following:
+        #
+        # - +Net::DNS::DEBUG+
+        # - +Net::DNS::INFO+
+        # - +Net::DNS::WARN+
+        # - +Net::DNS::ERROR+
+        # - +Net::DNS::FATAL+
+        #
+        # Note that if the global variable $DEBUG is set (like when the
+        # -d switch is used at the command line) the logger level is
+        # automatically set at DEGUB.
+        #
+        # For further informations, see Logger documentation in the
+        # Ruby standard library.
+        #
+        # Performs a DNS query for the given name, applying the searchlist if
+        # appropriate.  The search algorithm is as follows:
+        #
+        # 1. If the name contains at least one dot, try it as is.
+        # 2. If the name doesn't end in a dot then append each item in the search
+        #    list to the name.  This is only done if +dns_search+ is true.
+        # 3. If the name doesn't contain any dots, try it as is.
+        #
+        # The record type and class can be omitted; they default to +A+ and +IN+.
+        #
+        #   packet = res.search('mailhost')
+        #   packet = res.search('mailhost.example.com')
+        #   packet = res.search('example.com', Net::DNS::MX)
+        #   packet = res.search('user.passwd.example.com', Net::DNS::TXT, Net::DNS::HS)
+        #
+        # If the name is an IP address (Ipv4 or IPv6), in the form of a string
+        # or a +IPAddr+ object, then an appropriate PTR query will be performed:
+        #
+        #   ip = IPAddr.new("172.16.100.2")
+        #   packet = res.search(ip)
+        #   packet = res.search("192.168.10.254")
+        #
+        # Returns a Net::DNS::Packet object. If you need to examine the response packet
+        # whether it contains any answers or not, use the Resolver#query method instead.
+        #
+        # If the name contains at least one dot then try it as is first.
+        # If the name doesn't end in a dot then apply the search list.
+        # Finally, if the name has no dots then try it as is.
+        # Performs a DNS query for the given name; the search list
+        # is not applied.  If the name doesn't contain any dots and
+        # +defname+ is true then the default domain will be appended.
+        #
+        # The record type and class can be omitted; they default to +A+
+        # and +IN+.  If the name looks like an IP address (IPv4 or IPv6),
+        # then an appropriate PTR query will be performed.
+        #
+        #   packet = res.query('mailhost')
+        #   packet = res.query('mailhost.example.com')
+        #   packet = res.query('example.com', Net::DNS::MX)
+        #   packet = res.query('user.passwd.example.com', Net::DNS::TXT, Net::DNS::HS)
+        #
+        # If the name is an IP address (Ipv4 or IPv6), in the form of a string
+        # or a +IPAddr+ object, then an appropriate PTR query will be performed:
+        #
+        #   ip = IPAddr.new("172.16.100.2")
+        #   packet = res.query(ip)
+        #   packet = res.query("192.168.10.254")
+        #
+        # Returns a Net::DNS::Packet object. If you need to examine the response
+        # packet whether it contains any answers or not, use the Resolver#query
+        # method instead.
+        #
+        # If the name doesn't contain any dots then append the default domain.
+        # Performs a DNS query for the given name.  Neither the
+        # searchlist nor the default domain will be appended.
+        #
+        # The argument list can be either a Net::DNS::Packet object
+        # or a name string plus optional type and class, which if
+        # omitted default to +A+ and +IN+.
+        #
+        # Returns a Net::DNS::Packet object.
+        #
+        #   # Executes the query with a +Packet+ object
+        #   send_packet = Net::DNS::Packet.new("host.example.com", Net::DNS::NS, Net::DNS::HS)
+        #   packet = res.query(send_packet)
+        #
+        #   # Executes the query with a host, type and cls
+        #   packet = res.query("host.example.com")
+        #   packet = res.query("host.example.com", Net::DNS::NS)
+        #   packet = res.query("host.example.com", Net::DNS::NS, Net::DNS::HS)
+        #
+        # If the name is an IP address (Ipv4 or IPv6), in the form of a string
+        # or a IPAddr object, then an appropriate PTR query will be performed:
+        #
+        #   ip = IPAddr.new("172.16.100.2")
+        #   packet = res.query(ip)
+        #
+        #   packet = res.query("172.16.100.2")
+        #
+        # Use +packet.header.ancount+ or +packet.answer+ to find out if there
+        # were any records in the answer section.
+        #
+        # Store packet_data for performance improvements,
+        # so methods don't keep on calling Packet#data
+        # Choose whether use TCP, UDP or RAW
+        # Must use TCP, either plain or raw
+        # Use raw sockets?
+        # Packet size is inside the boundaries
+        # Use raw sockets?
+        # User requested TCP
+        # Finally use UDP
+        # Performs a zone transfer for the zone passed as a parameter.
+        #
+        # It is actually only a wrapper to a send with type set as Net::DNS::AXFR,
+        # since it is using the same infrastucture.
+        #
+        # Performs an MX query for the domain name passed as parameter.
+        #
+        # It actually uses the same methods a normal Resolver query would
+        # use, but automatically sort the results based on preferences
+        # and returns an ordered array.
+        #
+        #   res = Net::DNS::Resolver.new
+        #   res.mx("google.com")
+        #
+        # Parses a configuration file specified as the argument.
+        # Parses environment variables.
+        # Contains a number, try to see if it's an IP or IPv6 address
+        # Create the packet
+        # DNSSEC and TSIG stuff to be inserted here
+        # FIXME: a ? method should never raise.
+        ENV['RES_OPTIONS']&.split(" ")&.each do |opt|
+          name, val = opt.split(":")
+          begin
+            eval("self.#{name} = #{val}")
+          rescue NoMethodError
+            raise ArgumentError, "Invalid ENV option #{name}"
           end
         end
       end

data/lib/net/dns/rr/soa.rb

@@ -41,7 +41,7 @@ module Net # :nodoc:
         end
 
         def number?(num)
-          if num.is_a?(Integer) && (num > 0)
+          if num.is_a?(Integer) && num.positive?
             true
           else
             raise ArgumentError, "Wrong format field: #{num} not a number or less than zero"

data/lib/net/dns/rr/types.rb

@@ -6,65 +6,87 @@ module Net # :nodoc:
         TYPES = {
           'SIGZERO' => 0, # RFC2931 consider this a pseudo type
           'A' => 1, # RFC 1035, Section 3.4.1
-          'NS' => 2,       # RFC 1035, Section 3.3.11
-          'MD' => 3,       # RFC 1035, Section 3.3.4 (obsolete)
-          'MF' => 4,       # RFC 1035, Section 3.3.5 (obsolete)
+          'NS' => 2, # RFC 1035, Section 3.3.11
+          'MD' => 3, # RFC 1035, Section 3.3.4 (obsolete)
+          'MF' => 4, # RFC 1035, Section 3.3.5 (obsolete)
           'CNAME' => 5, # RFC 1035, Section 3.3.1
           'SOA' => 6, # RFC 1035, Section 3.3.13
-          'MB' => 7,       # RFC 1035, Section 3.3.3
-          'MG' => 8,       # RFC 1035, Section 3.3.6
-          'MR' => 9,       # RFC 1035, Section 3.3.8
-          'NULL' => 10, # RFC 1035, Section 3.3.10
-          'WKS' => 11,      # RFC 1035, Section 3.4.2 (deprecated)
-          'PTR' => 12,      # RFC 1035, Section 3.3.12
-          'HINFO' => 13,      # RFC 1035, Section 3.3.2
-          'MINFO' => 14,      # RFC 1035, Section 3.3.7
+          'MB' => 7, # RFC 1035, Section 3.3.3 (obsolete)
+          'MG' => 8, # RFC 1035, Section 3.3.6 (obsolete)
+          'MR' => 9, # RFC 1035, Section 3.3.8 (obsolete)
+          'NULL' => 10, # RFC 1035, Section 3.3.10 (obsolete)
+          'WKS' => 11, # RFC 1035, Section 3.4.2 (obsolete)
+          'PTR' => 12, # RFC 1035, Section 3.3.12
+          'HINFO' => 13, # RFC 1035, Section 3.3.2
+          'MINFO' => 14, # RFC 1035, Section 3.3.7 (obsolete)
           'MX' => 15, # RFC 1035, Section 3.3.9
           'TXT' => 16, # RFC 1035, Section 3.3.14
-          'RP' => 17, # RFC 1183, Section 2.2
+          'RP' => 17, # RFC 1183, Section 2.2 (obsolete)
           'AFSDB' => 18, # RFC 1183, Section 1
-          'X25' => 19, # RFC 1183, Section 3.1
-          'ISDN' => 20, # RFC 1183, Section 3.2
-          'RT' => 21, # RFC 1183, Section 3.3
-          'NSAP' => 22, # RFC 1706, Section 5
-          'NSAP_PTR' => 23, # RFC 1348 (obsolete)
+          'X25' => 19, # RFC 1183, Section 3.1 (obsolete)
+          'ISDN' => 20, # RFC 1183, Section 3.2 (obsolete)
+          'RT' => 21, # RFC 1183, Section 3.3 (obsolete)
+          'NSAP' => 22, # RFC 1706, Section 5 (obsolete)
+          'NSAP_PTR' => 23, # RFC 1348 (obsolete) (obsolete)
           # The following 2 RRs are impemented in Net::DNS::SEC, TODO
-          'SIG' => 24,      # RFC 2535, Section 4.1
-          'KEY' => 25,      # RFC 2535, Section 3.1
-          'PX' => 26, # RFC 2163,
-          'GPOS' => 27,      # RFC 1712 (obsolete)
-          'AAAA' => 28,      # RFC 1886, Section 2.1
+          'SIG' => 24, # RFC 2535, Section 4.1 (obsolete)
+          'KEY' => 25, # RFC 2535, Section 3.1 (obsolete)
+          'PX' => 26, # RFC 2163, (obsolete)
+          'GPOS' => 27, # RFC 1712 (obsolete)
+          'AAAA' => 28, # RFC 1886, Section 2.1
           'LOC' => 29, # RFC 1876
           # The following RR is implemented in Net::DNS::SEC, TODO
-          'NXT' => 30,      # RFC 2535, Section 5.2
-          'EID' => 31,      # draft-ietf-nimrod-dns-xx.txt
-          'NIMLOC' => 32, # draft-ietf-nimrod-dns-xx.txt
+          'NXT' => 30, # RFC 2535, Section 5.2 (obsolete)
+          'EID' => 31, # draft-ietf-nimrod-dns-xx.txt (obsolete)
+          'NIMLOC' => 32, # draft-ietf-nimrod-dns-xx.txt (obsolete)
           'SRV' => 33, # RFC 2052
-          'ATMA' => 34, # ???
+          'ATMA' => 34, # ??? (obsolete)
           'NAPTR' => 35, # RFC 2168
           'KX' => 36, # RFC 2230
           'CERT' => 37, # RFC 2538
           'DNAME' => 39, # RFC 2672
           'OPT' => 41, # RFC 2671
+          'APL' => 42, # RFC 3123 (obsolete)
           # The following 4 RRs are implemented in Net::DNS::SEC TODO
-          'DS' => 43, # draft-ietf-dnsext-delegation-signer
-          'SSHFP' => 44,      # draft-ietf-secsh-dns (No RFC # yet at time of coding)
-          'RRSIG' => 46,      # draft-ietf-dnsext-dnssec-2535typecode-change
-          'NSEC' => 47, # draft-ietf-dnsext-dnssec-2535typecode-change
-          'DNSKEY' => 48, # draft-ietf-dnsext-dnssec-2535typecode-change
-          'UINFO' => 100, # non-standard
-          'UID' => 101,     # non-standard
-          'GID' => 102,     # non-standard
-          'UNSPEC' => 103, # non-standard
-          'TKEY' => 249,     # RFC 2930
-          'TSIG' => 250,     # RFC 2931
-          'IXFR' => 251,     # RFC 1995
-          'AXFR' => 252,     # RFC 1035
-          'MAILB' => 253,     # RFC 1035 (MB, MG, MR)
-          'MAILA' => 254,     # RFC 1035 (obsolete - see MX)
+          'DS' => 43, # RFC 4034
+          'SSHFP' => 44, # RFC 4255
+          'IPSECKEY' => 45, # RFC 4025
+          'RRSIG' => 46, # RFC 4034
+          'NSEC' => 47, # RFC 4034
+          'DNSKEY' => 48, # RFC 4034
+          'DHCID' => 49, # RFC 4701
+          'NSEC3' => 50, # RFC 5155
+          'NSEC3PARAM' => 51, # RFC 5155
+          'TLSA' => 52, # RFC 6698
+          'SMIMEA' => 53, # RFC 8162
+          'HIP' => 55, # RFC 8005
+          'CDS' => 59, # RFC 7344
+          'CDNSKEY' => 60, # RFC 7344
+          'OPENPGPKEY' => 61, # RFC 7929
+          'CSYNC' => 62, # RFC 7477
+          'ZONEMD' => 63, # RFC 8976
+          'SVCB' => 64, # RFC 9460
+          'HTTPS' => 65, # RFC 9460
+          'UINFO' => 100, # non-standard (obsolete)
+          'UID' => 101, # non-standard (obsolete)
+          'GID' => 102, # non-standard (obsolete)
+          'UNSPEC' => 103, # non-standard (obsolete)
+          'EUI48' => 108, # RFC 7043
+          'EUI64' => 109, # RFC 7043
+          'TKEY' => 249, # RFC 2930
+          'TSIG' => 250, # RFC 2931
+          'IXFR' => 251, # RFC 1995
+          'AXFR' => 252, # RFC 1035
+          'MAILB' => 253, # RFC 1035 (MB, MG, MR) (obsolete)
+          'MAILA' => 254, # RFC 1035 (obsolete - see MX)
           'ANY' => 255, # RFC 1035
+          'URI' => 256, # RFC 7553
+          'CAA' => 257, # RFC 6844
         }.freeze
 
+        # Pre-initialize the inverted hash to avoid runtime inversion
+        TYPES_BY_NUMBER = TYPES.invert.freeze
+
         # The default value when type is nil in Resource Records
         @@default = TYPES["A"]
 
@@ -88,7 +110,7 @@ module Net # :nodoc:
           when String
             TYPES.key?(type)
           when Integer
-            TYPES.invert.key?(type)
+            TYPES_BY_NUMBER.key?(type)
           else
             raise ArgumentError, "Wrong type class: #{type.class}"
           end
@@ -99,8 +121,8 @@ module Net # :nodoc:
         def self.to_str(type)
           case type
           when Integer
-            if TYPES.invert.key? type
-              TYPES.invert[type]
+            if TYPES_BY_NUMBER.key? type
+              TYPES_BY_NUMBER[type]
             else
               raise ArgumentError, "Unknown type number #{type}"
             end
@@ -129,7 +151,7 @@ module Net # :nodoc:
             new_from_num(type)
           when nil
             # default type, control with Types.default=
-            @str = TYPES.invert[@@default]
+            @str = TYPES_BY_NUMBER[@@default]
             @num = @@default
           else
             raise ArgumentError, "Wrong type class: #{type.class}"
@@ -178,11 +200,11 @@ module Net # :nodoc:
 
         # Contructor for numeric data type.
         def new_from_num(type)
-          if TYPES.invert.key? type
+          if TYPES_BY_NUMBER.key? type
             @num = type
-            @str = TYPES.invert[type]
+            @str = TYPES_BY_NUMBER[type]
           else
-            raise ArgumentError, "Unkown type number #{type}"
+            raise ArgumentError, "Unknown type number #{type}"
           end
         end
       end

data/lib/net/dns/rr.rb

@@ -298,7 +298,14 @@ module Net
         if self.class == Net::DNS::RR
           temp = dn_expand(data, offset)[1]
           type = Net::DNS::RR::Types.new data.unpack("@#{temp} n")[0]
-          (eval "Net::DNS::RR::#{type}").parse_packet(data, offset)
+          rr_class = Net::DNS::RR.const_get(type.to_s) rescue nil
+
+          if rr_class && rr_class.respond_to?(:parse_packet)
+            rr_class.parse_packet(data, offset)
+          else
+            # This shouldn't happen because Net::DNS::RR::Types.new already raises an error on invalid types
+            raise "Unknown or unsupported RR type: #{type}"
+          end
         else
           @name, offset = dn_expand(data, offset)
           rrtype, cls, @ttl, @rdlength = data.unpack("@#{offset} n2 N n")

data/lib/net/dns/version.rb

@@ -3,6 +3,6 @@
 module Net
   module DNS
     # The current library version.
-    VERSION = "0.9.2".freeze
+    VERSION = "0.11.0"
   end
 end

data/test/unit/question_test.rb

@@ -5,7 +5,7 @@ class QuestionTest < Minitest::Test
   def setup
     @domain = 'example.com.'
     @type   = 'MX'
-    @cls  = 'HS'
+    @cls = 'HS'
     @data = "\006google\003com\000\000\001\000\001"
 
     @default = Net::DNS::Question.new(@domain)
@@ -42,6 +42,15 @@ class QuestionTest < Minitest::Test
     assert_raises(ArgumentError) do
       Net::DNS::Question.parse([])
     end
+    assert_raises(ArgumentError) do
+      Net::DNS::Question.parse("[]")
+    end
+    assert_raises(ArgumentError) do
+      Net::DNS::Question.parse("12344")
+    end
+    assert_raises(ArgumentError) do
+      Net::DNS::Question.parse("12345")
+    end
     assert_raises(ArgumentError) do
       Net::DNS::Question.parse("test")
     end

data/test/unit/rr/a_test.rb

@@ -10,7 +10,7 @@ class RRATest < Minitest::Test
     @rr_value   = "64.233.187.99"
     @rr_address = IPAddr.new(@rr_value)
 
-    @rr_output  = "google.com.             10000   IN      A       64.233.187.99"
+    @rr_output = "google.com.             10000   IN      A       64.233.187.99"
 
     @rr = Net::DNS::RR::A.new(name: @rr_name, address: @rr_address, ttl: @rr_ttl)
   end

data/test/unit/rr/aaaa_test.rb

@@ -10,9 +10,9 @@ class RRAAAATest < Minitest::Test
     @rr_value   = "2a00:d40:1:1::239"
     @rr_address = IPAddr.new(@rr_value)
 
-    @rr_output  = "www.nic.it.             60      IN      AAAA    2a00:d40:1:1::239"
+    @rr_output = "www.nic.it.             60      IN      AAAA    2a00:d40:1:1::239"
 
-    @rr         = Net::DNS::RR::AAAA.new(name: @rr_name, address: @rr_address, ttl: @rr_ttl)
+    @rr = Net::DNS::RR::AAAA.new(name: @rr_name, address: @rr_address, ttl: @rr_ttl)
   end
 
   def test_initialize_from_hash

data/test/unit/rr/cname_test.rb

@@ -10,9 +10,9 @@ class RRCNAMETest < Minitest::Test
     @rr_value   = "www.l.google.com."
     @rr_cname   = @rr_value
 
-    @rr_output  = "www.google.com.         550317  IN      CNAME   www.l.google.com."
+    @rr_output = "www.google.com.         550317  IN      CNAME   www.l.google.com."
 
-    @rr         = Net::DNS::RR::CNAME.new(name: @rr_name, cname: @rr_cname, ttl: @rr_ttl)
+    @rr = Net::DNS::RR::CNAME.new(name: @rr_name, cname: @rr_cname, ttl: @rr_ttl)
   end
 
   def test_initialize_from_hash

data/test/unit/rr/hinfo_test.rb

@@ -14,7 +14,7 @@ class RRHINFOTest < Minitest::Test
     @rr_cpu     = "PC-Intel-700mhz"
     @rr_os      = "Redhat Linux 7.1"
 
-    @rr         = Net::DNS::RR::HINFO.new(name: @rr_name, cpu: @rr_cpu, os: @rr_os)
+    @rr = Net::DNS::RR::HINFO.new(name: @rr_name, cpu: @rr_cpu, os: @rr_os)
   end
 
   def test_initialize_from_hash

data/test/unit/rr/mx_test.rb

@@ -11,9 +11,9 @@ class RRMXTest < Minitest::Test
     @rr_exchange    = "mail.example.com."
     @rr_value       = "#{@rr_preference} #{@rr_exchange}"
 
-    @rr_output  = "example.com.            10000   IN      MX      10 mail.example.com."
+    @rr_output = "example.com.            10000   IN      MX      10 mail.example.com."
 
-    @rr         = Net::DNS::RR::MX.new(name: "example.com.", preference: 10, exchange: "mail.example.com.", ttl: 10_000)
+    @rr = Net::DNS::RR::MX.new(name: "example.com.", preference: 10, exchange: "mail.example.com.", ttl: 10_000)
   end
 
   def test_initialize_from_hash

data/test/unit/rr/ns_test.rb

@@ -9,9 +9,9 @@ class RRNSTest < Minitest::Test
     @rr_ttl     = 10_800
     @rr_nsdname = "ns1.google.com."
 
-    @rr_output  = "google.com.             10800   IN      NS      ns1.google.com."
+    @rr_output = "google.com.             10800   IN      NS      ns1.google.com."
 
-    @rr         = Net::DNS::RR::NS.new(name: "google.com.", nsdname: "ns1.google.com.", ttl: @rr_ttl)
+    @rr = Net::DNS::RR::NS.new(name: "google.com.", nsdname: "ns1.google.com.", ttl: @rr_ttl)
   end
 
   def test_initialize_from_hash

data/test/unit/rr/types_test.rb

@@ -50,10 +50,10 @@ class RRTypesTest < Minitest::Test
   end
 
   def test_valid?
-    assert_equal(true,  Net::DNS::RR::Types.valid?("A"))
-    assert_equal(true,  Net::DNS::RR::Types.valid?(1))
+    assert_equal(true, Net::DNS::RR::Types.valid?("A"))
+    assert_equal(true, Net::DNS::RR::Types.valid?(1))
     assert_equal(false, Net::DNS::RR::Types.valid?("Q"))
-    assert_equal(false, Net::DNS::RR::Types.valid?(256))
+    assert_equal(false, Net::DNS::RR::Types.valid?(12345))
     assert_raises(ArgumentError) do
       Net::DNS::RR::Types.valid?({})
     end
@@ -62,7 +62,7 @@ class RRTypesTest < Minitest::Test
   def test_to_str
     assert_equal("A", Net::DNS::RR::Types.to_str(1))
     assert_raises(ArgumentError) do
-      Net::DNS::RR::Types.to_str(256)
+      Net::DNS::RR::Types.to_str(12345)
     end
     assert_raises(ArgumentError) do
       Net::DNS::RR::Types.to_str("string")

data/test/unit/rr_test.rb

@@ -124,4 +124,37 @@ class RRTest < Minitest::Test
       Net::DNS::RR.new("google.com. 10800 IM A")
     end
   end
+
+  def test_bad_type
+    assert_raises(ArgumentError) do
+      Net::DNS::RR.new(name: @rr_name,
+                       ttl: @ttl,
+                       cls: @cls,
+                       type: "BOGUS",
+                       address: @rdata)
+    end
+  end
+
+  def test_parse_packet_with_unsupported_type
+    # Create a mock binary packet with an unsupported RR type
+
+    # Start with a normal A record to get valid binary data
+    record = Net::DNS::RR.new("example.com. 3600 IN A 192.168.1.1")
+    binary_data = record.data
+
+    # Find where the name ends by looking for a null byte
+    name_end = binary_data.index("\x00") + 1
+
+    # Replace the type value (2 bytes) with 0xFACE (an undefined type)
+    modified_data = binary_data.dup
+    modified_data[name_end, 2] = [0xFACE].pack("n")
+
+    # The parse_packet should raise an error for unknown types
+    error = assert_raises(ArgumentError) do
+      Net::DNS::RR.parse(modified_data)
+    end
+
+    # Verify the error message mentions the unknown type
+    assert_match(/Unknown type number/, error.message)
+  end
 end

metadata

@@ -1,16 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-net-dns
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Marco Ceresa
 - Simone Carletti
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +142,6 @@ homepage: https://gitlab.com/gitlab-org/gitlab-net-dns
 licenses:
 - Ruby
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,15 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Pure Ruby DNS library.
 test_files: