ddig 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5f4f760504764961fc5ed63cf451342c21363dda09f7019b069b39b07f1f285
-  data.tar.gz: ea12f744a8ece727434e35109a4bbc47432e758aa9a316ed5e6188e87782b44d
+  metadata.gz: 58620e2fc9231b199356c668368c0af0b2b74a9bd6f081eaa6a0332794afe42c
+  data.tar.gz: 027a30588c369ecc5ee419f3821b3d2cef9aff5c27ced47227aba3384adba1bd
 SHA512:
-  metadata.gz: 2a6ee4074192640bd558b7b8bb01667f870e96f76ce7be977278eceeeb9898e209a20fb8ad629ec17d315848e2b36d94cf4efd775735e4a57f792120b17e1779
-  data.tar.gz: 21fefdd3bad1ad544b33c7e02c9dfd1a27dbe2b2791c8a552e701ef403ad915d3c98cc39e42f9ae2219f71fa175310d917fbb1b2b0d3cd7fe2fed04fbf0d9a1d
+  metadata.gz: 58c9a6c611f8b68461d0bbfdd5d41f8ea9a3cd5ddf3d748c531f0e4c287b4bee2030ad977b9c4cc5b980011db6cf44efb85a63cbbb978435bed9890d36073dda
+  data.tar.gz: ae0f8a828569c64d6d7faefea81d7ab633a1691a8011a4d12e575c3e963d7fc1431c21e3bebdf18a3d8f01f808836011cf8b7444c91a437117da39f13cb2636b

data/lib/ddig/cli.rb

@@ -27,7 +27,7 @@ module Ddig
         opts.on("--udp", "use resolve type of udp(do53)") { |v| @options[:dns_type] = 'do53' }
         opts.on("--dot", "use resolve type of dot") { |v| @options[:dns_type] = 'dot' }
         opts.on("--doh-h1", "use resolve type of doh (http/1.1)") { |v| @options[:dns_type] = 'doh_h1' }
-        opts.on("--doh-path=doh-path", "doh service path") { |v| @options[:doh_path] = v }
+        opts.on("--doh-path=doh-path", "doh service path (default: /dns-query{?dns})") { |v| @options[:doh_path] = v }
         opts.on("--ddr", "discover designated resolvers via ddr (discovery of designated resolvers)") { |v| @options[:ddr] = v }
         opts.on("-4", "--ipv4", "use IPv4 query transport only") { |v| @options[:ipv4] = v }
         opts.on("-6", "--ipv6", "use IPv6 query transport only") { |v| @options[:ipv6] = v }
@@ -132,8 +132,7 @@ module Ddig
 
     def resolve_doh_h1
       if @options[:nameserver].nil? || @options[:doh_path].nil?
-        puts 'ddig: doh needs option of --doh-path=doh-path'
-        exit
+        @options[:doh_path] = '/dns-query{?dns}'
       end
 
       doh = Ddig::Resolver::DohH1.new(hostname: @hostname, server: @options[:nameserver], dohpath: @options[:doh_path], port: @options[:port]).lookup

data/lib/ddig/ddr/designated_resolver.rb

@@ -8,6 +8,13 @@ module Ddig
       attr_reader :hostname, :a, :aaaa, :resolver, :errors
 
       PROTOCOLS = ['http/1.1', 'h2', 'h3', 'dot', 'doq']
+      # Reserved ALPN
+      # https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids
+      IGNORE_PROTOCOLS = [
+        "\u001A\u001A",  "\u002A\u002A",  "\u003A\u003A",  "\u004A\u004A",  "\u005A\u005A",
+        "\u006A\u006A",  "\u007A\u007A",  "\u008A\u008A",  "\u009A\u009A",  "\u00AA\u00AA",
+        "\u00BA\u00BA",  "\u00CA\u00CA",  "\u00DA\u00DA",  "\u00EA\u00EA",  "\u00FA\u00FA"
+      ] # '**', '::', 'JJ', 'ZZ', 'jj', 'zz'
 
       def initialize(unencrypted_resolver:, target:, protocol: nil, port: nil, dohpath: nil, address: nil, ip: nil)
         @target = target
@@ -17,10 +24,16 @@ module Ddig
         @dohpath = dohpath
         @address = address
         @ip = ip
+        @errors = []
 
         # check protocol
         unless PROTOCOLS.include?(@protocol)
