aspera-cli 4.24.2 → 4.25.0

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

@@ -18,15 +18,22 @@ module Aspera
         MAX_ITEMS = 'max'
         # Special query parameter: `pmax`: max number of pages for list command
         MAX_PAGES = 'pmax'
-        # Special identifier format: look for this name to find where supported
-        REGEX_LOOKUP_ID_BY_FIELD = /^%([^:]+):(.*)$/
 
         class << self
           def declare_options(options)
-            options.declare(:query, 'Additional filter for for some commands (list/delete)', types: [Hash, Array])
+            options.declare(:query, 'Additional filter for for some commands (list/delete)', allowed: [Hash, Array, NilClass])
             options.declare(:property, 'Name of property to set (modify operation)')
-            options.declare(:bulk, 'Bulk operation (only some)', values: :bool, default: :no)
-            options.declare(:bfail, 'Bulk operation error handling', values: :bool, default: :yes)
+            options.declare(:bulk, 'Bulk operation (only some)', allowed: Allowed::TYPES_BOOLEAN, default: false)
+            options.declare(:bfail, 'Bulk operation error handling', allowed: Allowed::TYPES_BOOLEAN, default: true)
+          end
+
+          # @return [Hash,NilClass] `{field:,value:}` if identifier is a percent selector, else `nil`
+          def percent_selector(identifier)
+            Aspera.assert_type(identifier, String)
+            if (m = identifier.match(REGEX_LOOKUP_ID_BY_FIELD))
+              return {field: m[1], value: ExtendedValue.instance.evaluate(m[2], context: "percent selector: #{m[1]}")}
+            end
+            return
           end
         end
 
@@ -41,10 +48,15 @@ module Aspera
         # Global objects
         attr_reader :context
 
+        # @return [Manager]
         def options; @context.options; end
+        # @return [TransferAgent]
         def transfer; @context.transfer; end
+        # @return [Config]
         def config; @context.config; end
+        # @return [Formatter]
         def formatter; @context.formatter; end
+        # @return [PersistencyFolder]
         def persistency; @context.persistency; end
 
         def add_manual_header(has_options = true)
@@ -55,26 +67,17 @@ module Aspera
           options.parser.separator('OPTIONS:') if has_options
         end
 
-        # Must be called AFTER the instance action:
-        # ... folder browse _call_instance_identifier
+        # Resource identifier as positional parameter
         #
         # @param description [String] description of the identifier
-        # @param as_option   [Symbol] option name to use if identifier is an option
         # @param block       [Proc] block to search for identifier based on attribute value
         # @return   [String, Array] identifier or list of ids
-        def instance_identifier(description: 'identifier', as_option: nil, &block)
-          if as_option.nil?
-            res_id = options.get_next_argument(description, multiple: options.get_option(:bulk)) if res_id.nil?
-          else
-            res_id = options.get_option(as_option)
-          end
+        def instance_identifier(description: 'identifier', &block)
+          res_id = options.get_next_argument(description, multiple: options.get_option(:bulk)) if res_id.nil?
           # Can be an Array
-          if res_id.is_a?(String) && (m = res_id.match(REGEX_LOOKUP_ID_BY_FIELD))
-            if block
-              res_id = yield(m[1], ExtendedValue.instance.evaluate(m[2]))
-            else
-              raise Cli::BadArgument, "Percent syntax for #{description} not supported in this context"
-            end
+          if res_id.is_a?(String) && (m = Base.percent_selector(res_id))
+            Aspera.assert(block, type: Cli::BadArgument){"Percent syntax for #{description} not supported in this context"}
+            res_id = yield(m[:field], m[:value])
           end
           return res_id
         end
@@ -133,12 +136,12 @@ module Aspera
         # @param command        [Symbol]  command to execute: create show list modify delete
         # @param display_fields [Array]   fields to display by default
         # @param items_key      [String]  result is in a sub key of the json
