svcb_rr_patch 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ebef813aa54947f773ae2725fccfa9ba030bc17f42890fcfd184ad0e7a186fd
-  data.tar.gz: b2b7b03a69be23a0b2d5b935f668d24b178a066a716d676d668679b119b7a363
+  metadata.gz: 503344cf96161251cbd1d4757b83f88c801cc2dd759a65c565d6ced4ee5c7821
+  data.tar.gz: a7c0ed560ab69ce745d24488c0a9d9cf05cafb022daa4bda9ac02e0aa3f9bc23
 SHA512:
-  metadata.gz: d1f8d9d0fea71fa10c4f0b316b85122d5fd58a7798fead763de346576dc4f0e599c3073f7d2b409b5d065686aa2da2c4032858c2f3ba27ca5edbf801118d82c2
-  data.tar.gz: 7e382bbbb79bda402a5fa3694b3e90f1e039789ee4328336cb0448970ab42c6b2db6f0b546487b947d963afc40cc09d08382cff9c796e130f60f64dbac181b27
+  metadata.gz: 65d4ae23c0a139f3572330d4b7965209c25c1842fd0af6ea9fd404748359ab3f24f632ca873e63469728bf7d3c6ade8b21dbf57a2c3387fdb69ef85157d73965
+  data.tar.gz: 127393d4ceb5f7afc7e1ec48baefb850c6cad8eca6c26f7baef1818ba1dcfdb01c8dd6fdc7f23f3aefb7ca1aa5edfb3b7ae5b2d11674785051d8c189dc4b611f

data/README.md

@@ -8,16 +8,16 @@
 
 - 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,7 +26,7 @@ $ gem install svcb_rr_patch
 
 You can resolve HTTPS resources.
 
-```bash
+```sh-session
 $ irb
 irb(main):001:0> require 'svcb_rr_patch'
 => true
@@ -34,7 +34,21 @@ 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> )
-=> [#<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>]
+=>
+[#<Resolv::DNS::Resource::IN::HTTPS:0x0000000000000001
+  @svc_params=
+   {"alpn"=>
+     #<SvcbRrPatch::SvcParams::Alpn:0x0000000000000002
+      @protocols=["h3", "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>]>},
+  @svc_priority=1,
+  @target_name="",
+  @ttl=300>]
 ```
 
 

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
 

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/svcb.rb

@@ -12,7 +12,7 @@ class Resolv::DNS::Resource::IN::SVCB < Resolv::DNS::Resource
   # @param target_name [String]
   # @param svc_params [Map]
   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

data/lib/svcb_rr_patch/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svcb_rr_patch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - thekuwayama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-09-04 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.24
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: the patch that adds SVCB Resource Record and HTTPS Resource Record