nicinfo 1.2.2 → 1.3.0.pre.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7142844fdfbe7ded73fa9c5e0f9dfe35593a8397
-  data.tar.gz: 7d3fa18e2f119dca33f398795aa71b51af677bd2
+  metadata.gz: f574db872855ffbfa72d6a22daaf59fdc1aec3b5
+  data.tar.gz: 414c3b45e8a4fe46e6afc31fc3d02c591a27c485
 SHA512:
-  metadata.gz: 1f31cbb2a7e2735c84471b90469bd32a39d224e3155ebc7f1b22c9874dc494952d727bb88f639d5cad0a817ae0a269cbb549e168409a21a0c7bf7d1c320a51cd
-  data.tar.gz: 0c393f07d54cc79b292ecf97a8604242afe013e8e68bd7718ad3e4c894768e031328f2b3383ec7a6e21fa66c50abf9730a6ec35052e7f5e3a2eaea7586d3b559
+  metadata.gz: 2eedd1a0b3a0226000664e4c9268874ac1886d7d940668f79826348cfbc285609be465c280a727f332297514ef5138eac095c91ed376881d406713962f8fa438
+  data.tar.gz: 93bd001ca3321104020bb7a0d1c48324c571cc97e81fc130d114958865eac35e378461b69c9e5e582070100686f9c99c89c74b02a64fada2c48a532bd22f100f

data/lib/nicinfo/config.rb

@@ -14,6 +14,7 @@
 
 
 require 'fileutils'
+require 'time'
 require 'nicinfo/nicinfo_logger'
 require 'yaml'
 require 'ostruct'
@@ -119,6 +120,47 @@ module NicInfo
       FileUtils::cp_r( src_dir, @rdap_bootstrap_dir )
     end
 
+    def set_bsfiles_last_update_time t = Time.now
+      f = File.open(bsfiles_last_update_filename, "w" )
+      f.write t.strftime( "%Y-%m-%d %H:%M:%S")
+      f.close
+    end
+
+    def get_bsfiles_last_update_time
+      retval = nil
+      fname = bsfiles_last_update_filename
+      if File.exists?( fname )
+        f = File.open( fname, "r" )
+        data = f.read
+        f.close
+        retval = Time.parse( data )
+      end
+      return retval
+    end
+
+    def bsfiles_last_update_filename
+      File.join(@rdap_bootstrap_dir, NicInfo::BSFILE_LAST_CHECK_FILENAME)
+    end
+
+    def check_bsfiles_age?
+      retval = false
+      if @config[ NicInfo::BOOTSTRAP ][ NicInfo::CHECK_BSFILES_AGE ]
+        t = get_bsfiles_last_update_time
+        if t != nil
+          configed_age = @config[ NicInfo::BOOTSTRAP ][ NicInfo::BSFILES_AGE ]
+          age = t + configed_age
+          retval = true if age < Time.now
+        else
+          retval = true
+        end
+      end
+      return retval
+    end
+
+    def update_bsfiles? aged
+      return aged && @config[ NicInfo::BOOTSTRAP ][ NicInfo::UPDATE_BSFILES ]
+    end
+
     def save name, data
       data_file = File.open( File.join( @app_data, name ), "w" )
       data_file.write data
@@ -275,6 +317,20 @@ bootstrap:
 
   ns_root_url: https://rdap.arin.net/registry
 
+  # Check for updates of the IANA RDAP bootstrap files
+  # If true, check for IANA bootstrap files once they have aged past bsfiles_age
+  # Values are true or false
+  check_bsfiles_age: true 
+
+  # The age at which IANA RDAP bootstrap files are to be checked if check_bsfiles is true
+  # This value is in seconds
+  bsfiles_age: 604800
+
+  # If the age of the IANA RDAP bootstrap files are considered old according to bsfiles_age
+  # and check_bsfiles is true, then this value will cause a fetch of new files if true.
+  # Values are true or false
+  update_bsfiles: true
+
 search:
 
   # Substring matching
@@ -288,7 +344,7 @@ security:
 
 config:
   # This should not be altered.
-  version: 3
+  version: 4
 
 YAML_CONFIG
 

data/lib/nicinfo/constants.rb

@@ -18,10 +18,10 @@
 
 module NicInfo
 
