aspera-cli 4.8.0 → 4.9.0

data/lib/aspera/cli/transfer_agent.rb

@@ -14,6 +14,7 @@ module Aspera
       FILE_LIST_FROM_ARGS = '@args'
       # special value for --sources : read file list from transfer spec (--ts)
       FILE_LIST_FROM_TRANSFER_SPEC = '@ts'
+      FILE_LIST_OPTIONS=[FILE_LIST_FROM_ARGS,FILE_LIST_FROM_TRANSFER_SPEC,'Array'].freeze
       DEFAULT_TRANSFER_NOTIF_TMPL = <<~END_OF_TEMPLATE
         From: <%=from_name%> <<%=from_email%>>
         To: <<%=to%>>
@@ -24,9 +25,20 @@ module Aspera
         <%=ts.to_yaml%>
       END_OF_TEMPLATE
       #% (formating bug in eclipse)
-      private_constant :FILE_LIST_FROM_ARGS,:FILE_LIST_FROM_TRANSFER_SPEC,:DEFAULT_TRANSFER_NOTIF_TMPL
+      private_constant :FILE_LIST_FROM_ARGS,:FILE_LIST_FROM_TRANSFER_SPEC,:FILE_LIST_OPTIONS,
+        :DEFAULT_TRANSFER_NOTIF_TMPL
       TRANSFER_AGENTS = %i[direct node connect httpgw trsdk].freeze
 
+      class << self
+        # @return :success if all sessions statuses returned by "start" are success
+        # else return the first error exception object
+        def session_status(statuses)
+          error_statuses = statuses.reject{|i|i.eql?(:success)}
+          return :success if error_statuses.empty?
+          return error_statuses.first
+        end
+      end
+
       # @param env external objects: option manager, config file manager
       def initialize(opt_mgr,config)
         @opt_mgr = opt_mgr
@@ -41,11 +53,11 @@ module Aspera
         @opt_mgr.set_obj_attr(:ts,self,:option_transfer_spec)
         @opt_mgr.add_opt_simple(:ts,"override transfer spec values (Hash, use @json: prefix), current=#{@opt_mgr.get_option(:ts)}")
         @opt_mgr.add_opt_simple(:local_resume,"set resume policy (Hash, use @json: prefix), current=#{@opt_mgr.get_option(:local_resume)}")
-        @opt_mgr.add_opt_simple(:to_folder,'destination folder for downloaded files')
-        @opt_mgr.add_opt_simple(:sources,'list of source files (see doc)')
-        @opt_mgr.add_opt_simple(:transfer_info,'parameters for transfer agent')
+        @opt_mgr.add_opt_simple(:to_folder,'destination folder for transfered files')
+        @opt_mgr.add_opt_simple(:sources,"how list of transfered files is provided (#{FILE_LIST_OPTIONS.join(',')})")
         @opt_mgr.add_opt_list(:src_type,%i[list pair],'type of file list')
         @opt_mgr.add_opt_list(:transfer,TRANSFER_AGENTS,'type of transfer agent')
+        @opt_mgr.add_opt_simple(:transfer_info,'parameters for transfer agent')
         @opt_mgr.add_opt_list(:progress,%i[none native multi],'type of progress bar')
         @opt_mgr.set_option(:transfer,:direct)
         @opt_mgr.set_option(:src_type,:list)
@@ -102,7 +114,8 @@ module Aspera
       # param: 'send' or 'receive'
       def destination_folder(direction)
         dest_folder = @opt_mgr.get_option(:to_folder)
-        return File.expand_path(dest_folder) unless dest_folder.nil?
+        # do not expand path, if user wants to expand path: user @path:
+        return dest_folder unless dest_folder.nil?
         dest_folder = @transfer_spec_cmdline['destination_root']
         return dest_folder unless dest_folder.nil?
         # default: / on remote, . on local
