aspera-cli 4.10.0 → 4.12.0

data/lib/aspera/fasp/agent_node.rb

@@ -2,6 +2,7 @@
 
 require 'aspera/fasp/agent_base'
 require 'aspera/fasp/transfer_spec'
+require 'aspera/node'
 require 'aspera/log'
 require 'tty-spinner'
 
@@ -9,20 +10,21 @@ module Aspera
   module Fasp
     # this singleton class is used by the CLI to provide a common interface to start a transfer
     # before using it, the use must set the `node_api` member.
-    class AgentNode < AgentBase
+    class AgentNode < Aspera::Fasp::AgentBase
       # option include: root_id if the node is an access key
       attr_writer :options
+
       def initialize(options)
         raise 'node specification must be Hash' unless options.is_a?(Hash)
-        %i[url username password].each { |k| raise "missing parameter [#{k}] in node specification: #{options}" unless options.has_key?(k) }
+        %i[url username password].each { |k| raise "missing parameter [#{k}] in node specification: #{options}" unless options.key?(k) }
         super()
         # root id is required for access key
         @root_id = options[:root_id]
         rest_params = { base_url: options[:url]}
         if /^Bearer /.match?(options[:password])
           rest_params[:headers] = {
-            'X-Aspera-AccessKey' => options[:username],
-            'Authorization'      => options[:password]
+            Aspera::Node::HEADER_X_ASPERA_ACCESS_KEY => options[:username],
+            'Authorization'                          => options[:password]
           }
           raise 'root_id is required for access key' if @root_id.nil?
         else
@@ -39,7 +41,7 @@ module Aspera
 
       # used internally to ensure node api is set before using.
       def node_api_
-        raise StandardError,'Before using this object, set the node_api attribute to a Aspera::Rest object' if @node_api.nil?
+        raise StandardError, 'Before using this object, set the node_api attribute to a Aspera::Rest object' if @node_api.nil?
         return @node_api
       end
       # use this to read the node_api end point.
@@ -54,7 +56,7 @@ module Aspera
       end
 
       # generic method
-      def start_transfer(transfer_spec,_options=nil)
+      def start_transfer(transfer_spec, token_regenerator: nil)
         # add root id if access key
         if !@root_id.nil?
           case transfer_spec['direction']
@@ -64,9 +66,9 @@ module Aspera
           end
         end
         # manage special additional parameter
-        if transfer_spec.has_key?('EX_ssh_key_paths') && transfer_spec['EX_ssh_key_paths'].is_a?(Array) && !transfer_spec['EX_ssh_key_paths'].empty?
+        if transfer_spec.key?('EX_ssh_key_paths') && transfer_spec['EX_ssh_key_paths'].is_a?(Array) && !transfer_spec['EX_ssh_key_paths'].empty?
           # not standard, so place standard field
-          if transfer_spec.has_key?('ssh_private_key')
+          if transfer_spec.key?('ssh_private_key')
             Log.log.warn('Both ssh_private_key and EX_ssh_key_paths are present, using ssh_private_key')
           else
             Log.log.warn('EX_ssh_key_paths has multiple keys, using first one only') unless transfer_spec['EX_ssh_key_paths'].length.eql?(1)
@@ -77,13 +79,13 @@ module Aspera
         if transfer_spec['tags'].is_a?(Hash) && transfer_spec['tags']['aspera'].is_a?(Hash)
           transfer_spec['tags']['aspera']['xfer_retry'] ||= 150
         end
-        # optimisation in case of sending to the same node
-        if transfer_spec['remote_host'].eql?(URI.parse(node_api_.params[:base_url]).host)
-          transfer_spec['remote_host'] = 'localhost'
+        # Optimization in case of sending to the same node (TODO: probably remove this, as /etc/hosts shall be used for that)
+        if !transfer_spec['wss_enabled'] && transfer_spec['remote_host'].eql?(URI.parse(node_api_.params[:base_url]).host)
+          transfer_spec['remote_host'] = '127.0.0.1'
         end
-        resp = node_api_.create('ops/transfers',transfer_spec)[:data]
+        resp = node_api_.create('ops/transfers', transfer_spec)[:data]
         @transfer_id = resp['id']
-        Log.log.debug("tr_id=#{@transfer_id}")
+        Log.log.debug{"tr_id=#{@transfer_id}"}
         return @transfer_id
       end
 
@@ -94,35 +96,33 @@ module Aspera
         # lets emulate management events to display progress bar
         loop do
           # status is empty sometimes with status 200...
