aspera-cli 4.21.1 → 4.21.2

data/lib/aspera/preview/utils.rb

@@ -14,7 +14,7 @@ module Aspera
       # from bash manual: meta-character need to be escaped
       BASH_SPECIAL_CHARACTERS = "|&;()<> \t#\n"
       # external binaries used
-      EXTERNAL_TOOLS = %i[ffmpeg ffprobe convert composite optipng unoconv].freeze
+      EXTERNAL_TOOLS = %i[ffmpeg ffprobe magick optipng unoconv].freeze
       TEMP_FORMAT = 'img%04d.jpg'
       private_constant :BASH_SPECIAL_CHARACTERS, :EXTERNAL_TOOLS, :TEMP_FORMAT
 
@@ -32,7 +32,7 @@ module Aspera
           tools_to_check.delete(:unoconv) if skip_types.include?(:office)
           # Check for binaries
           tools_to_check.each do |command_sym|
-            external_command(command_sym, ['-h'])
+            external_command(command_sym, ['-h'], out: File::NULL)
           rescue Errno::ENOENT => e
             raise "missing #{command_sym} binary: #{e}"
           rescue
@@ -45,7 +45,7 @@ module Aspera
         # @return nil
         def external_command(command_sym, command_args)
           Aspera.assert_values(command_sym, EXTERNAL_TOOLS){'command'}
-          Environment.secure_execute(exec: command_sym.to_s, args: command_args.map(&:to_s))
+          Environment.secure_execute(exec: command_sym.to_s, args: command_args.map(&:to_s), out: File::NULL, err: File::NULL)
         end
 
         def external_capture(command_sym, command_args)
@@ -97,7 +97,7 @@ module Aspera
           1.upto(count) do |i|
             percent = i * 100 / (count + 1)
             filename = get_tmp_num_filepath(temp_folder, index1 + i)
-            external_command(:composite, ['-blend', percent, img2, img1, filename])
+            external_command(:magick, ['composite', '-blend', percent, img2, img1, filename])
           end
         end
 

data/lib/aspera/products/connect.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require 'aspera/environment'
+require 'singleton'
 
 module Aspera
   module Products
     class Connect
+      include Singleton
       APP_NAME = 'IBM Aspera Connect'
+
       class << self
         # standard folder locations
         def locations
@@ -43,6 +46,37 @@ module Aspera
           end.map { |i| i.merge({ expected: APP_NAME }) }
         end
       end
+
+      def cdn_api
+        Rest.new(base_url: CDN_BASE_URL)
+      end
+
+      # retrieve structure from cloud (CDN) with all versions available
+      def versions
+        if @connect_versions.nil?
+          javascript = cdn_api.call(operation: 'GET', subpath: VERSION_INFO_FILE)
+          # get result on one line
+          connect_versions_javascript = javascript[:http].body.gsub(/\r?\n\s*/, '')
+          Log.log.debug{"javascript=[\n#{connect_versions_javascript}\n]"}
+          # get javascript object only
+          found = connect_versions_javascript.match(/^.*? = (.*);/)
+          raise Cli::Error, 'Problem when getting connect versions from internet' if found.nil?
+          all_data = JSON.parse(found[1])
+          @connect_versions = all_data['entries']
+        end
+        return @connect_versions
+      end
+
+      private
+
+      def initialize
+        @connect_versions = nil
+      end
+
+      VERSION_INFO_FILE = 'connectversions.js' # cspell: disable-line
+      CDN_BASE_URL = 'https://d3gcli72yxqn2z.cloudfront.net/connect'
+
+      private_constant :VERSION_INFO_FILE, :CDN_BASE_URL
     end
   end
 end

data/lib/aspera/products/{alpha.rb → desktop.rb}

@@ -4,8 +4,8 @@ require 'aspera/environment'
 
 module Aspera
   module Products
-    # Aspera Desktop Alpha Client
-    class Alpha
+    # Client Aspera for Desktop
+    class Desktop
       APP_NAME = 'IBM Aspera for Desktop'
       APP_IDENTIFIER = 'com.ibm.software.aspera.desktop'
       class << self

data/lib/aspera/products/transferd.rb

@@ -4,6 +4,11 @@ module Aspera
   module Products
     class Transferd
       APP_NAME = 'IBM Aspera Transfer Daemon'
+      V1_DAEMON_NAME = 'asperatransferd'
+      # from 1.1.5
+      V2_DAEMON_NAME = 'transferd'
+      # folders to extract from SDK archive
+      RUNTIME_FOLDERS = %w[bin lib sbin aspera].freeze
       class << self
         # standard folder locations
         def locations
