aspera-cli 4.16.0 → 4.17.0

data/lib/aspera/resumer.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'singleton'
+require 'aspera/log'
+require 'aspera/assert'
+
+module Aspera
+  # implements a simple resume policy
+  class Resumer
+    # list of supported parameters and default values
+    DEFAULTS = {
+      iter_max:      7,
+      sleep_initial: 2,
+      sleep_factor:  2,
+      sleep_max:     60
+    }.freeze
+
+    # @param params see DEFAULTS
+    def initialize(params=nil)
+      @parameters = DEFAULTS.dup
+      if !params.nil?
+        Aspera.assert_type(params, Hash)
+        params.each do |k, v|
+          Aspera.assert_values(k, DEFAULTS.keys){'resume parameter'}
+          Aspera.assert_type(v, Integer){k}
+          @parameters[k] = v
+        end
+      end
+      Log.log.debug{"resume params=#{@parameters}"}
+    end
+
+    # calls block a number of times (resumes) until success or limit reached
+    # this is re-entrant, one resumer can handle multiple transfers in //
+    def execute_with_resume
+      Aspera.assert(block_given?)
+      # maximum of retry
+      remaining_resumes = @parameters[:iter_max]
+      sleep_seconds = @parameters[:sleep_initial]
+      Log.log.debug{"retries=#{remaining_resumes}"}
+      # try to send the file until ascp is successful
+      loop do
+        Log.log.debug('transfer starting')
+        begin
+          # call provided block
+          yield
+          # exit retry loop if success
+          break
+        rescue Transfer::Error => e
+          Log.log.warn{"An error occurred during transfer: #{e.message}"}
+          # failure in ascp
+          if e.retryable?
+            # exit if we exceed the max number of retry
+            raise Transfer::Error, "Maximum number of retry reached (#{@parameters[:iter_max]})" if remaining_resumes <= 0
+          else
+            # give one chance only to non retryable errors
+            unless remaining_resumes.eql?(@parameters[:iter_max])
+              Log.log.error('non-retryable error'.red.blink)
+              raise e
+            end
+          end
+        end
+
+        # take this retry in account
+        remaining_resumes -= 1
+        Log.log.warn{"Resuming in #{sleep_seconds} seconds (retry left:#{remaining_resumes})"}
+
+        # wait a bit before retrying, maybe network condition will be better
+        sleep(sleep_seconds)
+
+        # increase retry period
+        sleep_seconds *= @parameters[:sleep_factor]
+        # cap value
+        sleep_seconds = @parameters[:sleep_max] if sleep_seconds > @parameters[:sleep_max]
+      end # loop
+    end
+  end
+end

data/lib/aspera/ssh.rb

@@ -3,7 +3,7 @@
 require 'net/ssh'
 
 if ENV.fetch('ASCLI_ENABLE_ED25519', 'false').eql?('false')
-  # HACK: deactivate ed25519 and ecdsa private keys from ssh identities, as it usually cause problems
+  # HACK: deactivate ed25519 and ecdsa private keys from SSH identities, as it usually causes problems
   old_verbose = $VERBOSE
   $VERBOSE = nil
   begin
@@ -14,6 +14,11 @@ if ENV.fetch('ASCLI_ENABLE_ED25519', 'false').eql?('false')
   $VERBOSE = old_verbose
 end
 
+if RUBY_ENGINE == 'jruby' && ENV.fetch('ASCLI_ENABLE_ECDSHA2', 'false').eql?('false')
+  Net::SSH::Transport::Algorithms::ALGORITHMS.each_value { |a| a.reject! { |a| a =~ /^ecd(sa|h)-sha2/ } }
+  Net::SSH::KnownHosts::SUPPORTED_TYPE.reject! { |t| t =~ /^ecd(sa|h)-sha2/ }
+end
+
 module Aspera
   # A simple wrapper around Net::SSH
   # executes one command and get its result from stdout

data/lib/aspera/{fasp → transfer}/error.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'aspera/fasp/error_info'
+require 'aspera/transfer/error_info'
 
 module Aspera
