aspera-cli 4.6.0 → 4.7.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'aspera/cli/basic_auth_plugin'
 require 'aspera/cli/plugins/node'
 require 'aspera/cli/plugins/config'
@@ -6,6 +7,7 @@ require 'aspera/cli/transfer_agent'
 require 'aspera/persistency_action_once'
 require 'aspera/open_application'
 require 'aspera/fasp/uri'
+require 'aspera/fasp/transfer_spec'
 require 'aspera/nagios'
 require 'aspera/id_generator'
 require 'xmlsimple'
@@ -16,8 +18,9 @@ module Aspera
   module Cli
     module Plugins
       class Faspex < BasicAuthPlugin
-        KEY_NODE='node'
-        KEY_PATH='path'
+        # required hash key for source in config
+        KEY_NODE='node' # value must be hash with url, username, password
+        KEY_PATH='path' # value must be same sub-path as in Faspex's node
         VAL_ALL='ALL'
         # added field in result that identifies the package
         PACKAGE_MATCH_FIELD='package_id'
@@ -25,7 +28,7 @@ module Aspera
         ATOM_MAILBOXES=[:inbox, :archive, :sent]
         # allowed parameters for inbox.atom
         ATOM_PARAMS=['page', 'count', 'startIndex']
-        # with special parameters (from Plugin class)
+        # with special parameters (from Plugin class) : max and pmax
         ATOM_EXT_PARAMS=ATOM_PARAMS+[MAX_ITEMS, MAX_PAGES]
         # sub path in url for public link delivery
         PUB_LINK_EXTERNAL_MATCH='external_deliveries/'
@@ -34,8 +37,8 @@ module Aspera
 
         class << self
           def detect(base_url)
-            api=Rest.new({:base_url=>base_url})
-            result=api.call({:operation=>'POST',:subpath=>'aspera/faspex',:headers=>{'Accept'=>'application/xrds+xml'},:text_body_params=>''})
+            api=Rest.new({base_url: base_url})
+            result=api.call({operation: 'POST',subpath: 'aspera/faspex',headers: {'Accept'=>'application/xrds+xml'},text_body_params: ''})
             # 4.x
             if result[:http].body.start_with?('<?xml')
               res_s=XmlSimple.xml_in(result[:http].body, {'ForceArray' => false})
@@ -44,66 +47,66 @@ module Aspera
             end
             return nil
           end
-        end
-
-        def initialize(env)
-          @api_v3=nil
-          @api_v4=nil
-          super(env)
-          self.options.add_opt_simple(:link,'public link for specific operation')
-          self.options.add_opt_simple(:delivery_info,'package delivery information (extended value)')
-          self.options.add_opt_simple(:source_name,'create package from remote source (by name)')
-          self.options.add_opt_simple(:storage,'Faspex local storage definition')
-          self.options.add_opt_simple(:recipient,'use if recipient is a dropbox (with *)')
-          self.options.add_opt_list(:box,ATOM_MAILBOXES,'package box')
-          self.options.set_option(:box,:inbox)
-          self.options.parse_options!
-        end
 
-        # extract elements from anonymous faspex link
-        def self.get_link_data(publink)
-          publink_uri=URI.parse(publink)
-          if m=publink_uri.path.match(/^(.*)\/(external.*)$/)
+          # extract elements from anonymous faspex link
+          def get_link_data(publink)
+            publink_uri=URI.parse(publink)
+            raise CliBadArgument, 'public link does not match Faspex format' unless (m=publink_uri.path.match(/^(.*)\/(external.*)$/))
             base=m[1]
             subpath=m[2]
-          else
-            raise CliBadArgument, 'public link does not match Faspex format'
+            port_add=publink_uri.port.eql?(publink_uri.default_port) ? '' : ":#{publink_uri.port}"
+            result={
+              base_url:  "#{publink_uri.scheme}://#{publink_uri.host}#{port_add}#{base}",
+              subpath:   subpath,
+              query:     URI.decode_www_form(publink_uri.query).each_with_object({}){|v,h|h[v.first]=v.last;}
+            }
+            Log.dump('publink',result)
+            return result
           end
