aspera-cli 4.21.2 → 4.23.0

data/lib/aspera/agent/httpgw.rb

@@ -9,9 +9,28 @@ require 'aspera/assert'
 module Aspera
   module Agent
     class Httpgw < Base
-      # start FASP transfer based on transfer spec (hash table)
-      # note that it is asynchronous
+      def initialize(
+        url:,
+        api_version: Api::Httpgw::API_V2,
+        upload_chunk_size: 64_000,
+        synchronous:       false,
+        **base_options
+      )
+        super(**base_options)
+        @gw_api = Api::Httpgw.new(
+          # remove /v1 from end of user-provided GW url: we need the base url only
+          url:               url,
+          api_version:       api_version,
+          upload_chunk_size: upload_chunk_size,
+          synchronous:       synchronous,
+          notify_cb:         ->(*pa, **ka){notify_progress(*pa, **ka)}
+        )
+      end
+
+      # Start FASP transfer based on transfer spec (hash table)
+      # note that this should be asynchronous, but it is not
       # HTTP download only supports file list
+      # :reek:UnusedParameters token_regenerator
       def start_transfer(transfer_spec, token_regenerator: nil)
         raise 'GW URL must be set' if @gw_api.nil?
         Aspera.assert_type(transfer_spec['paths'], Array){'paths'}
@@ -27,35 +46,12 @@ module Aspera
         end
       end
 
-      # wait for completion of all jobs started
+      # Wait for completion of all jobs started
       # @return list of :success or error message
       def wait_for_transfers_completion
         # well ... transfer was done in "start"
         return [:success]
       end
-
-      # TODO: is that useful?
-      # def url=(api_url); end
-
-      private
-
-      def initialize(
-        url:,
-        api_version: Api::Httpgw::API_V2,
-        upload_chunk_size: 64_000,
-        synchronous:       false,
-        **base_options
-      )
-        super(**base_options)
-        @gw_api = Api::Httpgw.new(
-          # remove /v1 from end of user-provided GW url: we need the base url only
-          url:               url,
-          api_version:       api_version,
-          upload_chunk_size: upload_chunk_size,
-          synchronous:       synchronous,
-          notify_cb:         ->(*pa, **ka) { notify_progress(*pa, **ka) }
-        )
-      end
     end
   end
 end

data/lib/aspera/agent/node.rb

@@ -13,10 +13,10 @@ module Aspera
     # this singleton class is used by the CLI to provide a common interface to start a transfer
     # before using it, the use must set the `node_api` member.
     class Node < Base
-      # @param url [String] the base url of the node api
-      # @param username [String] the username to use for the node api
-      # @param password [String] the password to use for the node api
-      # @param root_id [String] root file id if the node is an access key
+      # @param url          [String] the base url of the node api
+      # @param username     [String] the username to use for the node api
+      # @param password     [String] the password to use for the node api
+      # @param root_id      [String] root file id if the node is an access key
       # @param base_options [Hash] options for base class
       def initialize(
         url:,
@@ -28,7 +28,7 @@ module Aspera
         super(**base_options)
         # root id is required for access key
         @root_id = root_id
-        rest_params = { base_url: url}
+        rest_params = {base_url: url}
         if OAuth::Factory.bearer?(password)
           Aspera.assert(!@root_id.nil?){'root_id not allowed for access key'}
           rest_params[:headers] = Api::Node.bearer_headers(password, access_key: username)
@@ -44,13 +44,8 @@ module Aspera
         @transfer_id = nil
       end
 
-      # used internally to ensure node api is set before using.
-      def node_api_
-        Aspera.assert(!@node_api.nil?){'Before using this object, set the node_api attribute to a Aspera::Rest object'}
-        return @node_api
-      end
-
       # generic method
+      # :reek:UnusedParameters token_regenerator
       def start_transfer(transfer_spec, token_regenerator: nil)
         # add root id if access key
         if !@root_id.nil?
@@ -119,6 +114,14 @@ module Aspera
         # TODO: get status of sessions
         return []
       end
+
+      private
+
+      # used internally to ensure node api is set before using.
+      def node_api_
+        Aspera.assert(!@node_api.nil?){'Before using this object, set the node_api attribute to a Aspera::Rest object'}
+        return @node_api
+      end
     end
   end
 end

data/lib/aspera/agent/transferd.rb

@@ -31,6 +31,7 @@ module Aspera
         **base
       )
         super(**base)
