nicinfo 1.4.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bed82bd19fcdb26ad7a8ecd1e60e7e58322b829d
-  data.tar.gz: 44e8d9afd8b402f08797276494f15aa97b03a02c
+SHA256:
+  metadata.gz: 470a293eeb983a569b1c4c6b4efcf8db8362059964723fdbc0bb6dc92ccd3af0
+  data.tar.gz: ecc75c45646580c50bf742d75857d546227a2b52c375229665aa79c8d255d116
 SHA512:
-  metadata.gz: 1a1f67bc8329fefe746cb3db8b749f9cadb87bb6d33e1779ac6b7b1e4f28eddfff92f770a9eba32f0dbf8cd572bc52cdcaca8199d1ac6c13a3709388dd387972
-  data.tar.gz: ad70339067c3b81befa2206aef2e9c0aef63824387c4a480e8ff2af2cd866cc5efe8df0ac2be52455bbe8825e641e0857c98b027d9353caf83bb91a48d14364a
+  metadata.gz: c2ed93b9c261ed090e753f1b2ec20c28be87334be110eff77fba25e7ca96c9705320877482c448bfb5a6adf6451555fc1245bbda29ca1c1fd5aa9a0e7aad3baa
+  data.tar.gz: 66b285a0c792cb0b4dbabd5d4a62c79039723110c26489bea8f8e1ff1dd45ac7eb4926610faff5ba98ebd64ac4244f9b423e0795424d31fc329b5545f94d9c4c

data/lib/nicinfo/config.rb

@@ -315,9 +315,9 @@ cache:
 bootstrap:
 
   # The base or bootstrap URL. Specifying this will bypass all built-in bootstrapping.
-  #base_url: https://rdap.arin.net/bootstrap
+  #base_url: https://rdap-bootstrap.arin.net/bootstrap
 
-  help_root_url: https://rdap.arin.net/bootstrap
+  help_root_url: https://rdap-bootstrap.arin.net/bootstrap
 
   entity_root_url: https://rdap.arin.net/registry
 

data/lib/nicinfo/constants.rb

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

data/lib/nicinfo/demo/domain-dnr.json

@@ -506,9 +506,9 @@
     ],
     "links":[
         {
-            "value":"https://rdap.arin.net/bootstrap/domain/xn--fo-5ja.example",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/domain/xn--fo-5ja.example",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/domain/xn--fo-5ja.example"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/domain/xn--fo-5ja.example"
         }
     ],
     "port43":"whois.example.net",

data/lib/nicinfo/demo/entities.json

@@ -147,9 +147,9 @@
       ],
       "links": [
         {
-          "value": "https://rdap.arin.net/bootstrap/entity/entity-dnr",
+          "value": "https://rdap-bootstrap.arin.net/bootstrap/entity/entity-dnr",
           "rel": "self",
-          "href": "https://rdap.arin.net/bootstrap/entity/entity-dnr"
+          "href": "https://rdap-bootstrap.arin.net/bootstrap/entity/entity-dnr"
         }
       ],
       "port43": "whois.example.net",
@@ -286,9 +286,9 @@
       ],
       "links": [
         {
-          "value": "https://rdap.arin.net/bootstrap/entity/foo1",
+          "value": "https://rdap-bootstrap.arin.net/bootstrap/entity/foo1",
           "rel": "self",
-          "href": "https://rdap.arin.net/bootstrap/entity/foo1"
+          "href": "https://rdap-bootstrap.arin.net/bootstrap/entity/foo1"
         }
       ],
       "events": [

data/lib/nicinfo/demo/entity-dnr.json

@@ -123,9 +123,9 @@
     ],
     "links":[
         {
-            "value":"https://rdap.arin.net/bootstrap/entity/entity-dnr",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/entity/entity-dnr",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/entity/entity-dnr"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/entity/entity-dnr"
         }
     ],
     "port43":"whois.example.net",

data/lib/nicinfo/demo/entity-rir.json