-          port_add=publink_uri.port.eql?(publink_uri.default_port)?'':":#{publink_uri.port}"
-          result={
-            :base_url => "#{publink_uri.scheme}://#{publink_uri.host}#{port_add}#{base}",
-            :subpath  => subpath,
-            :query    => URI::decode_www_form(publink_uri.query).inject({}){|h,v|h[v.first]=v.last;h}
-          }
-          Log.dump('publink',result)
-          return result
-        end
 
-        # get faspe: URI from entry in xml, and fix problems..
-        def self.get_fasp_uri_from_entry(entry)
-          raise CliBadArgument, 'package has no link (deleted?)' unless entry.has_key?('link')
-          result=entry['link'].select{|e| e['rel'].eql?('package')}.first['href']
-          # tags in the end of URL is not well % encoded... there are "=" that should be %3D
-          # TODO: enter ticket to Faspex ?
-          ###XXif m=result.match(/(=+)$/);result.gsub!(/=+$/,"#{"%3D"*m[1].length}");end
-          return result
-        end
+          # get faspe: URI from entry in xml, and fix problems..
+          def get_fasp_uri_from_entry(entry, raise_no_link: true)
+            unless entry.has_key?('link')
+              raise CliBadArgument, 'package has no link (deleted?)' if raise_no_link
+              return nil
+            end
+            result=entry['link'].select{|e| e['rel'].eql?('package')}.first['href']
+            # tags in the end of URL is not well % encoded... there are "=" that should be %3D
+            # TODO: enter ticket to Faspex ?
+            ###XXif m=result.match(/(=+)$/);result.gsub!(/=+$/,"#{"%3D"*m[1].length}");end
+            return result
+          end
 
-        def self.textify_package_list(table_data)
-          return table_data.map { |e|
-            e.keys.each {|k| e[k]=e[k].first if e[k].is_a?(Array) and e[k].length == 1}
-            e['items'] = e.has_key?('link') ? e['link'].length : 0
-            e
-          }
-        end
+          def textify_package_list(table_data)
+            return table_data.map do |e|
+              e.keys.each {|k| e[k]=e[k].first if e[k].is_a?(Array) && (e[k].length == 1)}
+              e['items'] = e.has_key?('link') ? e['link'].length : 0
+              e
+            end
+          end
 