-  module Fasp
+  module Transfer
     # error raised if transfer fails
     class Error < StandardError
       attr_reader :err_code
@@ -14,7 +14,7 @@ module Aspera
       end
 
       def info
-        r = Fasp::ERROR_INFO[@err_code] || {r: false, c: 'UNKNOWN', m: 'unknown', a: 'unknown'}
+        r = ERROR_INFO[@err_code] || {r: false, c: 'UNKNOWN', m: 'unknown', a: 'unknown'}
         return r.merge({i: @err_code})
       end
 

data/lib/aspera/{fasp → transfer}/error_info.rb

@@ -3,7 +3,7 @@
 # cspell:words mnemo PROTO RCVR NOLIC PMTU BRTT VLINK BWMEAS SSEAR FIPS
 
 module Aspera
-  module Fasp
+  module Transfer
     # from https://www.google.com/search?q=FASP+error+codes
     # Note that the fact that an error is retry-able is not internally defined by protocol, it's client-side responsibility
     # rubocop:disable Layout/MultilineHashKeyLineBreaks

data/lib/aspera/{fasp → transfer}/faux_file.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Aspera
-  module Fasp
+  module Transfer
     # generates a pseudo file stream
     class FauxFile
       # marker for faux file

data/lib/aspera/{fasp → transfer}/parameters.rb

@@ -4,19 +4,19 @@ require 'aspera/log'
 require 'aspera/assert'
 require 'aspera/command_line_builder'
 require 'aspera/temp_file_manager'
-require 'aspera/fasp/error'
-require 'aspera/fasp/installation'
+require 'aspera/transfer/error'
+require 'aspera/transfer/spec'
+require 'aspera/ascp/installation'
 require 'aspera/cli/formatter'
 require 'aspera/rest'
 require 'securerandom'
 require 'base64'
 require 'json'
-require 'yaml'
 require 'fileutils'
 require 'openssl'
 
 module Aspera
-  module Fasp
+  module Transfer
     # translate transfer specification to ascp parameter list
     class Parameters
       # Agents shown in manual for parameters (sub list)
@@ -25,7 +25,7 @@ module Aspera
       SUPPORTED_AGENTS_SHORT = SUPPORTED_AGENTS.map{|a|a.to_s[0].to_sym}
       FILE_LIST_OPTIONS = ['--file-list', '--file-pair-list'].freeze
       # options that can be provided to the constructor, and then in @options
-      SUPPORTED_OPTIONS = %i[ascp_args wss check_ignore quiet trusted_certs].freeze
+      SUPPORTED_OPTIONS = %i[ascp_args wss check_ignore_cb quiet trusted_certs].freeze
 
       private_constant :SUPPORTED_AGENTS, :FILE_LIST_OPTIONS, :SUPPORTED_OPTIONS
 
@@ -34,22 +34,12 @@ module Aspera
         # because of garbage collection takes any file there
         # this could be refined, as , for instance, on macos, temp folder is already user specific
         @file_list_folder = TempFileManager.instance.new_file_path_global('asession_filelists') # cspell:disable-line
-        @param_description_cache = nil
-        # @return normalized description of transfer spec parameters, direct from yaml
-        def description
-          if @param_description_cache.nil?
-            # config file in same folder with same name as this source
-            description_from_yaml = YAML.load_file("#{__FILE__[0..-3]}yaml")
-            @param_description_cache = Aspera::CommandLineBuilder.normalize_description(description_from_yaml)
-          end
-          return @param_description_cache
-        end
 
         # @param to_text [bool] replace HTML entities with text equivalent
         # @return a table suitable to display in manual
         def man_table
           result = []
-          description.each do |name, options|
+          Spec::DESCRIPTION.each do |name, options|
             param = {name: name, type: [options[:accepted_types]].flatten.join(','), description: options[:desc]}
             # add flags for supported agents in doc
             SUPPORTED_AGENTS.each do |a|
@@ -85,13 +75,7 @@ module Aspera
             param[:description] = param[:description].gsub('/', '\\')
             result.push(param)
           end
