aspera-cli 4.27.5 → 4.29.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (249) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/BUGS.md +5 -10
  4. data/CHANGELOG.md +301 -4
  5. data/CODE_OF_CONDUCT.md +18 -0
  6. data/CONTRIBUTING.md +139 -58
  7. data/GOVERNANCE.md +30 -0
  8. data/LICENSE +201 -0
  9. data/README.md +103 -26
  10. data/SECURITY.md +70 -0
  11. data/bin/ascli +8 -5
  12. data/bin/asession +10 -7
  13. data/docs/README.md +2551 -772
  14. data/docs/test-mcp-with-ai.md +13 -11
  15. data/lib/aspera/agent/base.rb +23 -2
  16. data/lib/aspera/agent/connect.rb +16 -12
  17. data/lib/aspera/agent/desktop.rb +10 -7
  18. data/lib/aspera/agent/direct.rb +34 -22
  19. data/lib/aspera/agent/factory.rb +8 -4
  20. data/lib/aspera/agent/httpgw.rb +7 -5
  21. data/lib/aspera/agent/node.rb +15 -7
  22. data/lib/aspera/agent/transferd.rb +167 -43
  23. data/lib/aspera/api/alee.rb +4 -1
  24. data/lib/aspera/api/aoc.rb +14 -11
  25. data/lib/aspera/api/ats.rb +4 -2
  26. data/lib/aspera/api/cos_node.rb +8 -5
  27. data/lib/aspera/api/faspex.rb +16 -9
  28. data/lib/aspera/api/httpgw.rb +9 -6
  29. data/lib/aspera/api/node.rb +23 -19
  30. data/lib/aspera/ascmd.rb +8 -5
  31. data/lib/aspera/ascp/installation.rb +84 -42
  32. data/lib/aspera/ascp/log.schema.yaml +1084 -0
  33. data/lib/aspera/ascp/log_analyzer/advice.rb +97 -0
  34. data/lib/aspera/ascp/log_analyzer/diagnostics.rb +344 -0
  35. data/lib/aspera/ascp/log_analyzer/lines.rb +75 -0
  36. data/lib/aspera/ascp/log_analyzer/log_file.rb +593 -0
  37. data/lib/aspera/ascp/log_analyzer/records.rb +379 -0
  38. data/lib/aspera/ascp/log_analyzer/rules.rb +172 -0
  39. data/lib/aspera/ascp/log_analyzer/session.rb +782 -0
  40. data/lib/aspera/ascp/log_analyzer.rb +354 -0
  41. data/lib/aspera/ascp/management.rb +102 -48
  42. data/lib/aspera/ascp/session_errors.rb +217 -0
  43. data/lib/aspera/assert.rb +4 -0
  44. data/lib/aspera/cli/ascp_actions.rb +16 -37
  45. data/lib/aspera/cli/ascp_logs_actions.rb +176 -0
  46. data/lib/aspera/cli/async_transfer_store.rb +7 -4
  47. data/lib/aspera/cli/bootstrapper.rb +37 -34
  48. data/lib/aspera/cli/command_line.rb +24 -6
  49. data/lib/aspera/cli/command_registry.rb +49 -4
  50. data/lib/aspera/cli/command_spec.rb +34 -4
  51. data/lib/aspera/cli/completion/ascli.bash +53 -5
  52. data/lib/aspera/cli/completion/ascli.fish +27 -8
  53. data/lib/aspera/cli/completion/ascli.ps1 +63 -0
  54. data/lib/aspera/cli/completion/ascli.zsh +36 -4
  55. data/lib/aspera/cli/completion_actions.rb +594 -0
  56. data/lib/aspera/cli/context.rb +9 -4
  57. data/lib/aspera/cli/deprecation.rb +5 -2
  58. data/lib/aspera/cli/error.rb +45 -0
  59. data/lib/aspera/cli/extended_value.rb +83 -24
  60. data/lib/aspera/cli/formatter.rb +142 -73
  61. data/lib/aspera/cli/gem_checker.rb +9 -6
  62. data/lib/aspera/cli/hints.rb +22 -11
  63. data/lib/aspera/cli/http.rb +17 -13
  64. data/lib/aspera/cli/info.rb +17 -6
  65. data/lib/aspera/cli/mailer.rb +7 -4
  66. data/lib/aspera/cli/mcp/http_servlet.rb +155 -0
  67. data/lib/aspera/cli/mcp/secrets.rb +146 -0
  68. data/lib/aspera/cli/mcp/tool.rb +232 -0
  69. data/lib/aspera/cli/option_declarator.rb +10 -4
  70. data/lib/aspera/cli/option_registry.rb +6 -3
  71. data/lib/aspera/cli/option_types.rb +17 -2
  72. data/lib/aspera/cli/option_value.rb +72 -11
  73. data/lib/aspera/cli/options.schema.yaml +856 -81
  74. data/lib/aspera/cli/parser.rb +64 -31
  75. data/lib/aspera/cli/plugins/alee.rb +7 -4
  76. data/lib/aspera/cli/plugins/aoc.rb +250 -44
  77. data/lib/aspera/cli/plugins/ats.rb +9 -8
  78. data/lib/aspera/cli/plugins/base.rb +51 -25
  79. data/lib/aspera/cli/plugins/basic_auth.rb +5 -2
  80. data/lib/aspera/cli/plugins/config.rb +207 -141
  81. data/lib/aspera/cli/plugins/console.rb +9 -4
  82. data/lib/aspera/cli/plugins/cos.rb +8 -4
  83. data/lib/aspera/cli/plugins/factory.rb +22 -8
  84. data/lib/aspera/cli/plugins/faspex5.rb +37 -44
  85. data/lib/aspera/cli/plugins/faspio.rb +41 -8
  86. data/lib/aspera/cli/plugins/httpgw.rb +8 -4
  87. data/lib/aspera/cli/plugins/mcp.rb +186 -121
  88. data/lib/aspera/cli/plugins/node.rb +41 -34
  89. data/lib/aspera/cli/plugins/oauth.rb +5 -1
  90. data/lib/aspera/cli/plugins/orchestrator.rb +572 -59
  91. data/lib/aspera/cli/plugins/preview.rb +69 -44
  92. data/lib/aspera/cli/plugins/server.rb +66 -12
  93. data/lib/aspera/cli/plugins/shares.rb +288 -48
  94. data/lib/aspera/cli/plugins/transferd.rb +223 -0
  95. data/lib/aspera/cli/preset_actions.rb +155 -33
  96. data/lib/aspera/cli/preset_manager.rb +72 -16
  97. data/lib/aspera/cli/prompt.rb +7 -2
  98. data/lib/aspera/cli/result.rb +28 -11
  99. data/lib/aspera/cli/runner.rb +193 -80
  100. data/lib/aspera/cli/secret_finder.rb +4 -1
  101. data/lib/aspera/cli/security.rb +204 -0
  102. data/lib/aspera/cli/special_values.rb +4 -1
  103. data/lib/aspera/cli/sync_actions.rb +13 -10
  104. data/lib/aspera/cli/table_fitter.rb +119 -0
  105. data/lib/aspera/cli/terminal_formatter.rb +32 -40
  106. data/lib/aspera/cli/transfer_actions.rb +11 -8
  107. data/lib/aspera/cli/transfer_agent.rb +31 -19
  108. data/lib/aspera/cli/transfer_progress.rb +13 -45
  109. data/lib/aspera/cli/vault_actions.rb +45 -0
  110. data/lib/aspera/cli/vault_manager.rb +197 -50
  111. data/lib/aspera/cli/version.rb +4 -1
  112. data/lib/aspera/cli/web_secret.html.erb +61 -0
  113. data/lib/aspera/cli/web_secret.rb +222 -0
  114. data/lib/aspera/cli/wizard.rb +58 -45
  115. data/lib/aspera/command_line_builder.rb +35 -5
  116. data/lib/aspera/command_line_converter.rb +4 -1
  117. data/lib/aspera/coverage.rb +103 -33
  118. data/lib/aspera/data_repository.rb +42 -25
  119. data/lib/aspera/dot_container.rb +4 -1
  120. data/lib/aspera/duration.rb +45 -0
  121. data/lib/aspera/environment.rb +106 -33
  122. data/lib/aspera/exec_spec.rb +9 -5
  123. data/lib/aspera/faspex_gw.rb +105 -35
  124. data/lib/aspera/faspex_postproc.rb +193 -47
  125. data/lib/aspera/formatter_interface.rb +4 -2
  126. data/lib/aspera/graphql.rb +5 -1
  127. data/lib/aspera/hash_ext.rb +3 -0
  128. data/lib/aspera/id_generator.rb +6 -3
  129. data/lib/aspera/json_rpc/client.rb +55 -35
  130. data/lib/aspera/json_rpc/version.rb +4 -0
  131. data/lib/aspera/line_logger.rb +4 -1
  132. data/lib/aspera/link_header.rb +4 -1
  133. data/lib/aspera/log.rb +20 -10
  134. data/lib/aspera/markdown.rb +155 -115
  135. data/lib/aspera/mime.rb +9 -0
  136. data/lib/aspera/nagios.rb +9 -5
  137. data/lib/aspera/node_emulator.rb +111 -112
  138. data/lib/aspera/oauth/client/base.rb +163 -0
  139. data/lib/aspera/oauth/{boot.rb → client/boot.rb} +8 -4
  140. data/lib/aspera/oauth/{factory.rb → client/factory.rb} +13 -3
  141. data/lib/aspera/oauth/{generic.rb → client/generic.rb} +5 -1
  142. data/lib/aspera/oauth/{json_credentials.rb → client/json_credentials.rb} +4 -1
  143. data/lib/aspera/oauth/{jwt.rb → client/jwt.rb} +6 -3
  144. data/lib/aspera/oauth/client/shares_web.rb +85 -0
  145. data/lib/aspera/oauth/{url_json.rb → client/url_json.rb} +4 -1
  146. data/lib/aspera/oauth/client/web.rb +84 -0
  147. data/lib/aspera/oauth/server/authorize.html.erb +34 -0
  148. data/lib/aspera/oauth/server/pkce.rb +427 -0
  149. data/lib/aspera/orchestrator_workflow_checker.rb +679 -0
  150. data/lib/aspera/persistency_action_once.rb +5 -3
  151. data/lib/aspera/persistency_folder.rb +6 -3
  152. data/lib/aspera/preview/file_types.rb +6 -3
  153. data/lib/aspera/preview/generator.rb +9 -5
  154. data/lib/aspera/preview/options.schema.yaml +3 -3
  155. data/lib/aspera/preview/terminal.rb +11 -6
  156. data/lib/aspera/preview/utils.rb +6 -4
  157. data/lib/aspera/products/connect.rb +5 -2
  158. data/lib/aspera/products/desktop.rb +4 -1
  159. data/lib/aspera/products/other.rb +4 -2
  160. data/lib/aspera/products/transferd.rb +6 -2
  161. data/lib/aspera/products/transferd_service.rb +610 -0
  162. data/lib/aspera/proxy_auto_config.js +2 -2
  163. data/lib/aspera/proxy_auto_config.rb +5 -2
  164. data/lib/aspera/rainbow.rb +30 -1
  165. data/lib/aspera/rest/aspera_errors.rb +55 -60
  166. data/lib/aspera/rest/call_error.rb +3 -0
  167. data/lib/aspera/rest/client.rb +42 -42
  168. data/lib/aspera/rest/error_analyzer.rb +14 -2
  169. data/lib/aspera/rest/list.rb +14 -10
  170. data/lib/aspera/rest/parameters.rb +3 -0
  171. data/lib/aspera/rest/util.rb +13 -4
  172. data/lib/aspera/rest.rb +9 -7
  173. data/lib/aspera/schema/IBM Aspera Faspex API-5.0-enhanced.yaml +9 -11
  174. data/lib/aspera/schema/IBM Aspera Orchestrator API-v1-enhanced.yaml +4089 -0
  175. data/lib/aspera/schema/IBM Aspera faspio Gateway API-1.0.0-enhanced.yaml +1097 -0
  176. data/lib/aspera/schema/IBM Aspera on Cloud API-0.2.6-enhanced.yaml +11 -11
  177. data/lib/aspera/schema/IBM Aspera on Cloud Automation API-1.0.5-enhanced.yaml +2437 -1437
  178. data/lib/aspera/schema/IBM_Aspera_Shares.yaml +819 -7
  179. data/lib/aspera/schema/async_tables.yaml +11 -10
  180. data/lib/aspera/schema/documentation.rb +56 -78
  181. data/lib/aspera/schema/reader.rb +46 -11
  182. data/lib/aspera/schema/registry.rb +45 -24
  183. data/lib/aspera/schema/transferd-config.schema.json +333 -0
  184. data/lib/aspera/schema/validator.rb +4 -1
  185. data/lib/aspera/sealed_hash.rb +166 -0
  186. data/lib/aspera/secret/hider.rb +201 -0
  187. data/lib/aspera/secret/reference.rb +150 -0
  188. data/lib/aspera/secret/resolver.rb +212 -0
  189. data/lib/aspera/secret/store/base.rb +153 -0
  190. data/lib/aspera/secret/store/encrypted_hash.rb +329 -0
  191. data/lib/aspera/secret/store/factory.rb +103 -0
  192. data/lib/aspera/secret/store/hashicorp_vault.rb +390 -0
  193. data/lib/aspera/secret/store/keeper.rb +141 -0
  194. data/lib/aspera/secret/store/macos_security.rb +284 -0
  195. data/lib/aspera/secret/store/one_password_api.rb +99 -0
  196. data/lib/aspera/secret/store/one_password_base.rb +42 -0
  197. data/lib/aspera/secret/store/one_password_cli.rb +110 -0
  198. data/lib/aspera/secret/store/secret_service.rb +125 -0
  199. data/lib/aspera/secret/strength.rb +119 -0
  200. data/lib/aspera/servlet_helpers.rb +114 -0
  201. data/lib/aspera/ssh.rb +10 -7
  202. data/lib/aspera/ssl.rb +5 -2
  203. data/lib/aspera/string_ext.rb +3 -0
  204. data/lib/aspera/sync/args.schema.yaml +6 -1
  205. data/lib/aspera/sync/conf.schema.yaml +25 -10
  206. data/lib/aspera/sync/database.rb +3 -0
  207. data/lib/aspera/sync/operations.rb +34 -12
  208. data/lib/aspera/temp_file_manager.rb +85 -22
  209. data/lib/aspera/timer_limiter.rb +3 -0
  210. data/lib/aspera/transfer/error.rb +4 -1
  211. data/lib/aspera/transfer/faux_file.rb +4 -1
  212. data/lib/aspera/transfer/parameters.rb +22 -14
  213. data/lib/aspera/transfer/result.rb +3 -0
  214. data/lib/aspera/transfer/resumer.rb +6 -4
  215. data/lib/aspera/transfer/spec.rb +45 -18
  216. data/lib/aspera/transfer/spec.schema.yaml +8 -5
  217. data/lib/aspera/transfer/units.rb +75 -0
  218. data/lib/aspera/uri_reader.rb +57 -7
  219. data/lib/aspera/web_auth/index.html.erb +20 -0
  220. data/lib/aspera/web_auth/paste.rb +109 -0
  221. data/lib/aspera/web_auth/receiver.rb +50 -0
  222. data/lib/aspera/web_auth/relay.rb +76 -0
  223. data/lib/aspera/web_auth/reply.html.erb +150 -0
  224. data/lib/aspera/web_auth/server.rb +59 -14
  225. data/lib/aspera/web_page.html.erb +262 -0
  226. data/lib/aspera/web_page.rb +66 -0
  227. data/lib/aspera/web_server_simple.rb +82 -13
  228. data/lib/aspera/yaml.rb +5 -1
  229. data/llms.txt +81 -0
  230. data/skills/ascli/SKILL.md +88 -0
  231. data.tar.gz.sig +0 -0
  232. metadata +116 -48
  233. metadata.gz.sig +0 -0
  234. data/lib/aspera/cli/mcp_tool.rb +0 -189
  235. data/lib/aspera/keychain/base.rb +0 -25
  236. data/lib/aspera/keychain/encrypted_hash.rb +0 -188
  237. data/lib/aspera/keychain/factory.rb +0 -59
  238. data/lib/aspera/keychain/hashicorp_vault.rb +0 -74
  239. data/lib/aspera/keychain/macos_security.rb +0 -171
  240. data/lib/aspera/keychain/one_password_api.rb +0 -86
  241. data/lib/aspera/keychain/one_password_base.rb +0 -34
  242. data/lib/aspera/keychain/one_password_cli.rb +0 -98
  243. data/lib/aspera/oauth/base.rb +0 -141
  244. data/lib/aspera/oauth/web.rb +0 -57
  245. data/lib/aspera/oauth.rb +0 -9
  246. data/lib/aspera/schema/IBM Aspera Orchestrator API-v1.yaml +0 -1784
  247. data/lib/aspera/schema/IBM Aspera faspio Gateway API-1.0.0.yaml +0 -249
  248. data/lib/aspera/secret_hider.rb +0 -117
  249. data/lib/aspera/web_auth/index.html +0 -147
