nicinfo 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5fa366b19d52c697ed3b9beb65369186526be04
-  data.tar.gz: 902ebca0583c04b04a124f42ea3dfb76d9addbe5
+  metadata.gz: cc53cf86fdc483ebfdeb1cf5830173051059064b
+  data.tar.gz: 1786695e0c763541c50e474cdd19c83138eb6795
 SHA512:
-  metadata.gz: 4690149f62fc7a1c8fd1b91af76544ea64ed4373cf95b1b6f0633ba48f12fcc89cc37ca2e3f365ceb6f5a094449a3b3a625fca5a52990911da3d0a110d22d1c6
-  data.tar.gz: a43cdd24bcae1d910a97e92722e732cac56ab33b28b524b15b399ce8821281829e1d8503777776dec1bd962578db29364a6590ba04c04233e289b3bd181e2e5a
+  metadata.gz: 85f41c0a8a3e6951d6753e982984f38d3f682f4f440563899d5ccc8aae6a68e9fa3c300831aec1706d5caa583d8f50e66f4ff1ed239f0455ecb21b7349442aa1
+  data.tar.gz: bfc5ed2d82280bc4d095d2c7a42b82beff0f631bcf936550e8e413d547c0d9148b634bd9c37fe8251ad4b1e2c6f31d2801f38df8228e46cd4f1729e6391d8d93

data/lib/nicinfo/autnum.rb

@@ -48,7 +48,7 @@ module NicInfo
       @config.logger.start_data_item
       @config.logger.data_title "[ AS NUMBER ]"
       @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
-      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
+      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass, "autnum", @config )
       endNum = NicInfo.get_endAutnum @objectclass
       startNum = NicInfo.get_startAutnum @objectclass
       if endNum

data/lib/nicinfo/cache.rb

@@ -106,36 +106,6 @@ module NicInfo
       return count
     end
 
-    def get_last
-      cache_files = Dir::entries(@config.rdap_cache_dir)
-      last_file = nil
-      last_file_mtime = nil
-      cache_files.each do |file|
-        full_file_name = File.join(@config.rdap_cache_dir, file)
-        if !file.start_with?(".")
-          mtime = File.mtime(full_file_name)
-          if last_file == nil
-            last_file = full_file_name
-            last_file_mtime = mtime
-          elsif mtime > last_file_mtime
-            last_file = full_file_name
-            last_file_mtime = mtime
-          end
-        end
-      end
-      if last_file
-        f = File.open(last_file, "r")
-        data = ''
-        f.each_line do |line|
-          data += line
-        end
-        f.close
-        return [last_file, last_file_mtime, data]
-      end
-      #else
-      return nil
-    end
-
   end
 
 end

data/lib/nicinfo/common_json.rb

@@ -204,6 +204,25 @@ module NicInfo
       end
     end
 
+    def display_simple_links links
+      if links
+        if links.instance_of?( Array )
+          alternate = NicInfo.get_alternate_link links
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "More", alternate, NicInfo::AttentionType::SECONDARY if alternate
+          about = NicInfo.get_about_link links
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "About", about, NicInfo::AttentionType::SECONDARY if about
+          tos = NicInfo.get_tos_link links
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "TOS", tos, NicInfo::AttentionType::SECONDARY if tos
+          copyright = NicInfo.get_copyright_link links
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "(C)", copyright, NicInfo::AttentionType::SECONDARY if copyright
+          license = NicInfo.get_license_link links
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "License", license, NicInfo::AttentionType::SECONDARY if license
+        else
+          @config.conf_msgs << "'links' is not an array."
+        end
+      end
+    end
+
   end
 
   class EventActor

data/lib/nicinfo/constants.rb

@@ -18,7 +18,7 @@
 
 module NicInfo
 
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
   VERSION_LABEL = "NicInfo v." + VERSION
   COPYRIGHT = "Copyright (c) 2011-2017 American Registry for Internet Numbers (ARIN)"
   CONFIG_VERSION = 4
@@ -43,7 +43,7 @@ module NicInfo
   IPV6_REGEX = /\A(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\z/
   IPV6_HEXCOMPRESS_REGEX = /\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)\z/
 
-  #File Name Constants
+  # File Name Constants
   LASTTREE_YAML          = "lasttree.yaml"
   DEMO_DIR               = "demo"
   BOOTSTRAP_FILE_DIR     = "bsfiles"
@@ -53,6 +53,21 @@ module NicInfo
   IPV4_BOOTSTRAP         = "ipv4.json"
   IPV6_BOOTSTRAP         = "ipv6.json"
 
