svcb_rr_patch 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 607172ae2b63afd7c66a3cfe87456873eb1f436c28f0380a52edeeb31d9f3902
-  data.tar.gz: b8a3b83f4820b78fb3efcb27b675a3cf07a58f360fe7d3c3a93fdd7161ced077
+  metadata.gz: 7a695feb098bc9703ae3959c87c0b70ae5818f10b124c2e8ba538ba0e76d4cd0
+  data.tar.gz: 1f8dd380eddbc47c974563508fea1517110c4fd223ae631f9a2a782fd6f51e9c
 SHA512:
-  metadata.gz: 7125f6c9205f872a12574801bf5026073cd4d028640afbaefdf2a2ee69f11cc832167d4612341c475605306705af0742bb724fc241f482c85af8fe1e8a4f61d1
-  data.tar.gz: 9217eca73420740086db7877bd5ff05e024ece6f6ecda1ad0d6b30e50cb1966da733b32f3daab8518a1180d25c6a0de1a8c7dab4105e132e186ae21a956e419b
+  metadata.gz: 004cfdf5b89a512e9c48e4d10d2fca603c8b59f6e8564bd35544b6c0d8915f1c07404d2358f9bd32468ac5cf7f13a1859f0ab9e7ada4e24bb67cc1dbd0da60fa
+  data.tar.gz: b7be41bd51be17ec5737463157fdf1fae4de250dda739c3074bf21931fe97e3589a9b3724400f87a9082f0e7c6c3b5247510f739fad5edf76d9d4a183fb2c64b

data/.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
       - '*'
@@ -13,11 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7.x', '3.0.x']
+        ruby-version: ['2.7.x', '3.0.x', '3.1.x']
     steps:
-      - name: Set up Ruby
-        uses: actions/setup-ruby@v1
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
       - name: Install dependencies
         run: |
           gem --version

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Style/ConditionalAssignment:
   Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+3.1.2

data/Gemfile

@@ -2,12 +2,13 @@
 
 source 'https://rubygems.org'
 
-gem 'rake'
+gem 'ech_config'
 
 group :test do
   gem 'byebug'
-  gem 'rspec', '3.9.0'
-  gem 'rubocop', '0.78.0'
+  gem 'rake'
+  gem 'rspec', '3.11'
+  gem 'rubocop', '1.35'
 end
 
 gemspec

data/README.md

@@ -6,16 +6,16 @@
 
 `svcb_rr_patch` is the patch that adds SVCB Resource Record and HTTPS Resource Record.
 
-- https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-06
+- https://www.ietf.org/archive/id/draft-ietf-dnsop-svcb-https-06.html
 
-`svcb_rr_patch` supports "ech" SvcParamKey that ECHConfig.version is `0xfe0d`.
+`svcb_rr_patch` supports "ech" SvcParamKey that ECHConfig.version is `0xfe0b` ~ `0xfe0f`.
 
-- https://datatracker.ietf.org/doc/html/draft-ietf-tls-esni-13#section-4
+- https://author-tools.ietf.org/iddiff?url2=draft-ietf-tls-esni-11.txt#context-3
 
 
 ## Installation
 
-he gem is available at [rubygems.org](https://rubygems.org/gems/svcb_rr_patch). You can install it the following.
+The gem is available at [rubygems.org](https://rubygems.org/gems/svcb_rr_patch). You can install it the following.
 
 ```sh-session
 $ gem install svcb_rr_patch
@@ -26,20 +26,19 @@ $ gem install svcb_rr_patch
 
 You can resolve HTTPS resources.
 
-```sh-session
+```ruby
 $ 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):002:1* rr = Resolv::DNS.new.getresources(
+irb(main):003:1*   "crypto.cloudflare.com",
 irb(main):004:1*   Resolv::DNS::Resource::IN::HTTPS
 irb(main):005:0> )
 =>
-[#<Resolv::DNS::Resource::IN::HTTPS:0x0000000000000001
-  @svc_params={"alpn"=>h3,h3-29,h3-28,h3-27,h2, "ipv4hint"=>104.18.26.46,104.18.27.46, "ipv6hint"=>2606:4700::6812:1a2e,2606:4700::6812:1b2e},
-  @svc_priority=1,
-  @target_name="",
-  @ttl=300>]
+[#<Resolv::DNS::Resource::IN::HTTPS:0x0000000000000000
+...
+irb(main):006:0> rr.first.svc_params.to_s
+=> "alpn=http/1.1,h2 ipv4hint=162.159.137.85,162.159.138.85 ech=AEb+DQBC4wAgACCaqAJAAhqN4e1k2RSa+rFgJCpJNOapZy5FdQZUN5ITXAAEAAEAAQATY2xvdWRmbGFyZS1lc25pLmNvbQAA ipv6hint=2606:4700:7::a29f:8955,2606:4700:7::a29f:8a55"
 ```
 
 

data/lib/svcb_rr_patch/https.rb

@@ -8,11 +8,6 @@ class Resolv::DNS::Resource::IN::HTTPS < Resolv::DNS::Resource::IN::SVCB
   ClassValue = IN::ClassValue
   ClassHash[[TypeValue, ClassValue]] = self
 
-  def initialize(svc_priority, target_name, svc_params)
-    # https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-06
-    super(svc_priority, target_name, svc_params)
-  end
-
   class << self
     # :nodoc:
     def decode_rdata(msg)
@@ -21,7 +16,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

@@ -37,7 +37,7 @@ class SvcbRrPatch::SvcParams::Alpn
   end
 
   # :nodoc:
-  def inspect
+  def to_s
     @protocols.join(',')
   end
 end

data/lib/svcb_rr_patch/svc_params/ech.rb

@@ -18,56 +18,19 @@ class SvcbRrPatch::SvcParams::Ech
     raise ::Resolv::DNS::DecodeError \
       unless octet.length == octet.slice(0, 2).unpack1('n') + 2
 
-    echconfiglist = ECHConfig.decode_vectors(octet.slice(2..))
+    begin
+      echconfiglist = ::ECHConfig.decode_vectors(octet.slice(2..))
+    rescue ::ECHConfig::Error
+      raise ::Resolv::DNS::DecodeError
+    end
+
     new(echconfiglist)
   end
 
-  # https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-06#section-9
+  # https://www.ietf.org/archive/id/draft-ietf-dnsop-svcb-https-06.html#section-9
   # In presentation format, the value is a single ECHConfigList encoded in
   # Base64.
-  def inspect
+  def to_s
     Base64.strict_encode64(encode)
   end
 end
-
-require_relative 'ech/echconfig_contents'
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfig
-  attr_reader :version
-  attr_reader :echconfigcontents
-
-  ECHConfigContents = ::SvcbRrPatch::SvcParams::Ech::ECHConfigContents
-
-  # @param version [String]
-  # @param echconfig_contents [ECHConfigContents]
-  def initialize(version, echconfig_contents)
-    @version = version
-    @echconfig_contents = echconfig_contents
-  end
-
-  # @return [String]
-  def encode
-    @version + @echconfig_contents.encode.then { |s| [s.length].pack('n') + s }
-  end
-
-  # @return [Array of ECHConfig]
-  def self.decode_vectors(octet)
-    i = 0
-    echconfigs = []
-    while i < octet.length
-      raise ::Resolv::DNS::DecodeError if i + 4 > octet.length
-
-      version = octet.slice(i, 2)
-      length = octet.slice(i + 2, 2).unpack1('n')
-      i += 4
-      raise ::Resolv::DNS::DecodeError if i + length > octet.length
-
-      echconfig_contents = ECHConfigContents.decode(octet.slice(i, length))
-      i += length
-      echconfigs << new(version, echconfig_contents)
-    end
-    raise ::Resolv::DNS::DecodeError if i != octet.length
-
-    echconfigs
-  end
-end

data/lib/svcb_rr_patch/svc_params/ipv4hint.rb

@@ -20,7 +20,7 @@ class SvcbRrPatch::SvcParams::Ipv4hint
   end
 
   # :nodoc:
-  def inspect
+  def to_s
     @addresses.join(',')
   end
 end

data/lib/svcb_rr_patch/svc_params/ipv6hint.rb

@@ -20,7 +20,7 @@ class SvcbRrPatch::SvcParams::Ipv6hint
   end
 
   # :nodoc:
-  def inspect
+  def to_s
     @addresses.join(',')
   end
 end

data/lib/svcb_rr_patch/svc_params/mandatory.rb

@@ -17,18 +17,12 @@ class SvcbRrPatch::SvcParams::Mandatory
   def self.decode(octet)
     keys = octet.scan(/.{1,2}/)
                 .map { |s| s.unpack1('n') }
-                .filter { |i| i < 7 || i >= 65280 && i < 65535 }
     new(keys)
   end
 
   # :nodoc:
-  def inspect
-    @keys.map do |i|
-      if i < 7 || i >= 65280 && i < 65535
-        SvcbRrPatch::SvcParams::PARAMETER_REGISTRY[i]
-      else
-        ''
-      end
-    end.join(',')
+  def to_s
+    @keys.map { |i| SvcbRrPatch::SvcParams::PARAMETER_REGISTRY[i] }
+         .join(',')
   end
 end

data/lib/svcb_rr_patch/svc_params/port.rb

@@ -20,7 +20,7 @@ class SvcbRrPatch::SvcParams::Port
   end
 
   # :nodoc:
-  def inspect
+  def to_s
     @port.to_s
   end
 end

data/lib/svcb_rr_patch/svc_params.rb

@@ -12,23 +12,32 @@ module SvcbRrPatch::SvcParams
       ipv6hint
     ]
     # 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
+
+  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 }
+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 SvcbRrPatch::SvcParams::Hash
+  def initialize(hash)
+    @hash = hash
+  end
 