@@ -28,7 +33,9 @@ module Aspera
         end
 
         def transferd_path
-          return File.join(sdk_directory, Environment.exe_file('asperatransferd')) # cspell:disable-line
+          v1_path = File.join(sdk_directory, Environment.exe_file(V1_DAEMON_NAME))
+          return v1_path if File.exist?(v1_path)
+          return File.join(sdk_directory, Environment.exe_file(V2_DAEMON_NAME))
         end
 
         # Well, the port number is only in log file

data/lib/aspera/rest.rb

@@ -62,7 +62,7 @@ module Aspera
 
     class << self
       # @return [String] Basic auth token
-      def basic_token(user, pass); return "Basic #{Base64.strict_encode64("#{user}:#{pass}")}"; end
+      def basic_authorization(user, pass); return "Basic #{Base64.strict_encode64("#{user}:#{pass}")}"; end
 
       # Build a parameter list prefixed with "[]"
       # @param values [Array] list of values
@@ -295,7 +295,7 @@ module Aspera
         Log.log.debug('using Basic auth')
         # done in build_req
       when :oauth2
-        headers['Authorization'] = oauth.token unless headers.key?('Authorization')
+        headers['Authorization'] = oauth.authorization unless headers.key?('Authorization')
       when :url
         query ||= {}
         @auth_params[:url_query].each do |key, value|
@@ -409,12 +409,12 @@ module Aspera
         if @not_auth_codes.include?(result[:http].code.to_s) && @auth_params[:type].eql?(:oauth2)
           begin
             # try to use refresh token
-            req['Authorization'] = oauth.token(refresh: true)
+            req['Authorization'] = oauth.authorization(refresh: true)
           rescue RestCallError => e_tok
             e = e_tok
             Log.log.error('refresh failed'.bg_red)
             # regenerate a brand new token
-            req['Authorization'] = oauth.token(refresh: true)
+            req['Authorization'] = oauth.authorization(cache: false)
           end
           Log.log.debug{"using new token=#{headers['Authorization']}"}
           do_retry = true if (oauth_tries -= 1).positive?

data/lib/aspera/secret_hider.rb

@@ -38,6 +38,7 @@ module Aspera
     class << self
       attr_accessor :log_secrets
 
+      # @return new log formatter that hides secrets
       def log_formatter(original_formatter)
         original_formatter ||= Logger::Formatter.new
         # NOTE: that @log_secrets may be set AFTER this init is done, so it's done at runtime
@@ -51,6 +52,11 @@ module Aspera
         end
       end
 
+      def hide_secrets_in_string(value)
+        return value.gsub(REGEX_LOG_REPLACES.first){"#{Regexp.last_match(:begin)}#{HIDDEN_PASSWORD}#{Regexp.last_match(:end)}"}
+      end
+
+      # @return true if the key denotes a secret
       def secret?(keyword, value)
         keyword = keyword.to_s if keyword.is_a?(Symbol)
         # only Strings can be secrets, not booleans, or hash, arrays
@@ -62,6 +68,7 @@ module Aspera
         ALL_SECRETS.any?{|kw|keyword.include?(kw)}
       end
 
+      # Hides recursively secrets in Hash or Array of Hash
       def deep_remove_secret(obj)
         case obj
         when Array

data/lib/aspera/temp_file_manager.rb

@@ -35,22 +35,23 @@ module Aspera
 
     # ensure that provided folder exists, or create it, generate a unique filename
     # @return path to that unique file
-    def new_file_path_in_folder(temp_folder, add_base = '')
+    def new_file_path_in_folder(temp_folder, prefix: nil, suffix: nil)
       FileUtils.mkdir_p(temp_folder)
-      new_file = File.join(temp_folder, add_base + SecureRandom.uuid)
+      new_file = File.join(temp_folder, [prefix, SecureRandom.uuid, suffix].compact.join('-'))
       @created_files.push(new_file)
       new_file
     end
 
     # same as above but in global temp folder, with user's name
-    def new_file_path_global(base_name)
+    def new_file_path_global(prefix=nil, suffix: nil)
       username =
         begin
           Etc.getlogin || Etc.getpwuid(Process.uid).name || 'unknown_user'
         rescue StandardError
           'unknown_user'
         end
-      new_file_path_in_folder(Etc.systmpdir, base_name + '_' + username + '_')
+      prefix = [prefix, username].compact.join('-')
+      new_file_path_in_folder(Etc.systmpdir, prefix: prefix, suffix: suffix)
     end
 
     def cleanup_expired(temp_folder)

data/lib/aspera/uri_reader.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 require 'uri'
+require 'aspera/assert'
 require 'aspera/rest'