@@ -1,27 +1,26 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # cspell:ignore protobuf ckpt
4
- require 'aspera/yaml'
5
- require 'aspera/environment'
6
- require 'aspera/data_repository'
7
- require 'aspera/log'
8
- require 'aspera/rest'
9
- require 'aspera/uri_reader'
10
- require 'aspera/assert'
11
- require 'aspera/web_server_simple'
12
- require 'aspera/cli/info'
13
- require 'aspera/cli/version'
14
- require 'aspera/products/desktop'
15
- require 'aspera/products/connect'
16
- require 'aspera/products/transferd'
17
- require 'aspera/products/other'
18
- require 'English'
19
- require 'singleton'
20
- require 'xmlsimple'
21
- require 'base64'
3
+ # SPDX-FileCopyrightText: IBM Corp.
4
+ # SPDX-License-Identifier: Apache-2.0
5
+
6
+ # cspell:ignore ckpt
7
+ require_relative '../yaml'
8
+ require_relative '../environment'
9
+ require_relative '../data_repository'
10
+ require_relative '../log'
11
+ require_relative '../rest'
12
+ require_relative '../uri_reader'
13
+ require_relative '../assert'
14
+ require_relative '../web_server_simple'
15
+ require_relative '../hash_ext'
16
+ require_relative '../products/desktop'
17
+ require_relative '../products/connect'
18
+ require_relative '../products/transferd'
19
+ require_relative '../products/other'
22
20
  require 'fileutils'
