aspera-cli 4.8.0 → 4.9.0

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

@@ -55,13 +55,11 @@ module Aspera
           options.add_opt_simple(:name,'resource name')
           options.add_opt_simple(:path,'file or folder path')
           options.add_opt_simple(:link,'public link to shared resource')
-          options.add_opt_simple(:new_user_option,'new user creation option')
+          options.add_opt_simple(:new_user_option,'new user creation option for unknown package recipients')
           options.add_opt_simple(:from_folder,'share to share source folder')
           options.add_opt_simple(:scope,'OAuth scope for AoC API calls')
-          options.add_opt_boolean(:bulk,'bulk operation')
           options.add_opt_boolean(:default_ports,'use standard FASP ports or get from node api')
           options.add_opt_boolean(:validate_metadata,'validate shared inbox metadata')
-          options.set_option(:bulk,:no)
           options.set_option(:default_ports,:yes)
           options.set_option(:validate_metadata,:yes)
           options.set_option(:new_user_option,{'package_contact' => true})
@@ -91,7 +89,8 @@ module Aspera
           return transfer.start(*aoc_api.tr_spec(app,direction,node_file,ts_add))
         end
 
-        NODE4_COMMANDS = %i[bearer_token_node node_info browse find mkdir rename delete upload download transfer http_node_download v3 file].freeze
+        NODE4_CMD_PATH = %i[bearer_token_node node_info browse find]
+        NODE4_COMMANDS = [NODE4_CMD_PATH,%i[mkdir rename delete upload download transfer http_node_download v3 file]].flatten.freeze
 
         def execute_node_gen4_command(command_repo,top_node_file)
           case command_repo
@@ -145,7 +144,7 @@ module Aspera
             return Main.result_status("renamed #{thepath} to #{newname}")
           when :delete
             thepath = options.get_next_argument('path')
-            return do_bulk_operation(thepath,'deleted','path') do |l_path|
+            return do_bulk_operation(thepath,'deleted',id_result: 'path') do |l_path|
               raise "expecting String (path), got #{l_path.class.name} (#{l_path})" unless l_path.is_a?(String)
               node_file = aoc_api.resolve_node_file(top_node_file,l_path)
               node_api = aoc_api.get_node_api(node_file[:node_info])
@@ -232,8 +231,10 @@ module Aspera
             file_path = options.get_option(:path)
             node_file =
               if !file_path.nil?
+                # directly returns node_file info
                 aoc_api.resolve_node_file(top_node_file,file_path) # TODO: allow follow link ?
               else
+                # build node_file info from next argument on command line
                 {node_info: top_node_file[:node_info],file_id: instance_identifier}
               end
             node_api = aoc_api.get_node_api(node_file[:node_info])
@@ -246,7 +247,7 @@ module Aspera
               res = node_api.update("files/#{node_file[:file_id]}",update_param)[:data]
               return {type: :single_object,data: res}
             when :permission
-              command_perm = options.get_next_command(%i[list create])
+              command_perm = options.get_next_command(%i[list create delete])
               case command_perm
               when :list
                 # generic options : TODO: as arg ? option_url_query
@@ -259,15 +260,20 @@ module Aspera
                 end
                 items = node_api.read('permissions',list_options)[:data]
                 return {type: :object_list,data: items}
+              when :delete
+                perm_id=instance_identifier
+                return do_bulk_operation(perm_id,'deleted') do |one_id|
+                  node_api.delete("permissions/#{perm_id}")
+                  {'id' => one_id}
+                end
+                #node_api.delete("permissions/#{perm_id}")
               when :create