-        # @param delete_style   [String]  if set, the delete operation by array in payload
-        # @param id_as_arg      [String]  if set, the id is provided as url argument ?<id_as_arg>=<id>
-        # @param is_singleton   [Boolean] if true, entity is the full path to the resource
-        # @param tclo           [Bool]    if set, :list use paging with total_count, limit, offset
-        # @param block          [Proc]    block to search for identifier based on attribute value
-        # @return result suitable for CLI result
+        # @param delete_style   [String]  If set, the delete operation by array in payload
+        # @param id_as_arg      [String]  If set, the id is provided as url argument ?<id_as_arg>=<id>
+        # @param is_singleton   [Boolean] If `true`, entity is the full path to the resource
+        # @param tclo           [Boolean] If `true`, :list use paging with total_count, limit, offset
+        # @param block          [Proc]    Block to search for identifier based on attribute value
+        # @return [Hash] Result suitable for CLI result
         def entity_execute(
           api:,
           entity:,
@@ -172,12 +175,11 @@ module Aspera
             if !delete_style.nil?
               one_res_id = [one_res_id] unless one_res_id.is_a?(Array)
               Aspera.assert_type(one_res_id, Array, type: Cli::BadArgument)
-              api.call(
-                operation:    'DELETE',
-                subpath:      entity,
+              api.delete(
+                entity,
+                nil,
                 content_type: Rest::MIME_JSON,
-                body:         {delete_style => one_res_id},
-                headers:      {'Accept' => Rest::MIME_JSON}
+                body:         {delete_style => one_res_id}
               )
               return Main.result_status('deleted')
             end
@@ -192,11 +194,10 @@ module Aspera
               data, total = list_entities_limit_offset_total_count(api: api, entity:, items_key: items_key, query: query_read_delete(default: list_query))
               return Main.result_object_list(data, total: total, fields: display_fields)
             end
-            resp = api.call(operation: 'GET', subpath: entity, headers: {'Accept' => Rest::MIME_JSON}, query: query_read_delete)
-            return Main.result_empty if resp[:http].code == '204'
-            data = resp[:data]
+            data, http = api.read(entity, query_read_delete, ret: :both)
+            return Main.result_empty if http.code == '204'
             # TODO: not generic : which application is this for ?
-            if resp[:http]['Content-Type'].start_with?('application/vnd.api+json')
+            if http['Content-Type'].start_with?('application/vnd.api+json')
               Log.log.debug('is vnd.api')
               data = data[entity]
             end
@@ -223,9 +224,8 @@ module Aspera
 
         # Query parameters in URL suitable for REST: list/GET and delete/DELETE
         def query_read_delete(default: nil)
-          query = options.get_option(:query)
           # Dup default, as it could be frozen
-          query = default.dup if query.nil?
+          query = options.get_option(:query) || default.dup
           Log.log.debug{"query_read_delete=#{query}".bg_red}
           begin
             # Check it is suitable
@@ -249,7 +249,7 @@ module Aspera
           value = default if value.nil?
           unless type.nil?
             type = [type] unless type.is_a?(Array)
-            Aspera.assert(type.all?(Class)){"check types must be a Class, not #{type.map(&:class).join(',')}"}
+            Aspera.assert_array_all(type, Class){'check types'}
             if bulk
               Aspera.assert_type(value, Array, type: Cli::BadArgument)
               value.each do |v|
@@ -263,10 +263,10 @@ module Aspera
         end
 
         # Get a (full or partial) list of all entities of a given type with query: offset/limit
-        # @param `api`       [Rest]          the API object
-        # @param `entity`    [String,Symbol] the API endpoint of entity to list
-        # @param `items_key` [String]        key in the result to get the list of items
-        # @param `query`     [Hash,nil]      additional query parameters
+        # @param api       [Rest]          API object
+        # @param entity    [String,Symbol] API endpoint of entity to list
+        # @param items_key [String]        Key in the result to get the list of items (Default: same as `entity`)
+        # @param query     [Hash,nil]      Additional query parameters
         # @return [Array] items, total_count
         def list_entities_limit_offset_total_count(
           api:,
@@ -309,26 +309,39 @@ module Aspera
           return result, total_count
         end
 
-        # Lookup an entity id from its name
-        # @param entity    [String] the type of entity to lookup, by default it is the path, and it is also the field name in result
-        # @param value     [String] the value to lookup
-        # @param field     [String] the field to match, by default it is 'name'
-        # @param items_key [String] key in the result to get the list of items (override entity)
-        # @param query     [Hash]   additional query parameters
+        # Lookup an entity id from its name.
+        # Uses query `q` if `query` is `:default` and `field` is `name`.
+        # @param entity    [String] Type of entity to lookup, by default it is the path, and it is also the field name in result
+        # @param value     [String] Value to lookup
+        # @param field     [String] Field to match, by default it is `'name'`
+        # @param items_key [String] Key in the result to get the list of items (override entity)
+        # @param query     [Hash]   Additional query parameters (Default: `:default`)
         def lookup_entity_by_field(api:, entity:, value:, field: 'name', items_key: nil, query: :default)
           if query.eql?(:default)
             Aspera.assert(field.eql?('name')){'Default query is on name only'}
             query = {'q'=> value}
           end
-          found = list_entities_limit_offset_total_count(api: api, entity: entity, items_key: items_key, query: query).first.select{ |i| i[field].eql?(value)}
-          case found.length
-          when 0 then raise "No #{entity} with #{field} = #{value}"
-          when 1 then return found.first
-          else raise "Found #{found.length} #{entity} with #{field} = #{value}"
-          end
+          lookup_entity_generic(entity: entity, field: field, value: value){list_entities_limit_offset_total_count(api: api, entity: entity, items_key: items_key, query: query).first}
+        end
+
+        # Lookup entity by field and value. Extract single result from list of result returned by block.
+        # @param entity    [String] Type of entity to lookup, by default it is the path, and it is also the field name in result
+        # @param value     [String] Value to lookup
+        # @param field     [String] Field to match, by default it is `'name'`
+        # @param block     [Proc]   Get list of entity matching query.
+        def lookup_entity_generic(entity:, value:, field: 'name', &block)
+          Aspera.assert(block_given?)
+          found = yield
+          Aspera.assert_array_all(found, Hash)
+          found = found.select{ |i| i[field].eql?(value)}
+          return found.first if found.length.eql?(1)
+          raise Cli::BadIdentifier.new(entity, value, field: field, count: found.length)
         end
+
         PER_PAGE_DEFAULT = 1000
-        private_constant :PER_PAGE_DEFAULT
+        # Percent selector: select by this field for this value
+        REGEX_LOOKUP_ID_BY_FIELD = /^%([^:]+):(.*)$/
+        private_constant :PER_PAGE_DEFAULT, :REGEX_LOOKUP_ID_BY_FIELD
       end
     end
   end

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

@@ -10,6 +10,7 @@ require 'aspera/cli/formatter'
 require 'aspera/cli/info'
 require 'aspera/cli/transfer_progress'
 require 'aspera/cli/wizard'
+require 'aspera/cli/sync_actions'
 require 'aspera/ascp/installation'
 require 'aspera/sync/operations'
 require 'aspera/products/transferd'
@@ -29,7 +30,9 @@ require 'aspera/oauth/jwt'
 require 'aspera/log'
 require 'aspera/assert'
 require 'aspera/oauth'
+require 'aspera/ssl'
 require 'openssl'
+require 'digest'
 require 'open3'
 require 'date'
 require 'erb'
@@ -39,6 +42,8 @@ module Aspera
     module Plugins
       # Manage the CLI config file
       class Config < Base
+        include SyncActions
+
         class << self
           # Folder containing plugins in the gem's main folder
           def gem_plugins_folder
@@ -76,7 +81,7 @@ module Aspera
           # We need to defer parsing of options until we have the config file, so we can use @extend with @preset
           super
           @use_plugin_defaults = true
-          @config_presets = nil
+          @config_presets = {}
           @config_checksum_on_disk = nil
           @vault_instance = nil
           @pac_exec = nil
@@ -89,7 +94,7 @@ module Aspera
           @option_cache_tokens = true
           @main_folder = nil
           @option_config_file = nil
-          # Store is used for ruby https
+          # Store is used for ruby https (OpenSSL::X509::Store)
           @certificate_store = nil
           # Paths are used for ascp
           @certificate_paths = nil
@@ -98,7 +103,6 @@ module Aspera
           options.declare(
             :home, 'Home folder for tool',
             handler: {o: self, m: :main_folder},
-            types: String,
             default: self.class.default_app_main_folder(app_name: Info::CMD_NAME)
           )
           options.parse_options!
@@ -118,65 +122,49 @@ module Aspera
           # Read config file (set @config_presets)
           read_config_file
           # Add preset handler (needed for smtp)
-          ExtendedValue.instance.set_handler(EXTEND_PRESET, lambda{ |v| preset_by_name(v)})
-          ExtendedValue.instance.set_handler(EXTEND_VAULT, lambda{ |v| vault_value(v)})
+          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)
           # Vault options
           options.declare(:secret, 'Secret for access keys')
-          options.declare(:vault, 'Vault for secrets', types: Hash, default: {})
+          options.declare(:vault, 'Vault for secrets', allowed: Hash)
           options.declare(:vault_password, 'Vault password')
           options.parse_options!
           # Declare generic plugin options only after handlers are declared
           Base.declare_options(options)
           # Configuration options
-          options.declare(:no_default, 'Do not load default configuration for plugin', values: :none, short: 'N'){@use_plugin_defaults = false}
+          options.declare(:no_default, 'Do not load default configuration for plugin', allowed: Allowed::TYPES_NONE, short: 'N'){@use_plugin_defaults = false}
           options.declare(:preset, 'Load the named option preset from current config file', short: 'P', handler: {o: self, m: :option_preset})
-          options.declare(:version_check_days, 'Period in days to check new version (zero to disable)', coerce: Integer, default: DEFAULT_CHECK_NEW_VERSION_DAYS)
+          options.declare(:version_check_days, 'Period in days to check new version (zero to disable)', allowed: Allowed::TYPES_INTEGER, default: DEFAULT_CHECK_NEW_VERSION_DAYS)
           options.declare(:plugin_folder, 'Folder where to find additional plugins', handler: {o: self, m: :option_plugin_folder})
           # Declare wizard options
           @wizard = Wizard.new(self, @main_folder)
           # Transfer SDK options
-          options.declare(:ascp_path, 'Ascp: Path to ascp', handler: {o: Ascp::Installation.instance, m: :ascp_path})
-          options.declare(:use_product, 'Ascp: Use ascp from specified product', handler: {o: self, m: :option_use_product})
           options.declare(:sdk_url, 'Ascp: URL to get Aspera Transfer Executables', default: SpecialValues::DEF)
-          options.declare(:locations_url, 'Ascp: URL to get locations of Aspera Transfer Daemon', handler: {o: Ascp::Installation.instance, m: :transferd_urls})
-          options.declare(:sdk_folder, 'Ascp: SDK folder path', handler: {o: Products::Transferd, m: :sdk_directory})
-          options.declare(:progress_bar, 'Display progress bar', values: :bool, default: Environment.terminal?)
+          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(:progress_bar, 'Display progress bar', allowed: Allowed::TYPES_BOOLEAN, default: Environment.terminal?)
           # Email options
-          options.declare(:smtp, 'Email: SMTP configuration', types: Hash)
+          options.declare(:smtp, 'Email: SMTP configuration', allowed: Hash)
           options.declare(:notify_to, 'Email: Recipient for notification of transfers')
           options.declare(:notify_template, 'Email: ERB template for notification of transfers')
           # HTTP options
-          options.declare(:insecure, 'HTTP/S: Do not validate any certificate', values: :bool, handler: {o: self, m: :option_insecure}, default: :no)
-          options.declare(:ignore_certificate, 'HTTP/S: Do not validate certificate for these URLs', types: Array, handler: {o: self, m: :option_ignore_cert_host_port})
-          options.declare(:warn_insecure, 'HTTP/S: Issue a warning if certificate is ignored', values: :bool, handler: {o: self, m: :option_warn_insecure_cert}, default: :yes)
-          options.declare(:cert_stores, 'HTTP/S: List of folder with trusted certificates', types: [Array, String], handler: {o: self, m: :trusted_cert_locations})
-          options.declare(:http_options, 'HTTP/S: Options for HTTP/S socket', types: Hash, handler: {o: self, m: :option_http_options}, default: {})
-          options.declare(:http_proxy, 'HTTP/S: URL for proxy with optional credentials', types: String, handler: {o: self, m: :option_http_proxy})
-          options.declare(:cache_tokens, 'Save and reuse OAuth tokens', values: :bool, handler: {o: self, m: :option_cache_tokens})
+          options.declare(:insecure, 'HTTP/S: Do not validate any certificate', allowed: Allowed::TYPES_BOOLEAN, handler: {o: self, m: :option_insecure}, default: false)
+          options.declare(:ignore_certificate, 'HTTP/S: Do not validate certificate for these URLs', allowed: [Array, NilClass], handler: {o: self, m: :option_ignore_cert_host_port})
+          options.declare(:warn_insecure, 'HTTP/S: Issue a warning if certificate is ignored', allowed: Allowed::TYPES_BOOLEAN, handler: {o: self, m: :option_warn_insecure_cert}, default: true)
+          options.declare(:cert_stores, 'HTTP/S: List of folder with trusted certificates', allowed: Allowed::TYPES_STRING_ARRAY, handler: {o: self, m: :trusted_cert_locations})
+          options.declare(:http_options, 'HTTP/S: Options for HTTP/S socket', allowed: Hash, handler: {o: self, m: :option_http_options}, default: {})
+          options.declare(:http_proxy, 'HTTP/S: URL for proxy with optional credentials', handler: {o: self, m: :option_http_proxy})
+          options.declare(:cache_tokens, 'Save and reuse OAuth tokens', allowed: Allowed::TYPES_BOOLEAN, handler: {o: self, m: :option_cache_tokens})
           options.declare(:fpac, 'Proxy auto configuration script')
-          options.declare(:proxy_credentials, 'HTTP proxy credentials for fpac: user, password', types: Array)
+          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)
-          # Check SDK folder is set or not, for compatibility, we check in two places
-          sdk_dir = Products::Transferd.sdk_directory rescue nil
-          if sdk_dir.nil?
-            @sdk_default_location = true
-            Log.log.debug('SDK folder is not set, checking default')
-            # New location
-            sdk_dir = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME)
-            Log.log.debug{"Checking: #{sdk_dir}"}
-            if !Dir.exist?(sdk_dir)
-              Log.log.debug{"No such folder: #{sdk_dir}"}
-              # Former location
-              former_sdk_folder = File.join(self.class.default_app_main_folder(app_name: Info::CMD_NAME), TRANSFERD_APP_NAME)
-              Log.log.debug{"Checking: #{former_sdk_folder}"}
-              sdk_dir = former_sdk_folder if Dir.exist?(former_sdk_folder)
-            end
-            Log.log.debug{"Using: #{sdk_dir}"}
-            Products::Transferd.sdk_directory = sdk_dir
-          end
           pac_script = options.get_option(:fpac)
           # Create PAC executor
           if !pac_script.nil?