+        @transfer_id = nil
         @stop = stop
         is_local_auto_port = url.eql?(AUTO_LOCAL_TCP_PORT)
         raise 'Cannot set options `stop` or `start` to false with port zero' if is_local_auto_port && (!@stop || !start)
@@ -94,7 +95,7 @@ module Aspera
           end
           Log.log.debug{"Daemon started with pid #{@daemon_pid}"}
           Process.detach(@daemon_pid) unless @stop
-          at_exit {shutdown}
+          at_exit{shutdown}
           # update port for next connection attempt (if auto high port was requested)
           daemon_endpoint = "#{LOCAL_SOCKET_ADDR}#{PORT_SEP}#{Products::Transferd.daemon_port_from_log(log_stdout)}" if is_local_auto_port
           # local daemon started, try again
@@ -102,6 +103,7 @@ module Aspera
         end
       end
 
+      # :reek:UnusedParameters token_regenerator
       def start_transfer(transfer_spec, token_regenerator: nil)
         # create a transfer request
         transfer_request = ::Transferd::Api::TransferRequest.new(
@@ -156,10 +158,12 @@ module Aspera
         stop_daemon if @stop
       end
 
+      private
+
       def stop_daemon
         if !@daemon_pid.nil?
           Log.log.debug("Stopping daemon #{@daemon_pid}")
-          Process.kill('INT', @daemon_pid)
+          Process.kill(:INT, @daemon_pid)
           _, status = Process.wait2(@daemon_pid)
           Log.log.debug("daemon stopped #{status}")
           @daemon_pid = nil

data/lib/aspera/api/aoc.rb

@@ -22,7 +22,7 @@ module Aspera
       MAX_AOC_URL_REDIRECT = 10
       CLIENT_ID_PREFIX = 'aspera.'
       # Well-known AoC global client apps
-      GLOBAL_CLIENT_APPS = DataRepository::ELEMENTS.select{|i|i.to_s.start_with?(CLIENT_ID_PREFIX)}.freeze
+      GLOBAL_CLIENT_APPS = DataRepository::ELEMENTS.select{ |i| i.to_s.start_with?(CLIENT_ID_PREFIX)}.freeze
       # cookie prefix so that console can decode identity
       COOKIE_PREFIX_CONSOLE_AOC = 'aspera.aoc'
       # path in URL of public links
@@ -34,6 +34,8 @@ module Aspera
       # types of events for shared folder creation
       # Node events: permission.created permission.modified permission.deleted
       PERMISSIONS_CREATED = ['permission.created'].freeze
+      # Special name when creating workspace shared folders
+      ID_AK_ADMIN = 'ASPERA_ACCESS_KEY_ADMIN'
 
       private_constant :MAX_AOC_URL_REDIRECT,
         :CLIENT_ID_PREFIX,
@@ -43,7 +45,8 @@ module Aspera
         :JWT_AUDIENCE,
         :OAUTH_API_SUBPATH,
         :USER_INFO_FIELDS_MIN,
-        :PERMISSIONS_CREATED
+        :PERMISSIONS_CREATED,
+        :ID_AK_ADMIN
 
       # various API scopes supported
       SCOPE_FILES_SELF = 'self'
@@ -237,7 +240,7 @@ module Aspera
             Log.log.debug{"ignoring error: #{e}"}
             {}
           end
-        USER_INFO_FIELDS_MIN.each{|f|@cache_user_info[f] = nil if @cache_user_info[f].nil?}
+        USER_INFO_FIELDS_MIN.each{ |f| @cache_user_info[f] = nil if @cache_user_info[f].nil?}
         return @cache_user_info
       end
 
@@ -283,7 +286,7 @@ module Aspera
           if ws_info.nil?
             {
               id:   nil,
-              name: 'Shared folders'
+              name: "Shared #{application}"
             }
           else
             {
@@ -386,10 +389,10 @@ module Aspera
           Aspera.assert(field.key?('name')){'metadata field must have name'}
           Aspera.assert(field.key?('values')){'metadata field must have values'}
           Aspera.assert_type(field['values'], Array){'metadata field values'}
-          Aspera.assert(!meta_schema.none?{|i|i['name'].eql?(field['name'])}){"unknown metadata field: #{field['name']}"}
+          Aspera.assert(!meta_schema.none?{ |i| i['name'].eql?(field['name'])}){"unknown metadata field: #{field['name']}"}
         end
         meta_schema.each do |field|
-          provided = pkg_meta.select{|i|i['name'].eql?(field['name'])}
+          provided = pkg_meta.select{ |i| i['name'].eql?(field['name'])}
           raise "only one field with name #{field['name']} allowed" if provided.count > 1
           raise "missing mandatory field: #{field['name']}" if field['required'] && provided.empty?
         end
@@ -519,7 +522,7 @@ module Aspera
         # Console cookie
         ################
         # we are sure that fields are not nil
-        cookie_elements = [app_info[:app], current_user_info['name'] || 'public link', current_user_info['email'] || 'none'].map{|e|Base64.strict_encode64(e)}
+        cookie_elements = [app_info[:app], current_user_info['name'] || 'public link', current_user_info['email'] || 'none'].map{ |e| Base64.strict_encode64(e)}
         cookie_elements.unshift(COOKIE_PREFIX_CONSOLE_AOC)
         transfer_spec['cookie'] = cookie_elements.join(':')
         # Application tags
@@ -546,17 +549,12 @@ module Aspera
         transfer_spec['tags'][Transfer::Spec::TAG_RESERVED]['app'] = app_info[:app]
       end
 
-      ID_AK_ADMIN = 'ASPERA_ACCESS_KEY_ADMIN'
       # Callback from Plugins::Node
       # add application specific tags to permissions creation
       # @param perm_data [Hash] parameters for creating permissions
       # @param app_info [Hash] application information
       def permissions_set_create_params(perm_data:, app_info:)
-        # workspace shared folder:
-        # access_id = "#{ID_AK_ADMIN}_WS_#{app_info[:workspace_id]}"
         defaults = {
-          # 'access_type'   => 'user', # mandatory: user or group
-          # 'access_id'     => access_id, # id of user or group or special
           'tags' => {
             Transfer::Spec::TAG_RESERVED => {
               'files' => {
@@ -567,8 +565,6 @@ module Aspera
                   'shared_by_user_id' => current_user_info['id'],
                   'shared_by_name'    => current_user_info['name'],
                   'shared_by_email'   => current_user_info['email'],
-                  # 'shared_with_name'  => access_id,
-                  # 'share_as'  => new_name_for_folder,
                   'access_key'        => app_info[:node_info]['access_key'],
                   'node'              => app_info[:node_info]['name']
                 }
@@ -578,19 +574,20 @@ module Aspera
         }
         perm_data.deep_merge!(defaults)
         tag_workspace = perm_data['tags'][Transfer::Spec::TAG_RESERVED]['files']['workspace']
-        case perm_data['with']
+        shared_with = perm_data.delete('with')
+        case shared_with
         when NilClass
         when ''
+          # workspace shared folder
           perm_data['access_type'] = 'user'
           perm_data['access_id'] = "#{ID_AK_ADMIN}_WS_#{app_info[:workspace_id]}"
           tag_workspace['shared_with_name'] = perm_data['access_id']
         else
-          entity_info = lookup_by_name('contacts', perm_data['with'], query: {'current_workspace_id' => app_info[:workspace_id]})
+          entity_info = lookup_by_name('contacts', shared_with, query: {'current_workspace_id' => app_info[:workspace_id]})
           perm_data['access_type'] = entity_info['source_type']
           perm_data['access_id'] = entity_info['source_id']
-          tag_workspace['shared_with_name'] = entity_info['email']
+          tag_workspace['shared_with_name'] = entity_info['email'] # TODO: check that ???
         end
-        perm_data.delete('with')
         if perm_data.key?('as')
           tag_workspace['share_as'] = perm_data['as']
           perm_data.delete('as')

data/lib/aspera/api/cos_node.rb

@@ -88,7 +88,7 @@ module Aspera
         )
         # get delegated token to be placed in rest call header and in transfer tags
         @storage_credentials['token'][TOKEN_FIELD] = delegated_oauth.token
-        @headers['X-Aspera-Storage-Credentials'] = JSON.generate(@storage_credentials)
+        headers['X-Aspera-Storage-Credentials'] = JSON.generate(@storage_credentials)
       end
     end
   end

data/lib/aspera/api/httpgw.rb

@@ -171,7 +171,7 @@ module Aspera
           cond_var:       ConditionVariable.new
         }
         # start read thread after handshake
-        @ws_read_thread = Thread.new {process_read_thread}
+        @ws_read_thread = Thread.new{process_read_thread}
         @notify_cb&.call(:session_start, session_id: session_id)
         @notify_cb&.call(:session_size, session_id: session_id, info: total_bytes_to_transfer)
         sleep(1)
@@ -244,18 +244,22 @@ module Aspera
       end
 
       def download(transfer_spec)
-        transfer_spec['zip_required'] ||= false
         transfer_spec['source_root'] ||= '/'
+        default_file_name = transfer_spec['paths'].first['source']
+        source_is_folder = %w[. /].include?(default_file_name)
+        default_file_name = 'http_download' if source_is_folder
+        transfer_spec['zip_required'] ||= source_is_folder || transfer_spec['paths'].length > 1
         # is normally provided by application, like package name
         if !transfer_spec.key?('download_name')
           # by default it is the name of first file
-          download_name = File.basename(transfer_spec['paths'].first['source'], '.*')
-          # ands add indication of number of files if there is more than one
+          download_name = File.basename(default_file_name, '.*')
+          # add indication of number of files if there is more than one
           if transfer_spec['paths'].length > 1
             download_name += " #{transfer_spec['paths'].length} Files"
           end
           transfer_spec['download_name'] = download_name
         end
+        # start transfer session on httpgw
         creation = create('download', {'transfer_spec' => transfer_spec})
         transfer_uuid = creation['url'].split('/').last
         file_name =
@@ -264,7 +268,7 @@ module Aspera
             transfer_spec['download_name'] + '.zip'
           else
             # it is a plain file if we don't require zip and there is only one file
-            File.basename(transfer_spec['paths'].first['source'])
+            File.basename(default_file_name)
           end
         file_path = File.join(transfer_spec['destination_root'], file_name)
         call(operation: 'GET', subpath: "download/#{transfer_uuid}", save_to_file: file_path)
@@ -309,11 +313,15 @@ module Aspera
         # web socket endpoint: by default use v2 (newer gateways), without base64 encoding
         # is the latest supported? else revert to old api
         if !@upload_version.eql?(API_V1)
-          if !@api_info['endpoints'].any?{|i|i.include?(@upload_version)}
+          if !@api_info['endpoints'].any?{ |i| i.include?(@upload_version)}
             Log.log.warn{"API version #{@upload_version} not supported, reverting to #{API_V1}"}
             @upload_version = API_V1
           end
         end
+        @shared_info = nil
+        @ws_handshake = nil
+        @ws_io = nil
+        @ws_read_thread = nil
       end
 
       private
@@ -373,7 +381,7 @@ module Aspera
             raise "File not found: #{source_path}"
           end
         end
-        transfer_spec['paths'] = files_to_send.map{|i|{'source' => i[:name]}}
+        transfer_spec['paths'] = files_to_send.map{ |i| {'source' => i[:name]}}
         files_to_send.push(total_bytes_to_transfer)
         return files_to_send
       end

data/lib/aspera/api/node.rb

@@ -27,7 +27,7 @@ module Aspera
         :SIGNATURE_DELIMITER, :BEARER_TOKEN_VALIDITY_DEFAULT,
         :REQUIRED_APP_INFO_FIELDS, :REQUIRED_APP_API_METHODS
 
-      # node api permissions
+      # Node API permissions
       ACCESS_LEVELS = %w[delete list mkdir preview read rename write].freeze
       HEADER_X_ASPERA_ACCESS_KEY = 'X-Aspera-AccessKey'
       HEADER_X_TOTAL_COUNT = 'X-Total-Count'
@@ -38,7 +38,7 @@ module Aspera
       PATH_SEPARATOR = '/'
 
       # register node special token decoder
-      OAuth::Factory.instance.register_decoder(lambda{|token|Node.decode_bearer_token(token)})
+      OAuth::Factory.instance.register_decoder(lambda{ |token| Node.decode_bearer_token(token)})
 
       # class instance variable, access with accessors on class
       @use_standard_ports = true
@@ -81,6 +81,7 @@ module Aspera
         end
 
         # Create an Aspera Node bearer token
+        # @param access_key [String] Access key identifier
         # @param payload [String] JSON payload to be included in the token
         # @param private_key [OpenSSL::PKey::RSA] Private key to sign the token
         def bearer_token(access_key:, payload:, private_key:)
@@ -106,6 +107,7 @@ module Aspera
           ].join("\n")))
         end
 
