nslookupot 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 327221d555480cece10786485fe2dcdda611e1808b95a4cc4e350a666ac20fa9
-  data.tar.gz: 4132dc893b13642955b4cd830d73e98fadf4779ee03fd909abbf17ab83db3dc2
+  metadata.gz: 2c9de045df30e3e73273f0da9950c06e2e716ced7dee7fbbf55589c8c57067ee
+  data.tar.gz: ce164bc5a05df2681fd6afda4848262e4bcad328818a81941b53a4f777c6bc4f
 SHA512:
-  metadata.gz: 1bea793a0d39ffd71be4335e6fe67ae87531720ed95761134b016c87b09271de5f0231f181827fc4e3503b208b06154f84f3a700b01ac91492aa2047526588cb
-  data.tar.gz: c902c61d252da40c0467a32a2457ed7976617e78a7de0ac1c47ef76f493c6ae8fdb3cfa87fafad3259c5e302a2475d751385b2a4ed2e28f79a931314e3e946b3
+  metadata.gz: 9d836124c778fb60d8107d92ca53676af6e1a701881808894215ea435a7d3d33ad6138f260255c1b9bb202b25bef2588c97ed352e70a6f3739343d7ce098e7cd
+  data.tar.gz: acf065bdad8c0dfa20f7d6bb5a6a1efb6f040434baed88578f98fba07afeca222c5be540062f5650d7ba2349b3fdf054bb77435d1c636d270e4bf8f427b6512e

data/README.md

@@ -6,6 +6,8 @@
 
 nslookupot is CLI that is `nslookup` over TLS (version 1.3 or 1.2).
 
+- https://datatracker.ietf.org/doc/html/rfc7858
+
 
 ## Installation
 
@@ -26,17 +28,19 @@ Usage: nslookupot [options] name
     -h, --hostname VALUE             the name server hostname          (default cloudflare-dns.com)
     -n, --no-check-sni               no check SNI                      (default false)
     -t, --type VALUE                 the type of the information query (default A)
+        --types                      print the list of query types
 ```
 
 You can run it the following:
 
 ```sh-session
 $ nslookupot example.com
+Server:         1.1.1.1
 Address:        1.1.1.1#853
---
+
 Name:           example.com
 Address:        93.184.216.34
-Ttl:            2860
+Ttl:            83289
 
 ```
 
@@ -44,11 +48,12 @@ If you need to resolve other than A type, you can run it the following:
 
 ```sh-session
 $ nslookupot --type=cname www.youtube.com
+Server:         1.1.1.1
 Address:        1.1.1.1#853
---
+
 Name:           www.youtube.com
 Name:           youtube-ui.l.google.com
-Ttl:            1358
+Ttl:            86400
 
 ```
 
@@ -56,11 +61,12 @@ If you need to query to `8.8.8.8`, you can run it the following:
 
 ```sh-session
 $ nslookupot --server=8.8.8.8 --port=853 --hostname=dns.google www.google.com
+Server:         8.8.8.8
 Address:        8.8.8.8#853
---
+
 Name:           www.google.com
-Address:        172.217.24.132
-Ttl:            223
+Address:        142.250.196.132
+Ttl:            175
 
 ```
 
@@ -68,14 +74,22 @@ If you need to query to `9.9.9.9`, you can run it the following:
 
 ```sh-session
 $ nslookupot --server=9.9.9.9 --port=853 --hostname=quad9.net www.quad9.net
+Server:         9.9.9.9
 Address:        9.9.9.9#853
---
+
 Name:           www.quad9.net
 Address:        216.21.3.77
-Ttl:            1200
+Ttl:            100
 
 ```
 
+Supported query types are:
+
+```sh-session
+$ nslookupot --types
+** A, AAAA, CAA, CNAME, HINFO, HTTPS, LOC, MINFO, MX, NS, PTR, SOA, SRV, SVCB, TXT, WKS
+```
+
 
 ## License
 

data/lib/nslookupot/cli.rb

@@ -3,6 +3,7 @@
 require 'optparse'
 
 module Nslookupot
+  # rubocop: disable Metrics/ClassLength
   class CLI
     # rubocop: disable Metrics/AbcSize
     # rubocop: disable Metrics/MethodLength
@@ -17,6 +18,7 @@ module Nslookupot
         check_sni: true
       }
       type = 'A'
+      print_types = false
 
       op.on(
         '-s',
@@ -58,15 +60,28 @@ module Nslookupot
         type = v
       end
 
+      op.on(
+        '',
+        '--types',
+        'print the list of query types'
+      ) do |v|
+        print_types = v
+      end
+
       op.banner += ' name'
       begin
         args = op.parse(argv)
-      rescue OptionParser::InvalidOption => e
+      rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
         warn op.to_s
         warn "** #{e.message}"
         exit 1
       end
 
+      if print_types
+        warn "** #{types.sort.join(', ')}"
+        exit 1
+      end
+
       begin
         type = s2typeclass(type)
       rescue NameError
@@ -92,6 +107,15 @@ module Nslookupot
       rr
     end
 
+    def types
+      Resolv::DNS::Resource::IN.constants.filter do |const|
+        c = Resolv::DNS::Resource::IN.const_get(const)
+        c < Resolv::DNS::Resource
+      rescue ArgumentError
+        false
+      end
+    end
+
     # rubocop: disable Metrics/AbcSize
     def run
       opts, name, type = parse_options
@@ -116,7 +140,8 @@ module Nslookupot
       result.each do |rr|
         puts 'Name:'.ljust(16) + name
         rr.instance_variables.each do |var|
-          k = "#{var[1..].capitalize}:".ljust(16)
+          k = var.to_s.delete('@').split('_').map(&:capitalize).join
+          k = "#{k}:".ljust(16)
           v = rr.instance_variable_get(var).to_s
           puts k + v
         end
@@ -125,4 +150,5 @@ module Nslookupot
     end
     # rubocop: enable Metrics/AbcSize
   end
+  # rubocop: enable Metrics/ClassLength
 end

data/lib/nslookupot/version.rb

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

data/spec/cli_spec.rb

@@ -2,6 +2,7 @@
 
 require_relative 'spec_helper'
 
+# rubocop: disable Metrics/BlockLength
 RSpec.describe Nslookupot::CLI do
   context 'Resource Record (RR) TYPEs' do
     let(:cli) do
@@ -21,6 +22,8 @@ RSpec.describe Nslookupot::CLI do
       expect(cli.s2typeclass('TXT')).to eq Resolv::DNS::Resource::IN::TXT
       expect(cli.s2typeclass('WKS')).to eq Resolv::DNS::Resource::IN::WKS
       expect(cli.s2typeclass('CAA')).to eq Resolv::DNS::Resource::IN::CAA
+      expect(cli.s2typeclass('SVCB')).to eq Resolv::DNS::Resource::IN::SVCB
+      expect(cli.s2typeclass('HTTPS')).to eq Resolv::DNS::Resource::IN::HTTPS
     end
 
     it 'could raise NameError' do
@@ -30,3 +33,4 @@ RSpec.describe Nslookupot::CLI do
     end
   end
 end
+# rubocop: enable Metrics/BlockLength.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nslookupot
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - thekuwayama
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: nslookup over TLS