aspera-cli 4.12.0 → 4.13.0

data/bin/ascli

@@ -1,8 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -EUTF-8:UTF-8
 # frozen_string_literal: true
 
 require 'rubygems'
 require 'securerandom'
+# compute gem root based on  this script location
 GEM_ROOT = File.realpath(File.join(File.dirname(File.realpath(__FILE__)), '..'))
 # coverage for tests
 if ENV.key?('ENABLE_COVERAGE')
@@ -20,10 +21,9 @@ if ENV.key?('ENABLE_COVERAGE')
   end
   SimpleCov.start
 end
+# if in development, add path to gem
 $LOAD_PATH.unshift(File.join(GEM_ROOT, 'lib'))
 require 'aspera/cli/main'
 require 'aspera/environment'
-Encoding.default_internal = Encoding::UTF_8
-Encoding.default_external = Encoding::UTF_8
 Aspera::Environment.fix_home
 Aspera::Cli::Main.new(ARGV).process_command_line

data/docs/test_env.conf

@@ -4,7 +4,7 @@ config:
 default:
   config: cli_default
   aoc: tst_aoc_jwt
-  faspex: tst_faspex
+  faspex: tst_faspex4
   faspex5: tst_faspex5_jwt
   shares: tst_shares
   node: tst_node_simple
@@ -40,10 +40,18 @@ tst_aoc_web:
   redirect_uri: your value here
   client_id: your value here
   client_secret: your value here
-tst_faspex:
+tst_faspex4:
   url: your value here
   username: your value here
   password: your value here
+tst_faspex4_admin:
+  username: your value here
+  password: your value here
+faspex4_publink:
+  link_recv_from_user: your value here
+  link_send_to_user: your value here
+  link_send_to_dropbox: your value here
+tst_faspex4_storage:
   storage: your value here
 tst_hstsfaspex_ssh:
   url: your value here
@@ -65,6 +73,8 @@ tst_faspex5_jwt:
   client_secret: your value here
   private_key: your value here
   username: your value here
+f5_admin:
+  username: your value here
 tst_shares:
   url: your value here
   username: your value here
@@ -133,9 +143,6 @@ nowss:
 misc:
   upload_folder: your value here
   syncuser: your value here
-  faspex_publink_recv_from_fxuser: your value here
-  faspex_publink_send_to_fxuser: your value here
-  faspex_publink_send_to_dropbox: your value here
   faspex_dbx: your value here
   faspex_wkg: your value here
   faspex_src: your value here

data/lib/aspera/aoc.rb

@@ -252,25 +252,30 @@ module Aspera
       return @cache_user_info
     end
 
-    # @returns [Aspera::Node] a node API for access key
     # @param node_id [String] identifier of node in AoC
+    # @param workspace_id [String] workspace identifier
+    # @param workspace_name [String] workspace name
     # @param scope e.g. SCOPE_NODE_USER, or nil (requires secret)
-    def node_api_from(node_id: nil, workspace_info: nil, package_info: nil, scope: nil)
-      if node_id.nil?
-        if package_info.nil?
-          raise 'INTERNAL ERROR: either node_id or package_info is required'
-        else
-          node_id = package_info['node_id']
-        end
+    # @param package_info [Hash] created package information
+    # @returns [Aspera::Node] a node API for access key
+    def node_api_from(node_id:, workspace_id: nil, workspace_name: nil, scope: SCOPE_NODE_USER, package_info: nil)
+      raise 'invalid type for node_id' unless node_id.is_a?(String)
+      node_info = read("nodes/#{node_id}")[:data]
+      if workspace_name.nil? && !workspace_id.nil?
+        workspace_name = read("workspaces/#{workspace_id}")[:data]['name']
       end
