nslookupot 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b5138121e6546a6dbb0bafd8598089a9c2d5d7d483acb06d2a813eb82087fa
-  data.tar.gz: a594f974a3530a3853db065572b8cb7348f15d7271a8dd6d37c00df0d9dbc9a5
+  metadata.gz: 6d0cd401150ed1287584d18e88c6f694832c815a457bc3009e8f81a8dec31b32
+  data.tar.gz: 8052893c2bc633f31507e48c164d8fd40e31d271e9d18cd79996615acb35fc2d
 SHA512:
-  metadata.gz: 027d8c572281ac6932f57568973a1180756e4bcca4f6fa2a7581073a05dfcc408e68102dbebf339fbb5e3e4d6e51db82694f46c375cf203a8224184895deb69c
-  data.tar.gz: 58fa8a50615b82c6515e1acfdb58976807e86e9114102398f27c567d6e9305e76eca664bc6ae7ed2f56b84a1ef9e599bd8408996863fe6c63a72734bfb8ef934
+  metadata.gz: f74d383dc494c2bf4c431e1efb05cde628d2643fb1e92d3575a6f463b78486e1557e706044f18127346299107d55dd68c15f145dcf473229853bb81743d43e67
+  data.tar.gz: 1a1a138a511184c23d7b19e1eee57ec48a5a8f347a13f2d002aed9f74d734ede131d00f300c3d512b70345cf153333e7d5b4c8556ce8640179008f03194c8241

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/Gemfile

@@ -5,10 +5,10 @@ source 'https://rubygems.org'
 gem 'caa_rr_patch'
 gem 'openssl'
 gem 'rake'
+gem 'svcb_rr_patch'
 
 group :test do
-  gem 'pry'
-  gem 'pry-byebug'
+  gem 'byebug'
   gem 'rspec', '3.8.0'
   gem 'rubocop', '0.78.0'
 end

data/README.md

@@ -1,7 +1,7 @@
 # nslookupot
 
 [![Gem Version](https://badge.fury.io/rb/nslookupot.svg)](https://badge.fury.io/rb/nslookupot)
-[![Build Status](https://travis-ci.org/thekuwayama/nslookupot.svg?branch=master)](https://travis-ci.org/thekuwayama/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).
@@ -24,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,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'caa_rr_patch'
 require 'resolv'
+require 'caa_rr_patch'
+require 'svcb_rr_patch'
 require 'socket'
 require 'openssl'
 require 'optparse'

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',

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.3'
+  VERSION = '0.0.7'
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nslookupot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - thekuwayama
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2021-07-21 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
@@ -66,7 +80,7 @@ homepage: https://github.com/thekuwayama/nslookupot
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -81,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: nslookup over TLS
 test_files:

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.6
-  - 2.7
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
-before_install:
-  - gem install bundler
-  - bundle install
-
-script: bundle exec rake