@@ -200,27 +188,7 @@ module Aspera
               RestParameters.instance.send(method, v)
             elsif k.eql?('ssl_options')
               keys_to_delete.push(k)
-              # NOTE: here is a hack that allows setting SSLContext options
-              Aspera.assert_type(v, Array){'ssl_options'}
-              # Start with default options
-              ssl_options = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options]
-              v.each do |opt|
-                case opt
-                when Integer
-                  ssl_options = opt
-                when String
-                  name = "OP_#{opt.start_with?('-') ? opt[1..] : opt}".upcase
-                  raise Cli::BadArgument, "Unknown ssl_option: #{name}, use one of: #{OpenSSL::SSL.constants.grep(/^OP_/).map{ |c| c.to_s.sub(/^OP_/, '')}.join(', ')}" if !OpenSSL::SSL.const_defined?(name)
-                  if opt.start_with?('-')
-                    ssl_options &= ~OpenSSL::SSL.const_get(name)
-                  else
-                    ssl_options |= OpenSSL::SSL.const_get(name)
-                  end
-                else
-                  Aspera.error_unexpected_value(opt.class.name){'Expected String or Integer in ssl_options'}
-                end
-              end
-              OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] = ssl_options
+              Aspera::SSL.option_list = v
             elsif OAuth::Factory.instance.parameters.key?(k.to_sym)
               keys_to_delete.push(k)
               OAuth::Factory.instance.parameters[k.to_sym] = v