-          return result.sort do |a, b|
-            if a[:name].start_with?('EX_').eql?(b[:name].start_with?('EX_'))
-              a[:name] <=> b[:name]
-            else
-              b[:name] <=> a[:name]
-            end
-          end
+          return result.sort_by { |a| a[:name] }
         end
 
         # special encoding methods used in YAML (key: :convert)
@@ -104,13 +88,9 @@ module Aspera
         def convert_base64(v); Base64.strict_encode64(v); end
 
         # file list is provided directly with ascp arguments
-        def ts_has_ascp_file_list(ts, ascp_args)
-          # it can also be option transfer_info
-          ascp_args = ascp_args['ascp_args'] if ascp_args.is_a?(Hash)
-          (ts['EX_ascp_args'].is_a?(Array) && ts['EX_ascp_args'].any?{|i|FILE_LIST_OPTIONS.include?(i)}) ||
-            (ascp_args.is_a?(Array) && ascp_args.any?{|i|FILE_LIST_OPTIONS.include?(i)}) ||
-            ts.key?('EX_file_list') ||
-            ts.key?('EX_file_pair_list')
+        # @param ascp_args [Array,NilClass] ascp arguments
+        def ascp_args_file_list?(ascp_args)
+          ascp_args&.any?{|i|FILE_LIST_OPTIONS.include?(i)}
         end
 
         # temp file list files are created here
@@ -127,67 +107,56 @@ module Aspera
 
       # @param options [Hash] key: :wss: bool, :ascp_args: array of strings
       def initialize(job_spec, options)
-        assert_type(job_spec, Hash)
-        assert_type(options, Hash)
+        Aspera.assert_type(job_spec, Hash)
+        Aspera.assert_type(options, Hash)
         @job_spec = job_spec
         # check necessary options
         missing_options = SUPPORTED_OPTIONS - options.keys
-        assert(missing_options.empty?){"missing options: #{missing_options.join(', ')}"}
+        Aspera.assert(missing_options.empty?){"missing options: #{missing_options.join(', ')}"}
         @options = SUPPORTED_OPTIONS.each_with_object({}){|o, h| h[o] = options[o]}
         Log.log.debug{Log.dump(:parameters_options, @options)}
         Log.log.debug{Log.dump(:dismiss_options, options.keys - SUPPORTED_OPTIONS)}
-        assert_type(@options[:ascp_args], Array){'ascp_args'}
-        assert(@options[:ascp_args].all?(String)){'ascp arguments must Strings'}
-        @builder = Aspera::CommandLineBuilder.new(@job_spec, self.class.description)
+        Aspera.assert_type(@options[:ascp_args], Array){'ascp_args'}
+        Aspera.assert(@options[:ascp_args].all?(String)){'ascp arguments must Strings'}
+        @builder = CommandLineBuilder.new(@job_spec, Spec::DESCRIPTION)
       end
 
       # either place source files on command line, or add file list file
       def process_file_list
-        # is the file list provided through EX_ parameters?
-        ascp_file_list_provided = self.class.ts_has_ascp_file_list(@job_spec, @options[:ascp_args])
+        # is the file list provided through ascp parameters?
+        ascp_file_list_provided = self.class.ascp_args_file_list?(@options[:ascp_args])
         # set if paths is mandatory in ts
         @builder.params_definition['paths'][:mandatory] = !@job_spec.key?('keepalive') && !ascp_file_list_provided # cspell:words keepalive
         # get paths in transfer spec (after setting if it is mandatory)
         ts_paths_array = @builder.read_param('paths')
