aspera-cli 4.4.0 → 4.5.0

data/lib/aspera/fasp/{connect.rb → agent_connect.rb}

@@ -1,4 +1,4 @@
-require 'aspera/fasp/manager'
+require 'aspera/fasp/agent_base'
 require 'aspera/rest'
 require 'aspera/open_application'
 require 'securerandom'
@@ -6,19 +6,15 @@ require 'tty-spinner'
 
 module Aspera
   module Fasp
-    class Connect < Manager
+    class AgentConnect < AgentBase
       MAX_CONNECT_START_RETRY=3
       SLEEP_SEC_BETWEEN_RETRY=2
       private_constant :MAX_CONNECT_START_RETRY,:SLEEP_SEC_BETWEEN_RETRY
-      def initialize
-        super
+      def initialize(options)
+        super()
         @connect_settings={
           'app_id' => SecureRandom.uuid
         }
-        # TODO: start here and create monitor
-      end
-
-      def start_transfer(transfer_spec,options=nil)
         raise 'Using connect requires a graphical environment' if !OpenApplication.default_gui_mode.eql?(:graphical)
         trynumber=0
         begin
@@ -26,6 +22,7 @@ module Aspera
           Log.log.debug("found: #{connect_url}")
           @connect_api=Rest.new({base_url: "#{connect_url}/v5/connect",headers: {'Origin'=>Rest.user_agent}}) # could use v6 also now
           cinfo=@connect_api.read('info/version')[:data]
+          Log.dump(:connect_version,cinfo)
         rescue => e # Errno::ECONNREFUSED
           raise StandardError,"Unable to start connect after #{trynumber} try" if trynumber >= MAX_CONNECT_START_RETRY
           Log.log.warn("connect is not started. Retry ##{trynumber}, err=#{e}")
@@ -37,6 +34,9 @@ module Aspera
           sleep(SLEEP_SEC_BETWEEN_RETRY)
           retry
         end
+      end
+
+      def start_transfer(transfer_spec,options=nil)
         if transfer_spec['direction'] == 'send'
           Log.log.warn("Connect requires upload selection using GUI, ignoring #{transfer_spec['paths']}".red)
           transfer_spec.delete('paths')
@@ -47,7 +47,6 @@ module Aspera
         # if there is a token, we ask connect client to use well known ssh private keys
         # instead of asking password
         transfer_spec['authentication']='token' if transfer_spec.has_key?('token')
