ddig 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58620e2fc9231b199356c668368c0af0b2b74a9bd6f081eaa6a0332794afe42c
-  data.tar.gz: 027a30588c369ecc5ee419f3821b3d2cef9aff5c27ced47227aba3384adba1bd
+  metadata.gz: 436345c126c2da37eec4a4b3e53ffa6fb951b8f843194b20f4c58d2fdded7932
+  data.tar.gz: '092f974b175b6086e4affec4b2df6a59231abcac1e7c78ea2c6a0894fa291d1d'
 SHA512:
-  metadata.gz: 58c9a6c611f8b68461d0bbfdd5d41f8ea9a3cd5ddf3d748c531f0e4c287b4bee2030ad977b9c4cc5b980011db6cf44efb85a63cbbb978435bed9890d36073dda
-  data.tar.gz: ae0f8a828569c64d6d7faefea81d7ab633a1691a8011a4d12e575c3e963d7fc1431c21e3bebdf18a3d8f01f808836011cf8b7444c91a437117da39f13cb2636b
+  metadata.gz: e68d13faf8b03d62f4da5b6995e8dff1ae21205569af2dfb8c3a4553f7c699ed3b6dd188c412d80785be57c5f75ffc7f0f1aba319492d464a52cdfcfa3f85570
+  data.tar.gz: 2e00a96f37828eabbd75ba22e18ab6f15b3ef0023d03b52b363fadc48922a96e3d16495bb059d8945b96e550756fa54b0a0ee7c5c49281a125720e39d0d400ef

data/README.md

@@ -34,9 +34,9 @@ If bundler is not being used to manage dependencies, install the gem by executin
 ddig = Ddig.lookup('dns.google', nameservers: ['8.8.8.8', '2001:4860:4860::8888'])
 
 ddig[:do53][:ipv4]
-=> #<Ddig::Resolver::Do53:0x00000001207aaeb0 @a=["8.8.4.4", "8.8.8.8"], @aaaa=["2001:4860:4860::8844", "2001:4860:4860::8888"], @hostname="dns.google", @ip=:ipv4, @nameservers=["8.8.8.8"]>
+=> #<Ddig::Resolver::Do53:0x00000001207aaeb0 @a=["8.8.4.4", "8.8.8.8"], @a_response_time=18, @aaaa=["2001:4860:4860::8844", "2001:4860:4860::8888"], @aaaa_response_time=16, @hostname="dns.google", @ip=:ipv4, @nameservers=["8.8.8.8"]>
 ddig[:do53][:ipv6]