23
21
  require 'openssl'
24
- require 'yaml'
22
+ require 'singleton'
23
+ require 'stringio'
25
24
  module Aspera
26
25
  module Ascp
27
26
  # Singleton that tells where to find ascp and other local resources (keys..) , using the "path(:name)" method.
@@ -51,15 +50,16 @@ module Aspera
51
50
  end
52
51
 
53
52
  # Loads YAML from cloud with locations of SDK archives for all platforms
54
- # @return [Hash] location structure
53
+ # Tries each URL of option `locations_url` (default if empty) in order, until one provides a valid list.
54
+ # All but the last URL are read with a short timeout and no retry, so that fallback is quick.
55
+ # @return [Array<Hash>] location structure
55
56
  def sdk_locations
56
- location_url = @transferd_urls
57
- transferd_locations = UriReader.read(location_url)
58
- Log.log.debug { "Retrieving SDK locations from #{location_url}" }
59
- begin
60
- return Yaml.safe_load(transferd_locations)
61
- rescue Psych::SyntaxError
62
- raise "Error when parsing yaml data from: #{location_url}"
57
+ Aspera.assert_type(@transferd_urls, Array) { 'locations_url' }
58
+ location_urls = @transferd_urls.empty? ? TRANSFERD_ARCHIVE_LOCATION_URLS : @transferd_urls
59
+ return UriReader.read_first(location_urls, what: 'SDK locations') do |content|
60
+ locations = Yaml.safe_load(content)
61
+ Aspera.assert_type(locations, Array) { 'SDK locations' }
62
+ locations
63
63
  end