-          raise Error.new("Not Supportted Protocol (protocol: #{@protocol}). Suported protocol is #{PROTOCOLS.join(' / ')}")
+          if IGNORE_PROTOCOLS.include?(@protocol)
+            @errors << "Skip the protocol (protocol: #{@protocol}), as it is a reserved value in ALPN."
+          else
+            @errors << "Not Supportted Protocol (protocol: #{@protocol}). Suported protocol is #{PROTOCOLS.join(' / ')}"
+            puts "#{@errors.join('\n')}"
+          end
         end
 
         if @port.nil?
@@ -35,7 +48,6 @@ module Ddig
 
       def lookup(hostname)
         @hostname = hostname
-        @errors = []
 
         case @protocol
         when 'dot'
@@ -85,6 +97,11 @@ module Ddig
       end
 
       def to_cli
+        if @resolver.nil?
+          puts "# #{@errors.join('\n# ')}"
+          return
+        end
+
         @resolver.to_cli
       end
 

data/lib/ddig/ddr.rb

@@ -73,13 +73,19 @@ module Ddig
             unless do53_v4.nil? || do53_v4.a.nil?
               do53_v4.a.each do |address|
                 designated_resolver = ::Ddig::Ddr::DesignatedResolver.new(unencrypted_resolver: unencrypted_resolver, target: target, protocol: protocol, port: port, dohpath: dohpath, address: address.to_s, ip: :ipv4)
-                @designated_resolvers << designated_resolver
+
+                if designated_resolver.errors.count.zero?
+                  @designated_resolvers << designated_resolver
+                end
               end
             end
             unless do53_v6.nil? || do53_v6.a.nil?
               do53_v6.a.each do |address|
                 designated_resolver = ::Ddig::Ddr::DesignatedResolver.new(unencrypted_resolver: unencrypted_resolver, target: target, protocol: protocol, port: port, dohpath: dohpath, address: address.to_s, ip: :ipv4)
-                @designated_resolvers << designated_resolver
+
+                if designated_resolver.errors.count.zero?
+                  @designated_resolvers << designated_resolver
+                end
               end
             end
           end
@@ -89,13 +95,19 @@ module Ddig
             unless do53_v4.nil? || do53_v4.aaaa.nil?
               do53_v4.aaaa.each do |address|
                 designated_resolver = ::Ddig::Ddr::DesignatedResolver.new(unencrypted_resolver: unencrypted_resolver, target: target, protocol: protocol, port: port, dohpath: dohpath, address: address.to_s, ip: :ipv6)
-                @designated_resolvers << designated_resolver
+
+                if designated_resolver.errors.count.zero?
+                  @designated_resolvers << designated_resolver
+                end
               end
             end
             unless do53_v6.nil? || do53_v6.aaaa.nil?
               do53_v6.aaaa.each do |address|
                 designated_resolver = ::Ddig::Ddr::DesignatedResolver.new(unencrypted_resolver: unencrypted_resolver, target: target, protocol: protocol, port: port, dohpath: dohpath, address: address.to_s, ip: :ipv6)
-                @designated_resolvers << designated_resolver
+
+                if designated_resolver.errors.count.zero?
+                  @designated_resolvers << designated_resolver
+                end
               end
             end
           end
@@ -105,7 +117,10 @@ module Ddig
             ipv4hint.each do |address|
               ip = :ipv4
               designated_resolver = ::Ddig::Ddr::DesignatedResolver.new(unencrypted_resolver: unencrypted_resolver, target: target, protocol: protocol, port: port, dohpath: dohpath, address: address.to_s, ip: ip)
-              @designated_resolvers << designated_resolver
+
+                if designated_resolver.errors.count.zero?
+                  @designated_resolvers << designated_resolver
+                end
             end
           end
 
@@ -114,7 +129,10 @@ module Ddig
             ipv6hint.each do |address|
               ip = :ipv6
               designated_resolver = ::Ddig::Ddr::DesignatedResolver.new(unencrypted_resolver: unencrypted_resolver, target: target, protocol: protocol, port: port, dohpath: dohpath, address: address.to_s, ip: ip)
-              @designated_resolvers << designated_resolver
+
+              if designated_resolver.errors.count.zero?
+                @designated_resolvers << designated_resolver
+              end
             end
           end
         end

data/lib/ddig/resolver/doh_h1.rb

@@ -12,7 +12,7 @@ module Ddig
       attr_reader :hostname, :server, :address, :dohpath, :port
       attr_reader :a, :aaaa
 
-      def initialize(hostname:, server:, address: nil, dohpath:, port: 443)
+      def initialize(hostname:, server:, address: nil, dohpath: '/dns-query{?dns}', port: 443)
         @hostname = hostname
         @server = server
         @address = address

data/lib/ddig/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ddig
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ddig
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Taketo Takashima
 bindir: exe
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resolv