+        # Decode an Aspera Node bearer token
         def decode_bearer_token(token)
           return JSON.parse(Zlib::Inflate.inflate(Base64.decode64(token)).partition(SIGNATURE_DELIMITER).first)
         end
@@ -149,7 +151,7 @@ module Aspera
 
       # Call node API, possibly adding cache control header, as globally specified
       def read_with_cache(subpath, query=nil)
-        headers = {'Accept' => 'application/json'}
+        headers = {'Accept' => Rest::MIME_JSON}
         headers[HEADER_X_CACHE_CONTROL] = 'no-cache' unless self.class.use_node_cache
         return call(
           operation: 'GET',
@@ -352,7 +354,7 @@ module Aspera
           # get the transfer user from info on access key
           transfer_spec['remote_user'] = info['transfer_user'] if info['transfer_user']
           # get settings from name.value array to hash key.value
-          settings = info['settings']&.each_with_object({}){|i, h|h[i['name']] = i['value']}
+          settings = info['settings']&.each_with_object({}){ |i, h| h[i['name']] = i['value']}
           # check WSS ports
           Transfer::Spec::WSS_FIELDS.each do |i|
             transfer_spec[i] = settings[i] if settings.key?(i)

data/lib/aspera/ascmd.rb

@@ -10,7 +10,7 @@ module Aspera
   # execute: "ascmd -h" to get syntax
   # Note: "ls" can take filters: as_ls -f *.txt -f *.bin /
   class AsCmd
-    # number of arguments for each operation
+    # number of arguments for each operation (to allow splitting into batches)
     OPS_ARGS = {
       cp:     2,
       df:     0,
@@ -23,11 +23,11 @@ module Aspera
       rm:     1
     }.freeze
 
-    # protocol is based on Type-Length-Value
-    # type start at one, but array index start at zero
+    # Protocol is based on Type-Length-Value
+    # Type start at one, but array index start at zero
     ENUM_START = 1
 
-    # description of result structures (see ascmdtypes.h).
+    # Description of result structures (see ascmdtypes.h).
     # Base types are big endian
     # key = name of type
     # index in array `fields` is the type (minus ENUM_START)
@@ -79,17 +79,25 @@ module Aspera
     end
 
     # execute an "as" command on a remote server
+    # Version 2 allows use of reverse proxy with multiple addresses.
     # @param [Symbol] one of OPERATIONS
     # @param [Array] parameters for "as" command
     # @return result of command, type depends on command (bool, array, hash)
-    def execute_single(action_sym, arguments)
+    def execute_single(action_sym, arguments, version: 1, host: nil)
       arguments = [] if arguments.nil?
       Log.log.debug{"execute_single:#{action_sym}:#{arguments}"}
       Aspera.assert_type(action_sym, Symbol)
       Aspera.assert_type(arguments, Array)
       Aspera.assert(arguments.all?(String), 'arguments must be strings')
+      remote_cmd = 'ascmd'
       # lines of commands (String's)
       command_lines = []
+      if version.eql?(2)
+        cmd = "as_session_init --protocol=#{version}"
+        cmd += " --host=#{host}" if host
+        command_lines.push(cmd)
+        remote_cmd += ' -V2'
+      end
       # add "as_" command
       main_command = "as_#{action_sym}"
       arg_batches =
@@ -104,7 +112,7 @@ module Aspera
         # enclose arguments in double quotes, protect backslash and double quotes
         # ascmd uses space as token separator, and optional quotes ('") or \ to escape
         args.each do |v|
-          command.push(%Q{"#{v.gsub(/["\\]/){|s|"\\#{s}"}}"})
+          command.push(%Q{"#{v.gsub(/["\\]/){ |s| "\\#{s}"}}"})
         end
         command_lines.push(command.join(' '))
       end