-        if ascp_file_list_provided && !ts_paths_array.nil?
-          raise 'file list provided both in transfer spec and ascp file list. Remove one of them.'
-        end
-        # option 1: EX_file_list
-        file_list_file = @builder.read_param('EX_file_list')
-        if file_list_file.nil?
-          # option 2: EX_file_pair_list
-          file_list_file = @builder.read_param('EX_file_pair_list')
-          if !file_list_file.nil?
-            option = '--file-pair-list'
-          elsif !ts_paths_array.nil?
-            # option 3: in TS, it is an array
-            if self.class.file_list_folder.nil?
-              # not safe for special characters ? (maybe not, depends on OS)
-              Log.log.debug('placing source file list on command line (no file list file)')
-              @builder.add_command_line_options(ts_paths_array.map{|i|i['source']})
+        file_list_option = nil
+        # transfer spec contains paths ?
+        if !ts_paths_array.nil?
+          Aspera.assert(!ascp_file_list_provided){'file list provided both in transfer spec and ascp file list. Remove one of them.'}
+          Aspera.assert(ts_paths_array.all?{|i|i.key?('source')}){"All elements of paths must have a 'source' key"}
+          is_pair_list = ts_paths_array.any?{|i|i.key?('destination')}
+          raise "All elements of paths must be consistent with 'destination' key" if is_pair_list && !ts_paths_array.all?{|i|i.key?('destination')}
+          if self.class.file_list_folder.nil?
+            Aspera.assert(!is_pair_list){'file pair list is not supported when file list folder is not set'}
+            # not safe for special characters ? (maybe not, depends on OS)
+            Log.log.debug('placing source file list on command line (no file list file)')
+            @builder.add_command_line_options(ts_paths_array.map{|i|i['source']})
+          else
+            # safer option: generate a file list file if there is storage defined for it
+            if is_pair_list
+              file_list_option = '--file-pair-list'
+              lines = ts_paths_array.each_with_object([]){|e, m|m.push(e['source'], e['destination']) }
             else
-              assert(ts_paths_array.all?{|i|i.key?('source')}){"All elements of paths must have a 'source' key"}
-              is_pair_list = ts_paths_array.any?{|i|i.key?('destination')}
-              raise "All elements of paths must be consistent with 'destination' key" if is_pair_list && !ts_paths_array.all?{|i|i.key?('destination')}
-              # safer option: generate a file list file if there is storage defined for it
-              # if there is one destination in paths, then use file-pair-list
-              if is_pair_list
-                option = '--file-pair-list'
-                lines = ts_paths_array.each_with_object([]){|e, m|m.push(e['source'], e['destination'] || e['source']) }
-              else
-                option = '--file-list'
-                lines = ts_paths_array.map{|i|i['source']}
-              end
-              file_list_file = Aspera::TempFileManager.instance.new_file_path_in_folder(self.class.file_list_folder)
-              Log.log.debug{Log.dump(:file_list, lines)}
-              File.write(file_list_file, lines.join("\n"), encoding: 'UTF-8')
-              Log.log.debug{"#{option}=\n#{File.read(file_list_file)}".red}
+              file_list_option = '--file-list'
+              lines = ts_paths_array.map{|i|i['source']}
             end
+            file_list_file = TempFileManager.instance.new_file_path_in_folder(self.class.file_list_folder)
+            Log.log.debug{Log.dump(:file_list, lines)}
+            File.write(file_list_file, lines.join("\n"), encoding: 'UTF-8')
+            Log.log.debug{"#{file_list_option}=\n#{File.read(file_list_file)}".red}
           end
-        else
-          option = '--file-list'
         end
-        @builder.add_command_line_options(["#{option}=#{file_list_file}"]) unless option.nil?
+        @builder.add_command_line_options(["#{file_list_option}=#{file_list_file}"]) unless file_list_option.nil?
       end
 
       def remote_certificates
@@ -200,31 +169,32 @@ module Aspera
           # This will need to be cleaned up in aspera core
           @job_spec['ssh_port'] = @builder.read_param('wss_port')
           @job_spec.delete('fasp_port')
-          @job_spec.delete('EX_ssh_key_paths')
           @job_spec.delete('sshfp')
+          # set location for CA bundle to be the one of Ruby, see env var SSL_CERT_FILE / SSL_CERT_DIR
+          certificates_to_use.concat(@options[:trusted_certs]) if @options[:trusted_certs].is_a?(Array)
           # ignore cert for wss ?
-          if @options[:check_ignore]&.call(@job_spec['remote_host'], @job_spec['wss_port'])
+          if @options[:check_ignore_cb]&.call(@job_spec['remote_host'], @job_spec['wss_port'])
             wss_cert_file = TempFileManager.instance.new_file_path_global('wss_cert')
             wss_url = "https://#{@job_spec['remote_host']}:#{@job_spec['wss_port']}"