-          trdata = node_api_.read("ops/transfers/#{@transfer_id}")[:data] || {'status' => 'unknown'} rescue {'status' => 'waiting(read error)'}
-          case trdata['status']
+          transfer_data = node_api_.read("ops/transfers/#{@transfer_id}")[:data] || {'status' => 'unknown'} rescue {'status' => 'waiting(read error)'}
+          case transfer_data['status']
           when 'completed'
             notify_end(@transfer_id)
             break
-          when 'waiting','partially_completed','unknown','waiting(read error)'
+          when 'waiting', 'partially_completed', 'unknown', 'waiting(read error)'
             if spinner.nil?
               spinner = TTY::Spinner.new('[:spinner] :title', format: :classic)
               spinner.start
             end
-            spinner.update(title: trdata['status'])
+            spinner.update(title: transfer_data['status'])
             spinner.spin
-            #puts trdata
           when 'running'
-            #puts "running: sessions:#{trdata["sessions"].length}, #{trdata["sessions"].map{|i| i['bytes_transferred']}.join(',')}"
-            if !started && trdata['precalc'].is_a?(Hash) &&
-            trdata['precalc']['status'].eql?('ready')
-              notify_begin(@transfer_id,trdata['precalc']['bytes_expected'])
+            if !started && transfer_data['precalc'].is_a?(Hash) &&
+                transfer_data['precalc']['status'].eql?('ready')
+              notify_begin(@transfer_id, transfer_data['precalc']['bytes_expected'])
               started = true
             else
-              notify_progress(@transfer_id,trdata['bytes_transferred'])
+              notify_progress(@transfer_id, transfer_data['bytes_transferred'])
             end
           else
-            Log.log.warn("trdata -> #{trdata}")
-            raise Fasp::Error, "#{trdata['status']}: #{trdata['error_desc']}"
+            Log.log.warn{"transfer_data -> #{transfer_data}"}
+            raise Fasp::Error, "#{transfer_data['status']}: #{transfer_data['error_desc']}"
           end
           sleep(1)
         end
-        #TODO get status of sessions
+        # TODO: get status of sessions
         return []
       end
     end

data/lib/aspera/fasp/agent_trsdk.rb

@@ -6,7 +6,7 @@ require 'json'
 
 module Aspera
   module Fasp
-    class AgentTrsdk < AgentBase
+    class AgentTrsdk < Aspera::Fasp::AgentBase
       DEFAULT_OPTIONS = {
         address: '127.0.0.1',
         port:    55_002
@@ -18,26 +18,26 @@ module Aspera
         raise "expecting Hash (or nil), but have #{user_opts.class}" unless user_opts.nil? || user_opts.is_a?(Hash)
         # set default options and override if specified
         options = DEFAULT_OPTIONS.dup
-        user_opts&.each do |k,v|
-          raise "Unknown local agent parameter: #{k}, expect one of #{DEFAULT_OPTIONS.keys.map(&:to_s).join(',')}" unless DEFAULT_OPTIONS.has_key?(k)
+        user_opts&.each do |k, v|
+          raise "Unknown local agent parameter: #{k}, expect one of #{DEFAULT_OPTIONS.keys.map(&:to_s).join(',')}" unless DEFAULT_OPTIONS.key?(k)
           options[k] = v
         end
-        Log.log.debug("options= #{options}")
+        Log.log.debug{"options= #{options}"}
         super()
         # load and create SDK stub
         $LOAD_PATH.unshift(Installation.instance.sdk_ruby_folder)
         require 'transfer_services_pb'
-        @transfer_client = Transfersdk::TransferService::Stub.new("#{options[:address]}:#{options[:port]}",:this_channel_is_insecure)
+        @transfer_client = Transfersdk::TransferService::Stub.new("#{options[:address]}:#{options[:port]}", :this_channel_is_insecure)
         begin
           get_info_response = @transfer_client.get_info(Transfersdk::InstanceInfoRequest.new)
-          Log.log.debug("daemon info: #{get_info_response}")
+          Log.log.debug{"daemon info: #{get_info_response}"}
         rescue GRPC::Unavailable
           Log.log.warn('no daemon present, starting daemon...')
           # location of daemon binary
-          bin_folder = File.realpath(File.join(Installation.instance.sdk_ruby_folder,'..'))
+          bin_folder = File.realpath(File.join(Installation.instance.sdk_ruby_folder, '..'))
           # config file and logs are created in same folder
-          conf_file = File.join(bin_folder,'sdk.conf')
-          log_base = File.join(bin_folder,'transferd')
+          conf_file = File.join(bin_folder, 'sdk.conf')
+          log_base = File.join(bin_folder, 'transferd')
           # create a config file for daemon
           config = {
             address:      options[:address],
@@ -50,15 +50,15 @@ module Aspera
               }
             }
           }