+require 'aspera/temp_file_manager'
 
 module Aspera
   # read some content from some URI, support file: , http: and https: schemes
   module UriReader
+    FILE_SCHEME_PREFIX = 'file:///'
+    private_constant :FILE_SCHEME_PREFIX
     class << self
       # read some content from some URI, support file: , http: and https: schemes
       def read(uri_to_read)
@@ -18,8 +22,21 @@ module Aspera
           raise 'URL shall have a path, check syntax' if local_file_path.nil?
           local_file_path = File.expand_path(local_file_path.gsub(%r{^/}, '')) if %r{^/(~|.|..)/}.match?(local_file_path)
           return File.read(local_file_path)
+        else Aspera.error_unexpected_value(uri.scheme) {"scheme for [#{uri_to_read}]"}
+        end
+      end
+
+      # @return path to file with content at URL
+      def read_as_file(url)
+        if url.start_with?('file:')
+          # require specific file scheme: the path part is "relative", or absolute if there are 4 slash
+          raise "use format: #{FILE_SCHEME_PREFIX}<path>" unless url.start_with?(FILE_SCHEME_PREFIX)
+          return File.expand_path(url[FILE_SCHEME_PREFIX.length..-1])
         else
-          raise "unknown scheme: [#{uri.scheme}] for [#{uri_to_read}]"
+          # autodelete on exit
+          sdk_archive_path = TempFileManager.instance.new_file_path_global(suffix: File.basename(url))
+          Aspera::Rest.new(base_url: url, redirect_max: 3).call(operation: 'GET', save_to_file: sdk_archive_path)
+          return sdk_archive_path
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aspera-cli
 version: !ruby/object:Gem::Version
-  version: 4.21.1
+  version: 4.21.2
 platform: ruby
 authors:
 - Laurent Martin
@@ -37,7 +37,7 @@ cert_chain:
   eTf9kxhVM40wGQOECVNA8UsEEZHD48eF+csUYZtAJOF5oxTI8UyV9T/o6CgO0c9/
   Gzz+Qm5ULOUcPiJLjSpaiTrkiIVYiDGnqNSr6R1Hb1c=
   -----END CERTIFICATE-----
-date: 2025-03-14 00:00:00.000000000 Z
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blankslate
@@ -123,20 +123,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.3'
-- !ruby/object:Gem::Dependency
-  name: openssl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -249,160 +235,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: grpc-tools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.67.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.67.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: rubocop-ast
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop-shopify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-lsp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.23'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.23'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-- !ruby/object:Gem::Dependency
-  name: solargraph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.48'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.48'
 description: Command line interface for IBM Aspera products
 email:
 - laurent.martin.aspera@fr.ibm.com
@@ -418,15 +250,13 @@ files:
 - README.md
 - bin/ascli
 - bin/asession
-- examples/build_exec
-- examples/build_exec_rubyc
 - examples/build_package.sh
 - examples/dascli
 - examples/get_proto_file.rb
 - examples/proxy.pac
-- lib/aspera/agent/alpha.rb
 - lib/aspera/agent/base.rb
 - lib/aspera/agent/connect.rb
+- lib/aspera/agent/desktop.rb
 - lib/aspera/agent/direct.rb
 - lib/aspera/agent/httpgw.rb
 - lib/aspera/agent/node.rb
@@ -509,8 +339,8 @@ files:
 - lib/aspera/preview/terminal.rb
 - lib/aspera/preview/utils.rb
 - lib/aspera/preview/video_error.png
-- lib/aspera/products/alpha.rb
 - lib/aspera/products/connect.rb
+- lib/aspera/products/desktop.rb
 - lib/aspera/products/other.rb
 - lib/aspera/products/transferd.rb
 - lib/aspera/proxy_auto_config.js

data/examples/build_exec