-            File.write(wss_cert_file, Rest.remote_certificates(wss_url))
-            certificates_to_use.push(wss_cert_file)
+            File.write(wss_cert_file, Rest.remote_certificate_chain(wss_url))
+            # place in front, as more priority
+            certificates_to_use.unshift(wss_cert_file)
           end
-          # set location for CA bundle to be the one of Ruby, see env var SSL_CERT_FILE / SSL_CERT_DIR
-          certificates_to_use.concat(@options[:trusted_certs]) if @options[:trusted_certs]
+          # when wss is used, only first `-i` is used... Hum...
+          certificates_to_use = [certificates_to_use.first] unless certificates_to_use.empty?
         else
           # remove unused parameter (avoid warning)
           @job_spec.delete('wss_port')
           # add SSH bypass keys when authentication is token and no auth is provided
           if @job_spec.key?('token') && !@job_spec.key?('remote_password')
-            # @job_spec['remote_password'] = Installation.instance.ssh_cert_uuid # not used: no passphrase
-            certificates_to_use.concat(Installation.instance.aspera_token_ssh_key_paths)
+            # @job_spec['remote_password'] = Ascp::Installation.instance.ssh_cert_uuid # not used: no passphrase
+            certificates_to_use.concat(Ascp::Installation.instance.aspera_token_ssh_key_paths)
           end
         end
         return certificates_to_use
       end
 
       # translate transfer spec to env vars and command line arguments for ascp
-      # NOTE: parameters starting with "EX_" (extended) are not standard
       def ascp_args
         env_args = {
           args:         [],
@@ -236,11 +206,11 @@ module Aspera
         @job_spec.delete('source_root') if @job_spec.key?('source_root') && @job_spec['source_root'].empty?
 
         # notify multi-session was already used, anyway it was deleted by agent direct
-        assert(!@builder.read_param('multi_session'))
+        Aspera.assert(!@builder.read_param('multi_session'))
 
         # add ssh or wss certificates
-        remote_certificates.each do |cert|
-          Log.log.trace1{"adding certificate: #{cert}"}
+        # (reverse, to keep order, as we unshift)
+        remote_certificates.reverse_each do |cert|
           env_args[:args].unshift('-i', cert)
         end
 
@@ -248,7 +218,7 @@ module Aspera
         @builder.process_params
 
         base64_destination = false
-        # symbol must be index of Installation.paths
+        # symbol must be index of Ascp::Installation.paths
         if @builder.read_param('use_ascp4')
           env_args[:ascp_version] = :ascp4
         else
@@ -258,7 +228,6 @@ module Aspera
         # destination will be base64 encoded, put this before source path arguments
         @builder.add_command_line_options(['--dest64']) if base64_destination
         # optional arguments, at the end to override previous ones (to allow override)
-        @builder.add_command_line_options(@builder.read_param('EX_ascp_args'))
         @builder.add_command_line_options(@options[:ascp_args])
         # get list of source files to transfer and build arg for ascp
         process_file_list
@@ -272,8 +241,8 @@ module Aspera
         env_args[:args].unshift('-q') if @options[:quiet]
         # add fallback cert and key as arguments if needed
         if ['1', 1, true, 'force'].include?(@job_spec['http_fallback'])
-          env_args[:args].unshift('-Y', Installation.instance.path(:fallback_private_key))
-          env_args[:args].unshift('-I', Installation.instance.path(:fallback_certificate))
+          env_args[:args].unshift('-Y', Ascp::Installation.instance.path(:fallback_private_key))
+          env_args[:args].unshift('-I', Ascp::Installation.instance.path(:fallback_certificate))
         end
         Log.log.debug{"ascp args: #{env_args}"}
         return env_args

data/lib/aspera/{fasp/transfer_spec.rb → transfer/spec.rb}

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require 'aspera/fasp/parameters'
+require 'aspera/command_line_builder'
 require 'aspera/assert'
+require 'yaml'
 
 module Aspera
-  module Fasp
+  module Transfer
     # parameters for Transfer Spec
-    class TransferSpec
+    class Spec
       # default transfer username for access key based transfers
       ACCESS_KEY_TRANSFER_USER = 'xfer'
       SSH_PORT = 33_001
@@ -18,35 +19,36 @@ module Aspera
       }.freeze
       # reserved tag for Aspera
       TAG_RESERVED = 'aspera'