-    svc_params
-      .map { |k, v| [h[k], v] }
+  # @return [String]
+  def encode
+    @hash
+      .map { |k, v| [SvcbRrPatch::SvcParams::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 }
@@ -38,19 +47,18 @@ module SvcbRrPatch::SvcParams
 
   # @param octet [String]
   #
-  # @return [Hash] Integer => SvcbRrPatch::$Object
-  # rubocop:disable Metrics/AbcSize
+  # @return [Hash]
   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 { |already| h[already] >= k }.nil?
+      raise ::Resolv::DNS::DecodeError unless svc_params.keys.find do |key|
+        SvcbRrPatch::SvcParams::PARAMETER_REGISTRY_INVERT[key] >= k
+      end.nil?
 
       i += 2
       vlen = octet.slice(i, 2).unpack1('n')
@@ -60,37 +68,51 @@ module SvcbRrPatch::SvcParams
       v = octet.slice(i, vlen)
       i += vlen
       # Values are in a format specific to the SvcParamKey.
-      svc_param_key = PARAMETER_REGISTRY[k]
+      svc_param_key = SvcbRrPatch::SvcParams::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
 
-    svc_params
+    new(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)
+      SvcbRrPatch::SvcParams::Mandatory.decode(octet)
     when 'alpn'
-      Alpn.decode(octet)
+      SvcbRrPatch::SvcParams::Alpn.decode(octet)
     when 'no-default-alpn'
-      NoDefaultAlpn.decode(octet)
+      SvcbRrPatch::SvcParams::NoDefaultAlpn.decode(octet)
     when 'port'
-      Port.decode(octet)
+      SvcbRrPatch::SvcParams::Port.decode(octet)
     when 'ipv4hint'
-      Ipv4hint.decode(octet)
+      SvcbRrPatch::SvcParams::Ipv4hint.decode(octet)
     when 'ech'
-      Ech.decode(octet)
+      SvcbRrPatch::SvcParams::Ech.decode(octet)
     when 'ipv6hint'
-      Ipv6hint.decode(octet)
+      SvcbRrPatch::SvcParams::Ipv6hint.decode(octet)
     else
       octet
     end
   end
   # rubocop:enable Metrics/CyclomaticComplexity
+
+  # :nodoc:
+  def [](key)
+    @hash[key]
+  end
+
+  # :nodoc:
+  def keys
+    @hash.keys
+  end
+
+  # :nodoc:
+  def to_s
+    @hash.map { |k, v| "#{k}=#{v}" }.join(' ')
+  end
 end

data/lib/svcb_rr_patch/svcb.rb

@@ -10,34 +10,32 @@ 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]
+  # rubocop: disable Lint/MissingSuper
   def initialize(svc_priority, target_name, svc_params)