64
64
  end
65
65
 
@@ -132,7 +132,6 @@ module Aspera
132
132
  file_key = File.join(Products::Transferd.sdk_directory, 'aspera_fallback_cert_private_key.pem')
133
133
  file_cert = File.join(Products::Transferd.sdk_directory, 'aspera_fallback_cert.pem')
134
134
  if !File.exist?(file_key) || !File.exist?(file_cert)
135
- require 'openssl'
136
135
  # create new self signed certificate for http fallback
137
136
  private_key = OpenSSL::PKey::RSA.new(4096)
138
137
  cert = WebServerSimple.self_signed_cert(private_key)
@@ -238,8 +237,10 @@ module Aspera
238
237
  return ascp_data
239
238
  end
240
239
 
241
- # @return [String] the url for download of SDK archive for the given platform and version
242
- def sdk_url_for_platform(platform: nil, version: nil)
240
+ # @param platform [nil, String] Platform, if nil: current one
241
+ # @param version [nil, String] Version, if nil: latest
242
+ # @return [Hash] the entry of SDK locations for the given platform and version
243
+ def sdk_location_for_platform(platform: nil, version: nil)
243
244
  all_locations = sdk_locations
244
245
  platform = Environment.instance.architecture if platform.nil?
245
246
  locations = all_locations.select { |l| l['platform'].eql?(platform) }
