svcb_rr_patch 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe01826cf1fe78d4b2d6db7d53bb474234121dceba9f7cd8dc26b25ca2d3e00a
-  data.tar.gz: 7acaffe658b58b44b2d22c66fafe904acacf15d1b68a5a1288db11dfacad886c
+  metadata.gz: c3af5857ef38bc6a54ad9abedb5c1227ea008b56e049393d16277103cba4b823
+  data.tar.gz: 8a9152efcf7694b8e6ace3a2fce298854f4020292b3f880c2ec9da4d19b8f25b
 SHA512:
-  metadata.gz: eea644f426005af15be66fc9dbdcb9d60530e6ce77014a8345ebb52c561a71b2d352a2e29f373311724074a53c72d399007406348b8f421b1e9658a31c1b0c93
-  data.tar.gz: 8b60ace84e7fe2ab8c67ee7aea3cf412d1926740de83a60f5fd5820f06bad4e7202ea64349d74aa623c3475b0ccc74a4dd0de65eefe7266b851a24623923be06
+  metadata.gz: 912e4053675275418be0a343010b56e00e912c42ea20f24c89877f6754ee246231a91884e10ae62756185e0e64fc0c030fcdb019203a038088087e27f0d6c3fc
+  data.tar.gz: d56504d2fc39255d4ed9dc805d478b05054251af35b89384db816d340b1c22e400b531b9bee63865776d05fb550f3ec846eb8b0235412fb357776e6fedc284eb

data/README.md

@@ -6,18 +6,18 @@
 
 `svcb_rr_patch` is the patch that adds SVCB Resource Record and HTTPS Resource Record.
 
-- https://tools.ietf.org/html/draft-ietf-dnsop-svcb-https-06
+- https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-06
 
-`svcb_rr_patch` supports "ech" SvcParamKey that ECHConfig.version is 0xfe0a.
+`svcb_rr_patch` supports "ech" SvcParamKey that ECHConfig.version is `0xfe0d`.
 