-          File.write(conf_file,config.to_json)
-          trd_pid = Process.spawn(Installation.instance.path(:transferd),'--config', conf_file, out: "#{log_base}.out", err: "#{log_base}.err")
+          File.write(conf_file, config.to_json)
+          trd_pid = Process.spawn(Installation.instance.path(:transferd), '--config', conf_file, out: "#{log_base}.out", err: "#{log_base}.err")
           Process.detach(trd_pid)
           sleep(2.0)
           retry
         end
       end
 
-      def start_transfer(transfer_spec,_options=nil)
+      def start_transfer(transfer_spec, token_regenerator: nil)
         # create a transfer request
         transfer_request = Transfersdk::TransferRequest.new(
           transferType: Transfersdk::TransferType::FILE_REGULAR, # transfer type (file/stream)
@@ -66,9 +66,9 @@ module Aspera
           transferSpec: transfer_spec.to_json) # transfer definition
         # send start transfer request to the transfer manager daemon
         start_transfer_response = @transfer_client.start_transfer(transfer_request)
-        Log.log.debug("start transfer response #{start_transfer_response}")
+        Log.log.debug{"start transfer response #{start_transfer_response}"}
         @transfer_id = start_transfer_response.transferId
-        Log.log.debug("transfer started with id #{@transfer_id}")
+        Log.log.debug{"transfer started with id #{@transfer_id}"}
       end
 
       def wait_for_transfers_completion
@@ -76,26 +76,26 @@ module Aspera
         # monitor transfer status
         @transfer_client.monitor_transfers(Transfersdk::RegistrationRequest.new(transferId: [@transfer_id])) do |response|
           Log.dump(:response, response.to_h)
-          #Log.log.debug("#{response.sessionInfo.preTransferBytes} #{response.transferInfo.bytesTransferred}")
+          # Log.log.debug{"#{response.sessionInfo.preTransferBytes} #{response.transferInfo.bytesTransferred}"}
           case response.status
           when :RUNNING
             if !started && !response.sessionInfo.preTransferBytes.eql?(0)
-              notify_begin(@transfer_id,response.sessionInfo.preTransferBytes)
+              notify_begin(@transfer_id, response.sessionInfo.preTransferBytes)
               started = true
             elsif started
-              notify_progress(@transfer_id,response.transferInfo.bytesTransferred)
+              notify_progress(@transfer_id, response.transferInfo.bytesTransferred)
             end
           when :FAILED, :COMPLETED, :CANCELED
             notify_end(@transfer_id)
             raise Fasp::Error, JSON.parse(response.message)['Description'] unless :COMPLETED.eql?(response.status)
             break
-          when :QUEUED,:UNKNOWN_STATUS,:PAUSED,:ORPHANED
+          when :QUEUED, :UNKNOWN_STATUS, :PAUSED, :ORPHANED
             # ignore
           else
-            Log.log.error("unknown status#{response.status}")
+            Log.log.error{"unknown status#{response.status}"}
           end
         end
-        # TODO return status
+        # TODO: return status
         return []
       end
     end

data/lib/aspera/fasp/error.rb

@@ -7,7 +7,8 @@ module Aspera
     # error raised if transfer fails
     class Error < StandardError
       attr_reader :err_code
-      def initialize(message,err_code=nil)
+
+      def initialize(message, err_code=nil)
         super(message)
         @err_code = err_code
       end
@@ -17,7 +18,7 @@ module Aspera
         return r.merge({i: @err_code})
       end
 
-      def retryable?; info[:r];end
+      def retryable?; info[:r]; end
     end
   end
 end

data/lib/aspera/fasp/error_info.rb

@@ -4,6 +4,8 @@ module Aspera
   module Fasp
     # from https://www.google.com/search?q=FASP+error+codes
     # Note that the fact that an error is retryable is not internally defined by protocol, it's client-side responsibility
