nslookupot 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c9de045df30e3e73273f0da9950c06e2e716ced7dee7fbbf55589c8c57067ee
-  data.tar.gz: ce164bc5a05df2681fd6afda4848262e4bcad328818a81941b53a4f777c6bc4f
+  metadata.gz: 001bc23694a542dcd94ce1e95bafe0bf33ab59c4691637587aabfbbb8f969677
+  data.tar.gz: ddf23225145dfd448346e87e983689a0aef7fadef4bf4757749ecad533338122
 SHA512:
-  metadata.gz: 9d836124c778fb60d8107d92ca53676af6e1a701881808894215ea435a7d3d33ad6138f260255c1b9bb202b25bef2588c97ed352e70a6f3739343d7ce098e7cd
-  data.tar.gz: acf065bdad8c0dfa20f7d6bb5a6a1efb6f040434baed88578f98fba07afeca222c5be540062f5650d7ba2349b3fdf054bb77435d1c636d270e4bf8f427b6512e
+  metadata.gz: f1b614fc0bca485d8c03e52cd5c6a41030140f9bf0bde225343974ac88d9f85e0eb3fa897f4da879d71d7fd36d07d7d3c5e777f3b02e9e46ba59c353b014e58b
+  data.tar.gz: 6eed687c0fe4334edaa8a2865fcfb27f80a034fa4dd567c0db93f29b4498064dabe4e15bd6782a6fb7a2d507adf2b733907eb3c1168dc543a64d6f662faf0eed

data/.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
       - '*'
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7.x', '3.0.x', '3.1.x']
+        ruby-version: ['3.1.x', '3.2.x', '3.3.x']
     steps:
       - name: Set up Ruby
         uses: actions/setup-ruby@v1

data/Gemfile

@@ -2,15 +2,15 @@
 
 source 'https://rubygems.org'
 
-gem 'caa_rr_patch'
+gem 'base64'
 gem 'openssl'
-gem 'rake'
-gem 'svcb_rr_patch'
+gem 'resolv', '~> 0.4.0'
 
 group :test do
   gem 'byebug'
-  gem 'rspec', '3.8.0'
-  gem 'rubocop', '0.78.0'
+  gem 'rake'
+  gem 'rspec'
+  gem 'rubocop', '1.62.0'
 end
 
 gemspec

data/exe/nslookupot

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-$LOAD_PATH << __dir__ + '/../lib'
+$LOAD_PATH << "#{__dir__}/../lib"
 
 require 'nslookupot'
 

data/lib/nslookupot/cli.rb

@@ -3,6 +3,8 @@
 require 'optparse'
 
 module Nslookupot
+  using Refinements
+
   # rubocop: disable Metrics/ClassLength
   class CLI
     # rubocop: disable Metrics/AbcSize
@@ -72,7 +74,7 @@ module Nslookupot
       begin
         args = op.parse(argv)
       rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
-        warn op.to_s
+        warn op
         warn "** #{e.message}"
         exit 1
       end
@@ -90,7 +92,7 @@ module Nslookupot
       end
 
       if args.size != 1
-        warn op.to_s
+        warn op
         warn '** `name` argument is not specified'
         exit 1
       end
@@ -102,7 +104,8 @@ module Nslookupot
 
     def s2typeclass(s)
       rr = Resolv::DNS::Resource::IN.const_get(s.upcase)
-      raise NameError unless rr < Resolv::DNS::Resource
+      raise NameError unless rr < Resolv::DNS::Resource ||
+                             rr < Resolv::DNS::Resource::IN::ServiceBinding
 
       rr
     end
@@ -110,7 +113,8 @@ module Nslookupot
     def types
       Resolv::DNS::Resource::IN.constants.filter do |const|
         c = Resolv::DNS::Resource::IN.const_get(const)
-        c < Resolv::DNS::Resource
+        c < Resolv::DNS::Resource ||
+          c < Resolv::DNS::Resource::IN::ServiceBinding
       rescue ArgumentError
         false
       end

data/lib/nslookupot/utils.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Nslookupot
+  PARAMETER_REGISTRY = lambda {
+    registry = %w[
+      mandatory
+      alpn
+      no-default-alpn
+      port
+      ipv4hint
+      ech
+      ipv6hint
+      dohpath
+    ]
+    # rubocop:disable Security/Eval
+    (8...65280).each do |nnnn|
+      eval "registry[nnnn] = \"undefine#{nnnn}\"", binding, __FILE__, __LINE__
+    end
+    (65280...65535).each do |nnnn|
+      eval "registry[nnnn] = \"key#{nnnn}\"", binding, __FILE__, __LINE__
+    end
+    # rubocop:enable Security/Eval
+    registry
+  }.call.freeze
+
+  module Refinements
+    refine Resolv::DNS::SvcParams do
+      unless method_defined?(:ocsp_uris)
+        # rubocop: disable Metrics/CyclomaticComplexity
+        # rubocop: disable Metrics/PerceivedComplexity
+        define_method(:to_s) do
+          @params.map do |k, v|
+            key = PARAMETER_REGISTRY[k]
+            value = case v
+                    in Resolv::DNS::SvcParam::Mandatory
+                      v.keys.map { |i| PARAMETER_REGISTRY[i] }.join(',')
+                    in Resolv::DNS::SvcParam::ALPN
+                      v.protocol_ids.join(',')
+                    # NOTE: no-default-alpn is not supported
+                    # https://github.com/ruby/resolv/blob/v0.4.0/lib/resolv.rb#L1942
+                    in Resolv::DNS::SvcParam::IPv4Hint
+                      v.addresses.join(',')
+                    in Resolv::DNS::SvcParam::Port
+                      v.port.to_s
+                    in Resolv::DNS::SvcParam::Generic \
+                      if Resolv::DNS::SvcParam::Generic.const_get(:Key5) &&
+                         v.is_a?(Resolv::DNS::SvcParam::Generic::Key5)
+                      # ech
+                      Base64.strict_encode64(v.value)
+                    in Resolv::DNS::SvcParam::IPv6Hint
+                      v.addresses.join(',')
+                    in Resolv::DNS::SvcParam::DoHPath
+                      v.template.encode('utf-8')
+                    else
+                      v.to_s
+                    end
+            "#{key}=#{value}"
+          end.join(' ')
+        end
+        # rubocop: enable Metrics/CyclomaticComplexity
+        # rubocop: enable Metrics/PerceivedComplexity
+      end
+    end
+  end
+end

