aspera-cli 4.21.1 → 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,9 +1,7 @@
 #!/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/products/transferd'

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?('transferd.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/{alpha.rb → desktop.rb}

@@ -4,13 +4,13 @@ require 'aspera/agent/base'
 require 'aspera/rest'
 require 'aspera/environment'
 require 'aspera/json_rpc'
-require 'aspera/products/alpha'
+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
@@ -33,11 +33,11 @@ module Aspera
         rescue Errno::ECONNREFUSED => e
           start_url = START_URIS[method_index]
           method_index += 1
-          raise StandardError, "Unable to start #{Products::Alpha::APP_NAME} #{method_index} times" if start_url.nil?
-          Log.log.warn{"#{Products::Alpha::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, "#{Products::Alpha::APP_NAME} is not installed"
+            raise StandardError, "#{Products::Desktop::APP_NAME} is not installed"
           end
           sleep(SLEEP_SEC_BETWEEN_RETRY)
           retry
@@ -45,7 +45,7 @@ module Aspera
       end
 
       def aspera_client_api_url
-        log_file = Products::Alpha.log_file
+        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|

data/lib/aspera/agent/direct.rb

@@ -168,9 +168,12 @@ 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")
           # 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)
@@ -203,6 +206,10 @@ module Aspera
           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'
@@ -226,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

data/lib/aspera/agent/transferd.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'aspera/environment'
 require 'aspera/agent/base'
 require 'aspera/products/transferd'
 require 'aspera/temp_file_manager'
@@ -17,20 +18,22 @@ module Aspera
       # port zero means select a random available high port
       AUTO_LOCAL_TCP_PORT = "#{PORT_SEP}0"
 
-      # @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
@@ -44,14 +47,14 @@ module Aspera
           # Initiate actual connection
           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}"}
@@ -74,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
@@ -86,7 +93,7 @@ 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}#{Products::Transferd.daemon_port_from_log(log_stdout)}" if is_local_auto_port
@@ -146,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

data/lib/aspera/api/cos_node.rb

@@ -87,7 +87,7 @@ module Aspera
           receiver_client_ids: 'aspera_ats'
         )
         # get delegated token to be placed in rest call header and in transfer tags
-        @storage_credentials['token'][TOKEN_FIELD] = OAuth::Factory.bearer_extract(delegated_oauth.token)
+        @storage_credentials['token'][TOKEN_FIELD] = delegated_oauth.token
         @headers['X-Aspera-Storage-Credentials'] = JSON.generate(@storage_credentials)
       end
     end

data/lib/aspera/api/node.rb

@@ -280,7 +280,7 @@ module Aspera
       end
 
       def refreshed_transfer_token
-        return oauth.token(refresh: true)
+        return oauth.authorization(refresh: true)
       end
 
       # @return part of transfer spec with transport parameters only
@@ -310,12 +310,12 @@ module Aspera
         when :basic
           ak_name = auth_params[:username]
           Aspera.assert(auth_params[:password]){'no secret in node object'}
-          ak_token = Rest.basic_token(auth_params[:username], auth_params[:password])
+          ak_token = Rest.basic_authorization(auth_params[:username], auth_params[:password])
         when :oauth2
           ak_name = params[:headers][HEADER_X_ASPERA_ACCESS_KEY]
-          # TODO: token_generation_lambda = lambda{|do_refresh|oauth.token(refresh: do_refresh)}
+          # TODO: token_generation_lambda = lambda{|do_refresh|oauth.authorization(refresh: do_refresh)}
           # get bearer token, possibly use cache
-          ak_token = oauth.token
+          ak_token = oauth.authorization
         when :none
           ak_name = params[:headers][HEADER_X_ASPERA_ACCESS_KEY]
           ak_token = params[:headers]['Authorization']

data/lib/aspera/ascp/installation.rb

@@ -10,7 +10,7 @@ require 'aspera/assert'
 require 'aspera/web_server_simple'
 require 'aspera/cli/info'
 require 'aspera/cli/version'
