aspera-cli 4.18.1 → 4.19.0

data/lib/aspera/ascp/installation.rb

@@ -41,8 +41,11 @@ module Aspera
         </CONF>
       END_OF_CONFIG_FILE
       # all ascp files (in SDK)
-      FILES = %i[ascp ascp4 transferd ssh_private_dsa ssh_private_rsa aspera_license aspera_conf fallback_certificate fallback_private_key].freeze
+      EXE_FILES = %i[ascp ascp4 async].freeze
+      FILES = %i[transferd ssh_private_dsa ssh_private_rsa aspera_license aspera_conf fallback_certificate fallback_private_key].unshift(*EXE_FILES).freeze
       private_constant :EXT_RUBY_PROTOBUF, :RB_SDK_FOLDER, :DEFAULT_ASPERA_CONF, :FILES
+      # options for SSH client private key
+      CLIENT_SSH_KEY_OPTIONS = %i{dsa_rsa rsa per_client}.freeze
       # set ascp executable path
       def ascp_path=(v)
         @path_to_ascp = v
@@ -110,14 +113,14 @@ module Aspera
       def path(k)
         file_is_optional = false
         case k
-        when :ascp, :ascp4
+        when *EXE_FILES
+          file_is_optional = k.eql?(:async)
           use_ascp_from_product(FIRST_FOUND) if @path_to_ascp.nil?
-          file = @path_to_ascp
           # NOTE: that there might be a .exe at the end
-          file = file.gsub('ascp', 'ascp4') if k.eql?(:ascp4)
+          file = @path_to_ascp.gsub('ascp', k.to_s)
         when :transferd
-          file = transferd_filepath
           file_is_optional = true
+          file = transferd_filepath
         when :ssh_private_dsa, :ssh_private_rsa
           # assume last 3 letters are type
           type = k.to_s[-3..-1].to_sym
@@ -151,8 +154,16 @@ module Aspera
         return DataRepository.instance.item(:uuid)
       end
 
-      def aspera_token_ssh_key_paths
-        return %i[ssh_private_dsa ssh_private_rsa].map{|i|Installation.instance.path(i)}
+      # get paths of SSH keys to use for ascp client
+      # @param types [Symbol] types to use
+      def aspera_token_ssh_key_paths(types)
+        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)}
+               when :per_client
+                 raise 'Not yet implemented'
+               end
       end
 
       # use in plugin `config`
@@ -169,13 +180,14 @@ module Aspera
         raise "An error occurred when testing #{ascp_filename}: #{cmd_out}" unless $CHILD_STATUS == 0
         # get version from ascp, only after full extract, as windows requires DLLs (SSL/TLS/etc...)
         m = cmd_out.match(/ version ([0-9.]+)/)
-        exe_version = m[1] unless m.nil?
+        exe_version = m[1].gsub(/\.$/, '') unless m.nil?
         return exe_version
       end
 
-      def ascp_add_pvcl(data)
+      def ascp_pvcl_info
+        data = {}
         # read PATHs from ascp directly, and pvcl modules as well
-        Open3.popen3(data['ascp'], '-DDL-') do |_stdin, _stdout, stderr, thread|
+        Open3.popen3(ascp_path, '-DDL-') do |_stdin, _stdout, stderr, thread|
           last_line = ''
           while (line = stderr.gets)
             line.chomp!
@@ -194,32 +206,32 @@ module Aspera
               data['product_name'] = Regexp.last_match(1)
               data['product_version'] = Regexp.last_match(2)
             when /^LOG Initializing FASP version ([^,]+),/
-              data['ascp_version'] = Regexp.last_match(1)
+              data['sdk_ascp_version'] = Regexp.last_match(1)
             end
           end
           if !thread.value.exitstatus.eql?(1) && !data.key?('root')
             raise last_line
           end
         end
+        return data
       end
 
       # extract some stings from ascp binary
