aspera-cli 4.17.0 → 4.18.0

data/lib/aspera/rest.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
+require 'aspera/rest_errors_aspera'
+require 'aspera/rest_error_analyzer'
 require 'aspera/log'
 require 'aspera/assert'
 require 'aspera/oauth'
-require 'aspera/rest_error_analyzer'
 require 'aspera/hash_ext'
-require 'aspera/rest_errors_aspera'
 require 'net/http'
 require 'net/https'
 require 'json'
@@ -153,47 +153,6 @@ module Aspera
       return @http_session
     end
 
-    def build_request(
-      operation:,
-      subpath:,
-      url_params:,
-      json_params:,
-      www_body_params:,
-      text_body_params:,
-      headers:
-    )
-      # TODO: shall we percent encode subpath (spaces) test with access key delete with space in id
-      # URI.escape()
-      separator = !['', '/'].include?(subpath) || @base_url.end_with?('/') ? '/' : ''
-      uri = self.class.build_uri("#{@base_url}#{separator}#{subpath}", url_params)
-      Log.log.debug{"URI=#{uri}"}
-      begin
-        # instantiate request object based on string name
-        req = Net::HTTP.const_get(operation.capitalize).new(uri)
-      rescue NameError
-        raise "unsupported operation : #{operation}"
-      end
-      if !json_params.nil?
-        req.body = JSON.generate(json_params) # , ascii_only: true
-        req['Content-Type'] = 'application/json'
-      end
-      if !www_body_params.nil?
-        req.body = URI.encode_www_form(www_body_params)
-        req['Content-Type'] = 'application/x-www-form-urlencoded'
-      end
-      if !text_body_params.nil?
-        req.body = text_body_params
-      end
-      # set headers
-      headers.each do |key, value|
-        req[key] = value
-      end
-      # :type = :basic
-      req.basic_auth(@auth_params[:username], @auth_params[:password]) if @auth_params[:type].eql?(:basic)
-      Log.log.debug{Log.dump(:req_body, req.body)}
-      return req
-    end
-
     public
 
     attr_reader :auth_params
@@ -217,7 +176,7 @@ module Aspera
     #     :url_query  [:url]    a hash
     #     :*          [:oauth2] see OAuth::Factory class
     # @param not_auth_codes [Array] codes that trigger a refresh/regeneration of bearer token
