nicinfo 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9c3a6d1d9737c9ae846f04b29351a2fbe1108b8
-  data.tar.gz: 5d883318b59fb2b3a724e68ef16b639c575795dd
+  metadata.gz: 9795d629df0b8254d5212d7e9a7f061a3fd10e67
+  data.tar.gz: f0b0c40fbab2073c77359e3455e275fb0e17ef67
 SHA512:
-  metadata.gz: d2d70dbb2e402d33e1a2b92d428ecfabe7cf75ac5ea27e62b1d5b89f45172e857a3677ca6786a15a67e1c699ff1806aa7efce0fd1438e4833eba512103a1d03c
-  data.tar.gz: 43c5b70f9b9ad4d618002a57ad348f11b7ffa31bebca9f5a097feeae45b0d6608b86f492ee6bff87143d7edcf36c5815fa3c901c917dae57499365c5c9480910
+  metadata.gz: bd00e71e41d422e1f500cf429f643a58c9baf65e5d345918059a9a103f2f698af2ba6717437023cc702c56f56fdf759aebaa546b5bf269cbf7e9b1574e2a1b9b
+  data.tar.gz: 755ecf67a76d635483a4583aa7605aeb88fa5a6f036afe6d92a5fa63240d8b7dc625a12562ba5a1f8ef9d2713e2e5d669d4a4e74dbfb285d4e632e13c38ac519

data/lib/nicinfo/bsfiles/asn.json

@@ -1,6 +1,6 @@
 {
   "description": "RDAP bootstrap file for Autonomous System Number allocations",
-  "publication": "2015-08-11T00:09:31Z",
+  "publication": "2017-10-05T15:42:54Z",
   "services": [
     [
       [
@@ -324,11 +324,14 @@
         "58368-59391",
         "63488-63999",
         "64000-64098",
+        "64297-64395",
         "131072-132095",
         "132096-133119",
         "133120-133631",
         "133632-134556",
-        "134557-135580"
+        "134557-135580",
+        "135581-136505",
+        "136506-137529"
       ],
       [
         "https://rdap.apnic.net/"
@@ -1379,7 +1382,9 @@
         "62464-63487",
         "64198-64296",
         "393216-394239",
-        "394240-395164"
+        "394240-395164",
+        "395165-396188",
+        "396189-397212"
       ],
       [
         "https://rdap.arin.net/registry",
@@ -1624,6 +1629,7 @@
         "59392-60415",
         "60416-61439",
         "61952-62463",
+        "64396-64495",
         "196608-197631",
         "197632-198655",
         "198656-199679",
@@ -1631,7 +1637,10 @@
         "200192-201215",
         "201216-202239",
         "202240-203263",
-        "203264-204287"
+        "203264-204287",
+        "204288-205211",
+        "205212-206235",
+        "206236-207259"
       ],
       [
         "https://rdap.db.ripe.net/"
@@ -2320,7 +2329,10 @@
         "262144-263167",
         "263168-263679",
         "263680-264604",
-        "264605-265628"
+        "264605-265628",
+        "265629-266652",
+        "266653-267676",
+        "267677-268700"
       ],
       [
         "https://rdap.lacnic.net/rdap/"
@@ -2328,4 +2340,4 @@
     ]
   ],
   "version": "1.0"
-}
+}

data/lib/nicinfo/bsfiles/dns.json

@@ -1,6 +1,6 @@
 {
   "description": "RDAP bootstrap file for Domain Name System registrations",
-  "publication": "2017-10-05T15:42:56Z",
+  "publication": "2017-10-31T04:42:05Z",
   "services": [
     [
       [
@@ -8,7 +8,7 @@
         "net"
       ],
       [
-        "https://rdap-pilot.verisignlabs.com"
+        "https://rdap-pilot.verisignlabs.com/rdap/v1/"
       ]
     ],
     [
@@ -37,4 +37,4 @@
     ]
   ],
   "version": "1.0"
-}
+}

data/lib/nicinfo/constants.rb