@@ -247,7 +248,20 @@ module Aspera
247
248
  version = locations.max_by { |entry| Gem::Version.new(entry['version']) }['version'] if version.nil?
248
249
  info = locations.select { |entry| entry['version'].eql?(version) }
249
250
  Aspera.assert(!info.empty?) { "No such version: #{version} for #{platform}" }
250
- return info.first['url']
251
+ return info.first
252
+ end
253
+
254
+ # @return [String] the url for download of SDK archive for the given platform and version
255
+ def sdk_url_for_platform(platform: nil, version: nil)
256
+ return sdk_location_for_platform(platform: platform, version: version)['url']
257
+ end
258
+
259
+ # @return [String, nil] Version of the SDK installed in the SDK folder (from its meta data file), or nil if not installed
260
+ def installed_sdk_version
261
+ return unless File.exist?(sdk_exe_path(:transferd))
262
+ meta_data_file = File.join(Products::Transferd.sdk_directory, Products::Other::INFO_META_FILE)
263
+ return unless File.exist?(meta_data_file)
264
+ return File.read(meta_data_file).scan(%r{<version>(.*?)</version>}).flatten.first
251
265
  end
252
266
 
253
267
  # @param url [String] URL or filename used to detect archive format
@@ -337,8 +351,8 @@ module Aspera
337
351
  extracted_files[file_basename] = entry_name
