whois 5.1.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ff6872ad8615b4343c701a4db1eedc42eaa11adbb8e208c57a27925529a1cc2
-  data.tar.gz: fb06f748a5f3c51552ac2554dd09afd5dede8a1827c55a3c4466e9718a81ff20
+  metadata.gz: 233983f2127c776b5e77d6ac832a4443aa21a8da7dcc09dba31c76772926783a
+  data.tar.gz: 84ee1063c4dbdded63b6b6d83aaaf957a44f548eda71cba420a249a887a7f5e4
 SHA512:
-  metadata.gz: a27c9e7c48268fb08698628dc59e89b39182726f76cb882962c4a7fee139afb7bbca24ee1f04852c317221b58598237b036ccbda2d645012816e391e527ec7bf
-  data.tar.gz: 9cbb25f0c7ef46d0a39eb1699fae0d9e64943c8c5f9ae0c919524eb400eb228198046f5527f526d86a342a61746b6053576de9aa7a1967efccf2059ecc7a3e7c
+  metadata.gz: 7acf2553be68cc588e3850e6b9ed2339bfa8c63b138c63511d6c4b3dacbbe8f63bdf9b074a9823606f7e6f56c5925adda2d0ad781742eedc2c16d9eb5e5d6eca
+  data.tar.gz: 59137ef3644bf7a5ac1ba42622550b9eb3aabdbb2f90a78d5eba3da69c5163d494630f430c94e166bec430dd77ba5df080d126bb48d05d596fa442e72ca275de

data/.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,7 +47,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -61,4 +61,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

data/.github/workflows/release.yml

@@ -1,16 +1,18 @@
 name: release
 
 on:
+  workflow_dispatch:
   push:
     tags:
       - v*.*.*
+
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Release Gem
-        uses: cadwallion/publish-rubygems-action@d9474d9633f4674e59afb0c343f2dafe25181328
+        uses: cadwallion/publish-rubygems-action@94a6f4cd5350581749c569b5001eecc864e3ad0b
         env:
           RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
           RELEASE_COMMAND: rake release

data/.github/workflows/tests.yml

@@ -6,12 +6,10 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  test:
     strategy:
       matrix:
         ruby-version:
-          - "2.6"
-          - "2.7"
           - "3.0"
           - "3.1"
           - "3.2"

data/.rubocop.yml

@@ -6,7 +6,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   Exclude:
     # Exclude .gemspec files because they are generally auto-generated
     - '*.gemspec'

data/CHANGELOG.md