-                #create_param=self.options.get_next_argument('creation data (Hash)')
-                set_workspace_info
-                access_id = "#{ID_AK_ADMIN}_WS_#{@workspace_info['id']}"
-                node_file[:node_info]
-                params = {
+                create_param=options.get_next_argument('creation data (Hash)')
+                #access_id = "#{ID_AK_ADMIN}_WS_#{@workspace_info['id']}"
+                default_params = {
                   'file_id'       => node_file[:file_id], # mandatory
-                  'access_type'   => 'user', # mandatory: user or group
-                  'access_id'     => access_id, # id of user or group
+                  #'access_type'   => 'user', # mandatory: user or group
+                  #'access_id'     => access_id, # id of user or group
                   'access_levels' => Aspera::Node::ACCESS_LEVELS,
                   'tags'          => {'aspera' => {'files' => {'workspace' => {
                     'id'                => @workspace_info['id'],
@@ -276,12 +282,39 @@ module Aspera
                     'shared_by_user_id' => aoc_api.user_info['id'],
                     'shared_by_name'    => aoc_api.user_info['name'],
                     'shared_by_email'   => aoc_api.user_info['email'],
-                    'shared_with_name'  => access_id,
+                    #'shared_with_name'  => access_id,
                     'access_key'        => node_file[:node_info]['access_key'],
                     'node'              => node_file[:node_info]['name']}}}}}
+                create_param = default_params.deep_merge(create_param)
+                if create_param.has_key?('with')
+                  contact_info = aoc_api.lookup_entity_by_name(
+                    'contacts',
+                    create_param['with'],
+                    {'current_workspace_id' => @workspace_info['id'],'context'=> 'share_folder'})
+                  create_param.delete('with')
+                  create_param['access_type']=contact_info['source_type']
+                  create_param['access_id']=contact_info['source_id']
+                  create_param['tags']['aspera']['files']['workspace']['shared_with_name']=contact_info['email']
+                end
+                opt_link_name=nil
+                if create_param.has_key?('link_name')
+                  opt_link_name=create_param['link_name']
+                  create_param.delete('link_name')
+                end
+                # for admin type:
+                #node_file[:node_info]
                 #node_api = aoc_api.get_node_api(node_file[:node_info])
-                item = node_api.create('permissions',params)[:data]
-                return {type: :single_object,data: item}
+                created_data = node_api.create('permissions',create_param)[:data]
+                event_creation={
+                  'types'        => ['permission.created'],
+                  'node_id'      => node_file[:node_info]['id'],
+                  'workspace_id' => @workspace_info['id'],
+                  'data'         => created_data # Response from previous step
+                }
+                #(optional). The name of the folder to be displayed to the destination user. Use it if its value is different from the "share_as" field.
+                event_creation['link_name']=opt_link_name unless opt_link_name.nil?
+                aoc_api.create('events',event_creation)
+                return { type: :single_object, data: created_data}
               else raise "internal error:shall not reach here (#{command_perm})"
               end
             else raise "internal error:shall not reach here (#{command_node_file})"
@@ -346,7 +379,7 @@ module Aspera
           end
           home_node_id ||= @workspace_info['home_node_id'] || @workspace_info['node_id']
           home_file_id ||= @workspace_info['home_file_id']
-          raise 'Cannot get users home node id' if home_node_id.to_s.empty?
+          raise "Cannot get user's home node id, check your default workspace or specify one" if home_node_id.to_s.empty?
           @home_node_file = {
             node_info: aoc_api.read("nodes/#{home_node_id}")[:data],
             file_id:   home_file_id
@@ -356,25 +389,6 @@ module Aspera
           return nil
         end
 
-        def do_bulk_operation(ids_or_one,success_msg,id_result='id')
-          raise 'missing block' unless block_given?
-          ids_or_one = [ids_or_one] unless options.get_option(:bulk)
-          raise 'expecting Array' unless ids_or_one.is_a?(Array)
-          result_list = []
-          ids_or_one.each do |id|
-            one = {id_result => id}
-            begin
-              res = yield(id)
-              one = res if id.is_a?(Hash) # if block returns a has, let's use this
-              one['status'] = success_msg
-            rescue StandardError => e
-              one['status'] = e.to_s
-            end
-            result_list.push(one)
-          end
-          return {type: :object_list,data: result_list,fields: [id_result,'status']}
-        end
-
         # get identifier or name from command line
         # @return identifier
         def get_resource_id_from_args(resource_class_path)
@@ -395,7 +409,12 @@ module Aspera
           return "#{resource_class_path}/#{get_resource_id_from_args(resource_class_path)}"
         end
 
-        # package creation params can give just email, and full hash is created
+        # Normalize package creation recipient lists as expected by AoC API
+        # AoC expects {type: , id: }, but ascli allows providing either the native values or just a name
+        # in that case, the name is resolved and replaced with {type: , id: }
+        # @param package_data The whole package creation payload
+        # @param recipient_list_field The field in structure, i.e. recipients or bcc_recipients
+        # @return nil package_data is modified
         def resolve_package_recipients(package_data,recipient_list_field)
           return unless package_data.has_key?(recipient_list_field)
           raise CliBadArgument,"#{recipient_list_field} must be an Array" unless package_data[recipient_list_field].is_a?(Array)
@@ -404,17 +423,21 @@ module Aspera
           resolved_list = []
           package_data[recipient_list_field].each do |short_recipient_info|
             case short_recipient_info
-            when Hash # native api information, check keys
+            when Hash # native API information, check keys
               raise "#{recipient_list_field} element shall have fields: id and type" unless short_recipient_info.keys.sort.eql?(%w[id type])
-            when String # need to resolve name to type/id
+            when String # CLI helper: need to resolve provided name to type/id
               # email: user, else dropbox
               entity_type = short_recipient_info.include?('@') ? 'contacts' : 'dropboxes'
               begin
                 full_recipient_info = aoc_api.lookup_entity_by_name(entity_type,short_recipient_info,{'current_workspace_id' => @workspace_info['id']})
               rescue RuntimeError => e
                 raise e unless e.message.start_with?(Aspera::AoC::ENTITY_NOT_FOUND)
-                raise "no such shared inbox in workspace #{@workspace_info['name']}" unless entity_type.eql?('contacts')
-                full_recipient_info = aoc_api.create('contacts',{'current_workspace_id' => @workspace_info['id'],'email' => short_recipient_info}.merge(new_user_option))[:data]
+                # dropboxes cannot be created on the fly
+                raise "no such shared inbox in workspace #{@workspace_info['name']}" if entity_type.eql?('dropboxes')
+                # unknown user: create it as external user
+                full_recipient_info = aoc_api.create('contacts',{
+                  'current_workspace_id' => @workspace_info['id'],
+                  'email'                => short_recipient_info}.merge(new_user_option))[:data]
               end
               short_recipient_info = if entity_type.eql?('dropboxes')
                 {'id' => full_recipient_info['id'],'type' => 'dropbox'}
@@ -429,6 +452,7 @@ module Aspera
           end
           # replace with resolved elements
           package_data[recipient_list_field] = resolved_list
+          return nil
         end
 
         def normalize_metadata(pkg_data)
@@ -503,6 +527,7 @@ module Aspera
 
         # Call aoc_api.read with same parameters.
         # Use paging if necessary to get all results
+        # @return {list: , total: }
         def read_with_paging(resource_class_path,base_query)
           raise 'Query must be Hash' unless base_query.is_a?(Hash)
           # set default large page if user does not specify own parameters. AoC Caps to 1000 anyway
@@ -530,7 +555,7 @@ module Aspera
             break if !max_pages.nil? && page_count > max_pages
             break if !max_items.nil? && item_list.count > max_items
           end
-          return item_list,total_count
+          return {list: item_list,total: total_count}
         end
 
         def execute_admin_action
@@ -688,7 +713,7 @@ module Aspera
               # TODO: report inconsistency: creation url is !=, and does not return id.
               resource_class_path = 'admin/client_registration/token' if resource_class_path.eql?('admin/client_registration_tokens')
               list_or_one = options.get_next_argument('creation data (Hash)')
-              return do_bulk_operation(list_or_one,'created',id_result) do |params|
+              return do_bulk_operation(list_or_one,'created',id_result: id_result) do |params|
                 raise 'expecting Hash' unless params.is_a?(Hash)
                 aoc_api.create(resource_class_path,params)[:data]
               end
@@ -708,11 +733,11 @@ module Aspera
               when :group_membership then default_fields.push(*%w[group_id member_type member_id])
               when :workspace_membership then default_fields.push(*%w[workspace_id member_type member_id])
               end
-              item_list,total_count = read_with_paging(resource_class_path,option_url_query(default_query))
-              count_msg = "Items: #{item_list.length}/#{total_count}"
-              count_msg = count_msg.bg_red unless item_list.length.eql?(total_count.to_i)
+              items = read_with_paging(resource_class_path,option_url_query(default_query))
+              count_msg = "Items: #{items[:list].length}/#{items[:total]}"
+              count_msg = count_msg.bg_red unless items[:list].length.eql?(items[:total].to_i)
               self.format.display_status(count_msg)
-              return {type: :object_list,data: item_list,fields: default_fields}
+              return {type: :object_list,data: items[:list],fields: default_fields}
             when :show
               object = aoc_api.read(resource_instance_path)[:data]
               fields = object.keys.reject{|k|k.eql?('certificate')}
@@ -740,9 +765,9 @@ module Aspera
               command_repo = options.get_next_command(NODE4_COMMANDS)
               return execute_node_gen4_command(command_repo,{node_info: res_data, file_id: ak_root_file_id})
             when :shared_folder
-              Log.log.warn('ATTENTION: under development')
+              Log.log.warn('ATTENTION: alpha, under development, do not use')
               # inside a workspace
-              command_shared = options.get_next_command(%i[list create member delete])
+              command_shared = options.get_next_command(%i[list create delete]) # member
               core_api=Rest.new(aoc_api.params.merge(base_url: aoc_api.params[:base_url].gsub('/api.','/sedemo.')))
               # generic permission created for each shared folder
               access_id = "#{ID_AK_ADMIN}_WS_#{res_id}"
@@ -787,7 +812,7 @@ module Aspera
                 # remove from creation data if present, as it is not a standard argument
                 shared_create_data.delete('node_id')
                 # get optional link_name
-                opt_link_name=shared_create_data['link_name']
+                #opt_link_name=shared_create_data['link_name']
                 shared_create_data.delete('link_name')
                 raise 'missing node information: path' unless shared_create_data.has_key?('path')
                 folder_path=shared_create_data['path']
@@ -815,6 +840,7 @@ module Aspera
                 }}}}
                 shared_create_data = default_create_data.deep_merge(default_create_data) # ?aspera-node-basic=#{node_id}&aspera-node-prefer-basic=#{node_id}
                 created_data = node_api.create('permissions',shared_create_data)[:data]