+    # rubocop:disable Layout/MultilineHashKeyLineBreaks
+    # rubocop:disable Layout/FirstHashElementLineBreak
     ERROR_INFO = {
       # id   retryable      mnemo                       message                                              additional info
       1  => { r: false, c: 'FASP_PROTO',                  m: 'Generic fasp(tm) protocol error',                a: 'fasp(tm) error'},
@@ -18,13 +20,13 @@ module Aspera
       10 => { r: false, c: 'LIC_RATE_EXCEEDED',           m: 'Rate exceeds the cap imposed by license',        a: 'Rate exceeds cap imposed by license'},
       11 => { r: false, c: 'INTERNAL_ERROR',              m: 'Internal error (unexpected error)',              a: 'Internal error'},
       12 => { r: true,  c: 'TRANSFER_ERROR',              m: 'Error establishing control connection',
-                                                          a: 'Error establishing SSH connection (check SSH port and firewall)'},
+                                                              a: 'Error establishing SSH connection (check SSH port and firewall)'},
       13 => { r: true,  c: 'TRANSFER_TIMEOUT',            m: 'Timeout establishing control connection',
-                                                          a: 'Timeout establishing SSH connection (check SSH port and firewall)'},
+                                                              a: 'Timeout establishing SSH connection (check SSH port and firewall)'},
       14 => { r: true,  c: 'CONNECTION_ERROR',            m: 'Error establishing data connection',
-                                                          a: 'Error establishing UDP connection (check UDP port and firewall)'},
+                                                              a: 'Error establishing UDP connection (check UDP port and firewall)'},
       15 => { r: true,  c: 'CONNECTION_TIMEOUT',          m: 'Timeout establishing data connection',
-                                                          a: 'Timeout establishing UDP connection (check UDP port and firewall)'},
+                                                              a: 'Timeout establishing UDP connection (check UDP port and firewall)'},
       16 => { r: true,  c: 'CONNECTION_LOST',             m: 'Connection lost',                                a: 'Connection lost'},
       17 => { r: true,  c: 'RCVR_SEND_ERROR',             m: 'Receiver fails to send feedback',                a: 'Network failure (receiver can\'t send feedback)'},
       18 => { r: true,  c: 'RCVR_RECV_ERROR',             m: 'Receiver fails to receive data packets',         a: 'Network failure (receiver can\'t receive UDP data)'},
@@ -68,20 +70,21 @@ module Aspera
       54 => { r: false, c: 'THRESHOLD_VALIDATION_FAILED', m: 'File threshold validation failed',               a: 'File threshold validation failed'},
       55 => { r: false, c: 'FILEPATH_TOO_LONG',           m: 'File path/name too long for underlying file system', a: 'File path exceeds underlying file system limit'},
       56 => { r: false, c: 'ILLEGAL_CHARS_IN_PATH',       m: 'Windows path contains illegal characters',
-                                                          a: 'Path being written to Windows file system contains illegal characters'},
+                                                              a: 'Path being written to Windows file system contains illegal characters'},
       57 => { r: false, c: 'CHUNK_MUST_MATCH_ALIGNMENT',  m: 'Chunk size/start must be aligned with storage',  a: 'Chunk size/start must be aligned with storage'},
       58 => { r: false, c: 'VALIDATION_SESSION_ABORT',    m: 'Session aborted to due to validation error',     a: 'Session aborted to due validation error'},
       59 => { r: false, c: 'REMOTE_STORAGE_ERROR',        m: 'Remote storage errored',                         a: 'Remote storage errored'},
       60 => { r: false, c: 'LUA_SCRIPT_ABORTED_SESSION',  m: 'Session aborted due to Lua script abort',        a: 'Session aborted due to Lua script abort'},
       61 => { r: true,  c: 'SSEAR_RETRYABLE',             m: 'Transfer failed because of a retryable Encryption at Rest error',
-                                                          a: 'Transfer failed because of a retryable Encryption at Rest error'},
+                                                              a: 'Transfer failed because of a retryable Encryption at Rest error'},
       62 => { r: false, c: 'SSEAR_FATAL',                 m: 'Transfer failed because of a fatal Encryption at Rest error',
-                                                          a: 'Transfer failed because of a fatal Encryption at Rest error'},
+                                                              a: 'Transfer failed because of a fatal Encryption at Rest error'},
       63 => { r: false, c: 'LINK_LOOP',                   m: 'Path refers to a symbolic link loop',            a: 'Path refers to a symbolic link loop'},
       64 => { r: false, c: 'CANNOT_RENAME_PARTIAL_FILES', m: 'Can\'t rename a partial file',                   a: 'Can\'t rename a partial file.'},
       65 => { r: false, c: 'CIPHER_NON_COMPAT_FIPS',      m: 'Can\'t use this cipher with FIPS mode enabled',  a: 'Can\'t use this cipher with FIPS mode enabled'},
       66 => { r: false, c: 'PEER_REQUIRES_FIPS',          m: 'Peer rejects cipher due to FIPS mode enabled on peer',
-                                                          a: 'Peer rejects cipher due to FIPS mode enabled on peer'}
+                                                              a: 'Peer rejects cipher due to FIPS mode enabled on peer'}
     }.freeze
+    # rubocop:enable Layout/MultilineHashKeyLineBreaks
   end
 end

data/lib/aspera/fasp/installation.rb

@@ -42,9 +42,9 @@ module Aspera
         </default>
         </CONF>
       END_OF_CONFIG_FILE
