aspera-cli 4.21.2 → 4.23.0

data/lib/aspera/secret_hider.rb

@@ -15,8 +15,8 @@ module Aspera
     # keys in hash that contain secrets
     KEY_SECRETS = %w[password secret passphrase _key apikey crn token].freeze
     HTTP_SECRETS = %w[Authorization].freeze
-    ALL_SECRETS = [ASCP_ENV_SECRETS, KEY_SECRETS, HTTP_SECRETS].flatten.freeze
-    ALL_SECRETS2 = [KEY_SECRETS, HTTP_SECRETS].flatten.freeze
+    ALL_SECRETS = (ASCP_ENV_SECRETS + KEY_SECRETS + HTTP_SECRETS).freeze
+    ALL_SECRETS2 = (KEY_SECRETS + HTTP_SECRETS).freeze
     KEY_FALSE_POSITIVES = [/^access_key$/, /^fallback_private_key$/].freeze
     # regex that define named captures :begin and :end
     REGEX_LOG_REPLACES = [
@@ -62,17 +62,17 @@ module Aspera
         # only Strings can be secrets, not booleans, or hash, arrays
         return false unless keyword.is_a?(String) && value.is_a?(String)
         # those are not secrets
-        return false if KEY_FALSE_POSITIVES.any?{|f|f.match?(keyword)}
+        return false if KEY_FALSE_POSITIVES.any?{ |f| f.match?(keyword)}
         return true if ADDITIONAL_KEYS_TO_HIDE.include?(keyword)
         # check if keyword (name) contains an element that designate it as a secret
-        ALL_SECRETS.any?{|kw|keyword.include?(kw)}
+        ALL_SECRETS.any?{ |kw| keyword.include?(kw)}
       end
 
       # Hides recursively secrets in Hash or Array of Hash
       def deep_remove_secret(obj)
         case obj
         when Array
-          obj.each{|i|deep_remove_secret(i)}
+          obj.each{ |i| deep_remove_secret(i)}
         when Hash
           obj.each do |k, v|
             if secret?(k, v)

data/lib/aspera/ssh.rb

@@ -24,8 +24,8 @@ module Aspera
 
       def disable_ecd_sha2_algorithms
         Log.log.debug('Disabling SSH ecdsa')
-        Net::SSH::Transport::Algorithms::ALGORITHMS.each_value { |a| a.reject! { |a| a =~ /^ecd(sa|h)-sha2/ } }
-        Net::SSH::KnownHosts::SUPPORTED_TYPE.reject! { |t| t =~ /^ecd(sa|h)-sha2/ }
+        Net::SSH::Transport::Algorithms::ALGORITHMS.each_value{ |a| a.reject!{ |a| a =~ /^ecd(sa|h)-sha2/}}
+        Net::SSH::KnownHosts::SUPPORTED_TYPE.reject!{ |t| t =~ /^ecd(sa|h)-sha2/}
       end
     end
     # ssh_options: same as Net::SSH.start
@@ -49,16 +49,16 @@ module Aspera
       Net::SSH.start(@host, @username, @ssh_options) do |session|
         ssh_channel = session.open_channel do |channel|
           # prepare stdout processing
-          channel.on_data{|_chan, data|response.push(data)}
+          channel.on_data{ |_chan, data| response.push(data)}
           # prepare stderr processing, stderr if type = 1
           channel.on_extended_data do |_chan, _type, data|
             error_message = "#{cmd}: [#{data.chomp}]"
             # Happens when windows user hasn't logged in and created home account.
             error_message += "\nHint: home not created in Windows?" if data.include?('Could not chdir to home directory')
-            raise error_message
+            Log.log.debug(error_message)
           end
           # send command to SSH channel (execute) cspell: disable-next-line
-          channel.send('cexe'.reverse, cmd){|_ch, _success|channel.send_data(input) unless input.nil?}
+          channel.send('cexe'.reverse, cmd){ |_ch, _success| channel.send_data(input) unless input.nil?}
         end
         # wait for channel to finish (command exit)
         ssh_channel.wait

data/lib/aspera/temp_file_manager.rb

@@ -14,6 +14,7 @@ module Aspera
     FILE_LIST_AGE_MAX_SEC = SEC_IN_DAY * 5
     private_constant :SEC_IN_DAY, :FILE_LIST_AGE_MAX_SEC
     include Singleton
+
     attr_accessor :cleanup_on_exit
 
     def initialize

data/lib/aspera/timer_limiter.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
 module Aspera
-  # used to throttle logs
+  # trigger returns true only if the delay has passed since the last trigger
   class TimerLimiter
     # @param delay in seconds (float)
     def initialize(delay)
       @delay = delay
-      @last_time = nil
+      @last_trigger_time = nil
       @count = 0
     end
 
+    # Check if the trigger condition is met
+    # @return [Boolean] true if the trigger condition is met, false otherwise
     def trigger?
-      old_time = @last_time
-      @last_time = Time.now.to_f
+      current_time = Time.now.to_f
       @count += 1
-      if old_time.nil? || ((@last_time - old_time) > @delay)
+      if @last_trigger_time.nil? || ((current_time - @last_trigger_time) > @delay)
+        @last_trigger_time = current_time
         @count = 0
         return true
       end