338
352
  FileUtils.mkdir_p(dest_folder)
339
353
  if link_target.nil?
340
- # Security: Check if destination already exists
341
- if File.exist?(dest_file)
354
+ # Security: Check if destination already exists, including a dangling symlink (`exist?` follows links)
355
+ if File.symlink?(dest_file) || File.exist?(dest_file)
342
356
  Log.log.warn { "Rejecting write to existing file or link: #{dest_file}" }
343
357
  next
344
358
  end
@@ -348,13 +362,13 @@ module Aspera
348
362
  FileUtils.mkdir_p(File.dirname(dest_file))
349
363
  # Check where the file would resolve to (handles existing symlinks in path)
350
364
  resolved_dest = File.realpath(File.dirname(dest_file))
351
- unless resolved_dest.start_with?(install_boundary)
365
+ unless inside_folder?(resolved_dest, install_boundary)
352
366
  Log.log.warn { "Rejecting file outside installation directory: #{dest_file} resolves to #{resolved_dest}" }
353
367
  next
354
368
  end
355
369
  rescue Errno::ENOENT
356
370
  # Directory doesn't exist yet, verify the intended path
357
- unless dest_file.start_with?(folder)
371
+ unless inside_folder?(File.expand_path(dest_file), File.expand_path(folder))
358
372
  Log.log.warn { "Rejecting file with path outside installation directory: #{dest_file}" }
359
373
  next
360
374
  end
@@ -363,7 +377,8 @@ module Aspera
363
377
  else
364
378
  # Security: Validate symlink target stays within installation boundary
365
379
  # Resolve the symlink target relative to its location
366
- link_dir = File.dirname(dest_file)
380
+ # (real path of the folder, so that links already on disk are resolved)
381
+ link_dir = File.realpath(File.dirname(dest_file))
367
382
  resolved_target = if link_target.start_with?('/')
368
383
  # Absolute symlink target
369
384
  link_target
@@ -372,7 +387,7 @@ module Aspera
372
387
  File.expand_path(link_target, link_dir)
373
388
  end
374
389
  # Check if resolved target would be outside installation directory
375
- unless resolved_target.start_with?(install_boundary)
390
+ unless inside_folder?(File.expand_path(resolved_target), install_boundary)
376
391
  Log.log.warn { "Rejecting symlink pointing outside installation directory: #{entry_name} -> #{link_target} (resolves to #{resolved_target})" }