-- https://datatracker.ietf.org/doc/html/draft-ietf-tls-esni-10#section-4
+- https://datatracker.ietf.org/doc/html/draft-ietf-tls-esni-13#section-4
 
 
 ## Installation
 
 he gem is available at [rubygems.org](https://rubygems.org/gems/svcb_rr_patch). You can install it the following.
 
-```bash
+```sh-session
 $ gem install svcb_rr_patch
 ```
 
@@ -26,15 +26,46 @@ $ gem install svcb_rr_patch
 
 You can resolve HTTPS resources.
 
-```bash
+```sh-session
 $ irb
 irb(main):001:0> require 'svcb_rr_patch'
 => true
 irb(main):002:1* Resolv::DNS.new.getresources(
 irb(main):003:1*   "blog.cloudflare.com",
 irb(main):004:1*   Resolv::DNS::Resource::IN::HTTPS
-irb(main):005:0> ) { |rr| pp rr }
-=> [#<Resolv::DNS::Resource::IN::HTTPS:0x0000000000000001 @svc_priority=1, @svc_domain_name="", @svc_field_value={"alpn"=>#<SvcbRrPatch::SvcParams::Alpn:0x0000000000000002 @protocols=["h3-29", "h3-28", "h3-27", "h2"]>, "ipv4hint"=>#<SvcbRrPatch::SvcParams::Ipv4hint:0x0000000000000003 @addresses=[#<Resolv::IPv4 104.18.26.46>, #<Resolv::IPv4 104.18.27.46>]>, "ipv6hint"=>#<SvcbRrPatch::SvcParams::Ipv6hint:0x0000000000000004 @addresses=[#<Resolv::IPv6 2606:4700::6812:1a2e>, #<Resolv::IPv6 2606:4700::6812:1b2e>]>}, @ttl=300>]
+irb(main):005:0> )
+=>
+[#<Resolv::DNS::Resource::IN::HTTPS:0x0000000000000001
+  @svc_params=
+   #<SvcbRrPatch::SvcParams::Hash:0x0000000000000002
+    @hash=
+     {"alpn"=>#<SvcbRrPatch::SvcParams::Alpn:0x0000000000000003 @protocols=["http/1.1", "h2"]>,
+      "ipv4hint"=>#<SvcbRrPatch::SvcParams::Ipv4hint:0x0000000000000004 @addresses=[#<Resolv::IPv4 162.159.137.85>, #<Resolv::IPv4 162.159.138.85>]>,
+      "ech"=>
+       #<SvcbRrPatch::SvcParams::Ech:0x0000000000000005
+        @echconfiglist=
+         [#<SvcbRrPatch::SvcParams::Ech::ECHConfig:0x0000000000000006
+           @echconfig_contents=
+            #<SvcbRrPatch::SvcParams::Ech::ECHConfigContents:0x0000000000000007
+             @extensions=[],
+             @key_config=
+              #<SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig:0x0000000000000008
+               @cipher_suites=
+                [#<SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite:0x0000000000000009
+                  @aead_id=#<SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeAeadId:0x0000000000000010 @uint16=1>,
+                  @kdf_id=#<SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeKdfId:0x0000000000000011 @uint16=1>>],
+               @config_id=238,
+               @kem_id=#<SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkeKemId:0x0000000000000012 @uint16=32>,
+               @public_key=
+                #<SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkePublicKey:0x0000000000000013
+                 @opaque="I\x19\xD0\xCFP\b>e\xDF\xE1Q\xE8+i\x89\x8AJ\xA2b'\xD0j\xB9+\xDE\xE2\xDE\xF8\xFA\xAD\xBBm">>,
+             @maximum_name_length=0,
+             @public_name="cloudflare-esni.com">,
+           @version="\xFE\r">]>,
+      "ipv6hint"=>#<SvcbRrPatch::SvcParams::Ipv6hint:0x0000000000000014 @addresses=[#<Resolv::IPv6 2606:4700:7::a29f:8955>, #<Resolv::IPv6 2606:4700:7::a29f:8a55>]>}>,
+  @svc_priority=1,
+  @target_name="",
+  @ttl=58>]
 ```
 
 

data/lib/svcb_rr_patch/https.rb

@@ -9,7 +9,7 @@ class Resolv::DNS::Resource::IN::HTTPS < Resolv::DNS::Resource::IN::SVCB
   ClassHash[[TypeValue, ClassValue]] = self
 
   def initialize(svc_priority, target_name, svc_params)
-    # https://tools.ietf.org/html/draft-ietf-dnsop-svcb-https-06
+    # https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-06
     super(svc_priority, target_name, svc_params)
   end
 
@@ -21,7 +21,7 @@ class Resolv::DNS::Resource::IN::HTTPS < Resolv::DNS::Resource::IN::SVCB
       return new(svc_priority, target_name, {}) if svc_priority.zero?
 
       # the SvcParams, consuming the remainder of the record
-      svc_params = ::SvcbRrPatch::SvcParams.decode(msg.get_bytes)
+      svc_params = ::SvcbRrPatch::SvcParams::Hash.decode(msg.get_bytes)
       new(svc_priority, target_name, svc_params)
     end
   end

data/lib/svcb_rr_patch/svc_params/alpn.rb

@@ -35,4 +35,9 @@ class SvcbRrPatch::SvcParams::Alpn
     protocols = decode_protocols(octet)
     new(protocols)
   end
+
+  # :nodoc:
+  def to_s
+    @protocols.join(',')
+  end
 end

data/lib/svcb_rr_patch/svc_params/ech/echconfig_contents.rb

@@ -30,24 +30,20 @@ class SvcbRrPatch::SvcParams::Ech::ECHConfigContents
   # @return [String]
   def encode
     @key_config.encode \
-    + [@maximum_name_length].pack('n') \
-    + @public_name.then { |s| [s.length].pack('n') + s } \
+    + [@maximum_name_length].pack('C') \
+    + @public_name.then { |s| [s.length].pack('C') + s } \
     + @extensions.map(&:encode).join.then { |s| [s.length].pack('n') + s }
   end
 
   # :nodoc
   # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/CyclomaticComplexity
   def self.decode(octet)
     key_config, octet = HpkeKeyConfig.decode(octet)
     raise ::Resolv::DNS::DecodeError if octet.length < 2
 
-    maximum_name_length = octet.slice(0, 2).unpack1('n')
+    maximum_name_length = octet.slice(0, 1).unpack1('C')
+    pn_len = octet.slice(1, 1).unpack1('C')
     i = 2
-    raise ::Resolv::DNS::DecodeError if i + 2 > octet.length
-
-    pn_len = octet.slice(i, 2).unpack1('n')
-    i += 2
     raise ::Resolv::DNS::DecodeError if i + pn_len > octet.length
 
     public_name = octet.slice(i, pn_len)
@@ -70,5 +66,4 @@ class SvcbRrPatch::SvcParams::Ech::ECHConfigContents
     )
   end
   # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/CyclomaticComplexity
 end