data/lib/nslookupot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nslookupot
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/lib/nslookupot.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'resolv'
-require 'caa_rr_patch'
-require 'svcb_rr_patch'
-require 'socket'
+require 'base64'
 require 'openssl'
 require 'optparse'
+require 'resolv'
+require 'socket'
 
 require 'nslookupot/version'
 require 'nslookupot/error'
 require 'nslookupot/resolver'
+require 'nslookupot/utils'
 require 'nslookupot/cli'

data/nslookupot.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ['nslookupot']
 
   spec.add_development_dependency 'bundler'
-  spec.add_dependency             'caa_rr_patch'
+  spec.add_dependency             'base64'
   spec.add_dependency             'openssl'
-  spec.add_dependency             'svcb_rr_patch'
+  spec.add_dependency             'resolv', '~> 0.4.0'
 end

data/spec/utisl_spec.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require_relative 'spec_helper'
+
+# rubocop: disable Metrics/BlockLength
+RSpec.describe Nslookupot::Refinements do
+  using Nslookupot::Refinements
+
+  context 'SvcParams#to_s' do
+    let(:mandatory) do
+      Resolv::DNS::SvcParams.new(
+        [
+          Resolv::DNS::SvcParam::Mandatory.new([5, 6, 8, 65534])
+        ]
+      )
+    end
+
+    it 'could to_s' do
+      expect(mandatory.to_s).to eq 'mandatory=ech,ipv6hint,undefine8,key65534'
+    end
+
+    let(:alpn) do
+      Resolv::DNS::SvcParams.new(
+        [
+          Resolv::DNS::SvcParam::ALPN.new(%w[h2 h3])
+        ]
+      )
+    end
+
+    it 'could to_s' do
+      expect(alpn.to_s).to eq 'alpn=h2,h3'
+    end
+
+    let(:port) do
+      Resolv::DNS::SvcParams.new(
+        [
+          Resolv::DNS::SvcParam::Port.new(80)
+        ]
+      )
+    end
+
+    it 'could to_s' do
+      expect(port.to_s).to eq 'port=80'
+    end
+
+    let(:ipv4hint) do
+      Resolv::DNS::SvcParams.new(
+        [
+          Resolv::DNS::SvcParam::IPv4Hint.new(%w[192.168.0.1])
+        ]
+      )
+    end
+
+    it 'could to_s' do
+      expect(ipv4hint.to_s).to eq 'ipv4hint=192.168.0.1'
+    end
+
+    let(:ipv6hint) do
+      Resolv::DNS::SvcParams.new(
+        [
+          Resolv::DNS::SvcParam::IPv6Hint.new(%w[2001:db8::1])
+        ]
+      )
+    end
+
+    it 'could to_s' do
+      expect(ipv6hint.to_s).to eq 'ipv6hint=2001:db8::1'
+    end
+
+    let(:dohpath) do
+      Resolv::DNS::SvcParams.new(
+        [
+          Resolv::DNS::SvcParam::DoHPath.new('/dns-query{?dns}')
+        ]
+      )
+    end
+
+    it 'could to_s' do
+      expect(dohpath.to_s).to eq 'dohpath=/dns-query{?dns}'
+    end
+  end
+end
+# rubocop: enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nslookupot
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - thekuwayama
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2024-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: caa_rr_patch
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: svcb_rr_patch
+  name: resolv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 description: nslookup over TLS
 email:
 - thekuwayama@gmail.com
@@ -86,11 +86,13 @@ files:
 - lib/nslookupot/cli.rb
 - lib/nslookupot/error.rb
 - lib/nslookupot/resolver.rb
+- lib/nslookupot/utils.rb
 - lib/nslookupot/version.rb
 - nslookupot.gemspec
 - spec/cli_spec.rb
 - spec/resolver_spec.rb
 - spec/spec_helper.rb
+- spec/utisl_spec.rb
 homepage: https://github.com/thekuwayama/nslookupot
 licenses:
 - MIT
@@ -110,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: nslookup over TLS
@@ -118,3 +120,4 @@ test_files:
 - spec/cli_spec.rb
 - spec/resolver_spec.rb
 - spec/spec_helper.rb
+- spec/utisl_spec.rb