-    # https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-06
+    # https://www.ietf.org/archive/id/draft-ietf-dnsop-svcb-https-06.html
     @svc_priority = svc_priority
     @target_name = target_name
     @svc_params = svc_params
   end
+  # rubocop: enable Lint/MissingSuper
 
   ##
   # SvcPriority
 
-  attr_reader :svc_priority
+  attr_reader :svc_priority, :target_name, :svc_params
 
   ##
   # TargetName
 
-  attr_reader :target_name
-
   ##
   # SvcParams
 
-  attr_reader :svc_params
-
   # :nodoc:
   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 +46,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.4'
+  VERSION = '0.0.6'
 end

data/lib/svcb_rr_patch.rb

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

data/spec/alpn_spec.rb

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

data/spec/ipv4hint_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe SvcbRrPatch::SvcParams::Ipv4hint do
 
     it 'could encode' do
       expect(ipv4hint.encode).to eq octet
-      expect(ipv4hint.inspect).to eq '192.0.2.1,192.0.2.2'
+      expect(ipv4hint.to_s).to eq '192.0.2.1,192.0.2.2'
     end
   end
 end

data/spec/ipv6hint_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe SvcbRrPatch::SvcParams::Ipv6hint do
 
     it 'could encode' do
       expect(ipv6hint.encode).to eq octet
-      expect(ipv6hint.inspect).to eq '2001:db8::1,2001:db8::2'
+      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\x00\x06\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['ipv6hint'], 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,7 +34,7 @@ RSpec.describe SvcbRrPatch::SvcParams::Mandatory do
 
     it 'could encode' do
       expect(mandatory.encode).to eq octet
-      expect(mandatory.inspect).to eq 'ech,ipv6hint,key65444'
+      expect(mandatory.to_s).to eq 'ech,ipv6hint,undefine8,key65444'
     end
   end
 end

data/spec/no_default_alpn_spec.rb

@@ -30,7 +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.inspect).to eq 'h3-29,h3-28,h3-27,h2'
+      expect(no_default_alpn.to_s).to eq 'h3-29,h3-28,h3-27,h2'
     end
   end
 end

data/spec/port_spec.rb

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

data/spec/svc_params_spec.rb

@@ -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,17 @@ 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
     end
   end
 end

data/svcb_rr_patch.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/thekuwayama/svcb_rr_patch'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>=2.6.0'
+  spec.required_ruby_version = '>=2.7.0'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
+  spec.add_dependency 'ech_config'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svcb_rr_patch
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - thekuwayama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ech_config
+  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'
 description: the patch that adds SVCB Resource Record and HTTPS Resource Record
 email:
 - thekuwayama@gmail.com
@@ -34,6 +48,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -43,14 +58,6 @@ files:
 - lib/svcb_rr_patch/svc_params.rb
 - lib/svcb_rr_patch/svc_params/alpn.rb
 - lib/svcb_rr_patch/svc_params/ech.rb
-- lib/svcb_rr_patch/svc_params/ech/echconfig_contents.rb
-- lib/svcb_rr_patch/svc_params/ech/echconfig_contents/extension.rb
-- lib/svcb_rr_patch/svc_params/ech/echconfig_contents/hpke_key_config.rb
-- lib/svcb_rr_patch/svc_params/ech/echconfig_contents/hpke_key_config/hpke_kem_id.rb
-- lib/svcb_rr_patch/svc_params/ech/echconfig_contents/hpke_key_config/hpke_public_key.rb
-- lib/svcb_rr_patch/svc_params/ech/echconfig_contents/hpke_key_config/hpke_symmetric_cipher_suite.rb
-- lib/svcb_rr_patch/svc_params/ech/echconfig_contents/hpke_key_config/hpke_symmetric_cipher_suite/hpke_aead_id.rb
-- lib/svcb_rr_patch/svc_params/ech/echconfig_contents/hpke_key_config/hpke_symmetric_cipher_suite/hpke_kdf_id.rb
 - lib/svcb_rr_patch/svc_params/ipv4hint.rb
 - lib/svcb_rr_patch/svc_params/ipv6hint.rb
 - lib/svcb_rr_patch/svc_params/mandatory.rb
