aspera-cli 4.9.0 → 4.10.0

data/docs/test_env.conf

@@ -6,8 +6,7 @@ default:
   aoc: tst_aoc1
   faspex: tst_faspex
   faspex5: tst_faspex5
-  shares: tst_shares_1
-  shares2: tst_shares2
+  shares: tst_shares
   node: tst_node
   server: tst_server
   orchestrator: tst_orch
@@ -74,11 +73,11 @@ tst_shares_1:
   url: your value here
   username: your value here
   password: your value here
-tst_shares2:
+tst_node:
   url: your value here
   username: your value here
   password: your value here
-tst_node:
+node_srv:
   url: your value here
   username: your value here
   password: your value here
@@ -118,6 +117,9 @@ tst_cos:
   crn: your value here
   bucket: your value here
   endpoint: your value here
+sync:
+  local_path: your value here
+  remote_path: your value here
 misc:
   upload_folder: your value here
   syncuser: your value here

data/examples/dascli

@@ -1,12 +1,16 @@
 #!/usr/bin/env bash
+# set env var image to specify another docker image
+# set env var version to specify another image version
+# set env var docker_args to add options to docker run
 : ${image:=martinlaurent/ascli}
 # by default take latest version
 : ${version:=latest}
-imgtag=$image:$version
+: ${docker:=docker}
+: ${imgtag=$image:$version}
+# transform var into array
+add_dock_args=( $docker_args )
 # same location as in Dockerfile: main config folder for ascli in container
 ascli_home_container=/home/cliuser/.aspera/ascli
-# convenience: special argument to install the image
-case "$1" in install) docker pull $imgtag; exit 0; esac
 # set default location for config folder on host if necessary
 : ${ASCLI_HOME:=$HOME/.aspera/ascli}
 if test ! -d $ASCLI_HOME;then
@@ -14,10 +18,11 @@ if test ! -d $ASCLI_HOME;then
 	# create it if necessary to allow mounting the volume in container
 	mkdir -p "$ASCLI_HOME"
 fi
-exec docker run \
+exec $docker run \
 --rm \
 --tty \
 --interactive \
 --volume "$ASCLI_HOME:$ascli_home_container" \
+"${add_dock_args[@]}" \
 $imgtag \
 ascli "$@"

data/examples/faspex4.rb

@@ -74,7 +74,7 @@ Aspera::Log.dump('job_id',job_id)
 result = transfer_client.wait_for_transfers_completion
 #  notify of any transfer error
 result.reject{|i|i.eql?(:success)}.each do |e|
-  Aspera::Log.log.error("A transfer error occured: #{e.message}")
+  Aspera::Log.log.error("A transfer error occurred: #{e.message}")
 end
 
 # 3: Faspex 4 API v4

data/examples/node.rb

@@ -93,4 +93,4 @@ transfer_agent.start_transfer(transfer_spec)
 transfer_result = transfer_agent.wait_for_transfers_completion
 errors = transfer_result.reject{|i|i.eql?(:success)}
 # the transfer was not success, as there is at least one error
-raise "Error(s) occured: #{errors.join(',')}" if !errors.empty?
+raise "Error(s) occurred: #{errors.join(',')}" if !errors.empty?

data/examples/server.rb

@@ -90,4 +90,4 @@ $stdout.puts(JSON.generate(transfer_result))
 # get list of errors only
 errors = transfer_result.reject{|i|i.eql?(:success)}
 # the transfer was not success, as there is at least one error
-raise "Error(s) occured: #{errors.join(',')}" if !errors.empty?
+raise "Error(s) occurred: #{errors.join(',')}" if !errors.empty?

data/lib/aspera/cli/info.rb

@@ -10,9 +10,9 @@ 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 2.5
+    # 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.5'
+    RUBY_FUTURE_MINIMUM_VERSION = '2.7'
   end
 end

data/lib/aspera/cli/main.rb

@@ -87,7 +87,7 @@ module Aspera
         if @option_insecure
           url=http.inspect.gsub(/^[^ ]* /,'https://').gsub(/ [^ ]*$/,'')
           if !@ssl_warned_urls.include?(url)
-            @plugin_env[:formater].display_message(:error,"#{WARNING_FLASH} ignoring certificate for: #{url}. Only for tests, do not use in production.")
+            @plugin_env[:formater].display_message(:error,"#{WARNING_FLASH} ignoring certificate for: #{url}. Do not use unsafe certificates in production.")
             @ssl_warned_urls.push(url)
           end
           http.verify_mode = SELF_SIGNED_CERT

data/lib/aspera/cli/manager.rb

@@ -44,15 +44,17 @@ module Aspera
     # resolves on extended value syntax
     class Manager
       # boolean options are set to true/false from the following values
-      TRUE_VALUES = [:yes,true].freeze
-      BOOLEAN_VALUES = [TRUE_VALUES,:no,false].flatten.freeze
-      BOOLEAN_SIMPLE = %i[yes no].freeze
+      BOOLEAN_SIMPLE = %i[no yes].freeze
+      FALSE_VALUES = [BOOLEAN_SIMPLE.first,false].freeze
+      TRUE_VALUES = [BOOLEAN_SIMPLE.last,true].freeze
+      BOOLEAN_VALUES = [TRUE_VALUES,FALSE_VALUES].flatten.freeze
+
       # option name separator on command line
       OPTION_SEP_LINE = '-'
       # option name separator in code (symbol)
       OPTION_SEP_NAME = '_'
 
-      private_constant :TRUE_VALUES,:BOOLEAN_VALUES,:OPTION_SEP_LINE,:OPTION_SEP_NAME
+      private_constant :FALSE_VALUES,:TRUE_VALUES,:BOOLEAN_VALUES,:OPTION_SEP_LINE,:OPTION_SEP_NAME
 
       class << self
         def enum_to_bool(enum)

data/lib/aspera/cli/plugin.rb

@@ -35,7 +35,9 @@ module Aspera
         options.add_opt_simple(:property,'name of property to set')
         options.add_opt_simple(:id,"resource identifier (#{INSTANCE_OPS.join(',')})")
         options.add_opt_boolean(:bulk,'Bulk operation (only some)')
+        options.add_opt_boolean(:bfail,'Bulk operation error handling')
         options.set_option(:bulk,:no)
+        options.set_option(:bfail,:yes)
         options.parse_options!
         @@options_created = true # rubocop:disable Style/ClassVars
       end
@@ -72,6 +74,7 @@ module Aspera
             result = res if param.is_a?(Hash)
             result['status'] = success_msg
           rescue StandardError => e
+            raise e if options.get_option(:bfail)
             result['status'] = e.to_s
           end
           result_list.push(result)
@@ -140,7 +143,8 @@ module Aspera
             end
             data = item_list
           end
-          return {type: :object_list, data: data, fields: display_fields}
+          return {type: :object_list, data: data, fields: display_fields} if data.empty? || data.first.is_a?(Hash)
+          return {type: :value_list, data: data, name: 'id'}
         when :modify
           property = options.get_option(:property)
           parameters = {property => parameters} unless property.nil?

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

@@ -673,7 +673,7 @@ module Aspera
               startdate_persistency&.save
               if !options.get_option(:notif_to).nil?
                 events.each do |tr_event|
-                  config.send_email_template({ev: tr_event})
+                  config.send_email_template(values: {ev: tr_event})
                 end
               end
               return {type: :object_list,data: events}

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

@@ -4,6 +4,7 @@ require 'aspera/cli/basic_auth_plugin'
 require 'aspera/cli/extended_value'
 require 'aspera/cli/version'
 require 'aspera/cli/formater'
+require 'aspera/cli/info'
 require 'aspera/fasp/installation'
 require 'aspera/fasp/parameters'
 require 'aspera/fasp/transfer_spec'
@@ -37,7 +38,6 @@ module Aspera
         CONF_PRESET_VERSION = 'version'
         CONF_PRESET_DEFAULT = 'default'
         CONF_PRESET_GLOBAL = 'global_common_defaults'
-        CONF_PRESET_SECRETS = 'default_secrets' # pragma: allowlist secret
         CONF_PLUGIN_SYM = :config # Plugins::Config.name.split('::').last.downcase.to_sym
         CONF_GLOBAL_SYM = :config
         # old tool name
@@ -62,13 +62,14 @@ module Aspera
         EMAIL_TEST_TEMPLATE = <<~END_OF_TEMPLATE
           From: <%=from_name%> <<%=from_email%>>
           To: <<%=to%>>
-          Subject: Amelia email test
+          Subject: #{GEM_NAME} email test
 
-          It worked !
+          This email was sent to test #{PROGRAM_NAME}.
         END_OF_TEMPLATE
         # special extended values
         EXTV_INCLUDE_PRESETS = :incps
         EXTV_PRESET = :preset