@@ -114,7 +122,7 @@ module Aspera
       stdin_input = command_lines.join("\n")
       Log.log.trace1{"execute_single:#{stdin_input}"}
       # execute, get binary output
-      byte_buffer = @command_executor.execute('ascmd', stdin_input).unpack('C*')
+      byte_buffer = @command_executor.execute(remote_cmd, stdin_input).unpack('C*')
       raise 'ERROR: empty answer from server' if byte_buffer.empty?
       # get hash or table result
       result = self.class.parse(byte_buffer, :result)
@@ -141,7 +149,7 @@ module Aspera
       end
       # raise error as exception
       raise Error.new(result[:errno], result[:errstr], action_sym, arguments) if
-        result.is_a?(Hash) && (result.keys.sort == TYPES_DESCR[:error][:fields].map{|i|i[:name]}.sort)
+        result.is_a?(Hash) && (result.keys.sort == TYPES_DESCR[:error][:fields].map{ |i| i[:name]}.sort)
       return result
     end
 
@@ -209,7 +217,7 @@ module Aspera
               result[field_info[:name]] ||= []
               result[field_info[:name]].push(parse(typed_buffer[:buffer], field_info[:is_a], indent_level))
             when :list_tlv_list # field is an array of values in a list of buffers
-              result[field_info[:name]] = parse(typed_buffer[:buffer], :blist, indent_level).map{|r|parse(r[:buffer], field_info[:is_a], indent_level)}
+              result[field_info[:name]] = parse(typed_buffer[:buffer], :blist, indent_level).map{ |r| parse(r[:buffer], field_info[:is_a], indent_level)}
             when :list_tlv_restart # field is an array of values, but a new value is started on index 1
               fl = result[field_info[:name]] = []
               parse(typed_buffer[:buffer], :blist, indent_level).map do |tb|