-      if workspace_info.nil?
-        if package_info.nil?
-          raise 'INTERNAL ERROR: either workspace_info or package_info is required'
-        else
-          workspace_info = package_info['workspace_id']
-        end
+      app_info = {
+        api:            self, # for callback
+        app:            package_info.nil? ? FILES_APP : PACKAGES_APP,
+        node_info:      node_info,
+        workspace_id:   workspace_id,
+        workspace_name: workspace_name
+      }
+      if PACKAGES_APP.eql?(app_info[:app])
+        raise 'package info required' if package_info.nil?
+        app_info[:package_id] = package_info['id']
+        app_info[:package_name] = package_info['name']
       end
-      node_info = read("nodes/#{node_id}")[:data]
       node_rest_params = {base_url: node_info['url']}
       # if secret is available
       if scope.nil?
@@ -286,13 +291,6 @@ module Aspera
         # special header required for bearer token only
         node_rest_params[:headers] = {Aspera::Node::HEADER_X_ASPERA_ACCESS_KEY => node_info['access_key']}
       end
-      app_info = {
-        node_info:      node_info,
-        workspace_info: workspace_info,
-        app:            package_info.nil? ? FILES_APP : PACKAGES_APP,
-        api:            self # for callback
-      }
-      app_info[:package_info] = package_info unless package_info.nil?
       return Node.new(params: node_rest_params, app_info: app_info)
     end
 
@@ -433,7 +431,10 @@ module Aspera
       #  create a new package container
       created_package = create('packages', package_data)[:data]
 
-      package_node_api = node_api_from(package_info: created_package, scope: AoC::SCOPE_NODE_USER)
+      package_node_api = node_api_from(
+        node_id: created_package['node_id'],
+        workspace_id: created_package['workspace_id'],
+        package_info: created_package)
 
       # tell AoC what to expect in package: 1 transfer (can also be done after transfer)
       # TODO: if multi session was used we should probably tell
@@ -454,15 +455,14 @@ module Aspera
       transfer_type = Fasp::TransferSpec.action(transfer_spec)
       # Analytics tags
       ################