+                # new API:
                 #created_data=aoc_api.create("node/#{node_id}/permissions",shared_create_data)[:data]
                 # TODO: send event
                 event_creation={
@@ -824,7 +850,7 @@ module Aspera
                   'data'         => created_data # Response from previous step
                 }
                 #(optional). The name of the folder to be displayed to the destination user. Use it if its value is different from the "share_as" field.
-                event_creation['link_name']=opt_link_name unless opt_link_name.nil?
+                #event_creation['link_name']=opt_link_name unless opt_link_name.nil?
                 aoc_api.create('events',event_creation)
                 return { type: :single_object, data: created_data}
               end
@@ -877,7 +903,8 @@ module Aspera
             end
           when :packages
             set_workspace_info if @url_token_data.nil?
-            case options.get_next_command(%i[shared_inboxes send recv list show delete])
+            package_command = options.get_next_command([%i[shared_inboxes send recv list show delete],NODE4_CMD_PATH].flatten)
+            case package_command
             when :shared_inboxes
               case options.get_next_command(%i[list show])
               when :list
@@ -1004,6 +1031,15 @@ module Aspera
                 raise 'expecting String identifier' unless id.is_a?(String) || id.is_a?(Integer)
                 aoc_api.delete("packages/#{id}")[:data]
               end