@@ -238,11 +206,31 @@ module Aspera
         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
 
+        def set_sdk_dir
+          # Check SDK folder is set or not, for compatibility, we check in two places
+          sdk_dir = Products::Transferd.sdk_directory rescue nil
+          if sdk_dir.nil?
+            @sdk_default_location = true
+            Log.log.debug('SDK folder is not set, checking default')
+            # New location
+            sdk_dir = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME)
+            Log.log.debug{"Checking: #{sdk_dir}"}
+            if !Dir.exist?(sdk_dir)
+              Log.log.debug{"No such folder: #{sdk_dir}"}
+              # Former location
+              former_sdk_folder = File.join(self.class.default_app_main_folder(app_name: Info::CMD_NAME), TRANSFERD_APP_NAME)
+              Log.log.debug{"Checking: #{former_sdk_folder}"}
+              sdk_dir = former_sdk_folder if Dir.exist?(former_sdk_folder)
+            end
+            Log.log.debug{"Using: #{sdk_dir}"}
+            Products::Transferd.sdk_directory = sdk_dir
+          end
+        end
+
         # Add files, folders or default locations to the certificate store
-        # @param path_list [Array<String>] list of paths to add
+        # @param path_list [Array<String>] List of paths to add
         # @return the list of paths
         def trusted_cert_locations=(path_list)