data/lib/aspera/ascp/installation.rb

@@ -32,6 +32,7 @@ module Aspera
     # Installation.instance.ascp_path=""
     class Installation
       include Singleton
+
       DEFAULT_ASPERA_CONF = <<~END_OF_CONFIG_FILE
         <?xml version='1.0' encoding='UTF-8'?>
         <CONF version="2">
@@ -68,8 +69,8 @@ module Aspera
       # set ascp executable path
       def ascp_path=(v)
         Aspera.assert_type(v, String)
-        Aspera.assert(!v.empty?) {'ascp path cannot be empty: check your config file'}
-        Aspera.assert(File.exist?(v)) {"No such file: [#{v}]"}
+        Aspera.assert(!v.empty?){'ascp path cannot be empty: check your config file'}
+        Aspera.assert(File.exist?(v)){"No such file: [#{v}]"}
         @path_to_ascp = v
       end
 
@@ -89,7 +90,7 @@ module Aspera
           pl = installed_products.first
           raise "no Aspera transfer module or SDK found.\nRefer to the manual or install SDK with command:\nascli conf ascp install" if pl.nil?
         else
-          pl = installed_products.find{|i|i[:name].eql?(product_name)}
+          pl = installed_products.find{ |i| i[:name].eql?(product_name)}
           raise "no such product installed: #{product_name}" if pl.nil?
         end
         self.ascp_path = pl[:ascp_path]