+            when *NODE4_CMD_PATH
+              package_id = options.get_next_argument('package ID')
+              #path = options.get_next_argument('path', mandatory: false) || '/'
+              package_info = aoc_api.read("packages/#{package_id}")[:data]
+              package_node_file = {
+                node_info: aoc_api.read("nodes/#{package_info['node_id']}")[:data],
+                file_id:   package_info['file_id']
+              }
+              return execute_node_gen4_command(package_command,package_node_file)
             end
           when :files
             # get workspace related information

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

@@ -251,7 +251,9 @@ module Aspera
           require 'openssl'
           priv_key = OpenSSL::PKey::RSA.new(length)
           File.write(private_key_path,priv_key.to_s)
+          File.chmod(0400,private_key_path)
           File.write(private_key_path + '.pub',priv_key.public_key.to_s)
+          File.chmod(0400,private_key_path + '.pub')
           nil
         end
 
@@ -773,6 +775,7 @@ module Aspera
             result = {type: :other_struct, data: options.get_next_argument('value')}
             # special for csv
             result[:type] = :object_list if result[:data].is_a?(Array) && result[:data].first.is_a?(Hash)
+            result[:type] = :single_object if result[:data].is_a?(Hash)
             return result
           when :flush_tokens
             deleted_files = Oauth.flush_tokens