-          path_list = [path_list] unless path_list.is_a?(Array)
           Aspera.assert_type(path_list, Array){'cert locations'}
           if @certificate_store.nil?
             Log.log.debug('Creating SSL Cert store')
@@ -273,6 +261,7 @@ module Aspera
                 pp = Dir.entries(p)
                   .map{ |e| File.realpath(File.join(p, e))}
                   .select{ |entry| File.file?(entry)}
+                  .select{ |entry| CERT_EXT.any?{ |ext| entry.end_with?(ext)}}
               end
               @certificate_paths.concat(pp)
             end
@@ -285,7 +274,7 @@ module Aspera
           locations = @certificate_paths
           if locations.nil?
             # Compute default locations
-            self.trusted_cert_locations = SpecialValues::DEF
+            self.trusted_cert_locations = [SpecialValues::DEF]
             locations = @certificate_paths
             # Restore defaults
             @certificate_paths = @certificate_store = nil
@@ -447,7 +436,7 @@ module Aspera
               Log.log.warn{"keeping same value for #{preset}: #{param_name}: #{param_value}"}
               return
             end
-            Log.log.warn{"overwriting value: #{selected_preset[param_name]}"}
+            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}")
@@ -479,21 +468,12 @@ module Aspera
             raise Cli::Error, "Unknown config preset: #{include_path}" if current.nil?
           end
           current = self.class.deep_clone(current) unless current.is_a?(String)