-        connect_settings=
         connect_transfer_args={
           'aspera_connect_settings'=>@connect_settings.merge({
           'request_id'               =>@request_id,
@@ -65,42 +64,50 @@ module Aspera
         connect_activity_args={'aspera_connect_settings'=>@connect_settings}
         started=false
         spinner=nil
-        loop do
-          tr_info=@connect_api.create("transfers/info/#{@xfer_id}",connect_activity_args)[:data]
-          if tr_info['transfer_info'].is_a?(Hash)
-            trdata=tr_info['transfer_info']
-            if trdata.nil?
-              Log.log.warn("no session in Connect")
-              break
-            end
-            # TODO: get session id
-            case trdata['status']
-            when 'completed'
-              notify_end(@connect_settings['app_id'])
-              break
-            when 'initiating','queued'
-              if spinner.nil?
-                spinner = TTY::Spinner.new('[:spinner] :title', format: :classic)
-                spinner.start
+        begin
+          loop do
+            tr_info=@connect_api.create("transfers/info/#{@xfer_id}",connect_activity_args)[:data]
+            if tr_info['transfer_info'].is_a?(Hash)
+              trdata=tr_info['transfer_info']
+              if trdata.nil?
+                Log.log.warn("no session in Connect")
+                break
               end
-              spinner.update(title: trdata['status'])
-              spinner.spin
-            when 'running'
-              #puts "running: sessions:#{trdata['sessions'].length}, #{trdata['sessions'].map{|i| i['bytes_transferred']}.join(',')}"
-              if !started and trdata['bytes_expected'] != 0
-                notify_begin(@connect_settings['app_id'],trdata['bytes_expected'])
-                started=true
+              # TODO: get session id
+              case trdata['status']
+              when 'completed'
+                notify_end(@connect_settings['app_id'])
+                break
+              when 'initiating','queued'
+                if spinner.nil?
+                  spinner = TTY::Spinner.new('[:spinner] :title', format: :classic)
+                  spinner.start
+                end
+                spinner.update(title: trdata['status'])
+                spinner.spin
+              when 'running'
+                #puts "running: sessions:#{trdata['sessions'].length}, #{trdata['sessions'].map{|i| i['bytes_transferred']}.join(',')}"
+                if !started and trdata['bytes_expected'] != 0
+                  spinner.success unless spinner.nil?
+                  notify_begin(@connect_settings['app_id'],trdata['bytes_expected'])
+                  started=true
+                else
+                  notify_progress(@connect_settings['app_id'],trdata['bytes_written'])
+                end
+              when 'failed'
+                spinner.error unless spinner.nil?
+                raise Fasp::Error.new(trdata['error_desc'])
               else
-                notify_progress(@connect_settings['app_id'],trdata['bytes_written'])
+                raise Fasp::Error.new("unknown status: #{trdata['status']}: #{trdata['error_desc']}")
               end
-            else
-              raise Fasp::Error.new("unknown status: #{trdata['status']}: #{trdata['error_desc']}")
             end
+            sleep 1
           end
-          sleep 1
+        rescue => e
+          return [e]
         end
-        return [] #TODO
+        return [:success]
       end # wait
-    end # Connect
+    end # AgentConnect
   end
 end

data/lib/aspera/fasp/{local.rb → agent_direct.rb}

@@ -5,11 +5,12 @@
 # Laurent Martin
 #
 ##############################################################################
-require 'aspera/fasp/manager'
+require 'aspera/fasp/agent_base'
 require 'aspera/fasp/error'
 require 'aspera/fasp/parameters'
 require 'aspera/fasp/installation'
 require 'aspera/fasp/resume_policy'
+require 'aspera/fasp/default'
 require 'aspera/log'
 require 'socket'
 require 'timeout'
@@ -18,19 +19,17 @@ require 'securerandom'
 module Aspera
   module Fasp
     # executes a local "ascp", connects mgt port, equivalent of "Fasp Manager"
-    class Local < Manager
+    class AgentDirect < AgentBase
       # options for initialize (same as values in option transfer_info)
       DEFAULT_OPTIONS = {
-        :spawn_timeout_sec => 3,
-        :spawn_delay_sec   => 2,
-        :wss               => false,
-        :multi_incr_udp    => true,
-        :resume            => {}
+        spawn_timeout_sec: 3,
+        spawn_delay_sec:   2,
+        wss:               false,
+        multi_incr_udp:    true,
+        resume:            {},
+        quiet:             true   # by default no interactive progress bar
       }
-      DEFAULT_UDP_PORT=33001
       private_constant :DEFAULT_OPTIONS
-      # set to false to keep ascp progress bar display ("true" adds ascp's option -q)
-      attr_accessor :quiet
 
       # start ascp transfer (non blocking), single or multi-session
       # job information added to @jobs
@@ -76,13 +75,13 @@ module Aspera
             Log.log.error("multi_session(#{transfer_spec['multi_session']}) shall be integer >= 0")
             multi_session_info = nil
           elsif multi_session_info[:count].eql?(0)
-            Log.log.debug("multi_session  count is zero: no multisession")
+            Log.log.debug("multi_session count is zero: no multisession")
             multi_session_info = nil
           else # multi_session_info[:count] > 0
             # if option not true: keep default udp port for all sessions
             if @options[:multi_incr_udp]
               # override if specified, else use default value
-              multi_session_info[:udp_base]=transfer_spec.has_key?('fasp_port') ? transfer_spec['fasp_port'] : DEFAULT_UDP_PORT
+              multi_session_info[:udp_base]=transfer_spec.has_key?('fasp_port') ? transfer_spec['fasp_port'] : Default::UDP_PORT
               # delete from original transfer spec, as we will increment values
               transfer_spec.delete('fasp_port')
             end
@@ -98,7 +97,7 @@ module Aspera
           env_args[:args].unshift('-I',Installation.instance.path(:fallback_cert))
         end
 
-        env_args[:args].unshift('-q') if @quiet
+        env_args[:args].unshift('-q') if @options[:quiet]
 
         # transfer job can be multi session
         xfer_job={
@@ -240,7 +239,7 @@ module Aspera
             when ''
               # empty line is separator to end event information
               raise 'unexpected empty line' if current_event_data.nil?
-              current_event_data[Manager::LISTENER_SESSION_ID_B]=ascp_pid
+              current_event_data[AgentBase::LISTENER_SESSION_ID_B]=ascp_pid
               notify_listeners(current_event_text,current_event_data)
               case current_event_data['Type']
               when 'INIT'
@@ -333,8 +332,6 @@ module Aspera
       # @param options : keys(symbol): see DEFAULT_OPTIONS
       def initialize(options=nil)
         super()
-        # by default no interactive progress bar
-        @quiet=true
         # all transfer jobs, key = SecureRandom.uuid, protected by mutex, condvar on change
         @jobs={}
         # mutex protects global data accessed by threads
@@ -374,6 +371,6 @@ module Aspera
         Log.log.debug("EXIT (#{Thread.current[:name]})")
       end
 
-    end # Local
+    end # AgentDirect
   end
 end

data/lib/aspera/fasp/{http_gw.rb → agent_httpgw.rb}

@@ -1,5 +1,5 @@
 #!/bin/echo this is a ruby class:
-require 'aspera/fasp/manager'
+require 'aspera/fasp/agent_base'
 require 'aspera/log'
 require 'aspera/rest'
 require 'websocket-client-simple'
@@ -12,7 +12,7 @@ require 'json'
 module Aspera
   module Fasp
     # start a transfer using Aspera HTTP Gateway, using web socket session
-    class HttpGW < Manager
+    class AgentHttpgw < AgentBase
       # message returned by HTTP GW in case of success
       OK_MESSAGE='end upload'
       # refresh rate for progress
@@ -179,7 +179,7 @@ module Aspera
         when 'receive'
           download(transfer_spec)
         else
-          raise "error"
+          raise "unexpected direction: [#{transfer_spec['direction']}]"
         end
       end # start_transfer
 
@@ -209,6 +209,6 @@ module Aspera
         @upload_chunksize=128000 # TODO: configurable ?
       end
 
-    end # HttpGW
+    end # AgentHttpgw
   end
 end

data/lib/aspera/fasp/{node.rb → agent_node.rb}

@@ -1,4 +1,4 @@
-require 'aspera/fasp/manager'
+require 'aspera/fasp/agent_base'
 require 'aspera/log'
 require 'tty-spinner'
 
@@ -6,13 +6,30 @@ 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 Node < Manager
+    class AgentNode < AgentBase
       # option include: root_id if the node is an access key
       attr_writer :options
-      def initialize(node_api,options={})
+      def initialize(options)
+        raise "node specification must be Hash" unless options.is_a?(Hash)
+        [:url,:username,:password].each { |k| raise "missing parameter [#{k}] in node specification: #{options}" unless options.has_key?(k) }
         super()
-        @node_api=node_api
-        @options=options
+        # root id is required for access key
+        @root_id=options[:root_id]
+        rest_params={ base_url: options[:url]}
+        if options[:password].match(/^Bearer /)
+          rest_params[:headers]={
+            'X-Aspera-AccessKey'=>options[:username],
+            'Authorization'     =>options[:password]
+          }
+          raise "root_id is required for access key" if @root_id.nil?
+        else
+          rest_params[:auth]={
+            type:     :basic,
+            username: options[:username],
+            password: options[:password]
+          }
+        end
+        @node_api=Rest.new(rest_params)
         # TODO: currently only supports one transfer. This is bad shortcut. but ok for CLI.
         @transfer_id=nil
       end
@@ -36,10 +53,10 @@ module Aspera
       # generic method
       def start_transfer(transfer_spec,options=nil)
         # add root id if access key
-        if @options.has_key?(:root_id)
+        if ! @root_id.nil?
           case transfer_spec['direction']
-          when 'send';transfer_spec['source_root_id']=@options[:root_id]
-          when 'receive';transfer_spec['destination_root_id']=@options[:root_id]
+          when 'send';transfer_spec['source_root_id']=@root_id
+          when 'receive';transfer_spec['destination_root_id']=@root_id
           else raise "unexpected direction in ts: #{transfer_spec['direction']}"
           end
         end

data/lib/aspera/fasp/agent_trsdk.rb

@@ -0,0 +1,106 @@
+require 'aspera/fasp/agent_base'
+require 'aspera/fasp/installation'
+require 'json'
+
+module Aspera
+  module Fasp
+    class AgentTrsdk < AgentBase
+      DEFAULT_OPTIONS = {
+        address: '127.0.0.1',
+        port:    55002,
+      }
+      private_constant :DEFAULT_OPTIONS
+
+      # options come from transfer_info
+      def initialize(user_opts)
+        raise "expecting Hash (or nil), but have #{user_opts.class}" unless user_opts.nil? or user_opts.is_a?(Hash)
+        # set default options and override if specified
+        options=DEFAULT_OPTIONS.clone
+        if !user_opts.nil?
+          user_opts.each do |k,v|
+            if DEFAULT_OPTIONS.has_key?(k)
+              options[k]=v
+            else
+              raise "Unknown local agent parameter: #{k}, expect one of #{DEFAULT_OPTIONS.keys.map{|i|i.to_s}.join(",")}"
+            end
+          end
+        end
+        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)
+        begin
+          get_info_response = @transfer_client.get_info(Transfersdk::InstanceInfoRequest.new)
+          Log.log.debug("daemon info: #{get_info_response}")
+        rescue GRPC::Unavailable => e
+          Log.log.warn("no daemon present, starting daemon...")
+          # location of daemon binary
+          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')
+          # create a config file for daemon
+          config = {
+            address: options[:address],
+            port:    options[:port],
+            fasp_runtime: {
+            use_embedded: false,
+            user_defined: {
+            bin: bin_folder,
+            etc: bin_folder,
+            }
+            }
+          }
+          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)
+        # create a transfer request
+        transfer_request = Transfersdk::TransferRequest.new(
+        transferType: Transfersdk::TransferType::FILE_REGULAR, # transfer type (file/stream)
+        config: Transfersdk::TransferConfig.new, # transfer configuration
+        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}")
+        @transfer_id = start_transfer_response.transferId
+        Log.log.debug("transfer started with id #{@transfer_id}")
+      end
+
+      def wait_for_transfers_completion
+        started=false
+        # 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}")
+          case response.status
+          when :RUNNING
+            if !started and !response.sessionInfo.preTransferBytes.eql?(0)
+              notify_begin(@transfer_id,response.sessionInfo.preTransferBytes)
+              started=true
+            elsif started
+              notify_progress(@transfer_id,response.transferInfo.bytesTransferred)
+            end
+          when :FAILED, :COMPLETED, :CANCELED
+            notify_end(@transfer_id)
+            raise Fasp::Error.new(JSON.parse(response.message)['Description']) unless :COMPLETED.eql?(response.status)
+            break
+          when :QUEUED,:UNKNOWN_STATUS,:PAUSED,:ORPHANED
+            # ignore
+          else
+            Log.log.error("unknown status#{response.status}")
+          end
+        end
+        # TODO return status
+        return []
+      end
+    end
+  end
+end

data/lib/aspera/fasp/default.rb

@@ -0,0 +1,17 @@
+module Aspera
+  module Fasp
+    # default parameters
+    class Default
+      # (public) default transfer username for access key based transfers
+      ACCESS_KEY_TRANSFER_USER='xfer'
+      SSH_PORT=33001
+      UDP_PORT=33001
+      AK_TSPEC_BASE={
+        'remote_user' => ACCESS_KEY_TRANSFER_USER,
+        'ssh_port'    => SSH_PORT,
+        'fasp_port'   => UDP_PORT
+      }
+    end
+  end
+end
+

data/lib/aspera/fasp/installation.rb

@@ -10,7 +10,7 @@ require 'fileutils'
 module Aspera
   module Fasp
     # Singleton that tells where to find ascp and other local resources (keys..) , using the "path(symb)" method.
-    # It is used by object : Fasp::Local to find necessary resources
+    # It is used by object : AgentDirect to find necessary resources
     # By default it takes the first Aspera product found specified in product_locations
     # but the user can specify ascp location by calling:
     # Installation.instance.use_ascp_from_product(product_name)
@@ -22,6 +22,9 @@ module Aspera
       PRODUCT_CLI_V1='Aspera CLI'
       PRODUCT_DRIVE='Aspera Drive'
       PRODUCT_ENTSRV='Enterprise Server'
+      # protobuf generated files from sdk
+      EXT_RUBY_PROTOBUF='_pb.rb'
+      RB_SDK_FOLDER='lib'
       MAX_REDIRECT_SDK=2
       private_constant :MAX_REDIRECT_SDK
       # set ascp executable path
@@ -29,9 +32,10 @@ module Aspera
         @path_to_ascp=v
       end
 
-      # filename for ascp with optional extension (Windows)
-      def ascp_filename
-        return 'ascp'+Environment.exe_extension
+      def sdk_ruby_folder
+        ruby_pb_folder=File.join(folder_path,RB_SDK_FOLDER)
+        FileUtils.mkdir_p(ruby_pb_folder) unless Dir.exist?(ruby_pb_folder)
+        return ruby_pb_folder
       end
 
       # location of SDK files
@@ -100,6 +104,8 @@ module Aspera
           file=@path_to_ascp
           # 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=File.join(folder_path,'aspera_bypass_dsa.pem')
           File.write(file,get_key('dsa',1)) unless File.exist?(file)
@@ -182,16 +188,22 @@ module Aspera
         return [:ssh_bypass_key_dsa,:ssh_bypass_key_rsa].map{|i|Installation.instance.path(i)}
       end
 
+      # use in plugin `config`
+      def get_ascp_version(exe_path)
+        return get_exe_version(exe_path,'-A')
+      end
+
       # Check that specified path is ascp and get version
-      def get_ascp_version(ascp_path)
-        raise "File basename of #{ascp_path} must be #{ascp_filename}" unless File.basename(ascp_path).eql?(ascp_filename)
-        ascp_version='n/a'
-        raise "error in sdk: no ascp included" if ascp_path.nil?
-        cmd_out=%x{"#{ascp_path}" -A}
+      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
+        cmd_out=%x{"#{exe_path}" #{vers_arg}}
         raise "An error occured when testing #{ascp_filename}: #{cmd_out}" unless $? == 0
         # get version from ascp, only after full extract, as windows requires DLLs (SSL/TLS/etc...)
-        m=cmd_out.match(/ascp version (.*)/)
-        ascp_version=m[1] unless m.nil?
+        m=cmd_out.match(/ version ([0-9\.]+)/)
+        exe_version=m[1] unless m.nil?
+        return exe_version
       end
 
       # download aspera SDK or use local file
@@ -205,54 +217,49 @@ module Aspera
           raise 'use format: file:///<path>' unless sdk_url.start_with?('file:///')
           sdk_zip_path=sdk_url.gsub(%r{^file:///},'')
         else
-          redirect_remain=MAX_REDIRECT_SDK
-          begin
-            Aspera::Rest.new(base_url: sdk_url).call(operation: 'GET',save_to_file: sdk_zip_path)
-          rescue Aspera::RestCallError => e
-            if e.response.is_a?(Net::HTTPRedirection)
-              if redirect_remain > 0
-                redirect_remain-=1
-                sdk_url=e.response['location']
-                retry
-              else
-                raise "Too many redirect"
-              end
-            else
-              raise e
-            end
-          end
+          Aspera::Rest.new(base_url: sdk_url, redirect_max: 3).call(operation: 'GET',save_to_file: sdk_zip_path)
         end
-        # SDK is organized by architecture
-        filter="/#{Environment.architecture}/"
-        ascp_path=nil
-        sdk_path=folder_path
         # rename old install
-        if File.exist?(File.join(sdk_path,ascp_filename))
-          Log.log.warn("Previous install exists, renaming.")
-          File.rename(sdk_path,"#{sdk_path}.#{Time.now.strftime("%Y%m%d%H%M%S")}")
+        if ! Dir.empty?(folder_path)
+          Log.log.warn("Previous install exists, renaming folder.")
+          File.rename(folder_path,"#{folder_path}.#{Time.now.strftime("%Y%m%d%H%M%S")}")
+          # TODO: delete old archives ?
         end
-        # first ensure license file is here so that ascp invokation for version works
-        self.path(:aspera_license)
-        self.path(:aspera_conf)
+        # SDK is organized by architecture
+        arch_filter="#{Environment.architecture}/"
+        # extract files from archive
         Zip::File.open(sdk_zip_path) do |zip_file|
           zip_file.each do |entry|
-            # get only specified arch, but not folder, only files
-            if entry.name.include?(filter) and !entry.name.end_with?('/')
-              archive_file=File.join(sdk_path,File.basename(entry.name))
-              File.open(archive_file, 'wb') do |output_stream|
+            # skip folder entries
+            next if entry.name.end_with?('/')
+            dest_folder=nil
+            # binaries
+            dest_folder=folder_path if entry.name.include?(arch_filter)
+            # ruby adapters
+            dest_folder=sdk_ruby_folder if entry.name.end_with?(EXT_RUBY_PROTOBUF)
+            if !dest_folder.nil?
+              File.open(File.join(dest_folder,File.basename(entry.name)), 'wb') do |output_stream|
                 IO.copy_stream(entry.get_input_stream, output_stream)
               end
-              if File.basename(entry.name).eql?(ascp_filename)
-                FileUtils.chmod(0755,archive_file)
-                ascp_path=archive_file
-              end
             end
           end
         end
         File.unlink(sdk_zip_path) rescue nil # Windows may give error
-        ascp_version=get_ascp_version(ascp_path)
-        File.write(File.join(folder_path,PRODUCT_INFO),"<product><name>IBM Aspera SDK</name><version>#{ascp_version}</version></product>")
-        return ascp_version
+        # ensure license file are generated so that ascp invokation for version works
+        self.path(:aspera_license)
+        self.path(:aspera_conf)
+        ascp_path=File.join(folder_path,ascp_filename)
+        raise "No #{ascp_filename} found in SDK archive" unless File.exist?(ascp_path)
+        FileUtils.chmod(0755,ascp_path)
+        FileUtils.chmod(0755,ascp_path.gsub('ascp','ascp4'))
+        ascp_version=get_ascp_version(File.join(folder_path,ascp_filename))
+        trd_path=transferd_filepath
+        Log.log.warn("No #{trd_path} in SDK archive") unless File.exist?(trd_path)
+        FileUtils.chmod(0755,trd_path) if File.exist?(trd_path)
+        transferd_version=get_exe_version(trd_path,'version')
+        sdk_version = transferd_version||ascp_version
+        File.write(File.join(folder_path,PRODUCT_INFO),"<product><name>IBM Aspera SDK</name><version>#{sdk_version}</version></product>")
+        return sdk_version
       end
 
       private
@@ -288,6 +295,15 @@ module Aspera
         @sdk_folder
       end
 
+      # filename for ascp with optional extension (Windows)
+      def ascp_filename
+        return 'ascp'+Environment.exe_extension
+      end
+
+      def transferd_filepath
+        return File.join(folder_path,'asperatransferd'+Environment.exe_extension)
+      end
+
       # @return product folders depending on OS fields
       # :expected  M app name is taken from the manifest if present, else defaults to this value
       # :app_root  M main folder for the application

data/lib/aspera/fasp/parameters.rb

@@ -7,6 +7,7 @@ require 'json'
 require 'yaml'
 require 'securerandom'
 require 'fileutils'
+require 'openssl'
 
 module Aspera
   module Fasp
@@ -26,7 +27,7 @@ module Aspera
         Aspera::CommandLineBuilder.normalize_description(@@param_description_cache)
       end
 
-      # Agents shown in manual
+      # Agents shown in manual for parameters (sub list)
       SUPPORTED_AGENTS=[:direct,:node,:connect]
       # Short names of columns in manual
       SUPPORTED_AGENTS_SHORT=SUPPORTED_AGENTS.map{|a|a.to_s[0].to_sym}
@@ -111,6 +112,9 @@ module Aspera
           @job_spec.delete('fasp_port')
           @job_spec.delete('EX_ssh_key_paths')
           @job_spec.delete('sshfp')
+          # set default location for CA bundle, see env var SSL_CERT_FILE / SSL_CERT_DIR
+          @job_spec['EX_ssh_key_paths']=[OpenSSL::X509::DEFAULT_CERT_FILE]
+          Log.log.debug("CA certs: EX_ssh_key_paths <- DEFAULT_CERT_FILE from openssl")
         else
           # remove unused parameter (avoid warning)
           @job_spec.delete('wss_port')
@@ -163,8 +167,8 @@ module Aspera
                   lines=paths_array.map{|i|i['source']}
                 end
                 file_list_file=Aspera::TempFileManager.instance.new_file_path_in_folder(@@file_list_folder)
-                File.open(file_list_file, 'w+'){|f|f.puts(lines)}
-                Log.log.debug("#{option}=\n#{File.read(file_list_file)}".red)
+                File.open(file_list_file, 'w+'){|f|f.write(lines.join("\n"))}
+                Log.log.debug{"#{option}=\n#{File.read(file_list_file)}".red}
               end
             end
             @builder.add_command_line_options(["#{option}=#{file_list_file}"])