nslookupot 0.0.6 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f55a82dd8b59575552ff6ec51ce460d3960edc9802ae7b0ad7b34acf9ecdb2
-  data.tar.gz: f5fafc615a8bcd14b230f29ca719dd43bebd48a4e91bbabd449936ad1ef20df2
+  metadata.gz: 327221d555480cece10786485fe2dcdda611e1808b95a4cc4e350a666ac20fa9
+  data.tar.gz: 4132dc893b13642955b4cd830d73e98fadf4779ee03fd909abbf17ab83db3dc2
 SHA512:
-  metadata.gz: 4f9c2a07724a2f6ee9cb15b396360bd47e5a33ca7b17eb3be151cbc93d1c2111a91c60dbe362a7277af0cc646a556279ccfca08e7e3328cade8acb453bcdd273
-  data.tar.gz: 3663e91a31ac98e0d638be5bc182b66c776322fe7aeb0d6ad92d6cfea6a4d6b4d7a0ea885935cf797534d24f9c69eb1d622127765fecc088d86b842209e95de7
+  metadata.gz: 1bea793a0d39ffd71be4335e6fe67ae87531720ed95761134b016c87b09271de5f0231f181827fc4e3503b208b06154f84f3a700b01ac91492aa2047526588cb
+  data.tar.gz: c902c61d252da40c0467a32a2457ed7976617e78a7de0ac1c47ef76f493c6ae8fdb3cfa87fafad3259c5e302a2475d751385b2a4ed2e28f79a931314e3e946b3

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6.x', '2.7.x']
+        ruby-version: ['2.7.x', '3.0.x', '3.1.x']
     steps:
       - name: Set up Ruby
         uses: actions/setup-ruby@v1

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Style/Documentation:
   Enabled: false

data/Gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 gem 'caa_rr_patch'
 gem 'openssl'
 gem 'rake'
+gem 'svcb_rr_patch'
 
 group :test do
   gem 'byebug'

data/README.md