-          return ExtendedValue.instance.evaluate(current)
-        end
-
-        def option_use_product=(value)
-          Ascp::Installation.instance.use_ascp_from_product(value)
-        end
-
-        def option_use_product
-          'write-only option, see value of ascp_path'
+          return ExtendedValue.instance.evaluate(current, context: 'preset')
         end
 
         def option_plugin_folder=(value)
-          Aspera.assert_values(value.class, [String, Array]){'plugin folder'}
-          value = [value] if value.is_a?(String)
-          Aspera.assert(value.all?(String)){'plugin folder'}
+          value = [value] unless value.is_a?(Array)
+          Aspera.assert_array_all(value, String){'plugin folder(s)'}
           value.each{ |f| Plugins::Factory.instance.add_lookup_folder(f)}
         end
 
@@ -514,8 +494,9 @@ module Aspera
           end
         end
 
+        # @return [Integer]
         def config_checksum
-          JSON.generate(@config_presets).hash
+          Digest::SHA1.hexdigest(JSON.generate(@config_presets))
         end
 
         # Read config file and validate format
@@ -556,6 +537,7 @@ module Aspera
               Log.log.warn{"#{file} -> #{@main_folder}"}
             end
           end
+          return
         rescue Psych::SyntaxError => e
           Log.log.error('YAML error in config file')
           raise e