-      DUMMY_CERT_INFO='/C=US/ST=California/L=Emeryville/O=Aspera Inc./OU=Corporate/CN=Aspera Inc./emailAddress=info@asperasoft.com'
-      private_constant :PRODUCT_CONNECT,:PRODUCT_CLI_V1,:PRODUCT_DRIVE,:PRODUCT_ENTSRV,:EXT_RUBY_PROTOBUF,:RB_SDK_FOLDER,
-        :ONE_YEAR_SECONDS,:DEFAULT_ASPERA_CONF,:DUMMY_CERT_INFO
+      DUMMY_CERT_INFO = '/C=US/ST=California/L=Emeryville/O=Aspera Inc./OU=Corporate/CN=Aspera Inc./emailAddress=info@asperasoft.com'
+      private_constant :PRODUCT_CONNECT, :PRODUCT_CLI_V1, :PRODUCT_DRIVE, :PRODUCT_ENTSRV, :EXT_RUBY_PROTOBUF, :RB_SDK_FOLDER,
+        :ONE_YEAR_SECONDS, :DEFAULT_ASPERA_CONF, :DUMMY_CERT_INFO
       # set ascp executable path
       def ascp_path=(v)
         @path_to_ascp = v
@@ -55,7 +55,7 @@ module Aspera
       end
 
       def sdk_ruby_folder
-        ruby_pb_folder = File.join(sdk_folder,RB_SDK_FOLDER)
+        ruby_pb_folder = File.join(sdk_folder, RB_SDK_FOLDER)
         FileUtils.mkdir_p(ruby_pb_folder) unless Dir.exist?(ruby_pb_folder)
         return ruby_pb_folder
       end
@@ -87,7 +87,7 @@ module Aspera
           raise "no such product installed: #{product_name}" if pl.nil?
         end
         self.ascp_path = pl[:ascp_path]
-        Log.log.debug("ascp_path=#{@path_to_ascp}")
+        Log.log.debug{"ascp_path=#{@path_to_ascp}"}
       end
 
       # @return the list of installed products in format of product_locations
@@ -104,15 +104,15 @@ module Aspera
           @found_products = scan_locations.select! do |item|
             # skip if not main folder
             next false unless Dir.exist?(item[:app_root])
-            Log.log.debug("Found #{item[:app_root]}")
+            Log.log.debug{"Found #{item[:app_root]}"}
             sub_bin = item[:sub_bin] || BIN_SUBFOLDER
-            item[:ascp_path] = File.join(item[:app_root],sub_bin,ascp_filename)
+            item[:ascp_path] = File.join(item[:app_root], sub_bin, ascp_filename)
             # skip if no ascp
             next false unless File.exist?(item[:ascp_path])
             # read info from product info file if present
             product_info_file = "#{item[:app_root]}/#{PRODUCT_INFO}"
             if File.exist?(product_info_file)
-              res_s = XmlSimple.xml_in(File.read(product_info_file),{'ForceArray' => false})
+              res_s = XmlSimple.xml_in(File.read(product_info_file), {'ForceArray' => false})
               item[:name] = res_s['name']
               item[:version] = res_s['version']
             else
@@ -128,23 +128,23 @@ module Aspera
       FILES = %i[ascp ascp4 ssh_bypass_key_dsa ssh_bypass_key_rsa aspera_license aspera_conf fallback_cert fallback_key].freeze
 
       # get path of one resource file of currently activated product
-      # keys and certs are generated locally... (they are well known values, arch. independant)
+      # keys and certs are generated locally... (they are well known values, arch. independent)
       def path(k)
         case k
-        when :ascp,:ascp4
+        when :ascp, :ascp4
           use_ascp_from_product(FIRST_FOUND) if @path_to_ascp.nil?
           file = @path_to_ascp
-          # note that there might be a .exe at the end
-          file = file.gsub('ascp','ascp4') if k.eql?(:ascp4)
+          # NOTE: that there might be a .exe at the end
+          file = file.gsub('ascp', 'ascp4') if k.eql?(:ascp4)
         when :transferd
           file = transferd_filepath
         when :ssh_bypass_key_dsa
-          file=Environment.write_file_restricted(File.join(sdk_folder,'aspera_bypass_dsa.pem')) {get_key('dsa',1)}
+          file = Environment.write_file_restricted(File.join(sdk_folder, 'aspera_bypass_dsa.pem')) {get_key('dsa', 1)}
         when :ssh_bypass_key_rsa
-          file=Environment.write_file_restricted(File.join(sdk_folder,'aspera_bypass_rsa.pem')) {get_key('rsa',2)}
+          file = Environment.write_file_restricted(File.join(sdk_folder, 'aspera_bypass_rsa.pem')) {get_key('rsa', 2)}
         when :aspera_license