-      def ascp_add_openssl(data)
-        ascp_file = data['ascp']
-        File.binread(ascp_file).scan(/[\x20-\x7E]{10,}/) do |bin_string|
+      def ascp_ssl_info
+        data = {}
+        File.binread(ascp_path).scan(/[\x20-\x7E]{10,}/) do |bin_string|
           if (m = bin_string.match(/OPENSSLDIR.*"(.*)"/))
             data['openssldir'] = m[1]
           elsif (m = bin_string.match(/OpenSSL (\d[^ -]+)/))
             data['openssl_version'] = m[1]
           end
-        end if File.file?(ascp_file)
+        end if File.file?(ascp_path)
+        return data
       end
 
       def ascp_info
-        data = file_paths
-        ascp_add_pvcl(data)
-        ascp_add_openssl(data)
-        return data
+        files = file_paths
+        return files.merge(ascp_pvcl_info).merge(ascp_ssl_info)
       end
 
       # download aspera SDK or use local file
@@ -263,19 +275,22 @@ module Aspera
         # ensure license file are generated so that ascp invocation for version works
         path(:aspera_license)
         path(:aspera_conf)
-        ascp_file = Products.ascp_filename
-        ascp_path = File.join(sdk_folder, ascp_file)
-        raise "No #{ascp_file} found in SDK archive" unless File.exist?(ascp_path)
-        Environment.restrict_file_access(ascp_path, mode: 0o755)
-        Environment.restrict_file_access(ascp_path.gsub('ascp', 'ascp4'), mode: 0o755)
-        ascp_version = get_ascp_version(ascp_path)
-        trd_path = transferd_filepath
-        Log.log.warn{"No #{trd_path} in SDK archive"} unless File.exist?(trd_path)
-        Environment.restrict_file_access(trd_path, mode: 0o755) if File.exist?(trd_path)
-        transferd_version = get_exe_version(trd_path, 'version')
-        sdk_version = transferd_version || ascp_version
-        File.write(File.join(sdk_folder, Products::INFO_META_FILE), "<product><name>IBM Aspera SDK</name><version>#{sdk_version}</version></product>")
-        return sdk_version
+        sdk_ascp_file = Products.ascp_filename
+        sdk_ascp_path = File.join(sdk_folder, sdk_ascp_file)
+        raise "No #{sdk_ascp_file} found in SDK archive" unless File.exist?(sdk_ascp_path)
+        EXE_FILES.each do |exe_sym|
+          exe_path = sdk_ascp_path.gsub('ascp', exe_sym.to_s)
+          Environment.restrict_file_access(exe_path, mode: 0o755) if File.exist?(exe_path)
+        end
+        sdk_ascp_version = get_ascp_version(sdk_ascp_path)
+        sdk_daemon_path = transferd_filepath
+        Log.log.warn{"No #{sdk_daemon_path} in SDK archive"} unless File.exist?(sdk_daemon_path)
+        Environment.restrict_file_access(sdk_daemon_path, mode: 0o755) if File.exist?(sdk_daemon_path)
+        transferd_version = get_exe_version(sdk_daemon_path, 'version')
+        sdk_name = 'IBM Aspera Transfer SDK'
+        sdk_version = transferd_version || sdk_ascp_version
+        File.write(File.join(sdk_folder, Products::INFO_META_FILE), "<product><name>#{sdk_name}</name><version>#{sdk_version}</version></product>")
+        return sdk_name, sdk_version
       end
 
       private

data/lib/aspera/ascp/management.rb

@@ -188,7 +188,7 @@ module Aspera
       # empty line is separator to end event information
       MGT_FRAME_SEPARATOR = ''
       # fields description for JSON generation