377
392
  next
378
393
  end
@@ -384,8 +399,10 @@ module Aspera
384
399
  # Downloads, installs and configures the SDK, returns name, version and install folder
385
400
  # @param url [nil, String] URL to SDK archive, if nil: default url for version
386
401
  # @param version [nil, String] Specific version, if nil: latest version
402
+ # @param folder [nil, String] Install folder, if nil: the SDK folder (option `sdk_folder`), which is unchanged
387
403
  # @return [Array<String>] sdk name, sdk version, install folder
388
- def install_sdk(url: nil, version: nil)
404
+ def install_sdk(url: nil, version: nil, folder: nil)
405
+ return with_sdk_directory(folder) { install_sdk(url: url, version: version) } unless folder.nil?
389
406
  folder = Products::Transferd.sdk_directory
390
407
  download_sdk(folder: folder, url: url, version: version)
391
408
  # Ensure necessary files are there, or generate them, restrict file access on SDK executables
@@ -415,10 +432,30 @@ module Aspera
415
432
  return sdk_name, sdk_version, folder
416
433
  end
417
434
 
435
+ # @return [Array<String>] URLs of SDK locations, tried in order
418
436
  attr_accessor :transferd_urls
419
437
 
420
438
  private
421
439
 
440
+ # Run the block with another SDK folder (files of the SDK are located from it), then set the previous one back
441
+ # @param folder [String] Temporary SDK folder
442
+ def with_sdk_directory(folder)
443
+ previous = Products::Transferd.sdk_directory
444
+ begin
445
+ Products::Transferd.sdk_directory = folder
446
+ return yield
447
+ ensure
448
+ Products::Transferd.sdk_directory = previous
449
+ end
450
+ end
451
+
452
+ # @param path [String] Path to check
453
+ # @param boundary [String] Folder that must contain `path`
454
+ # @return [Boolean] `true` if `path` is `boundary` or is below it (a sibling sharing the name prefix is not)
455
+ def inside_folder?(path, boundary)
456
+ path.eql?(boundary) || path.start_with?(boundary.end_with?(File::SEPARATOR) ? boundary : "#{boundary}#{File::SEPARATOR}")
457
+ end
458
+
422
459
  DEFAULT_ASPERA_CONF = <<~END_OF_CONFIG_FILE
423
460
  <?xml version='1.0' encoding='UTF-8'?>
424
461
  <CONF version="2">
@@ -434,14 +471,19 @@ module Aspera
434
471
  EXE_FILES = %i[ascp ascp4 async transferd].freeze
435
472
  # IDs of files present in SDK
436
473
  SDK_FILES = (EXE_FILES + %i[ssh_private_dsa ssh_private_rsa aspera_license aspera_conf fallback_certificate fallback_private_key]).freeze
437
- TRANSFERD_ARCHIVE_LOCATION_URL = 'https://ibm.biz/sdk_location'
474
+ # Primary URL (ibm.biz short link) with fallback to the canonical GitHub raw source
475
+ TRANSFERD_ARCHIVE_LOCATION_URLS = [
476
+ 'https://ibm.biz/sdk_location',
477
+ 'https://raw.githubusercontent.com/IBM/aspera-cli/refs/heads/main/docs/sdk_location.yaml'
478
+ ].freeze
438
479
  # filename for ascp with optional extension (Windows)
439
- private_constant :DEFAULT_ASPERA_CONF, :EXE_FILES, :SDK_FILES, :TRANSFERD_ARCHIVE_LOCATION_URL
480
+ private_constant :DEFAULT_ASPERA_CONF, :EXE_FILES, :SDK_FILES, :TRANSFERD_ARCHIVE_LOCATION_URLS
440
481
 
441
482
  def initialize
442
483
  # cache for installed products found
443
484
  @found_products = nil
444
- @transferd_urls = TRANSFERD_ARCHIVE_LOCATION_URL
485
+ # URLs of SDK locations, tried in order
486
+ @transferd_urls = TRANSFERD_ARCHIVE_LOCATION_URLS
445
487
  # product selected with option `sdk_folder`, or nil to use SDK folder
446
488
  @ascp_product = nil
447
489
  # cache for folder of `ascp` of selected product