whois 4.0.6 → 6.0.3

data/lib/whois/server/adapters/web.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   class Server
     module Adapters
-
       #
       # = Web Adapter
       #
@@ -21,7 +22,6 @@ module Whois
       # adapter, just a little bit more specific.
       #
       class Web < Base
-
         # Always raises a {Whois::WebInterfaceError} exception
         # including the web address for the WHOIS inteface.
         #
@@ -30,12 +30,10 @@ module Whois
         #
         # @raise  [Whois::WebInterfaceError] For every request.
         #
-        def request(string)
+        def request(_string)
           raise WebInterfaceError, options[:url]
         end
-
       end
-
     end
   end
 end

data/lib/whois/server/socket_handler.rb

@@ -1,30 +1,30 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'socket'
-require 'whois/errors'
+require "socket"
+require "whois/errors"
 
 
 module Whois
   class Server
-
     # The SocketHandler is the default query handler provided with the
     # Whois library. It performs the WHOIS query using a synchronous
     # socket connection.
     class SocketHandler
-
       # Array of connection errors to rescue
       # and wrap into a {Whois::ConnectionError}
       RESCUABLE_CONNECTION_ERRORS = [
-          SystemCallError,
-          SocketError,
-      ]
+        SystemCallError,
+        SocketError,
+      ].freeze
 
       # Performs the Socket request.
       #
@@ -36,8 +36,8 @@ module Whois
       #
       def call(query, *args)
         execute(query, *args)
-      rescue *RESCUABLE_CONNECTION_ERRORS => error
-        raise ConnectionError, "#{error.class}: #{error.message}"
+      rescue *RESCUABLE_CONNECTION_ERRORS => e
+        raise ConnectionError, "#{e.class}: #{e.message}"
       end
 
       # Executes the low-level Socket connection.
@@ -56,9 +56,8 @@ module Whois
         client.write("#{query}\r\n")    # I could use put(foo) and forget the \n
         client.read                     # but write/read is more symmetric than puts/read
       ensure                            # and I really want to use read instead of gets.
-        client.close if client          # If != client something went wrong.
+        client&.close # If != client something went wrong.
       end
     end
-
   end
 end

data/lib/whois/server.rb

@@ -1,53 +1,55 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'ipaddr'
-require 'json'
-require 'whois/server/adapters/base'
+require "ipaddr"
+require "json"
+require "whois/server/adapters/base"
+require "whois/server/adapters/arin"
+require "whois/server/adapters/arpa"
+require "whois/server/adapters/afilias"
+require "whois/server/adapters/formatted"
+require "whois/server/adapters/none"
+require "whois/server/adapters/not_implemented"
+require "whois/server/adapters/standard"
+require "whois/server/adapters/verisign"
+require "whois/server/adapters/web"
 
 
 module Whois
-
   # The {Whois::Server} class has two important roles:
   #
   # 1. it acts as a database for the WHOIS server definitions
   # 2. it is responsible for selecting the right adapter used to handle the query to the WHOIS server(s).
   #
   class Server
-
     # The {Whois::Server::Adapters} module is a namespace for all
     # WHOIS server adapters. Each adapter is a subclass of {Whois::Server::Adapters::Base},
     # customized to handle WHOIS queries for a type or a group of servers.
     module Adapters
-      autoload :Base,             "whois/server/adapters/base"
-      autoload :Arin,             "whois/server/adapters/arin"
-      autoload :Arpa,             "whois/server/adapters/arpa"
-      autoload :Afilias,          "whois/server/adapters/afilias"
-      autoload :Formatted,        "whois/server/adapters/formatted"
-      autoload :None,             "whois/server/adapters/none"
-      autoload :NotImplemented,   "whois/server/adapters/not_implemented"
-      autoload :Standard,         "whois/server/adapters/standard"
-      autoload :Verisign,         "whois/server/adapters/verisign"
-      autoload :Web,              "whois/server/adapters/web"
     end
 
     # @return [Array<Symbol>] the definition types
     TYPES = [
-        TYPE_TLD   = :tld,
-        TYPE_IPV4  = :ipv4,
-        TYPE_IPV6  = :ipv6,
-        TYPE_ASN16 = :asn16,
-        TYPE_ASN32 = :asn32,
+      TYPE_TLD = :tld,
+      TYPE_IPV4  = :ipv4,
+      TYPE_IPV6  = :ipv6,
+      TYPE_ASN16 = :asn16,
+      TYPE_ASN32 = :asn32,
     ].freeze
 
