ddig 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1a65973ea90a0410cf7c2bd8846431d1b46f6bfec521cde944deba86c83effc
-  data.tar.gz: 4eaf90cdfabfe53095f4a5f4ca5f034b0d79296e0ff64da53a00cd4c71de6d04
+  metadata.gz: a776d193cef1eb47509ef1979fe17267088c418c89320e1f6db61da04e8d5f4c
+  data.tar.gz: 463dc9f0efa82b6b1bde2e7641fe2fe866b470faae033fbadd8eadca72479a81
 SHA512:
-  metadata.gz: 675a844c854c9bb5d63cac33742cc88e7a712356b41dc1fd61c4a646112ee1080a887218b3f8a6c949c0277c2d7f01851d1f30f3258138c2a57c467f4570c448
-  data.tar.gz: bdf9aa4945b93c190716a5809829cc11e2fd58584d0620b48f0793ae5085b3cb5e77b6f0cac2c28303f2dbb3e1c988e3b5f989f80de49049cb6fe5d3420212a8
+  metadata.gz: 175b5193ff75e92e5a5d3a07f9589918a6a943dae64b6002b5ead5f3af205cbbd6d49512d5607c86ed55e5afcbca4d40ee89de5a2095161c1eb3ebe67415c1d8
+  data.tar.gz: c633c6733c13cc5363e176bb3d7bb9dac66e14b0fea6072729d6d1692e2517a7d4d1ac68b818b342c4ff24d33958753e701e8916fdd48d00ec169492b16778fc

data/README.md

@@ -130,6 +130,7 @@ Usage: ddig [options] hostname
         --dot                        use resolve type of dot
         --doh-h1                     use resolve type of doh (http/1.1)
         --doh-path=doh-path          doh service path
+        --ddr                        discover designated resolvers via ddr (discovery of designated resolvers)
     -4, --ipv4                       use IPv4 query transport only
     -6, --ipv6                       use IPv6 query transport only
     -@ipaddress|doh-hostname,        nameserver
@@ -142,6 +143,43 @@ Usage: ddig [options] hostname
         --version                    show version.
 ```
 
+```sh
+$ ddig --nameserver 8.8.8.8 dns.google
+# Do53 (IPv4)
+dns.google	A	8.8.4.4
+dns.google	A	8.8.8.8
+dns.google	AAAA	2001:4860:4860::8844
+dns.google	AAAA	2001:4860:4860::8888
+
+# SERVER: 8.8.8.8
+
+# DDR
+## DDR (#0) - dot: dns.google:853 (8.8.4.4),	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+dns.google	A	8.8.4.4
+dns.google	A	8.8.8.8
+dns.google	AAAA	2001:4860:4860::8844
+dns.google	AAAA	2001:4860:4860::8888
+
+# SERVER(Address): 8.8.4.4
+# PORT: 853
+
+...
+
+# SERVER(Address): 2001:4860:4860::8888
+# PORT: 853
+
+## DDR (#6) - h2: dns.google:443 (2001:4860:4860::8888),	path: /dns-query{?dns},	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+dns.google	A	8.8.8.8
+dns.google	A	8.8.4.4
+dns.google	AAAA	2001:4860:4860::8844
+dns.google	AAAA	2001:4860:4860::8888
+
+# SERVER(Hostname): 2001:4860:4860::8888
+# SERVER(Path): /dns-query{?dns}
+# PORT: 443
+...
+```
+
 - UDP(Do53)
 ```sh
 $ ddig --udp --nameserver 8.8.8.8 dns.google
@@ -178,6 +216,25 @@ dns.google	AAAA	2001:4860:4860::8844
 # PORT: 443
 ```
 
+- DDR (Discovery of Designated Resolvers)
+```sh
+$ ddig --ddr --nameserver 8.8.8.8
+dot: dns.google:853 (8.8.8.8),	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+dot: dns.google:853 (8.8.4.4),	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+dot: dns.google:853 (2001:4860:4860::8844),	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+dot: dns.google:853 (2001:4860:4860::8888),	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+h2: dns.google:443 (8.8.8.8),	path: /dns-query{?dns},	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+h2: dns.google:443 (8.8.4.4),	path: /dns-query{?dns},	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+h2: dns.google:443 (2001:4860:4860::8844),	path: /dns-query{?dns},	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+h2: dns.google:443 (2001:4860:4860::8888),	path: /dns-query{?dns},	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+h3: dns.google:443 (8.8.4.4),	path: /dns-query{?dns},	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+h3: dns.google:443 (8.8.8.8),	path: /dns-query{?dns},	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+h3: dns.google:443 (2001:4860:4860::8888),	path: /dns-query{?dns},	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+h3: dns.google:443 (2001:4860:4860::8844),	path: /dns-query{?dns},	unencrypted_resolver: 8.8.8.8, 	verify cert: true
+
+# SERVER: 8.8.8.8
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/ddig/cli.rb