@@ -134,7 +147,9 @@ module Aspera
             "--sources=#{FILE_LIST_FROM_TRANSFER_SPEC} to use transfer spec" if !file_list.is_a?(Array) || file_list.empty?
         when FILE_LIST_FROM_TRANSFER_SPEC
           Log.log.debug('assume list provided in transfer spec')
-          (special_case_direct_with_list = @opt_mgr.get_option(:transfer,is_type: :mandatory).eql?(:direct)) && Fasp::Parameters.ts_has_file_list(@transfer_spec_cmdline)
+          special_case_direct_with_list =
+            @opt_mgr.get_option(:transfer,is_type: :mandatory).eql?(:direct) &&
+            Fasp::Parameters.ts_has_ascp_file_list(@transfer_spec_cmdline)
           raise CliBadArgument,'transfer spec on command line must have sources' if @transfer_paths.nil? && !special_case_direct_with_list
           # here we assume check of sources is made in transfer agent
           return @transfer_paths
@@ -222,14 +237,6 @@ module Aspera
         @config.send_email_template(email_vars,DEFAULT_TRANSFER_NOTIF_TMPL)
       end
 
-      # @return :success if all sessions statuses returned by "start" are success
-      # else return the first error exception object
-      def self.session_status(statuses)
-        error_statuses = statuses.reject{|i|i.eql?(:success)}
-        return :success if error_statuses.empty?
-        return error_statuses.first
-      end
-
       # shut down if agent requires it
       def shutdown
         @agent.shutdown if @agent.respond_to?(:shutdown)

data/lib/aspera/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Aspera
   module Cli
-    VERSION = '4.8.0'
+    VERSION = '4.9.0'
   end
 end

data/lib/aspera/environment.rb

@@ -46,9 +46,11 @@ module Aspera
           return CPU_PPC64
         when /s390/
           return CPU_S390
-        else # other
-          raise "Unknown CPU: #{RbConfig::CONFIG['host_cpu']}"
+        when /arm/
+          # arm on mac has rosetta 2
+          return CPU_X86_64 if os.eql?(OS_X)
         end
+        raise "Unknown CPU: #{RbConfig::CONFIG['host_cpu']}"
       end
 
       def architecture
@@ -76,6 +78,17 @@ module Aspera
       def secure_eval(code)
         Kernel.send('lave'.reverse,code,empty_binding, __FILE__, __LINE__)
       end
+
+      # value is provided in block
+      def write_file_restricted(path,force: false)
+        raise 'coding error, missing content block' unless block_given?
+        if force || !File.exist?(path)
+          File.unlink(path) rescue nil # Windows may give error
+          File.write(path,yield)
+          File.chmod(0400,path)
+        end
+        return path
+      end
     end
   end
 end

data/lib/aspera/fasp/agent_base.rb

@@ -15,6 +15,15 @@ module Aspera
       EXPECTED_METHODS = %i[text struct enhanced].freeze
       private_constant :INTEGER_FIELDS,:BOOLEAN_FIELDS,:EXPECTED_METHODS
 
+      class << self
+        # This checks the validity of the value returned by wait_for_transfers_completion
+        # it must be a list of :success or exception
+        def validate_status_list(statuses)
+          raise "internal error: bad statuses type: #{statuses.class}" unless statuses.is_a?(Array)
+          raise "internal error: bad statuses content: #{statuses}" unless statuses.select{|i|!i.eql?(:success) && !i.is_a?(StandardError)}.empty?
+        end
+      end
+
       private
 
       # translates legacy event into enhanced (JSON) event
@@ -74,13 +83,6 @@ module Aspera
         self
       end
 