-=> #<Ddig::Resolver::Do53:0x000000012073d2c0 @a=["8.8.4.4", "8.8.8.8"], @aaaa=["2001:4860:4860::8844", "2001:4860:4860::8888"], @hostname="dns.google", @ip=:ipv4, @nameservers=["2001:4860:4860::8888"]>
+=> #<Ddig::Resolver::Do53:0x000000012073d2c0 @a=["8.8.4.4", "8.8.8.8"], @a_response_time=18, @aaaa=["2001:4860:4860::8844", "2001:4860:4860::8888"], @aaaa_response_time=16, @hostname="dns.google", @ip=:ipv4, @nameservers=["2001:4860:4860::8888"]>
 
 ddig[:ddr]
 => [#<Ddig::Ddr::DesignatedResolver:0x0000000120735480
@@ -90,7 +90,7 @@ ddig[:ddr]
 - Do53
 ```ruby
 do53 = Ddig::Resolver::Do53.new(hostname: 'dns.google', nameservers: '8.8.8.8').lookup
-=> #<Ddig::Resolver::Do53:0x0000000121717b78 @a=["8.8.8.8", "8.8.4.4"], @aaaa=["2001:4860:4860::8844", "2001:4860:4860::8888"], @hostname="dns.google", @ip=nil, @nameserver=#<Ddig::Nameserver:0x00000001211fb108 @nameservers="8.8.8.8", @servers=["8.8.8.8"]>, @nameservers=["8.8.8.8"]>
+=> #<Ddig::Resolver::Do53:0x0000000121717b78 @a=["8.8.8.8", "8.8.4.4"], @a_response_time=18, @aaaa=["2001:4860:4860::8844", "2001:4860:4860::8888"], @aaaa_response_time=16, @hostname="dns.google", @ip=nil, @nameserver=#<Ddig::Nameserver:0x00000001211fb108 @nameservers="8.8.8.8", @servers=["8.8.8.8"]>, @nameservers=["8.8.8.8"]>
 
 do53.a
 => ["8.8.4.4", "8.8.8.8"]
@@ -101,7 +101,7 @@ do53.aaaa
 - DoT
 ```ruby
 dot = Ddig::Resolver::Dot.new(hostname: 'dns.google', server: '8.8.8.8').lookup
-=> #<Ddig::Resolver::Dot:0x000000012145da90 @a=["8.8.8.8", "8.8.4.4"], @aaaa=["2001:4860:4860::8844", "2001:4860:4860::8888"], @hostname="dns.google", @open_timeout=3, @port=853, @server="8.8.8.8", @server_name=nil>
+=> #<Ddig::Resolver::Dot:0x000000012145da90 @a=["8.8.8.8", "8.8.4.4"], @a_response_time=108, @aaaa=["2001:4860:4860::8844", "2001:4860:4860::8888"], @aaaa_response_time=122, @hostname="dns.google", @open_timeout=3, @port=853, @server="8.8.8.8", @server_name=nil>
 
 dot.a
 => ["8.8.4.4", "8.8.8.8"]
@@ -112,7 +112,7 @@ dot.aaaa
 - DoH (HTTP/1.1)
 ```ruby
 doh = Ddig::Resolver::DohH1.new(hostname: 'dns.google', server: 'dns.google', dohpath: '/dns-query{?dns}').lookup
-=> #<Ddig::Resolver::DohH1:0x00000001023ed020 @a=["8.8.4.4", "8.8.8.8"], @aaaa=["2001:4860:4860::8888", "2001:4860:4860::8844"], @address=nil, @dohpath="/dns-query{?dns}", @hostname="dns.google", @open_timeout=10, @port=443, @server="dns.google">
+=> #<Ddig::Resolver::DohH1:0x00000001023ed020 @a=["8.8.4.4", "8.8.8.8"], @a_response_time=62, @aaaa=["2001:4860:4860::8888", "2001:4860:4860::8844"], @aaaa_response_time=77, @address=nil, @dohpath="/dns-query{?dns}", @hostname="dns.google", @open_timeout=10, @port=443, @server="dns.google">
 
 doh.a
 => ["8.8.4.4", "8.8.8.8"]
@@ -151,6 +151,8 @@ dns.google	A	8.8.8.8
 dns.google	AAAA	2001:4860:4860::8844
 dns.google	AAAA	2001:4860:4860::8888
 
+# Query time (A):    15 msec
+# Query time (AAAA): 15 msec
 # SERVER: 8.8.8.8
 
 # DDR
@@ -160,6 +162,8 @@ dns.google	A	8.8.8.8
 dns.google	AAAA	2001:4860:4860::8844
 dns.google	AAAA	2001:4860:4860::8888
 
+# Query time (A):    114 msec
+# Query time (AAAA): 187 msec
 # SERVER(Address): 8.8.4.4
 # PORT: 853
 
@@ -174,6 +178,8 @@ dns.google	A	8.8.4.4
 dns.google	AAAA	2001:4860:4860::8844
 dns.google	AAAA	2001:4860:4860::8888
 
+# Query time (A):    89 msec
+# Query time (AAAA): 105 msec
 # SERVER(Hostname): 2001:4860:4860::8888
 # SERVER(Path): /dns-query{?dns}
 # PORT: 443
@@ -188,6 +194,8 @@ dns.google	A	8.8.4.4
 dns.google	AAAA	2001:4860:4860::8844
 dns.google	AAAA	2001:4860:4860::8888
 
+# Query time (A):    20 msec
+# Query time (AAAA): 16 msec
 # SERVER: 8.8.8.8
 ```
 
@@ -199,6 +207,8 @@ dns.google	A	8.8.4.4
 dns.google	AAAA	2001:4860:4860::8888
 dns.google	AAAA	2001:4860:4860::8844
 
+# Query time (A):    90 msec
+# Query time (AAAA): 167 msec
 # SERVER(Address): 8.8.8.8
 # PORT: 853
 ```
@@ -211,6 +221,8 @@ dns.google	A	8.8.4.4
 dns.google	AAAA	2001:4860:4860::8888
 dns.google	AAAA	2001:4860:4860::8844
 
+# Query time (A):    69 msec
+# Query time (AAAA): 70 msec
 # SERVER(Hostname): dns.google
 # SERVER(Path): /dns-query{?dns}
 # PORT: 443

data/exe/ddig

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "ddig/cli"
 

data/lib/ddig/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "optparse"
 
 require "ddig"
@@ -56,6 +58,15 @@ module Ddig
         return false
       end
 
+      if @options[:nameserver].nil?
+        if @options[:dns_type] == "dot" || @options[:dns_type] == "doh_h1"
+          puts "Error: nameserver is required with dns_type: #{@options[:dns_type]}"
+          puts
+
+          return false
+        end
+      end
+
       return true
     end
 
@@ -116,35 +127,47 @@ module Ddig
       ip = Ddig::Ip.new(use_ipv4: @use_ipv4, use_ipv6: @use_ipv6)
       do53 = Ddig::Resolver::Do53.new(hostname: @hostname, nameservers: @options[:nameserver], ip: ip.ip_type).lookup
 
-      if do53.nil?
-        puts "Error: Could not lookup wit nameserver: #{@options[:nameserver]}"
-        exit
+      if @options[:format] == 'json'
+        puts do53.to_json
+      else
+        do53.to_cli
       end
-
-      do53.to_cli
     end
 
     def resolve_dot
       dot = Ddig::Resolver::Dot.new(hostname: @hostname, server: @options[:nameserver], port: @options[:port]).lookup
 
-      dot.to_cli
+      if @options[:format] == 'json'
+        puts dot.to_json
+      else
+        dot.to_cli
+      end
     end
 
     def resolve_doh_h1
-      if @options[:nameserver].nil? || @options[:doh_path].nil?
+      # set default doh_path
+      if @options[:doh_path].nil?
         @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
 
-      doh.to_cli
+      if @options[:format] == 'json'
+        puts dot.to_json
+      else
+        doh.to_cli
+      end
     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)
 
-      ddr.to_cli
+      if @options[:format] == 'json'
+        puts ddr.to_json
+      else
+        ddr.to_cli
+      end
     end
   end
 end

data/lib/ddig/ddr/designated_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Ddig

data/lib/ddig/ddr/verify_cert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "openssl"
 require 'net/protocol'
 

data/lib/ddig/ddr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'resolv'
 require 'json'
 

data/lib/ddig/nameserver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'resolv'
 
 module Ddig

data/lib/ddig/resolver/dns_message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'resolv'
 
 module Ddig

data/lib/ddig/resolver/dns_resource_https.rb

@@ -0,0 +1,41 @@
+require 'resolv'
+
+module Ddig
+  module Resolver
+    class DnsResourceHttps
+      attr_reader :priority, :target, :alpn, :port, :ipv4hint, :ipv6hint
+
+      def self.build(resources)
+        resources
+          .select { |resource| resource.is_a?(Resolv::DNS::Resource::IN::HTTPS) }
+          .map { |resource| new(resource) }
+          .sort_by { |https| https.priority }
+      end
+
+      def initialize(resource)
+        @priority = resource.priority
+        @target = resource.target != Resolv::DNS::Name.create(".") ? resource.target.to_s : "."
+
+        @alpn = resource.params[:alpn]&.protocol_ids
+        @port = resource.params[:port]&.port
+        @ipv4hint = resource.params[:ipv4hint]&.addresses&.map(&:to_s)
+        @ipv6hint = resource.params[:ipv6hint]&.addresses&.map(&:to_s)
+      end
+
+      def as_json(*)
+        {
+          priority: @priority,
+          target: @target,
+          alpn: @alpn,
+          port: @port,
+          ipv4hint: @ipv4hint,
+          ipv6hint: @ipv6hint,
+        }
+      end
+
+      def to_json(*args)
+        as_json.to_json
+      end
+    end
+  end
+end

data/lib/ddig/resolver/do53.rb

@@ -1,12 +1,17 @@
+# frozen_string_literal: true
+
 require 'resolv'
 require 'json'
 
+require_relative 'dns_resource_https'
+
 module Ddig
   module Resolver
     # DNS Resolver of UDP/53
     class Do53
       attr_reader :hostname, :nameservers, :ip
-      attr_reader :a, :aaaa
+      attr_reader :a, :aaaa, :https
+      attr_reader :a_response_time, :aaaa_response_time
 
       def initialize(hostname:, nameservers: nil, ip: nil)
         @hostname = hostname
@@ -21,15 +26,24 @@ module Ddig
           return nil
         end
 
+        a_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @a = Resolv::DNS.open(nameserver: @nameservers) do |dns|
           ress = dns.getresources(@hostname, Resolv::DNS::Resource::IN::A)
           ress.map { |resource| resource.address.to_s }
         end
+        @a_response_time = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - a_start) * 1000).round
 
+        aaaa_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @aaaa = Resolv::DNS.open(nameserver: @nameservers) do |dns|
           ress = dns.getresources(@hostname, Resolv::DNS::Resource::IN::AAAA)
           ress.map { |resource| resource.address.to_s }
         end
+        @aaaa_response_time = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - aaaa_start) * 1000).round
+
+        @https = Resolv::DNS.open(nameserver: @nameservers) do |dns|
+          ress = dns.getresources(@hostname, Resolv::DNS::Resource::IN::HTTPS)
+          DnsResourceHttps.build(ress)
+        end
 
         self
       end
@@ -38,9 +52,12 @@ module Ddig
         {
           a: @a,
           aaaa: @aaaa,
+          https: @https.map { |dns_resource_https| dns_resource_https.as_json },
           hostname: @hostname,
           nameservers: @nameservers,
           ip: @ip,
+          a_response_time: @a_response_time,
+          aaaa_response_time: @aaaa_response_time,
         }
       end
 
@@ -57,8 +74,18 @@ module Ddig
           rr_type = 'AAAA'
           puts "#{@hostname}\t#{rr_type}\t#{address}"
         end
+        @https.each do |record|
+          rr_type = 'HTTPS'
+          puts "#{@hostname}\t#{rr_type}\tpriority: #{record.priority}\ttarget: #{record.target}\talpn: #{record.alpn.join(', ')}"
+        end
 
         puts
+        unless @a_response_time.nil?
+          puts "# Query time (A):    #{@a_response_time} msec"
+        end
+        unless @aaaa_response_time.nil?
+          puts "# Query time (AAAA): #{@aaaa_response_time} msec"
+        end
         puts "# SERVER: #{@nameservers.join(', ')}"
       end
 

data/lib/ddig/resolver/doh_h1.rb

@@ -1,16 +1,20 @@
+# frozen_string_literal: true
+
 require 'net/http'
 require 'resolv'
 require 'base64'
 require 'json'
 
 require_relative 'dns_message'
+require_relative 'dns_resource_https'
 
 module Ddig
   module Resolver
     # DNS over HTTPS (HTTP/1.1)
     class DohH1
       attr_reader :hostname, :server, :address, :dohpath, :port
-      attr_reader :a, :aaaa
+      attr_reader :a, :aaaa, :https
+      attr_reader :a_response_time, :aaaa_response_time
 
       def initialize(hostname:, server:, address: nil, dohpath: '/dns-query{?dns}', port: 443)
         @hostname = hostname
@@ -27,9 +31,17 @@ module Ddig
           return nil
         end
 
+        a_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @a = get_resources(@hostname, Resolv::DNS::Resource::IN::A).map { |resource| resource.address.to_s if resource.is_a?(Resolv::DNS::Resource::IN::A) }.compact
+        @a_response_time = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - a_start) * 1000).round
 
+        aaaa_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @aaaa = get_resources(@hostname, Resolv::DNS::Resource::IN::AAAA).map { |resource| resource.address.to_s if resource.is_a?(Resolv::DNS::Resource::IN::AAAA) }.compact
+        @aaaa_response_time = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - aaaa_start) * 1000).round
+
+        @https = DnsResourceHttps.build(
+          get_resources(@hostname, Resolv::DNS::Resource::IN::HTTPS)
+        )
 
         self
       end
@@ -62,11 +74,14 @@ module Ddig
         {
           a: @a,
           aaaa: @aaaa,
+          https: @https.map { |dns_resource_https| dns_resource_https.as_json },
           hostname: @hostname,
           server: @server,
           address: @address,
           dohpath: @dohpath,
           port: @port,
+          a_response_time: @a_response_time,
+          aaaa_response_time: @aaaa_response_time,
         }
       end
 
@@ -83,8 +98,18 @@ module Ddig
           rr_type = 'AAAA'
           puts "#{@hostname}\t#{rr_type}\t#{address}"
         end
+        @https.each do |record|
+          rr_type = 'HTTPS'
+          puts "#{@hostname}\t#{rr_type}\tpriority: #{record.priority}\ttarget: #{record.target}\talpn: #{record.alpn.join(', ')}"
+        end
 
         puts
+        unless @a_response_time.nil?
+          puts "# Query time (A):    #{@a_response_time} msec"
+        end
+        unless @aaaa_response_time.nil?
+          puts "# Query time (AAAA): #{@aaaa_response_time} msec"
+        end
         puts "# SERVER(Hostname): #{@server}"
         puts "# SERVER(Path): #{@dohpath}"
         puts "# PORT: #{@port}"

data/lib/ddig/resolver/dot.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
 require 'openssl'
 require 'resolv'
 require 'json'
 
 require_relative 'dns_message'
+require_relative 'dns_resource_https'
 
 module Ddig
   module Resolver
     # DNS over TLS/TCP
     class Dot
       attr_reader :hostname, :server, :server_name, :port
-      attr_reader :a, :aaaa
+      attr_reader :a, :aaaa, :https
+      attr_reader :a_response_time, :aaaa_response_time
 
       def initialize(hostname:, server:, server_name: nil, port: 853)
         @hostname = hostname
@@ -25,9 +29,17 @@ module Ddig
           return nil
         end
 
+        a_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @a = get_resources(@hostname, Resolv::DNS::Resource::IN::A).map { |resource| resource.address.to_s if resource.is_a?(Resolv::DNS::Resource::IN::A) }.compact
+        @a_response_time = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - a_start) * 1000).round
 
+        aaaa_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @aaaa = get_resources(@hostname, Resolv::DNS::Resource::IN::AAAA).map { |resource| resource.address.to_s if resource.is_a?(Resolv::DNS::Resource::IN::AAAA) }.compact
+        @aaaa_response_time = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - aaaa_start) * 1000).round
+
+        @https = DnsResourceHttps.build(
+          get_resources(@hostname, Resolv::DNS::Resource::IN::HTTPS)
+        )
 
         self
       end
@@ -80,10 +92,13 @@ module Ddig
         {
           a: @a,
           aaaa: @aaaa,
+          https: @https.map { |dns_resource_https| dns_resource_https.as_json },
           hostname: @hostname,
           server: @server,
           server_name: @server_name,
           port: @port,
+          a_response_time: @a_response_time,
+          aaaa_response_time: @aaaa_response_time,
         }
       end
 
@@ -100,8 +115,18 @@ module Ddig
           rr_type = 'AAAA'
           puts "#{@hostname}\t#{rr_type}\t#{address}"
         end
+        @https.each do |record|
+          rr_type = 'HTTPS'
+          puts "#{@hostname}\t#{rr_type}\tpriority: #{record.priority}\ttarget: #{record.target}\talpn: #{record.alpn.join(', ')}"
+        end
 
         puts
+        unless @a_response_time.nil?
+          puts "# Query time (A):    #{@a_response_time} msec"
+        end
+        unless @aaaa_response_time.nil?
+          puts "# Query time (AAAA): #{@aaaa_response_time} msec"
+        end
         puts "# SERVER(Address): #{@server}"
         #puts "# SERVER(Hostname): #{@server_name}"
         puts "# PORT: #{@port}"

data/lib/ddig/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ddig
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Taketo Takashima
 bindir: exe
 cert_chain: []
-date: 2025-04-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resolv
@@ -58,6 +58,7 @@ files:
 - lib/ddig/ip.rb
 - lib/ddig/nameserver.rb
 - lib/ddig/resolver/dns_message.rb
+- lib/ddig/resolver/dns_resource_https.rb
 - lib/ddig/resolver/do53.rb
 - lib/ddig/resolver/doh_h1.rb
 - lib/ddig/resolver/dot.rb
@@ -70,6 +71,7 @@ metadata:
   homepage_uri: https://github.com/taketo1113/ddig
   source_code_uri: https://github.com/taketo1113/ddig
   changelog_uri: https://github.com/taketo1113/ddig/releases
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -84,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: DNS lookup utility for Ruby
 test_files: []