aspera-cli 4.20.0 → 4.21.2

data/bin/ascli

@@ -9,17 +9,8 @@ Encoding.default_internal = Encoding::UTF_8
 Encoding.default_external = Encoding::UTF_8
 $VERBOSE = old_verbose
 
-begin
-  gem_lib_folder = File.join(File.dirname(File.dirname(File.realpath(__FILE__))), 'lib')
-  Kernel.load(File.join(gem_lib_folder, 'aspera/coverage.rb'))
-  begin
-    require 'aspera/cli/main'
-  rescue LoadError
-    # if in development, add path toward gem
-    $LOAD_PATH.unshift(gem_lib_folder)
-    require 'aspera/cli/main'
-  end
-  require 'aspera/environment'
-  Aspera::Environment.fix_home
-  Aspera::Cli::Main.new(ARGV).process_command_line
-end
+require 'aspera/coverage'
+require 'aspera/environment'
+require 'aspera/cli/main'
+Aspera::Environment.fix_home
+Aspera::Cli::Main.new(ARGV).process_command_line

data/bin/asession

@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-gem_lib_folder = File.join(File.dirname(File.dirname(File.realpath(__FILE__))), 'lib')
-Kernel.load(File.join(gem_lib_folder, 'aspera/coverage.rb'))
-$LOAD_PATH.unshift(gem_lib_folder)
+require 'aspera/coverage'
 require 'aspera/agent/direct'
 require 'aspera/cli/extended_value'
-require 'aspera/ascp/installation'
+require 'aspera/products/transferd'
 require 'aspera/log'
 require 'json'
 # extended transfer spec parameter (only used in asession)
@@ -77,7 +75,7 @@ if session_spec.key?(PARAM_TMP_FILE_LIST_FOLDER)
   Aspera::Transfer::Parameters.file_list_folder = session_spec[PARAM_TMP_FILE_LIST_FOLDER]
 end
 session_spec[PARAM_SDK] = File.join(Dir.home, '.aspera', 'sdk') unless session_spec.key?(PARAM_SDK)
-Aspera::Ascp::Installation.instance.sdk_folder = session_spec[PARAM_SDK]
+Aspera::Products::Transferd.sdk_directory = session_spec[PARAM_SDK]
 session_spec[PARAM_AGENT] = {} unless session_spec.key?(PARAM_AGENT)
 agent_params = session_spec[PARAM_AGENT]
 agent_params['quiet'] = true

data/examples/get_proto_file.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Retrieve `transfer.proto` from the web
-$LOAD_PATH.unshift(File.join(File.dirname(File.dirname(File.realpath(__FILE__))), 'lib'))
 require 'aspera/ascp/installation'
-Aspera::Ascp::Installation.instance.install_sdk(folder: ARGV.first, backup: false, with_exe: false) {|name| '/' if name.end_with?('transfer.proto')}
+require 'aspera/cli/transfer_progress'
+Aspera::RestParameters.instance.progress_bar = Aspera::Cli::TransferProgress.new
+# Retrieve `transfer.proto` from the web
+Aspera::Ascp::Installation.instance.install_sdk(folder: ARGV.first, backup: false, with_exe: false) {|name| name.end_with?('.proto') ? '/' : nil }

data/examples/proxy.pac