+        EXTV_VAULT = :vault
         PRESET_DIG_SEPARATOR = '.'
         DEFAULT_CHECK_NEW_VERSION_DAYS = 7
         DEFAULT_PRIV_KEY_FILENAME = 'aspera_aoc_key' # pragma: allowlist secret
@@ -77,7 +78,7 @@ module Aspera
           :CONF_PRESET_GLOBAL,:PROGRAM_NAME_V1,:PROGRAM_NAME_V2,:DEFAULT_REDIRECT,:ASPERA_PLUGINS_FOLDERNAME,
           :RUBY_FILE_EXT,:AOC_COMMAND_V1,:AOC_COMMAND_V2,:AOC_COMMAND_V3,:AOC_COMMAND_CURRENT,:DEMO,
           :TRANSFER_SDK_ARCHIVE_URL,:AOC_PATH_API_CLIENTS,:DEMO_SERVER_PRESET,:EMAIL_TEST_TEMPLATE,:EXTV_INCLUDE_PRESETS,
-          :EXTV_PRESET,:DEFAULT_CHECK_NEW_VERSION_DAYS,:DEFAULT_PRIV_KEY_FILENAME,:SERVER_COMMAND,:CONF_PRESET_SECRETS,
+          :EXTV_PRESET,:EXTV_VAULT,:DEFAULT_CHECK_NEW_VERSION_DAYS,:DEFAULT_PRIV_KEY_FILENAME,:SERVER_COMMAND,
           :PRESET_DIG_SEPARATOR
         def initialize(env,params)
           raise 'env and params must be Hash' unless env.is_a?(Hash) && params.is_a?(Hash)
@@ -107,6 +108,7 @@ module Aspera
           # 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)})
           # load defaults before it can be overriden
           add_plugin_default_preset(CONF_GLOBAL_SYM)
           options.parse_options!
@@ -122,18 +124,20 @@ module Aspera
           options.add_opt_boolean(:test_mode,'Wizard: skip private key check step')
           options.add_opt_simple(:preset,'-PVALUE','load the named option preset from current config file')
           options.add_opt_simple(:pkeypath,'Wizard: path to private key for JWT')
-          options.add_opt_simple(:ascp_path,'path to ascp')
-          options.add_opt_simple(:use_product,'use ascp from specified product')
-          options.add_opt_simple(:smtp,'smtp configuration (extended value: hash)')
-          options.add_opt_simple(:fpac,'proxy auto configuration script')
-          options.add_opt_simple(:secret,'default secret')
-          options.add_opt_simple(:secrets,'secret vault')
+          options.add_opt_simple(:ascp_path,'Path to ascp')
+          options.add_opt_simple(:use_product,'Use ascp from specified product')
+          options.add_opt_simple(:smtp,'SMTP configuration (extended value: hash)')
+          options.add_opt_simple(:fpac,'Proxy auto configuration script')
+          options.add_opt_simple(:proxy_credentials,'HTTP proxy credentials (Array with user and password)')
+          options.add_opt_simple(:secret,'Secret for access keys')
+          options.add_opt_simple(:vault,'Vault for secrets')
+          options.add_opt_simple(:vault_password,'Vault password')
           options.add_opt_simple(:sdk_url,'URL to get SDK')
           options.add_opt_simple(:sdk_folder,'SDK folder path')
-          options.add_opt_simple(:notif_to,'email recipient for notification of transfers')
-          options.add_opt_simple(:notif_template,'email ERB template for notification of transfers')
-          options.add_opt_simple(:version_check_days,Integer,'period in days to check new version (zero to disable)')
-          options.add_opt_simple(:plugin_folder,'folder where to find additional plugins')
+          options.add_opt_simple(:notif_to,'Email recipient for notification of transfers')
+          options.add_opt_simple(:notif_template,'Email ERB template for notification of transfers')
+          options.add_opt_simple(:version_check_days,Integer,'Period in days to check new version (zero to disable)')
+          options.add_opt_simple(:plugin_folder,'Folder where to find additional plugins')
           options.set_option(:use_generic_client,true)
           options.set_option(:test_mode,false)
           options.set_option(:default,true)
@@ -145,6 +149,13 @@ module Aspera
           pac_script = options.get_option(:fpac)
           # create PAC executor
           @pac_exec = Aspera::ProxyAutoConfig.new(pac_script).register_uri_generic unless pac_script.nil?