@@ -130,22 +131,21 @@ module Aspera
         when :ssh_private_dsa, :ssh_private_rsa
           # assume last 3 letters are type
           type = k.to_s[-3..-1].to_sym
-          file = check_or_create_sdk_file("aspera_bypass_#{type}.pem") {DataRepository.instance.item(type)}
+          file = check_or_create_sdk_file("aspera_bypass_#{type}.pem"){DataRepository.instance.item(type)}
         when :aspera_license
-          file = check_or_create_sdk_file('aspera-license') {DataRepository.instance.item(:license)}
+          file = check_or_create_sdk_file('aspera-license'){DataRepository.instance.item(:license)}
         when :aspera_conf
-          file = check_or_create_sdk_file('aspera.conf') {DEFAULT_ASPERA_CONF}
+          file = check_or_create_sdk_file('aspera.conf'){DEFAULT_ASPERA_CONF}
         when :fallback_certificate, :fallback_private_key
           file_key = File.join(Products::Transferd.sdk_directory, 'aspera_fallback_cert_private_key.pem')
           file_cert = File.join(Products::Transferd.sdk_directory, 'aspera_fallback_cert.pem')
           if !File.exist?(file_key) || !File.exist?(file_cert)
             require 'openssl'
             # create new self signed certificate for http fallback
-            cert = OpenSSL::X509::Certificate.new
             private_key = OpenSSL::PKey::RSA.new(4096)
-            WebServerSimple.fill_self_signed_cert(cert, private_key)
-            check_or_create_sdk_file('aspera_fallback_cert_private_key.pem', force: true) {private_key.to_pem}
-            check_or_create_sdk_file('aspera_fallback_cert.pem', force: true) {cert.to_pem}
+            cert = WebServerSimple.self_signed_cert(private_key)
+            check_or_create_sdk_file('aspera_fallback_cert_private_key.pem', force: true){private_key.to_pem}
+            check_or_create_sdk_file('aspera_fallback_cert.pem', force: true){cert.to_pem}
           end
           file = k.eql?(:fallback_certificate) ? file_cert : file_key
         else Aspera.error_unexpected_value(k)