-      # spellchecker: disable
+      # cspell: disable
       INTEGER_FIELDS = %w[Bytescont FaspFileArgIndex StartByte Rate MinRate Port Priority RateCap MinRateCap TCPPort CreatePolicy TimePolicy
                           DatagramSize XoptFlags VLinkVersion PeerVLinkVersion DSPipelineDepth PeerDSPipelineDepth ReadBlockSize WriteBlockSize
                           ClusterNumNodes ClusterNodeId Size Written Loss FileBytes PreTransferBytes TransferBytes PMTU Elapsedusec ArgScansAttempted
@@ -219,6 +219,9 @@ module Aspera
       end
       attr_reader :last_event
 
+      # process line of mgt port event
+      # @param line [String] line of mgt port event
+      # @return [Hash] event hash or nil if event is not yet complete
       def process_line(line)
         # Log.log.debug{"line=[#{line}]"}
         case line

data/lib/aspera/ascp/products.rb

@@ -126,7 +126,7 @@ module Aspera
 
         # filename for ascp with optional extension (Windows)
         def ascp_filename
-          return 'ascp' + Environment.exe_extension
+          return "ascp#{Environment.exe_extension}"
         end
 
         # @return folder paths for specified applications
@@ -150,12 +150,6 @@ module Aspera
           end
           raise "no connect uri file found in #{folder}"
         end
-
-        # @ return path to configuration file of aspera CLI
-        # def cli_conf_file
-        #  connect = folders(PRODUCT_CLI_V1)
-        #  return File.join(connect[:app_root], BIN_SUBFOLDER, '.aspera_cli_conf')
-        # end
       end
     end
   end

data/lib/aspera/cli/formatter.rb

@@ -98,11 +98,12 @@ module Aspera
       CSV_RECORD_SEPARATOR = "\n"
       CSV_FIELD_SEPARATOR = ','
       # supported output formats
-      DISPLAY_FORMATS = %i[text nagios ruby json jsonpp yaml table csv image].freeze
+      DISPLAY_FORMATS = %i[text nagios ruby json jsonpp yaml table multi csv image].freeze
       # user output levels
       DISPLAY_LEVELS = %i[info data error].freeze
+      FIELD_VALUE_HEADINGS = %i[key value].freeze
 
-      private_constant :DISPLAY_FORMATS, :DISPLAY_LEVELS, :CSV_RECORD_SEPARATOR, :CSV_FIELD_SEPARATOR
+      private_constant :DISPLAY_FORMATS, :DISPLAY_LEVELS, :CSV_RECORD_SEPARATOR, :CSV_FIELD_SEPARATOR, :FIELD_VALUE_HEADINGS
       # prefix to display error messages in user messages (terminal)
       ERROR_FLASH = 'ERROR:'.bg_red.gray.blink.freeze
       WARNING_FLASH = 'WARNING:'.bg_brown.black.blink.freeze
@@ -116,7 +117,7 @@ module Aspera
 
         def tick(yes)
           result =
-            if Environment.terminal_supports_unicode?
+            if Environment.instance.terminal_supports_unicode?
               if yes
                 "\u2713"
               else
@@ -150,16 +151,9 @@ module Aspera
       end
 
       # Highlight special values
-      def special_format(what, use_colors: $stdout.isatty)
-        result = $stdout.isatty ? "<#{what}>" : "&lt;#{what}&gt;"
-        if use_colors
-          result = if %w[null empty].any?{|s|what.include?(s)}
-            result.dim
-          else
-            result.reverse_color
-          end
-        end
-        return result
+      def special_format(what)
+        result = "<#{what}>"
+        return %w[null empty].any?{|s|what.include?(s)} ? result.dim : result.reverse_color
       end
 
       # call this after REST calls if several api calls are expected
@@ -198,7 +192,7 @@ module Aspera
       end
 
       def declare_options(options)
-        default_table_style = if Environment.terminal_supports_unicode?
+        default_table_style = if Environment.instance.terminal_supports_unicode?
           {border: :unicode_round}
         else
           {}
@@ -326,16 +320,16 @@ module Aspera
           display_message(:info, special_format('empty')) if @options[:format].eql?(:table)
           return
         end
+        # if table has only one element, and only one field, display the value
         if object_array.length == 1 && fields.length == 1
           display_message(:data, object_array.first[fields.first])
           return
         end
         # Special case if only one row (it could be object_list or single_object)
         if @options[:transpose_single] && object_array.length == 1
-          new_columns = %i[key value]
           single = object_array.first
-          object_array = fields.map { |i| new_columns.zip([i, single[i]]).to_h }
-          fields = new_columns
+          object_array = fields.map { |i| FIELD_VALUE_HEADINGS.zip([i, single[i]]).to_h }
+          fields = FIELD_VALUE_HEADINGS
         end
         Log.log.debug{Log.dump(:object_array, object_array)}
         # convert data to string, and keep only display fields
@@ -348,8 +342,18 @@ module Aspera
             headings:  fields,
             rows:      final_table_rows,
             style:     @options[:table_style]&.symbolize_keys))