-      # This checks the validity of the value returned by wait_for_transfers_completion
-      # it must be a list of :success or exception
-      def self.validate_status_list(statuses)
-        raise "internal error: bad statuses type: #{statuses.class}" unless statuses.is_a?(Array)
-        raise "internal error: bad statuses content: #{statuses}" unless statuses.select{|i|!i.eql?(:success) && !i.is_a?(StandardError)}.empty?
-      end
-
       # the following methods must be implemented by subclass:
       # start_transfer(transfer_spec,options) : start and wait for completion
       # wait_for_transfers_completion : wait for termination of all transfers, @return list of : :success or error message

data/lib/aspera/fasp/installation.rb

@@ -139,28 +139,20 @@ module Aspera
         when :transferd
           file = transferd_filepath
         when :ssh_bypass_key_dsa
-          file = File.join(sdk_folder,'aspera_bypass_dsa.pem')
-          File.write(file,get_key('dsa',1)) unless File.exist?(file)
-          File.chmod(0400,file)
+          file=Environment.write_file_restricted(File.join(sdk_folder,'aspera_bypass_dsa.pem')) {get_key('dsa',1)}
         when :ssh_bypass_key_rsa
-          file = File.join(sdk_folder,'aspera_bypass_rsa.pem')
-          File.write(file,get_key('rsa',2)) unless File.exist?(file)
-          File.chmod(0400,file)
+          file=Environment.write_file_restricted(File.join(sdk_folder,'aspera_bypass_rsa.pem')) {get_key('rsa',2)}
         when :aspera_license
-          file = File.join(sdk_folder,'aspera-license')
-          unless File.exist?(file)
+          file=Environment.write_file_restricted(File.join(sdk_folder,'aspera-license')) do
             clear=[
               Zlib::Inflate.inflate(DataRepository.instance.data(6)),
               "==SIGNATURE==\n",
               Base64.strict_encode64(DataRepository.instance.data(7))
             ]
-            File.write(file,Base64.strict_encode64(clear.join))
+            Base64.strict_encode64(clear.join)
           end
-          File.chmod(0400,file)
         when :aspera_conf
-          file = File.join(sdk_folder,'aspera.conf')
-          File.write(file,DEFAULT_ASPERA_CONF) unless File.exist?(file)
-          File.chmod(0400,file)
+          file=Environment.write_file_restricted(File.join(sdk_folder,'aspera.conf')) {DEFAULT_ASPERA_CONF}
         when :fallback_cert,:fallback_key
           file_key = File.join(sdk_folder,'aspera_fallback_key.pem')
           file_cert = File.join(sdk_folder,'aspera_fallback_cert.pem')
@@ -176,10 +168,8 @@ module Aspera
             cert.serial = 0x0
             cert.version = 2
             cert.sign(private_key, OpenSSL::Digest.new('SHA1'))
-            File.write(file_key,private_key.to_pem)
-            File.write(file_cert,cert.to_pem)
-            File.chmod(0400,file_key)
-            File.chmod(0400,file_cert)
+            Environment.write_file_restricted(file_key, force: true) {private_key.to_pem}
+            Environment.write_file_restricted(file_cert, force: true) {cert.to_pem}
           end
           file = k.eql?(:fallback_cert) ? file_cert : file_key
         else
@@ -240,6 +230,8 @@ module Aspera
       # extracts ascp binary for current system architecture
       # @return ascp version (from execution)
       def install_sdk(sdk_url)
+        # SDK is organized by architecture, check this first, in case architecture is not supported
+        arch_filter = "#{Environment.architecture}/"
         require 'zip'
         sdk_zip_path = File.join(Dir.tmpdir,'sdk.zip')
         if sdk_url.start_with?('file:')
@@ -255,8 +247,6 @@ module Aspera
           File.rename(sdk_folder,"#{sdk_folder}.#{Time.now.strftime('%Y%m%d%H%M%S')}")
           # TODO: delete old archives ?
         end
-        # SDK is organized by architecture
-        arch_filter = "#{Environment.architecture}/"
         # extract files from archive
         Zip::File.open(sdk_zip_path) do |zip_file|
           zip_file.each do |entry|