@@ -79,14 +86,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: the patch that adds SVCB Resource Record and HTTPS Resource Record

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

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents::Extension
-  attr_reader :octet
-
-  # @param octet [String]
-  def initialize(octet)
-    @octet = octet # TODO
-  end
-
-  # @return [String]
-  def encode
-    @octet # TODO
-  end
-
-  # @return [Array of Extension]
-  def self.decode_vectors(octet)
-    i = 0
-    extensions = []
-    while i < octet.length
-      raise ::Resolv::DNS::DecodeError if i + 4 > octet.length
-
-      ex_len = octet.slice(i + 2, 2)
-      i += 4
-      raise ::Resolv::DNS::DecodeError if i + ex_len > octet.length
-
-      extensions << new(octet.slice(i, ex_len)) # TODO
-      i += ex_len
-    end
-    raise ::Resolv::DNS::DecodeError if i != octet.length
-
-    extensions
-  end
-end

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkeKemId
-  attr_reader :uint16
-
-  # @param uint16 [Integer]
-  def initialize(uint16)
-    @uint16 = uint16
-  end
-
-  # @return [String]
-  def encode
-    [@uint16].pack('n')
-  end
-
-  # :nodoc
-  def self.decode(octet)
-    raise ::Resolv::DNS::DecodeError if octet.length != 2
-
-    new(octet.unpack1('n'))
-  end
-end

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

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkePublicKey # rubocop:disable Layout/LineLength
-  attr_reader :opaque
-
-  # @param opaque [String]
-  def initialize(opaque)
-    @opaque = opaque
-  end
-
-  # @return [String]
-  def encode
-    @opaque.then { |s| [s.length].pack('n') + s }
-  end
-
-  # :nodoc
-  def self.decode(octet)
-    new(octet)
-  end
-end

data/lib/svcb_rr_patch/svc_params/ech/echconfig_contents/hpke_key_config/hpke_symmetric_cipher_suite/hpke_aead_id.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeAeadId # rubocop:disable Layout/LineLength
-  attr_reader :uint16
-
-  # @param uint16 [Integer]
-  def initialize(uint16)
-    @uint16 = uint16
-  end
-
-  # @return [String]
-  def encode
-    [@uint16].pack('n')
-  end
-
-  # :nodoc
-  def self.decode(octet)
-    raise ::Resolv::DNS::DecodeError if octet.length != 2
-
-    new(octet.unpack1('n'))
-  end
-end