-    class << self
+    # Empty hash constant used to save allocation for definitions with empty settings.
+    EMPTY_HASH = {}.freeze
+    private_constant :EMPTY_HASH
 
+    class << self
       # Clears the definition and reset them to an empty list.
       #
       # @return [void]
@@ -62,7 +64,7 @@ module Whois
       # @return [void]
       def load_definitions
         clear_definitions
-        Dir[File.expand_path("../../../data/*.json", __FILE__)].each { |f| load_json(f) }
+        Dir[File.expand_path("../../data/*.json", __dir__)].each { |f| load_json(f) }
       end
 
       # Loads the definitions from a JSON file.
@@ -72,10 +74,18 @@ module Whois
       # @return [void]
       def load_json(file)
         type = File.basename(file, File.extname(file)).to_sym
-        JSON.load(File.read(file)).each do |allocation, settings|
+        JSON.parse(File.read(file)).each do |allocation, settings|
           next if allocation == "_"
+
           settings.reject! { |k, _| k.start_with?("_") }
-          define(type, allocation, settings.delete("host"), Hash[settings.map { |k,v| [k.to_sym, v] }])
+          host = settings.delete("host")
+          host = intern_string(host) if host
+          options = if settings.empty?
+                      EMPTY_HASH
+                    else
+                      settings.to_h { |k, v| [k.to_sym, v.is_a?(String) ? intern_string(v) : v] }.freeze
+                    end
+          define(type, allocation, host, options)
         end
       end
 
@@ -100,7 +110,7 @@ module Whois
       #
       def definitions(type)
         TYPES.include?(type) or
-            raise(ArgumentError, "`#{type}` is not a valid definition type")
+          raise(ArgumentError, "`#{type}` is not a valid definition type")
 
         _definitions(type).values
       end
@@ -142,11 +152,11 @@ module Whois
       #     :adapter => Whois::Server::Adapters::Web,
       #     :url => "http://www.nic.ar/"
       #
-      def define(type, allocation, host, options = {})
+      def define(type, allocation, host, options = EMPTY_HASH)
         TYPES.include?(type) or
-            raise(ArgumentError, "`#{type}` is not a valid definition type")
+          raise(ArgumentError, "`#{type}` is not a valid definition type")
 
-        _definitions(type)[allocation] = [allocation, host, options]
+        _definitions(type)[allocation] = [allocation, host, options.freeze]
       end
 
       # Creates a new server adapter from given arguments
@@ -222,19 +232,13 @@ module Whois
       #         but the object type doesn't have any supported WHOIS adapter associated.
       def guess(string)
         # Top Level Domain match
-        if matches_tld?(string)
-          return factory(:tld, ".", "whois.iana.org")
-        end
+        return factory(:tld, ".", "whois.iana.org") if matches_tld?(string)
 
         # IP address (secure match)
-        if matches_ip?(string)
-          return find_for_ip(string)
-        end
+        return find_for_ip(string) if matches_ip?(string)
 
         # Email Address (secure match)
-        if matches_email?(string)
-          return find_for_email(string)
-        end
+        return find_for_email(string) if matches_email?(string)
 
         # Domain Name match
         if (server = find_for_domain(string))
@@ -242,9 +246,7 @@ module Whois
         end
 
         # ASN match
-        if matches_asn?(string)
-          return find_for_asn(string)
-        end
+        return find_for_asn(string) if matches_asn?(string)
 
         # Game Over
         raise ServerNotFound, "Unable to find a WHOIS server for `#{string}'"
@@ -263,13 +265,12 @@ module Whois
         begin
           ip = IPAddr.new(string)
           type = ip.ipv4? ? TYPE_IPV4 : TYPE_IPV6
-          _definitions(type).each do |_, definition|
-            if IPAddr.new(definition.first).include?(ip)
-              return factory(type, *definition)
-            end
+          _definitions(type).each_value do |definition|
+            return factory(type, *definition) if IPAddr.new(definition.first).include?(ip)
           end
         rescue ArgumentError
           # continue