@@ -354,6 +344,12 @@ module Aspera
           log_root: File.join(Dir.home,'Library','Logs','Aspera_Connect'),
           run_root: File.join(Dir.home,'Library','Application Support','Aspera','Aspera Connect'),
           sub_bin:  File.join('Contents','Resources')
+        },{
+          expected: PRODUCT_CONNECT,
+          app_root: File.join('','Applications','Aspera Connect.app'),
+          log_root: File.join(Dir.home,'Library','Logs','Aspera_Connect'),
+          run_root: File.join(Dir.home,'Library','Application Support','Aspera','Aspera Connect'),
+          sub_bin:  File.join('Contents','Resources')
         },{
           expected: PRODUCT_CLI_V1,
           app_root: File.join(Dir.home,'Applications','Aspera CLI'),

data/lib/aspera/fasp/parameters.rb

@@ -19,6 +19,8 @@ module Aspera
       # Short names of columns in manual
       SUPPORTED_AGENTS_SHORT = SUPPORTED_AGENTS.map{|a|a.to_s[0].to_sym}
 
+      private_constant :SUPPORTED_AGENTS
+
       class << self
         # Temp folder for file lists, must contain only file lists
         # because of garbage collection takes any file there
@@ -40,6 +42,7 @@ module Aspera
           result = []
           description.each do |k,i|
             param = {name: k, type: [i[:accepted_types]].flatten.join(','),description: i[:desc]}
+            # add flags for supported agents in doc
             SUPPORTED_AGENTS.each do |a|
               param[a.to_s[0].to_sym] = i[:tragents].nil? || i[:tragents].include?(a) ? 'Y' : ''
             end
@@ -68,8 +71,11 @@ module Aspera
         # special encoding methods used in YAML (key: :clconvert)
         def clconv_base64(v); Base64.strict_encode64(v); end
 
-        def ts_has_file_list(ts)
-          ts.has_key?('EX_ascp_args') && ts['EX_ascp_args'].is_a?(Array) && ['--file-list','--file-pair-list'].any?{|i|ts['EX_ascp_args'].include?(i)}
+        # file list is provided directly with ascp arguments
+        def ts_has_ascp_file_list(ts)
+          (ts['EX_ascp_args'].is_a?(Array) && ['--file-list','--file-pair-list'].any?{|i|ts['EX_ascp_args'].include?(i)}) ||
+          ts.has_key?('EX_file_list') ||
+          ts.has_key?('EX_file_pair_list')
         end
 
         def ts_to_env_args(transfer_spec,options)
@@ -143,48 +149,50 @@ module Aspera
           # destination will be base64 encoded, put before path arguments
           @builder.add_command_line_options(['--dest64'])
         end
-        # paths is mandatory, unless ...
-        file_list_provided = self.class.ts_has_file_list(@job_spec)
-        (@builder.params_definition['paths'][:mandatory] = !@job_spec.has_key?('keepalive')) && !file_list_provided
-        paths_array = @builder.process_param('paths',:get_value)
-        if file_list_provided && !paths_array.nil?
-          Log.log.warn('file list provided both in transfer spec and ascp file list. Keeping file list only.')
-          paths_array = nil
-        end
-        if !paths_array.nil?
-          # it's an array
-          raise 'paths is empty in transfer spec' if paths_array.empty?
-          # use file list if there is storage defined for it.
-          if self.class.file_list_folder.nil?
-            # not safe for special characters ? (maybe not, depends on OS)
-            Log.log.debug('placing source file list on command line (no file list file)')
-            @builder.add_command_line_options(paths_array.map{|i|i['source']})
+        # process file lists
+        begin
+          # is the file list provided through EX_ parameters?
+          ascp_file_list_provided = self.class.ts_has_ascp_file_list(@job_spec)
+          # set if paths is mandatory in ts
+          @builder.params_definition['paths'][:mandatory] = !@job_spec.has_key?('keepalive') && !ascp_file_list_provided
+          # get paths in transfer spec (after setting if it is mandatory)
+          ts_paths_array = @builder.process_param('paths',:get_value)
+          if ascp_file_list_provided && !ts_paths_array.nil?
+            raise 'file list provided both in transfer spec and ascp file list. Remove one of them.'
+          end
+          # option 1: EX_file_list
+          file_list_file = @builder.process_param('EX_file_list',:get_value)
+          if !file_list_file.nil?
+            option = '--file-list'
           else
-            file_list_file = @builder.process_param('EX_file_list',:get_value)
+            # option 2: EX_file_pair_list
+            file_list_file = @builder.process_param('EX_file_pair_list',:get_value)
             if !file_list_file.nil?
-              option = '--file-list'
-            else
-              file_list_file = @builder.process_param('EX_file_pair_list',:get_value)
-              if !file_list_file.nil?
-                option = '--file-pair-list'
-              else
-                # safer option: file list
+              option = '--file-pair-list'
+            elsif !ts_paths_array.nil?
+              # option 3: in TS, it is an array
+              if !self.class.file_list_folder.nil?
+                # safer option: generate a file list file if there is storage defined for it
                 # if there is destination in paths, then use filepairlist
                 # TODO: well, we test only the first one, but anyway it shall be consistent
-                if paths_array.first.has_key?('destination')
+                if ts_paths_array.first.has_key?('destination')
                   option = '--file-pair-list'
-                  lines = paths_array.each_with_object([]){|e,m|m.push(e['source'],e['destination']);}
+                  lines = ts_paths_array.each_with_object([]){|e,m|m.push(e['source'],e['destination']);}
                 else
                   option = '--file-list'
-                  lines = paths_array.map{|i|i['source']}
+                  lines = ts_paths_array.map{|i|i['source']}
                 end
                 file_list_file = Aspera::TempFileManager.instance.new_file_path_in_folder(self.class.file_list_folder)
                 File.write(file_list_file, lines.join("\n"))
                 Log.log.debug{"#{option}=\n#{File.read(file_list_file)}".red}
+              else
+                # not safe for special characters ? (maybe not, depends on OS)
+                Log.log.debug('placing source file list on command line (no file list file)')
+                @builder.add_command_line_options(ts_paths_array.map{|i|i['source']})
               end
             end
-            @builder.add_command_line_options(["#{option}=#{file_list_file}"])
           end
+          @builder.add_command_line_options(["#{option}=#{file_list_file}"]) unless option.nil?
         end
         # optional args, at the end to override previous ones (to allow override)
         @builder.add_command_line_options(@builder.process_param('EX_ascp_args',:get_value))

data/lib/aspera/fasp/parameters.yaml

@@ -49,7 +49,13 @@ create_dir:
   :cltype: :opt_without_arg
   :clswitch: "-d"
 delete_before_transfer:
-  :desc: "Before transfer, delete files that exist at the destination but not at the source. The source and destination arguments must be directories that have matching names. Objects on the destination that have the same name but different type or size as objects on the source are not deleted."
+  :desc: |-
+    Before transfer, delete files that exist at the destination but not at the source.
+    The source and destination arguments must be directories that have matching names.
+    Objects on the destination that have the same name but different type or size as objects
+    on the source are not deleted.
+
+
   :cltype: :opt_without_arg
 delete_source: # duplicate of remove_after_transfer ?
   :desc: Remove SRC files after transfer success
@@ -138,16 +144,24 @@ https_fallback_port:
   :cltype: :opt_with_arg
   :clswitch: "-t"
 move_after_transfer:
+  :desc: The relative path to which the files will be moved after the transfer at the source side.
   :cltype: :opt_with_arg
 multi_session:
-  :desc: "Use multi-session transfer. max 128.\n
-Each participant on one host needs an independent UDP (-O) port.\n
-Large files are split between sessions only when transferring with resume_policy=none."
+  :desc: |
+    Use multi-session transfer. max 128.
+    Each participant on one host needs an independent UDP (-O) port.
+    Large files are split between sessions only when transferring with resume_policy=none.
+
+
   :accepted_types: :int
   :cltype: :ignore
   :clswitch: "-C"
 multi_session_threshold:
-  :desc: Split files across multiple ascp sessions if their size in bytes is greater than or equal to the specified value. (0=no file is split)
+  :desc: |-
+    Split files across multiple ascp sessions if their size in bytes is greater than or equal to the specified value.
+    (0=no file is split)
+
+
   :accepted_types: :int
   :tragents:
   - :direct
@@ -163,6 +177,18 @@ overwrite:
   - older
   - diff+older
   :cltype: :opt_with_arg
+password:
+  :desc: |-
+    Password for local Windows user when transfer user associated with node api user is not the same as the one running asperanoded.
+    Allows impersonating the transfer user and have access to resources (e.g. network shares).
+    Windows only, node api only.
+
+
+  :required: false
+  :accepted_types: :string
+  :cltype: :ignore
+  :tragents:
+  - :node
 paths:
   :desc: Array of path to the source (required) and a path to the destination (optional).
   :required: true
@@ -233,10 +259,13 @@ remove_skipped:
   - :node
   :cltype: :opt_without_arg
 proxy:
-  :desc: "Specify the address of the Aspera high-speed proxy server.\n
-dnat(s)://[user[:password]@]server:port\n
-Default ports for DNAT and DNATS protocols are 9091 and 9092.\n
-Password, if specified here, overrides the value of environment variable ASPERA_PROXY_PASS."
+  :desc: |-
+    Specify the address of the Aspera high-speed proxy server.
+    dnat(s)://[user[:password]@]server:port
+    Default ports for DNAT and DNATS protocols are 9091 and 9092.
+    Password, if specified here, overrides the value of environment variable ASPERA_PROXY_PASS.
+
+
   :tragents:
   - :direct
   - :sdk
@@ -279,9 +308,12 @@ ssh_port:
   :cltype: :opt_with_arg
   :clswitch: "-P"
 ssh_private_key:
-  :desc: "Private key used for SSH authentication.\n
-   Shall look like: -----BEGIN RSA PRIV4TE KEY-----\\nMII...\n
-   Note the JSON encoding: \\n for newlines."
+  :desc: |-
+    Private key used for SSH authentication.
+    Shall look like: -----BEGIN RSA PRIV4TE KEY-----\nMII...
+    Note the JSON encoding: \n for newlines.
+
+
   :tragents:
   - :direct
   - :sdk
@@ -355,8 +387,11 @@ use_system_ssh:
   :cltype: :ignore
   :clswitch: "-SSH"
 source_root:
-  :desc: "Path to be prepended to each source path.\n
-This is either a conventional path or it can be a URI but only if there is no root defined."
+  :desc: |-
+    Path to be prepended to each source path.
+    This is either a conventional path or it can be a URI but only if there is no root defined.
+
+
   :cltype: :opt_with_arg
   :clswitch: "--source-prefix64"
   :clconvert: Aspera::Fasp::Parameters.clconv_base64
@@ -377,6 +412,20 @@ apply_local_docroot:
   - :direct
   - :sdk
   :cltype: :opt_without_arg
+src_base:
+  :desc: |-
+    Specify the prefix to be stripped off from each source object.
+    The remaining portion of the source path is kept intact at the destination.
+    Special care must be taken when used with cloud storage.
+
+
+  :tragents:
+  - :direct
+  - :node
+  - :sdk
+  :cltype: :opt_with_arg
+  :clswitch: "--src-base64"
+  :clconvert: Aspera::Fasp::Parameters.clconv_base64
 preserve_acls:
   :desc: "Preserve access control lists."
   :enum:
@@ -440,14 +489,17 @@ remove_empty_source_directory:
   - :sdk
   :cltype: :opt_without_arg
 EX_at_rest_password:
-  :desc: "Passphrase used for at rest encryption or decryption. Prefer to use standard: content_protection_password"
+  :desc: "DEPRECATED: Prefer to use standard parameter: content_protection_password"
   :tragents:
   - :direct
   :cltype: :envvar
   :clvarname: ASPERA_SCP_FILEPASS
 EX_proxy_password:
-  :desc: "Password used for Aspera proxy server authentication.\n
-May be overridden by password in URL EX_fasp_proxy_url."
+  :desc: |-
+    Password used for Aspera proxy server authentication.
+    May be overridden by password in URL EX_fasp_proxy_url.
+
+
   :tragents:
   - :direct
   :cltype: :envvar

data/lib/aspera/hash_ext.rb

@@ -10,18 +10,30 @@ class ::Hash
   end
 end
 
+# in 2.5
+unless Hash.method_defined?(:transform_keys)
+  class Hash
+    def transform_keys
+      return each_with_object({}){|(k,v),memo|memo[yield(k)]=v} if block_given?
+      raise 'missing block'
+    end
+  end
+end
+
+# rails
 unless Hash.method_defined?(:symbolize_keys)
   class Hash
     def symbolize_keys
-      return each_with_object({}){|(k,v),memo| memo[k.to_sym] = v; }
+      return transform_keys(&:to_sym)
     end
   end
 end
 
+# rails
 unless Hash.method_defined?(:stringify_keys)
   class Hash
     def stringify_keys
-      return each_with_object({}){|(k,v),memo| memo[k.to_s] = v }
+      return transform_keys(&:to_s)
     end
   end
 end

data/lib/aspera/id_generator.rb

@@ -8,17 +8,19 @@ module Aspera
     WINDOWS_PROTECTED_CHAR = %r{[/:"<>\\*?]}.freeze
     PROTECTED_CHAR_REPLACE = '_'
     private_constant :ID_SEPARATOR,:PROTECTED_CHAR_REPLACE,:WINDOWS_PROTECTED_CHAR
-    def self.from_list(object_id)
-      if object_id.is_a?(Array)
-        object_id = object_id.compact.map do |i|
-          i.is_a?(String) && i.start_with?('https://') ? URI.parse(i).host : i.to_s
-        end.join(ID_SEPARATOR)
+    class << self
+      def from_list(object_id)
+        if object_id.is_a?(Array)
+          object_id = object_id.compact.map do |i|
+            i.is_a?(String) && i.start_with?('https://') ? URI.parse(i).host : i.to_s
+          end.join(ID_SEPARATOR)
+        end
+        raise 'id must be a String' unless object_id.is_a?(String)
+        return object_id.
+            gsub(WINDOWS_PROTECTED_CHAR,PROTECTED_CHAR_REPLACE). # remove windows forbidden chars
+            gsub('.',PROTECTED_CHAR_REPLACE).  # keep dot for extension only (nicer)
+            downcase
       end
-      raise 'id must be a String' unless object_id.is_a?(String)
-      return object_id.
-          gsub(WINDOWS_PROTECTED_CHAR,PROTECTED_CHAR_REPLACE). # remove windows forbidden chars
-          gsub('.',PROTECTED_CHAR_REPLACE).  # keep dot for extension only (nicer)
-          downcase
     end
   end
 end

data/lib/aspera/keychain/encrypted_hash.rb

@@ -117,17 +117,17 @@ module Aspera
         result = options.clone
         case info
         when NilClass
-          raise "no such secret: #{options[:url]} #{username}"
+          raise "no such secret: [#{url}|#{username}] in #{@all_secrets.keys.join(',')}"
         when String
           result[:secret] = info
           result[:description] = ''
         when Hash
           info=info.symbolize_keys
           key = identifier(options)
-          plain = SimpleCipher.new(key).decrypt(info[:secret])
+          plain = SimpleCipher.new(key).decrypt(info[:secret]) rescue info[:secret]
           result[:secret] = plain
           result[:description] = info[:description]
-        else raise 'error'
+        else raise "#{info.class} is not an expected type"
         end
         return result
       end

data/lib/aspera/log.rb

@@ -79,7 +79,7 @@ module Aspera
         @logger = Logger.new($stdout)
       when :syslog
         require 'syslog/logger'
-        @logger = Syslog::Logger.new(@program_name)
+        @logger = Syslog::Logger.new(@program_name, Syslog::LOG_LOCAL2)
       else
         raise "unknown log type: #{new_logtype.class} #{new_logtype}"
       end

data/lib/aspera/nagios.rb

@@ -18,6 +18,32 @@ module Aspera
       define_method(name){|comp,msg|@data.push({code: code,comp: comp,msg: msg})}
     end
 
+    class << self
+      # process results of a analysis and display status and exit with code
+      def process(data)
+        raise 'INTERNAL ERROR, result must be list and not empty' unless data.is_a?(Array) && !data.empty?
+        %w[status component message].each{|c|raise "INTERNAL ERROR, result must have #{c}" unless data.first.has_key?(c)}
+        res_errors = data.reject{|s|s['status'].eql?('ok')}
+        # keep only errors in case of problem, other ok are assumed so
+        data = res_errors unless res_errors.empty?
+        # first is most critical
+        data.sort!{|a,b|LEVELS.index(a['status'].to_sym) <=> LEVELS.index(b['status'].to_sym)}
+        # build message: if multiple components: concatenate
+        #message = data.map{|i|"#{i['component']}:#{i['message']}"}.join(', ').gsub("\n",' ')
+        message = data.
+          map{|i|i['component']}.
+          uniq.
+          map{|comp|comp + ':' + data.select{|d|d['component'].eql?(comp)}.map{|d|d['message']}.join(',')}.
+          join(', ').
+          tr("\n",' ')
+        status = data.first['status'].upcase
+        # display status for nagios
+        puts("#{status} - [#{message}]\n")
+        # provide exit code to nagios
+        Process.exit(LEVELS.index(data.first['status'].to_sym))
+      end
+    end
+
     attr_reader :data
     def initialize
       @data = []
@@ -50,24 +76,5 @@ module Aspera
       raise 'missing result' if @data.empty?
       {type: :object_list,data: @data.map{|i|{'status' => LEVELS[i[:code]].to_s,'component' => i[:comp],'message' => i[:msg]}}}
     end
-
-    # process results of a analysis and display status and exit with code
-    def self.process(data)
-      raise 'INTERNAL ERROR, result must be list and not empty' unless data.is_a?(Array) && !data.empty?
-      %w[status component message].each{|c|raise "INTERNAL ERROR, result must have #{c}" unless data.first.has_key?(c)}
-      res_errors = data.reject{|s|s['status'].eql?('ok')}
-      # keep only errors in case of problem, other ok are assumed so
-      data = res_errors unless res_errors.empty?
-      # first is most critical
-      data.sort!{|a,b|LEVELS.index(a['status'].to_sym) <=> LEVELS.index(b['status'].to_sym)}
-      # build message: if multiple components: concatenate
-      #message = data.map{|i|"#{i['component']}:#{i['message']}"}.join(', ').gsub("\n",' ')
-      message = data.map{|i|i['component']}.uniq.map{|comp|comp + ':' + data.select{|d|d['component'].eql?(comp)}.map{|d|d['message']}.join(',')}.join(', ').tr("\n",' ')
-      status = data.first['status'].upcase
-      # display status for nagios
-      puts("#{status} - [#{message}]\n")
-      # provide exit code to nagios
-      Process.exit(LEVELS.index(data.first['status'].to_sym))
-    end
   end
 end