+  # JCR Constants
+  JCR_DIR                    = "jcr"
+  RDAP_JCR                   = "rdap.jcr"
+  STRICT_RDAP_JCR            = "strict.jcr"
+  JCR_ROOT_ENTITY            = "entity_response"
+  JCR_ROOT_NAMESERVER        = "nameserver_response"
+  JCR_ROOT_DOMAIN            = "domain_response"
+  JCR_ROOT_NETWORK           = "network_response"
+  JCR_ROOT_AUTNUM            = "autnum_response"
+  JCR_ROOT_ERROR             = "error_response"
+  JCR_ROOT_HELP              = "help_response"
+  JCR_ROOT_DOMAIN_SEARCH     = "domainSearch_response"
+  JCR_ROOT_NAMESERVER_SEARCH = "nameserverSearch_response"
+  JCR_ROOT_ENTITY_SEARCH     = "entitySearch_response"
+
   # Config constants
   OUTPUT = "output"
   MESSAGES = "messages"

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

@@ -20,6 +20,35 @@
                     "href":"http://www.example.com/tos.html"
                 }
             ]
+        },
+        {
+            "title":"Copyright",
+            "description":[
+                "This test data is Copyright (C) 2015-2018 ARIN."
+            ],
+            "links":[
+                {
+                    "value":"https://rdap.arin.net/bootstrap/entity/restricted",
+                    "rel":"copyright",
+                    "type":"text/html",
+                    "href":"http://www.example.com/copyright.html"
+                }
+            ]
+        },
+        {
+            "title":"About",
+            "description":[
+                "Questions regarding ARIN's RDAP service should be sent to arin-tech-discuss@arin.net.",
+                "See our mailing list for more info."
+            ],
+            "links":[
+                {
+                    "value":"https://rdap.arin.net/bootstrap/entity/restricted",
+                    "rel":"about",
+                    "type":"text/html",
+                    "href":"https://lists.arin.net/mailman/listinfo/arin-tech-discuss"
+                }
+            ]
         }
     ],
     "errorCode":418,

data/lib/nicinfo/demo/nameservers.json