-        # field_sym : :id or :name
-        def self.get_source_id(source_list,source_name)
-          source_ids=source_list.select { |i| i['name'].eql?(source_name) }
-          if source_ids.empty?
-            raise CliError,%Q{No such Faspex source "#{source_name}" in [#{source_list.map{|i| %Q{"#{i['name']}"}}.join(', ')}]}
+          # field_sym : :id or :name
+          def get_source_id(source_list,source_name)
+            source_ids=source_list.select { |i| i['name'].eql?(source_name) }
+            if source_ids.empty?
+              raise CliError,%Q(No such Faspex source "#{source_name}" in [#{source_list.map{|i| %Q("#{i['name']}")}.join(', ')}])
+            end
+            return source_ids.first['id']
           end
-          return source_ids.first['id']
+        end
+
+        def initialize(env)
+          @api_v3=nil
+          @api_v4=nil
+          super(env)
+          options.add_opt_simple(:link,'public link for specific operation')
+          options.add_opt_simple(:delivery_info,'package delivery information (extended value)')
+          options.add_opt_simple(:source_name,'create package from remote source (by name)')
+          options.add_opt_simple(:storage,'Faspex local storage definition')
+          options.add_opt_simple(:recipient,'use if recipient is a dropbox (with *)')
+          options.add_opt_list(:box,ATOM_MAILBOXES,'package box')
+          options.set_option(:box,:inbox)
+          options.parse_options!
         end
 
         def api_v3
@@ -115,35 +118,37 @@ module Aspera
 
         def api_v4
           if @api_v4.nil?
-            faspex_api_base=self.options.get_option(:url,:mandatory)
+            faspex_api_base=options.get_option(:url,:mandatory)
             @api_v4=Rest.new({
-              :base_url  => faspex_api_base+'/api',
-              :auth      => {
-              :type      => :oauth2,
-              :base_url  => faspex_api_base+'/auth/oauth2',
-              :grant     => :header_userpass,
-              :user_name => self.options.get_option(:username,:mandatory),
-              :user_pass => self.options.get_option(:password,:mandatory),
-              :scope     => 'admin'
+              base_url:   faspex_api_base+'/api',
+              auth:       {
+              type:         :oauth2,
+              base_url:     faspex_api_base+'/auth/oauth2',
+              auth:         {type: :basic, username: options.get_option(:username,:mandatory), password: options.get_option(:password,:mandatory)},
+              crtype:       :generic,
+              generic:      {grant_type: 'password'},
+              scope:        'admin'
               }})
           end
           return @api_v4
         end
 
-        # query supports : {"startIndex":10,"count":1,"page":109}
-        def mailbox_all_entries
-          recipient_name=self.options.get_option(:recipient,:optional) || self.options.get_option(:username,:mandatory)
+        # query supports : {"startIndex":10,"count":1,"page":109,"max":2,"pmax":1}
+        def mailbox_filtered_entries(stop_at_id: nil)
+          recipient_names=[options.get_option(:recipient,:optional) || options.get_option(:username,:mandatory)]
+          # some workgroup messages have no star in recipient name
+          recipient_names.push(recipient_names.first[1..-1]) if recipient_names.first.start_with?('*')
           # mailbox is in ATOM_MAILBOXES
-          mailbox=self.options.get_option(:box,:mandatory)
+          mailbox=options.get_option(:box,:mandatory)
           # parameters
-          mailbox_query=self.options.get_option(:query,:optional)
+          mailbox_query=options.get_option(:query,:optional)
           max_items=nil
           max_pages=nil
           result=[]
           if !mailbox_query.nil?
-            raise "query: must be Hash or nil" unless mailbox_query.is_a?(Hash)
+            raise 'query: must be Hash or nil' unless mailbox_query.is_a?(Hash)
             raise "query: supported params: #{ATOM_EXT_PARAMS}" unless (mailbox_query.keys-ATOM_EXT_PARAMS).empty?
-            raise "query: startIndex and page are exclusive" if mailbox_query.has_key?('startIndex') and mailbox_query.has_key?('page')
+            raise 'query: startIndex and page are exclusive' if mailbox_query.has_key?('startIndex') && mailbox_query.has_key?('page')
             max_items=mailbox_query[MAX_ITEMS]
             mailbox_query.delete(MAX_ITEMS)
             max_pages=mailbox_query[MAX_PAGES]
@@ -159,22 +164,27 @@ module Aspera
             Log.log.debug("new items: #{items.count}")
             # it is the end if page is empty
             break if items.empty?
+            stop_condition=false
             # results will be sorted in reverse id
             items.reverse.each do |package|
-              package[PACKAGE_MATCH_FIELD]=case mailbox
+              package[PACKAGE_MATCH_FIELD]=
+              case mailbox
               when :inbox,:archive
-                recipient=package['to'].select{|i|i['name'].first.eql?(recipient_name)}.first
+                recipient=package['to'].select{|i|recipient_names.include?(i['name'].first)}.first
                 recipient.nil? ? nil : recipient['recipient_delivery_id'].first
               else # :sent
                 package['delivery_id'].first
               end
+              # if we look for a specific package
+              stop_condition=true if !stop_at_id.nil? && stop_at_id.eql?(package[PACKAGE_MATCH_FIELD])
               # keep only those for the specified recipient,
               result.push(package) unless package[PACKAGE_MATCH_FIELD].nil?
             end
+            break if stop_condition
             #result.push({PACKAGE_MATCH_FIELD=>'======'})
             Log.log.debug("total items: #{result.count}")
             # reach the limit ?
-            if !max_items.nil? and result.count >= max_items
+            if !max_items.nil? && (result.count >= max_items)
               result=result.slice(0,max_items) if result.count > max_items
               break
             end
@@ -184,9 +194,9 @@ module Aspera
             break if link.nil?
             # replace parameters with the ones from next link
             params=CGI.parse(URI.parse(link['href']).query)
-            mailbox_query=params.keys.inject({}){|m,i|;m[i]=params[i].first;m}
+            mailbox_query=params.keys.each_with_object({}){|i,m|;m[i]=params[i].first;}
             Log.log.debug("query: #{mailbox_query}")
-            break if !max_pages.nil? and mailbox_query['page'].to_i > max_pages
+            break if !max_pages.nil? && (mailbox_query['page'].to_i > max_pages)
           end
           return result
         end
@@ -200,15 +210,15 @@ module Aspera
             raise CliBadArgument,"pub link is #{link_data[:subpath]}, expecting external/submissions/new"
           end
           create_path=link_data[:subpath].split('/')[0..-2].join('/')
-          package_create_params.merge!({:passcode=>link_data[:query]['passcode']})
+          package_create_params.merge!({passcode: link_data[:query]['passcode']})
           delivery_info.merge!({
-            :transfer_type     => 'connect',
-            :source_paths_list => self.transfer.ts_source_paths.map{|i|i['source']}.join("\r\n")})
-          api_public_link=Rest.new({:base_url=>link_data[:base_url]})
+            transfer_type:      'connect',
+            source_paths_list:  transfer.ts_source_paths.map{|i|i['source']}.join("\r\n")})
+          api_public_link=Rest.new({base_url: link_data[:base_url]})
           # Hum, as this does not always work (only user, but not dropbox), we get the javascript and need hack
           #pkg_created=api_public_link.create(create_path,package_create_params)[:data]
           # so extract data from javascript
-          pkgdatares=api_public_link.call({:operation=>'POST',:subpath=>create_path,:json_params=>package_create_params,:headers=>{'Accept'=>'text/javascript'}})[:http].body
+          pkgdatares=api_public_link.call({operation: 'POST',subpath: create_path,json_params: package_create_params,headers: {'Accept'=>'text/javascript'}})[:http].body
           # get args of function call
           pkgdatares.gsub!("\n",'') # one line
           pkgdatares.gsub!(/^[^"]+\("\{/,'{') # delete header
@@ -218,51 +228,51 @@ module Aspera
           begin
             pkgdatares=JSON.parse("[#{pkgdatares}]")
           rescue JSON::ParserError # => e
-            raise "Link not valid"
+            raise 'Link not valid'
           end
           return pkgdatares.first
         end
 
-        ACTIONS=[ :health,:package, :source, :me, :dropbox, :v4, :address_book, :login_methods ]
+        ACTIONS=[:health,:package, :source, :me, :dropbox, :v4, :address_book, :login_methods].freeze
 
         def execute_action
-          command=self.options.get_next_command(ACTIONS)
+          command=options.get_next_command(ACTIONS)
           case command
           when :health
             nagios=Nagios.new
             begin
               api_v3.read('me')
               nagios.add_ok('faspex api','accessible')
-            rescue => e
+            rescue StandardError => e
               nagios.add_critical('faspex api',e.to_s)
             end
             return nagios.result
           when :package
-            command_pkg=self.options.get_next_command([ :send, :recv, :list ])
+            command_pkg=options.get_next_command([:send, :recv, :list])
             case command_pkg
             when :list
-              return {:type=>:object_list,:data=>self.mailbox_all_entries,:fields=>[PACKAGE_MATCH_FIELD,'title','items'], :textify => lambda { |table_data| Faspex.textify_package_list(table_data)} }
+              return {type: :object_list,data: mailbox_filtered_entries,fields: [PACKAGE_MATCH_FIELD,'title','items'], textify: lambda {|table_data|Faspex.textify_package_list(table_data)} }
             when :send
-              delivery_info=self.options.get_option(:delivery_info,:mandatory)
+              delivery_info=options.get_option(:delivery_info,:mandatory)
               raise CliBadArgument,'delivery_info must be hash, refer to doc' unless delivery_info.is_a?(Hash)
               # actual parameter to faspex API
               package_create_params={'delivery'=>delivery_info}
-              public_link_url=self.options.get_option(:link,:optional)
+              public_link_url=options.get_option(:link,:optional)
               if public_link_url.nil?
                 # authenticated user
                 delivery_info['sources']||=[{'paths'=>[]}]
                 first_source=delivery_info['sources'].first
-                first_source['paths'].push(*self.transfer.ts_source_paths.map{|i|i['source']})
-                source_name=self.options.get_option(:source_name,:optional)
+                first_source['paths'].push(*transfer.ts_source_paths.map{|i|i['source']})
+                source_name=options.get_option(:source_name,:optional)
                 if !source_name.nil?
-                  source_list=api_v3.call({:operation=>'GET',:subpath=>'source_shares',:headers=>{'Accept'=>'application/json'}})[:data]['items']
+                  source_list=api_v3.call({operation: 'GET',subpath: 'source_shares',headers: {'Accept'=>'application/json'}})[:data]['items']
                   source_id=self.class.get_source_id(source_list,source_name)
                   first_source['id']=source_id
                 end
-                pkg_created=api_v3.call({:operation=>'POST',:subpath=>'send',:json_params=>package_create_params,:headers=>{'Accept'=>'application/json'}})[:data]
+                pkg_created=api_v3.call({operation: 'POST',subpath: 'send',json_params: package_create_params,headers: {'Accept'=>'application/json'}})[:data]
                 if !source_name.nil?
                   # no transfer spec if remote source
-                  return {:data=>[pkg_created['links']['status']],:type=>:value_list,:name=>'link'}
+                  return {data: [pkg_created['links']['status']],type: :value_list,name: 'link'}
                 end
                 raise CliBadArgument,'expecting one session exactly' if pkg_created['xfer_sessions'].length != 1
                 transfer_spec=pkg_created['xfer_sessions'].first
@@ -272,53 +282,55 @@ module Aspera
                 transfer_spec=send_publink_to_ts(public_link_url,package_create_params)
               end
               #Log.dump('transfer_spec',transfer_spec)
-              return Main.result_transfer(self.transfer.start(transfer_spec,{:src=>:node_gen3}))
+              return Main.result_transfer(transfer.start(transfer_spec,{src: :node_gen3}))
             when :recv
-              link_url=self.options.get_option(:link,:optional)
+              link_url=options.get_option(:link,:optional)
               # list of faspex ID/URI to download
               pkg_id_uri=nil
               skip_ids_data=[]
               skip_ids_persistency=nil
               case link_url
               when nil # usual case: no link
-                if self.options.get_option(:once_only,:mandatory)
+                if options.get_option(:once_only,:mandatory)
                   skip_ids_persistency=PersistencyActionOnce.new(
                   manager: @agents[:persistency],
                   data:    skip_ids_data,
-                  id:      IdGenerator.from_list(['faspex_recv',self.options.get_option(:url,:mandatory),self.options.get_option(:username,:mandatory),self.options.get_option(:box,:mandatory).to_s]))
+                  id:      IdGenerator.from_list(['faspex_recv',options.get_option(:url,:mandatory),options.get_option(:username,:mandatory),options.get_option(:box,:mandatory).to_s]))
                 end
                 # get command line parameters
-                delivid=self.instance_identifier()
-                raise "empty id" if delivid.empty?
+                delivid=instance_identifier()
+                raise 'empty id' if delivid.empty?
+                recipient=options.get_option(:recipient,:optional)
                 if delivid.eql?(VAL_ALL)
-                  pkg_id_uri=mailbox_all_entries.map{|i|{:id=>i[PACKAGE_MATCH_FIELD],:uri=>self.class.get_fasp_uri_from_entry(i)}}
+                  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.select!{|i|!skip_ids_data.include?(i[: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).select{|p|p[PACKAGE_MATCH_FIELD].eql?(delivid)}.first['link'].first['href']
+                  raise 'Not Found. Dropbox and Workgroup packages can use the link option with faspe:' if found_package_link.nil?
+                  pkg_id_uri=[{id: delivid,uri: found_package_link}]
                 else
-                  recipient=options.get_option(:recipient,:optional)
-                  if !recipient.nil? and recipient.start_with?('*')
-                    raise "Dropbox and Workgroup packages should use link option with faspe:"
-                  end
                   # TODO: delivery id is the right one if package was receive by workgroup
-                  endpoint=case self.options.get_option(:box,:mandatory)
-                  when :inbox,:archive;'received'
-                  when :sent; 'sent'
+                  endpoint=
+                  case options.get_option(:box,:mandatory)
+                  when :inbox,:archive then'received'
+                  when :sent then 'sent'
                   end
-                  entry_xml=api_v3.call({:operation=>'GET',:subpath=>"#{endpoint}/#{delivid}",:headers=>{'Accept'=>'application/xml'}})[:http].body
+                  entry_xml=api_v3.call({operation: 'GET',subpath: "#{endpoint}/#{delivid}",headers: {'Accept'=>'application/xml'}})[:http].body
                   package_entry=XmlSimple.xml_in(entry_xml, {'ForceArray' => true})
-                  pkg_id_uri=[{:id=>delivid,:uri=>self.class.get_fasp_uri_from_entry(package_entry)}]
+                  pkg_id_uri=[{id: delivid,uri: self.class.get_fasp_uri_from_entry(package_entry)}]
                 end
               when /^faspe:/
-                pkg_id_uri=[{:id=>'package',:uri=>link_url}]
+                pkg_id_uri=[{id: 'package',uri: link_url}]
               else
                 link_data=self.class.get_link_data(link_url)
                 if !link_data[:subpath].start_with?(PUB_LINK_EXTERNAL_MATCH)
                   raise CliBadArgument,"Pub link is #{link_data[:subpath]}. Expecting #{PUB_LINK_EXTERNAL_MATCH}"
                 end
                 # Note: unauthenticated API (authorization is in url params)
-                api_public_link=Rest.new({:base_url=>link_data[:base_url]})
-                pkgdatares=api_public_link.call({:operation=>'GET',:subpath=>link_data[:subpath],:url_params=>{:passcode=>link_data[:query]['passcode']},:headers=>{'Accept'=>'application/xml'}})
+                api_public_link=Rest.new({base_url: link_data[:base_url]})
+                pkgdatares=api_public_link.call({operation: 'GET',subpath: link_data[:subpath],url_params: {passcode: link_data[:query]['passcode']}, headers: {'Accept'=>'application/xml'}})
                 if !pkgdatares[:http].body.start_with?('<?xml ')
                   OpenApplication.instance.uri(link_url)
                   raise CliError, 'no such package'
@@ -326,21 +338,30 @@ module Aspera
                 package_entry=XmlSimple.xml_in(pkgdatares[:http].body, {'ForceArray' => false})
                 Log.dump(:package_entry,package_entry)
                 transfer_uri=self.class.get_fasp_uri_from_entry(package_entry)
-                pkg_id_uri=[{:id=>package_entry['id'],:uri=>transfer_uri}]
+                pkg_id_uri=[{id: package_entry['id'],uri: transfer_uri}]
               end # public link
               Log.dump(:pkg_id_uri,pkg_id_uri)
               return Main.result_status('no package') if pkg_id_uri.empty?
               result_transfer=[]
               pkg_id_uri.each do |id_uri|
-                transfer_spec=Fasp::Uri.new(id_uri[:uri]).transfer_spec
-                # NOTE: only external users have token in faspe: link !
-                if !transfer_spec.has_key?('token')
-                  sanitized=id_uri[:uri].gsub('&','&amp;')
-                  xmlpayload='<?xml version="1.0" encoding="UTF-8"?><url-list xmlns="http://schemas.asperasoft.com/xml/url-list"><url href="'+sanitized+'"/></url-list>'
-                  transfer_spec['token']=api_v3.call({:operation=>'POST',:subpath=>'issue-token?direction=down',:headers=>{'Accept'=>'text/plain','Content-Type'=>'application/vnd.aspera.url-list+xml'},:text_body_params=>xmlpayload})[:http].body
+                if id_uri[:uri].nil?
+                  # skip package with no link: empty or content deleted
+                  statuses=[:success]
+                else
+                  transfer_spec=Fasp::Uri.new(id_uri[:uri]).transfer_spec
+                  # NOTE: only external users have token in faspe: link !
+                  if !transfer_spec.has_key?('token')
+                    sanitized=id_uri[:uri].gsub('&','&amp;')
+                    xmlpayload=%Q(<?xml version="1.0" encoding="UTF-8"?><url-list xmlns="http://schemas.asperasoft.com/xml/url-list"><url href="#{sanitized}"/></url-list>)
+                    transfer_spec['token']=api_v3.call({
+                      operation: 'POST',
+                      subpath:   'issue-token?direction=down',
+                      headers:   {'Accept'=>'text/plain','Content-Type'=>'application/vnd.aspera.url-list+xml'},
+                      text_body_params: xmlpayload})[:http].body
+                  end
+                  transfer_spec['direction']=Fasp::TransferSpec::DIRECTION_RECEIVE
+                  statuses=transfer.start(transfer_spec,{src: :node_gen3})
                 end
-                transfer_spec['direction']='receive'
-                statuses=self.transfer.start(transfer_spec,{:src=>:node_gen3})
                 result_transfer.push({'package'=>id_uri[:id],Main::STATUS_FIELD=>statuses})
                 # skip only if all sessions completed
                 skip_ids_data.push(id_uri[:id]) if TransferAgent.session_status(statuses).eql?(:success)
@@ -349,21 +370,21 @@ module Aspera
               return Main.result_transfer_multiple(result_transfer)
             end
           when :source
-            command_source=self.options.get_next_command([ :list, :id, :name ])
-            source_list=api_v3.call({:operation=>'GET',:subpath=>'source_shares',:headers=>{'Accept'=>'application/json'}})[:data]['items']
+            command_source=options.get_next_command([:list, :id, :name])
+            source_list=api_v3.call({operation: 'GET',subpath: 'source_shares',headers: {'Accept'=>'application/json'}})[:data]['items']
             case command_source
             when :list
-              return {:type=>:object_list,:data=>source_list}
+              return {type: :object_list,data: source_list}
             else # :id or :name
-              source_match_val=self.options.get_next_argument('source id or name')
+              source_match_val=options.get_next_argument('source id or name')
               source_ids=source_list.select { |i| i[command_source.to_s].to_s.eql?(source_match_val) }
               if source_ids.empty?
-                raise CliError,"No such Faspex source #{command_source.to_s}: #{source_match_val} in [#{source_list.map{|i| i[command_source.to_s]}.join(', ')}]"
+                raise CliError,"No such Faspex source #{command_source}: #{source_match_val} in [#{source_list.map{|i| i[command_source.to_s]}.join(', ')}]"
               end
               # get id and name
               source_name=source_ids.first['name']
-              source_id=source_ids.first['id']
-              source_hash=self.options.get_option(:storage,:mandatory)
+              #source_id=source_ids.first['id']
+              source_hash=options.get_option(:storage,:mandatory)
               # check value of option
               raise CliError,'storage option must be a Hash' unless source_hash.is_a?(Hash)
               source_hash.each do |name,storage|
@@ -377,56 +398,56 @@ module Aspera
               end
               source_info=source_hash[source_name]
               Log.log.debug("source_info: #{source_info}")
-              command_node=self.options.get_next_command([ :info, :node ])
+              command_node=options.get_next_command([:info, :node])
               case command_node
               when :info
-                return {:data=>source_info,:type=>:single_object}
+                return {data: source_info,type: :single_object}
               when :node
                 node_config=ExtendedValue.instance.evaluate(source_info[KEY_NODE])
                 raise CliError,"bad type for: \"#{source_info[KEY_NODE]}\"" unless node_config.is_a?(Hash)
                 Log.log.debug("node=#{node_config}")
                 api_node=Rest.new({
-                  :base_url => node_config['url'],
-                  :auth     => {
-                  :type     =>:basic,
-                  :username => node_config['username'],
-                  :password => node_config['password']}})
-                command=self.options.get_next_command(Node::COMMON_ACTIONS)
+                  base_url:  node_config['url'],
+                  auth:      {
+                  type:      :basic,
+                  username:  node_config['username'],
+                  password:  node_config['password']}})
+                command=options.get_next_command(Node::COMMON_ACTIONS)
                 return Node.new(@agents.merge(skip_basic_auth_options: true, node_api: api_node)).execute_action(command,source_info[KEY_PATH])
               end
             end
           when :me
-            my_info=api_v3.call({:operation=>'GET',:subpath=>'me',:headers=>{'Accept'=>'application/json'}})[:data]
-            return {:data=>my_info, :type=>:single_object}
+            my_info=api_v3.call({operation: 'GET',subpath: 'me',headers: {'Accept'=>'application/json'}})[:data]
+            return {data: my_info, type: :single_object}
           when :dropbox
-            command_pkg=self.options.get_next_command([ :list ])
+            command_pkg=options.get_next_command([:list])
             case command_pkg
             when :list
-              dropbox_list=api_v3.call({:operation=>'GET',:subpath=>'dropboxes',:headers=>{'Accept'=>'application/json'}})[:data]
-              return {:type=>:object_list, :data=>dropbox_list['items'], :fields=>['name','id','description','can_read','can_write']}
+              dropbox_list=api_v3.call({operation: 'GET',subpath: 'dropboxes',headers: {'Accept'=>'application/json'}})[:data]
+              return {type: :object_list, data: dropbox_list['items'], fields: ['name','id','description','can_read','can_write']}
             end
           when :v4
-            command=self.options.get_next_command([:package,:dropbox, :dmembership, :workgroup,:wmembership,:user,:metadata_profile])
+            command=options.get_next_command([:package,:dropbox, :dmembership, :workgroup,:wmembership,:user,:metadata_profile])
             case command
             when :dropbox
-              return self.entity_action(api_v4,'admin/dropboxes',['id','e_wg_name','e_wg_desc','created_at'],:id)
+              return entity_action(api_v4,'admin/dropboxes',display_fields: ['id','e_wg_name','e_wg_desc','created_at'])
             when :dmembership
-              return self.entity_action(api_v4,'dropbox_memberships',nil,:id)
+              return entity_action(api_v4,'dropbox_memberships')
             when :workgroup
-              return self.entity_action(api_v4,'admin/workgroups',['id','e_wg_name','e_wg_desc','created_at'],:id)
+              return entity_action(api_v4,'admin/workgroups',display_fields: ['id','e_wg_name','e_wg_desc','created_at'])
             when :wmembership
-              return self.entity_action(api_v4,'workgroup_memberships',nil,:id)
+              return entity_action(api_v4,'workgroup_memberships')
             when :user
-              return self.entity_action(api_v4,'users',['id','name','first_name','last_name'],:id)
+              return entity_action(api_v4,'users',display_fields: ['id','name','first_name','last_name'])
             when :metadata_profile
-              return self.entity_action(api_v4,'metadata_profiles',nil,:id)
+              return entity_action(api_v4,'metadata_profiles')
             when :package
-              pkg_box_type=self.options.get_next_command([:users])
-              pkg_box_id=self.instance_identifier()
-              return self.entity_action(api_v4,"#{pkg_box_type}/#{pkg_box_id}/packages",nil,:id)
+              pkg_box_type=options.get_next_command([:users])
+              pkg_box_id=instance_identifier()
+              return entity_action(api_v4,"#{pkg_box_type}/#{pkg_box_id}/packages")
             end
           when :address_book
-            result=api_v3.call({:operation=>'GET',:subpath=>'address-book',:headers=>{'Accept'=>'application/json'},:url_params=>{'format'=>'json','count'=>100000}})[:data]
+            result=api_v3.call({operation: 'GET',subpath: 'address-book',headers: {'Accept'=>'application/json'},url_params: {'format'=>'json','count'=>100_000}})[:data]
             self.format.display_status("users: #{result['itemsPerPage']}/#{result['totalResults']}, start:#{result['startIndex']}")
             users=result['entry']
             # add missing entries
@@ -442,11 +463,11 @@ module Aspera
               u['first_name'],u['last_name'] = u['displayName'].split(' ',2)
               u['x']=true
             end
-            return {:type=>:object_list,:data=>users}
+            return {type: :object_list,data: users}
           when :login_methods
-            login_meths=api_v3.call({:operation=>'GET',:subpath=>'login/new',:headers=>{'Accept'=>'application/xrds+xml'}})[:http].body
+            login_meths=api_v3.call({operation: 'GET',subpath: 'login/new',headers: {'Accept'=>'application/xrds+xml'}})[:http].body
             login_methods=XmlSimple.xml_in(login_meths, {'ForceArray' => false})
-            return {:type=>:object_list, :data=>login_methods['XRD']['Service']}
+            return {type: :object_list, data: login_methods['XRD']['Service']}
           end # command
         end
       end