aspera-cli 4.22.0 → 4.23.0

data/lib/aspera/agent/direct.rb

@@ -325,7 +325,7 @@ module Aspera
           session.delete(:io)
           # if command was successfully started, check its status
           unless command_pid.nil?
-            Process.kill(:INT, command_pid) if @monitor
+            Process.kill(:INT, command_pid) if @monitor && !Environment.os.eql?(Environment::OS_WINDOWS)
             # collect process exit status or wait for termination
             _, status = Process.wait2(command_pid)
             # process stderr of ascp

data/lib/aspera/api/aoc.rb

@@ -34,6 +34,8 @@ module Aspera
       # types of events for shared folder creation
       # Node events: permission.created permission.modified permission.deleted
       PERMISSIONS_CREATED = ['permission.created'].freeze
+      # Special name when creating workspace shared folders
+      ID_AK_ADMIN = 'ASPERA_ACCESS_KEY_ADMIN'
 
       private_constant :MAX_AOC_URL_REDIRECT,
         :CLIENT_ID_PREFIX,
@@ -43,7 +45,8 @@ module Aspera
         :JWT_AUDIENCE,
         :OAUTH_API_SUBPATH,
         :USER_INFO_FIELDS_MIN,
-        :PERMISSIONS_CREATED
+        :PERMISSIONS_CREATED,
+        :ID_AK_ADMIN
 
       # various API scopes supported
       SCOPE_FILES_SELF = 'self'
@@ -546,17 +549,12 @@ module Aspera
         transfer_spec['tags'][Transfer::Spec::TAG_RESERVED]['app'] = app_info[:app]
       end
 
-      ID_AK_ADMIN = 'ASPERA_ACCESS_KEY_ADMIN'
       # Callback from Plugins::Node
       # add application specific tags to permissions creation
       # @param perm_data [Hash] parameters for creating permissions
       # @param app_info [Hash] application information
       def permissions_set_create_params(perm_data:, app_info:)
-        # workspace shared folder:
-        # access_id = "#{ID_AK_ADMIN}_WS_#{app_info[:workspace_id]}"
         defaults = {
-          # 'access_type'   => 'user', # mandatory: user or group
-          # 'access_id'     => access_id, # id of user or group or special
           'tags' => {
             Transfer::Spec::TAG_RESERVED => {
               'files' => {
@@ -567,8 +565,6 @@ module Aspera
                   'shared_by_user_id' => current_user_info['id'],
                   'shared_by_name'    => current_user_info['name'],
                   'shared_by_email'   => current_user_info['email'],
-                  # 'shared_with_name'  => access_id,
-                  # 'share_as'  => new_name_for_folder,
                   'access_key'        => app_info[:node_info]['access_key'],
                   'node'              => app_info[:node_info]['name']
                 }
@@ -578,19 +574,20 @@ module Aspera
         }
         perm_data.deep_merge!(defaults)
         tag_workspace = perm_data['tags'][Transfer::Spec::TAG_RESERVED]['files']['workspace']
-        case perm_data['with']
+        shared_with = perm_data.delete('with')
+        case shared_with
         when NilClass
         when ''
+          # workspace shared folder
           perm_data['access_type'] = 'user'
           perm_data['access_id'] = "#{ID_AK_ADMIN}_WS_#{app_info[:workspace_id]}"
           tag_workspace['shared_with_name'] = perm_data['access_id']
         else
-          entity_info = lookup_by_name('contacts', perm_data['with'], query: {'current_workspace_id' => app_info[:workspace_id]})
+          entity_info = lookup_by_name('contacts', shared_with, query: {'current_workspace_id' => app_info[:workspace_id]})
           perm_data['access_type'] = entity_info['source_type']
           perm_data['access_id'] = entity_info['source_id']
-          tag_workspace['shared_with_name'] = entity_info['email']
+          tag_workspace['shared_with_name'] = entity_info['email'] # TODO: check that ???
         end
-        perm_data.delete('with')
         if perm_data.key?('as')
           tag_workspace['share_as'] = perm_data['as']
           perm_data.delete('as')

data/lib/aspera/api/httpgw.rb

@@ -244,18 +244,22 @@ module Aspera
       end
 
       def download(transfer_spec)
-        transfer_spec['zip_required'] ||= false
         transfer_spec['source_root'] ||= '/'
+        default_file_name = transfer_spec['paths'].first['source']
+        source_is_folder = %w[. /].include?(default_file_name)
+        default_file_name = 'http_download' if source_is_folder
+        transfer_spec['zip_required'] ||= source_is_folder || transfer_spec['paths'].length > 1
         # is normally provided by application, like package name
         if !transfer_spec.key?('download_name')
           # by default it is the name of first file
-          download_name = File.basename(transfer_spec['paths'].first['source'], '.*')
-          # ands add indication of number of files if there is more than one
+          download_name = File.basename(default_file_name, '.*')
+          # add indication of number of files if there is more than one
           if transfer_spec['paths'].length > 1
             download_name += " #{transfer_spec['paths'].length} Files"
           end
           transfer_spec['download_name'] = download_name
         end
+        # start transfer session on httpgw
         creation = create('download', {'transfer_spec' => transfer_spec})
         transfer_uuid = creation['url'].split('/').last
         file_name =
@@ -264,7 +268,7 @@ module Aspera
             transfer_spec['download_name'] + '.zip'
           else
             # it is a plain file if we don't require zip and there is only one file
-            File.basename(transfer_spec['paths'].first['source'])
+            File.basename(default_file_name)
           end
         file_path = File.join(transfer_spec['destination_root'], file_name)
         call(operation: 'GET', subpath: "download/#{transfer_uuid}", save_to_file: file_path)

data/lib/aspera/ascmd.rb

@@ -10,7 +10,7 @@ module Aspera
   # execute: "ascmd -h" to get syntax
   # Note: "ls" can take filters: as_ls -f *.txt -f *.bin /
   class AsCmd
-    # number of arguments for each operation
+    # number of arguments for each operation (to allow splitting into batches)
     OPS_ARGS = {
       cp:     2,
       df:     0,
@@ -23,11 +23,11 @@ module Aspera
       rm:     1
     }.freeze
 
-    # protocol is based on Type-Length-Value
-    # type start at one, but array index start at zero
+    # Protocol is based on Type-Length-Value
+    # Type start at one, but array index start at zero
     ENUM_START = 1
 
-    # description of result structures (see ascmdtypes.h).
+    # Description of result structures (see ascmdtypes.h).
     # Base types are big endian
     # key = name of type
     # index in array `fields` is the type (minus ENUM_START)
@@ -79,17 +79,25 @@ module Aspera
     end
 
     # execute an "as" command on a remote server
+    # Version 2 allows use of reverse proxy with multiple addresses.
     # @param [Symbol] one of OPERATIONS
     # @param [Array] parameters for "as" command
     # @return result of command, type depends on command (bool, array, hash)
-    def execute_single(action_sym, arguments)
+    def execute_single(action_sym, arguments, version: 1, host: nil)
       arguments = [] if arguments.nil?
       Log.log.debug{"execute_single:#{action_sym}:#{arguments}"}
       Aspera.assert_type(action_sym, Symbol)
       Aspera.assert_type(arguments, Array)
       Aspera.assert(arguments.all?(String), 'arguments must be strings')
+      remote_cmd = 'ascmd'
       # lines of commands (String's)
       command_lines = []
+      if version.eql?(2)
+        cmd = "as_session_init --protocol=#{version}"
+        cmd += " --host=#{host}" if host
+        command_lines.push(cmd)
+        remote_cmd += ' -V2'
+      end
       # add "as_" command
       main_command = "as_#{action_sym}"
       arg_batches =
@@ -114,7 +122,7 @@ module Aspera
       stdin_input = command_lines.join("\n")
       Log.log.trace1{"execute_single:#{stdin_input}"}
       # execute, get binary output
-      byte_buffer = @command_executor.execute('ascmd', stdin_input).unpack('C*')
+      byte_buffer = @command_executor.execute(remote_cmd, stdin_input).unpack('C*')
       raise 'ERROR: empty answer from server' if byte_buffer.empty?
       # get hash or table result
       result = self.class.parse(byte_buffer, :result)

data/lib/aspera/ascp/installation.rb

@@ -32,6 +32,7 @@ module Aspera
     # Installation.instance.ascp_path=""
     class Installation
       include Singleton
+
       DEFAULT_ASPERA_CONF = <<~END_OF_CONFIG_FILE
         <?xml version='1.0' encoding='UTF-8'?>
         <CONF version="2">
@@ -196,6 +197,8 @@ module Aspera
           last_line = ''
           while (line = stderr.gets)
             line.chomp!
+            # skip lines that may have accents
+            next unless line.valid_encoding?
             last_line = line
             case line
             when /^DBG Path ([^ ]+) (dir|file) +: (.*)$/
@@ -211,7 +214,7 @@ module Aspera
               data['product_name'] = Regexp.last_match(1)
               data['product_version'] = Regexp.last_match(2)
             when /^LOG Initializing FASP version ([^,]+),/
-              data['sdk_ascp_version'] = Regexp.last_match(1)
+              data['ascp_version'] = Regexp.last_match(1)
             end
           end
           if !thread.value.exitstatus.eql?(1) && !data.key?('root')
@@ -226,9 +229,9 @@ module Aspera
         data = {}
         File.binread(ascp_path).scan(/[\x20-\x7E]{10,}/) do |bin_string|
           if (m = bin_string.match(/OPENSSLDIR.*"(.*)"/))
-            data['openssldir'] = m[1]
+            data['ascp_openssl_dir'] = m[1]
           elsif (m = bin_string.match(/OpenSSL (\d[^ -]+)/))
-            data['openssl_version'] = m[1]
+            data['ascp_openssl_version'] = m[1]
           end
         end if File.file?(ascp_path)
         return data

data/lib/aspera/assert.rb

@@ -22,7 +22,7 @@ module Aspera
     # @param value [Object] the value to check
     # @param type [Class] the expected type
     def assert_type(value, type, exception_class: AssertError)
-      assert(value.is_a?(type), exception_class: exception_class){"#{block_given? ? "#{yield}: " : nil}expecting #{type}, but have #{value.inspect}"}
+      assert(value.is_a?(type), exception_class: exception_class){"#{"#{yield}: " if block_given?}expecting #{type}, but have #{value.inspect}"}
     end
 
     # assert that value is one of the given values
@@ -33,7 +33,7 @@ module Aspera
       assert(values.include?(value), exception_class: exception_class) do
         val_list = values.inspect
         val_list = "one of #{val_list}" if values.is_a?(Array)
-        "#{block_given? ? "#{yield}: " : nil}expecting #{val_list}, but have #{value.inspect}"
+        "#{"#{yield}: " if block_given?}expecting #{val_list}, but have #{value.inspect}"
       end
     end
 
@@ -47,7 +47,7 @@ module Aspera
     # @param exception_class exception to raise
     # @param block additional description in front
     def error_unexpected_value(value, exception_class: InternalError)
-      raise exception_class, "#{block_given? ? "#{yield}: " : nil}unexpected value: #{value.inspect}"
+      raise exception_class, "#{"#{yield}: " if block_given?}unexpected value: #{value.inspect}"
     end
 
     def require_method!(name)

data/lib/aspera/cli/hints.rb

@@ -64,7 +64,15 @@ module Aspera
           remediation: [
             'If remote node is Cloud Pak For Integration',
             'Make sure that a LoadBalancer is active on cluster',
-            'Check the external address of Aspera tcp-proxy pod'
+            'Check the external address of Aspera tcp-proxy Pod'
+          ]
+        },
+        {
+          exception:   Aspera::RestCallError,
+          match:       /Invalid subject\./,
+          remediation: [
+            'It seems that this user name is not registered on the server',
+            'Check the user name and try again'
           ]
         }
       ]

data/lib/aspera/cli/main.rb

@@ -198,7 +198,7 @@ module Aspera
         rescue Net::SSH::AuthenticationFailed => e; exception_info = {e: e, t: 'SSH', security: true}
         rescue OpenSSL::SSL::SSLError => e;         exception_info = {e: e, t: 'SSL'}
         rescue Cli::BadArgument => e;               exception_info = {e: e, t: 'Argument', usage: true}
-        rescue Cli::BadIdentifier => e;          exception_info = {e: e, t: 'Identifier'}
+        rescue Cli::BadIdentifier => e;             exception_info = {e: e, t: 'Identifier'}
         rescue Cli::Error => e;                     exception_info = {e: e, t: 'Tool', usage: true}
         rescue Transfer::Error => e;                exception_info = {e: e, t: 'Transfer'}
         rescue RestCallError => e;                  exception_info = {e: e, t: 'Rest'}

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 #{'one of: ' if type_list.length > 1}#{type_list.map(&:name).join(', ')}" unless
               type_list.any?{ |t| value.is_a?(t)}
           end
         end

data/lib/aspera/cli/plugin.rb

@@ -240,7 +240,7 @@ module Aspera
       # @param default [Object] default value if not provided
       def value_create_modify(command:, description: nil, type: Hash, bulk: false, default: nil)
         value = options.get_next_argument(
-          "parameters for #{command}#{description.nil? ? '' : " (#{description})"}", mandatory: default.nil?,
+          "parameters for #{command}#{" (#{description})" unless description.nil?}", mandatory: default.nil?,
           validation: bulk ? Array : type)
         value = default if value.nil?
         unless type.nil?

data/lib/aspera/cli/plugins/aoc.rb

@@ -50,10 +50,11 @@ module Aspera
           'archived'    => false,
           'has_content' => true,
           'received'    => true,
-          'completed'   => true}.freeze
+          'completed'   => true
+        }.freeze
+        PACKAGE_LIST_DEFAULT_FIELDS = %w[id name created_at files_completed bytes_transferred].freeze
         # options and parameters for Api::AoC.new
         OPTIONS_NEW = %i[url auth client_id client_secret scope redirect_uri private_key passphrase username password workspace].freeze
-        PACKAGE_LIST_DEFAULT_FIELDS = %w[id name created_at files_completed bytes_transferred].freeze
 
         private_constant :REDIRECT_LOCALHOST, :STD_AUTH_TYPES, :ADMIN_OBJECTS, :PACKAGE_RECEIVED_BASE_QUERY, :OPTIONS_NEW, :PACKAGE_LIST_DEFAULT_FIELDS
         class << self
@@ -191,22 +192,28 @@ module Aspera
           options.declare(:auth, 'OAuth type of authentication', values: STD_AUTH_TYPES, default: :jwt)
           options.declare(:client_id, 'OAuth API client identifier')
           options.declare(:client_secret, 'OAuth API client secret')
-          options.declare(:scope, 'OAuth scope for AoC API calls', default: Api::AoC::SCOPE_FILES_USER)
+          options.declare(:scope, 'OAuth scope for AoC API calls')
           options.declare(:redirect_uri, 'OAuth API client redirect URI')
           options.declare(:private_key, 'OAuth JWT RSA private key PEM value (prefix file path with @file:)')
           options.declare(:passphrase, 'RSA private key passphrase', types: String)
           options.declare(:workspace, 'Name of workspace', types: [String, NilClass], default: Api::AoC::DEFAULT_WORKSPACE)
           options.declare(:new_user_option, 'New user creation option for unknown package recipients', types: Hash)
           options.declare(:validate_metadata, 'Validate shared inbox metadata', values: :bool, default: true)
+          options.declare(:package_folder, 'Field of package to use as folder name, or @none:', types: [String, NilClass])
           options.parse_options!
           # add node plugin options (for manual)
           Node.declare_options(options)
         end
 
-        def api_from_options(new_base_path)
-          create_values = {subpath: new_base_path, secret_finder: config}
+        def api_from_options(aoc_base_path)
+          create_values = OPTIONS_NEW.each_with_object({
+            subpath:       aoc_base_path,
+            secret_finder: config}) do |i, m|
+            m[i] = options.get_option(i) unless options.get_option(i).nil?
+          end
+          create_values[:scope] = Api::AoC::SCOPE_FILES_USER if create_values[:scope].nil?
           # create an API object with the same options, but with a different subpath
-          return Api::AoC.new(**OPTIONS_NEW.each_with_object(create_values){ |i, m| m[i] = options.get_option(i) unless options.get_option(i).nil?})
+          return Api::AoC.new(**create_values)
         rescue ArgumentError => e
           if (m = e.message.match(/missing keyword: :(.*)$/))
             raise Cli::Error, "Missing option: #{m[1]}"
@@ -443,7 +450,9 @@ module Aspera
               default_fields.push('app_type', 'app_name', 'available', 'direct_authorizations_allowed', 'workspace_authorizations_allowed')
             when :client, :client_access_key, :dropbox, :group, :package, :saml_configuration, :workspace then default_fields.push('name')
             when :client_registration_token then default_fields.push('value', 'data.client_subject_scopes', 'created_at')
-            when :contact then default_fields = %w[email name source_id source_type]
+            when :contact
+              default_fields = %w[source_type source_id name email]
+              default_query = {'include_only_user_personal_contacts' => true} if aoc_api.oauth.scope == Api::AoC::SCOPE_FILES_USER
             when :node then default_fields.push('name', 'host', 'access_key')
             when :operation then default_fields = nil
             when :short_link then default_fields.push('short_url', 'data.url_token_data.purpose')
@@ -486,8 +495,8 @@ module Aspera
         ADMIN_ACTIONS = %i[ats resource usage_reports analytics subscription auth_providers].concat(ADMIN_OBJECTS).freeze
 
         def execute_admin_action
-          # upgrade scope to admin
-          aoc_api.oauth.scope = Api::AoC::SCOPE_FILES_ADMIN
+          # default scope to admin
+          aoc_api.oauth.scope = Api::AoC::SCOPE_FILES_ADMIN if options.get_option(:scope).nil?
           command_admin = options.get_next_command(ADMIN_ACTIONS)
           case command_admin
           when :resource
@@ -801,7 +810,9 @@ module Aspera
           when :tier_restrictions
             return Main.result_single_object(aoc_api.read('tier_restrictions'))
           when :user
-            case options.get_next_command(%i[workspaces profile preferences])
+            case options.get_next_command(%i[workspaces profile preferences contacts])
+            when :contacts
+              return execute_resource_action(:contact)
             # when :settings
             # return Main.result_object_list(aoc_api.read('client_settings/'))
             when :workspaces
@@ -890,31 +901,30 @@ module Aspera
                 # remove from list the ones already downloaded
                 reject_packages_from_persistency(all_packages, skip_ids_persistency)
                 ids_to_download = all_packages.map{ |e| e['id']}
+                formatter.display_status("Found #{ids_to_download.length} package(s).")
               else
                 # single id to array
                 ids_to_download = [ids_to_download] unless ids_to_download.is_a?(Array)
               end
-              file_list =
-                begin
-                  transfer.source_list.map{ |i| {'source'=>i}}
-                rescue Cli::BadArgument
-                  [{'source' => '.'}]
-                end
-              # list here
+              # download all files, or specified list only
+              ts_paths = transfer.ts_source_paths(default: ['.'])
+              per_package_field = options.get_option(:package_folder)
+              destination_folder = transfer.destination_folder(Transfer::Spec::DIRECTION_RECEIVE)
               result_transfer = []
-              formatter.display_status("Found #{ids_to_download.length} package(s).")
               ids_to_download.each do |package_id|
                 package_info = aoc_api.read("packages/#{package_id}")
-                formatter.display_status("downloading package: [#{package_info['id']}] #{package_info['name']}")
                 package_node_api = aoc_api.node_api_from(
                   node_id: package_info['node_id'],
                   package_info: package_info,
                   **workspace_id_hash(name: true))
+                transfer_spec = package_node_api.transfer_spec_gen4(
+                  package_info['contents_file_id'],
+                  Transfer::Spec::DIRECTION_RECEIVE,
+                  {'paths'=> ts_paths})
+                transfer.option_transfer_spec['destination_root'] = File.join(destination_folder, package_info[per_package_field]) unless per_package_field.nil?
+                formatter.display_status(%Q{Downloading package: [#{package_info['id']}] "#{package_info['name']}" to [#{transfer.option_transfer_spec['destination_root']}]})
                 statuses = transfer.start(
-                  package_node_api.transfer_spec_gen4(
-                    package_info['contents_file_id'],
-                    Transfer::Spec::DIRECTION_RECEIVE,
-                    {'paths'=> file_list}),
+                  transfer_spec,
                   rest_token: package_node_api)
                 result_transfer.push({'package' => package_id, Main::STATUS_FIELD => statuses})
                 # update skip list only if all transfer sessions completed

data/lib/aspera/cli/plugins/config.rb

@@ -210,23 +210,23 @@ module Aspera
           options.declare(:test_mode, 'Wizard: skip private key check step', values: :bool, default: false)
           options.declare(:key_path, 'Wizard: path to private key for JWT')
           # Transfer SDK options
-          options.declare(:ascp_path, 'Path to ascp', handler: {o: Ascp::Installation.instance, m: :ascp_path})
-          options.declare(:use_product, 'Use ascp from specified product', handler: {o: self, m: :option_use_product})
-          options.declare(:sdk_url, 'URL to get Aspera Transfer Daemon', default: SpecialValues::DEF)
-          options.declare(:locations_url, 'URL to get locations of Aspera Transfer Daemon', handler: {o: Ascp::Installation.instance, m: :transferd_urls})
-          options.declare(:sdk_folder, 'SDK folder path', handler: {o: Products::Transferd, m: :sdk_directory})
+          options.declare(:ascp_path, 'Ascp: Path to ascp', handler: {o: Ascp::Installation.instance, m: :ascp_path})
+          options.declare(:use_product, 'Ascp: Use ascp from specified product', handler: {o: self, m: :option_use_product})
+          options.declare(:sdk_url, 'Ascp: URL to get Aspera Transfer Executables', default: SpecialValues::DEF)
+          options.declare(:locations_url, 'Ascp: URL to get locations of Aspera Transfer Daemon', handler: {o: Ascp::Installation.instance, m: :transferd_urls})
+          options.declare(:sdk_folder, 'Ascp: SDK folder path', handler: {o: Products::Transferd, m: :sdk_directory})
           options.declare(:progress_bar, 'Display progress bar', values: :bool, default: Environment.terminal?)
           # email options
-          options.declare(:smtp, 'SMTP configuration', types: Hash)
-          options.declare(:notify_to, 'Email recipient for notification of transfers')
-          options.declare(:notify_template, 'Email ERB template for notification of transfers')
+          options.declare(:smtp, 'Email: SMTP configuration', types: Hash)
+          options.declare(:notify_to, 'Email: Recipient for notification of transfers')
+          options.declare(:notify_template, 'Email: ERB template for notification of transfers')
           # HTTP options
-          options.declare(:insecure, 'Do not validate any HTTPS certificate', values: :bool, handler: {o: self, m: :option_insecure}, default: :no)
-          options.declare(:ignore_certificate, 'Do not validate HTTPS certificate for these URLs', types: Array, handler: {o: self, m: :option_ignore_cert_host_port})
-          options.declare(:silent_insecure, 'Issue a warning if certificate is ignored', values: :bool, handler: {o: self, m: :option_warn_insecure_cert}, default: :yes)
-          options.declare(:cert_stores, 'List of folder with trusted certificates', types: [Array, String], handler: {o: self, m: :trusted_cert_locations})
-          options.declare(:http_options, 'Options for HTTP/S socket', types: Hash, handler: {o: self, m: :option_http_options}, default: {})
-          options.declare(:http_proxy, 'URL for HTTP proxy with optional credentials', types: String, handler: {o: self, m: :option_http_proxy})
+          options.declare(:insecure, 'HTTP/S: Do not validate any certificate', values: :bool, handler: {o: self, m: :option_insecure}, default: :no)
+          options.declare(:ignore_certificate, 'HTTP/S: Do not validate certificate for these URLs', types: Array, handler: {o: self, m: :option_ignore_cert_host_port})
+          options.declare(:silent_insecure, 'HTTP/S: Issue a warning if certificate is ignored', values: :bool, handler: {o: self, m: :option_warn_insecure_cert}, default: :yes)
+          options.declare(:cert_stores, 'HTTP/S: List of folder with trusted certificates', types: [Array, String], handler: {o: self, m: :trusted_cert_locations})
+          options.declare(:http_options, 'HTTP/S: Options for HTTP/S socket', types: Hash, handler: {o: self, m: :option_http_options}, default: {})
+          options.declare(:http_proxy, 'HTTP/S: URL for proxy with optional credentials', types: String, handler: {o: self, m: :option_http_proxy})
           options.declare(:cache_tokens, 'Save and reuse OAuth tokens', values: :bool, handler: {o: self, m: :option_cache_tokens})
           options.declare(:fpac, 'Proxy auto configuration script')
           options.declare(:proxy_credentials, 'HTTP proxy credentials for fpac: user, password', types: Array)
@@ -691,7 +691,7 @@ module Aspera
             # collect info from ascp executable
             data = Ascp::Installation.instance.ascp_info
             # add command line transfer spec
-            data['ts'] = transfer.updated_ts
+            data['ts'] = transfer.option_transfer_spec
             # add keys
             DataRepository::ELEMENTS.each_with_object(data){ |i, h| h[i.to_s] = DataRepository.instance.item(i)}
             # declare those as secrets
@@ -1298,6 +1298,7 @@ module Aspera
           )
         end
 
+        # Artifically raise an exception for tests
         def execute_test
           case options.get_next_command(%i[throw web])
           when :throw
@@ -1317,6 +1318,8 @@ module Aspera
           url.sub(%r{/+$}, '').sub(%r{^(https://[^/]+):443$}, '\1')
         end
 
+        # Look for a preset that has the corresponding URL and username
+        # @return the first one matching
         def lookup_preset(url:, username:)
           # remove extra info to maximize match
           url = canonical_url(url)
@@ -1329,6 +1332,8 @@ module Aspera
           nil
         end
 
+        # Lookup the corresponding secret for the given URL and usernames
+        # @raise Exception if mandatory and not found
         def lookup_secret(url:, username:, mandatory: false)
           secret = options.get_option(:secret)
           if secret.nil?