@@ -605,6 +587,15 @@ module Aspera
               return Main.result_status("Opened: #{one_link['href']}")
             end
           end
+          Aspera.error_unreachable_line
+        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
@@ -624,7 +615,7 @@ module Aspera
             # Collect info from ascp executable
             data = Ascp::Installation.instance.ascp_info
             # Add command line transfer spec
-            data['ts'] = transfer.option_transfer_spec
+            data['ts'] = transfer.user_transfer_spec
             # Add keys
             DataRepository::ELEMENTS.each_with_object(data){ |i, h| h[i.to_s] = DataRepository.instance.item(i)}
             # Declare those as secrets
@@ -638,15 +629,11 @@ module Aspera
             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.instance.path(:ascp))
+              set_global_default(:ascp_path, "#{Ascp::Installation::USE_PRODUCT_PREFIX}#{default_product}")
               return Main.result_nothing
             end
           when :install
-            # 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
-            version = options.get_next_argument('transferd version', mandatory: false)
-            n, v = Ascp::Installation.instance.install_sdk(url: options.get_option(:sdk_url, mandatory: true), version: version)
-            return Main.result_status("Installed #{n} version #{v}")
+            return install_transfer_sdk
           when :spec
             fields, data = Transfer::SpecDoc.man_table(Formatter, include_option: true)
             return Main.result_object_list(data, fields: fields.map(&:to_s))
@@ -671,11 +658,7 @@ module Aspera
           command = options.get_next_command(%i[list install])
           case command
           when :install