@@ -11,20 +11,20 @@ function FindProxyForURL(url, host) {
 
 	/* Don't proxy local domains */
 	if (dnsDomainIs(host, ".example1.com") || (host == "example1.com")
-			|| dnsDomainIs(host, ".example2.com") || (host == "example2.com")
-			|| dnsDomainIs(host, ".example3.com") || (host == "example3.com")) {
+		|| dnsDomainIs(host, ".example2.com") || (host == "example2.com")
+		|| dnsDomainIs(host, ".example3.com") || (host == "example3.com")) {
 		return 'DIRECT';
 	}
 
 	/* Don't proxy Windows Update */
 	if ((host == "download.microsoft.com")
-			|| (host == "ntservicepack.microsoft.com")
-			|| (host == "cdm.microsoft.com") || (host == "wustat.windows.com")
-			|| (host == "windowsupdate.microsoft.com")
-			|| (dnsDomainIs(host, ".windowsupdate.microsoft.com"))
-			|| (host == "update.microsoft.com")
-			|| (dnsDomainIs(host, ".update.microsoft.com"))
-			|| (dnsDomainIs(host, ".windowsupdate.com"))) {
+		|| (host == "ntservicepack.microsoft.com")
+		|| (host == "cdm.microsoft.com") || (host == "wustat.windows.com")
+		|| (host == "windowsupdate.microsoft.com")
+		|| (dnsDomainIs(host, ".windowsupdate.microsoft.com"))
+		|| (host == "update.microsoft.com")
+		|| (dnsDomainIs(host, ".update.microsoft.com"))
+		|| (dnsDomainIs(host, ".windowsupdate.com"))) {
 		return 'DIRECT';
 	}
 
@@ -33,22 +33,22 @@ function FindProxyForURL(url, host) {
 
 		/* Don't proxy private addresses (RFC 3330) */
 		if (isInNet(hostIP, '0.0.0.0', '255.0.0.0')
-				|| isInNet(hostIP, '10.0.0.0', '255.0.0.0')
-				|| isInNet(hostIP, '127.0.0.0', '255.0.0.0')
-				|| isInNet(hostIP, '169.254.0.0', '255.255.0.0')
-				|| isInNet(hostIP, '172.16.0.0', '255.240.0.0')
-				|| isInNet(hostIP, '192.0.2.0', '255.255.255.0')
-				|| isInNet(hostIP, '192.88.99.0', '255.255.255.0')
-				|| isInNet(hostIP, '192.168.0.0', '255.255.0.0')
-				|| isInNet(hostIP, '198.18.0.0', '255.254.0.0')
-				|| isInNet(hostIP, '224.0.0.0', '240.0.0.0')
-				|| isInNet(hostIP, '240.0.0.0', '240.0.0.0')) {
+			|| isInNet(hostIP, '10.0.0.0', '255.0.0.0')
+			|| isInNet(hostIP, '127.0.0.0', '255.0.0.0')
+			|| isInNet(hostIP, '169.254.0.0', '255.255.0.0')
+			|| isInNet(hostIP, '172.16.0.0', '255.240.0.0')
+			|| isInNet(hostIP, '192.0.2.0', '255.255.255.0')
+			|| isInNet(hostIP, '192.88.99.0', '255.255.255.0')
+			|| isInNet(hostIP, '192.168.0.0', '255.255.0.0')
+			|| isInNet(hostIP, '198.18.0.0', '255.254.0.0')
+			|| isInNet(hostIP, '224.0.0.0', '240.0.0.0')
+			|| isInNet(hostIP, '240.0.0.0', '240.0.0.0')) {
 			return 'DIRECT';
 		}
 	}
 
 	if (url.substring(0, 5) == 'http:' || url.substring(0, 6) == 'https:'
-			|| url.substring(0, 4) == 'ftp:') {
+		|| url.substring(0, 4) == 'ftp:') {
 		return 'PROXY proxy.example.com:8080';
 	}
 

data/lib/aspera/agent/base.rb

@@ -7,6 +7,7 @@ module Aspera
     # Base class for transfer agents
     class Base
       RUBY_EXT = '.rb'
+      private_constant :RUBY_EXT
       class << self
         def factory_create(agent, options)
           # Aspera.assert_values(agent, agent_list)
@@ -15,6 +16,7 @@ module Aspera
         end
 
         # discover available agents
+        # @return [Array] list of symbols of agents
         def agent_list
           base_class = File.basename(__FILE__)
           Dir.entries(File.dirname(File.expand_path(__FILE__))).select do |file|

data/lib/aspera/agent/connect.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require 'aspera/agent/base'
+require 'aspera/products/connect'
+require 'aspera/products/other'
 require 'aspera/rest'
+require 'aspera/environment'
 require 'securerandom'
 
 module Aspera
@@ -13,14 +16,14 @@ module Aspera
       SLEEP_SEC_BETWEEN_RETRY = 5
       private_constant :CONNECT_START_URIS, :SLEEP_SEC_BETWEEN_RETRY
       def initialize(**base_options)
-        super(**base_options)
+        super
         @connect_settings = {
           'app_id' => SecureRandom.uuid
         }
         raise 'Using connect requires a graphical environment' if !Environment.default_gui_mode.eql?(:graphical)
         method_index = 0
         begin
-          connect_url = Ascp::Products.connect_uri
+          connect_url = connect_api_url
           Log.log.debug{"found: #{connect_url}"}
           @connect_api = Rest.new(
             base_url: "#{connect_url}/v5/connect", # could use v6 also now
@@ -43,6 +46,21 @@ module Aspera
         end
       end
 
+      # @return the file path of local connect where API's URI can be read
+      def connect_api_url
+        connect_locations = Products::Other.find(Products::Connect.locations).first
+        raise "Product: #{name} not found, please install." if connect_locations.nil?
+        folder = File.join(connect_locations[:run_root], 'var', 'run')
+        ['', '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
+        end
+        raise "no connect uri file found in #{folder}"
+      end
+
       def start_transfer(transfer_spec, token_regenerator: nil)
         if transfer_spec['direction'] == 'send'
           Log.log.warn{"Connect requires upload selection using GUI, ignoring #{transfer_spec['paths']}".red}

data/lib/aspera/agent/{alpha.rb → desktop.rb}

@@ -2,26 +2,25 @@
 
 require 'aspera/agent/base'
 require 'aspera/rest'
-require 'aspera/log'
-require 'aspera/json_rpc'
 require 'aspera/environment'
+require 'aspera/json_rpc'
+require 'aspera/products/desktop'
 require 'securerandom'
 
 module Aspera
   module Agent
-    # Aspera Desktop Alpha Client
-    class Alpha < Base
+    # Client: Aspera for Desktop
+    class Desktop < Base
       # try twice the main init url in sequence
       START_URIS = ['aspera://', 'aspera://', 'aspera://']
       # delay between each try to start the app
       SLEEP_SEC_BETWEEN_RETRY = 5
-      APP_IDENTIFIER = 'com.ibm.software.aspera.desktop'
-      APP_NAME = 'Aspera Desktop Alpha Client'
       private_constant :START_URIS, :SLEEP_SEC_BETWEEN_RETRY
+
       def initialize(**base_options)
         @application_id = SecureRandom.uuid
         @xfer_id = nil
-        super(**base_options)
+        super
         raise 'Using client requires a graphical environment' if !Environment.default_gui_mode.eql?(:graphical)
         method_index = 0
         begin
@@ -34,24 +33,20 @@ module Aspera
         rescue Errno::ECONNREFUSED => e
           start_url = START_URIS[method_index]
           method_index += 1
-          raise StandardError, "Unable to start #{APP_NAME} #{method_index} times" if start_url.nil?
-          Log.log.warn{"#{APP_NAME} is not started (#{e}). Trying to start it ##{method_index}..."}
+          raise StandardError, "Unable to start #{Products::Desktop::APP_NAME} #{method_index} times" if start_url.nil?
+          Log.log.warn{"#{Products::Desktop::APP_NAME} is not started (#{e}). Trying to start it ##{method_index}..."}
           if !Environment.open_uri_graphical(start_url)
             Environment.open_uri_graphical('https://www.ibm.com/aspera/connect/')
-            raise StandardError, "#{APP_NAME} is not installed"
+            raise StandardError, "#{Products::Desktop::APP_NAME} is not installed"
           end
           sleep(SLEEP_SEC_BETWEEN_RETRY)
           retry
         end
       end
 
-      def sdk_log_file
-        File.join(Dir.home, 'Library', 'Logs', APP_IDENTIFIER, 'ibm-aspera-desktop.log')
-      end
-
       def aspera_client_api_url
-        log_file = sdk_log_file
-        url = nil
+        log_file = Products::Desktop.log_file
+        url = 'http://127.0.0.1:33024'
         File.open(log_file, 'r') do |file|
           file.each_line do |line|
             line = line.chomp
@@ -60,8 +55,7 @@ module Aspera
             end
           end
         end
-        url = 'http://127.0.0.1:33024' if url.nil?
-        raise StandardError, "Unable to find the JSON-RPC server URL in #{log_file}" if url.nil?
+        # raise StandardError, "Unable to find the JSON-RPC server URL in #{log_file}" if url.nil?
         return url
       end
 

data/lib/aspera/agent/direct.rb

@@ -72,7 +72,7 @@ module Aspera
         session = {
           id:                nil, # SessionId from INIT message in mgt port
           job_id:            SecureRandom.uuid, # job id (regroup sessions)
-          ts:                transfer_spec,     # transfer spec
+          ts:                transfer_spec,     # global transfer spec
           thread:            nil,               # Thread object monitoring management port, not nil when pushed to :sessions
           error:             nil,               # exception if failed
           io:                nil,               # management port server socket
@@ -84,7 +84,7 @@ module Aspera
         if multi_session_info.nil?
           Log.log.debug('Starting single session thread')
           # single session for transfer : simple
-          session[:thread] = Thread.new(session) {|session_info|transfer_thread_entry(session_info)}
+          session[:thread] = Thread.new {transfer_thread_entry(session)}
           @sessions.push(session)
         else
           Log.log.debug('Starting multi session threads')
@@ -101,7 +101,7 @@ module Aspera
             # option: increment (default as per ascp manual) or not (cluster on other side ?)
             args.unshift('-O', (multi_session_info[:udp_base] + i - 1).to_s) if @multi_incr_udp
             # finally start the thread
-            this_session[:thread] = Thread.new(this_session) {|session_info|transfer_thread_entry(session_info)}
+            this_session[:thread] = Thread.new {transfer_thread_entry(this_session)}
             @sessions.push(this_session)
           end
         end
@@ -132,18 +132,18 @@ module Aspera
 
       # @return [Array] list of sessions for a job
       def sessions_by_job(job_id)
-        @sessions.select{|session_info| session_info[:job_id].eql?(job_id)}
+        @sessions.select{|session| session[:job_id].eql?(job_id)}
       end
 
-      # This is the low level method to start the transfer process
+      # This is the low level method to start the transfer process.
+      # Typically started in a thread.
       # Start process with management port.
-      # returns
-      # raises FaspError on error
       # @param session this session information, keys :io and :token_regenerator
-      # @param env  [Hash]   environment variables
-      # @param name [Symbol] name of executable: :ascp, :ascp4 or :async
-      # @param args [Array]  command line arguments
+      # @param env  [Hash]   environment variables (comes from ascp_args)
+      # @param name [Symbol] name of executable: :ascp, :ascp4 or :async (comes from ascp_args)
+      # @param args [Array]  command line arguments (comes from ascp_args)
       # @return [nil] when process has exited
+      # @throw FaspError on error
       def start_and_monitor_process(
         session:,
         env:,
@@ -159,6 +159,8 @@ module Aspera
           mgt_server_socket = socket_class.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
           # open any available (0) local TCP port for use as management port
           mgt_server_socket.bind(Addrinfo.tcp(LISTEN_LOCAL_ADDRESS, SELECT_AVAILABLE_PORT))
+          # make port ready to accept connections, before starting ascp
+          mgt_server_socket.listen(1)
           # build arguments and add mgt port
           command_arguments = if name.eql?(:async)
             ["--exclusive-mgmt-port=#{mgt_server_socket.local_address.ip_port}"]
@@ -166,12 +168,15 @@ module Aspera
             ['-M', mgt_server_socket.local_address.ip_port.to_s]
           end
           command_arguments.concat(args)
+          # capture process stderr
+          stderr_r, stderr_w = IO.pipe
           # get location of command executable (ascp, async)
           command_path = Ascp::Installation.instance.path(name)
-          command_pid = Environment.secure_spawn(env: env, exec: command_path, args: command_arguments)
+          command_pid = Environment.secure_spawn(env: env, exec: command_path, args: command_arguments, err: stderr_w)
+          stderr_w.close
           notify_progress(:pre_start, session_id: nil, info: "waiting for #{name} to start")
-          mgt_server_socket.listen(1)
           # TODO: timeout does not work when Process.spawn is used... until process exits, then it works
+          # So we use select to detect that anything happens on the socket (connection)
           Log.log.debug{"before select, timeout: #{@spawn_timeout_sec}"}
           readable, _, _ = IO.select([mgt_server_socket], nil, nil, @spawn_timeout_sec)
           Log.log.debug('after select, before accept')
@@ -192,13 +197,19 @@ module Aspera
             next unless event
             # event is ready
             Log.log.trace1{Log.dump(:management_port, event)}
+            # store latest event by type
+            session[:id] = event['SessionId'] if event['Type'].eql?('INIT')
             @management_cb&.call(event)
             process_progress(event)
-            Log.log.error((event['Description']).to_s) if event['Type'].eql?('FILEERROR') # cspell:disable-line
+            Log.log.error(event['Description'].to_s) if event['Type'].eql?('FILEERROR') # cspell:disable-line
           end
           Log.log.debug('management io closed')
           # check that last status was received before process exit
           last_event = processor.last_event
+          # process stderr of ascp
+          stderr_r&.each_line do |line|
+            Log.log.error(line.chomp)
+          end
           raise Transfer::Error, "internal: no management event (#{last_event.class})" unless last_event.is_a?(Hash)
           case last_event['Type']
           when 'ERROR'
@@ -222,6 +233,7 @@ module Aspera
           raise Transfer::Error, 'transfer interrupted by user'
         ensure
           mgt_server_socket.close
+          stderr_r&.close
           # if command was successfully started, check its status
           unless command_pid.nil?
             # "wait" for process to avoid zombie
@@ -242,10 +254,13 @@ module Aspera
         nil
       end
 
+      attr_reader :sessions
+
       private
 
       # notify progress to callback
       # @param event management port event
+      # @param session sessin object
       def process_progress(event)
         session_id = event['SessionId']
         case event['Type']
@@ -282,14 +297,6 @@ module Aspera
         end
       end
 
-      # @return [Hash] session information
-      def session_by_id(id)
-        matches = @sessions.select{|session_info| session_info[:id].eql?(id)}
-        raise 'no such session' if matches.empty?
-        raise 'more than one session' if matches.length > 1
-        return matches.first
-      end
-
       # send command to management port of command (used in `asession)
       # @param job_id identified transfer process
       # @param session_index index of session (for multi session)
@@ -297,18 +304,10 @@ module Aspera
       # {'type'=>'START','source'=>_path_,'destination'=>_path_}
       # {'type'=>'DONE'}
       def send_command(job_id, data)
-        session = session_by_id(job_id)
+        session = @sessions.find{|session| session[:job_id].eql?(job_id)}
         Log.log.debug{"command: #{data}"}
-        # build command
-        command = data
-          .keys
-          .map{|k|"#{k.capitalize}: #{data[k]}"}
-          .unshift(MGT_HEADER)
-          .push('', '')
-          .join("\n")
-        session[:io].puts(command)
+        session[:io].puts(Ascp::Management.command_to_stream(data))
       end
-      attr_reader :sessions
 
       # options for initialize (same as values in option transfer_info)
       # @param ascp_args [Array] additional arguments to ascp

data/lib/aspera/agent/node.rb

@@ -50,14 +50,6 @@ module Aspera
         return @node_api
       end
 
-      # use this to set the node_api end point before using the class.
-      def node_api=(new_value)
-        if !@node_api.nil? && !new_value.nil?
-          Log.log.warn('overriding existing node api value')
-        end
-        @node_api = new_value
-      end
-
       # generic method
       def start_transfer(transfer_spec, token_regenerator: nil)
         # add root id if access key
@@ -120,9 +112,7 @@ module Aspera
             # Bug in HSTS ? transfer is marked failed, but there is no reason
             break if transfer_data['error_code'].eql?(0) && transfer_data['error_desc'].empty?
             raise Transfer::Error, "status: #{transfer_data['status']}. code: #{transfer_data['error_code']}. description: #{transfer_data['error_desc']}"
-          else
-            Log.log.warn{"transfer_data -> #{transfer_data}"}
-            raise Transfer::Error, "status: #{transfer_data['status']}. code: #{transfer_data['error_code']}. description: #{transfer_data['error_desc']}"
+          else Aspera.error_unexpected_value(transfer_data['status']){"transfer_data -> #{transfer_data}"}
           end
           sleep(1.0)
         end

data/lib/aspera/agent/{trsdk.rb → transferd.rb}

@@ -1,57 +1,39 @@
 # frozen_string_literal: true
 
+require 'aspera/environment'
 require 'aspera/agent/base'
-require 'aspera/ascp/installation'
+require 'aspera/products/transferd'
 require 'aspera/temp_file_manager'
-require 'aspera/log'
-require 'aspera/assert'
 require 'json'
 require 'uri'
-require 'transfer_services_pb'
+require 'transferd_services_pb'
 
 module Aspera
   module Agent
-    class Trsdk < Base
-      # see https://github.com/grpc/grpc/blob/master/doc/naming.md
+    class Transferd < Base
+      # https://github.com/grpc/grpc/blob/master/doc/naming.md
       # https://grpc.io/docs/guides/custom-name-resolution/
       LOCAL_SOCKET_ADDR = '127.0.0.1'
       PORT_SEP = ':'
       # port zero means select a random available high port
       AUTO_LOCAL_TCP_PORT = "#{PORT_SEP}0"
-      class << self
-        # Well, the port number is only in log file
-        def daemon_port_from_log(log_file)
-          result = nil
-          # if port is zero, a dynamic port was created, get it
-          File.open(log_file, 'r') do |file|
-            file.each_line do |line|
-              # Well, it's tricky to depend on log
-              if (m = line.match(/Info: API Server: Listening on ([^:]+):(\d+) /))
-                result = m[2].to_i
-                # no "break" , need to read last matching log line
-              end
-            end
-          end
-          raise 'Port not found in daemon logs' if result.nil?
-          Log.log.debug{"Got port #{result} from log"}
-          return result
-        end
-      end
 
-      # @param url [String] URL of the transfer manager daemon
-      # @param external [Boolean] if true, expect that an external daemon is already running
-      # @param keep [Boolean] if true, do not shutdown daemon on exit
-      # @param base_options [Hash] base options
+      private_constant :LOCAL_SOCKET_ADDR, :PORT_SEP, :AUTO_LOCAL_TCP_PORT
+
+      # @param url   [String] URL of the transfer manager daemon
+      # @param start [Bool]   if false, expect that an external daemon is already running
+      # @param stop  [Bool]   if false, do not shutdown daemon on exit
+      # @param base  [Hash]   base class options
       def initialize(
-        url: AUTO_LOCAL_TCP_PORT,
-        external: false,
-        keep:     false,
-        **base_options
+        url:   AUTO_LOCAL_TCP_PORT,
+        start: true,
+        stop:  true,
+        **base
       )
-        super(**base_options)
-        @keep = keep
+        super(**base)
+        @stop = stop
         is_local_auto_port = url.eql?(AUTO_LOCAL_TCP_PORT)
-        raise 'Cannot use options `keep` or `external` with port zero' if is_local_auto_port && (@keep || external)
+        raise 'Cannot set options `stop` or `start` to false with port zero' if is_local_auto_port && (!@stop || !start)
         # keep PID for optional shutdown
         @daemon_pid = nil
         daemon_endpoint = url
@@ -61,18 +43,18 @@ module Aspera
           # no address: local bind
           daemon_endpoint = "#{LOCAL_SOCKET_ADDR}#{daemon_endpoint}" if daemon_endpoint.match?(/^#{PORT_SEP}[0-9]+$/o)
           # Create stub (without credentials)
-          @transfer_client = Transfersdk::TransferService::Stub.new(daemon_endpoint, :this_channel_is_insecure)
+          @transfer_client = ::Transferd::Api::TransferService::Stub.new(daemon_endpoint, :this_channel_is_insecure)
           # Initiate actual connection
-          get_info_response = @transfer_client.get_info(Transfersdk::InstanceInfoRequest.new)
+          get_info_response = @transfer_client.get_info(::Transferd::Api::InstanceInfoRequest.new)
           Log.log.debug{"Daemon info: #{get_info_response}"}
-          Log.log.warn{'Attached to existing daemon'} unless @daemon_pid || external || @keep
+          Log.log.warn('Attached to existing daemon') unless @daemon_pid || !start || !@stop
           at_exit{shutdown}
         rescue GRPC::Unavailable => e
           # if transferd is external: do not start it, or other error
-          raise if external || !e.message.include?('failed to connect')
+          raise if !start || !e.message.include?('failed to connect')
           # we already tried to start a daemon, but it failed
           Aspera.assert(@daemon_pid.nil?){"Daemon started with PID #{@daemon_pid}, but connection failed to #{daemon_endpoint}}"}
-          Log.log.warn('no daemon present, starting daemon...') if external
+          Log.log.warn('no daemon present, starting daemon...') if !start
           # transferd only supports local ip and port
           daemon_uri = URI.parse("ipv4://#{daemon_endpoint}")
           Aspera.assert(daemon_uri.scheme.eql?('ipv4')){"Invalid scheme daemon URI #{daemon_endpoint}"}
@@ -83,8 +65,8 @@ module Aspera
             fasp_runtime: {
               use_embedded: false,
               user_defined: {
-                bin: Ascp::Installation.instance.sdk_folder,
-                etc: Ascp::Installation.instance.sdk_folder
+                bin: Products::Transferd.sdk_directory,
+                etc: Products::Transferd.sdk_directory
               }
             }
           }
@@ -95,7 +77,11 @@ module Aspera
           log_stdout = "#{transferd_base_tmp}.out"
           log_stderr = "#{transferd_base_tmp}.err"
           File.write(conf_file, config.to_json)
-          @daemon_pid = Process.spawn(Ascp::Installation.instance.path(:transferd), '--config', conf_file, out: log_stdout, err: log_stderr)
+          @daemon_pid = Environment.secure_spawn(
+            exec: Ascp::Installation.instance.path(:transferd),
+            args: ['--config', conf_file],
+            out: log_stdout,
+            err: log_stderr)
           begin
             # wait for process to initialize, max 2 seconds
             Timeout.timeout(2.0) do
@@ -107,10 +93,10 @@ module Aspera
             nil
           end
           Log.log.debug{"Daemon started with pid #{@daemon_pid}"}
-          Process.detach(@daemon_pid) if @keep
+          Process.detach(@daemon_pid) unless @stop
           at_exit {shutdown}
           # update port for next connection attempt (if auto high port was requested)
-          daemon_endpoint = "#{LOCAL_SOCKET_ADDR}#{PORT_SEP}#{self.class.daemon_port_from_log(log_stdout)}" if is_local_auto_port
+          daemon_endpoint = "#{LOCAL_SOCKET_ADDR}#{PORT_SEP}#{Products::Transferd.daemon_port_from_log(log_stdout)}" if is_local_auto_port
           # local daemon started, try again
           retry
         end
@@ -118,9 +104,9 @@ module Aspera
 
       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)
-          config: Transfersdk::TransferConfig.new, # transfer configuration
+        transfer_request = ::Transferd::Api::TransferRequest.new(
+          transferType: ::Transferd::Api::TransferType::FILE_REGULAR, # transfer type (file/stream)
+          config: ::Transferd::Api::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)
@@ -134,7 +120,7 @@ module Aspera
         session_started = false
         bytes_expected = nil
         # monitor transfer status
-        @transfer_client.monitor_transfers(Transfersdk::RegistrationRequest.new(transferId: [@transfer_id])) do |response|
+        @transfer_client.monitor_transfers(::Transferd::Api::RegistrationRequest.new(transferId: [@transfer_id])) do |response|
           Log.log.debug{Log.dump(:response, response.to_h)}
           # Log.log.debug{"#{response.sessionInfo.preTransferBytes} #{response.transferInfo.bytesTransferred}"}
           case response.status
@@ -167,7 +153,7 @@ module Aspera
       end
 
       def shutdown
-        stop_daemon unless @keep
+        stop_daemon if @stop
       end
 
       def stop_daemon

data/lib/aspera/api/alee.rb

@@ -7,7 +7,7 @@ module Aspera
       def initialize(entitlement_id, customer_id, api_domain: AoC::SAAS_DOMAIN_PROD, version: 'v1')
         super(
           base_url: "https://api.#{api_domain}/metering/#{version}",
-          headers:  {'X-Aspera-Entitlement-Authorization' => Rest.basic_token(entitlement_id, customer_id)}
+          headers:  {'X-Aspera-Entitlement-Authorization' => Rest.basic_authorization(entitlement_id, customer_id)}
         )
       end
     end