data/lib/svcb_rr_patch/svc_params/ech.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class SvcbRrPatch::SvcParams::Ech
-  attr_reader :echconfigs
+  attr_reader :echconfiglist
 
   # @param echconfiglist [Array of ECHConfig]
   def initialize(echconfiglist)
@@ -21,6 +21,13 @@ class SvcbRrPatch::SvcParams::Ech
     echconfiglist = ECHConfig.decode_vectors(octet.slice(2..))
     new(echconfiglist)
   end
+
+  # https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-06#section-9
+  # In presentation format, the value is a single ECHConfigList encoded in
+  # Base64.
+  def to_s
+    Base64.strict_encode64(encode)
+  end
 end
 
 require_relative 'ech/echconfig_contents'

data/lib/svcb_rr_patch/svc_params/ipv4hint.rb

@@ -18,4 +18,9 @@ class SvcbRrPatch::SvcParams::Ipv4hint
     addresses = octet.scan(/.{1,4}/).map { |s| Resolv::IPv4.new(s) }
     new(addresses)
   end
+
+  # :nodoc:
+  def to_s
+    @addresses.join(',')
+  end
 end

data/lib/svcb_rr_patch/svc_params/ipv6hint.rb

@@ -18,4 +18,9 @@ class SvcbRrPatch::SvcParams::Ipv6hint
     addresses = octet.scan(/.{1,16}/).map { |s| Resolv::IPv6.new(s) }
     new(addresses)
   end
+
+  # :nodoc:
+  def to_s
+    @addresses.join(',')
+  end
 end

data/lib/svcb_rr_patch/svc_params/mandatory.rb

@@ -15,7 +15,14 @@ class SvcbRrPatch::SvcParams::Mandatory
 
   # :nodoc:
   def self.decode(octet)
-    keys = octet.scan(/.{1,2}/).map { |s| s.unpack1('n') }
+    keys = octet.scan(/.{1,2}/)
+                .map { |s| s.unpack1('n') }
     new(keys)
   end
+
+  # :nodoc:
+  def to_s
+    @keys.map { |i| SvcbRrPatch::SvcParams::PARAMETER_REGISTRY[i] }
+         .join(',')
+  end
 end

data/lib/svcb_rr_patch/svc_params/port.rb

@@ -18,4 +18,9 @@ class SvcbRrPatch::SvcParams::Port
     port = octet.unpack1('n')
     new(port)
   end
+
+  # :nodoc:
+  def to_s
+    @port.to_s
+  end
 end

data/lib/svcb_rr_patch/svc_params.rb

@@ -12,85 +12,109 @@ module SvcbRrPatch::SvcParams
       ipv6hint
     ]
     # rubocop:disable Security/Eval