@@ -1,74 +0,0 @@
-#!/bin/bash
-# Glibc for various OS: https://gist.github.com/wagenet/35adca1a032cec2999d47b6c40aa45b1
-# https://distrowatch.com/table.php?distribution=redhat
-# RHEL 8 : glibc 2.28
-# RHEL 9 : glibc 2.34
-# https://distrowatch.com/table.php?distribution=ubuntu
-# Ubuntu 18.10 cosmic : glibc 2.28
-# Ubuntu 21.10 impish : gblic 2.34
-# https://www.ibm.com/docs/en/ahts/4.4.x?topic=release-notes
-# ascp 4.4.5 : gblic 2.28
-# dwarfs requires boost >= 1.65
-# boost requires cmake >= 3.30
-set -e
-
-if test $# -ne 5; then
-    echo "Usage: $0 <CLI_EXECUTABLE> <CLI_PATH> <GEM_NAME> <GEM_VERSION> <DIR_TMP>" 1>&2
-    exit 1
-fi
-
-CLI_EXECUTABLE=$1
-CLI_PATH=$(realpath $2)
-GEM_NAME=$3
-GEM_VERSION=$4
-DIR_TMP=$(realpath $5)
-
-echo "Building: $(basename $CLI_EXECUTABLE)"
-
-# tebako compilation
-tebako_env=$DIR_TMP/tebako-env
-# project files (gem)
-tebako_root=$DIR_TMP/tebako-root
-# only provide the name, not path
-tebako_entry=$(basename $CLI_PATH)
-tebako_output=$CLI_EXECUTABLE
-
-container_tag=alpine-3.17
-#container_tag=ubuntu-20.04
-
-gem install tebako
-mkdir -p $tebako_env $tebako_root
-(cd $tebako_root && gem fetch $GEM_NAME:$GEM_VERSION)
-case $(uname -s) in
-Darwin)
-    brew update
-    # install tools
-    brew install bash binutils bison flex gnu-sed lz4 pkg-config xz
-    # install libs
-    brew install boost double-conversion fmt gdbm glog jemalloc libevent libffi libsodium libyaml ncurses openssl@3 zlib
-    # make sure tools are reachable
-    export PATH=/opt/homebrew/opt/flex/bin:/opt/homebrew/opt/bison/bin:$PATH
-    # remove binutils from path so that macos `ar` is used
-    export PATH=$(echo $PATH|tr : \\n|grep -v /binutils/|tr \\n :)
-    ;;
-Linux)
-    tebako_root=/mnt/w
-    tebako_prefix="podman run -it --rm -v $PWD:$tebako_root ghcr.io/tamatebako/tebako-${container_tag}:0.8.6"
-    tebako_opts=--patchelf
-    tebako_output=$tebako_root/$(basename $CLI_EXECUTABLE)
-    ;;
-LinuxLocal)
-    dnf module reset ruby
-    dnf module install ruby:3.3
-    dnf install -y cmake git bash sudo autoconf boost-devel flex bison make clang binutils-devel libevent-devel libacl-devel sed python3 pkgconfig curl lz4-devel openssl-devel zlib-devel xz zip unzip tar xz-devel elfutils-devel libffi-devel gdbm-devel ncurses-devel readline-devel ruby-devel gettext-devel brotli-devel clang libxslt-devel
-    echo TODO
-    exit 1
-    dnf install 
-    ;;
-*)
-    echo "This OS is not supported." >&2
-    exit 1
-    ;;
-esac
-set -x
-exec $tebako_prefix tebako press --root=$tebako_root --entry-point=$tebako_entry --output=$tebako_output --prefix=$tebako_env $tebako_opts

data/examples/build_exec_rubyc

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if test $# -ne 5; then
-    echo "Usage: $0 <CLI_EXECUTABLE> <CLI_PATH> <GEM_NAME> <GEM_VERSION> <DIR_TMP>" 1>&2
-    exit 1
-fi
-
-CLI_EXECUTABLE=$1
-CLI_PATH=$(realpath $2)
-GEM_NAME=$3
-GEM_VERSION=$4
-DIR_TMP=$(realpath $5)
-
-echo "Building: $(basename $CLI_EXECUTABLE)"
-
-# https://github.com/you54f/ruby-packer
-# https://github.com/you54f/ruby-packer/releases
-set -e
-FOLDER="$(dirname $0)/../tmp"
-RUBYC="$FOLDER/rubyc"
-if test ! -e "$RUBYC"; then
-    mkdir -p "$FOLDER"
-    case $(uname -sm|tr ' ' -) in
-        Darwin-arm64)
-            curl -L https://github.com/YOU54F/ruby-packer/releases/download/rel-20230812/rubyc-Darwin-arm64.tar.gz | tar -xz -C "$FOLDER"
-            mv "$FOLDER/rubyc-Darwin-arm64" "$RUBYC"
-            ;;
-        Linux-x86_64)
-            curl -L https://github.com/YOU54F/ruby-packer/releases/download/rel-20230812/rubyc-Linux-x86_64.tar.gz | tar -xz -C "$FOLDER"
-            mv "$FOLDER/rubyc-Linux-x86_64" "$RUBYC"
-            ;;
-        *)
-            echo "This architecture is not supported." >&2
-            exit 1
-            ;;
-    esac
-fi
-exec "$RUBYC" -o "$CLI_EXECUTABLE" "$CLI_PATH"