@@ -132,9 +132,9 @@
     ],
     "links":[
         {
-            "value":"https://rdap.arin.net/bootstrap/entity/foo1",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/entity/foo1",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/entity/foo1"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/entity/foo1"
         }
     ],
     "events":[

data/lib/nicinfo/demo/error-code.json

@@ -14,7 +14,7 @@
             ],
             "links":[
                 {
-                    "value":"https://rdap.arin.net/bootstrap/entity/restricted",
+                    "value":"https://rdap-bootstrap.arin.net/bootstrap/entity/restricted",
                     "rel":"terms-of-service",
                     "type":"text/html",
                     "href":"http://www.example.com/tos.html"
@@ -28,7 +28,7 @@
             ],
             "links":[
                 {
-                    "value":"https://rdap.arin.net/bootstrap/entity/restricted",
+                    "value":"https://rdap-bootstrap.arin.net/bootstrap/entity/restricted",
                     "rel":"copyright",
                     "type":"text/html",
                     "href":"http://www.example.com/copyright.html"
@@ -43,7 +43,7 @@
             ],
             "links":[
                 {
-                    "value":"https://rdap.arin.net/bootstrap/entity/restricted",
+                    "value":"https://rdap-bootstrap.arin.net/bootstrap/entity/restricted",
                     "rel":"about",
                     "type":"text/html",
                     "href":"https://lists.arin.net/mailman/listinfo/arin-tech-discuss"

data/lib/nicinfo/demo/nameservers.json

@@ -45,9 +45,9 @@
         ],
         "links":[
           {
-            "value":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
           }
         ],
         "port43":"whois.example.net",
@@ -248,9 +248,9 @@
         ],
         "links":[
           {
-            "value":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
           }
         ],
         "port43":"whois.example.net",

data/lib/nicinfo/demo/ns.json

@@ -43,9 +43,9 @@
     ],
     "links":[
         {
-            "value":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
         }
     ],
     "port43":"whois.example.net",

data/lib/nicinfo/entity.rb

@@ -131,96 +131,98 @@ module NicInfo
     def process entity
       if ( vcard = get_vcard( entity ) ) != nil
         vcardElements = vcard[ 1 ]
-        if vcardElements.size == 0
+        if vcardElements.nil? || vcardElements.size == 0
           @config.conf_msgs << "jCard (vCard) is empty."
         elsif vcardElements[ 0 ][ 0 ] != "version"
           @config.conf_msgs << "jCard (vCard) does not have required version first element."
         end
-        vcardElements.each do |element|
-          if element[ 0 ] == "fn"
-            @fns << element[ 3 ]
-          end
-          if element[ 0 ] == "n"
-            name = ""
-            if element[ 3 ][ -1 ].instance_of? Array
-              name << element[ 3 ][ -1 ].join( ' ' )
+        if !vcardElements.nil?
+          vcardElements.each do |element|
+            if element[ 0 ] == "fn"
+              @fns << element[ 3 ]
             end
-            name << ' ' if name[-1] != ' '
-            name << element[ 3 ][ 1 ]
-            if element[ 3 ][ 2 ] && !element[ 3 ][ 2 ].empty?
-              name << " " << element[ 3 ][ 2 ]
+            if element[ 0 ] == "n"
+              name = ""
+              if element[ 3 ][ -1 ].instance_of? Array
+                name << element[ 3 ][ -1 ].join( ' ' )
+              end
+              name << ' ' if name[-1] != ' '
+              name << element[ 3 ][ 1 ]
+              if element[ 3 ][ 2 ] && !element[ 3 ][ 2 ].empty?
+                name << " " << element[ 3 ][ 2 ]
+              end
+              if element[ 3 ][ 3 ] && !element[ 3 ][ 3 ].empty?
+                name << " " << element[ 3 ][ 3 ]
+              end
+              name << " " << element[ 3 ][ 0 ]
+              if element[ 3 ][ -2 ].instance_of? Array
+                name << " " << element[ 3 ][ -2 ].join( ' ' )
+              end
+              @names << name.strip
             end
-            if element[ 3 ][ 3 ] && !element[ 3 ][ 3 ].empty?
-              name << " " << element[ 3 ][ 3 ]
+            if element[ 0 ] == "tel"
+              tel = Tel.new
+              if (type = element[ 1 ][ "type" ]) != nil
+                tel.type << type if type.instance_of? String
+                tel.type = type if type.instance_of? Array
+              end
+              if (str = element[ 3 ] ).start_with?( "tel:" )
+                tel.number=str[ /^tel\:([^;]*)/,1 ]
+                tel.ext=str[ /[^;]*ext=(.*)/,1 ]
+              else
+                tel.number=str
+              end
+              @phones << tel
             end
-            name << " " << element[ 3 ][ 0 ]
-            if element[ 3 ][ -2 ].instance_of? Array
-              name << " " << element[ 3 ][ -2 ].join( ' ' )
+            if element[ 0 ] == "email"
+              email = Email.new
+              if (type = element[ 1 ][ "type" ]) != nil
+                email.type << type if type.instance_of? String
+                email.type = type if type.instance_of? Array
+              end
+              email.addr=element[ 3 ]
+              @emails << email
             end
-            @names << name.strip
-          end
-          if element[ 0 ] == "tel"
-            tel = Tel.new
-            if (type = element[ 1 ][ "type" ]) != nil
-              tel.type << type if type.instance_of? String
-              tel.type = type if type.instance_of? Array
+            if element[ 0 ] == "adr"
+              adr = Adr.new
+              if (type = element[ 1 ][ "type" ]) != nil
+                adr.type << type if type.instance_of? String
+                adr.type = type if type.instance_of? Array
+              end
+              if (label = element[ 1 ][ "label" ]) != nil
+                adr.label = label.split( "\n" )
+              else
+                adr.pobox=element[ 3 ][ 0 ]
+                adr.extended=element[ 3 ][ 1 ]
+                adr.street=element[ 3 ][ 2 ]
+                adr.locality=element[ 3 ][ 3 ]
+                adr.region=element[ 3 ][ 4 ]
+                adr.postal=element[ 3 ][ 5 ]
+                adr.country=element[ 3 ][ 6 ]
+                adr.structured=true
+              end
+              @adrs << adr
             end
-            if (str = element[ 3 ] ).start_with?( "tel:" )
-              tel.number=str[ /^tel\:([^;]*)/,1 ]
-              tel.ext=str[ /[^;]*ext=(.*)/,1 ]
-            else
-              tel.number=str
+            if element[ 0 ] == "kind"
+              @kind = element[ 3 ]
             end
-            @phones << tel
-          end
-          if element[ 0 ] == "email"
-            email = Email.new
-            if (type = element[ 1 ][ "type" ]) != nil
-              email.type << type if type.instance_of? String
-              email.type = type if type.instance_of? Array
-            end
-            email.addr=element[ 3 ]
-            @emails << email
-          end
-          if element[ 0 ] == "adr"
-            adr = Adr.new
-            if (type = element[ 1 ][ "type" ]) != nil
-              adr.type << type if type.instance_of? String
-              adr.type = type if type.instance_of? Array
+            if element[ 0 ] == "title"
+              @titles << element[ 3 ]
             end
-            if (label = element[ 1 ][ "label" ]) != nil
-              adr.label = label.split( "\n" )
-            else
-              adr.pobox=element[ 3 ][ 0 ]
-              adr.extended=element[ 3 ][ 1 ]
-              adr.street=element[ 3 ][ 2 ]
-              adr.locality=element[ 3 ][ 3 ]
-              adr.region=element[ 3 ][ 4 ]
-              adr.postal=element[ 3 ][ 5 ]
-              adr.country=element[ 3 ][ 6 ]
-              adr.structured=true
+            if element[ 0 ] == "role"
+              @roles << element[ 3 ]
             end
-            @adrs << adr
-          end
-          if element[ 0 ] == "kind"
-            @kind = element[ 3 ]
-          end
-          if element[ 0 ] == "title"
-            @titles << element[ 3 ]
-          end
-          if element[ 0 ] == "role"
-            @roles << element[ 3 ]
-          end
-          if element[ 0 ] == "org"
-            org = Org.new
-            if (type = element[ 1 ][ "type" ]) != nil
-              org.type << type if type.instance_of? String
-              org.type = type if type.instance_of? Array
+            if element[ 0 ] == "org"
+              org = Org.new
+              if (type = element[ 1 ][ "type" ]) != nil
+                org.type << type if type.instance_of? String
+                org.type = type if type.instance_of? Array
+              end
+              names = element[ 3 ]
+              org.names << names if names.instance_of? String
+              org.names = org.names + names if names.instance_of? Array
+              @orgs << org
             end
-            names = element[ 3 ]
-            org.names << names if names.instance_of? String
-            org.names = org.names + names if names.instance_of? Array
-            @orgs << org
           end
         end
         if @fns.empty?

data/lib/nicinfo/nicinfo_main.rb

@@ -319,7 +319,8 @@ module NicInfo
       if data == nil
 
         @config.logger.trace("Issuing GET for " + url)
-        uri = URI.parse( URI::encode( url ) )
+        p = URI::Parser.new
+        uri = URI.parse( p.escape( url ) )
         req = Net::HTTP::Get.new(uri.request_uri)
         req["User-Agent"] = NicInfo::VERSION_LABEL
         req["Accept"] = NicInfo::RDAP_CONTENT_TYPE + ", " + NicInfo::JSON_CONTENT_TYPE
@@ -376,7 +377,8 @@ module NicInfo
     def get_file_via_http url, file_name, try
 
       @config.logger.trace("Downloading " + url + " to " + file_name )
-      uri = URI.parse( URI::encode( url ) )
+      p = URI::Parser.new
+      uri = URI.parse( p.escape( url ) )
       req = Net::HTTP::Get.new(uri.request_uri)
       req["User-Agent"] = NicInfo::VERSION_LABEL
       req["Accept"] = NicInfo::JSON_CONTENT_TYPE
@@ -937,7 +939,7 @@ HELP_SUMMARY
 
     # Creates a query type
     def create_resource_url(args, queryType)
-
+      p = URI::Parser.new
       path = ""
       case queryType
         when QueryType::BY_IP4_ADDR
@@ -959,15 +961,15 @@ HELP_SUMMARY
           path = tree.find_rest_ref(args[0])
           raise ArgumentError.new("Unable to find result for " + args[0]) unless path
         when QueryType::BY_ENTITY_HANDLE
-          path << "entity/" << URI.escape( args[ 0 ] )
+          path << "entity/" << p.escape( args[ 0 ] )
         when QueryType::SRCH_ENTITY_BY_NAME
           case args.length
             when 1
-              path << "entities?fn=" << URI.escape( args[ 0 ] )
+              path << "entities?fn=" << p.escape( args[ 0 ] )
             when 2
-              path << "entities?fn=" << URI.escape( args[ 0 ] + " " + args[ 1 ] )
+              path << "entities?fn=" << p.escape( args[ 0 ] + " " + args[ 1 ] )
             when 3
-              path << "entities?fn=" << URI.escape( args[ 0 ] + " " + args[ 1 ] + " " + args[ 2 ] )
+              path << "entities?fn=" << p.escape( args[ 0 ] + " " + args[ 1 ] + " " + args[ 2 ] )
           end
         when QueryType::SRCH_DOMAIN_BY_NAME
           path << "domains?name=" << args[ 0 ]

data/lib/nicinfo/utils.rb

@@ -20,8 +20,9 @@ require 'nicinfo/config'
 module NicInfo
 
   def NicInfo.make_safe( url )
-    safe = URI.escape( url )
-    safe = URI.escape( safe, "!*'();:@&=+$,/?#[]" )
+    p = URI::Parser.new
+    safe = p.escape( url )
+    safe = p.escape( safe, "!*'();:@&=+$,/?#[]" )
     return safe
   end
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nicinfo
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Andrew Newton
-autorequire: 
+- Garth Dubin
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2022-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -16,20 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.3
 description: A command-line RDAP client.
-email: andy@arin.net
+email: gdubin@arin.net
 executables:
 - nicinfo
 extensions: []
@@ -120,7 +115,7 @@ homepage: https://github.com/arinlabs/nicinfo
 licenses:
 - ISC
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,9 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: RDAP Client
 test_files: []