-    (65280..65535).each do |nnnn|
+    (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
+
+  PARAMETER_REGISTRY_INVERT = lambda {
+    Hash[(0..PARAMETER_REGISTRY.size - 1).zip(PARAMETER_REGISTRY)].invert
+  }.call.freeze
 end
 
 Dir[File.dirname(__FILE__) + '/svc_params/*.rb'].sort.each { |f| require f }
 
 module SvcbRrPatch::SvcParams
-  # @return [String]
-  def self.encode(svc_params)
-    h = Hash[(0..PARAMETER_REGISTRY.size - 1).zip(PARAMETER_REGISTRY)].invert
+  class Hash
+    def initialize(hash)
+      @hash = hash
+    end
 
-    svc_params
-      .map { |k, v| [h[k], v] }
-      .sort { |lh, rh| lh.first <=> rh.first }
-      .map do |k, v|
-        [k].pack('n') + v.encode.then { |s| [s.length].pack('n') + s }
-      end
-      .join
-  end
+    # @return [String]
+    def encode
+      @hash
+        .map { |k, v| [PARAMETER_REGISTRY_INVERT[k], v] }
+        .sort { |lh, rh| lh.first <=> rh.first }
+        .map do |k, v|
+          [k].pack('n') + v.encode.then { |s| [s.length].pack('n') + s }
+        end
+        .join
+    end
+
+    # @param octet [String]
+    #
+    # @return [Hash]
+    def self.decode(octet)
+      svc_params = {}
+      i = 0
+      while i < octet.length
+        raise ::Resolv::DNS::DecodeError if i + 4 > octet.length
 
-  # @param octet [String]
-  #
-  # @return [Hash] Integer => SvcbRrPatch::$Object
-  # rubocop:disable Metrics/AbcSize
-  def self.decode(octet)
-    svc_params = {}
-    i = 0
-    h = Hash[(0..PARAMETER_REGISTRY.size - 1).zip(PARAMETER_REGISTRY)].invert
-    while i < octet.length
-      raise ::Resolv::DNS::DecodeError if i + 4 > octet.length
+        k = octet.slice(i, 2).unpack1('n')
+        # SvcParamKeys SHALL appear in increasing numeric order.
+        raise ::Resolv::DNS::DecodeError unless svc_params.keys.find do |key|
+          PARAMETER_REGISTRY_INVERT[key] >= k
+        end.nil?
 
-      k = octet.slice(i, 2).unpack1('n')
-      # SvcParamKeys SHALL appear in increasing numeric order.
-      raise ::Resolv::DNS::DecodeError \
-        unless svc_params.keys.find { |already| h[already] >= k }.nil?
+        i += 2
+        vlen = octet.slice(i, 2).unpack1('n')
+        i += 2
+        raise ::Resolv::DNS::DecodeError if i + vlen > octet.length
 
-      i += 2
-      vlen = octet.slice(i, 2).unpack1('n')
-      i += 2
-      raise ::Resolv::DNS::DecodeError if i + vlen > octet.length
+        v = octet.slice(i, vlen)
+        i += vlen
+        # Values are in a format specific to the SvcParamKey.
+        svc_param_key = PARAMETER_REGISTRY[k]
+        svc_param_values = decode_svc_params(svc_param_key, v)
+        svc_params.store(svc_param_key, svc_param_values)
+      end
+      raise ::Resolv::DNS::DecodeError if i != octet.length
 
-      v = octet.slice(i, vlen)
-      i += vlen
-      # Values are in a format specific to the SvcParamKey.
-      svc_param_key = PARAMETER_REGISTRY[k]
-      svc_param_values = decode_svc_params(svc_param_key, v)
-      svc_params.store(svc_param_key, svc_param_values)
+      new(svc_params)
     end
-    raise ::Resolv::DNS::DecodeError if i != octet.length
 
-    svc_params
-  end
-  # rubocop:enable Metrics/AbcSize
+    # :nodoc:
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def self.decode_svc_params(key, octet)
+      case key
+      when 'mandatory'
+        Mandatory.decode(octet)
+      when 'alpn'
+        Alpn.decode(octet)
+      when 'no-default-alpn'
+        NoDefaultAlpn.decode(octet)
+      when 'port'
+        Port.decode(octet)
+      when 'ipv4hint'
+        Ipv4hint.decode(octet)
+      when 'ech'
+        Ech.decode(octet)
+      when 'ipv6hint'
+        Ipv6hint.decode(octet)
+      else
+        octet
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+
+    # :nodoc:
+    def [](key)
+      @hash[key]
+    end
+
+    # :nodoc:
+    def keys
+      @hash.keys
+    end
 
-  # :nodoc:
-  # rubocop:disable Metrics/CyclomaticComplexity
-  def self.decode_svc_params(key, octet)
-    case key
-    when 'no name'
-      NoName.decode(octet)
-    when 'alpn'
-      Alpn.decode(octet)
-    when 'no-default-alpn'
-      NoDefaultAlpn.decode(octet)
-    when 'port'
-      Port.decode(octet)
-    when 'ipv4hint'
-      Ipv4hint.decode(octet)
-    when 'ech'
-      Ech.decode(octet)
-    when 'ipv6hint'
-      Ipv6hint.decode(octet)
-    else
-      octet
+    # :nodoc:
+    def to_s
+      @hash.map { |k, v| "#{k}=#{v}" }.join(' ')
     end
   end
-  # rubocop:enable Metrics/CyclomaticComplexity
 end

data/lib/svcb_rr_patch/svcb.rb

@@ -10,9 +10,9 @@ class Resolv::DNS::Resource::IN::SVCB < Resolv::DNS::Resource
 
   # @param svc_priority [Integer]
   # @param target_name [String]
-  # @param svc_params [Map]
+  # @param svc_params [Hash]
   def initialize(svc_priority, target_name, svc_params)
-    # https://tools.ietf.org/html/draft-ietf-dnsop-svcb-https-06
+    # https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-06
     @svc_priority = svc_priority
     @target_name = target_name
     @svc_params = svc_params
@@ -37,7 +37,7 @@ class Resolv::DNS::Resource::IN::SVCB < Resolv::DNS::Resource
   def encode_rdata(msg)
     msg.put_bytes([@svc_priority].pack('n'))
     msg.put_string(@target_name)
-    msg.put_string(::SvcbRrPatch::SvcParams.encode(@svc_params))
+    msg.put_string(@svc_params.encode)
   end
 
   class << self
@@ -48,7 +48,7 @@ class Resolv::DNS::Resource::IN::SVCB < Resolv::DNS::Resource
       return new(svc_priority, target_name, {}) if svc_priority.zero?
 
       # the SvcParams, consuming the remainder of the record
-      svc_params = ::SvcbRrPatch::SvcParams.decode(msg.get_bytes)
+      svc_params = ::SvcbRrPatch::SvcParams::Hash.decode(msg.get_bytes)
       new(svc_priority, target_name, svc_params)
     end
   end

data/lib/svcb_rr_patch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SvcbRrPatch
-  VERSION = '0.0.1'
+  VERSION = '0.0.5'
 end

data/lib/svcb_rr_patch.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'base64'
 require 'resolv'
 
 require 'svcb_rr_patch/version'

data/spec/alpn_spec.rb

@@ -25,6 +25,7 @@ RSpec.describe SvcbRrPatch::SvcParams::Alpn do
 
     it 'could encode' do
       expect(alpn.encode).to eq octet
+      expect(alpn.to_s).to eq 'h3-29,h3-28,h3-27,h2'
     end
   end
 end

data/spec/ipv4hint_spec.rb

@@ -5,7 +5,7 @@ require_relative 'spec_helper'
 
 RSpec.describe SvcbRrPatch::SvcParams::Ipv4hint do
   let(:octet) do
-    "\xc0\xa8\x00\x01\xc0\xa8\x00\x02"
+    "\xc0\x00\x02\x01\xc0\x00\x02\x02"
   end
 
   context '#decode' do
@@ -15,8 +15,8 @@ RSpec.describe SvcbRrPatch::SvcParams::Ipv4hint do
 
     it 'could decode' do
       expect(ipv4hint.addresses).to eq [
-        Resolv::IPv4.create('192.168.0.1'),
-        Resolv::IPv4.create('192.168.0.2')
+        Resolv::IPv4.create('192.0.2.1'),
+        Resolv::IPv4.create('192.0.2.2')
       ]
     end
   end
@@ -25,14 +25,15 @@ RSpec.describe SvcbRrPatch::SvcParams::Ipv4hint do
     let(:ipv4hint) do
       SvcbRrPatch::SvcParams::Ipv4hint.new(
         [
-          Resolv::IPv4.create('192.168.0.1'),
-          Resolv::IPv4.create('192.168.0.2')
+          Resolv::IPv4.create('192.0.2.1'),
+          Resolv::IPv4.create('192.0.2.2')
         ]
       )
     end
 
     it 'could encode' do
       expect(ipv4hint.encode).to eq octet
+      expect(ipv4hint.to_s).to eq '192.0.2.1,192.0.2.2'
     end
   end
 end

data/spec/ipv6hint_spec.rb

@@ -5,7 +5,10 @@ require_relative 'spec_helper'
 
 RSpec.describe SvcbRrPatch::SvcParams::Ipv6hint do
   let(:octet) do
-    "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
+    <<-BIN.split.map(&:hex).map(&:chr).join
+      20 01 0d b8 00 00 00 00     00 00 00 00 00 00 00 01
+      20 01 0d b8 00 00 00 00     00 00 00 00 00 00 00 02
+    BIN
   end
 
   context '#decode' do
@@ -14,20 +17,26 @@ RSpec.describe SvcbRrPatch::SvcParams::Ipv6hint do
     end
 
     it 'could decode' do
-      expect(ipv6hint.addresses)
-        .to eq [Resolv::IPv6.create('101:101:101:101:101:101:101:101')]
+      expect(ipv6hint.addresses).to eq [
+        Resolv::IPv6.create('2001:db8::1'),
+        Resolv::IPv6.create('2001:db8::2')
+      ]
     end
   end
 
   context '#encode' do
     let(:ipv6hint) do
       SvcbRrPatch::SvcParams::Ipv6hint.new(
-        [Resolv::IPv6.create('101:101:101:101:101:101:101:101')]
+        [
+          Resolv::IPv6.create('2001:db8::1'),
+          Resolv::IPv6.create('2001:db8::2')
+        ]
       )
     end
 
     it 'could encode' do
       expect(ipv6hint.encode).to eq octet
+      expect(ipv6hint.to_s).to eq '2001:db8::1,2001:db8::2'
     end
   end
 end

data/spec/mandatory_spec.rb

@@ -5,16 +5,16 @@ require_relative 'spec_helper'
 
 RSpec.describe SvcbRrPatch::SvcParams::Mandatory do
   let(:octet) do
-    "\x00\x05\xff\xa4"
+    "\x00\x05\x00\x06\x00\x08\xff\xa4"
   end
 
   let(:keys) do
-    h = Hash[
-      (0..SvcbRrPatch::SvcParams::PARAMETER_REGISTRY.size - 1)
-        .zip(SvcbRrPatch::SvcParams::PARAMETER_REGISTRY)
-    ].invert
-
-    [h['ech'], h['key65444']]
+    [
+      SvcbRrPatch::SvcParams::PARAMETER_REGISTRY_INVERT['ech'],
+      SvcbRrPatch::SvcParams::PARAMETER_REGISTRY_INVERT['ipv6hint'],
+      SvcbRrPatch::SvcParams::PARAMETER_REGISTRY_INVERT['undefine8'],
+      SvcbRrPatch::SvcParams::PARAMETER_REGISTRY_INVERT['key65444']
+    ]
   end
 
   context '#decode' do
@@ -34,6 +34,7 @@ RSpec.describe SvcbRrPatch::SvcParams::Mandatory do
 
     it 'could encode' do
       expect(mandatory.encode).to eq octet
+      expect(mandatory.to_s).to eq 'ech,ipv6hint,undefine8,key65444'
     end
   end
 end

data/spec/no_default_alpn_spec.rb

@@ -30,6 +30,7 @@ RSpec.describe SvcbRrPatch::SvcParams::NoDefaultAlpn do
       expect(no_default_alpn)
         .to be_a(SvcbRrPatch::SvcParams::NoDefaultAlpn)
       expect(no_default_alpn.encode).to eq octet
+      expect(no_default_alpn.to_s).to eq 'h3-29,h3-28,h3-27,h2'
     end
   end
 end

data/spec/port_spec.rb

@@ -25,6 +25,7 @@ RSpec.describe SvcbRrPatch::SvcParams::Port do
 
     it 'could encode' do
       expect(port.encode).to eq octet
+      expect(port.to_s).to eq '443'
     end
   end
 end

data/spec/svc_params_spec.rb

@@ -8,8 +8,8 @@ RSpec.describe SvcbRrPatch::SvcParams do
     <<-BIN.split.map(&:hex).map(&:chr).join
       00 01 00 15 05 68 33 2d     32 39 05 68 33 2d 32 38
       05 68 33 2d 32 37 02 68     32 00 04 00 08 c0 a8 00
-      01 c0 a8 00 02 00 06 00     10 01 01 01 01 01 01 01
-      01 01 01 01 01 01 01 01     01 ff 35 00 03 01 02 03
+      01 c0 a8 00 02 00 06 00     10 20 01 0d b8 00 00 00
+      00 00 00 00 00 00 00 00     01 ff 35 00 03 01 02 03
     BIN
   end
 
@@ -28,7 +28,7 @@ RSpec.describe SvcbRrPatch::SvcParams do
 
   let(:ipv6hint) do
     SvcbRrPatch::SvcParams::Ipv6hint.new(
-      [Resolv::IPv6.create('101:101:101:101:101:101:101:101')]
+      [Resolv::IPv6.create('2001:db8::1')]
     )
   end
 
@@ -45,7 +45,7 @@ RSpec.describe SvcbRrPatch::SvcParams do
 
   context '#decode' do
     let(:svc_params) do
-      SvcbRrPatch::SvcParams.decode(octet)
+      SvcbRrPatch::SvcParams::Hash.decode(octet)
     end
 
     it 'could decode' do
@@ -60,16 +60,18 @@ RSpec.describe SvcbRrPatch::SvcParams do
 
   context '#encode' do
     let(:svc_params) do
-      {
+      h = {
         'alpn' => alpn,
         'ipv4hint' => ipv4hint,
         'ipv6hint' => ipv6hint,
         'key65333' => key65333
       }
+      SvcbRrPatch::SvcParams::Hash.new(h)
     end
 
     it 'could encode' do
-      expect(SvcbRrPatch::SvcParams.encode(svc_params)).to eq octet
+      expect(svc_params.encode).to eq octet
+      puts svc_params.inspect
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svcb_rr_patch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - thekuwayama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: the patch that adds SVCB Resource Record and HTTPS Resource Record