@@ -1020,8 +1023,10 @@ module Aspera
         def save_presets_to_config_file
           raise 'no configuration loaded' if @config_presets.nil?
           FileUtils.mkdir_p(@main_folder) unless Dir.exist?(@main_folder)
+          File.chmod(0700,@main_folder)
           Log.log.debug("Writing #{@option_config_file}")
           File.write(@option_config_file,@config_presets.to_yaml)
+          File.chmod(0600,@option_config_file)
         end
 
         # returns [String] name if config_presets has default

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

@@ -326,9 +326,6 @@ module Aspera
                 recipient = options.get_option(:recipient)
                 if delivid.eql?(VAL_ALL)
                   pkg_id_uri = mailbox_filtered_entries.map{|i|{id: i[PACKAGE_MATCH_FIELD],uri: self.class.get_fasp_uri_from_entry(i, raise_no_link: false)}}
-                  # TODO : remove ids from skip not present in inbox to avoid growing too big
-                  # skip_ids_data.select!{|id|pkg_id_uri.select{|p|p[:id].eql?(id)}}
-                  pkg_id_uri.reject!{|i|skip_ids_data.include?(i[:id])}
                 elsif !recipient.nil? && recipient.start_with?('*')
                   found_package_link = mailbox_filtered_entries(stop_at_id: delivid).find{|p|p[PACKAGE_MATCH_FIELD].eql?(delivid)}['link'].first['href']
                   raise 'Not Found. Dropbox and Workgroup packages can use the link option with faspe:' if found_package_link.nil?
@@ -367,8 +364,12 @@ module Aspera
                 transfer_uri = self.class.get_fasp_uri_from_entry(package_entry)
                 pkg_id_uri = [{id: package_entry['id'],uri: transfer_uri}]
               end # public link
+              # prune packages already downloaded
+              # TODO : remove ids from skip not present in inbox to avoid growing too big
+              # skip_ids_data.select!{|id|pkg_id_uri.select{|p|p[:id].eql?(id)}}
+              pkg_id_uri.reject!{|i|skip_ids_data.include?(i[:id])}
               Log.dump(:pkg_id_uri,pkg_id_uri)
-              return Main.result_status('no package') if pkg_id_uri.empty?
+              return Main.result_status('no new package') if pkg_id_uri.empty?
               result_transfer = []
               pkg_id_uri.each do |id_uri|
                 if id_uri[:uri].nil?

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

@@ -274,6 +274,7 @@ module Aspera
         # @return {.api,.file_id}
         def resolve_api_fid(id, path)
           # TODO: implement
+          Log.log.debug("TODO #{path}")
           return {api: @api_node, file_id: id}
         end
 
@@ -569,8 +570,8 @@ module Aspera
               # change API if needed
               if !access_key.eql?('self')
                 secret=config.vault.get(username: access_key)[:secret] #, url: @api_node.params[:base_url] : TODO: better handle vault
-                @api_node.params[:username]=access_key
-                @api_node.params[:password]=secret
+                @api_node.params[:auth][:username]=access_key
+                @api_node.params[:auth][:password]=secret
               end
               command_repo = options.get_next_command(NODE4_COMMANDS)
               return execute_node_gen4_command(command_repo,ak_info['root_file_id'])

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

@@ -21,83 +21,18 @@ module Aspera
 
         def initialize(env)
           super(env)
-          options.add_opt_simple(:ssh_keys,'ssh key path list (Array or single)')
-          options.add_opt_simple(:ssh_options,'ssh options (Hash)')
-          options.add_opt_simple(:cmd_prefix,'prefix to add for as cmd execution, e.g. sudo or /opt/aspera/bin ')
+          options.add_opt_simple(:ssh_keys,'SSH key path list (Array or single)')
+          options.add_opt_simple(:ssh_options,'SSH options (Hash)')
           options.set_option(:ssh_keys,[])
           options.set_option(:ssh_options,{})
           options.parse_options!
         end
 
-        def key_symb_to_str_single(source)
-          return source.each_with_object({}){|(k,v),memo| memo[k.to_s] = v; }
-        end
-
         def key_symb_to_str_list(source)