+        when :multi
+          final_table_rows.each do |row|
+            Log.log.debug{Log.dump(:row, row)}
+            display_message(:data, Terminal::Table.new(
+              headings:  FIELD_VALUE_HEADINGS,
+              rows:      fields.zip(row),
+              style:     @options[:table_style]&.symbolize_keys))
+          end
         when :csv
           display_message(:data, final_table_rows.map{|t| t.join(CSV_FIELD_SEPARATOR)}.join(CSV_RECORD_SEPARATOR))
+        else
+          raise "not expected: #{@options[:format]}"
         end
       end
 
@@ -420,7 +424,7 @@ module Aspera
           end
           raise "not url: #{url.class} #{url}" unless url.is_a?(String)
           display_message(:data, status_image(url))
-        when :table, :csv
+        when :table, :csv, :multi
           case type
           when :config_over
             display_table(Flattener.new(self).config_over(data), CONF_OVERVIEW_KEYS)
@@ -452,6 +456,8 @@ module Aspera
           else
             raise "unknown data type: #{type}"
           end
+        else
+          raise "not expected: #{@options[:format]}"
         end
       end
     end

data/lib/aspera/cli/manager.rb

@@ -20,7 +20,7 @@ module Aspera
         @method = method_name
         @option_name = option_name
         @has_writer = @object.respond_to?(writer_method)
-        Log.log.debug{"AttrAccessor: #{@option_name}: #{@object.class}.#{@method}: writer=#{@has_writer}"}
+        Log.log.trace1{"AttrAccessor: #{@option_name}: #{@object.class}.#{@method}: writer=#{@has_writer}"}
         Aspera.assert(@object.respond_to?(@method)) {"#{object} does not respond to #{method_name}"}
       end
 
@@ -328,7 +328,7 @@ module Aspera
         if opt[:read_write].eql?(:accessor)
           Aspera.assert_type(handler, Hash)
           Aspera.assert(handler.keys.sort.eql?(%i[m o]))
-          Log.log.debug{"set attr obj #{option_symbol} (#{handler[:o]},#{handler[:m]})"}
+          Log.log.trace1{"set attr obj: #{option_symbol} (#{handler[:o]},#{handler[:m]})"}
           opt[:accessor] = AttrAccessor.new(handler[:o], handler[:m], option_symbol)
         end
         set_option(option_symbol, default, where: 'default') unless default.nil?
@@ -372,7 +372,7 @@ module Aspera
           @parser.on(*on_args, &block)
         else Aspera.error_unexpected_value(values)
         end
-        Log.log.debug{"on_args=#{on_args}"}
+        Log.log.trace1{"on_args=#{on_args}"}
       end
 
       # Adds each of the keys of specified hash as an option
@@ -435,7 +435,7 @@ module Aspera
 
       # removes already known options from the list
       def parse_options!
-        Log.log.debug('parse_options!'.red)
+        Log.log.trace1('parse_options!'.red)
         # first conf file, then env var
         consume_option_pairs(@option_pairs_batch, 'set')
         consume_option_pairs(@option_pairs_env, 'env')
@@ -443,16 +443,16 @@ module Aspera
         unknown_options = []
         begin
           # remove known options one by one, exception if unknown