@@ -18,7 +18,7 @@
 
 module NicInfo
 
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
   VERSION_LABEL = "NicInfo v." + VERSION
   COPYRIGHT = "Copyright (c) 2011-2017 American Registry for Internet Numbers (ARIN)"
   CONFIG_VERSION = 3

data/lib/nicinfo/nicinfo_main.rb

@@ -285,7 +285,7 @@ module NicInfo
     end
 
     # Do an HTTP GET with the path.
-    def get url, try
+    def get url, try, expect_rdap = true
 
       data = @cache.get(url)
       if data == nil
@@ -310,7 +310,7 @@ module NicInfo
           if @config.config[ NicInfo::SECURITY ][ NicInfo::TRY_INSECURE ]
             @config.logger.mesg( "Secure connection failed. Trying insecure connection." )
             uri.scheme = "http"
-            return get( uri.to_s, try )
+            return get( uri.to_s, try, expect_rdap )
           else
             raise e
           end
@@ -319,11 +319,13 @@ module NicInfo
         case res
           when Net::HTTPSuccess
             content_type = res[ "content-type" ].downcase
-            unless content_type.include?(NicInfo::RDAP_CONTENT_TYPE) or content_type.include?(NicInfo::JSON_CONTENT_TYPE)
-              raise Net::HTTPServerException.new("Bad Content Type", res)
-            end
-            if content_type.include? NicInfo::JSON_CONTENT_TYPE
-              @config.conf_msgs << "Server responded with non-RDAP content type but it is JSON"
+            if expect_rdap
+              unless content_type.include?(NicInfo::RDAP_CONTENT_TYPE) or content_type.include?(NicInfo::JSON_CONTENT_TYPE)
+                raise Net::HTTPServerException.new("Bad Content Type", res)
+              end
+              if content_type.include? NicInfo::JSON_CONTENT_TYPE
+                @config.conf_msgs << "Server responded with non-RDAP content type but it is JSON"
+              end
             end
             data = res.body
             @cache.create_or_update(url, data)
@@ -331,7 +333,7 @@ module NicInfo
             if res.code == "301" or res.code == "302" or res.code == "303" or res.code == "307" or res.code == "308"
               res.error! if try >= 5
               location = res["location"]
-              return get( location, try + 1)
+              return get( location, try + 1, expect_rdap)
             end
             res.error!
         end #end case
@@ -426,7 +428,7 @@ module NicInfo
 
       if @config.options.argv[0] == '.'
         @config.logger.mesg( "Obtaining current IP Address...")
-        data = get("https://stat.ripe.net/data/whats-my-ip/data.json", 0)
+        data = get("https://stat.ripe.net/data/whats-my-ip/data.json", 0, false )
         json_data = JSON.load(data)
 
         if json_data["data"] == nil || json_data["data"]["ip"] == nil
@@ -434,6 +436,7 @@ module NicInfo
           @config.logger.mesg("Unable to determine your IP Address. You must specify it.")
           exit
         elsif
+          @config.logger.mesg("Your IP address is " + json_data["data"]["ip"])
           @config.options.argv[0] = json_data["data"]["ip"]
         end
       end
@@ -500,172 +503,6 @@ module NicInfo
           display_rdap_query( json_data, true )
       end
 