@@ -166,7 +166,7 @@ module Aspera
         Aspera.assert_values(types, CLIENT_SSH_KEY_OPTIONS)
         return case types
                when :dsa_rsa, :rsa
-                 types.to_s.split('_').map{|i|Installation.instance.path("ssh_private_#{i}".to_sym)}
+                 types.to_s.split('_').map{ |i| Installation.instance.path("ssh_private_#{i}".to_sym)}
                when :per_client
                  raise 'Not yet implemented'
                end
@@ -197,6 +197,8 @@ module Aspera
           last_line = ''
           while (line = stderr.gets)
             line.chomp!
+            # skip lines that may have accents
+            next unless line.valid_encoding?
             last_line = line
             case line
             when /^DBG Path ([^ ]+) (dir|file) +: (.*)$/
@@ -212,7 +214,7 @@ module Aspera
               data['product_name'] = Regexp.last_match(1)
               data['product_version'] = Regexp.last_match(2)
             when /^LOG Initializing FASP version ([^,]+),/
-              data['sdk_ascp_version'] = Regexp.last_match(1)
+              data['ascp_version'] = Regexp.last_match(1)
             end
           end
           if !thread.value.exitstatus.eql?(1) && !data.key?('root')
@@ -227,9 +229,9 @@ module Aspera
         data = {}
         File.binread(ascp_path).scan(/[\x20-\x7E]{10,}/) do |bin_string|
           if (m = bin_string.match(/OPENSSLDIR.*"(.*)"/))
-            data['openssldir'] = m[1]
+            data['ascp_openssl_dir'] = m[1]
           elsif (m = bin_string.match(/OpenSSL (\d[^ -]+)/))
-            data['openssl_version'] = m[1]
+            data['ascp_openssl_version'] = m[1]
           end
         end if File.file?(ascp_path)
         return data
@@ -247,10 +249,10 @@ module Aspera
       def sdk_url_for_platform(platform: nil, version: nil)
         locations = sdk_locations
         platform = Environment.architecture if platform.nil?
-        locations = locations.select{|l|l['platform'].eql?(platform)}
+        locations = locations.select{ |l| l['platform'].eql?(platform)}
         raise "No SDK for platform: #{platform}" if locations.empty?
-        version = locations.max_by { |entry| Gem::Version.new(entry['version']) }['version'] if version.nil?
-        info = locations.select{|entry| entry['version'].eql?(version)}
+        version = locations.max_by{ |entry| Gem::Version.new(entry['version'])}['version'] if version.nil?
+        info = locations.select{ |entry| entry['version'].eql?(version)}
         raise "No such version: #{version} for #{platform}" if info.empty?
         return info.first['url']
       end
@@ -300,7 +302,7 @@ module Aspera
         if subfolder_lambda.nil?
           # default files to extract directly to main folder if in selected source folders
           subfolder_lambda = ->(name) do
-            Products::Transferd::RUNTIME_FOLDERS.any?{|i|name.match?(%r{^[^/]*/#{i}/})} ? '/' : nil
+            Products::Transferd::RUNTIME_FOLDERS.any?{ |i| name.match?(%r{^[^/]*/#{i}/})} ? '/' : nil
           end
         end
         # rename old install
@@ -322,7 +324,7 @@ module Aspera
           end
           FileUtils.mkdir_p(dest_folder)
           if link_target.nil?
-            File.open(dest_file, 'wb') { |output_stream|IO.copy_stream(entry_stream, output_stream)}
+            File.open(dest_file, 'wb'){ |output_stream| IO.copy_stream(entry_stream, output_stream)}
           else
             File.symlink(link_target, dest_file)
           end

data/lib/aspera/ascp/management.rb

@@ -227,7 +227,7 @@ module Aspera
           # TODO: translate enhanced to capitalized ?
           data
             .keys
-            .map{|k|"#{k.capitalize}: #{data[k]}"}
+            .map{ |k| "#{k.capitalize}: #{data[k]}"}
             .unshift(MGT_HEADER)
             .push('', '')
             .join("\n")