data/lib/svcb_rr_patch/svc_params/ech/echconfig_contents/hpke_key_config/hpke_symmetric_cipher_suite/hpke_kdf_id.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeKdfId # rubocop:disable Layout/LineLength
-  attr_reader :uint16
-
-  # @param uint16 [Integer]
-  def initialize(uint16)
-    @uint16 = uint16
-  end
-
-  # @return [String]
-  def encode
-    [@uint16].pack('n')
-  end
-
-  # :nodoc
-  def self.decode(octet)
-    raise ::Resolv::DNS::DecodeError if octet.length != 2
-
-    new(octet.unpack1('n'))
-  end
-end

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

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite # rubocop:disable Layout/LineLength
-  # define class
-end
-
-Dir[File.dirname(__FILE__) + '/hpke_symmetric_cipher_suite/*.rb']
-  .sort.each { |f| require f }
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite # rubocop:disable Layout/LineLength
-  attr_reader :kdf_id
-  attr_reader :aead_id
-
-  # @param kdf_id [HpkeKdfId]
-  # @param aead_id [HpkeAeadId]
-  def initialize(kdf_id, aead_id)
-    @kdf_id = kdf_id
-    @aead_id = aead_id
-  end
-
-  # @return [String]
-  def encode
-    @kdf_id.encode + @aead_id.encode
-  end
-
-  # @return [Array of HpkeSymmetricCipherSuite]
-  def self.decode_vectors(octet)
-    i = 0
-    cipher_suites = []
-    while i < octet.length
-      raise ::Resolv::DNS::DecodeError if i + 4 > octet.length
-
-      kdf_id = HpkeKdfId.decode(octet.slice(i, 2))
-      aead_id = HpkeAeadId.decode(octet.slice(i + 2, 2))
-      i += 4
-      cipher_suites << new(kdf_id, aead_id)
-    end
-
-    cipher_suites
-  end
-end

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

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig
-  # define class
-end
-
-Dir[File.dirname(__FILE__) + '/hpke_key_config/*.rb']
-  .sort.each { |f| require f }
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents::HpkeKeyConfig
-  attr_reader :config_id
-  attr_reader :kem_id
-  attr_reader :public_key
-  attr_reader :cipher_suites
-
-  # @param config_id [Integer]
-  # @param kem_id [HpkeKemId]
-  # @param public_key [HpkePublicKey]
-  # @param cipher_suites [Array of HpkeSymmetricCipherSuite]
-  def initialize(config_id,
-                 kem_id,
-                 public_key,
-                 cipher_suites)
-    @config_id = config_id
-    @kem_id = kem_id
-    @public_key = public_key
-    @cipher_suites = cipher_suites
-  end
-
-  # @return [String]
-  def encode
-    [@config_id].pack('C') \
-    + @kem_id.encode \
-    + @public_key.encode \
-    + @cipher_suites.map(&:encode).join.then { |s| [s.length].pack('n') + s }
-  end
-
-  # :nodoc
-  # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/CyclomaticComplexity
-  def self.decode(octet)
-    raise ::Resolv::DNS::DecodeError if octet.empty?
-
-    config_id = octet.slice(0, 1).unpack1('C')
-    i = 1
-    raise ::Resolv::DNS::DecodeError if i + 2 > octet.length
-
-    kem_id = HpkeKemId.decode(octet.slice(i, 2))
-    i += 2
-    raise ::Resolv::DNS::DecodeError if i + 2 > octet.length
-
-    pk_len = octet.slice(i, 2).unpack1('n')
-    i += 2
-    raise ::Resolv::DNS::DecodeError if i + pk_len > octet.length
-
-    public_key = HpkePublicKey.decode(octet.slice(i, pk_len))
-    i += pk_len
-    raise ::Resolv::DNS::DecodeError if i + 2 > octet.length
-
-    cs_len = octet.slice(i, 2).unpack1('n')
-    i += 2
-    raise ::Resolv::DNS::DecodeError if i + 2 > octet.length
-
-    cs_bin = octet.slice(i, cs_len)
-    i += cs_len
-    cipher_suites = HpkeSymmetricCipherSuite.decode_vectors(cs_bin)
-    hpke_key_config = new(
-      config_id,
-      kem_id,
-      public_key,
-      cipher_suites
-    )
-    [hpke_key_config, octet[i..]]
-  end
-  # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/CyclomaticComplexity
-end

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

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents
-  # define class
-end
-
-Dir[File.dirname(__FILE__) + '/echconfig_contents/*.rb']
-  .sort.each { |f| require f }
-
-class SvcbRrPatch::SvcParams::Ech::ECHConfigContents
-  attr_reader :key_config
-  attr_reader :maximum_name_length
-  attr_reader :public_name
-  attr_reader :extensions
-
-  # @param key_config [HpkeKeyConfig]
-  # @param maximum_name_length [Integer]
-  # @param public_name [String]
-  # @param extensions [Array of Extension]
-  def initialize(key_config,
-                 maximum_name_length,
-                 public_name,
-                 extensions)
-    @key_config = key_config
-    @maximum_name_length = maximum_name_length
-    @public_name = public_name
-    @extensions = extensions
-  end
-
-  # @return [String]
-  def encode
-    @key_config.encode \
-    + [@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
-  def self.decode(octet)
-    key_config, octet = HpkeKeyConfig.decode(octet)
-    raise ::Resolv::DNS::DecodeError if octet.length < 2
-
-    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 + pn_len > octet.length
-
-    public_name = octet.slice(i, pn_len)
-    i += pn_len
-    raise ::Resolv::DNS::DecodeError if i + 2 > octet.length
-
-    ex_len = octet.slice(i, 2).unpack1('n')
-    i += 2
-    raise ::Resolv::DNS::DecodeError if i + ex_len > octet.length
-
-    extensions = Extension.decode_vectors(octet.slice(i, ex_len))
-    i += ex_len
-    raise ::Resolv::DNS::DecodeError if i != octet.length
-
-    new(
-      key_config,
-      maximum_name_length,
-      public_name,
-      extensions
-    )
-  end
-  # rubocop:enable Metrics/AbcSize
-end