-          Log.log.debug('before parse'.red)
+          Log.log.trace1('before parse'.red)
           @parser.parse!(@unprocessed_cmd_line_options)
-          Log.log.debug('After parse'.red)
+          Log.log.trace1('After parse'.red)
         rescue OptionParser::InvalidOption => e
-          Log.log.debug{"InvalidOption #{e}".red}
+          Log.log.trace1{"InvalidOption #{e}".red}
           # save for later processing
           unknown_options.push(e.args.first)
           retry
         end
-        Log.log.debug{"remains: #{unknown_options}"}
+        Log.log.trace1{"remains: #{unknown_options}"}
         # set unprocessed options for next time
         @unprocessed_cmd_line_options = unknown_options
       end
@@ -538,7 +538,7 @@ module Aspera
       # @param unprocessed_options [Array] list of options to apply (key_sym,value)
       # @param where [String] where the options come from
       def consume_option_pairs(unprocessed_options, where)
-        Log.log.debug{"consume_option_pairs: #{where}"}
+        Log.log.trace1{"consume_option_pairs: #{where}"}
         options_to_set = {}
         unprocessed_options.each do |k, v|
           if @declared_options.key?(k)
@@ -548,7 +548,7 @@ module Aspera
             end
             options_to_set[k] = v
           else
-            Log.log.debug{"unprocessed: #{k}: #{v}"}
+            Log.log.trace1{"unprocessed: #{k}: #{v}"}
           end
         end
         options_to_set.each do |k, v|

data/lib/aspera/cli/plugin.rb

@@ -5,7 +5,7 @@ require 'aspera/assert'
 
 module Aspera
   module Cli
-    # base class for plugins modules
+    # Base class for plugins
     class Plugin
       # operations without id
       GLOBAL_OPS = %i[create list].freeze
@@ -53,8 +53,8 @@ module Aspera
         options.parser.separator('OPTIONS:')
       end
 
+      # @return a hash of instance variables
       def init_params
-        # return a hash of instance variables
         INIT_PARAMS.map{|p| [p, instance_variable_get("@#{p}".to_sym)]}.to_h
       end
 

data/lib/aspera/cli/plugin_factory.rb

@@ -3,7 +3,7 @@
 require 'singleton'
 module Aspera
   module Cli
-    # option is retrieved from another object using accessor
+    # Instantiate plugin from well-known locations
     class PluginFactory
       include Singleton
 
@@ -19,14 +19,17 @@ module Aspera
         @plugins = {}
       end
 
+      # @return list of registered plugins
       def plugin_list
         @plugins.keys
       end
 
+      # @return path to source file of plugin
       def plugin_source(plugin_name_sym)
         @plugins[plugin_name_sym][:source]
       end
 
+      # add a folder to the list of folders to look for plugins
       def add_lookup_folder(folder)
         @lookup_folders.unshift(folder)
       end
@@ -43,6 +46,7 @@ module Aspera
         end
       end
 
+      # @return Class object for plugin
       def plugin_class(plugin_name_sym)
         raise "ERROR: plugin not found: #{plugin_name_sym}" unless @plugins.key?(plugin_name_sym)
         require @plugins[plugin_name_sym][:require_stanza]
@@ -50,6 +54,9 @@ module Aspera
         return Object.const_get("#{Module.nesting[1]}::#{PLUGINS_MODULE}::#{plugin_name_sym.to_s.capitalize}")
       end
 
+      # Create specified plugin
+      # @param plugin_name_sym [Symbol] name of plugin
+      # @param args [Hash] arguments to pass to plugin constructor
       def create(plugin_name_sym, **args)
         # TODO: check that ancestor is Plugin?
         plugin_class(plugin_name_sym).new(**args)
@@ -57,6 +64,8 @@ module Aspera
 
       private
 