-require 'aspera/products/alpha'
+require 'aspera/products/desktop'
 require 'aspera/products/connect'
 require 'aspera/products/transferd'
 require 'aspera/products/other'
@@ -32,9 +32,6 @@ module Aspera
     # Installation.instance.ascp_path=""
     class Installation
       include Singleton
-      # protobuf generated files from sdk
-      EXT_RUBY_PROTOBUF = '_pb.rb'
-      RB_SDK_SUBFOLDER = 'lib'
       DEFAULT_ASPERA_CONF = <<~END_OF_CONFIG_FILE
         <?xml version='1.0' encoding='UTF-8'?>
         <CONF version="2">
@@ -50,29 +47,21 @@ module Aspera
       EXE_FILES = %i[ascp ascp4 async].freeze
       FILES = %i[transferd ssh_private_dsa ssh_private_rsa aspera_license aspera_conf fallback_certificate fallback_private_key].unshift(*EXE_FILES).freeze
       TRANSFER_SDK_LOCATION_URL = 'https://ibm.biz/sdk_location'
-      FILE_SCHEME_PREFIX = 'file:///'
-      SDK_ARCHIVE_FOLDERS = ['/bin/', '/aspera/'].freeze
       # filename for ascp with optional extension (Windows)
-      private_constant :EXT_RUBY_PROTOBUF, :RB_SDK_SUBFOLDER, :DEFAULT_ASPERA_CONF, :FILES, :TRANSFER_SDK_LOCATION_URL, :FILE_SCHEME_PREFIX
+      private_constant :DEFAULT_ASPERA_CONF, :FILES, :TRANSFER_SDK_LOCATION_URL
       # options for SSH client private key
       CLIENT_SSH_KEY_OPTIONS = %i{dsa_rsa rsa per_client}.freeze
 
-      class << self
-        def transfer_sdk_location_url
-          ENV.fetch('ASCLI_TRANSFER_SDK_LOCATION_URL', TRANSFER_SDK_LOCATION_URL)
-        end
-
-        # Loads YAML from cloud with locations of SDK archives for all platforms
-        # @return location structure
-        def sdk_locations
-          location_url = transfer_sdk_location_url
-          transferd_locations = UriReader.read(location_url)
-          Log.log.debug{"Retrieving SDK locations from #{location_url}"}
-          begin
-            return YAML.load(transferd_locations)
-          rescue Psych::SyntaxError
-            raise "Error when parsing yaml data from: #{location_url}"
-          end
+      # Loads YAML from cloud with locations of SDK archives for all platforms
+      # @return location structure
+      def sdk_locations
+        location_url = @transferd_urls
+        transferd_locations = UriReader.read(location_url)
+        Log.log.debug{"Retrieving SDK locations from #{location_url}"}
+        begin
+          return YAML.load(transferd_locations)
+        rescue Psych::SyntaxError
+          raise "Error when parsing yaml data from: #{location_url}"
         end
       end
 
@@ -250,14 +239,13 @@ module Aspera
       def ascp_info
         ascp_data = file_paths
         ascp_data.merge!(ascp_pvcl_info)
-        ascp_data['sdk_locations'] = self.class.transfer_sdk_location_url
         ascp_data.merge!(ascp_ssl_info)
         return ascp_data
       end
 
       # @return the url for download of SDK archive for the given platform and version
       def sdk_url_for_platform(platform: nil, version: nil)
-        locations = self.class.sdk_locations
+        locations = sdk_locations
         platform = Environment.architecture if platform.nil?
         locations = locations.select{|l|l['platform'].eql?(platform)}
         raise "No SDK for platform: #{platform}" if locations.empty?
@@ -298,56 +286,47 @@ module Aspera
         end
       end
 
-      # download aspera SDK or use local file
-      # extracts ascp binary for current system architecture
+      # Retrieves ascp binary for current system architecture from URL or file
       # @param url      [String] URL to SDK archive, or SpecialValues::DEF