+          proxy_creds=options.get_option(:proxy_credentials)
+          if !proxy_creds.nil?
+            raise CliBadArgument,'proxy credentials shall be an array (#{proxy_creds.class})' unless proxy_creds.is_a?(Array)
+            raise CliBadArgument,'proxy credentials shall have two elements (#{proxy_creds.length})' unless proxy_creds.length.eql?(2)
+            @pac_exec.proxy_user=Rest.proxy_user=proxy_creds[0]
+            @pac_exec.proxy_pass=Rest.proxy_pass=proxy_creds[1]
+          end
         end
 
         # env var name to override the app's main folder
@@ -251,9 +262,9 @@ module Aspera
           require 'openssl'
           priv_key = OpenSSL::PKey::RSA.new(length)
           File.write(private_key_path,priv_key.to_s)
-          File.chmod(0400,private_key_path)
           File.write(private_key_path + '.pub',priv_key.public_key.to_s)
-          File.chmod(0400,private_key_path + '.pub')
+          Environment.restrict_file_access(private_key_path)
+          Environment.restrict_file_access(private_key_path + '.pub')
           nil
         end
 
@@ -479,11 +490,14 @@ module Aspera
             Log.log.error('YAML error in config file')
             raise e
           rescue StandardError => e
-            Log.log.debug("-> #{e}")
-            new_name = "#{@option_config_file}.pre#{@info[:version]}.manual_conversion_needed"
-            File.rename(@option_config_file,new_name)
-            Log.log.warn("Renamed config file to #{new_name}.")
-            Log.log.warn('Manual Conversion is required. Next time, a new empty file will be created.')
+            Log.log.debug("-> #{e.class.name} : #{e}")
+            if File.exist?(@option_config_file)
+              # then there is a problem with that file.
+              new_name = "#{@option_config_file}.pre#{@info[:version]}.manual_conversion_needed"
+              File.rename(@option_config_file,new_name)
+              Log.log.warn("Renamed config file to #{new_name}.")
+              Log.log.warn('Manual Conversion is required. Next time, a new empty file will be created.')
+            end
             raise CliError,e.to_s
           end
         end
@@ -621,7 +635,8 @@ module Aspera
                 last_line = line
                 case line
                 when %r{^DBG Path ([^ ]+) (dir|file) +: (.*)$} then data[Regexp.last_match(1)] = Regexp.last_match(3)