@@ -13,7 +13,7 @@ module Ddig
 
       parse_options
 
-      if @hostname.nil?
+      unless valid_options?
         puts @option_parser
         exit
       end
@@ -23,11 +23,12 @@ module Ddig
       @option_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ddig [options] hostname"
 
-        opts.on("-d", "--dns-type={all|do53|dot}", "resolve type (default: all)") { |v| @options[:dns_type] = v }
+        opts.on("-d", "--dns-type={all|do53|dot|doh_h1}", "resolve type (default: all)") { |v| @options[:dns_type] = v }
         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("--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 }
         opts.on("-@", "--nameserver=ipaddress|doh-hostname", "nameserver") { |v| @options[:nameserver] = v }
@@ -46,12 +47,29 @@ module Ddig
       @hostname = @args[0]
     end
 
+    def valid_options?
+      if @hostname.nil?
+        if @options[:ddr]
+          return true
+        end
+
+        return false
+      end
+
+      return true
+    end
+
     def exec
       if @options[:ipv4] || @options[:ipv6]
         @use_ipv4 = @options[:ipv4] || false
         @use_ipv6 = @options[:ipv6] || false
       end
 
+      if @options[:ddr]
+        resolve_ddr
+        exit
+      end
+
       case @options[:dns_type]
       when "all"
         resolve_all
@@ -69,9 +87,27 @@ module Ddig
 
       if @options[:format] == 'json'
         # TODO: to_json
-        puts @ddig
       else
-        puts @ddig
+        unless @ddig[:do53][:ipv4].nil?
+          puts "# Do53 (IPv4)"
+          @ddig[:do53][:ipv4].to_cli
+          puts
+        end
+
+        unless @ddig[:do53][:ipv6].nil?
+          puts "# Do53 (IPv6)"
+          @ddig[:do53][:ipv6].to_cli
+          puts
+        end
+
+        unless @ddig[:ddr].nil?
+          puts "# DDR"
+          @ddig[:ddr].each_with_index do |designated_resolver, index|
+            puts "## DDR (##{index}) - #{designated_resolver.to_s}"
+            designated_resolver.to_cli
+            puts
+          end
+        end
       end
     end
 
@@ -84,35 +120,13 @@ module Ddig
         exit
       end
 
-      do53.a.each do |address|
-        rr_type = 'A'
-        puts "#{@hostname}\t#{rr_type}\t#{address}"
-      end
-      do53.aaaa.each do |address|
-        rr_type = 'AAAA'
-        puts "#{@hostname}\t#{rr_type}\t#{address}"
-      end
-
-      puts
-      puts "# SERVER: #{do53.nameservers.join(', ')}"
+      do53.to_cli
     end
 
     def resolve_dot
       dot = Ddig::Resolver::Dot.new(hostname: @hostname, server: @options[:nameserver], port: @options[:port]).lookup
 
-      dot.a.each do |address|
-        rr_type = 'A'
-        puts "#{@hostname}\t#{rr_type}\t#{address}"
-      end
-      dot.aaaa.each do |address|
-        rr_type = 'AAAA'
-        puts "#{@hostname}\t#{rr_type}\t#{address}"
-      end
-
-      puts
-      puts "# SERVER(Address): #{dot.server}"
-      #puts "# SERVER(Hostname): #{dot.server_name}"
-      puts "# PORT: #{dot.port}"
+      dot.to_cli
     end
 
     def resolve_doh_h1
@@ -123,19 +137,14 @@ module Ddig
 
       doh = Ddig::Resolver::DohH1.new(hostname: @hostname, server: @options[:nameserver], dohpath: @options[:doh_path], port: @options[:port]).lookup
 
-      doh.a.each do |address|
-        rr_type = 'A'
-        puts "#{@hostname}\t#{rr_type}\t#{address}"
-      end
-      doh.aaaa.each do |address|
-        rr_type = 'AAAA'
-        puts "#{@hostname}\t#{rr_type}\t#{address}"
-      end
+      doh.to_cli
+    end
+
+    def resolve_ddr
+      ip = Ddig::Ip.new(use_ipv4: @use_ipv4, use_ipv6: @use_ipv6)
+      ddr = Ddig::Ddr.new(nameservers: @options[:nameserver], ip: ip.ip_type)
 
-      puts
-      puts "# SERVER(Hostname): #{doh.server}"
-      puts "# SERVER(Path): #{doh.dohpath}"
-      puts "# PORT: #{doh.port}"
+      ddr.to_cli
     end
   end
 end

data/lib/ddig/ddr/designated_resolver.rb

@@ -3,6 +3,7 @@ module Ddig
     class DesignatedResolver
       attr_reader :unencrypted_resolver, :target, :protocol, :port, :dohpath, :address, :ip
       attr_reader :verify_cert
+      attr_reader :hostname, :a, :aaaa, :resolver, :errors
 
       PROTOCOLS = ['http/1.1', 'h2', 'h3', 'dot', 'doq']
 
@@ -30,13 +31,53 @@ module Ddig
         @verify_cert.verify
       end
 
+      def lookup(hostname)
+        @hostname = hostname
+        @errors = []
+
+        case @protocol
+        when 'dot'
+          @resolver = Ddig::Resolver::Dot.new(hostname: @hostname, server: @address, server_name: @target, port: @port).lookup
+
+          unless @resolver.nil?
+            @a = @resolver.a
+            @aaaa = @resolver.aaaa
+
+            return self
+          end
+
+        when 'http/1.1', 'h2', 'h3'
+          @resolver = Ddig::Resolver::DohH1.new(hostname: @hostname, server: @address, address: @address, dohpath: @dohpath, port: @port).lookup
+
+          unless @resolver.nil?
+            @a = @resolver.a
+            @aaaa = @resolver.aaaa
+
+            return self
+          end
+
+        when 'doq'
+          @errors << "#{@protocol} is not supportted protocol"
+        end
+      end
+
+      def to_cli
+        @resolver.to_cli
+      end
+
+      def to_s
+        if ['http/1.1', 'h2', 'h3'].include?(@protocol)
+          "#{@protocol}: #{@target}:#{@port} (#{@address}),\tpath: #{@dohpath},\tunencrypted_resolver: #{@unencrypted_resolver}, \tverify cert: #{@verify_cert.verify}"
+        else
+          "#{@protocol}: #{@target}:#{@port} (#{@address}),\tunencrypted_resolver: #{@unencrypted_resolver}, \tverify cert: #{@verify_cert.verify}"
+        end
+      end
+
       # Set default port by protocol
       # ref: https://www.rfc-editor.org/rfc/rfc9461.html#section-4.2
       def set_default_port
         case @protocol
-        when 'http/1.1'
-          @port = 80
-        when 'h2', 'h3'
+        when 'http/1.1', 'h2', 'h3'
           @port = 443
         when 'dot', 'doq'
           @port = 853

data/lib/ddig/ddr.rb

@@ -129,6 +129,15 @@ module Ddig
       end
     end
 
+    def to_cli
+      @designated_resolvers.each do |designated_resolver|
+        puts designated_resolver.to_s
+      end
+
+      puts
+      puts "# SERVER: #{@nameservers.join(', ')}"
+    end
+
     def set_nameservers
       @nameservers = @nameserver.servers
 

data/lib/ddig/resolver/do53.rb

@@ -33,6 +33,20 @@ module Ddig
         self
       end
 
+      def to_cli
+        @a.each do |address|
+          rr_type = 'A'
+          puts "#{@hostname}\t#{rr_type}\t#{address}"
+        end
+        @aaaa.each do |address|
+          rr_type = 'AAAA'
+          puts "#{@hostname}\t#{rr_type}\t#{address}"
+        end
+
+        puts
+        puts "# SERVER: #{@nameservers.join(', ')}"
+      end
+
       def set_nameservers
         @nameservers = @nameserver.servers
 

data/lib/ddig/resolver/doh_h1.rb

@@ -56,6 +56,22 @@ module Ddig
           return []
         end
       end
+
+      def to_cli
+        @a.each do |address|
+          rr_type = 'A'
+          puts "#{@hostname}\t#{rr_type}\t#{address}"
+        end
+        @aaaa.each do |address|
+          rr_type = 'AAAA'
+          puts "#{@hostname}\t#{rr_type}\t#{address}"
+        end
+
+        puts
+        puts "# SERVER(Hostname): #{@server}"
+        puts "# SERVER(Path): #{@dohpath}"
+        puts "# PORT: #{@port}"
+      end
     end
   end
 end

data/lib/ddig/resolver/dot.rb

@@ -74,6 +74,22 @@ module Ddig
           ssl_socket
         end
       end
+
+      def to_cli
+        @a.each do |address|
+          rr_type = 'A'
+          puts "#{@hostname}\t#{rr_type}\t#{address}"
+        end
+        @aaaa.each do |address|
+          rr_type = 'AAAA'
+          puts "#{@hostname}\t#{rr_type}\t#{address}"
+        end
+
+        puts
+        puts "# SERVER(Address): #{@server}"
+        #puts "# SERVER(Hostname): #{@server_name}"
+        puts "# PORT: #{@port}"
+      end
     end
   end
 end

data/lib/ddig/version.rb

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

data/lib/ddig.rb

@@ -24,6 +24,9 @@ module Ddig
     @do53_ipv6 = Ddig::Resolver::Do53.new(hostname: @hostname, nameservers: @nameserver.servers, ip: :ipv6).lookup unless @ip.ip_type == :ipv4
 
     @ddr = Ddig::Ddr.new(nameservers: @nameservers, ip: @ip.ip_type)
+    @ddr.designated_resolvers.each do |designated_resolver|
+      designated_resolver.lookup(@hostname)
+    end
 
     {
       do53: {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddig
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Taketo Takashima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resolv
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: DNS lookup utility for Ruby