-      # @param folder   [String] destination
-      # @param backup   [Bool]
-      # @param with_exe [Bool]
-      # @param &block   [Proc] a lambda that receives a file path from archive and tells detination sub folder, or nil to not extract
+      # @param folder   [String] Destination folder path
+      # @param backup   [Bool]   If destination folder exists, then rename
+      # @param with_exe [Bool]   If false, only retrieves files, but do not generate or restrict access
+      # @param &block   [Proc]   A lambda that receives a file path from archive and tells detination sub folder(end with /) or file, or nil to not extract
       # @return ascp version (from execution)
       def install_sdk(url: nil, version: nil, folder: nil, backup: true, with_exe: true, &block)
         url = sdk_url_for_platform(version: version) if url.nil? || url.eql?('DEF')
         folder = Products::Transferd.sdk_directory if folder.nil?
         subfolder_lambda = block
         if subfolder_lambda.nil?
+          # default files to extract directly to main folder if in selected source folders
           subfolder_lambda = ->(name) do
-            if SDK_ARCHIVE_FOLDERS.any?{|i|name.include?(i)}
-              '/'
-            elsif name.end_with?(EXT_RUBY_PROTOBUF)
-              RB_SDK_SUBFOLDER
-            end
+            Products::Transferd::RUNTIME_FOLDERS.any?{|i|name.match?(%r{^[^/]*/#{i}/})} ? '/' : nil
           end
         end
-        if 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 url.start_with?(FILE_SCHEME_PREFIX)
-          sdk_archive_path = url[FILE_SCHEME_PREFIX.length..-1]
-          delete_archive = false
-        else
-          sdk_archive_path = File.join(Dir.tmpdir, File.basename(url))
-          Aspera::Rest.new(base_url: url, redirect_max: 3).call(operation: 'GET', save_to_file: sdk_archive_path)
-          delete_archive = true
-        end
         # rename old install
         if backup && !Dir.empty?(folder)
           Log.log.warn('Previous install exists, renaming folder.')
           File.rename(folder, "#{folder}.#{Time.now.strftime('%Y%m%d%H%M%S')}")
           # TODO: delete old archives ?
         end
+        sdk_archive_path = UriReader.read_as_file(url)
         extract_archive_files(sdk_archive_path) do |entry_name, entry_stream, link_target|
-          subfolder = subfolder_lambda.call(entry_name)
-          next if subfolder.nil?
-          dest_folder = File.join(folder, subfolder)
+          dest_folder = subfolder_lambda.call(entry_name)
+          next if dest_folder.nil?
+          dest_folder = File.join(folder, dest_folder)
+          if dest_folder.end_with?('/')
+            dest_file = File.join(dest_folder, File.basename(entry_name))
+          else
+            dest_file = dest_folder
+            dest_folder = File.dirname(dest_file)
+          end
           FileUtils.mkdir_p(dest_folder)
-          new_file = File.join(dest_folder, File.basename(entry_name))
           if link_target.nil?
-            File.open(new_file, 'wb') { |output_stream|IO.copy_stream(entry_stream, output_stream)}
+            File.open(dest_file, 'wb') { |output_stream|IO.copy_stream(entry_stream, output_stream)}
           else
-            File.symlink(link_target, new_file)
+            File.symlink(link_target, dest_file)
           end
         end
-        File.unlink(sdk_archive_path) rescue nil if delete_archive # Windows may give error
         return unless with_exe
         # ensure license file are generated so that ascp invocation for version works
         path(:aspera_license)
@@ -360,16 +339,18 @@ module Aspera
           Environment.restrict_file_access(exe_path, mode: 0o755) if File.exist?(exe_path)
         end
         sdk_ascp_version = get_ascp_version(sdk_ascp_path)
-        sdk_daemon_path = Products::Transferd.transferd_path
-        Log.log.warn{"No #{sdk_daemon_path} in SDK archive"} unless File.exist?(sdk_daemon_path)
-        Environment.restrict_file_access(sdk_daemon_path, mode: 0o755) if File.exist?(sdk_daemon_path)
-        transferd_version = get_exe_version(sdk_daemon_path, 'version')
+        transferd_exe_path = Products::Transferd.transferd_path
+        Log.log.warn{"No #{transferd_exe_path} in SDK archive"} unless File.exist?(transferd_exe_path)
+        Environment.restrict_file_access(transferd_exe_path, mode: 0o755) if File.exist?(transferd_exe_path)
+        transferd_version = get_exe_version(transferd_exe_path, 'version')
         sdk_name = 'IBM Aspera Transfer SDK'
         sdk_version = transferd_version || sdk_ascp_version
         File.write(File.join(folder, Products::Other::INFO_META_FILE), "<product><name>#{sdk_name}</name><version>#{sdk_version}</version></product>")
         return sdk_name, sdk_version
       end
 
+      attr_accessor :transferd_urls
+
       private
 
       # policy for product selection
@@ -379,6 +360,7 @@ module Aspera
         @path_to_ascp = nil
         @sdk_dir = nil
         @found_products = nil
+        @transferd_urls = TRANSFER_SDK_LOCATION_URL
       end
 
       public
@@ -392,7 +374,7 @@ module Aspera
           # :run_root  O only for Connect Client, location of http port file
           # :sub_bin   O subfolder with executables, default : bin
           scan_locations = Products::Transferd.locations.concat(
-            Products::Alpha.locations,
+            Products::Desktop.locations,
             Products::Connect.locations,
             Products::Other::LOCATION_ON_THIS_OS
           )

data/lib/aspera/cli/extended_value.rb

@@ -21,6 +21,13 @@ module Aspera
       MARKER_END = ':'
       MARKER_IN_END = '@'
 
+      # special handlers stop processing of handlers on right
+      # extend includes processing of other handlers in itself
+      # val keeps the value intact
+      SPECIAL_HANDLERS = %i[extend val].freeze
+
+      private_constant :MARKER_START, :MARKER_END, :MARKER_IN_END, :SPECIAL_HANDLERS
+
       class << self
         # decode comma separated table text
         def decode_csvt(value)
@@ -64,7 +71,7 @@ module Aspera
           ruby:   lambda{|v|Environment.secure_eval(v, __FILE__, __LINE__)},
           secret: lambda{|v|prompt = v.empty? ? 'secret' : v; $stdin.getpass("#{prompt}> ")}, # rubocop:disable Style/Semicolon
           stdin:  lambda{|v|ExtendedValue.assert_no_value(v, :stdin); $stdin.read}, # rubocop:disable Style/Semicolon
-          stdbin: lambda{|v|ExtendedValue.assert_no_value(v, :stdin); $stdin.binmode.read}, # rubocop:disable Style/Semicolon
+          stdbin: lambda{|v|ExtendedValue.assert_no_value(v, :stdbin); $stdin.binmode.read}, # rubocop:disable Style/Semicolon
           yaml:   lambda{|v|YAML.load(v)},
           zlib:   lambda{|v|Zlib::Inflate.inflate(v)},
           extend: lambda{|v|ExtendedValue.instance.evaluate_all(v)}
@@ -107,8 +114,7 @@ module Aspera
           handler = m[1].to_sym
           handlers_reversed.unshift(handler)
           value = m[2]
-          # stop processing if handler is extend (it will be processed later)
-          break if handler.eql?(:extend)
+          break if SPECIAL_HANDLERS.include?(handler)
         end
         Log.log.trace1{"evaluating: #{handlers_reversed}, value: #{value}"}
         handlers_reversed.each do |handler|

data/lib/aspera/cli/formatter.rb

@@ -217,6 +217,7 @@ module Aspera
       # info: additional info, displayed if level==info
       # error: always displayed on stderr
       def display_message(message_level, message)
+        message = SecretHider.hide_secrets_in_string(message) if message.is_a?(String) && hide_secrets?
         case message_level
         when :data then $stdout.puts(message) unless @options[:display].eql?(:error)
         when :info then $stdout.puts(message) if @options[:display].eql?(:info)
@@ -238,8 +239,13 @@ module Aspera
         display_status(count_msg)
       end
 
+      def hide_secrets?
+        !@options[:show_secrets] && !@options[:display].eql?(:data)
+      end
+
+      # hides secrets in Hash or Array
       def hide_secrets(data)
-        SecretHider.deep_remove_secret(data) unless @options[:show_secrets] || @options[:display].eql?(:data)
+        SecretHider.deep_remove_secret(data) if hide_secrets?
       end
 
       # this method displays the results, especially the table format
@@ -255,6 +261,7 @@ module Aspera
         Aspera.assert(!data.nil? || %i[empty nothing].include?(type)){'result must have data'}
         display_item_count(data.length, total) unless total.nil?
         hide_secrets(data)
+        data = SecretHider.hide_secrets_in_string(data) if data.is_a?(String) && hide_secrets?
         case @options[:format]
         when :text
           display_message(:data, data.to_s)

data/lib/aspera/cli/info.rb

@@ -10,6 +10,7 @@ module Aspera
       DOC_URL  = "https://www.rubydoc.info/gems/#{GEM_NAME}"
       GEM_URL  = "https://rubygems.org/gems/#{GEM_NAME}"
       SRC_URL  = 'https://github.com/IBM/aspera-cli'
+      CONTAINER = 'docker.io/martinlaurent/ascli'
       # set this to warn in advance when minimum required ruby version will increase
       # see also required_ruby_version in gemspec file
       RUBY_FUTURE_MINIMUM_VERSION = '3.2'

data/lib/aspera/cli/main.rb

@@ -64,8 +64,8 @@ module Aspera
           return Main.result_status(formatter.status_image(blob))
         end
 
-        def result_single_object(data)
-          return {type: :single_object, data: data}
+        def result_single_object(data, fields: nil)
+          return {type: :single_object, data: data, fields: fields}
         end
 
         def result_object_list(data, fields: nil, total: nil)

data/lib/aspera/cli/manager.rb

@@ -112,7 +112,7 @@ module Aspera
           value_list = check_array ? to_check : [to_check]
           value_list.each do |value|
             raise Cli::BadArgument,
-              "#{what.to_s.capitalize} #{descr} is a #{value.class} but must be #{type_list.length > 1 ? 'one of ' : ''}#{type_list.map(&:name).join(',')}" unless
+              "#{what.to_s.capitalize} #{descr} is a #{value.class} but must be #{type_list.length > 1 ? 'one of: ' : ''}#{type_list.map(&:name).join(', ')}" unless
               type_list.any?{|t|value.is_a?(t)}
           end
         end
@@ -182,7 +182,7 @@ module Aspera
 
       # @param descr [String] description for help
       # @param mandatory [Boolean] if true, raise error if option not set
-      # @param multiple [Boolean] if true, return remaining arguments
+      # @param multiple [Boolean] if true, return remaining arguments (Array)
       # @param accept_list [Array] list of allowed values (Symbol)
       # @param validation [Class, Array] accepted value type(s) or list of Symbols
       # @param aliases [Hash] map of aliases: key = alias, value = real value
@@ -204,7 +204,7 @@ module Aspera
             values = @unprocessed_cmd_line_arguments.shift(how_many)
             values = values.map{|v|evaluate_extended_value(v, allowed_types)}
             # if expecting list and only one arg of type array : it is the list
-            values = values.first if values.length.eql?(1) && values.first.is_a?(Array)
+            values = values.first if multiple && values.length.eql?(1) && values.first.is_a?(Array)
             if accept_list
               allowed_values = [].concat(accept_list)
               allowed_values.concat(aliases.keys) unless aliases.nil?