feature with config to automatically get IANA bootstrap files

Author: andy

lib/nicinfo/config.rb

@@ -121,14 +121,14 @@ def copy_bsfiles
     end
 
     def set_bsfiles_last_update_time t = Time.now
-      f = File.open(File.join( @app_data, NicInfo::BSFILE_LAST_CHECK_FILENAME ), "w" )
+      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 = File.join( @app_data, NicInfo::BSFILE_LAST_CHECK_FILENAME )
+      fname = bsfiles_last_update_filename
       if File.exists?( fname )
         f = File.open( fname, "r" )
         data = f.read
@@ -138,6 +138,29 @@ def get_bsfiles_last_update_time
       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
@@ -294,6 +317,20 @@ def self.formulate_config_file_name data_dir
 
   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
@@ -307,7 +344,7 @@ def self.formulate_config_file_name data_dir
 
 config:
   # This should not be altered.
-  version: 3
+  version: 4
 
 YAML_CONFIG
 

lib/nicinfo/constants.rb

@@ -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"

lib/nicinfo/nicinfo_main.rb

@@ -391,6 +391,15 @@ def run
 
       if @config.options.get_iana_files
         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
@@ -508,6 +517,7 @@ def get_iana_files
       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

spec/config_spec.rb

@@ -114,9 +114,74 @@
     c.logger.message_level = "NONE"
     c.setup_workspace
 
+    expect( File.exists?( c.bsfiles_last_update_filename ) ).to be_falsey
     t2 = c.get_bsfiles_last_update_time
     expect( t2 ).to be_nil
 
   end
 
+  it 'should update bsfiles based on aged and standard config' do
+    dir = File.join( @work_dir, "test_update_bsfiles_based_on_age_standard" )
+    c = NicInfo::Config.new( dir )
+    c.logger.message_level = "NONE"
+    c.setup_workspace
+
+    expect( c.update_bsfiles?( true ) ).to be_truthy
+    expect( c.update_bsfiles?( false ) ).to be_falsey
+  end
+
+  it 'should update bsfiles based on aged and no update config' do
+    dir = File.join( @work_dir, "test_update_bsfiles_based_on_age_no_update" )
+    c = NicInfo::Config.new( dir )
+    c.logger.message_level = "NONE"
+    c.setup_workspace
+
+    c.config[ NicInfo::BOOTSTRAP ][ NicInfo::UPDATE_BSFILES ] = false
+    expect( c.update_bsfiles?( true ) ).to be_falsey
+    expect( c.update_bsfiles?( false ) ).to be_falsey
+  end
+
+  it 'should update bsfiles on new install' do
+    dir = File.join( @work_dir, "test_update_bsfiles_on_new_install" )
+
+    c = NicInfo::Config.new( dir )
+    c.logger.message_level = "NONE"
+    c.setup_workspace
+
+    expect( c.update_bsfiles?( c.check_bsfiles_age? ) ).to be_truthy
+
+  end
+
+  it 'should not update bsfiles if not aged' do
+    dir = File.join( @work_dir, "test_not_update_bsfiles_not_aged" )
+
+    c = NicInfo::Config.new( dir )
+    c.logger.message_level = "NONE"
+    c.setup_workspace
+
+    t1 = Time.now.round - 1
+    c.set_bsfiles_last_update_time t1
+    c.config[ NicInfo::BOOTSTRAP ][ NicInfo::BSFILES_AGE ] = 500
+
+    check_bsfiles_age = c.check_bsfiles_age?
+    expect( check_bsfiles_age ).to be_falsey
+    expect( c.update_bsfiles?( check_bsfiles_age ) ).to be_falsey
+  end
+
+  it 'should update bsfiles if aged' do
+    dir = File.join( @work_dir, "test_update_bsfiles_fi_aged" )
+
+    c = NicInfo::Config.new( dir )
+    c.logger.message_level = "NONE"
+    c.setup_workspace
+
+    t1 = Time.now.round - 500
+    c.set_bsfiles_last_update_time t1
+    c.config[ NicInfo::BOOTSTRAP ][ NicInfo::BSFILES_AGE ] = 1
+
+    check_bsfiles_age = c.check_bsfiles_age?
+    expect( check_bsfiles_age ).to be_truthy
+    expect( c.update_bsfiles?( c.check_bsfiles_age? ) ).to be_truthy
+  end
+
 end