-                when %r{^DBG Added module group:"([^"]+)" name:"([^"]+)", version:"([^"]+)" interface:"([^"]+)"$} then data[Regexp.last_match(2)] = Regexp.last_match(4)
+                when %r{^DBG Added module group:"([^"]+)" name:"([^"]+)", version:"([^"]+)" interface:"([^"]+)"$}
+                  data[Regexp.last_match(2)] = "#{Regexp.last_match(4)} #{Regexp.last_match(1)} v#{Regexp.last_match(3)}"
                 when %r{^DBG License result \(/license/(\S+)\): (.+)$} then data[Regexp.last_match(1)] = Regexp.last_match(2)
                 when %r{^LOG (.+) version ([0-9.]+)$} then data['product_name'] = Regexp.last_match(1);data['product_version'] = Regexp.last_match(2)
                 when %r{^LOG Initializing FASP version ([^,]+),} then data['ascp_version'] = Regexp.last_match(1)
@@ -891,7 +906,7 @@ module Aspera
           when :file
             return Main.result_status(@option_config_file)
           when :email_test
-            send_email_template({},EMAIL_TEST_TEMPLATE)
+            send_email_template(email_template_default: EMAIL_TEST_TEMPLATE)
             return Main.result_nothing
           when :smtp_settings
             return {type: :single_object, data: email_settings}
@@ -924,46 +939,7 @@ module Aspera
             end
             save_presets_to_config_file
             return Main.result_status('Done')
-          when :vault
-            command = options.get_next_command(%i[init list get set delete])
-            case command
-            when :init
-              type = options.get_option(:value)
-              case type
-              when 'config',NilClass
-                raise 'default secrets already exists' if @config_presets.has_key?(CONF_PRESET_SECRETS)
-                @config_presets[CONF_PRESET_SECRETS] = {}
-                set_global_default(:secrets,"@preset:#{CONF_PRESET_SECRETS}")
-              else raise 'no such vault type'
-              end
-              return Main.result_status('Done')
-            when :list
-              return {type: :object_list, data: vault.list}
-            when :set
-              # register url option
-              BasicAuthPlugin.register_options(@agents)
-              username = options.get_option(:username,is_type: :mandatory)
-              url = options.get_option(:url,is_type: :mandatory)
-              description = options.get_option(:value)
-              secret = options.get_next_argument('secret')
-              vault.set(username: username, url: url, description: description, secret: secret)
-              save_presets_to_config_file if vault.is_a?(Keychain::EncryptedHash)
-              return Main.result_status('Done')
-            when :get
-              # register url option
-              BasicAuthPlugin.register_options(@agents)
-              username = options.get_option(:username,is_type: :mandatory)
-              url = options.get_option(:url)
-              result = vault.get(username: username, url: url)
-              return {type: :single_object, data: result}
-            when :delete
-              # register url option
-              BasicAuthPlugin.register_options(@agents)
-              username = options.get_option(:username,is_type: :mandatory)
-              url = options.get_option(:url)
-              vault.delete(username: username, url: url)
-              return Main.result_status('Done')
-            end
+          when :vault then execute_vault
           else raise 'INTERNAL ERROR: wrong case'
           end
         end
@@ -992,21 +968,21 @@ module Aspera
           Kernel.binding
         end
 
-        def send_email_template(vars,email_template_default=nil)
-          vars[:to] ||= options.get_option(:notif_to,is_type: :mandatory)
+        def send_email_template(email_template_default: nil, values: {})
+          values[:to] ||= options.get_option(:notif_to,is_type: :mandatory)
           notif_template = options.get_option(:notif_template,is_type: email_template_default.nil? ? :mandatory : :optional) || email_template_default
           mail_conf = email_settings
-          vars[:from_name] ||= mail_conf[:from_name]
-          vars[:from_email] ||= mail_conf[:from_email]
+          values[:from_name] ||= mail_conf[:from_name]
+          values[:from_email] ||= mail_conf[:from_email]
           %i[from_name from_email].each do |n|
-            raise "Missing email parameter: #{n}" unless vars.has_key?(n)
+            raise "Missing email parameter: #{n}" unless values.has_key?(n)
           end
           start_options = [mail_conf[:domain]]
           start_options.push(mail_conf[:username],mail_conf[:password],:login) if mail_conf.has_key?(:username) && mail_conf.has_key?(:password)
-          # create a binding with only variables defined in vars
+          # create a binding with only variables defined in values
           template_binding = empty_binding
           # add variables to binding
-          vars.each do |k,v|
+          values.each do |k,v|
             raise "key (#{k.class}) must be Symbol" unless k.is_a?(Symbol)
             template_binding.local_variable_set(k,v)
           end
@@ -1016,17 +992,17 @@ module Aspera
           smtp = Net::SMTP.new(mail_conf[:server], mail_conf[:port])
           smtp.enable_starttls if mail_conf[:tls]
           smtp.start(*start_options) do |smtp_session|
-            smtp_session.send_message(msg_with_headers, vars[:from_email], vars[:to])
+            smtp_session.send_message(msg_with_headers, values[:from_email], values[:to])
           end
         end
 
         def save_presets_to_config_file
           raise 'no configuration loaded' if @config_presets.nil?
           FileUtils.mkdir_p(@main_folder) unless Dir.exist?(@main_folder)
-          File.chmod(0700,@main_folder)
           Log.log.debug("Writing #{@option_config_file}")
           File.write(@option_config_file,@config_presets.to_yaml)
-          File.chmod(0600,@option_config_file)
+          Environment.restrict_file_access(@main_folder)
+          Environment.restrict_file_access(@option_config_file)
         end
 
         # returns [String] name if config_presets has default
@@ -1051,25 +1027,65 @@ module Aspera
           return nil
         end # get_plugin_default_config_name
 
+        ALLOWED_KEYS=%i[password username description].freeze
+        def execute_vault
+          command = options.get_next_command(%i[list show create delete password])
+          case command
+          when :list
+            return {type: :object_list, data: vault.list}
+          when :show
+            return {type: :single_object, data: vault.get(label: options.get_next_argument('label'))}
+          when :create
+            label=options.get_next_argument('label')
+            info=options.get_next_argument('info Hash')
+            raise 'info must be Hash' unless info.is_a?(Hash)
+            info=info.symbolize_keys
+            info[:label]=label
+            vault.set(info)
+            return Main.result_status('Password added')
+          when :delete
+            vault.delete(label: options.get_next_argument('label'))
+            return Main.result_status('Password deleted')
+          when :password
+            raise 'Vault does not support password change' unless vault.respond_to?(:password=)
+            new_password=options.get_next_argument('new_password')
+            vault.password=new_password
+            vault.save
+            return Main.result_status('Password updated')
+          end
+        end
+
+        def vault_value(name)
+          m=name.match(/^(.+)\.(.+)$/)
+          raise 'vault name shall match <name>.<param>' if m.nil?
+          info=vault.get(label: m[1])
+          #raise "no such vault entry: #{m[1]}" if info.nil?
+          value=info[m[2].to_sym]
+          raise "no such entry value: #{m[2]}" if value.nil?
+          return value
+        end
+
         def vault
           if @vault.nil?
-            vault_info = options.get_option(:secrets)
-            case vault_info
-            when Hash
-              @vault = Keychain::EncryptedHash.new(vault_info)
-            when /^system/
-              name = vault_info.start_with?('system:') ? vault_info[7..-1] : nil
+            vault_info = options.get_option(:vault) || {'type'=>'file','name'=>'vault.bin'}
+            vault_password = options.get_option(:vault_password,is_type: :mandatory)
+            raise 'vault must be Hash' unless vault_info.is_a?(Hash)
+            vault_type = vault_info['type'] || 'file'
+            vault_name = vault_info['name'] || (vault_type.eql?('file') ? 'vault.bin' : PROGRAM_NAME)
+            case vault_type
+            when 'file'
+              vault_path=vault_name
+              @vault = Keychain::EncryptedHash.new(vault_path,vault_password)
+            when 'system'
               case Environment.os
               when Environment::OS_X
-                @vault = Keychain::MacosSecurity.new(name)
+                @vault = Keychain::MacosSystem.new(vault_name,vault_password)
               when Environment::OS_WINDOWS,Environment::OS_LINUX,Environment::OS_AIX
                 raise 'not implemented'
-              else raise 'Error'
+              else raise 'Error, OS not supported'
               end
-            when NilClass
-              # keep nil
             else
-              raise CliBadArgument,'secrets shall be Hash'
+              raise CliBadArgument,"Unknown vault type: #{vault_type}"
             end
           end
           raise 'No vault defined' if @vault.nil?

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

@@ -56,7 +56,7 @@ module Aspera
           # extract elements from anonymous faspex link
           def get_link_data(publink)
             publink_uri = URI.parse(publink)
-            raise CliBadArgument, 'public link does not match Faspex format' unless (m = publink_uri.path.match(/^(.*)\/(external.*)$/))
+            raise CliBadArgument, 'Public link does not match Faspex format' unless (m = publink_uri.path.match(/^(.*)\/(external.*)$/))
             base = m[1]
             subpath = m[2]
             port_add = publink_uri.port.eql?(publink_uri.default_port) ? '' : ":#{publink_uri.port}"
@@ -236,7 +236,7 @@ module Aspera
           begin
             pkgdatares = JSON.parse("[#{pkgdatares}]")
           rescue JSON::ParserError # => e
-            raise 'Link not valid'
+            raise 'Unexpected response: missing metadata ?'
           end
           return pkgdatares.first
         end
@@ -357,7 +357,7 @@ module Aspera
                   headers: {'Accept' => 'application/xml'})
                 if !pkgdatares[:http].body.start_with?('<?xml ')
                   OpenApplication.instance.uri(link_url)