-    # @param redirect_max [int] max redirections allowed
+    # @param redirect_max [int] max redirection allowed
     def initialize(
       base_url:,
       auth: nil,
@@ -255,21 +214,21 @@ module Aspera
       return @oauth
     end
 
-    def oauth_token(force_refresh: false)
-      Aspera.assert_values(force_refresh, [true, false])
-      return oauth.get_authorization(use_refresh_token: force_refresh)
-    end
-
     # HTTP/S REST call
+    # @param operation [String] HTTP operation (GET, POST, PUT, DELETE)
+    # @param subpath [String] subpath of REST API
+    # @param query [Hash] URL parameters
+    # @param body [Hash, String] body parameters
+    # @param body_type [Symbol] type of body parameters (:json, :www, :text, nil)
     # @param save_to_file (filepath)
     # @param return_error (bool)
+    # @param headers [Hash] additional headers
     def call(
       operation:,
       subpath: nil,
-      json_params: nil,
-      url_params: nil,
-      www_body_params: nil,
-      text_body_params: nil,
+      query: nil,
+      body: nil,
+      body_type: nil,
       save_to_file: nil,
       return_error: false,
       headers: nil
@@ -293,20 +252,49 @@ module Aspera
         Log.log.debug('using Basic auth')
         # done in build_req
       when :oauth2
-        headers['Authorization'] = oauth_token unless headers.key?('Authorization')
+        headers['Authorization'] = oauth.token unless headers.key?('Authorization')
       when :url
-        url_params ||= {}
+        query ||= {}
         @auth_params[:url_query].each do |key, value|
-          url_params[key] = value
+          query[key] = value
         end
       else Aspera.error_unexpected_value(@auth_params[:type])
       end
       result = {http: nil}
-      # start a block to be able to retry the actual HTTP request
+      # start a block to be able to retry the actual HTTP request in case of OAuth token expiration
       begin
-        req = build_request(
-          operation: operation, subpath: subpath, json_params: json_params, url_params: url_params, www_body_params: www_body_params,
-          text_body_params: text_body_params, headers: headers)
+        # TODO: shall we percent encode subpath (spaces) test with access key delete with space in id
+        # URI.escape()
+        separator = !['', '/'].include?(subpath) || @base_url.end_with?('/') ? '/' : ''
+        uri = self.class.build_uri("#{@base_url}#{separator}#{subpath}", query)
+        Log.log.debug{"URI=#{uri}"}
+        begin
+          # instantiate request object based on string name
+          req = Net::HTTP.const_get(operation.capitalize).new(uri)
+        rescue NameError
+          raise "unsupported operation : #{operation}"
+        end
+        case body_type
+        when :json
+          req.body = JSON.generate(body) # , ascii_only: true
+          req['Content-Type'] = 'application/json'
+        when :www
+          req.body = URI.encode_www_form(body)
+          req['Content-Type'] = 'application/x-www-form-urlencoded'
+        when :text
+          req.body = body
+          req['Content-Type'] = 'text/plain'
+        when nil
+        else
+          raise "unsupported body type : #{body_type}"
+        end
+        # set headers
+        headers.each do |key, value|
+          req[key] = value
+        end
+        # :type = :basic
+        req.basic_auth(@auth_params[:username], @auth_params[:password]) if @auth_params[:type].eql?(:basic)
+        Log.log.debug{Log.dump(:req_body, req.body)}
         # we try the call, and will retry only if oauth, as we can, first with refresh, and then re-auth if refresh is bad
         oauth_tries ||= 2
         # initialize with number of initial retries allowed, nil gives zero
@@ -347,7 +335,7 @@ module Aspera
             # rename at the end
             File.rename(target_file_tmp, target_file)
             file_saved = true
-          end # save_to_file
+          end
         end
         # sometimes there is a UTF8 char (e.g. (c) ), TODO : related to mime type encoding ?
         # result[:http].body.force_encoding('UTF-8') if result[:http].body.is_a?(String)
@@ -367,16 +355,16 @@ module Aspera
         if @not_auth_codes.include?(result[:http].code.to_s) && @auth_params[:type].eql?(:oauth2)
           begin
             # try to use refresh token
-            req['Authorization'] = oauth_token(force_refresh: true)
+            req['Authorization'] = oauth.token(refresh: true)
           rescue RestCallError => e_tok
             e = e_tok
             Log.log.error('refresh failed'.bg_red)
             # regenerate a brand new token
-            req['Authorization'] = oauth_token(force_refresh: true)
+            req['Authorization'] = oauth.token(refresh: true)
           end
           Log.log.debug{"using new token=#{headers['Authorization']}"}
           retry if (oauth_tries -= 1).nonzero?
-        end # if oauth
+        end
         # redirect ? (any code beginning with 3)
         if e.response.is_a?(Net::HTTPRedirection) && tries_remain_redirect.positive?
           tries_remain_redirect -= 1
@@ -390,13 +378,12 @@ module Aspera
           end
           # forwards the request to the new location
           return self.class.new(base_url: new_url, redirect_max: tries_remain_redirect).call(
-            operation: operation, json_params: json_params,
-            url_params: url_params, www_body_params: www_body_params, text_body_params: text_body_params,
+            operation: operation, query: query, body: body, body_type: body_type,
             save_to_file: save_to_file, return_error: return_error, headers: headers)
         end
         # raise exception if could not retry and not return error in result
         raise e unless return_error
-      end # begin request
+      end
       Log.log.debug{"result=#{result}"}
       return result
     end
@@ -405,21 +392,20 @@ module Aspera
     # CRUD methods here
     #
 
-    # @param encoding : one of: :json_params, :url_params
-    def create(subpath, params, encoding=:json_params)
-      return call(operation: 'POST', subpath: subpath, headers: {'Accept' => 'application/json'}, encoding => params)
+    def create(subpath, params)
+      return call(operation: 'POST', subpath: subpath, headers: {'Accept' => 'application/json'}, body: params, body_type: :json)
     end
 
     def read(subpath, query=nil)
-      return call(operation: 'GET', subpath: subpath, headers: {'Accept' => 'application/json'}, url_params: query)
+      return call(operation: 'GET', subpath: subpath, headers: {'Accept' => 'application/json'}, query: query)
     end
 
     def update(subpath, params)
-      return call(operation: 'PUT', subpath: subpath, headers: {'Accept' => 'application/json'}, json_params: params)
+      return call(operation: 'PUT', subpath: subpath, headers: {'Accept' => 'application/json'}, body: params, body_type: :json)
     end
 
     def delete(subpath, params=nil)
-      return call(operation: 'DELETE', subpath: subpath, headers: {'Accept' => 'application/json'}, url_params: params)
+      return call(operation: 'DELETE', subpath: subpath, headers: {'Accept' => 'application/json'}, query: params)
     end
 
     def cancel(subpath)
@@ -453,4 +439,4 @@ module Aspera
       end
     end
   end
-end # module Aspera
+end

data/lib/aspera/rest_call_error.rb

@@ -3,7 +3,7 @@
 module Aspera
   # raised on error after REST call
   class RestCallError < StandardError
-    attr_accessor :request, :response
+    attr_reader :request, :response
 
     # @param req HTTP Request object
     # @param resp HTTP Response object

data/lib/aspera/rest_error_analyzer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'aspera/log'
 require 'aspera/rest_call_error'
+require 'aspera/log'
 require 'singleton'
 
 module Aspera
@@ -80,7 +80,7 @@ module Aspera
           end
         end
       end
-    end # add_simple_handler
+    end
 
     class << self
       # used by handler to add an error description to list of errors

data/lib/aspera/rest_errors_aspera.rb

@@ -61,7 +61,7 @@ module Aspera
             RestErrorAnalyzer.add_error(call_context, type, "missing parameter: #{param}")
           end
         end
-      end # register_handlers
+      end
     end
   end
 end

data/lib/aspera/resumer.rb

@@ -71,7 +71,7 @@ module Aspera
         sleep_seconds *= @parameters[:sleep_factor]
         # cap value
         sleep_seconds = @parameters[:sleep_max] if sleep_seconds > @parameters[:sleep_max]
-      end # loop
+      end
     end
   end
 end

data/lib/aspera/secret_hider.rb

@@ -25,10 +25,8 @@ module Aspera
       /(?<begin> (?:#{ASCP_ENV_SECRETS.join('|')})=)(\\.|[^ ])*(?<end> )/,
       # rendered JSON or Ruby
       /(?<begin>(?:(?<quote>["'])|:)[^"':=]*(?:#{ALL_SECRETS.join('|')})[^"':=]*\k<quote>?(?:=>|:) *")[^"]+(?<end>")/,
-      # option "secret"
-      /(?<begin>"[^"]*(secret)[^"]*"=>{)[^}]+(?<end>})/,
-      # option "secrets"
-      /(?<begin>(secrets)={)[^}]+(?<end>})/,
+      # logged data
+      /(?<begin>(?:#{ALL_SECRETS.join('|')})[ =:]+).*(?<end>$)/,
       # private key values
       /(?<begin>--+BEGIN [^-]+ KEY--+)[[:ascii:]]+?(?<end>--+?END [^-]+ KEY--+)/,
       # cred in http dump

data/lib/aspera/ssh.rb

@@ -61,7 +61,7 @@ module Aspera
         ssh_channel.wait
         # main ssh session loop
         session.loop
-      end # start
+      end
       # response as single string
       return response.join
     end

data/lib/aspera/transfer/parameters.rb

@@ -22,12 +22,10 @@ module Aspera
       # Agents shown in manual for parameters (sub list)
       SUPPORTED_AGENTS = %i[direct node connect trsdk httpgw].freeze
       # Short names of columns in manual
-      SUPPORTED_AGENTS_SHORT = SUPPORTED_AGENTS.map{|a|a.to_s[0].to_sym}
+      SUPPORTED_AGENTS_SHORT = SUPPORTED_AGENTS.map{|agent_sym|agent_sym.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_cb quiet trusted_certs].freeze
 
-      private_constant :SUPPORTED_AGENTS, :FILE_LIST_OPTIONS, :SUPPORTED_OPTIONS
+      private_constant :SUPPORTED_AGENTS, :FILE_LIST_OPTIONS
 
       class << self
         # Temp folder for file lists, must contain only file lists
@@ -35,18 +33,18 @@ module Aspera
         # 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 to_text [bool] replace HTML entities with text equivalent
+        # @param formatter [Cli::Formatter] formatter to use
         # @return a table suitable to display in manual
-        def man_table
+        def man_table(formatter)
           result = []
           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|
-              param[a.to_s[0].to_sym] = Cli::Formatter.tick(options[:agents].nil? || options[:agents].include?(a))
+            SUPPORTED_AGENTS.each do |agent_sym|
+              param[agent_sym.to_s[0].to_sym] = Cli::Formatter.tick(options[:agents].nil? || options[:agents].include?(agent_sym))
             end
             # only keep lines that are usable in supported agents
-            next if SUPPORTED_AGENTS_SHORT.inject(true){|m, j|m && param[j].empty?}
+            next if SUPPORTED_AGENTS_SHORT.inject(true){|memory, agent_short_sym|memory && param[agent_short_sym].empty?}
             param[:cli] =
               case options[:cli][:type]
               when :envvar then 'env:' + options[:cli][:variable]
@@ -63,8 +61,8 @@ module Aspera
                 end.map{|n|"{#{n}}"}.join('|')
                 conversion_tag = options[:cli].key?(:convert) ? '(conversion)' : ''
                 "#{options[:cli][:switch]} #{conversion_tag}#{values}"
-              when :special then Cli::Formatter.special('special')
-              when :ignore then Cli::Formatter.special('ignored')
+              when :special then formatter.special_format('special')
+              when :ignore then formatter.special_format('ignored')
               else
                 param[:d].eql?(tick_yes) ? '' : 'n/a'
               end
@@ -75,17 +73,17 @@ module Aspera
             param[:description] = param[:description].gsub('&sol;', '\\')
             result.push(param)
           end
-          return result.sort_by { |a| a[:name] }
+          return result.sort_by { |parameter_info| parameter_info[:name] }
         end
 
         # special encoding methods used in YAML (key: :convert)
-        def convert_remove_hyphen(v); v.tr('-', ''); end
+        def convert_remove_hyphen(value); value.tr('-', ''); end
 
         # special encoding methods used in YAML (key: :convert)
-        def convert_json64(v); Base64.strict_encode64(JSON.generate(v)); end
+        def convert_json64(value); Base64.strict_encode64(JSON.generate(value)); end
 
         # special encoding methods used in YAML (key: :convert)
-        def convert_base64(v); Base64.strict_encode64(v); end
+        def convert_base64(value); Base64.strict_encode64(value); end
 
         # file list is provided directly with ascp arguments
         # @param ascp_args [Array,NilClass] ascp arguments
@@ -94,8 +92,8 @@ module Aspera
         end
 
         # temp file list files are created here
-        def file_list_folder=(v)
-          @file_list_folder = v
+        def file_list_folder=(value)
+          @file_list_folder = value
           return if @file_list_folder.nil?
           FileUtils.mkdir_p(@file_list_folder)
           TempFileManager.instance.cleanup_expired(@file_list_folder)
@@ -103,28 +101,33 @@ module Aspera
 
         # static methods
         attr_reader :file_list_folder
-      end # self
+      end
 
       # @param options [Hash] key: :wss: bool, :ascp_args: array of strings
-      def initialize(job_spec, options)
-        Aspera.assert_type(job_spec, Hash)
-        Aspera.assert_type(options, Hash)
+      def initialize(
+        job_spec,
+        ascp_args:,
+        wss:,
+        quiet:,
+        trusted_certs:,
+        check_ignore_cb:
+      )
         @job_spec = job_spec
-        # check necessary options
-        missing_options = SUPPORTED_OPTIONS - options.keys
-        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)}
-        Aspera.assert_type(@options[:ascp_args], Array){'ascp_args'}
-        Aspera.assert(@options[:ascp_args].all?(String)){'ascp arguments must Strings'}
+        @ascp_args = ascp_args
+        @wss = wss
+        @quiet = quiet
+        @trusted_certs = trusted_certs
+        @check_ignore_cb = check_ignore_cb
+        Aspera.assert_type(job_spec, Hash)
+        Aspera.assert_type(@ascp_args, Array){'ascp_args'}
+        Aspera.assert(@ascp_args.all?(String)){'ascp arguments must be 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 ascp parameters?
-        ascp_file_list_provided = self.class.ascp_args_file_list?(@options[:ascp_args])
+        ascp_file_list_provided = self.class.ascp_args_file_list?(@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)
@@ -162,7 +165,7 @@ module Aspera
       def remote_certificates
         certificates_to_use = []
         # use web socket secure for session ?
-        if @builder.read_param('wss_enabled') && (@options[:wss] || !@job_spec.key?('fasp_port'))
+        if @builder.read_param('wss_enabled') && (@wss || !@job_spec.key?('fasp_port'))
           # by default use web socket session if available, unless removed by user
           @builder.add_command_line_options(['--ws-connect'])
           # TODO: option to give order ssh,ws (legacy http is implied by ssh)
@@ -171,9 +174,9 @@ module Aspera
           @job_spec.delete('fasp_port')
           @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)
+          certificates_to_use.concat(@trusted_certs) if @trusted_certs.is_a?(Array)
           # ignore cert for wss ?
-          if @options[:check_ignore_cb]&.call(@job_spec['remote_host'], @job_spec['wss_port'])
+          if @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_certificate_chain(wss_url))
@@ -228,7 +231,7 @@ 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(@options[:ascp_args])
+        @builder.add_command_line_options(@ascp_args)
         # get list of source files to transfer and build arg for ascp
         process_file_list
         # process destination folder
@@ -238,7 +241,7 @@ module Aspera
         # destination MUST be last command line argument to ascp
         @builder.add_command_line_options([destination_folder])
         @builder.add_env_args(env_args)
-        env_args[:args].unshift('-q') if @options[:quiet]
+        env_args[:args].unshift('-q') if @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', Ascp::Installation.instance.path(:fallback_private_key))
@@ -247,6 +250,6 @@ module Aspera
         Log.log.debug{"ascp args: #{env_args}"}
         return env_args
       end
-    end # Parameters
+    end
   end
 end

data/lib/aspera/transfer/spec.rb

@@ -17,6 +17,8 @@ module Aspera
         'ssh_port'    => SSH_PORT,
         'fasp_port'   => UDP_PORT
       }.freeze
+      # fields for transport
+      TRANSPORT_FIELDS = %w[remote_host remote_user ssh_port fasp_port wss_enabled wss_port].freeze
       # reserved tag for Aspera
       TAG_RESERVED = 'aspera'
       class << self

data/lib/aspera/transfer/sync.rb

@@ -48,7 +48,8 @@ module Aspera
           'cooloff'                    => { cli: { type: :opt_with_arg}, accepted_types: :int},
           'pending_max'                => { cli: { type: :opt_with_arg}, accepted_types: :int},
           'scan_intensity'             => { cli: { type: :opt_with_arg}, accepted_types: :string},
-          'cipher'                     => { cli: { type: :opt_with_arg, convert: 'Aspera::Transfer::Parameters.convert_remove_hyphen'}, accepted_types: :string, ts: true},
+          'cipher'                     => { cli: { type: :opt_with_arg, convert: 'Aspera::Transfer::Parameters.convert_remove_hyphen'},
+                                            accepted_types: :string, ts: true},
           'transfer_threads'           => { cli: { type: :opt_with_arg}, accepted_types: :int},
           'preserve_time'              => { cli: { type: :opt_without_arg}, ts: :preserve_times},
           'preserve_access_time'       => { cli: { type: :opt_without_arg}, ts: nil},

data/lib/aspera/transfer/uri.rb

@@ -24,7 +24,7 @@ module Aspera
         result_ts['ssh_port'] = @fasp_uri.port
         result_ts['paths'] = [{'source' => URI.decode_www_form_component(@fasp_uri.path)}]
         # faspex 4 does not encode trailing base64 padding, fix that to be able to decode properly
-        fixed_query = @fasp_uri.query.gsub(/(=+)$/){|x|'%3D' * x.length}
+        fixed_query = @fasp_uri.query.gsub(/(=+)$/){|trail_equals|'%3D' * trail_equals.length}
 
         Rest.decode_query(fixed_query).each do |name, value|
           case name

data/lib/aspera/uri_reader.rb

@@ -4,21 +4,22 @@ require 'uri'
 require 'aspera/rest'
 
 module Aspera
+  # read some content from some URI, support file: , http: and https: schemes
   module UriReader
     class << self
       # read some content from some URI, support file: , http: and https: schemes
       def read(uri_to_read)
-        proxy_uri = URI.parse(uri_to_read)
-        case proxy_uri.scheme
+        uri = URI.parse(uri_to_read)
+        case uri.scheme
         when 'http', 'https'
           return Rest.new(base_url: uri_to_read, redirect_max: 5).call(operation: 'GET', subpath: '', headers: {'Accept' => 'text/plain'})[:data]
         when 'file', NilClass
-          local_file_path = proxy_uri.path
+          local_file_path = uri.path
           raise 'URL shall have a path, check syntax' if local_file_path.nil?
           local_file_path = File.expand_path(local_file_path.gsub(%r{^/}, '')) if %r{^/(~|.|..)/}.match?(local_file_path)
           return File.read(local_file_path)
         else
-          raise "unknown scheme: [#{proxy_uri.scheme}] for [#{uri_to_read}]"
+          raise "unknown scheme: [#{uri.scheme}] for [#{uri_to_read}]"
         end
       end
     end

data/lib/aspera/web_auth.rb

@@ -28,7 +28,7 @@ module Aspera
       response.body = '<html><head><title>Ok</title></head><body><h1>Thank you !</h1><p>You can close this window.</p></body></html>'
       return nil
     end
-  end # WebAuthServlet
+  end
 
   # start a local web server, then start a browser that will callback the local server upon authentication
   class WebAuth < WebServerSimple

data/lib/aspera/web_server_simple.rb

@@ -7,6 +7,7 @@ require 'aspera/assert'
 require 'openssl'
 
 module Aspera
+  # Simple WEBrick server with HTTPS support
   class WebServerSimple < WEBrick::HTTPServer
     CERT_PARAMETERS = %i[key cert chain].freeze
     GENERIC_ISSUER = '/C=FR/O=Test/OU=Test/CN=Test'
@@ -18,8 +19,8 @@ module Aspera
       # generates and adds self signed cert to provided webrick options
       def fill_self_signed_cert(cert, key, digest = 'SHA256')
         cert.subject = cert.issuer = OpenSSL::X509::Name.parse(GENERIC_ISSUER)
-        cert.not_before = Time.now
-        cert.not_after = Time.now + ONE_YEAR_SECONDS
+        cert.not_before = cert.not_after = Time.now
+        cert.not_after += ONE_YEAR_SECONDS
         cert.public_key = key.public_key
         cert.serial = 0x0
         cert.version = 2
@@ -56,7 +57,7 @@ module Aspera
         else
           Aspera.assert_type(certificate, Hash)
           certificate = certificate.symbolize_keys
-          raise "unexpected key in certificate config: only: #{CERT_PARAMETERS.join(', ')}" if certificate.keys.any?{|k|!CERT_PARAMETERS.include?(k)}
+          raise "unexpected key in certificate config: only: #{CERT_PARAMETERS.join(', ')}" if certificate.keys.any?{|key|!CERT_PARAMETERS.include?(key)}
           webrick_options[:SSLPrivateKey] = if certificate.key?(:key)
             OpenSSL::PKey::RSA.new(File.read(certificate[:key]))
           else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aspera-cli
 version: !ruby/object:Gem::Version
-  version: 4.17.0
+  version: 4.18.0
 platform: ruby
 authors:
 - Laurent Martin
@@ -37,7 +37,7 @@ cert_chain:
   eTf9kxhVM40wGQOECVNA8UsEEZHD48eF+csUYZtAJOF5oxTI8UyV9T/o6CgO0c9/
   Gzz+Qm5ULOUcPiJLjSpaiTrkiIVYiDGnqNSr6R1Hb1c=
   -----END CERTIFICATE-----
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blankslate
@@ -403,6 +403,7 @@ files:
 - lib/aspera/api/aoc.rb
 - lib/aspera/api/ats.rb
 - lib/aspera/api/cos_node.rb
+- lib/aspera/api/httpgw.rb
 - lib/aspera/api/node.rb
 - lib/aspera/ascmd.rb
 - lib/aspera/ascp/installation.rb
@@ -422,12 +423,13 @@ files:
 - lib/aspera/cli/plugins/alee.rb
 - lib/aspera/cli/plugins/aoc.rb
 - lib/aspera/cli/plugins/ats.rb
-- lib/aspera/cli/plugins/bss.rb
 - lib/aspera/cli/plugins/config.rb
 - lib/aspera/cli/plugins/console.rb
 - lib/aspera/cli/plugins/cos.rb
 - lib/aspera/cli/plugins/faspex.rb
 - lib/aspera/cli/plugins/faspex5.rb
+- lib/aspera/cli/plugins/faspio.rb
+- lib/aspera/cli/plugins/httpgw.rb
 - lib/aspera/cli/plugins/node.rb
 - lib/aspera/cli/plugins/orchestrator.rb
 - lib/aspera/cli/plugins/preview.rb