-          file=Environment.write_file_restricted(File.join(sdk_folder,'aspera-license')) do
-            clear=[
+          file = Environment.write_file_restricted(File.join(sdk_folder, 'aspera-license')) do
+            clear = [
               Zlib::Inflate.inflate(DataRepository.instance.data(6)),
               "==SIGNATURE==\n",
               Base64.strict_encode64(DataRepository.instance.data(7))
@@ -152,10 +152,10 @@ module Aspera
             Base64.strict_encode64(clear.join)
           end
         when :aspera_conf
-          file=Environment.write_file_restricted(File.join(sdk_folder,'aspera.conf')) {DEFAULT_ASPERA_CONF}
-        when :fallback_cert,:fallback_key
-          file_key = File.join(sdk_folder,'aspera_fallback_key.pem')
-          file_cert = File.join(sdk_folder,'aspera_fallback_cert.pem')
+          file = Environment.write_file_restricted(File.join(sdk_folder, 'aspera.conf')) {DEFAULT_ASPERA_CONF}
+        when :fallback_cert, :fallback_key
+          file_key = File.join(sdk_folder, 'aspera_fallback_key.pem')
+          file_cert = File.join(sdk_folder, 'aspera_fallback_cert.pem')
           if !File.exist?(file_key) || !File.exist?(file_cert)
             require 'openssl'
             # create new self signed certificate for http fallback
@@ -182,10 +182,10 @@ module Aspera
       # @return the file path of local connect where API's URI can be read
       def connect_uri
         connect = get_product_folders(PRODUCT_CONNECT)
-        folder = File.join(connect[:run_root],VARRUN_SUBFOLDER)
-        ['','s'].each do |ext|
-          uri_file = File.join(folder,"http#{ext}.uri")
-          Log.log.debug("checking connect port file: #{uri_file}")
+        folder = File.join(connect[:run_root], VAR_RUN_SUBFOLDER)
+        ['', 's'].each do |ext|
+          uri_file = File.join(folder, "http#{ext}.uri")
+          Log.log.debug{"checking connect port file: #{uri_file}"}
           if File.exist?(uri_file)
             return File.open(uri_file, &:gets).strip
           end
@@ -196,12 +196,12 @@ module Aspera
       # @ return path to configuration file of aspera CLI
       def cli_conf_file
         connect = get_product_folders(PRODUCT_CLI_V1)
-        return File.join(connect[:app_root],BIN_SUBFOLDER,'.aspera_cli_conf')
+        return File.join(connect[:app_root], BIN_SUBFOLDER, '.aspera_cli_conf')
       end
 
       # default bypass key phrase
       def bypass_pass
-        return format('%08x-%04x-%04x-%04x-%04x%08x',*DataRepository.instance.data(3).unpack('NnnnnN'))
+        return format('%08x-%04x-%04x-%04x-%04x%08x', *DataRepository.instance.data(3).unpack('NnnnnN'))
       end
 
       def bypass_keys
@@ -210,11 +210,11 @@ module Aspera
 
       # use in plugin `config`
       def get_ascp_version(exe_path)
-        return get_exe_version(exe_path,'-A')
+        return get_exe_version(exe_path, '-A')
       end
 
       # Check that specified path is ascp and get version
-      def get_exe_version(exe_path,vers_arg)
+      def get_exe_version(exe_path, vers_arg)
         raise 'ERROR: nil arg' if exe_path.nil?
         return nil unless File.exist?(exe_path)
         exe_version = nil
@@ -233,18 +233,18 @@ module Aspera
         # SDK is organized by architecture, check this first, in case architecture is not supported
         arch_filter = "#{Environment.architecture}/"
         require 'zip'
-        sdk_zip_path = File.join(Dir.tmpdir,'sdk.zip')
+        sdk_zip_path = File.join(Dir.tmpdir, 'sdk.zip')
         if sdk_url.start_with?('file:')
           # require specific file scheme: the path part is "relative", or absolute if there are 4 slash
           raise 'use format: file:///<path>' unless sdk_url.start_with?('file:///')
-          sdk_zip_path = sdk_url.gsub(%r{^file:///},'')
+          sdk_zip_path = sdk_url.gsub(%r{^file:///}, '')
         else
-          Aspera::Rest.new(base_url: sdk_url, redirect_max: 3).call(operation: 'GET',save_to_file: sdk_zip_path)
+          Aspera::Rest.new(base_url: sdk_url, redirect_max: 3).call(operation: 'GET', save_to_file: sdk_zip_path)
         end
         # rename old install
         if !Dir.empty?(sdk_folder)
           Log.log.warn('Previous install exists, renaming folder.')
-          File.rename(sdk_folder,"#{sdk_folder}.#{Time.now.strftime('%Y%m%d%H%M%S')}")
+          File.rename(sdk_folder, "#{sdk_folder}.#{Time.now.strftime('%Y%m%d%H%M%S')}")
           # TODO: delete old archives ?
         end
         # extract files from archive
@@ -258,26 +258,26 @@ module Aspera
             # ruby adapters
             dest_folder = sdk_ruby_folder if entry.name.end_with?(EXT_RUBY_PROTOBUF)
             next if dest_folder.nil?
-            File.open(File.join(dest_folder,File.basename(entry.name)), 'wb') do |output_stream|
+            File.open(File.join(dest_folder, File.basename(entry.name)), 'wb') do |output_stream|
               IO.copy_stream(entry.get_input_stream, output_stream)
             end
           end
         end
         File.unlink(sdk_zip_path) rescue nil # Windows may give error
-        # ensure license file are generated so that ascp invokation for version works
+        # ensure license file are generated so that ascp invocation for version works
         path(:aspera_license)
         path(:aspera_conf)
-        ascp_path = File.join(sdk_folder,ascp_filename)
+        ascp_path = File.join(sdk_folder, ascp_filename)
         raise "No #{ascp_filename} found in SDK archive" unless File.exist?(ascp_path)
-        Environment.restrict_file_access(ascp_path, mode: 0755)
-        Environment.restrict_file_access(ascp_path.gsub('ascp','ascp4'), mode: 0755)
-        ascp_version = get_ascp_version(File.join(sdk_folder,ascp_filename))
+        Environment.restrict_file_access(ascp_path, mode: 0o755)
+        Environment.restrict_file_access(ascp_path.gsub('ascp', 'ascp4'), mode: 0o755)
+        ascp_version = get_ascp_version(File.join(sdk_folder, ascp_filename))
         trd_path = transferd_filepath
-        Log.log.warn("No #{trd_path} in SDK archive") unless File.exist?(trd_path)
-        Environment.restrict_file_access(trd_path, mode: 0755) if File.exist?(trd_path)
-        transferd_version = get_exe_version(trd_path,'version')
+        Log.log.warn{"No #{trd_path} in SDK archive"} unless File.exist?(trd_path)
+        Environment.restrict_file_access(trd_path, mode: 0o755) if File.exist?(trd_path)
+        transferd_version = get_exe_version(trd_path, 'version')
         sdk_version = transferd_version || ascp_version
-        File.write(File.join(sdk_folder,PRODUCT_INFO),"<product><name>IBM Aspera SDK</name><version>#{sdk_version}</version></product>")
+        File.write(File.join(sdk_folder, PRODUCT_INFO), "<product><name>IBM Aspera SDK</name><version>#{sdk_version}</version></product>")
         return sdk_version
       end
 
@@ -285,13 +285,13 @@ module Aspera
 
       BIN_SUBFOLDER = 'bin'
       ETC_SUBFOLDER = 'etc'
-      VARRUN_SUBFOLDER = File.join('var','run')
+      VAR_RUN_SUBFOLDER = File.join('var', 'run')
       # product information manifest: XML (part of aspera product)
       PRODUCT_INFO = 'product-info.mf'
       # policy for product selection
       FIRST_FOUND = 'FIRST'
 
-      private_constant :BIN_SUBFOLDER,:ETC_SUBFOLDER,:VARRUN_SUBFOLDER,:PRODUCT_INFO
+      private_constant :BIN_SUBFOLDER, :ETC_SUBFOLDER, :VAR_RUN_SUBFOLDER, :PRODUCT_INFO
 
       def initialize
         @path_to_ascp = nil
@@ -313,7 +313,7 @@ module Aspera
       end
 
       def transferd_filepath
-        return File.join(sdk_folder,'asperatransferd' + Environment.exe_extension)
+        return File.join(sdk_folder, 'asperatransferd' + Environment.exe_extension)
       end
 
       # @return product folders depending on OS fields
@@ -326,54 +326,54 @@ module Aspera
         case Aspera::Environment.os
         when Aspera::Environment::OS_WINDOWS; return [{
           expected: PRODUCT_CONNECT,
-          app_root: File.join(ENV['LOCALAPPDATA'],'Programs','Aspera','Aspera Connect'),
-          log_root: File.join(ENV['LOCALAPPDATA'],'Aspera','Aspera Connect','var','log'),
-          run_root: File.join(ENV['LOCALAPPDATA'],'Aspera','Aspera Connect')
-        },{
+          app_root: File.join(ENV['LOCALAPPDATA'], 'Programs', 'Aspera', 'Aspera Connect'),
+          log_root: File.join(ENV['LOCALAPPDATA'], 'Aspera', 'Aspera Connect', 'var', 'log'),
+          run_root: File.join(ENV['LOCALAPPDATA'], 'Aspera', 'Aspera Connect')
+        }, {
           expected: PRODUCT_CLI_V1,
-          app_root: File.join('C:','Program Files','Aspera','cli'),
-          log_root: File.join('C:','Program Files','Aspera','cli','var','log')
-        },{
+          app_root: File.join('C:', 'Program Files', 'Aspera', 'cli'),
+          log_root: File.join('C:', 'Program Files', 'Aspera', 'cli', 'var', 'log')
+        }, {
           expected: PRODUCT_ENTSRV,
-          app_root: File.join('C:','Program Files','Aspera','Enterprise Server'),
-          log_root: File.join('C:','Program Files','Aspera','Enterprise Server','var','log')
+          app_root: File.join('C:', 'Program Files', 'Aspera', 'Enterprise Server'),
+          log_root: File.join('C:', 'Program Files', 'Aspera', 'Enterprise Server', 'var', 'log')
         }]
         when Aspera::Environment::OS_X; return [{
           expected: PRODUCT_CONNECT,
-          app_root: File.join(Dir.home,'Applications','Aspera Connect.app'),
-          log_root: File.join(Dir.home,'Library','Logs','Aspera_Connect'),
-          run_root: File.join(Dir.home,'Library','Application Support','Aspera','Aspera Connect'),
-          sub_bin:  File.join('Contents','Resources')
-        },{
+          app_root: File.join(Dir.home, 'Applications', 'Aspera Connect.app'),
+          log_root: File.join(Dir.home, 'Library', 'Logs', 'Aspera_Connect'),
+          run_root: File.join(Dir.home, 'Library', 'Application Support', 'Aspera', 'Aspera Connect'),
+          sub_bin:  File.join('Contents', 'Resources')
+        }, {
           expected: PRODUCT_CONNECT,
-          app_root: File.join('','Applications','Aspera Connect.app'),
-          log_root: File.join(Dir.home,'Library','Logs','Aspera_Connect'),
-          run_root: File.join(Dir.home,'Library','Application Support','Aspera','Aspera Connect'),
-          sub_bin:  File.join('Contents','Resources')
-        },{
+          app_root: File.join('', 'Applications', 'Aspera Connect.app'),
+          log_root: File.join(Dir.home, 'Library', 'Logs', 'Aspera_Connect'),
+          run_root: File.join(Dir.home, 'Library', 'Application Support', 'Aspera', 'Aspera Connect'),
+          sub_bin:  File.join('Contents', 'Resources')
+        }, {
           expected: PRODUCT_CLI_V1,
-          app_root: File.join(Dir.home,'Applications','Aspera CLI'),
-          log_root: File.join(Dir.home,'Library','Logs','Aspera')
-        },{
+          app_root: File.join(Dir.home, 'Applications', 'Aspera CLI'),
+          log_root: File.join(Dir.home, 'Library', 'Logs', 'Aspera')
+        }, {
           expected: PRODUCT_ENTSRV,
-          app_root: File.join('','Library','Aspera'),
-          log_root: File.join(Dir.home,'Library','Logs','Aspera')
-        },{
+          app_root: File.join('', 'Library', 'Aspera'),
+          log_root: File.join(Dir.home, 'Library', 'Logs', 'Aspera')
+        }, {
           expected: PRODUCT_DRIVE,
-          app_root: File.join('','Applications','Aspera Drive.app'),
-          log_root: File.join(Dir.home,'Library','Logs','Aspera_Drive'),
-          sub_bin:  File.join('Contents','Resources')
+          app_root: File.join('', 'Applications', 'Aspera Drive.app'),
+          log_root: File.join(Dir.home, 'Library', 'Logs', 'Aspera_Drive'),
+          sub_bin:  File.join('Contents', 'Resources')
         }]
         else; return [{ # other: Linux and Unix family
           expected: PRODUCT_CONNECT,
-          app_root: File.join(Dir.home,'.aspera','connect'),
-          run_root: File.join(Dir.home,'.aspera','connect')
-        },{
+          app_root: File.join(Dir.home, '.aspera', 'connect'),
+          run_root: File.join(Dir.home, '.aspera', 'connect')
+        }, {
           expected: PRODUCT_CLI_V1,
-          app_root: File.join(Dir.home,'.aspera','cli')
-        },{
+          app_root: File.join(Dir.home, '.aspera', 'cli')
+        }, {
           expected: PRODUCT_ENTSRV,
-          app_root: File.join('','opt','aspera')
+          app_root: File.join('', 'opt', 'aspera')
         }]
         end
       end
@@ -381,7 +381,7 @@ module Aspera
       # @return a standard bypass key
       # @param type rsa or dsa
       # @param id in repository 1 for dsa, 2 for rsa
-      def get_key(type,id)
+      def get_key(type, id)
         # generate PEM from DER
         OpenSSL::PKey.const_get(type.upcase).new(DataRepository.instance.data(id)).to_pem
       end