-          return source.map{|o| key_symb_to_str_single(o)}
+          return source.map(&:stringify_keys)
         end
 
-        def asctl_parse(text)
-          # normal separator
-          r = /:\s*/
-          result = []
-          text.split("\n").each do |line|
-            # console: missing space
-            line.gsub!(/(SessionDataCollector)/,'\1 ')
-            # orchestrator
-            line.gsub!(/ with pid:.*/,'')
-            line.gsub!(/ is /,': ')
-            items = line.split(r)
-            next unless items.length.eql?(2)
-            state = {'process' => items.first,'state' => items.last}
-            # console
-            state['state'].gsub!(/\.+$/,'')
-            # console
-            state['process'].gsub!(/^.+::/,'')
-            # faspex
-            state['process'].gsub!(/^Faspex /,'')
-            # faspex
-            state['process'].gsub!(/ Background/,'')
-            state['process'].gsub!(/serving orchestrator on port /,'')
-            # console
-            r = /\s+/ if state['process'].eql?('Console')
-            # orchestrator
-            state['process'].gsub!(/^  -> /,'')
-            state['process'].gsub!(/ Process/,'')
-            result.push(state)
-          end
-          return result
-        end
-
-        def asconfigurator_parse(result)
-          lines = result.split("\n")
-          # not windows
-          Log.log.debug(%x(type asconfigurator))
-          status=lines.shift
-          case status
-          when 'success'
-            result = []
-            lines.each do |line|
-              Log.log.debug(line.to_s)
-              # normalize values
-              data = line.
-                gsub(/^"/,'').
-                gsub(/,""$/,',"AS_EMPTY"').
-                gsub(/"$/,'').
-                split('","').
-                map{|i|case i;when 'AS_NULL' then nil;when 'AS_EMPTY' then '';when 'true' then true;when 'false' then false;else i;end}
-              data.insert(1,'') if data.length.eql?(4)
-              titles=%w[level section parameter value default]
-              result.push(titles.each_with_object({}){|t,o|o[t]=data.shift})
-            end
-            return result
-          when 'failure'
-            raise lines.join("\n")
-          else raise "Unexpected: #{status}"
-          end
-        end
-
-        ACTIONS = %i[health nodeadmin userdata configurator ctl download upload browse delete rename].concat(Aspera::AsCmd::OPERATIONS).freeze
+        ACTIONS = %i[health download upload browse delete rename].concat(Aspera::AsCmd::OPERATIONS).freeze
 
         def execute_action
           server_uri = URI.parse(options.get_option(:url,is_type: :mandatory))
@@ -120,6 +55,7 @@ module Aspera
             server_transfer_spec['remote_user'] = options.get_option(:username,is_type: :mandatory)
             ssh_options = options.get_option(:ssh_options)
             raise 'expecting a Hash for ssh_options' unless ssh_options.is_a?(Hash)
+            ssh_options = ssh_options.symbolize_keys
             if !server_uri.port.nil?
               ssh_options[:port] = server_uri.port
               server_transfer_spec['ssh_port'] = server_uri.port
@@ -160,17 +96,8 @@ module Aspera
           case command
           when :health
             nagios = Nagios.new
-            command_nagios = options.get_next_command(%i[app_services transfer asctlstatus])
+            command_nagios = options.get_next_command(%i[transfer])
             case command_nagios
-            when :app_services
-              # will not work with aspshell, requires Linux/bash
-              procs = shell_executor.execute('ps -A -o comm').split("\n")
-              Log.log.debug("found: #{procs}")
-              %w[asperanoded asperaredisd].each do |name|
-                nagios.add_critical('general',"missing process #{name}") unless procs.include?(name)
-              end
-              nagios.add_ok('daemons','ok') if nagios.data.empty?
-              return nagios.result
             when :transfer
               file = Tempfile.new('transfer_test')
               filepath = file.path
@@ -189,37 +116,9 @@ module Aspera
               else
                 nagios.add_critical('transfer',statuses.reject{|i|i.eql?(:success)}.first.to_s)
               end
-            when :asctlstatus
-              realcmd = 'asctl'
-              prefix = options.get_option(:cmd_prefix)
-              realcmd = "#{prefix}#{realcmd} all:status" unless prefix.nil?
-              result = shell_executor.execute(realcmd.split)
-              data = asctl_parse(result)
-              data.each do |i|
-                if i['state'].eql?('running')
-                  nagios.add_ok(i['process'],i['state'])
-                else
-                  nagios.add_critical(i['process'],i['state'])
-                end
-              end
             else raise 'ERROR'
             end
             return nagios.result
-          when :nodeadmin,:userdata,:configurator,:ctl
-            realcmd = "as#{command}"
-            prefix = options.get_option(:cmd_prefix)
-            realcmd = "#{prefix}#{realcmd}" unless prefix.nil?
-            args = options.get_next_argument("#{realcmd} arguments",expected: :multiple)
-            args.unshift('-x') if command.eql?(:configurator)
-            result = shell_executor.execute(args.unshift(realcmd))
-            case command
-            when :ctl
-              return {type: :object_list,data: asctl_parse(result)}
-            when :configurator
-              result=asconfigurator_parse(result)
-              return {type: :object_list,data: result} # ,option_expand_last: true
-            end
-            return Main.result_status(result)
           when :upload
             return Main.result_transfer(transfer.start(server_transfer_spec.merge('direction' => Fasp::TransferSpec::DIRECTION_SEND),{src: :direct}))
           when :download
@@ -233,7 +132,7 @@ module Aspera
               when :mkdir,:mv,:cp,:rm then return Main.result_success
               when :ls                then return {type: :object_list,data: key_symb_to_str_list(result),fields: %w[zmode zuid zgid size mtime name]}
               when :df                then return {type: :object_list,data: key_symb_to_str_list(result)}
-              when :du,:md5sum,:info  then return {type: :single_object,data: key_symb_to_str_single(result)}
+              when :du,:md5sum,:info  then return {type: :single_object,data: result.stringify_keys}
               end
             rescue Aspera::AsCmd::Error => e
               raise CliBadArgument,e.extended_message

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

@@ -26,6 +26,9 @@ module Aspera
         #          super(env)
         #        end
 
+        SAML_IMPORT_MANDATORY=%w[id name_id].freeze
+        SAML_IMPORT_ALLOWED=[SAML_IMPORT_MANDATORY,%w[email given_name surname]].flatten.freeze
+
         ACTIONS = %i[health repository admin].freeze
 
         def execute_action
@@ -58,7 +61,7 @@ module Aspera
             command = options.get_next_command(%i[user share])
             case command
             when :user
-              command = options.get_next_command(%i[list app_authorizations share_permissions])
+              command = options.get_next_command(%i[list app_authorizations share_permissions saml_import ldap_import])
               user_id = instance_identifier if %i[app_authorizations share_permissions].include?(command)
               case command
               when :list
@@ -70,6 +73,23 @@ module Aspera
                 #all_shares = api_shares_admin.read('data/shares')[:data]
                 #share_id = all_shares.find{|s| s['name'].eql?(share_name)}['id']
                 return {type: :object_list,data: api_shares_admin.read("data/users/#{user_id}/share_permissions")[:data]}
+              when :saml_import
+                parameters = options.get_option(:value)
+                return do_bulk_operation(parameters,'created') do |user_params|
+                  user_params=user_params.transform_keys{|k|k.gsub(/\s+/,'_').downcase}
+                  raise 'expecting Hash' unless user_params.is_a?(Hash)
+                  SAML_IMPORT_MANDATORY.each{|p|raise "missing mandatory field: #{p}" if user_params[p].nil?}
+                  user_params.keys.each do |p|
+                    raise "unsupported field: #{p}, use: #{SAML_IMPORT_ALLOWED.join(',')}" unless SAML_IMPORT_ALLOWED.include?(p)
+                  end
+                  api_shares_admin.create('data/saml_users/import',user_params)[:data]
+                end
+              when :ldap_import
+                parameters = options.get_option(:value)
+                return do_bulk_operation(parameters,'created') do |user_name|
+                  raise 'expecting string (user name), have #{user_params.class}' unless user_params.is_a?(String)
+                  api_shares_admin.create('data/ldap_users',{'user'=>user_name})[:data]
+                end
               end
             when :share
               command = options.get_next_command(%i[list user_permissions])