+          nil
         end
         raise AllocationUnknown, "IP Allocation for `#{string}' unknown"
       end
@@ -279,7 +280,7 @@ module Whois
       # @param  string [String]
       # @raise  [Whois::ServerNotSupported]
       #         emails are not supported.
-      def find_for_email(string)
+      def find_for_email(_string)
         raise ServerNotSupported, "No WHOIS server is known for email objects"
       end
 
@@ -292,14 +293,14 @@ module Whois
         token = string
         defs  = _definitions(TYPE_TLD)
 
-        while token != "" do
+        while token != ""
           if (found = defs[token])
             return factory(:tld, *found)
           else
             index = token.index(".")
             break if index.nil?
 
-            token = token[(index + 1)..-1]
+            token = token[(index + 1)..]
           end
         end
 
@@ -316,8 +317,8 @@ module Whois
       #         that matches one of the existing server definitions.
       def find_for_asn(string)
         asn = string[/\d+/].to_i
-        asn_type = asn <= 65535 ? TYPE_ASN16 : TYPE_ASN32
-        _definitions(asn_type).each do |_, definition|
+        asn_type = asn <= 65_535 ? TYPE_ASN16 : TYPE_ASN32
+        _definitions(asn_type).each_value do |definition|
           if (range = definition.first.split.map(&:to_i)) && asn >= range.first && asn <= range.last
             return factory(asn_type, *definition)
           end
@@ -336,13 +337,22 @@ module Whois
         end
       end
 
+      if String.method_defined?(:-@)
+        def intern_string(string)
+          -string
+        end
+      else
+        def intern_string(string)
+          string.freeze
+        end
+      end
 
       def camelize(string)
         string.to_s.split("_").collect(&:capitalize).join
       end
 
       def matches_tld?(string)
-        string =~ /^\.(xn--)?[a-z0-9]+$/
+        string.match?(/^\.(xn--)?[a-z0-9]+$/)
       end
 
       def matches_ip?(string)
@@ -350,36 +360,35 @@ module Whois
       end
 
       def matches_email?(string)
-        string =~ /@/
+        string.include?("@")
       end
 
       def matches_asn?(string)
-        string =~ /^as\d+$/i
+        string.match?(/^as\d+$/i)
       end
 
-
       def valid_ipv4?(addr)
-        if /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ addr
-          return $~.captures.all? {|i| i.to_i < 256}
+        if (m = /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/.match(addr))
+          return m.captures.all? { |i| i.to_i < 256 }
         end
+
         false
       end
 
       def valid_ipv6?(addr)
         # IPv6 (normal)
-        return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*\Z/ =~ addr
-        return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/ =~ addr
-        return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/ =~ addr
+        return true if addr.match?(/\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*\Z/)
+        return true if addr.match?(/\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/)
+        return true if addr.match?(/\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/)
         # IPv6 (IPv4 compat)