-                  raise CliError, 'no such package'
+                  raise CliError, 'Unexpected response: package not found ?'
                 end
                 package_entry = XmlSimple.xml_in(pkgdatares[:http].body, {'ForceArray' => false})
                 Log.dump(:package_entry,package_entry)

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

@@ -82,12 +82,14 @@ module Aspera
           end
         end
 
-        ACTIONS = %i[health package admin user].freeze
+        ACTIONS = %i[health version user bearer_token package admin].freeze
 
         def execute_action
           set_api
           command = options.get_next_command(ACTIONS)
           case command
+          when :version
+            return { type: :single_object, data: @api_v5.read('version')[:data] }
           when :health
             nagios = Nagios.new
             begin
@@ -110,6 +112,8 @@ module Aspera
                 return Main.result_status('modified')
               end
             end
+          when :bearer_token
+            return {type: :text,data: @api_v5.oauth_token}
           when :package
             command = options.get_next_command(%i[list show send receive])
             case command

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

@@ -427,6 +427,7 @@ module Aspera
           raise 'ERR'
         end # execute_node_gen4_command
 
+        # This is older API
         def execute_async
           command = options.get_next_command(%i[list delete files show counters bandwidth])
           unless command.eql?(:list)
@@ -504,13 +505,27 @@ module Aspera
           end
         end
 