-            # 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
-            version = options.get_next_argument('transferd version', mandatory: false)
-            n, v = Ascp::Installation.instance.install_sdk(url: options.get_option(:sdk_url, mandatory: true), version: version)
-            return Main.result_status("Installed #{n} version #{v}")
+            return install_transfer_sdk
           when :list
             sdk_list = Ascp::Installation.instance.sdk_locations
             return Main.result_object_list(
@@ -725,7 +708,7 @@ module Aspera
             value = @config_presets[name][param_name]
             raise "no such option in preset #{name} : #{param_name}" if value.nil?
             case value
-            when Numeric, String then return Main.result_text(ExtendedValue.instance.evaluate(value.to_s))
+            when Numeric, String then return Main.result_text(ExtendedValue.instance.evaluate(value.to_s, context: 'preset'))
             end
             return Main.result_single_object(value)
           when :unset
@@ -754,7 +737,7 @@ module Aspera
             options.ask_missing_mandatory = true
             @config_presets[name] ||= {}
             options.get_next_argument('option names', multiple: true).each do |option_name|
-              option_value = options.get_interactive(option_name, option: true)
+              option_value = options.get_interactive(option_name, check_option: true)
               @config_presets[name][option_name] = option_value
             end
             return Main.result_status("Updated: #{name}")
@@ -889,7 +872,7 @@ module Aspera
                 result.push({
                   plugin: name,
                   detect: Formatter.tick(plugin_class.respond_to?(:detect)),
-                  wizard: Formatter.tick(plugin_class.instance_methods.include?(:wizard)),
+                  wizard: Formatter.tick(plugin_class.method_defined?(:wizard)),
                   path:   Plugins::Factory.instance.plugin_source(name)
                 })
               end
@@ -930,10 +913,14 @@ module Aspera
           when :ascp
             execute_action_ascp
           when :sync
-            case options.get_next_command(%i[spec])
+            case options.get_next_command(%i[spec admin translate])
             when :spec
               fields, data = Transfer::SpecDoc.man_table(Formatter, include_option: true, agent_columns: false, schema: Sync::Operations::CONF_SCHEMA)
               return Main.result_object_list(data, fields: fields.map(&:to_s))
+            when :admin
+              return execute_sync_admin
+            when :translate
+              return Main.result_single_object(Sync::Operations.args_to_conf(options.get_next_argument('async arguments', multiple: true)))
             else Aspera.error_unreachable_line
             end
           when :transferd
@@ -1183,16 +1170,17 @@ module Aspera
         end
 
         # Lookup the corresponding secret for the given URL and usernames
-        # @raise Exception if mandatory and not found
-        def lookup_secret(url:, username:, mandatory: false)
+        # @param url      [String] Server URL
+        # @param username [String] Username
+        # @return [String, nil] Secret if found
+        def lookup_secret(url:, username:)
           secret = options.get_option(:secret)
-          if secret.nil?
+          if secret.eql?('PRESET')
             conf = lookup_preset(url: url, username: username)
             if conf.is_a?(Hash)
               Log.log.debug{"Found preset #{conf} with URL and username"}
               secret = conf['password']
             end
-            raise "Please provide secret for #{username} using option: secret or by setting a preset for #{username}@#{url}." if secret.nil? && mandatory
           end
           return secret
         end
@@ -1227,6 +1215,7 @@ module Aspera
         # Special extended values
         EXTEND_PRESET = :preset
         EXTEND_VAULT = :vault
+        EXTEND_ARGS = :''
         PRESET_DIG_SEPARATOR = '.'
         DEFAULT_CHECK_NEW_VERSION_DAYS = 7
         COFFEE_IMAGE_URL = 'https://enjoyjava.com/wp-content/uploads/2018/01/How-to-make-strong-coffee.jpg'
@@ -1235,7 +1224,7 @@ module Aspera
         SELF_SIGNED_CERT = OpenSSL::SSL.const_get(:enon_yfirev.to_s.upcase.reverse) # cspell: disable-line
         CONF_OVERVIEW_KEYS = %w[preset parameter value].freeze
         SMTP_CONF_PARAMS = %i[server tls ssl port domain username password from_name from_email].freeze
-
+        CERT_EXT = %w[crt cer pem der].freeze
         private_constant :ASPERA_HOME_FOLDER_NAME,
           :DEFAULT_CONFIG_FILENAME,
           :CONF_PRESET_CONFIG,
@@ -1260,7 +1249,8 @@ module Aspera
           :TRANSFERD_APP_NAME,
           :GLOBAL_DEFAULT_KEYWORD,
           :CONF_GLOBAL_SYM,
-          :GEM_CHECK_DATE_FMT
+          :GEM_CHECK_DATE_FMT,
+          :CERT_EXT
       end
     end
   end