-      ws_info = app_info[:workspace_info]
       transfer_spec.deep_merge!({
         'tags' => {
-          'aspera' => {
-            'usage_id' => "aspera.files.workspace.#{ws_info['id']}", # activity tracking
+          Fasp::TransferSpec::TAG_RESERVED => {
+            'usage_id' => "aspera.files.workspace.#{app_info[:workspace_id]}", # activity tracking
             'files'    => {
               'files_transfer_action' => "#{transfer_type}_#{app_info[:app].gsub(/s$/, '')}",
-              'workspace_name'        => ws_info['name'], # activity tracking
-              'workspace_id'          => ws_info['id']
+              'workspace_name'        => app_info[:workspace_name], # activity tracking
+              'workspace_id'          => app_info[:workspace_id]
             }
           }
         }
@@ -477,37 +477,37 @@ module Aspera
       ##################
       case app_info[:app]
       when FILES_APP
-        file_id = transfer_spec['tags']['aspera']['node']['file_id']
-        transfer_spec.deep_merge!({'tags' => {'aspera' => {'files' => {'parentCwd' => "#{app_info[:node_info]['id']}:#{file_id}"}}}}) \
+        file_id = transfer_spec['tags'][Fasp::TransferSpec::TAG_RESERVED]['node']['file_id']
+        transfer_spec.deep_merge!({'tags' => {Fasp::TransferSpec::TAG_RESERVED => {'files' => {'parentCwd' => "#{app_info[:node_info]['id']}:#{file_id}"}}}}) \
           unless transfer_spec.key?('remote_access_key')
       when PACKAGES_APP
         transfer_spec.deep_merge!({
           'tags' => {
-            'aspera' => {
+            Fasp::TransferSpec::TAG_RESERVED => {
               'files' => {
-                'package_id'        => app_info[:package_info]['id'],
-                'package_name'      => app_info[:package_info]['name'],
+                'package_id'        => app_info[:package_id],
+                'package_name'      => app_info[:package_name],
                 'package_operation' => transfer_type
               }}}})
       end
-      transfer_spec['tags']['aspera']['files']['node_id'] = app_info[:node_info]['id']
-      transfer_spec['tags']['aspera']['app'] = app_info[:app]
+      transfer_spec['tags'][Fasp::TransferSpec::TAG_RESERVED]['files']['node_id'] = app_info[:node_info]['id']
+      transfer_spec['tags'][Fasp::TransferSpec::TAG_RESERVED]['app'] = app_info[:app]
     end
 
     ID_AK_ADMIN = 'ASPERA_ACCESS_KEY_ADMIN'
     # Callback from Plugins::Node
     def permissions_create_params(create_param:, app_info:)
       # workspace shared folder:
-      # access_id = "#{ID_AK_ADMIN}_WS_#{ app_info[:workspace_info]['id']}"
+      # access_id = "#{ID_AK_ADMIN}_WS_#{app_info[:workspace_id]}"
       default_params = {
         # 'access_type'   => 'user', # mandatory: user or group
         # 'access_id'     => access_id, # id of user or group
         'tags' => {
-          'aspera' => {
+          Fasp::TransferSpec::TAG_RESERVED => {
             'files' => {
               'workspace' => {
-                'id'                => app_info[:workspace_info]['id'],
-                'workspace_name'    => app_info[:workspace_info]['name'],
+                'id'                => app_info[:workspace_id],
+                'workspace_name'    => app_info[:workspace_name],
                 'user_name'         => current_user_info['name'],
                 'shared_by_user_id' => current_user_info['id'],
                 'shared_by_name'    => current_user_info['name'],
@@ -520,11 +520,11 @@ module Aspera
         contact_info = lookup_entity_by_name(
           'contacts',
           create_param['with'],
-          {'current_workspace_id' => app_info[:workspace_info]['id'], 'context' => 'share_folder'})
+          {'current_workspace_id' => app_info[:workspace_id], 'context' => 'share_folder'})
         create_param.delete('with')
         create_param['access_type'] = contact_info['source_type']
         create_param['access_id'] = contact_info['source_id']
-        create_param['tags']['aspera']['files']['workspace']['shared_with_name'] = contact_info['email']
+        create_param['tags'][Fasp::TransferSpec::TAG_RESERVED]['files']['workspace']['shared_with_name'] = contact_info['email']
       end
       # optional
       app_info[:opt_link_name] = create_param.delete('link_name')
@@ -535,7 +535,7 @@ module Aspera
       event_creation = {
         'types'        => ['permission.created'],
         'node_id'      => app_info[:node_info]['id'],
-        'workspace_id' => app_info[:workspace_info]['id'],
+        'workspace_id' => app_info[:workspace_id],
         'data'         => created_data # Response from previous step
       }
       # (optional). The name of the folder to be displayed to the destination user. Use it if its value is different from the "share_as" field.

data/lib/aspera/ascmd.rb

@@ -24,10 +24,11 @@ module Aspera
       # concatenate arguments, enclose in double quotes, protect backslash and double quotes, add "as_" command and as_exit
       stdin_input = (args || []).map{|v| '"' + v.gsub(/["\\]/n) {|s| '\\' + s } + '"'}.unshift('as_' + action_sym.to_s).join(' ') + "\nas_exit\n"
       # execute, get binary output
-      bytebuffer = @command_executor.execute('ascmd', stdin_input).unpack('C*')
+      byte_buffer = @command_executor.execute('ascmd', stdin_input).unpack('C*')
+      raise 'ERROR: empty answer from server' if byte_buffer.empty?
       # get hash or table result
-      result = self.class.parse(bytebuffer, :result)
-      raise 'ERROR: unparsed bytes remaining' unless bytebuffer.empty?
+      result = self.class.parse(byte_buffer, :result)
+      raise 'ERROR: unparsed bytes remaining' unless byte_buffer.empty?
       # get and delete info,always present in results
       system_info = result[:info]
       result.delete(:info)

data/lib/aspera/cli/extended_value.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'aspera/cli/plugins/config'
 require 'aspera/uri_reader'
 require 'aspera/environment'
 require 'json'
@@ -39,38 +38,33 @@ module Aspera
 
       def initialize
         @handlers = {
-          decoder: {
-            base64: lambda{|v|Base64.decode64(v)},
-            json:   lambda{|v|JSON.parse(v)},
-            zlib:   lambda{|v|Zlib::Inflate.inflate(v)},
-            ruby:   lambda{|v|Environment.secure_eval(v)},
-            csvt:   lambda{|v|ExtendedValue.decode_csvt(v)},
-            lines:  lambda{|v|v.split("\n")},
-            list:   lambda{|v|v[1..-1].split(v[0])}
-          },
-          reader:  {
-            val:   lambda{|v|v},
-            file:  lambda{|v|File.read(File.expand_path(v))},
-            path:  lambda{|v|File.expand_path(v)},
-            env:   lambda{|v|ENV[v]},
-            uri:   lambda{|v|UriReader.read(v)},
-            stdin: lambda{|v|raise 'no value allowed for stdin' unless v.empty?; $stdin.read} # rubocop:disable Style/Semicolon
-          }
+          base64: lambda{|v|Base64.decode64(v)},
+          csvt:   lambda{|v|ExtendedValue.decode_csvt(v)},
+          env:    lambda{|v|ENV[v]},
+          file:   lambda{|v|File.read(File.expand_path(v))},
+          json:   lambda{|v|JSON.parse(v)},
+          lines:  lambda{|v|v.split("\n")},
+          list:   lambda{|v|v[1..-1].split(v[0])},
+          path:   lambda{|v|File.expand_path(v)},
+          ruby:   lambda{|v|Environment.secure_eval(v)},
+          secret: lambda{|v|raise 'no value allowed for secret' unless v.empty?; $stdin.getpass('secret> ')}, # rubocop:disable Style/Semicolon
+          stdin:  lambda{|v|raise 'no value allowed for stdin' unless v.empty?; $stdin.read}, # rubocop:disable Style/Semicolon
+          uri:    lambda{|v|UriReader.read(v)},
+          val:    lambda{|v|v},
+          zlib:   lambda{|v|Zlib::Inflate.inflate(v)}
           # other handlers can be set using set_handler, e.g. preset is reader in config plugin
         }
       end
 
       public
 
-      def modifiers; @handlers.keys.map{|i|@handlers[i].keys}.flatten.map(&:to_s); end
+      def modifiers; @handlers.keys; end
 
-      # add a new :reader or :decoder
-      # decoder can be chained, reader is last one on right
-      def set_handler(name, type, method)
-        Log.log.debug{"setting #{type} handler for #{name}"}
+      # add a new handler
+      def set_handler(name, method)
+        Log.log.debug{"setting handler for #{name}"}
         raise 'name must be Symbol' unless name.is_a?(Symbol)
-        raise "type #{type} must be one of #{@handlers.keys}" unless @handlers.key?(type)
-        @handlers[type][name] = method
+        @handlers[name] = method
       end
 
       # parse an option value if it is a String using supported extended value modifiers
@@ -78,20 +72,13 @@ module Aspera
       def evaluate(value)
         return value if !value.is_a?(String)
         # first determine decoders, in reversed order
-        decoders_reversed = []
-        while (m = value.match(/^@([^:]+):(.*)/)) && @handlers[:decoder].include?(m[1].to_sym)
-          decoders_reversed.unshift(m[1].to_sym)
+        handlers_reversed = []
+        while (m = value.match(/^@([^:]+):(.*)/)) && @handlers.include?(m[1].to_sym)
+          handlers_reversed.unshift(m[1].to_sym)
           value = m[2]
         end
-        # then read value
-        @handlers[:reader].each do |reader, method|
-          if (m = value.match(/^@#{reader}:(.*)/))
-            value = method.call(m[1])
-            break
-          end
-        end
-        decoders_reversed.each do |decoder|
-          value = @handlers[:decoder][decoder].call(value)
+        handlers_reversed.each do |handler|
+          value = @handlers[handler].call(value)
         end
         return value
       end # parse

data/lib/aspera/cli/formatter.rb

@@ -116,6 +116,12 @@ module Aspera
         display_message(:info, status)
       end
 
+      def display_item_count(number, total)
+        count_msg = "Items: #{number}/#{total}"
+        count_msg = count_msg.bg_red unless number.to_i.eql?(total.to_i)
+        display_status(count_msg)
+      end
+
       def result_default_fields(results, table_rows_hash_val)
         unless results[:fields].nil?
           raise "internal error: [fields] must be Array, not #{results[:fields].class}" unless results[:fields].is_a?(Array)

data/lib/aspera/cli/info.rb

@@ -10,9 +10,7 @@ module Aspera
     GEM_URL  = "https://rubygems.org/gems/#{GEM_NAME}"
     SRC_URL  = 'https://github.com/IBM/aspera-cli'
     # set this to warn in advance when minimum required ruby version will increase
-    # for example currently minimum version is 2.4 in gemspec, but future minimum will be different
-    # set to current minimum if there is no deprecation
-    # the actual current minimum required version is in gemspec at required_ruby_version
-    RUBY_FUTURE_MINIMUM_VERSION = '2.7'
+    # see also required_ruby_version in gemspec file
+    RUBY_FUTURE_MINIMUM_VERSION = '3.0'
   end
 end

data/lib/aspera/cli/main.rb

@@ -335,6 +335,7 @@ module Aspera
           # finish
           @plugin_env[:transfer].shutdown
         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 CliBadArgument => e;                 exception_info = {e: e, t: 'Argument', usage: true}
         rescue CliNoSuchId => e;                    exception_info = {e: e, t: 'Identifier'}
         rescue CliError => e;                       exception_info = {e: e, t: 'Tool', usage: true}
@@ -351,10 +352,15 @@ module Aspera
           Log.log.warn(exception_info[:e].message) if Aspera::Log.instance.logger_type.eql?(:syslog) && exception_info[:security]
           @formatter.display_message(:error, "#{ERROR_FLASH} #{exception_info[:t]}: #{exception_info[:e].message}")
           @formatter.display_message(:error, 'Use option -h to get help.') if exception_info[:usage]
+          # Provide hint on FASP errors
           if exception_info[:e].is_a?(Fasp::Error) && exception_info[:e].message.eql?('Remote host is not who we expected')
             @formatter.display_message(:error, "For this specific error, refer to:\n"\
               "#{SRC_URL}#error-remote-host-is-not-who-we-expected\nAdd this to arguments:\n--ts=@json:'{\"sshfp\":null}'")
           end
+          # Provide hint on SSL errors
+          if exception_info[:e].is_a?(OpenSSL::SSL::SSLError) && ['does not match the server certificate'].any?{|m|exception_info[:e].message.include?(m)}
+            @formatter.display_message(:error, "You can ignore SSL errors with option:\n--insecure=yes")
+          end
         end
         # 2- processing of command not processed (due to exception or bad command line)
         if execute_command || @option_show_config

data/lib/aspera/cli/manager.rb

@@ -52,9 +52,9 @@ module Aspera
       # option name separator on command line
       OPTION_SEP_LINE = '-'
       # option name separator in code (symbol)
-      OPTION_SEP_NAME = '_'
+      OPTION_SEP_SYMB = '_'
 
-      private_constant :FALSE_VALUES, :TRUE_VALUES, :BOOLEAN_VALUES, :OPTION_SEP_LINE, :OPTION_SEP_NAME
+      private_constant :FALSE_VALUES, :TRUE_VALUES, :BOOLEAN_VALUES, :OPTION_SEP_LINE, :OPTION_SEP_SYMB
 
       class << self
         def enum_to_bool(enum)
@@ -81,6 +81,15 @@ module Aspera
         def bad_arg_message_multi(error_msg, choices)
           return [error_msg, 'Use:'].concat(choices.map{|c|"- #{c}"}.sort).join("\n")
         end
+
+        # change option name with dash to name with underscore
+        def option_line_to_name(name)
+          return name.gsub(OPTION_SEP_LINE, OPTION_SEP_SYMB)
+        end
+
+        def option_name_to_line(name)
+          return "--#{name.to_s.gsub(OPTION_SEP_SYMB, OPTION_SEP_LINE)}"
+        end
       end
 
       attr_reader :parser
@@ -108,7 +117,7 @@ module Aspera
         @parser = OptionParser.new
         @parser.program_name = program_name
         # options can also be provided by env vars : --param-name -> ASCLI_PARAM_NAME
-        env_prefix = program_name.upcase + OPTION_SEP_NAME
+        env_prefix = program_name.upcase + OPTION_SEP_SYMB
         ENV.each do |k, v|
           if k.start_with?(env_prefix)
             @unprocessed_env.push([k[env_prefix.length..-1].downcase.to_sym, v])
@@ -223,7 +232,7 @@ module Aspera
         end
       end
 
-      # get an option value by name
+      # Get an option value by name
       # either return value or call handler, can return nil
       # ask interactively if requested/required
       def get_option(option_symbol, is_type: :optional)
@@ -347,7 +356,7 @@ module Aspera
           when /^--([^=]+)=(.*)$/
             name = Regexp.last_match(1)
             value = Regexp.last_match(2)
-            name.gsub!(OPTION_SEP_LINE, OPTION_SEP_NAME)
+            name.gsub!(OPTION_SEP_LINE, OPTION_SEP_SYMB)
             value = ExtendedValue.instance.evaluate(value)
             Log.log.debug{"option #{name}=#{value}"}
             result[name] = value
@@ -429,7 +438,7 @@ module Aspera
 
       # generate command line option from option symbol
       def symbol_to_option(symbol, opt_val)
-        result = '--' + symbol.to_s.gsub(OPTION_SEP_NAME, OPTION_SEP_LINE)
+        result = '--' + symbol.to_s.gsub(OPTION_SEP_SYMB, OPTION_SEP_LINE)
         result = result + '=' + opt_val unless opt_val.nil?
         return result
       end

data/lib/aspera/cli/plugin.rb

@@ -140,11 +140,7 @@ module Aspera
           if item_list_key
             item_list = data[item_list_key]
             total_count = data['total_count']
-            if !total_count.nil?
-              count_msg = "Items: #{item_list.length}/#{total_count}"
-              count_msg = count_msg.bg_red unless item_list.length.eql?(total_count.to_i)
-              formatter.display_status(count_msg)
-            end
+            formatter.display_item_count(item_list.length, total_count) unless total_count.nil?
             data = item_list
           end
           case data

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

@@ -142,6 +142,13 @@ module Aspera
           end
           home_node_id ||= current_workspace_info['home_node_id'] || current_workspace_info['node_id']
           home_file_id ||= current_workspace_info['home_file_id']
+          if home_node_id.to_s.empty?
+            # not part of any workspace, but has some folder shared
+            user_info = aoc_api.current_user_info(exception: true)
+            home_node_id = user_info['read_only_home_node_id']
+            home_file_id = user_info['read_only_home_file_id']
+          end
+
           raise "Cannot get user's home node id, check your default workspace or specify one" if home_node_id.to_s.empty?
           @cache_home_node_file = {
             node_id: home_node_id,
@@ -214,7 +221,12 @@ module Aspera
         # @param file_id [String] root file id for the operation (can be AK root, or other, e.g. package, or link)
         # @param scope [String] node scope, or nil (admin)
         def execute_nodegen4_command(command_repo, node_id, file_id: nil, scope: nil)
-          top_node_api = aoc_api.node_api_from(node_id: node_id, workspace_info: current_workspace_info, scope: scope)
+          top_node_api = aoc_api.node_api_from(
+            node_id: node_id,
+            workspace_id: current_workspace_info['id'],
+            workspace_name: current_workspace_info['name'],
+            scope: scope
+          )
           file_id = top_node_api.read("access_keys/#{top_node_api.app_info[:node_info]['access_key']}")[:data]['root_file_id'] if file_id.nil?
           node_plugin = Node.new(@agents.merge(
             skip_basic_auth_options: true,
@@ -440,9 +452,7 @@ module Aspera
               when :workspace_membership then default_fields.push(*%w[workspace_id member_type member_id])
               end
               items = read_with_paging(resource_class_path, option_url_query(default_query))
-              count_msg = "Items: #{items[:list].length}/#{items[:total]}"
-              count_msg = count_msg.bg_red unless items[:list].length.eql?(items[:total].to_i)
-              formatter.display_status(count_msg)
+              formatter.display_item_count(items[:list].length, items[:total])
               return {type: :object_list, data: items[:list], fields: default_fields}
             when :show
               object = aoc_api.read(resource_instance_path)[:data]
@@ -588,7 +598,11 @@ module Aspera
               ids_to_download.each do |package_id|
                 package_info = aoc_api.read("packages/#{package_id}")[:data]
                 formatter.display_status("downloading package: #{package_info['name']}")
-                package_node_api = aoc_api.node_api_from(package_info: package_info, scope: AoC::SCOPE_NODE_USER)
+                package_node_api = aoc_api.node_api_from(
+                  node_id: package_info['node_id'],
+                  workspace_id: current_workspace_info['id'],
+                  workspace_name: current_workspace_info['name'],
+                  package_info: package_info)
                 statuses = transfer.start(
                   package_node_api.transfer_spec_gen4(
                     package_info['contents_file_id'],
@@ -653,7 +667,10 @@ module Aspera
               create_params = nil
               shared_apfid = nil
               if !folder_dest.nil?
-                home_node_api = aoc_api.node_api_from(node_id: home_info[:node_id], workspace_info: current_workspace_info, scope: AoC::SCOPE_NODE_USER)
+                home_node_api = aoc_api.node_api_from(
+                  node_id: home_info[:node_id],
+                  workspace_id: current_workspace_info['id'],
+                  workspace_name: current_workspace_info['name'])
                 shared_apfid = home_node_api.resolve_api_fid(home_info[:file_id], folder_dest)
                 create_params = {
                   file_id:      shared_apfid[:file_id],

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

@@ -74,6 +74,7 @@ module Aspera
         DEFAULT_CHECK_NEW_VERSION_DAYS = 7
         DEFAULT_PRIV_KEY_FILENAME = 'aspera_aoc_key' # pragma: allowlist secret
         DEFAULT_PRIVKEY_LENGTH = 4096
+        COFFEE_IMAGE = 'https://enjoyjava.com/wp-content/uploads/2018/01/How-to-make-strong-coffee.jpg'
         private_constant :DEFAULT_CONFIG_FILENAME,
           :CONF_PRESET_CONFIG,
           :CONF_PRESET_VERSION,
@@ -99,7 +100,8 @@ module Aspera
           :DEFAULT_CHECK_NEW_VERSION_DAYS,
           :DEFAULT_PRIV_KEY_FILENAME,
           :SERVER_COMMAND,
-          :PRESET_DIG_SEPARATOR
+          :PRESET_DIG_SEPARATOR,
+          :COFFEE_IMAGE
         def initialize(env, params)
           raise 'env and params must be Hash' unless env.is_a?(Hash) && params.is_a?(Hash)
           raise 'missing param' unless %i[name help version gem].sort.eql?(params.keys.sort)
@@ -126,9 +128,9 @@ module Aspera
           # read correct file (set @config_presets)
           read_config_file
           # add preset handler (needed for smtp)
-          ExtendedValue.instance.set_handler(EXTV_PRESET, :reader, lambda{|v|preset_by_name(v)})
-          ExtendedValue.instance.set_handler(EXTV_INCLUDE_PRESETS, :decoder, lambda{|v|expanded_with_preset_includes(v)})
-          ExtendedValue.instance.set_handler(EXTV_VAULT, :decoder, lambda{|v|vault_value(v)})
+          ExtendedValue.instance.set_handler(EXTV_PRESET, lambda{|v|preset_by_name(v)})
+          ExtendedValue.instance.set_handler(EXTV_INCLUDE_PRESETS, lambda{|v|expanded_with_preset_includes(v)})
+          ExtendedValue.instance.set_handler(EXTV_VAULT, lambda{|v|vault_value(v)})
           # load defaults before it can be overridden
           add_plugin_default_preset(CONF_GLOBAL_SYM)
           options.parse_options!
@@ -350,7 +352,7 @@ module Aspera
           include_path = include_path.clone # avoid messing up if there are multiple branches
           current = @config_presets
           config_name.split(PRESET_DIG_SEPARATOR).each do |name|
-            raise CliError, "Expecting Hash for subkey: #{include_path} (#{current.class})" unless current.is_a?(Hash)
+            raise CliError, "Expecting Hash for sub key: #{include_path} (#{current.class})" unless current.is_a?(Hash)
             include_path.push(name)
             current = current[name]
             raise CliError, "No such config preset: #{include_path}" if current.nil?
@@ -747,6 +749,7 @@ module Aspera
           when :set
             param_name = options.get_next_argument('parameter name')
             param_value = options.get_next_argument('parameter value')
+            param_name = Manager.option_line_to_name(param_name)
             if !@config_presets.key?(name)
               Log.log.debug{"no such config name: #{name}, initializing"}
               selected_preset = @config_presets[name] = {}
@@ -974,7 +977,11 @@ module Aspera
             BasicAuthPlugin.register_options(@agents)
             return {type: :single_object, data: identify_plugin_for_url(options.get_option(:url, is_type: :mandatory))}
           when :coffee
-            OpenApplication.instance.uri('https://enjoyjava.com/wp-content/uploads/2018/01/How-to-make-strong-coffee.jpg')
+            if OpenApplication.instance.url_method.eql?(:text)
+              require 'aspera/preview/terminal'
+              return Main.result_status(Preview::Terminal.build(Rest.new(base_url: COFFEE_IMAGE).read('')[:http].body, reserved_lines: 3))
+            end
+            OpenApplication.instance.uri(COFFEE_IMAGE)
             return Main.result_nothing
           when :ascp
             execute_action_ascp

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

@@ -170,6 +170,7 @@ module Aspera
             stop_condition = false
             # results will be sorted in reverse id
             items.reverse_each do |package|
+              # create the package id, based on recipient's box
               package[PACKAGE_MATCH_FIELD] =
                 case mailbox
                 when :inbox, :archive
@@ -180,7 +181,7 @@ module Aspera
                 end
               # if we look for a specific package
               stop_condition = true if !stop_at_id.nil? && stop_at_id.eql?(package[PACKAGE_MATCH_FIELD])
-              # keep only those for the specified recipient,
+              # keep only those for the specified recipient
               result.push(package) unless package[PACKAGE_MATCH_FIELD].nil?
             end
             break if stop_condition
@@ -378,13 +379,13 @@ module Aspera
                   # NOTE: only external users have token in faspe: link !
                   if !transfer_spec.key?('token')
                     sanitized = id_uri[:uri].gsub('&', '&')
-                    xmlpayload =
+                    xml_payload =
                       %Q(<?xml version="1.0" encoding="UTF-8"?><url-list xmlns="http://schemas.asperasoft.com/xml/url-list"><url href="#{sanitized}"/></url-list>)
                     transfer_spec['token'] = api_v3.call({
                       operation:        'POST',
                       subpath:          'issue-token?direction=down',
                       headers:          {'Accept' => 'text/plain', 'Content-Type' => 'application/vnd.aspera.url-list+xml'},
-                      text_body_params: xmlpayload})[:http].body
+                      text_body_params: xml_payload})[:http].body
                   end
                   transfer_spec['direction'] = Fasp::TransferSpec::DIRECTION_RECEIVE
                   statuses = transfer.start(transfer_spec)