-        ACTIONS = %i[postprocess stream transfer cleanup forward access_key watch_folder service async central asperabrowser basic_token].concat(COMMON_ACTIONS).freeze
+        ACTIONS = %i[postprocess stream transfer cleanup forward access_key watch_folder service async sync central asperabrowser
+                     basic_token].concat(COMMON_ACTIONS).freeze
 
         def execute_action(command=nil,prefix_path=nil)
           command ||= options.get_next_command(ACTIONS)
           case command
           when *COMMON_ACTIONS then return execute_simple_common(command,prefix_path)
           when :async then return execute_async
+          when :sync
+            sync_command = options.get_next_command([Plugin::ALL_OPS,%i[bandwidth counters files start state stop summary]].flatten-%i[modify])
+            case sync_command
+            when *Plugin::ALL_OPS then return entity_command(sync_command,@api_node,'asyncs',item_list_key: 'ids')
+            else
+              parameters = options.get_option(:value)
+              asyncs_id=instance_identifier
+              if %i[start stop].include?(sync_command)
+                @api_node.create("asyncs/#{asyncs_id}/#{sync_command}",parameters)
+                return Main.result_status('ok')
+              end
+              return { type: :single_object, data: @api_node.read("asyncs/#{asyncs_id}/#{sync_command}",parameters)[:data] }
+            end
           when :stream
             command = options.get_next_command(%i[list create show modify cancel])
             case command
@@ -545,7 +560,9 @@ module Aspera
             case command
             when :list
               # could use ? subpath: 'transfers'
-              resp = @api_node.read(res_class_path,options.get_option(:value))
+              query=options.get_option(:value) || options.get_option(:query)
+              raise 'Query must be a Hash' unless query.nil? || query.is_a?(Hash)
+              resp = @api_node.read(res_class_path,query)
               return {
                 type:   :object_list,
                 data:   resp[:data],
@@ -635,8 +652,11 @@ module Aspera
               when :list
                 request_data.deep_merge!({'validation' => validation}) unless validation.nil?
                 resp = @api_node.create('services/rest/transfers/v1/sessions',request_data)
-                return { type: :object_list, data: resp[:data]['session_info_result']['session_info'],
-fields: %w[session_uuid status transport direction bytes_transferred]}
+                return {
+                  type:   :object_list,
+                  data:   resp[:data]['session_info_result']['session_info'],
+                  fields: %w[session_uuid status transport direction bytes_transferred]
+                }
               end
             when :file
               command = options.get_next_command(%i[list modify])

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

@@ -397,7 +397,7 @@ module Aspera
                 Log.log.warn("unknown entry type: #{entry['type']}")
               end
             rescue StandardError => e
-              Log.log.warn("An error occured: #{e}, ignoring")
+              Log.log.warn("An error occurred: #{e}, ignoring")
             end
           end
         end

data/lib/aspera/cli/transfer_agent.rb

@@ -3,6 +3,7 @@
 require 'aspera/fasp/transfer_spec'
 require 'aspera/cli/listener/logger'
 require 'aspera/cli/listener/progress_multi'
+require 'aspera/cli/info'
 
 module Aspera
   module Cli
@@ -230,11 +231,11 @@ module Aspera
         global_status = self.class.session_status(statuses)
         email_vars = {
           global_transfer_status: global_status,
-          subject:                "ascli transfer: #{global_status}",
+          subject:                "#{PROGRAM_NAME} transfer: #{global_status}",
           body:                   "Transfer is: #{global_status}",
           ts:                     transfer_spec
         }
-        @config.send_email_template(email_vars,DEFAULT_TRANSFER_NOTIF_TMPL)
+        @config.send_email_template(email_template_default: DEFAULT_TRANSFER_NOTIF_TMPL, values: email_vars)
       end
 
       # shut down if agent requires it

data/lib/aspera/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Aspera
   module Cli
-    VERSION = '4.9.0'
+    VERSION = '4.10.0'
   end
 end