svcb_rr_patch 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 503344cf96161251cbd1d4757b83f88c801cc2dd759a65c565d6ced4ee5c7821
-  data.tar.gz: a7c0ed560ab69ce745d24488c0a9d9cf05cafb022daa4bda9ac02e0aa3f9bc23
+  metadata.gz: 607172ae2b63afd7c66a3cfe87456873eb1f436c28f0380a52edeeb31d9f3902
+  data.tar.gz: b8a3b83f4820b78fb3efcb27b675a3cf07a58f360fe7d3c3a93fdd7161ced077
 SHA512:
-  metadata.gz: 65d4ae23c0a139f3572330d4b7965209c25c1842fd0af6ea9fd404748359ab3f24f632ca873e63469728bf7d3c6ade8b21dbf57a2c3387fdb69ef85157d73965
-  data.tar.gz: 127393d4ceb5f7afc7e1ec48baefb850c6cad8eca6c26f7baef1818ba1dcfdb01c8dd6fdc7f23f3aefb7ca1aa5edfb3b7ae5b2d11674785051d8c189dc4b611f
+  metadata.gz: 7125f6c9205f872a12574801bf5026073cd4d028640afbaefdf2a2ee69f11cc832167d4612341c475605306705af0742bb724fc241f482c85af8fe1e8a4f61d1
+  data.tar.gz: 9217eca73420740086db7877bd5ff05e024ece6f6ecda1ad0d6b30e50cb1966da733b32f3daab8518a1180d25c6a0de1a8c7dab4105e132e186ae21a956e419b

data/README.md

@@ -36,16 +36,7 @@ irb(main):004:1*   Resolv::DNS::Resource::IN::HTTPS
 irb(main):005:0> )
 =>
 [#<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_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>]

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 inspect
+    @protocols.join(',')
+  end
 end

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 inspect
+    @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 inspect
+    @addresses.join(',')
+  end
 end

data/lib/svcb_rr_patch/svc_params/mandatory.rb

@@ -15,7 +15,20 @@ 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') }
+                .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(',')
+  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 inspect
+    @port.to_s
+  end
 end

data/lib/svcb_rr_patch/svc_params.rb

@@ -12,7 +12,7 @@ module SvcbRrPatch::SvcParams
       ipv6hint
     ]
     # rubocop:disable Security/Eval
-    (65280..65535).each do |nnnn|
+    (65280...65535).each do |nnnn|
       eval "registry[nnnn] = \"key#{nnnn}\"", binding, __FILE__, __LINE__
     end
     # rubocop:enable Security/Eval
@@ -74,8 +74,8 @@ module SvcbRrPatch::SvcParams
   # rubocop:disable Metrics/CyclomaticComplexity
   def self.decode_svc_params(key, octet)
     case key
-    when 'no name'
-      NoName.decode(octet)
+    when 'mandatory'
+      Mandatory.decode(octet)
     when 'alpn'
       Alpn.decode(octet)
     when 'no-default-alpn'

data/lib/svcb_rr_patch/version.rb

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

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.inspect).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.inspect).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.inspect).to eq '2001:db8::1,2001:db8::2'
     end
   end
 end

data/spec/mandatory_spec.rb

@@ -5,7 +5,7 @@ require_relative 'spec_helper'
 
 RSpec.describe SvcbRrPatch::SvcParams::Mandatory do
   let(:octet) do
-    "\x00\x05\xff\xa4"
+    "\x00\x05\x00\x06\xff\xa4"
   end
 
   let(:keys) do
@@ -14,7 +14,7 @@ RSpec.describe SvcbRrPatch::SvcParams::Mandatory do
         .zip(SvcbRrPatch::SvcParams::PARAMETER_REGISTRY)
     ].invert
 
-    [h['ech'], h['key65444']]
+    [h['ech'], h['ipv6hint'], h['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.inspect).to eq 'ech,ipv6hint,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.inspect).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.inspect).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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svcb_rr_patch
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - thekuwayama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler