aspera-cli 4.25.1 → 4.25.2

data/lib/aspera/cli/formatter.rb

@@ -30,10 +30,6 @@ module Aspera
       SINGLE_OBJECT_COLUMN_NAMES = %i[field value].freeze
 
       private_constant :FIELDS_LESS, :DISPLAY_FORMATS, :DISPLAY_LEVELS, :SINGLE_OBJECT_COLUMN_NAMES
-      # prefix to display error messages in user messages (terminal)
-      ERROR_FLASH = 'ERROR:'.bg_red.gray.blink.freeze
-      WARNING_FLASH = 'WARNING:'.bg_brown.black.blink.freeze
-      HINT_FLASH = 'HINT:'.bg_green.gray.blink.freeze
 
       class << self
         # nicer display for boolean

data/lib/aspera/cli/hints.rb

@@ -26,7 +26,7 @@ module Aspera
           ]
         },
         {
-          exception:   RestCallError,
+          exception:   Aspera::RestCallError,
           match:       /Signature has expired/,
           remediation: [
             'There is too much time difference between your computer and the server',
@@ -108,6 +108,13 @@ module Aspera
             'Transfer user shall have those parameters in aspera.conf set to: token',
             'authorization_transfer_in_value authorization_transfer_out_value'
           ]
+        },
+        {
+          exception:   Aspera::RestCallError,
+          match:       /invalid_grant/,
+          remediation: [
+            'Check your public key in your AoC user profile.'
+          ]
         }
       ]
       private_constant :ERROR_HINTS
@@ -129,9 +136,9 @@ module Aspera
                 next unless message.match?(m)
               else Aspera.error_unexpected_value(m)
               end
-              remediation = hint[:remediation]
-              remediation = [remediation] unless remediation.is_a?(Array)
-              remediation.each{ |r| formatter.display_message(:error, "#{Formatter::HINT_FLASH} #{r}")}
+              hint[:remediation].each do |r|
+                Log.log.info{"#{'HINT:'.bg_green.gray.blink.freeze} #{r}"}
+              end
               break
             end
           end

data/lib/aspera/cli/main.rb

@@ -228,7 +228,7 @@ module Aspera
         # 1- processing of error condition
         unless exception_info.nil?
           Log.log.warn(exception_info[:e].message) if Log.instance.logger_type.eql?(:syslog) && exception_info[:security]
-          @context.formatter.display_message(:error, "#{Formatter::ERROR_FLASH} #{exception_info[:t]}: #{exception_info[:e].message}")
+          Log.log.error{"#{exception_info[:t]}: #{exception_info[:e].message}"}
           Log.log.debug{(['Backtrace:'] + exception_info[:e].backtrace).join("\n")} if exception_info[:debug]
           @context.formatter.display_message(:error, 'Use option -h to get help.') if exception_info[:usage]
           # Is that a known error condition with proposal for remediation ?
@@ -237,7 +237,7 @@ module Aspera
         # 2- processing of command not processed (due to exception or bad command line)
         if execute_command || @option_show_config
           @context.options.final_errors.each do |msg|
-            @context.formatter.display_message(:error, "#{Formatter::ERROR_FLASH} Argument: #{msg}")
+            Log.log.error{"Argument: #{msg}"}
             # Add code as exception if there is not already an error
             exception_info = {e: Exception.new(msg), t: 'UnusedArg'} if exception_info.nil?
           end
@@ -291,10 +291,7 @@ module Aspera
         @context.formatter.declare_options(@context.options)
         # Compare $0 with expected name
         current_prog_name = File.basename($PROGRAM_NAME)
-        @context.formatter.display_message(
-          :error,
-          "#{Formatter::WARNING_FLASH} Please use '#{Info::CMD_NAME}' instead of '#{current_prog_name}'"
-        ) unless current_prog_name.eql?(Info::CMD_NAME)
+        Aspera.assert(current_prog_name.eql?(Info::CMD_NAME), type: :warn){"Please use '#{Info::CMD_NAME}' instead of '#{current_prog_name}'"}
         # Declare and parse global options
         declare_global_options
         # Do not display config commands if help is asked

data/lib/aspera/cli/manager.rb

@@ -35,7 +35,8 @@ module Aspera
       attr_accessor :values
 
       # @param option      [Symbol] Name of option
-      # @param allowed  [see below] Allowed values
+      # @param description [String] Description for help
+      # @param allowed  [nil,Class,Array<Class>,Array<Symbol>] Allowed values
       # @param handler       [Hash] Accessor: keys: :o(object) and :m(method)
       # @param deprecation [String] Deprecation message
       # `allowed`:
@@ -61,7 +62,7 @@ module Aspera
         else
           :setter
         end
-        Aspera.assert(@object.respond_to?(@read_method)){"#{@object} does not respond to #{method}"} unless @access.eql?(:local)
+        Aspera.assert(@object.respond_to?(@read_method)){"#{@object} does not respond to #{@read_method}"} unless @access.eql?(:local)
         @types = nil
         @values = nil
         if !allowed.nil?
@@ -600,9 +601,12 @@ module Aspera
       end
 
       # TODO: use formatter
-      # @return [String] comma separated list of values, with the current value highlighted
+      # Highlight current value in list
+      # @param list    [Array<Symbol>] List of possible values
+      # @param current [Symbol]        Current value
+      # @return [String] comma separated sorted list of values, with the current value highlighted
       def highlight_current_in_list(list, current)
-        list.map do |i|
+        list.sort.map do |i|
           if i.eql?(current)
             $stdout.isatty ? i.to_s.red.bold : "[#{i}]"
           else

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

@@ -470,11 +470,11 @@ module Aspera
             return Main.result_success
           when :do
             command_repo = options.get_next_command(NODE4_EXT_COMMANDS)
-            return execute_nodegen4_command(command_repo, res_id, scope: Api::Node::SCOPE_ADMIN)
+            return execute_nodegen4_command(command_repo, res_id, scope: Api::Node::Scope::ADMIN)
           when :bearer_token
             node_api = aoc_api.node_api_from(
               node_id: res_id,
-              scope:   options.get_next_argument('scope')
+              scope:   options.get_next_argument('scope', default: Api::Node::Scope::ADMIN)
             )
             return Main.result_text(node_api.oauth.authorization)
           when :dropbox
@@ -504,7 +504,7 @@ module Aspera
                   node_id: shared_folder['node_id'],
                   workspace_id: res_id,
                   workspace_name: nil,
-                  scope: Api::Node::SCOPE_USER
+                  scope: Api::Node::Scope::USER
                 )
                 result = node_api.read(
                   'permissions',
@@ -742,9 +742,9 @@ module Aspera
         end
 
         # Create a shared link for the given entity
-        # @param purpose_public [Symbol]
+        # @param purpose_public [String] send_package_to_dropbox or view_shared_file
         # @param shared_data    [Hash] information for shared data
-        # @param block          [Proc] Optional: called on creation
+        # @param &block         [Proc] Optional: called on creation
         def short_link_command(purpose_public:, **shared_data)
           link_type = options.get_next_argument('link type', accept_list: %i[public private])
           purpose_local = case link_type
@@ -780,6 +780,7 @@ module Aspera
               }
             end
             custom_data = value_create_modify(command: command, default: {})
+            access_levels = custom_data.delete('access_levels')
             if (pass = custom_data.delete('password'))
               entity_data[:data][:url_token_data][:password] = pass
               entity_data[:password_enabled] = true
@@ -787,7 +788,7 @@ module Aspera
             entity_data.deep_merge!(custom_data)
             result_create_short_link = aoc_api.create('short_links', entity_data)
             # public: Creation: permission on node
-            yield(result_create_short_link['resource_id']) if block_given? && link_type.eql?(:public)
+            yield(result_create_short_link['resource_id'], access_levels) if block_given? && link_type.eql?(:public)
             return Main.result_single_object(result_create_short_link)
           when :list, :show
             query = if link_type.eql?(:private)
@@ -1052,13 +1053,13 @@ module Aspera
             when *Node::NODE4_READ_ACTIONS
               package_id = instance_identifier
               package_info = aoc_api.read("packages/#{package_id}")
-              return execute_nodegen4_command(package_command, package_info['node_id'], file_id: package_info['contents_file_id'], scope: Api::Node::SCOPE_USER)
+              return execute_nodegen4_command(package_command, package_info['node_id'], file_id: package_info['contents_file_id'], scope: Api::Node::Scope::USER)
             end
           when :files
             command_repo = options.get_next_command([:short_link].concat(NODE4_EXT_COMMANDS))
             case command_repo
             when *NODE4_EXT_COMMANDS
-              return execute_nodegen4_command(command_repo, aoc_api.home[:node_id], file_id: aoc_api.home[:file_id], scope: Api::Node::SCOPE_USER)
+              return execute_nodegen4_command(command_repo, aoc_api.home[:node_id], file_id: aoc_api.home[:file_id], scope: Api::Node::Scope::USER)
             when :short_link
               folder_dest = options.get_next_argument('path', validation: String)
               home_node_api = aoc_api.node_api_from(
@@ -1071,17 +1072,13 @@ module Aspera
                 node_id:        shared_apfid[:api].app_info[:node_info]['id'],
                 file_id:        shared_apfid[:file_id],
                 **workspace_id_hash
-              ) do |resource_id|
-                       # TODO: merge with node permissions ?
-                       # TODO: access level as arg
-                       access_levels = Api::Node::ACCESS_LEVELS # ['delete','list','mkdir','preview','read','rename','write']
+              ) do |resource_id, access_levels|
                        perm_data = {
                          'file_id'       => shared_apfid[:file_id],
                          'access_id'     => resource_id,
                          'access_type'   => 'user',
-                         'access_levels' => access_levels,
+                         'access_levels' => Api::AoC.expand_access_levels(access_levels),
                          'tags'          => {
-                           # TODO: really just here ? not in tags.aspera.files.workspace ?
                            'url_token'        => true,
                            'folder_name'      => File.basename(folder_dest),
                            'created_by_name'  => aoc_api.current_user_info['name'],

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

@@ -40,7 +40,7 @@ module Aspera
         def initialize(context:)
           # Check presence in descendant of mandatory method and constant
           Aspera.assert(respond_to?(:execute_action), type: InternalError){"Missing method 'execute_action' in #{self.class}"}
-          Aspera.assert(self.class.constants.include?(:ACTIONS), type: InternalError){"Missing constant 'ACTIONS' in #{self.class}"}
+          Aspera.assert(self.class.const_defined?(:ACTIONS), type: InternalError){"Missing constant 'ACTIONS' in #{self.class}"}
           @context = context
           add_manual_header if @context.man_header
         end

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

@@ -36,6 +36,7 @@ require 'digest'
 require 'open3'
 require 'date'
 require 'erb'
+require 'net/http'
 
 module Aspera
   module Cli
@@ -107,11 +108,7 @@ module Aspera
           )
           options.parse_options!
           Log.log.debug{"#{Info::CMD_NAME} folder: #{@main_folder}"}
-          # Data persistency manager, created by config plugin, set for global object
-          context.persistency = PersistencyFolder.new(File.join(@main_folder, PERSISTENCY_FOLDER))
-          # Set folders for plugin lookup
-          Plugins::Factory.instance.add_lookup_folder(self.class.gem_plugins_folder)
-          Plugins::Factory.instance.add_lookup_folder(File.join(@main_folder, ASPERA_PLUGINS_FOLDERNAME))
+          setup_persistency_and_plugin_folders
           # Option to set config file
           options.declare(
             :config_file, 'Path to YAML file with preset configuration',
@@ -121,12 +118,7 @@ module Aspera
           options.parse_options!
           # Read config file (set @config_presets)
           read_config_file
-          # Add preset handler (needed for smtp)
-          ExtendedValue.instance.on(EXTEND_PRESET){ |v| preset_by_name(v)}
-          ExtendedValue.instance.on(EXTEND_VAULT){ |v| vault_value(v)}
-          ExtendedValue.instance.on(EXTEND_ARGS){ |v| options.args_as_extended(v)}
-          # Load defaults before it can be overridden
-          add_plugin_default_preset(CONF_GLOBAL_SYM)
+          setup_extended_value_handlers
           # Vault options
           options.declare(:secret, 'Secret for access keys')
           options.declare(:vault, 'Vault for secrets', allowed: Hash)
@@ -145,9 +137,8 @@ module Aspera
           options.declare(:sdk_url, 'Ascp: URL to get Aspera Transfer Executables', default: SpecialValues::DEF)
           options.parse_options!
           set_sdk_dir
-          options.declare(:ascp_path, 'Ascp: Path to ascp (or product with "product:")', handler: {o: Ascp::Installation.instance, m: :ascp_path}, default: "#{Ascp::Installation::USE_PRODUCT_PREFIX}#{Ascp::Installation::FIRST_FOUND}")
           options.declare(:locations_url, 'Ascp: URL to get download locations of Aspera Transfer Daemon', handler: {o: Ascp::Installation.instance, m: :transferd_urls})
-          options.declare(:sdk_folder, 'Ascp: SDK installation folder path', handler: {o: Products::Transferd, m: :sdk_directory})
+          options.declare(:sdk_folder, 'Ascp: Path to folder with ascp (or product with "product:")', handler: {o: Products::Transferd, m: :sdk_directory})
           options.declare(:progress_bar, 'Display progress bar', allowed: Allowed::TYPES_BOOLEAN, default: Environment.terminal?)
           # Email options
           options.declare(:smtp, 'Email: SMTP configuration', allowed: Hash)
@@ -165,17 +156,39 @@ module Aspera
           options.declare(:proxy_credentials, 'HTTP proxy credentials for fpac: user, password', allowed: [Array, NilClass])
           options.parse_options!
           @progress_bar = TransferProgress.new if options.get_option(:progress_bar)
+          setup_pac_executor
+          setup_rest_and_transfer_runtime
+        end
+
+        private
+
+        def setup_persistency_and_plugin_folders
+          context.persistency = PersistencyFolder.new(File.join(@main_folder, PERSISTENCY_FOLDER))
+          Plugins::Factory.instance.add_lookup_folder(self.class.gem_plugins_folder)
+          Plugins::Factory.instance.add_lookup_folder(File.join(@main_folder, ASPERA_PLUGINS_FOLDERNAME))
+        end
+
+        def setup_extended_value_handlers
+          ExtendedValue.instance.on(EXTEND_PRESET){ |v| preset_by_name(v)}
+          ExtendedValue.instance.on(EXTEND_VAULT){ |v| vault_value(v)}
+          ExtendedValue.instance.on(EXTEND_ARGS){ |v| options.args_as_extended(v)}
+          add_plugin_default_preset(CONF_GLOBAL_SYM)
+        end
+
+        def setup_pac_executor
           pac_script = options.get_option(:fpac)
-          # Create PAC executor
-          if !pac_script.nil?
-            @pac_exec = ProxyAutoConfig.new(pac_script).register_uri_generic
-            proxy_user_pass = options.get_option(:proxy_credentials)
-            if !proxy_user_pass.nil?
-              Aspera.assert(proxy_user_pass.length.eql?(2), type: Cli::BadArgument){"proxy_credentials shall have two elements (#{proxy_user_pass.length})"}
-              @pac_exec.proxy_user = proxy_user_pass[0]
-              @pac_exec.proxy_pass = proxy_user_pass[1]
-            end
+          return unless pac_script
+
+          @pac_exec = ProxyAutoConfig.new(pac_script).register_uri_generic
+          proxy_user_pass = options.get_option(:proxy_credentials)
+          if proxy_user_pass
+            Aspera.assert(proxy_user_pass.length.eql?(2), type: Cli::BadArgument){"proxy_credentials shall have two elements (#{proxy_user_pass.length})"}
+            @pac_exec.proxy_user = proxy_user_pass[0]
+            @pac_exec.proxy_pass = proxy_user_pass[1]
           end
+        end
+
+        def setup_rest_and_transfer_runtime
           RestParameters.instance.user_agent = Info::CMD_NAME
           RestParameters.instance.progress_bar = @progress_bar
           RestParameters.instance.session_cb = lambda{ |http_session| update_http_session(http_session)}
@@ -197,12 +210,14 @@ module Aspera
           keys_to_delete.each{ |k| @option_http_options.delete(k)}
           OAuth::Factory.instance.persist_mgr = persistency if @option_cache_tokens
           OAuth::Web.additional_info = "#{Info::CMD_NAME} v#{Cli::VERSION}"
-          Transfer::Parameters.file_list_folder = File.join(@main_folder, 'filelists')
-          RestErrorAnalyzer.instance.log_file = File.join(@main_folder, 'rest_exceptions.log')
+          Transfer::Parameters.file_list_folder = File.join(@main_folder, FILELIST_FOLDERNAME)
+          RestErrorAnalyzer.instance.log_file = File.join(@main_folder, REST_EXCEPTIONS_LOG_FILENAME)
           # Register aspera REST call error handlers
           RestErrorsAspera.register_handlers
         end
 
+        public
+
         attr_accessor :main_folder, :option_cache_tokens, :option_insecure, :option_warn_insecure_cert, :option_http_options
         attr_reader :option_ignore_cert_host_port, :progress_bar
 
@@ -307,10 +322,7 @@ module Aspera
             if @option_warn_insecure_cert
               base_url = "https://#{address}:#{port}"
               if !@ssl_warned_urls.include?(base_url)
-                formatter.display_message(
-                  :error,
-                  "#{Formatter::WARNING_FLASH} Ignoring certificate for: #{base_url}. Do not deactivate certificate verification in production."
-                )
+                Log.log.warn{"Ignoring certificate for: #{base_url}. Do not deactivate certificate verification in production."}
                 @ssl_warned_urls.push(base_url)
               end
             end
@@ -416,7 +428,7 @@ module Aspera
           raise Cli::Error, "Preset already exists: #{preset_name}  (use --override=yes or provide alternate name on command line)" \
             if !option_override && @config_presets.key?(preset_name)
           if option_default
-            formatter.display_status("Setting config preset as default for #{plugin_name}")
+            Log.log.info("Setting config preset as default for #{plugin_name}")
             @config_presets[CONF_PRESET_DEFAULTS][plugin_name.to_s] = preset_name
           end
           @config_presets[preset_name] = preset_values
@@ -439,7 +451,7 @@ module Aspera
             Log.log.warn{"overwriting value for #{param_name}: #{selected_preset[param_name]}"}
           end
           selected_preset[param_name] = param_value
-          formatter.display_status("Updated: #{preset}: #{param_name} <- #{param_value}")
+          Log.log.info("Updated: #{preset}: #{param_name} <- #{param_value}")
           nil
         end
 
@@ -591,24 +603,16 @@ module Aspera
         end
 
         def install_transfer_sdk
-          # Reset to default location, if older default was used
-          Products::Transferd.sdk_directory = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME) if @sdk_default_location
           asked_version = options.get_next_argument('transferd version', mandatory: false)
           name, version, folder = Ascp::Installation.instance.install_sdk(url: options.get_option(:sdk_url, mandatory: true), version: asked_version)
           return Main.result_status("Installed #{name} version #{version} in #{folder}")
         end
 
         def execute_action_ascp
-          command = options.get_next_command(%i[connect use show products info install spec schema errors])
+          command = options.get_next_command(%i[connect show products info install spec schema errors])
           case command
           when :connect
             return execute_connect_action
-          when :use
-            ascp_path = options.get_next_argument('path to ascp')
-            Ascp::Installation.instance.ascp_path = ascp_path
-            formatter.display_status("ascp version: #{Ascp::Installation.instance.get_ascp_version(ascp_path)}")
-            set_global_default(:ascp_path, ascp_path)
-            return Main.result_nothing
           when :show
             return Main.result_text(Ascp::Installation.instance.path(:ascp))
           when :info
@@ -622,15 +626,10 @@ module Aspera
             SecretHider::ADDITIONAL_KEYS_TO_HIDE.concat(DataRepository::ELEMENTS.map(&:to_s))
             return Main.result_single_object(data)
           when :products
-            command = options.get_next_command(%i[list use])
+            command = options.get_next_command(%i[list])
             case command
             when :list
               return Main.result_object_list(Ascp::Installation.instance.installed_products, fields: %w[name app_root])
-            when :use
-              default_product = options.get_next_argument('product name')
-              Ascp::Installation.instance.use_ascp_from_product(default_product)
-              set_global_default(:ascp_path, "#{Ascp::Installation::USE_PRODUCT_PREFIX}#{default_product}")
-              return Main.result_nothing
             end
           when :install
             return install_transfer_sdk
@@ -848,7 +847,7 @@ module Aspera
             file_url = options.get_next_argument('source URL').chomp
             file_dest = options.get_next_argument('file path', mandatory: false)
             file_dest = File.join(transfer.destination_folder(Transfer::Spec::DIRECTION_RECEIVE), file_url.gsub(%r{.*/}, '')) if file_dest.nil?
-            formatter.display_status("Downloading: #{file_url}")
+            Log.log.info("Downloading: #{file_url}")
             Rest.new(base_url: file_url).call(operation: 'GET', save_to_file: file_dest)
             return Main.result_status("Saved to: #{file_dest}")
           when :tokens
@@ -1047,8 +1046,7 @@ module Aspera
           return false if @config_checksum_on_disk.eql?(current_checksum)
           FileUtils.mkdir_p(@main_folder)
           Environment.restrict_file_access(@main_folder)
-          Log.log.info{"Writing #{@option_config_file}"}
-          formatter.display_status('Saving config file.')
+          Log.log.info{"Saving config file: #{@option_config_file}"}
           Environment.write_file_restricted(@option_config_file, force: true){@config_presets.to_yaml}
           @config_checksum_on_disk = current_checksum
           return true
@@ -1200,6 +1198,8 @@ module Aspera
         # Folder containing custom plugins in user's config folder
         ASPERA_PLUGINS_FOLDERNAME = 'plugins'
         PERSISTENCY_FOLDER = 'persist_store'
+        FILELIST_FOLDERNAME = 'filelists'
+        REST_EXCEPTIONS_LOG_FILENAME = 'rest_exceptions.log'
         ASPERA = 'aspera'
         SERVER_COMMAND = 'server'
         TRANSFERD_APP_NAME = 'sdk'
@@ -1232,6 +1232,8 @@ module Aspera
           :CONF_PRESET_DEFAULTS,
           :CONF_PRESET_GLOBAL,
           :ASPERA_PLUGINS_FOLDERNAME,
+          :FILELIST_FOLDERNAME,
+          :REST_EXCEPTIONS_LOG_FILENAME,
           :ASPERA,
           :DEMO_SERVER,
           :DEMO_PRESET,

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

@@ -20,9 +20,9 @@ module Aspera
           @plugins = {}
         end
 
-        # @return list of registered plugins
+        # @return [Array<Symbol>] Sorted list of registered plugins
         def plugin_list
-          @plugins.keys
+          @plugins.keys.sort
         end
 
         # add a folder to the list of folders to look for plugins

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

@@ -506,7 +506,7 @@ module Aspera
             )
             return Main.result_single_object(result)
           when :members, :saml_groups
-            # :shared_inboxes, :workgroups
+            # res_command := :shared_inboxes, :workgroups
             res_id = instance_identifier{ |field, value| lookup_entity_by_field(api: @api_v5, entity: res_sym.to_s, field: field, value: value, query: res_id_query)['id']}
             res_path = "#{res_sym}/#{res_id}/#{res_command}"
             list_key = res_command.to_s
@@ -533,6 +533,7 @@ module Aspera
               access = options.get_next_argument('level', mandatory: false, accept_list: SHARED_INBOX_MEMBER_LEVELS, default: :standard)
               options.unshift_next_argument({user: users.map{ |u| {id: u, access: access}}})
             end
+            # TODO: test SAML group
             return entity_execute(
               api: @api_v5,
               entity: res_path,
@@ -541,11 +542,11 @@ module Aspera
             ) do |field, value|
                      lookup_entity_by_field(
                        api: @api_v5,
-                       entity: 'contacts',
+                       entity: res_path,
                        field: field,
                        value: value,
                        query: Rest.php_style({type: %w[user]})
-                     )['id']
+                     )['user_id']
                    end
           when :reset_password
             # :accounts

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

@@ -106,17 +106,12 @@ module Aspera
           Log.log.debug{"tmpdir: #{@tmp_folder}"}
         end
 
-        # /files/id/files is normally cached in redis, but we can discard the cache
+        # /files/id/files is normally cached in Redis, but we can discard the cache
         # but /files/id is not cached
         def get_folder_entries(file_id, request_args = nil)
           headers = {'Accept' => Rest::MIME_JSON}
           headers['X-Aspera-Cache-Control'] = 'no-cache' if @option_folder_reset_cache.eql?(:header)
-          return @api_node.call(
-            operation: 'GET',
-            subpath:   "files/#{file_id}/files",
-            headers:   headers,
-            query:     request_args
-          )
+          return @api_node.read("files/#{file_id}/files", request_args, headers: headers)
         end
 
         # old version based on folders
@@ -153,7 +148,7 @@ module Aspera
             end
             # log/persist periodically or last one
             next unless @periodic.trigger? || event.equal?(events.last)
-            Log.log.info{"Processed event #{event['id']}"}
+            Log.log.debug{"Processed event #{event['id']}"}
             # save checkpoint to avoid losing processing in case of error
             if !iteration_persistency.nil?
               iteration_persistency.data[0] = event['id'].to_s
@@ -186,7 +181,7 @@ module Aspera
             end
             # log/persist periodically or last one
             next unless @periodic.trigger? || event.equal?(events.last)
-            Log.log.info{"Processing event #{event['id']}"}
+            Log.log.debug{"Processing event #{event['id']}"}
             # save checkpoint to avoid losing processing in case of error
             if !iteration_persistency.nil?
               iteration_persistency.data[0] = event['id'].to_s
@@ -303,7 +298,7 @@ module Aspera
             #  download original file to temp folder
             do_transfer(Transfer::Spec::DIRECTION_RECEIVE, entry['parent_file_id'], entry['name'], @tmp_folder)
           end
-          Log.log.info{"source: #{entry['id']}: #{entry['path']}"}
+          Log.log.debug{"source: #{entry['id']}: #{entry['path']}"}
           gen_infos.each do |gen_info|
             gen_info[:generator].generate rescue nil
           end
@@ -335,7 +330,7 @@ module Aspera
             entry = entries_to_process.shift
             # process this entry only if it is within the top_path
             entry_path_with_slash = entry['path']
-            Log.log.info{"processing entry #{entry_path_with_slash}"} if @periodic.trigger?
+            Log.log.debug{"processing entry #{entry_path_with_slash}"} if @periodic.trigger?
             entry_path_with_slash = "#{entry_path_with_slash}/" unless entry_path_with_slash.end_with?('/')
             if !top_path.nil? && !top_path.start_with?(entry_path_with_slash) && !entry_path_with_slash.start_with?(top_path)
               Log.log.debug{"#{entry['path']} folder (skip start)".bg_red}

data/lib/aspera/cli/transfer_agent.rb

@@ -33,8 +33,8 @@ module Aspera
         :DEFAULT_TRANSFER_NOTIFY_TEMPLATE
 
       class << self
-        # @return :success if all sessions statuses returned by "start" are success
-        # else return the first error exception object
+        # @return [:success]  if all sessions statuses returned by "start" are success
+        # @return [Exception] if one sessions statuses returned by "start" is failed
         def session_status(statuses)
           error_statuses = statuses.reject{ |i| i.eql?(:success)}
           return :success if error_statuses.empty?

data/lib/aspera/cli/version.rb

@@ -4,6 +4,6 @@ module Aspera
   module Cli
     # For beta add extension : .beta1
     # For dev version add extension : .pre
-    VERSION = '4.25.1'
+    VERSION = '4.25.2'
   end
 end

data/lib/aspera/environment.rb

@@ -58,8 +58,8 @@ module Aspera
       # @param code [String] Ruby code to execute
       # @param file [String] File name for error reporting
       # @param line [Integer] Line number for error reporting
-      def secure_eval(code, file, line)
-        Kernel.send('lave'.reverse, code, empty_binding, file, line)
+      def secure_eval(code, file, line, user_binding = nil)
+        Kernel.send('lave'.reverse, code, user_binding || empty_binding, file, line)
       end
 
       # Build argv for Process.spawn / Kernel.system (no shell)
@@ -74,26 +74,40 @@ module Aspera
         argv
       end
 
-      # Execute a process securely (no shell)
-      # mode:
-      #   :execute    -> Kernel.system, return nil
-      #   :background -> Process.spawn, return pid
-      #   :capture    -> Open3.capture3, return stdout
-      # @param cmd       [Array]     Command and arguments
-      # @param env       [Hash, nil] Environment variables
-      # @param mode      [Symbol]    Execution mode (see above)
-      # @param kwargs    [Hash]      Additional arguments to underlying method, includes:
-      #                              :exception [Boolean] for :capture mode, raise error if process fails
-      #                              :close_others [Boolean] for :background mode
-      #                              :env [Hash] for :execute mode
+      # like `Shellwords.shellescape`, but does not escape `=`
+      def shell_escape_pretty(str)
+        # Safe unquoted characters + '=' explicitly allowed
+        return str if str.match?(%r{\A[A-Za-z0-9_.,:/@+=-]+\z})
+        # return str if Shellwords.shellescape(str) == str
+
+        # Otherwise use single quotes
+        "'#{str.gsub("'", %q('\'\''))}'"
+      end
+
+      # Execute a process securely without shell.
+      #
+      # Execution `mode` can be:
+      # - :execute    -> Kernel.system, return nil
+      # - :background -> Process.spawn, return pid
+      # - :capture    -> Open3.capture3, return stdout
+      #
+      # @param cmd [Array<String>] Executable and arguments (mapped "to_s")
+      # @param mode [:execute,:background,:capture] Execution mode
+      # @param kwargs [Hash] Additional arguments to underlying method
+      # @option kwargs [Hash] :env Environment variables
+      # @option kwargs [Boolean] :exception for :capture mode, raise error if process fails
+      # @option kwargs [Boolean] :close_others for :background mode
+      # @return [nil] for :execute mode
+      # @return [Integer] pid for :background mode
+      # @return [String] stdout for :capture mode
       def secure_execute(*cmd, mode: :execute, **kwargs)
         cmd = cmd.map(&:to_s)
         Aspera.assert(cmd.size.positive?, type: ArgumentError){'executable must be present'}
         Aspera.assert_values(mode, PROCESS_MODES, type: ArgumentError){'mode'}
         Log.log.debug do
           parts = [mode.to_s, 'command:']
-          kwargs[:env]&.each{ |k, v| parts << "#{k}=#{Shellwords.shellescape(v.to_s)}"}
-          cmd.each{ |a| parts << Shellwords.shellescape(a)}
+          kwargs[:env]&.each{ |k, v| parts << "#{k}=#{shell_escape_pretty(v.to_s)}"}
+          cmd.each{ |a| parts << shell_escape_pretty(a)}
           parts.join(' ')
         end
         case mode

data/lib/aspera/faspex_gw.rb

@@ -80,7 +80,7 @@ module Aspera
               faspex4_send_to_faspex5(faspex_pkg_parameters)
             else Aspera.error_unexpected_value(@app_api.class.name)
             end
-          Log.log.info{"faspex_package_create_result=#{faspex_package_create_result}"}
+          Log.log.debug{"faspex_package_create_result=#{faspex_package_create_result}"}
           response.status = 200
           response.content_type = Rest::MIME_JSON
           response.body = JSON.generate(faspex_package_create_result)