@@ -27,8 +27,9 @@
     "nameserverSearchResults": [
       {
         "handle":"XXXX",
+        "objectClassName" : "nameserver",
         "ldhName":"ns1.xn--fo-5ja.example",
-        "unicodeName":"foo.example",
+        "unicodeName":"ns1.foo.example",
         "status":[ "active" ],
         "ipAddresses":{
           "v4":[ "192.0.2.1", "192.0.2.2" ],
@@ -229,9 +230,9 @@
       },
       {
         "handle":"XXXX2",
-        "objectClassName":"domain",
+        "objectClassName":"nameserver",
         "ldhName":"ns1.xn--fo-5ja.example",
-        "unicodeName":"foo.example",
+        "unicodeName":"ns1.foo.example",
         "status":[ "active" ],
         "ipAddresses":{
           "v4":[ "192.0.2.1", "192.0.2.2" ],

data/lib/nicinfo/demo/ns-simple.json

@@ -1,6 +1,6 @@
 {
-    "nicInfo_demoUrl" : "https://rdap.arin.net/registry/nameserver/ns2.example.com",
-    "nicInfo_demoHint" : "nicinfo ns2.example.com",
+    "nicInfo_demoUrl" : "https://rdap.arin.net/registry/nameserver/ns2.example.example",
+    "nicInfo_demoHint" : "nicinfo ns2.example.example",
     "rdapConformance":[
         "rdap_level_0"
     ],

data/lib/nicinfo/demo/ns-very-simple.json

@@ -1,6 +1,6 @@
 {
-    "nicInfo_demoUrl" : "https://rdap.arin.net/registry/nameserver/ns1.example.com",
-    "nicInfo_demoHint" : "nicinfo ns1.example.com",
+    "nicInfo_demoUrl" : "https://rdap.arin.net/registry/nameserver/ns1.example.example",
+    "nicInfo_demoHint" : "nicinfo ns1.example.example",
     "rdapConformance":[
         "rdap_level_0"
     ],

data/lib/nicinfo/demo/ns.json

@@ -1,5 +1,5 @@
 {
-    "nicInfo_demoUrl" : "https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
+    "nicInfo_demoUrl" : "https://rdap.arin.net/registry/nameserver/ns1.xn--fo-5ja.example",
     "nicInfo_demoHint" : "nicinfo ns1.xn--fo-5ja.example",
     "rdapConformance":[
         "rdap_level_0"
@@ -25,9 +25,9 @@
         }
     ],
     "handle":"XXXX",
-    "objectClassName":"entity",
+    "objectClassName":"nameserver",
     "ldhName":"ns1.xn--fo-5ja.example",
-    "unicodeName":"foo.example",
+    "unicodeName":"ns1.foo.example",
     "status":[ "active" ],
     "ipAddresses":{
         "v4":[ "192.0.2.1", "192.0.2.2" ],

data/lib/nicinfo/domain.rb

@@ -141,7 +141,7 @@ module NicInfo
       @config.logger.start_data_item
       @config.logger.data_title "[ DOMAIN ]"
       @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
-      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
+      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass, "domain", @config )
       @config.logger.terse "Domain Name", NicInfo::get_ldhName( @objectclass ), NicInfo::AttentionType::SUCCESS
       @config.logger.datum "I18N Domain Name", NicInfo::get_unicodeName( @objectclass ), NicInfo::AttentionType::SUCCESS
       variants = @objectclass[ "variants" ]

data/lib/nicinfo/entity.rb

@@ -112,7 +112,8 @@ module NicInfo
 
     attr_accessor :fns, :names, :phones, :emails, :adrs, :kind, :titles, :roles, :orgs
 
-    def initialize
+    def initialize( config )
+      @config = config
       @fns = Array.new
       @names = Array.new
       @phones = Array.new
@@ -130,6 +131,11 @@ module NicInfo
     def process entity
       if ( vcard = get_vcard( entity ) ) != nil
         vcardElements = vcard[ 1 ]
+        if 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 ]
@@ -151,7 +157,7 @@ module NicInfo
             if element[ 3 ][ -2 ].instance_of? Array
               name << " " << element[ 3 ][ -2 ].join( ' ' )
             end
-            @names << name
+            @names << name.strip
           end
           if element[ 0 ] == "tel"
             tel = Tel.new
@@ -217,6 +223,9 @@ module NicInfo
             @orgs << org
           end
         end
+        if @fns.empty?
+          @config.conf_msgs << "jCard (vCard) has no required 'fn' property."
+        end
       end
       return self
     end
@@ -232,7 +241,7 @@ module NicInfo
 
     def initialize config
       @config = config
-      @jcard = JCard.new
+      @jcard = JCard.new( config )
       @common = CommonJson.new config
       @entity = nil
       @asEvents = Array.new
@@ -283,12 +292,12 @@ module NicInfo
       @config.logger.start_data_item
       @config.logger.data_title "[ ENTITY ]"
       @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
-      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
+      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass, "entity", @config )
       @jcard.fns.each do |fn|
-        @config.logger.terse "Name", fn, NicInfo::AttentionType::SUCCESS
+        @config.logger.terse "Common Name", fn, NicInfo::AttentionType::SUCCESS
       end
       @jcard.names.each do |n|
-        @config.logger.extra "Name", n, NicInfo::AttentionType::SUCCESS
+        @config.logger.extra "Formal Name", n, NicInfo::AttentionType::SUCCESS
       end
       @jcard.orgs.each do |org|
         item_value = org.names.join( ", " )

data/lib/nicinfo/error_code.rb

@@ -15,6 +15,7 @@
 require 'nicinfo/config'
 require 'nicinfo/nicinfo_logger'
 require 'nicinfo/utils'
+require 'nicinfo/common_json'
 
 module NicInfo
 
@@ -25,6 +26,7 @@ module NicInfo
 
     def initialize( config )
       @config = config
+      @common = CommonJson.new( config )
     end
 
     def display_error_code ec
@@ -42,18 +44,7 @@ module NicInfo
         i = i + 1
       end
       links = ec[ "links" ]
-      if links
-        alternate = NicInfo.get_alternate_link links
-        @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "More", alternate if alternate
-        about = NicInfo.get_about_link links
-        @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "About", about if about
-        tos = NicInfo.get_tos_link links
-        @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "TOS", tos if tos
-        copyright = NicInfo.get_copyright_link links
-        @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "(C)", copyright if copyright
-        license = NicInfo.get_license_link links
-        @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "License", license if license
-      end
+      @common.display_simple_links( links )
       @config.logger.end_data_item
     end
 

data/lib/nicinfo/ip.rb

@@ -51,9 +51,17 @@ module NicInfo
       @config.logger.start_data_item
       @config.logger.data_title "[ IP NETWORK ]"
       @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
-      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
-      @config.logger.terse "Start Address", NicInfo.get_startAddress( @objectclass ), NicInfo::AttentionType::SUCCESS
-      @config.logger.terse "End Address", NicInfo.get_endAddress( @objectclass ), NicInfo::AttentionType::SUCCESS
+      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass, "ip network", @config )
+      start_addr = NicInfo.get_startAddress( @objectclass )
+      if start_addr.include?( '/' )
+        @config.conf_msgs << "start IP #{start_addr} is not an IP address (possibly a CIDR)"
+      end
+      @config.logger.terse "Start Address", start_addr , NicInfo::AttentionType::SUCCESS
+      end_addr = NicInfo.get_endAddress( @objectclass )
+      if end_addr.include?( '/' )
+        @config.conf_msgs << "end IP #{end_addr} is not an IP address (possibly a CIDR)"
+      end
+      @config.logger.terse "End Address", end_addr, NicInfo::AttentionType::SUCCESS
       @config.logger.terse "CIDRs", get_CIDRs
       @config.logger.datum "IP Version", @objectclass[ "ipVersion" ]
       @config.logger.extra "Name", NicInfo.get_name( @objectclass )