-      # define constants for enums of parameters: <parameter>_<enum>, e.g. CIPHER_AES_128, DIRECTION_SEND, ...
-      Aspera::Fasp::Parameters.description.each do |name, description|
-        next unless description[:enum].is_a?(Array)
-        TransferSpec.const_set("#{name.to_s.upcase}_ENUM_VALUES", description[:enum])
-        description[:enum].each do |enum|
-          TransferSpec.const_set("#{name.to_s.upcase}_#{enum.upcase.gsub(/[^A-Z0-9]/, '_')}", enum.freeze)
-        end
-      end
       class << self
         def action_to_direction(tspec, command)
-          assert_type(tspec, Hash){'transfer spec'}
+          Aspera.assert_type(tspec, Hash){'transfer spec'}
           tspec['direction'] = case command.to_sym
           when :upload then DIRECTION_SEND
           when :download then DIRECTION_RECEIVE
-          else error_unexpected_value(command.to_sym)
+          else Aspera.error_unexpected_value(command.to_sym)
           end
           return tspec
         end
 
         def action(tspec)
-          assert_type(tspec, Hash){'transfer spec'}
-          assert_values(tspec['direction'], [DIRECTION_SEND, DIRECTION_RECEIVE]){'direction'}
+          Aspera.assert_type(tspec, Hash){'transfer spec'}
+          Aspera.assert_values(tspec['direction'], [DIRECTION_SEND, DIRECTION_RECEIVE]){'direction'}
           case tspec['direction']
           when DIRECTION_SEND then :upload
           when DIRECTION_RECEIVE then :download
-          else error_unexpected_value(tspec['direction'])
+          else Aspera.error_unexpected_value(tspec['direction'])
           end
         end
       end
+      DESCRIPTION = CommandLineBuilder.normalize_description(YAML.load_file("#{__FILE__[0..-3]}yaml"))
+      # define constants for enums of parameters: <parameter>_<enum>, e.g. CIPHER_AES_128, DIRECTION_SEND, ...
+      DESCRIPTION.each do |name, description|
+        next unless description[:enum].is_a?(Array)
+        const_set(:"#{name.to_s.upcase}_ENUM_VALUES", description[:enum])
+        description[:enum].each do |enum|
+          const_set("#{name.to_s.upcase}_#{enum.upcase.gsub(/[^A-Z0-9]/, '_')}", enum.freeze)
+        end
+      end
     end
   end
 end

data/lib/aspera/{fasp/parameters.yaml → transfer/spec.yaml}

@@ -27,7 +27,7 @@ cipher:
   :cli:
     :type: :opt_with_arg
     :switch: "-c"
-    :convert: Aspera::Fasp::Parameters.convert_remove_hyphen
+    :convert: Aspera::Transfer::Parameters.convert_remove_hyphen
 content_protection:
   :desc: Enable client-side encryption at rest. (CSEAR, content protection)
   :enum:
@@ -424,7 +424,7 @@ tags:
   :cli:
     :type: :opt_with_arg
     :switch: "--tags64"
-    :convert: Aspera::Fasp::Parameters.convert_json64
+    :convert: Aspera::Transfer::Parameters.convert_json64
 target_rate_cap_kbps:
   :desc: Returned by upload/download_setup node API.
   :accepted_types: :int
@@ -479,7 +479,7 @@ source_root:
   :cli:
     :type: :opt_with_arg
     :switch: "--source-prefix64"
-    :convert: Aspera::Fasp::Parameters.convert_base64
+    :convert: Aspera::Transfer::Parameters.convert_base64
 min_rate_cap_kbps:
   :desc: |-
     The highest minimum rate that an incoming transfer can request, in kilobits per second.