@@ -3,6 +3,18 @@
 This project uses [Semantic Versioning 2.0.0](http://semver.org/).
 
 
+## Release 6.0.0
+
+### Fixed
+
+- Fixed badly anchored regular expression (GH-661)
+
+### Changed
+
+- Minimum Ruby version 3.0
+- SERVER: Updated .GOV.UK and .AC.UK (GH-554). The official whois servers are not responding correctly, I am reverting them to the .UK TLD.
+
+
 ## Release 5.1.1
 
 ### Changed

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2022 Simone Carletti
+Copyright (c) 2009-2024 Simone Carletti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -33,7 +33,7 @@ This repository contains the core whois library, that includes the WHOIS client,
 
 ## Requirements
 
-- Ruby >= 2.4
+- Ruby >= 3.0
 
 For older versions of Ruby, see the [CHANGELOG](CHANGELOG.md).
 
@@ -213,4 +213,4 @@ Report issues or feature requests to [GitHub Issues](https://github.com/weppos/w
 
 ## License
 
-Copyright (c) 2009-2022 [Simone Carletti](https://simonecarletti.com/). This is Free Software distributed under the MIT license.
+Copyright (c) 2009-2024 [Simone Carletti](https://simonecarletti.com/). This is Free Software distributed under the MIT license.

data/SECURITY.md

@@ -0,0 +1,24 @@
+# Security Policy
+
+## Supported Versions
+
+Security updates are provided only for the current minor version.
+
+If you are using a previous minor version, we recommend to upgrade to the current minor version. This project uses [semantic versioning](https://semver.org/), therefore you can upgrade to a more recent minor version without incurring into breaking changes.
+
+Exceptionally, we may support previous minor versions upon request if there are significant reasons preventing to immediately switch the latest minor version.
+
+Older major versions are no longer supported.
+
+
+## Reporting a Vulnerability
+
+To make a report, please email weppos@weppos.net.
+
+> [!IMPORTANT]  
+> Please consider encrypting your report with GPG using the key [0x420da82a989398df](https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x420da82a989398df).
+
+
+## Tracking Security Updates
+
+Information about security vulnerabilities are published in the [Security Advisories](https://github.com/weppos/whois/security/advisories) page.

data/data/tld.json

@@ -1,7 +1,7 @@
 {
   "_": {
     "schema": "2",
-    "updated": "2023-11-08 10:10:00 UTC"
+    "updated": "2024-08-05 11:39:00 UTC"
   },
   "aaa": {
     "_type": "newgtld",
@@ -5703,18 +5703,18 @@
   "uk": {
     "host": "whois.nic.uk"
   },
-  "ac.uk": {
-    "host": "whois.ja.net"
-  },
+  // "ac.uk": {
+  //   "host": "whois.nic.ac.uk"
+  // },
   "bl.uk": {
     "adapter": "none"
   },
   "british-library.uk": {
     "adapter": "none"
   },
-  "gov.uk": {
-    "host": "whois.ja.net"
-  },
+  // "gov.uk": {
+  //   "host": "whois.gov.uk"
+  // },
   "icnet.uk": {
     "adapter": "none"
   },

data/lib/whois/client.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/errors.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/part.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -30,7 +30,7 @@ module Whois
         # "192.in-addr.arpa" => "192.0.0.0"
         # "in-addr.arpa" => "0.0.0.0"
         def inaddr_to_ip(string)
-          raise ServerError, "Invalid .in-addr.arpa address" unless string.match?(/^([0-9]{1,3}\.?){0,4}in-addr\.arpa$/)
+          raise ServerError, "Invalid .in-addr.arpa address" unless string.match?(/\A([0-9]{1,3}\.?){0,4}in-addr\.arpa\z/)
 
           a, b, c, d = string.scan(/[0-9]{1,3}\./).reverse
           [a, b, c, d].map do |token|

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/server/socket_handler.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/server.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -86,7 +86,7 @@ module Whois
           options = if settings.empty?
                       EMPTY_HASH
                     else
-                      settings.map { |k, v| [k.to_sym, v.is_a?(String) ? intern_string(v) : v] }.to_h.freeze
+                      settings.to_h { |k, v| [k.to_sym, v.is_a?(String) ? intern_string(v) : v] }.freeze
                     end
           define(type, allocation, host, options)
         end
@@ -268,7 +268,7 @@ module Whois
         begin
           ip = IPAddr.new(string)
           type = ip.ipv4? ? TYPE_IPV4 : TYPE_IPV6
-          _definitions(type).each do |_, definition|
+          _definitions(type).each_value do |definition|
             return factory(type, *definition) if IPAddr.new(definition.first).include?(ip)
           end
         rescue ArgumentError
@@ -303,7 +303,7 @@ module Whois
             index = token.index(".")
             break if index.nil?
 
-            token = token[(index + 1)..-1]
+            token = token[(index + 1)..]
           end
         end
 
@@ -321,7 +321,7 @@ module Whois
       def find_for_asn(string)
         asn = string[/\d+/].to_i
         asn_type = asn <= 65_535 ? TYPE_ASN16 : TYPE_ASN32
-        _definitions(asn_type).each do |_, definition|
+        _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

data/lib/whois/version.rb

@@ -5,11 +5,11 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   # The current library version.
-  VERSION = "5.1.1"
+  VERSION = "6.0.0"
 end

data/lib/whois.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ Encoding.default_internal = Encoding::UTF_8
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(SPEC_ROOT, "support/**/*.rb")].sort.each { |f| require f }
+Dir[File.join(SPEC_ROOT, "support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   config.mock_with :rspec

data/spec/whois/server/adapters/arpa_spec.rb

@@ -8,13 +8,22 @@ describe Whois::Server::Adapters::Arpa do
 
   describe "#lookup" do
     it "returns the WHOIS record" do
-      response = "Whois Response"
       server = described_class.new(*definition)
-      expect(Whois::Server::Adapters::Arin.query_handler).to receive(:call).with("n + 229.128.in-addr.arpa", "whois.arin.net", 43).and_return(response)
+      expect(Whois::Server::Adapters::Arin.query_handler).to receive(:call)
+        .with("n + 229.128.in-addr.arpa", "whois.arin.net", 43)
+        .and_return(response = "Whois Response")
 
       record = server.lookup("229.128.in-addr.arpa")
       expect(record.to_s).to eq(response)
       expect(record.parts).to eq([Whois::Record::Part.new(body: response, host: "whois.arin.net")])
     end
+
+    it "discards newlines" do
+      server = described_class.new(*definition)
+
+      expect do
+        server.lookup("229.128.in-addr.arpa\nextra")
+      end.to raise_error(Whois::ServerError, "Invalid .in-addr.arpa address")
+    end
   end
 end

data/whois.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = "Whois is an intelligent WHOIS client and parser written in pure Ruby. It can query registry data for IPv4, IPv6 and top level domains, and parse the responses into easy-to-use Ruby objects via the whois-parser library."
   s.license     = "MIT"
 
-  s.required_ruby_version = ">= 2.4"
+  s.required_ruby_version = ">= 3.0"
 
   s.require_paths    = %w( lib )
   s.executables      =%w( whoisrb )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whois
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Simone Carletti
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,6 +84,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
 - bin/console
 - bin/whoisrb
 - data/asn16.json
@@ -159,46 +160,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: An intelligent pure Ruby WHOIS client and parser.
-test_files:
-- spec/fixtures/referrals/afilias.bz.txt
-- spec/fixtures/referrals/arin_referral_apnic.txt
-- spec/fixtures/referrals/arin_referral_missing.txt
-- spec/fixtures/referrals/arin_referral_ripe.txt
-- spec/fixtures/referrals/arin_referral_rwhois.txt
-- spec/fixtures/referrals/arin_referral_servernap.txt
-- spec/fixtures/referrals/arin_referral_whois.txt
-- spec/fixtures/referrals/crsnic.com.txt
-- spec/fixtures/referrals/crsnic.com_referral.txt
-- spec/fixtures/referrals/crsnic.com_referral_missing.txt
-- spec/integration/whois_spec.rb
-- spec/spec_helper.rb
-- spec/support/helpers/connectivity_helper.rb
-- spec/support/helpers/spec_helper.rb
-- spec/whois/client_spec.rb
-- spec/whois/record/part_spec.rb
-- spec/whois/record_spec.rb
-- spec/whois/server/adapters/afilias_spec.rb
-- spec/whois/server/adapters/arin_spec.rb
-- spec/whois/server/adapters/arpa_spec.rb
-- spec/whois/server/adapters/base_spec.rb
-- spec/whois/server/adapters/formatted_spec.rb
-- spec/whois/server/adapters/none_spec.rb
-- spec/whois/server/adapters/not_implemented_spec.rb
-- spec/whois/server/adapters/standard_spec.rb
-- spec/whois/server/adapters/verisign_spec.rb
-- spec/whois/server/adapters/web_spec.rb
-- spec/whois/server/socket_handler_spec.rb
-- spec/whois/server_spec.rb
-- spec/whois/web_interface_error_spec.rb
-- spec/whois/whois_spec.rb
+test_files: []