+      # add plugin information to list
+      # @param path [String] path to plugin source file
       def add_plugin_info(path)
         raise "ERROR: plugin path must end with #{RUBY_FILE_EXT}" if !path.end_with?(RUBY_FILE_EXT)
         plugin_symbol = File.basename(path, RUBY_FILE_EXT).to_sym

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

@@ -281,6 +281,8 @@ module Aspera
         attr_reader :option_ignore_cert_host_port, :progress_bar
 
         # add files, folders or default locations to the certificate store
+        # @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'}
@@ -296,10 +298,10 @@ module Aspera
             Log.log.debug{"Adding cert location: #{path}"}
             if path.eql?(SpecialValues::DEF)
               @certificate_store.set_default_paths
-              paths_to_add = [
-                OpenSSL::X509::DEFAULT_CERT_DIR,
-                OpenSSL::X509::DEFAULT_CERT_FILE
-              ].select{|f|File.exist?(f)}
+              paths_to_add = [OpenSSL::X509::DEFAULT_CERT_DIR]
+              # JRuby cert file seems not to be PEM
+              paths_to_add.push(OpenSSL::X509::DEFAULT_CERT_FILE) unless defined?(JRUBY_VERSION)
+              paths_to_add.select!{|f|File.exist?(f)}
             elsif File.file?(path)
               @certificate_store.add_file(path)
             elsif File.directory?(path)
@@ -578,7 +580,7 @@ module Aspera
             @config_checksum_on_disk = config_checksum
           end
           files_to_copy = []
-          Log.log.debug{Log.dump('Available_presets', @config_presets)}
+          Log.log.trace1{Log.dump('Available_presets', @config_presets)}
           Aspera.assert_type(@config_presets, Hash){'config file YAML'}
           # check there is at least the config section
           Aspera.assert(@config_presets.key?(CONF_PRESET_CONFIG)){"Cannot find key: #{CONF_PRESET_CONFIG}"}
@@ -699,8 +701,7 @@ module Aspera
             return execute_connect_action
           when :use
             ascp_path = options.get_next_argument('path to ascp')
-            ascp_version = Ascp::Installation.instance.get_ascp_version(ascp_path)
-            formatter.display_status("ascp version: #{ascp_version}")
+            formatter.display_status("ascp version: #{Ascp::Installation.instance.get_ascp_version(ascp_path)}")
             set_global_default(:ascp_path, ascp_path)
             return Main.result_nothing
           when :show
@@ -729,8 +730,8 @@ module Aspera
           when :install
             # reset to default location, if older default was used
             Ascp::Installation.instance.sdk_folder = self.class.default_app_main_folder(app_name: APP_NAME_SDK) if @sdk_default_location
-            v = Ascp::Installation.instance.install_sdk(options.get_option(:sdk_url, mandatory: true))
-            return Main.result_status("Installed version #{v}")
+            n, v = Ascp::Installation.instance.install_sdk(options.get_option(:sdk_url, mandatory: true))
+            return Main.result_status("Installed #{n} version #{v}")
           when :spec
             return {
               type:   :object_list,
@@ -871,7 +872,9 @@ module Aspera
           check_update
           initdemo
           vault
-          throw].freeze
+          throw
+          platform
+        ].freeze
 
         # Main action procedure for plugin
         def execute_action
@@ -1015,6 +1018,8 @@ module Aspera
             exception_class = Object.const_get(exception_class_name)
             Aspera.assert(exception_class <= Exception){"#{exception_class} is not an exception: #{exception_class.class}"}
             raise exception_class, exception_text
+          when :platform
+            return Main.result_status(Environment.architecture)
           else Aspera.error_unreachable_line
           end
         end

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

@@ -531,16 +531,17 @@ module Aspera
             # if a single file: split into folder and path
             apifid = @api_node.resolve_api_fid(top_file_id, source_folder)
             if source_paths.empty?
+              # get precise info in this element
               file_info = apifid[:api].read("files/#{apifid[:file_id]}")[:data]
               case file_info['type']
               when 'file'
                 # if the single source is a file, we need to split into folder path and filename
                 src_dir_elements = source_folder.split(Api::Node::PATH_SEPARATOR)