@@ -540,7 +540,7 @@ src_base:
   :cli:
     :type: :opt_with_arg
     :switch: "--src-base64"
-    :convert: Aspera::Fasp::Parameters.convert_base64
+    :convert: Aspera::Transfer::Parameters.convert_base64
 preserve_acls:
   :desc: "Preserve access control lists."
   :enum:
@@ -610,34 +610,6 @@ remove_empty_source_directory:
   - :sdk
   :cli:
     :type: :opt_without_arg
-EX_at_rest_password:
-  :desc: Content protection password
-  :deprecation: "(4.13) Use standard spec parameter: content_protection_password"
-  :agents:
-  - :direct
-  :cli:
-    :type: :envvar
-    :variable: ASPERA_SCP_FILEPASS
-EX_proxy_password:
-  :desc: |-
-    Password used for Aspera proxy server authentication.
-    May be overridden by password in URL provided in parameter: proxy.
-
-
-  :deprecation: (4.14) Use env var ASPERA_PROXY_PASS
-  :agents:
-  - :direct
-  :cli:
-    :type: :envvar
-    :variable: ASPERA_PROXY_PASS
-EX_license_text:
-  :desc: "License file text override.\nBy default ascp looks for license file near executable."
-  :deprecation: (4.14) Use env var ASPERA_SCP_LICENSE
-  :agents:
-  - :direct
-  :cli:
-    :type: :envvar
-    :variable: ASPERA_SCP_LICENSE
 keepalive:
   :desc: The session is running in persistent session mode.
   :agents:
@@ -663,49 +635,6 @@ sshfp:
   :cli:
     :type: :opt_with_arg
     :switch: "--check-sshfp"
-EX_http_proxy_url:
-  :desc: Specify the proxy server address used by HTTP Fallback
-  :deprecation: (4.14) TODO, use proxy option ?
-  :agents:
-  - :direct
-  :cli:
-    :type: :opt_with_arg
-    :switch: "-x"
-EX_ssh_key_paths:
-  :desc: Use public key authentication for SSH and specify the private key file paths
-  :deprecation: (4.14) Use option transfer_info.ascp_args
-  :accepted_types: :array
-  :agents:
-  - :direct
-  :cli:
-    :type: :opt_with_arg
-    :switch: "-i"
-EX_http_transfer_jpeg:
-  :desc: HTTP transfers as JPEG file
-  :deprecation: (4.14) Use option transfer_info.ascp_args
-  :accepted_types: :int
-  :default: '0'
-  :agents:
-  - :direct
-  :cli:
-    :type: :opt_with_arg
-    :switch: "-j"
-EX_no_read:
-  :desc: no read source
-  :deprecation: (4.14) Use option transfer_info.ascp_args
-  :agents:
-  - :direct
-  :cli:
-    :type: :opt_without_arg
-    :switch: "--no-read"
-EX_no_write:
-  :desc: no write on destination
-  :deprecation: (4.14) Use option transfer_info.ascp_args
-  :agents:
-  - :direct
-  :cli:
-    :type: :opt_without_arg
-    :switch: "--no-write"
 target_rate_percentage:
   :desc: "TODO: remove ?"
   :cli:
@@ -754,30 +683,6 @@ obfuscate_file_names:
   - :httpgw
   :cli:
     :type: :ignore
-EX_file_list:
-  :desc: source file list
-  :deprecation: (4.14) Use command line file list, or option transfer_info.ascp_args
-  :agents:
-  - :direct
-  :cli:
-    :type: :special
-    :switch: "--file-list"
-EX_file_pair_list:
-  :desc: source file pair list
-  :deprecation: (4.14) Use command line file pair list, or option transfer_info.ascp_args
-  :agents:
-  - :direct
-  :cli:
-    :type: :special
-    :switch: "--file-pair-list"
-EX_ascp_args:
-  :desc: Add native command line arguments to ascp
-  :deprecation: (4.13) Use option transfer_info.ascp_args
-  :accepted_types: :array
-  :agents:
-  - :direct
-  :cli:
-    :type: :special
 wss_enabled:
   :desc: Server has Web Socket service enabled
   :accepted_types: :bool