-  VERSION = "1.2.2"
+  VERSION = "1.3.0-alpha1"
   VERSION_LABEL = "NicInfo v." + VERSION
   COPYRIGHT = "Copyright (c) 2011-2017 American Registry for Internet Numbers (ARIN)"
-  CONFIG_VERSION = 3
+  CONFIG_VERSION = 4
 
   # regular expressions
   NET_HANDLE_REGEX = /^NET-.*/i
@@ -75,6 +75,9 @@ module NicInfo
   IP_ROOT_URL = "ip_root_url"
   AS_ROOT_URL = "as_root_url"
   DOMAIN_ROOT_URL = "domain_root_url"
+  CHECK_BSFILES_AGE = "check_bsfiles_age"
+  BSFILES_AGE = "bsfiles_age"
+  UPDATE_BSFILES = "update_bsfiles"
   SEARCH = "search"
   SUBSTRING = "substring"
   CONFIG = "config"
@@ -104,4 +107,6 @@ module NicInfo
      255 =>  "reserved"
   }
 
+  BSFILE_LAST_CHECK_FILENAME = "_last_check_time.txt"
+
 end

data/lib/nicinfo/nicinfo_main.rb

@@ -390,10 +390,16 @@ module NicInfo
       end
 
       if @config.options.get_iana_files
-        get_file_via_http( "http://data.iana.org/rdap/asn.json", File.join( @config.rdap_bootstrap_dir, "asn.json" ), 0 )
-        get_file_via_http( "http://data.iana.org/rdap/ipv4.json", File.join( @config.rdap_bootstrap_dir, "ipv4.json" ), 0 )
-        get_file_via_http( "http://data.iana.org/rdap/ipv6.json", File.join( @config.rdap_bootstrap_dir, "ipv6.json" ), 0 )
-        get_file_via_http( "http://data.iana.org/rdap/dns.json", File.join( @config.rdap_bootstrap_dir, "dns.json" ), 0 )
+        get_iana_files
+      else
+        check_bsfiles_age = @config.check_bsfiles_age?
+        update_bsfiles = @config.update_bsfiles?( check_bsfiles_age )
+        if update_bsfiles
+          @config.logger.mesg( "IANA RDAP bootstrap files are old and need to be updated." )
+          get_iana_files
+        elsif check_bsfiles_age
+          @config.logger.mesg( "IANA RDAP bootstrap files are old. Update them with --iana option" )
+        end
       end
 
       if @config.options.demo
@@ -500,14 +506,21 @@ module NicInfo
           end
         else
           json_data = do_rdap_query
-          display_rdap_query( json_data, true ) if json_data
+          display_rdap_query( json_data, true )
       end
 
 
     end
 
+    def get_iana_files
+      get_file_via_http("http://data.iana.org/rdap/asn.json", File.join(@config.rdap_bootstrap_dir, "asn.json"), 0)
+      get_file_via_http("http://data.iana.org/rdap/ipv4.json", File.join(@config.rdap_bootstrap_dir, "ipv4.json"), 0)
+      get_file_via_http("http://data.iana.org/rdap/ipv6.json", File.join(@config.rdap_bootstrap_dir, "ipv6.json"), 0)
+      get_file_via_http("http://data.iana.org/rdap/dns.json", File.join(@config.rdap_bootstrap_dir, "dns.json"), 0)
+      @config.set_bsfiles_last_update_time
+    end
+
     def do_rdap_query
-      retval = nil
       if @config.config[ NicInfo::BOOTSTRAP ][ NicInfo::BOOTSTRAP_URL ] == nil && !@config.options.url
         bootstrap = Bootstrap.new( @config )
         qtype = @config.options.query_type
@@ -565,7 +578,7 @@ module NicInfo
         end
         inspect_rdap_compliance json_data
         cache_self_references json_data
-        retval = json_data
+        json_data
       rescue JSON::ParserError => a
         @config.logger.mesg( "Server returned invalid JSON!" )
       rescue SocketError => a
@@ -604,7 +617,6 @@ module NicInfo
         end
         @config.logger.trace("Server response code was " + e.response.code)
       end
-      return retval
     end
 
     def display_rdap_query json_data, show_help = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nicinfo
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0.pre.alpha1
 platform: ruby
 authors:
 - Andrew Newton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -100,12 +100,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: RDAP Client