svcb_rr_patch 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 607172ae2b63afd7c66a3cfe87456873eb1f436c28f0380a52edeeb31d9f3902
-  data.tar.gz: b8a3b83f4820b78fb3efcb27b675a3cf07a58f360fe7d3c3a93fdd7161ced077
+  metadata.gz: c3af5857ef38bc6a54ad9abedb5c1227ea008b56e049393d16277103cba4b823
+  data.tar.gz: 8a9152efcf7694b8e6ace3a2fce298854f4020292b3f880c2ec9da4d19b8f25b
 SHA512:
-  metadata.gz: 7125f6c9205f872a12574801bf5026073cd4d028640afbaefdf2a2ee69f11cc832167d4612341c475605306705af0742bb724fc241f482c85af8fe1e8a4f61d1
-  data.tar.gz: 9217eca73420740086db7877bd5ff05e024ece6f6ecda1ad0d6b30e50cb1966da733b32f3daab8518a1180d25c6a0de1a8c7dab4105e132e186ae21a956e419b
+  metadata.gz: 912e4053675275418be0a343010b56e00e912c42ea20f24c89877f6754ee246231a91884e10ae62756185e0e64fc0c030fcdb019203a038088087e27f0d6c3fc
+  data.tar.gz: d56504d2fc39255d4ed9dc805d478b05054251af35b89384db816d340b1c22e400b531b9bee63865776d05fb550f3ec846eb8b0235412fb357776e6fedc284eb

data/README.md

@@ -36,10 +36,36 @@ 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_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=300>]
+  @ttl=58>]
 ```
 
 

data/lib/svcb_rr_patch/https.rb

@@ -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

@@ -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

@@ -25,7 +25,7 @@ class SvcbRrPatch::SvcParams::Ech
   # 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 inspect
+  def to_s
     Base64.strict_encode64(encode)
   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,85 +12,109 @@ 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 }
 
 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 '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
+    # :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,7 +10,7 @@ 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://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-06
     @svc_priority = svc_priority
@@ -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.4'
+  VERSION = '0.0.5'
 end

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,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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - thekuwayama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler