nslookupot 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0846a02a74eb40953b233d52b2b8f38f12414f8b3bf9c06c7eb2603129100428'
-  data.tar.gz: ab65aa27f3980d3bad019c6711258111da627298a3a07e63deb781550dda7ed3
+  metadata.gz: b9f55a82dd8b59575552ff6ec51ce460d3960edc9802ae7b0ad7b34acf9ecdb2
+  data.tar.gz: f5fafc615a8bcd14b230f29ca719dd43bebd48a4e91bbabd449936ad1ef20df2
 SHA512:
-  metadata.gz: 4ef75c8b9bd0b4acebec3255714f853a1b777f2e0132d9018dd094b5ff394e063439e68dc9f60621558964e5f73e4a0d2b332978b33078b54c29513f50ca94fd
-  data.tar.gz: aa3653f20ebd41e739f9d7aa7c24356ad037b6d333aed83da6f8d7c9b33d82f39c50a516229cb547222b3e309bc309543dc51ad21d7d6f05c9c41d84a9fad7b2
+  metadata.gz: 4f9c2a07724a2f6ee9cb15b396360bd47e5a33ca7b17eb3be151cbc93d1c2111a91c60dbe362a7277af0cc646a556279ccfca08e7e3328cade8acb453bcdd273
+  data.tar.gz: 3663e91a31ac98e0d638be5bc182b66c776322fe7aeb0d6ad92d6cfea6a4d6b4d7a0ea885935cf797534d24f9c69eb1d622127765fecc088d86b842209e95de7

data/.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6.x', '2.7.x']
+    steps:
+      - name: Set up Ruby
+        uses: actions/setup-ruby@v1
+      - uses: actions/checkout@v1
+      - name: Install dependencies
+        run: |
+          gem --version
+          gem install bundler
+          bundle --version
+          bundle install
+      - name: Run test
+        run: |
+          bundle exec rake

data/.rubocop.yml

@@ -16,5 +16,5 @@ Metrics/AbcSize:
 Metrics/MethodLength:
   Max: 30
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   MinNameLength: 1

data/Gemfile

@@ -2,14 +2,14 @@
 
 source 'https://rubygems.org'
 
+gem 'caa_rr_patch'
 gem 'openssl'
 gem 'rake'
 
 group :test do
-  gem 'pry'
-  gem 'pry-byebug'
+  gem 'byebug'
   gem 'rspec', '3.8.0'
-  gem 'rubocop', '0.68.1'
+  gem 'rubocop', '0.78.0'
 end
 
 gemspec

data/README.md

@@ -1,6 +1,7 @@
 # nslookupot
 
-[![Build Status](https://travis-ci.org/thekuwayama/nslookupot.svg?branch=master)](https://travis-ci.org/thekuwayama/nslookupot)
+[![Gem Version](https://badge.fury.io/rb/nslookupot.svg)](https://badge.fury.io/rb/nslookupot)
+[![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).
@@ -23,6 +24,7 @@ Usage: nslookupot [options] name
     -s, --server VALUE               the name server IP address        (default 1.1.1.1)
     -p, --port VALUE                 the name server port number       (default 853)
     -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)
 ```
 

data/lib/nslookupot.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'caa_rr_patch'
 require 'resolv'
 require 'socket'
 require 'openssl'

data/lib/nslookupot/cli.rb

@@ -12,7 +12,8 @@ module Nslookupot
       opts = {
         server: '1.1.1.1',
         port: 853,
-        hostname: 'cloudflare-dns.com'
+        hostname: 'cloudflare-dns.com',
+        check_sni: true
       }
       type = 'A'
 
@@ -40,6 +41,14 @@ module Nslookupot
         opts[:hostname] = v
       end
 
+      op.on(
+        '-n',
+        '--no-check-sni',
+        "no check SNI                      (default #{!opts[:check_sni]})"
+      ) do
+        opts[:check_sni] = false
+      end
+
       op.on(
         '-t',
         '--type VALUE',
@@ -52,21 +61,21 @@ module Nslookupot
       begin
         args = op.parse(argv)
       rescue OptionParser::InvalidOption => e
-        puts op.to_s
-        puts "error: #{e.message}"
+        warn op.to_s
+        warn "error: #{e.message}"
         exit 1
       end
 
       begin
         type = s2typeclass(type)
       rescue NameError
-        puts "error: unknown query type #{type}"
+        warn "error: unknown query type #{type}"
         exit 1
       end
 
       if args.size != 1
-        puts op.to_s
-        puts 'error: number of arguments is not 1'
+        warn op.to_s
+        warn 'error: number of arguments is not 1'
         exit 1
       end
 
@@ -75,20 +84,23 @@ module Nslookupot
     # rubocop: enable Metrics/MethodLength
 
     def s2typeclass(s)
-      Resolv::DNS::Resource::IN.const_get(s.upcase)
+      rr = Resolv::DNS::Resource::IN.const_get(s.upcase)
+      raise NameError unless rr < Resolv::DNS::Resource
+
+      rr
     end
 
     def run
       opts, name, type = parse_options
 
-      resolver = Nslookupot::Resolver.new(opts)
+      resolver = Nslookupot::Resolver.new(**opts)
       puts 'Address:'.ljust(16) + opts[:server] + '#' + opts[:port].to_s
       puts '--'
       resolver.resolve_resources(name, type).each do |rr|
         puts 'Name:'.ljust(16) + name
-        rr.instance_variables.each do |v|
-          k = (v[1..].capitalize + ':').ljust(16)
-          v = rr.instance_variable_get(v).to_s
+        rr.instance_variables.each do |var|
+          k = (var[1..].capitalize + ':').ljust(16)
+          v = rr.instance_variable_get(var).to_s
           puts k + v
         end
         puts ''

data/lib/nslookupot/resolver.rb

@@ -5,11 +5,17 @@ module Nslookupot
     # @param server [String]
     # @param port [Integer]
     # @param hostname [String]
-    def initialize(server: '1.1.1.1', port: 853,
-                   hostname: 'cloudflare-dns.com')
+    # @param check_sni [bool]
+    def initialize(
+      server: '1.1.1.1',
+      port: 853,
+      hostname: 'cloudflare-dns.com',
+      check_sni: true
+    )
       @server = server
       @port = port
       @hostname = hostname # for SNI
+      @check_sni = check_sni
     end
 
     # @param name [String]
@@ -70,10 +76,16 @@ module Nslookupot
     def gen_sock
       ts = TCPSocket.new(@server, @port)
       ctx = OpenSSL::SSL::SSLContext.new('TLSv1_2')
+      ctx.alpn_protocols = ['dot']
       sock = OpenSSL::SSL::SSLSocket.new(ts, ctx)
       sock.sync_close = true
-      sock.connect
-      sock.post_connection_check(@hostname)
+      if @check_sni
+        sock.hostname = @hostname
+        sock.connect
+        sock.post_connection_check(@hostname)
+      else
+        sock.connect
+      end
 
       sock
     end

data/lib/nslookupot/version.rb

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

data/nslookupot.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.executables   = ['nslookupot']
 
   spec.add_development_dependency 'bundler'
+  spec.add_dependency             'caa_rr_patch'
   spec.add_dependency             'openssl'
 end

data/spec/cli_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative 'spec_helper'
+
+RSpec.describe Nslookupot::CLI do
+  context 'Resource Record (RR) TYPEs' do
+    let(:cli) do
+      Nslookupot::CLI.new
+    end
+
+    it 'could return the typeclass object' do
+      expect(cli.s2typeclass('A')).to eq Resolv::DNS::Resource::IN::A
+      expect(cli.s2typeclass('AAAA')).to eq Resolv::DNS::Resource::IN::AAAA
+      expect(cli.s2typeclass('CNAME')).to eq Resolv::DNS::Resource::IN::CNAME
+      expect(cli.s2typeclass('HINFO')).to eq Resolv::DNS::Resource::IN::HINFO
+      expect(cli.s2typeclass('MINFO')).to eq Resolv::DNS::Resource::IN::MINFO
+      expect(cli.s2typeclass('MX')).to eq Resolv::DNS::Resource::IN::MX
+      expect(cli.s2typeclass('NS')).to eq Resolv::DNS::Resource::IN::NS
+      expect(cli.s2typeclass('PTR')).to eq Resolv::DNS::Resource::IN::PTR
+      expect(cli.s2typeclass('SOA')).to eq Resolv::DNS::Resource::IN::SOA
+      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
+    end
+
+    it 'could raise NameError' do
+      expect { cli.s2typeclass('ANY') }.to raise_error(NameError)
+      expect { cli.s2typeclass('ClassValue') }.to raise_error(NameError)
+      expect { cli.s2typeclass('hoge') }.to raise_error(NameError)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nslookupot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.6
 platform: ruby
 authors:
 - thekuwayama
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: caa_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'
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -46,9 +60,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -59,13 +73,14 @@ files:
 - lib/nslookupot/resolver.rb
 - lib/nslookupot/version.rb
 - nslookupot.gemspec
+- spec/cli_spec.rb
 - spec/resolver_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/thekuwayama/nslookupot
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,10 +95,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: nslookup over TLS
 test_files:
+- spec/cli_spec.rb
 - spec/resolver_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,17 +0,0 @@
-sudo: false
-
-language: ruby
-
-rvm:
-  - 2.6.3
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
-before_install:
-  - gem install bundler
-  - bundle install
-
-script: bundle exec rake