@@ -4,21 +4,21 @@
 [![CI](https://github.com/thekuwayama/nslookupot/workflows/CI/badge.svg)](https://github.com/thekuwayama/nslookupot/actions?workflow=CI)
 [![Maintainability](https://api.codeclimate.com/v1/badges/5df9157757f5a0bf1623/maintainability)](https://codeclimate.com/github/thekuwayama/nslookupot/maintainability)
 
-nslookupot is CLI that is `nslookup` over TLS (version 1.2).
+nslookupot is CLI that is `nslookup` over TLS (version 1.3 or 1.2).
 
 
 ## Installation
 
 The gem is available at [rubygems.org](https://rubygems.org/gems/nslookupot). You can install with:
 
-```bash
+```sh-session
 $ gem install nslookupot
 ```
 
 
 ## Usage
 
-```bash
+```sh-session
 $ nslookupot --help
 Usage: nslookupot [options] name
     -s, --server VALUE               the name server IP address        (default 1.1.1.1)
@@ -30,7 +30,7 @@ Usage: nslookupot [options] name
 
 You can run it the following:
 
-```bash
+```sh-session
 $ nslookupot example.com
 Address:        1.1.1.1#853
 --
@@ -42,7 +42,7 @@ Ttl:            2860
 
 If you need to resolve other than A type, you can run it the following:
 
-```bash
+```sh-session
 $ nslookupot --type=cname www.youtube.com
 Address:        1.1.1.1#853
 --
@@ -54,7 +54,7 @@ Ttl:            1358
 
 If you need to query to `8.8.8.8`, you can run it the following:
 
-```bash
+```sh-session
 $ nslookupot --server=8.8.8.8 --port=853 --hostname=dns.google www.google.com
 Address:        8.8.8.8#853
 --
@@ -66,7 +66,7 @@ Ttl:            223
 
 If you need to query to `9.9.9.9`, you can run it the following:
 
-```bash
+```sh-session
 $ nslookupot --server=9.9.9.9 --port=853 --hostname=quad9.net www.quad9.net
 Address:        9.9.9.9#853
 --

data/lib/nslookupot/cli.rb

@@ -4,6 +4,7 @@ require 'optparse'
 
 module Nslookupot
   class CLI
+    # rubocop: disable Metrics/AbcSize
     # rubocop: disable Metrics/MethodLength
     def parse_options(argv = ARGV)
       op = OptionParser.new
@@ -62,25 +63,26 @@ module Nslookupot
         args = op.parse(argv)
       rescue OptionParser::InvalidOption => e
         warn op.to_s
-        warn "error: #{e.message}"
+        warn "** #{e.message}"
         exit 1
       end
 
       begin
         type = s2typeclass(type)
       rescue NameError
-        warn "error: unknown query type #{type}"
+        warn "** unknown query type: #{type.upcase}"
         exit 1
       end
 
       if args.size != 1
         warn op.to_s
-        warn 'error: number of arguments is not 1'
+        warn '** `name` argument is not specified'
         exit 1
       end
 
       [opts, args[0], type]
     end
+    # rubocop: enable Metrics/AbcSize
     # rubocop: enable Metrics/MethodLength
 
     def s2typeclass(s)
@@ -90,21 +92,37 @@ module Nslookupot
       rr
     end
 
+    # rubocop: disable Metrics/AbcSize
     def run
       opts, name, type = parse_options
 
-      resolver = Nslookupot::Resolver.new(**opts)
-      puts 'Address:'.ljust(16) + opts[:server] + '#' + opts[:port].to_s
-      puts '--'
-      resolver.resolve_resources(name, type).each do |rr|
+      resolver = Resolver.new(**opts)
+      puts 'Server:'.ljust(16) + opts[:server]
+      puts 'Address:'.ljust(16) + "#{opts[:server]}\##{opts[:port]}"
+      puts
+
+      result = nil
+      begin
+        result = resolver.resolve_resources(name, type)
+      rescue Error::DNNotFound
+        t = type.name.split('::').last
+        warn "** Not Found: (domain, type) = (#{name}, #{t})"
+        exit 1
+      rescue Error::DoTServerUnavailable => e
+        warn "** DoT Server Unavailable: #{e.message}"
+        exit 1
+      end
+
+      result.each do |rr|
         puts 'Name:'.ljust(16) + name
         rr.instance_variables.each do |var|
-          k = (var[1..].capitalize + ':').ljust(16)
+          k = "#{var[1..].capitalize}:".ljust(16)
           v = rr.instance_variable_get(var).to_s
           puts k + v
         end
-        puts ''
+        puts
       end
     end
+    # rubocop: enable Metrics/AbcSize
   end
 end

data/lib/nslookupot/error.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Nslookupot
+  module Error
+    # Generic error, common for all classes under Nslookupot::Error module.
+    class Error < StandardError; end
+
+    class DNNotFound < Error; end
+
+    class DoTServerUnavailable < Error; end
+  end
+end

data/lib/nslookupot/resolver.rb

@@ -35,14 +35,26 @@ module Nslookupot
     # @param name [String]
     # @param typeclass [Resolv::DNS::Resource::IN constant]
     #
+    # @raise [Nslookupot::Error]
+    #
     # @return [Array of Resolv::DNS::Resource]
     def resolve_resources(name, typeclass)
-      sock = gen_sock
-      send_msg(sock, name, typeclass)
-      msg = recv_msg(sock)
-      sock.close
+      begin
+        sock = gen_sock
+        send_msg(sock, name, typeclass)
+        msg = recv_msg(sock)
+        sock.close
+      rescue SocketError, Errno::ECONNREFUSED
+        err_msg = "#{@server}\##{@port} connection refused"
+        raise Error::DoTServerUnavailable.new, err_msg
+      rescue OpenSSL::SSL::SSLError => e
+        raise Error::DoTServerUnavailable.new, e.message
+      end
+
+      result = msg.answer.map(&:last)
+      raise Error::DNNotFound if result.empty?
 
-      msg.answer.map(&:last)
+      result
     end
 
     private
@@ -75,7 +87,11 @@ module Nslookupot
     # @return [OpenSSL::SSL::SSLSocket]
     def gen_sock
       ts = TCPSocket.new(@server, @port)
-      ctx = OpenSSL::SSL::SSLContext.new('TLSv1_2')
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
+      ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+      ctx.max_version = OpenSSL::SSL::TLS1_3_VERSION \
+        if defined? OpenSSL::SSL::TLS1_3_VERSION
       ctx.alpn_protocols = ['dot']
       sock = OpenSSL::SSL::SSLSocket.new(ts, ctx)
       sock.sync_close = true

data/lib/nslookupot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nslookupot
-  VERSION = '0.0.6'
+  VERSION = '0.0.10'
 end

data/lib/nslookupot.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require 'caa_rr_patch'
 require 'resolv'
+require 'caa_rr_patch'
+require 'svcb_rr_patch'
 require 'socket'
 require 'openssl'
 require 'optparse'
 
 require 'nslookupot/version'
+require 'nslookupot/error'
 require 'nslookupot/resolver'
 require 'nslookupot/cli'

data/nslookupot.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/thekuwayama/nslookupot'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>=2.6.0'
+  spec.required_ruby_version = '>=2.7.0'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_dependency             'caa_rr_patch'
   spec.add_dependency             'openssl'
+  spec.add_dependency             'svcb_rr_patch'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nslookupot
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.10
 platform: ruby
 authors:
 - thekuwayama
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: svcb_rr_patch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: nslookup over TLS
 email:
 - thekuwayama@gmail.com
@@ -70,6 +84,7 @@ files:
 - exe/nslookupot
 - lib/nslookupot.rb
 - lib/nslookupot/cli.rb
+- lib/nslookupot/error.rb
 - lib/nslookupot/resolver.rb
 - lib/nslookupot/version.rb
 - nslookupot.gemspec
@@ -88,14 +103,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: nslookup over TLS