-        return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:/ =~ addr && valid_ipv4?($')
-        return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_ipv4?($')
-        return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_ipv4?($')
+        return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:/ =~ addr && valid_ipv4?(Regexp.last_match.post_match)
+        return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_ipv4?(Regexp.last_match.post_match)
+        return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_ipv4?(Regexp.last_match.post_match)
+
         false
       end
-
     end
   end
-
 end
 
 Whois::Server.load_definitions

data/lib/whois/version.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   # The current library version.
-  VERSION = "4.0.6".freeze
+  VERSION = "6.0.3"
 end

data/lib/whois.rb

@@ -1,23 +1,23 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'whois/version'
-require 'whois/errors'
-require 'whois/client'
-require 'whois/server'
-require 'whois/record'
+require "whois/version"
+require "whois/errors"
+require "whois/client"
+require "whois/server"
+require "whois/record"
 
 
 module Whois
-
   class << self
-
     # Queries the WHOIS server for <tt>object</tt> and returns
     # the response from the server.
     #
@@ -35,21 +35,21 @@ module Whois
       Client.new.lookup(object)
     end
 
-    alias_method :whois, :lookup
+    alias whois lookup
 
 
     # @deprecated
     def available?(object)
       unless defined? Whois::Parser
         warn("Whois.available? requires the gem `whois-parser`")
-        return
+        return false
       end
 
-      deprecate(%Q{Whois.available? is deprecated. Call Whois.whois("#{object}").available?})
+      deprecate(%{Whois.available? is deprecated. Call Whois.whois("#{object}").parser.available?})
 
       result = lookup(object).parser.available?
       if result.nil?
-        warn  "This method is not supported for this kind of object.\n" +
+        warn  "This method is not supported for this kind of object.\n" \
               "Use Whois.lookup('#{object}') instead."
       end
       result
@@ -59,20 +59,20 @@ module Whois
     def registered?(object)
       unless defined? Whois::Parser
         warn("Whois.registered? requires the gem `whois-parser`")
-        return
+        return false
       end
 
-      deprecate(%Q{Whois.registered? is deprecated. Call Whois.whois("#{object}").available?})
+      deprecate(%{Whois.registered? is deprecated. Call Whois.whois("#{object}").parser.registered?})
 
       result = lookup(object).parser.registered?
       if result.nil?
-        warn  "This method is not supported for this kind of object.\n" +
+        warn  "This method is not supported for this kind of object.\n" \
               "Use Whois.lookup('#{object}') instead."
       end
       result
     end
 
-    def deprecate(message = nil, callstack = caller)
+    def deprecate(message = nil, _callstack = caller)
       # warn("DEPRECATION WARNING: #{message} #{deprecation_caller_message(callstack)}")
       warn("DEPRECATION WARNING: #{message}")
     end
@@ -87,9 +87,9 @@ module Whois
     # @api private
     # @private
     def bug!(error, message)
-      raise error, message.dup        <<
-        " Please report the issue at" <<
-        " http://github.com/weppos/whois/issues"
+      raise error, message.dup <<
+                   " Please report the issue at " \
+                   "http://github.com/weppos/whois/issues"
     end
 
 
@@ -97,26 +97,25 @@ module Whois
 
     def deprecation_caller_message(callstack)
       file, line, method = extract_callstack(callstack)
-      if file
-        if line && method
-          "(called from #{method} at #{file}:#{line})"
-        else
-          "(called from #{file}:#{line})"
-        end
+      return unless file
+
+      if line && method
+        "(called from #{method} at #{file}:#{line})"
+      else
+        "(called from #{file}:#{line})"
       end
     end
 
     def extract_callstack(callstack)
-      gem_root = File.expand_path("../../../", __FILE__) + "/"
+      gem_root = "#{File.expand_path('../..', __dir__)}/"
       offending_line = callstack.find { |line| !line.start_with?(gem_root) } || callstack.first
-      if offending_line
-        if md = offending_line.match(/^(.+?):(\d+)(?::in `(.*?)')?/)
-          md.captures
-        else
-          offending_line
-        end
+      return unless offending_line
+
+      if (md = offending_line.match(/^(.+?):(\d+)(?::in `(.*?)')?/))
+        md.captures
+      else
+        offending_line
       end
     end
   end
-
 end

data/spec/fixtures/referrals/afilias.bz.txt

@@ -0,0 +1,23 @@
+Domain Name: BELIZENIC.BZ
+Registry Domain ID: D105800000000355891-AGRS
+Registrar WHOIS Server: whois.belizenic.bz
+Registrar URL:
+Updated Date: 2017-04-11T20:43:07Z
+Creation Date: 2001-04-30T19:00:00Z
+Registry Expiry Date: 2018-04-30T19:00:00Z
+Registrar Registration Expiration Date:
+Registrar: University Management Limited
+Registrar IANA ID: 800165
+Registrar Abuse Contact Email:
+Registrar Abuse Contact Phone:
+Reseller:
+Domain Status: ok https://icann.org/epp#ok
+Name Server: NS1.BELIZENIC.BZ
+Name Server: PIXIE.UCB.EDU.BZ
+DNSSEC: unsigned
+URL of the ICANN Whois Inaccuracy Complaint Form: https://www.icann.org/wicf/
+>>> Last update of WHOIS database: 2017-07-27T16:49:05Z <<<
+
+For more information on Whois status codes, please visit https://icann.org/epp
+
+Access to WHOIS information is provided to assist persons in determining the contents of a domain name registration record in the registry database. The data in this record is provided by The Registry Operator for informational purposes only, and accuracy is not guaranteed.  This service is intended only for query-based access. You agree that you will use this data only for lawful purposes and that, under no circumstances will you use this data to: (a) allow, enable, or otherwise support the transmission by e-mail, telephone, or facsimile of mass unsolicited, commercial advertising or solicitations to entities other than the data recipient's own existing customers; or (b) enable high volume, automated, electronic processes that send queries or data to the systems of Registry Operator, a Registrar, or Afilias except as reasonably necessary to register domain names or modify existing registrations. All rights reserved. Registry Operator reserves the right to modify these terms at any time. By submitting this query, you agree to abide by this policy.

data/spec/fixtures/referrals/arin_referral_apnic.txt

@@ -0,0 +1,78 @@
+
+#
+# ARIN WHOIS data and services are subject to the Terms of Use
+# available at: https://www.arin.net/whois_tou.html
+#
+# If you see inaccuracies in the results, please report at
+# http://www.arin.net/public/whoisinaccuracy/index.xhtml
+#
+
+
+#
+# Query terms are ambiguous.  The query is assumed to be:
+#     "n 144.134.121.81"
+#
+# Use "?" to get help.
+#
+
+#
+# The following results may also be obtained via:
+# http://whois.arin.net/rest/nets;q=144.134.121.81?showDetails=true&showARIN=false&ext=netref2
+#
+
+NetRange:       144.130.0.0 - 144.140.255.255
+CIDR:           144.132.0.0/14, 144.136.0.0/14, 144.130.0.0/15, 144.140.0.0/16
+OriginAS:
+NetName:        APNIC-ERX-144-130-0-0
+NetHandle:      NET-144-130-0-0-1
+Parent:         NET-144-0-0-0-0
+NetType:        Early Registrations, Transferred to APNIC
+Comment:        This IP address range is not registered in the ARIN database.
+Comment:        This range was transferred to the APNIC Whois Database as
+Comment:        part of the ERX (Early Registration Transfer) project.
+Comment:        For details, refer to the APNIC Whois Database via
+Comment:        WHOIS.APNIC.NET or http://wq.apnic.net/apnic-bin/whois.pl
+Comment:
+Comment:        ** IMPORTANT NOTE: APNIC is the Regional Internet Registry
+Comment:        for the Asia Pacific region.  APNIC does not operate networks
+Comment:        using this IP address range and is not able to investigate
+Comment:        spam or abuse reports relating to these addresses.  For more
+Comment:        help, refer to http://www.apnic.net/apnic-info/whois_search2/abuse-and-spamming
+RegDate:        2004-01-07
+Updated:        2009-10-08
+Ref:            http://whois.arin.net/rest/net/NET-144-130-0-0-1
+
+OrgName:        Asia Pacific Network Information Centre
+OrgId:          APNIC
+Address:        PO Box 3646
+City:           South Brisbane
+StateProv:      QLD
+PostalCode:     4101
+Country:        AU
+RegDate:
+Updated:        2012-01-24
+Ref:            http://whois.arin.net/rest/org/APNIC
+
+ReferralServer: whois://whois.apnic.net
+
+OrgTechHandle: AWC12-ARIN
+OrgTechName:   APNIC Whois Contact
+OrgTechPhone:  +61 7 3858 3188
+OrgTechEmail:  search-apnic-not-arin@apnic.net
+OrgTechRef:    http://whois.arin.net/rest/poc/AWC12-ARIN
+
+OrgAbuseHandle: AWC12-ARIN
+OrgAbuseName:   APNIC Whois Contact
+OrgAbusePhone:  +61 7 3858 3188
+OrgAbuseEmail:  search-apnic-not-arin@apnic.net
+OrgAbuseRef:    http://whois.arin.net/rest/poc/AWC12-ARIN
+
+
+#
+# ARIN WHOIS data and services are subject to the Terms of Use
+# available at: https://www.arin.net/whois_tou.html
+#
+# If you see inaccuracies in the results, please report at
+# http://www.arin.net/public/whoisinaccuracy/index.xhtml
+#
+