-                # filename is the last one
+                # filename is the last one, source folder is what remains
                 source_paths = [{'source' => src_dir_elements.pop}]
-                # source folder is what remains
+                # add trailing / so that link is resolved, if it's a shared folder
+                src_dir_elements.push('')
                 source_folder = src_dir_elements.join(Api::Node::PATH_SEPARATOR)
-                # TODO: instead of creating a new object, use the same, and change file id with parent folder id ? possible ?
                 apifid = @api_node.resolve_api_fid(top_file_id, source_folder)
               when 'link', 'folder'
                 # single source is 'folder' or 'link'

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

@@ -176,7 +176,7 @@ module Aspera
         def execute_transfer(command, transfer_spec)
           case command
           when :upload, :download
-            Transfer::Spec.action_to_direction(transfer_spec, command)
+            transfer_spec['direction'] = Transfer::Spec.transfer_type_to_direction(command)
             return Main.result_transfer(transfer.start(transfer_spec))
           when :sync
             # lets ignore the arguments provided by execute_sync_action, we just give the transfer spec

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

@@ -7,7 +7,10 @@ module Aspera
     module Plugins
       # Plugin for Aspera Shares v1
       class Shares < Cli::BasicAuthPlugin
-        NODE_API_PREFIX = 'node_api'
+        # path for node API after base url
+        NODE_API_PATH = 'node_api'
+        # path for node admin after base url
+        ADMIN_API_PATH = 'api/v1'
         class << self
           def detect(address_or_url)
             address_or_url = "https://#{address_or_url}" unless address_or_url.match?(%r{^[a-z]{1,6}://})
@@ -16,7 +19,7 @@ module Aspera
             begin
               # shall fail: shares requires auth, but we check error message
               # TODO: use ping instead ?
-              api.read("#{NODE_API_PREFIX}/app")
+              api.read("#{NODE_API_PATH}/app")
             rescue RestCallError => e
               if e.response.code.to_s.eql?('401') && e.response.body.eql?('{"error":{"user_message":"API user authentication failed"}}')
                 found = true
@@ -65,7 +68,7 @@ module Aspera
             nagios = Nagios.new
             begin
               res = Rest
-                .new(base_url: "#{options.get_option(:url, mandatory: true)}/#{NODE_API_PREFIX}")
+                .new(base_url: "#{options.get_option(:url, mandatory: true)}/#{NODE_API_PATH}")
                 .call(
                   operation: 'GET',
                   subpath: 'ping',
@@ -77,13 +80,13 @@ module Aspera
             end
             return nagios.result
           when :repository, :files
-            api_shares_node = basic_auth_api(NODE_API_PREFIX)
+            api_shares_node = basic_auth_api(NODE_API_PATH)
             repo_command = options.get_next_command(Node::COMMANDS_SHARES)
             return Node
                 .new(**init_params, api: api_shares_node)
                 .execute_action(repo_command)
           when :admin
-            api_shares_admin = basic_auth_api('api/v1')
+            api_shares_admin = basic_auth_api(ADMIN_API_PATH)
             admin_command = options.get_next_command(%i[node share transfer_settings user group].freeze)
             case admin_command
             when :node
@@ -92,8 +95,9 @@ module Aspera
               share_command = options.get_next_command(%i[user_permissions group_permissions].concat(Plugin::ALL_OPS))
               case share_command
               when *Plugin::ALL_OPS
-                return entity_command(share_command, api_shares_admin, 'data/shares')
-                # return {type: :object_list, data: all_shares, fields: %w[id name status status_message]}
+                return entity_command(
+                  share_command, api_shares_admin, 'data/shares',
+                  display_fields: %w[id name node_id directory percent_free])
               when :user_permissions, :group_permissions
                 share_id = instance_identifier
                 return entity_action(api_shares_admin, "data/shares/#{share_id}/#{share_command}")