-=begin
-      if @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] == nil && !@config.options.url
-        bootstrap = Bootstrap.new( @config )
-        qtype = @config.options.query_type
-        if qtype == QueryType::BY_SERVER_HELP
-          qtype = guess_query_value_type( @config.options.argv )
-        end
-        case qtype
-          when QueryType::BY_IP4_ADDR
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_ip( @config.options.argv[ 0 ] )
-          when QueryType::BY_IP6_ADDR
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_ip( @config.options.argv[ 0 ] )
-          when QueryType::BY_IP4_CIDR
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_ip( @config.options.argv[ 0 ] )
-          when QueryType::BY_IP6_CIDR
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_ip( @config.options.argv[ 0 ] )
-          when QueryType::BY_AS_NUMBER
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_as( @config.options.argv[ 0 ] )
-          when QueryType::BY_DOMAIN
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_domain( @config.options.argv[ 0 ] )
-          when QueryType::BY_NAMESERVER
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_domain( @config.options.argv[ 0 ] )
-          when QueryType::BY_ENTITY_HANDLE
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_entity( @config.options.argv[ 0 ] )
-          when QueryType::SRCH_ENTITY_BY_NAME
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::ENTITY_ROOT_URL ]
-          when QueryType::SRCH_DOMAIN_BY_NAME
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_domain( @config.options.argv[ 0 ] )
-          when QueryType::SRCH_DOMAIN_BY_NSNAME
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_domain( @config.options.argv[ 0 ] )
-          when QueryType::SRCH_DOMAIN_BY_NSIP
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::DOMAIN_ROOT_URL ]
-          when QueryType::SRCH_NS_BY_NAME
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_domain( @config.options.argv[ 0 ] )
-          when QueryType::SRCH_NS_BY_IP
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = bootstrap.find_url_by_ip( @config.options.argv[ 0 ] )
-          else
-            @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] = @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::HELP_ROOT_URL ]
-        end
-      end
-
-      begin
-        rdap_url = nil
-        unless @config.options.url
-          path = create_resource_url(@config.options.argv, @config.options.query_type)
-          rdap_url = make_rdap_url(@config.config[NicInfo::BOOTSTRAP][NicInfo::BOOTSTRAP_URL], path)
-        else
-          rdap_url = @config.options.argv[0]
-        end
-        data = get( rdap_url, 0 )
-        json_data = JSON.load data
-        if (ec = json_data[ NicInfo::NICINFO_DEMO_ERROR ]) != nil
-          res = MyHTTPResponse.new( "1.1", ec, "Demo Exception" )
-          res["content-type"] = NicInfo::RDAP_CONTENT_TYPE
-          res.body=data
-          raise Net::HTTPServerException.new( "Demo Exception", res )
-        end
-        inspect_rdap_compliance json_data
-        cache_self_references json_data
-        if @config.options.output_json
-          @config.logger.raw( DataAmount::TERSE_DATA, data, false )
-        elsif @config.options.json_values
-          @config.options.json_values.each do |value|
-            @config.logger.raw( DataAmount::TERSE_DATA, eval_json_value( value, json_data), false )
-          end
-        else
-          Notices.new.display_notices json_data, @config, @config.options.query_type == QueryType::BY_SERVER_HELP
-          if @config.options.query_type != QueryType::BY_SERVER_HELP
-            result_type = get_query_type_from_result( json_data )
-            if result_type != nil
-              if result_type != @config.options.query_type
-                @config.logger.mesg( "Query type is " + @config.options.query_type + ". Result type is " + result_type + "." )
-              else
-                @config.logger.mesg( "Result type is " + result_type + "." )
-              end
-              @config.options.query_type = result_type
-            elsif json_data[ "errorCode" ] == nil
-              @config.conf_msgs << "Response has no result type."
-            end
-            data_tree = DataTree.new( )
-            case @config.options.query_type
-              when QueryType::BY_IP4_ADDR
-                NicInfo::display_ip( json_data, @config, data_tree )
-              when QueryType::BY_IP6_ADDR
-                NicInfo::display_ip( json_data, @config, data_tree )
-              when QueryType::BY_IP4_CIDR
-                NicInfo::display_ip( json_data, @config, data_tree )
-              when QueryType::BY_IP6_CIDR
-                NicInfo::display_ip( json_data, @config, data_tree )
-              when QueryType::BY_IP
-                NicInfo::display_ip( json_data, @config, data_tree )
-              when QueryType::BY_AS_NUMBER
-                NicInfo::display_autnum( json_data, @config, data_tree )
-              when "NicInfo::DsData"
-                NicInfo::display_ds_data( json_data, @config, data_tree )
-              when "NicInfo::KeyData"
-                NicInfo::display_key_data( json_data, @config, data_tree )
-              when QueryType::BY_DOMAIN
-                NicInfo::display_domain( json_data, @config, data_tree )
-              when QueryType::BY_NAMESERVER
-                NicInfo::display_ns( json_data, @config, data_tree )
-              when QueryType::BY_ENTITY_HANDLE
-                NicInfo::display_entity( json_data, @config, data_tree )
-              when QueryType::SRCH_DOMAINS
-                NicInfo::display_domains( json_data, @config, data_tree )
-              when QueryType::SRCH_DOMAIN_BY_NAME
-                NicInfo::display_domains( json_data, @config, data_tree )
-              when QueryType::SRCH_DOMAIN_BY_NSNAME
-                NicInfo::display_domains( json_data, @config, data_tree )
-              when QueryType::SRCH_DOMAIN_BY_NSIP
-                NicInfo::display_domains( json_data, @config, data_tree )
-              when QueryType::SRCH_ENTITY_BY_NAME
-                NicInfo::display_entities( json_data, @config, data_tree )
-              when QueryType::SRCH_NS
-                NicInfo::display_nameservers( json_data, @config, data_tree )
-              when QueryType::SRCH_NS_BY_NAME
-                NicInfo::display_nameservers( json_data, @config, data_tree )
-              when QueryType::SRCH_NS_BY_IP
-                NicInfo::display_nameservers( json_data, @config, data_tree )
-            end
-            @config.save_as_yaml( NicInfo::LASTTREE_YAML, data_tree ) if !data_tree.empty?
-            show_search_results_truncated json_data
-            show_conformance_messages
-            show_helpful_messages json_data, data_tree
-          end
-        end
-        @config.logger.end_run
-      rescue JSON::ParserError => a
-        @config.logger.mesg( "Server returned invalid JSON!" )
-      rescue SocketError => a
-        @config.logger.mesg(a.message)
-      rescue ArgumentError => a
-        @config.logger.mesg(a.message)
-      rescue Net::HTTPServerException => e
-        case e.response.code
-          when "200"
-            @config.logger.mesg( e.message )
-          when "401"
-            @config.logger.mesg("Authorization is required.")
-            handle_error_response e.response
-          when "404"
-            @config.logger.mesg("Query yielded no results.")
-            handle_error_response e.response
-          else
-            @config.logger.mesg("Error #{e.response.code}.")
-            handle_error_response e.response
-        end
-        @config.logger.trace("Server response code was " + e.response.code)
-      rescue Net::HTTPFatalError => e
-        case e.response.code
-          when "500"
-            @config.logger.mesg("RDAP server is reporting an internal error.")
-            handle_error_response e.response
-          when "501"
-            @config.logger.mesg("RDAP server does not implement the query.")
-            handle_error_response e.response
-          when "503"
-            @config.logger.mesg("RDAP server is reporting that it is unavailable.")
-            handle_error_response e.response
-          else
-            @config.logger.mesg("Error #{e.response.code}.")
-            handle_error_response e.response
-        end
-        @config.logger.trace("Server response code was " + e.response.code)
-      end
-=end
 
     end
 
@@ -872,9 +709,10 @@ SUMMARY
   NicInfo is a Registry Data Access Protocol (RDAP) client capable of querying RDAP
   servers containing IP address, Autonomous System, and Domain name information.
 
-  The general usage is "nicinfo QUERY_VALUE" where the type of QUERY_VALUE influences the
-  type of query performed. This program will attempt to guess the type of QUERY_VALUE,
-  but the QUERY_VALUE type maybe explicitly set using the -t option.
+  The general usage is "nicinfo QUERY_VALUE" where the QUERY_VALUE is an IP address,
+  autonomous system number, or domain name. The type of query to perform is implicitly
+  determined but maybe explicitly set using the -t option. When the QUERY_VALUE is simply
+  a dot or period character (e.g. "."), the IP address of the client is implied.
 
   Given the type of query to perform, this program will attempt to use the most appropriate
   RDAP server it can determine, and follow referrals from that server if necessary.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nicinfo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Andrew Newton
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: RDAP Client