aspera-cli 4.28.0 → 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.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/BUGS.md +5 -10
- data/CHANGELOG.md +143 -2
- data/CODE_OF_CONDUCT.md +18 -0
- data/CONTRIBUTING.md +135 -56
- data/GOVERNANCE.md +30 -0
- data/LICENSE +201 -0
- data/README.md +103 -26
- data/SECURITY.md +70 -0
- data/bin/ascli +8 -5
- data/bin/asession +9 -6
- data/docs/README.md +1633 -609
- data/docs/test-mcp-with-ai.md +8 -8
- data/lib/aspera/agent/base.rb +23 -2
- data/lib/aspera/agent/connect.rb +16 -12
- data/lib/aspera/agent/desktop.rb +10 -7
- data/lib/aspera/agent/direct.rb +20 -19
- data/lib/aspera/agent/factory.rb +6 -3
- data/lib/aspera/agent/httpgw.rb +7 -5
- data/lib/aspera/agent/node.rb +15 -7
- data/lib/aspera/agent/transferd.rb +167 -43
- data/lib/aspera/api/alee.rb +4 -1
- data/lib/aspera/api/aoc.rb +14 -11
- data/lib/aspera/api/ats.rb +4 -2
- data/lib/aspera/api/cos_node.rb +7 -4
- data/lib/aspera/api/faspex.rb +16 -9
- data/lib/aspera/api/httpgw.rb +9 -6
- data/lib/aspera/api/node.rb +20 -20
- data/lib/aspera/ascmd.rb +8 -5
- data/lib/aspera/ascp/installation.rb +71 -65
- data/lib/aspera/ascp/log.schema.yaml +1084 -0
- data/lib/aspera/ascp/log_analyzer/advice.rb +97 -0
- data/lib/aspera/ascp/log_analyzer/diagnostics.rb +344 -0
- data/lib/aspera/ascp/log_analyzer/lines.rb +75 -0
- data/lib/aspera/ascp/log_analyzer/log_file.rb +593 -0
- data/lib/aspera/ascp/log_analyzer/records.rb +379 -0
- data/lib/aspera/ascp/log_analyzer/rules.rb +172 -0
- data/lib/aspera/ascp/log_analyzer/session.rb +782 -0
- data/lib/aspera/ascp/log_analyzer.rb +354 -0
- data/lib/aspera/ascp/management.rb +16 -8
- data/lib/aspera/ascp/session_errors.rb +217 -0
- data/lib/aspera/assert.rb +4 -0
- data/lib/aspera/cli/ascp_actions.rb +12 -19
- data/lib/aspera/cli/ascp_logs_actions.rb +176 -0
- data/lib/aspera/cli/async_transfer_store.rb +7 -4
- data/lib/aspera/cli/bootstrapper.rb +37 -33
- data/lib/aspera/cli/command_line.rb +24 -6
- data/lib/aspera/cli/command_registry.rb +6 -1
- data/lib/aspera/cli/command_spec.rb +34 -7
- data/lib/aspera/cli/completion/ascli.bash +19 -5
- data/lib/aspera/cli/completion/ascli.fish +13 -2
- data/lib/aspera/cli/completion/ascli.ps1 +31 -9
- data/lib/aspera/cli/completion/ascli.zsh +22 -6
- data/lib/aspera/cli/completion_actions.rb +303 -69
- data/lib/aspera/cli/context.rb +9 -4
- data/lib/aspera/cli/deprecation.rb +5 -2
- data/lib/aspera/cli/error.rb +3 -0
- data/lib/aspera/cli/extended_value.rb +61 -27
- data/lib/aspera/cli/formatter.rb +29 -22
- data/lib/aspera/cli/gem_checker.rb +9 -6
- data/lib/aspera/cli/hints.rb +22 -10
- data/lib/aspera/cli/http.rb +12 -9
- data/lib/aspera/cli/info.rb +12 -7
- data/lib/aspera/cli/mailer.rb +6 -3
- data/lib/aspera/cli/mcp/http_servlet.rb +7 -8
- data/lib/aspera/cli/mcp/secrets.rb +8 -5
- data/lib/aspera/cli/mcp/tool.rb +15 -14
- data/lib/aspera/cli/option_declarator.rb +10 -4
- data/lib/aspera/cli/option_registry.rb +6 -3
- data/lib/aspera/cli/option_types.rb +17 -2
- data/lib/aspera/cli/option_value.rb +65 -12
- data/lib/aspera/cli/options.schema.yaml +487 -63
- data/lib/aspera/cli/parser.rb +56 -32
- data/lib/aspera/cli/plugins/alee.rb +7 -4
- data/lib/aspera/cli/plugins/aoc.rb +244 -35
- data/lib/aspera/cli/plugins/ats.rb +9 -8
- data/lib/aspera/cli/plugins/base.rb +17 -12
- data/lib/aspera/cli/plugins/basic_auth.rb +5 -2
- data/lib/aspera/cli/plugins/config.rb +198 -103
- data/lib/aspera/cli/plugins/console.rb +6 -3
- data/lib/aspera/cli/plugins/cos.rb +8 -4
- data/lib/aspera/cli/plugins/factory.rb +21 -7
- data/lib/aspera/cli/plugins/faspex5.rb +28 -25
- data/lib/aspera/cli/plugins/faspio.rb +7 -5
- data/lib/aspera/cli/plugins/httpgw.rb +7 -4
- data/lib/aspera/cli/plugins/mcp.rb +28 -22
- data/lib/aspera/cli/plugins/node.rb +31 -30
- data/lib/aspera/cli/plugins/oauth.rb +5 -1
- data/lib/aspera/cli/plugins/orchestrator.rb +272 -72
- data/lib/aspera/cli/plugins/preview.rb +69 -44
- data/lib/aspera/cli/plugins/server.rb +63 -11
- data/lib/aspera/cli/plugins/shares.rb +86 -16
- data/lib/aspera/cli/plugins/transferd.rb +223 -0
- data/lib/aspera/cli/preset_actions.rb +144 -30
- data/lib/aspera/cli/preset_manager.rb +52 -18
- data/lib/aspera/cli/prompt.rb +4 -1
- data/lib/aspera/cli/result.rb +12 -8
- data/lib/aspera/cli/runner.rb +69 -46
- data/lib/aspera/cli/secret_finder.rb +4 -1
- data/lib/aspera/cli/security.rb +79 -9
- data/lib/aspera/cli/special_values.rb +4 -1
- data/lib/aspera/cli/sync_actions.rb +13 -10
- data/lib/aspera/cli/table_fitter.rb +3 -0
- data/lib/aspera/cli/terminal_formatter.rb +9 -6
- data/lib/aspera/cli/transfer_actions.rb +11 -8
- data/lib/aspera/cli/transfer_agent.rb +29 -20
- data/lib/aspera/cli/transfer_progress.rb +13 -45
- data/lib/aspera/cli/vault_actions.rb +45 -0
- data/lib/aspera/cli/vault_manager.rb +188 -42
- data/lib/aspera/cli/version.rb +4 -1
- data/lib/aspera/cli/web_secret.rb +12 -10
- data/lib/aspera/cli/wizard.rb +42 -39
- data/lib/aspera/command_line_builder.rb +9 -5
- data/lib/aspera/command_line_converter.rb +4 -1
- data/lib/aspera/coverage.rb +103 -33
- data/lib/aspera/data_repository.rb +4 -1
- data/lib/aspera/dot_container.rb +4 -1
- data/lib/aspera/duration.rb +5 -2
- data/lib/aspera/environment.rb +21 -12
- data/lib/aspera/exec_spec.rb +3 -0
- data/lib/aspera/faspex_gw.rb +13 -9
- data/lib/aspera/faspex_postproc.rb +15 -12
- data/lib/aspera/formatter_interface.rb +4 -1
- data/lib/aspera/graphql.rb +5 -1
- data/lib/aspera/hash_ext.rb +3 -0
- data/lib/aspera/id_generator.rb +4 -2
- data/lib/aspera/json_rpc/client.rb +6 -5
- data/lib/aspera/json_rpc/version.rb +3 -0
- data/lib/aspera/line_logger.rb +4 -1
- data/lib/aspera/link_header.rb +4 -1
- data/lib/aspera/log.rb +18 -5
- data/lib/aspera/markdown.rb +5 -2
- data/lib/aspera/mime.rb +3 -0
- data/lib/aspera/nagios.rb +6 -4
- data/lib/aspera/node_emulator.rb +15 -13
- data/lib/aspera/oauth/client/base.rb +91 -70
- data/lib/aspera/oauth/client/boot.rb +7 -4
- data/lib/aspera/oauth/client/factory.rb +6 -3
- data/lib/aspera/oauth/client/generic.rb +5 -1
- data/lib/aspera/oauth/client/json_credentials.rb +4 -1
- data/lib/aspera/oauth/client/jwt.rb +6 -3
- data/lib/aspera/oauth/client/shares_web.rb +85 -0
- data/lib/aspera/oauth/client/url_json.rb +4 -1
- data/lib/aspera/oauth/client/web.rb +39 -12
- data/lib/aspera/oauth/server/pkce.rb +6 -5
- data/lib/aspera/orchestrator_workflow_checker.rb +119 -1
- data/lib/aspera/persistency_action_once.rb +5 -3
- data/lib/aspera/persistency_folder.rb +6 -3
- data/lib/aspera/preview/file_types.rb +6 -3
- data/lib/aspera/preview/generator.rb +9 -5
- data/lib/aspera/preview/options.schema.yaml +3 -3
- data/lib/aspera/preview/terminal.rb +8 -4
- data/lib/aspera/preview/utils.rb +6 -4
- data/lib/aspera/products/connect.rb +5 -2
- data/lib/aspera/products/desktop.rb +4 -1
- data/lib/aspera/products/other.rb +4 -2
- data/lib/aspera/products/transferd.rb +6 -2
- data/lib/aspera/products/transferd_service.rb +610 -0
- data/lib/aspera/proxy_auto_config.js +2 -2
- data/lib/aspera/proxy_auto_config.rb +5 -2
- data/lib/aspera/rainbow.rb +3 -0
- data/lib/aspera/rest/aspera_errors.rb +4 -1
- data/lib/aspera/rest/call_error.rb +3 -0
- data/lib/aspera/rest/client.rb +22 -29
- data/lib/aspera/rest/error_analyzer.rb +5 -2
- data/lib/aspera/rest/list.rb +8 -4
- data/lib/aspera/rest/parameters.rb +3 -0
- data/lib/aspera/rest/util.rb +8 -5
- data/lib/aspera/rest.rb +9 -6
- data/lib/aspera/schema/IBM Aspera Faspex API-5.0-enhanced.yaml +9 -9
- data/lib/aspera/schema/IBM Aspera Orchestrator API-v1-enhanced.yaml +118 -30
- data/lib/aspera/schema/IBM Aspera on Cloud API-0.2.6-enhanced.yaml +11 -11
- data/lib/aspera/schema/IBM Aspera on Cloud Automation API-1.0.5-enhanced.yaml +2437 -1437
- data/lib/aspera/schema/async_tables.yaml +11 -10
- data/lib/aspera/schema/documentation.rb +8 -2
- data/lib/aspera/schema/reader.rb +7 -0
- data/lib/aspera/schema/registry.rb +43 -28
- data/lib/aspera/schema/transferd-config.schema.json +333 -0
- data/lib/aspera/schema/validator.rb +4 -1
- data/lib/aspera/sealed_hash.rb +166 -0
- data/lib/aspera/secret/hider.rb +201 -0
- data/lib/aspera/secret/reference.rb +150 -0
- data/lib/aspera/secret/resolver.rb +212 -0
- data/lib/aspera/secret/store/base.rb +153 -0
- data/lib/aspera/secret/store/encrypted_hash.rb +329 -0
- data/lib/aspera/secret/store/factory.rb +103 -0
- data/lib/aspera/secret/store/hashicorp_vault.rb +390 -0
- data/lib/aspera/secret/store/keeper.rb +141 -0
- data/lib/aspera/secret/store/macos_security.rb +284 -0
- data/lib/aspera/secret/store/one_password_api.rb +99 -0
- data/lib/aspera/secret/store/one_password_base.rb +42 -0
- data/lib/aspera/secret/store/one_password_cli.rb +110 -0
- data/lib/aspera/secret/store/secret_service.rb +125 -0
- data/lib/aspera/secret/strength.rb +119 -0
- data/lib/aspera/servlet_helpers.rb +5 -2
- data/lib/aspera/ssh.rb +10 -7
- data/lib/aspera/ssl.rb +5 -2
- data/lib/aspera/string_ext.rb +3 -0
- data/lib/aspera/sync/args.schema.yaml +3 -0
- data/lib/aspera/sync/conf.schema.yaml +9 -4
- data/lib/aspera/sync/database.rb +3 -0
- data/lib/aspera/sync/operations.rb +16 -14
- data/lib/aspera/temp_file_manager.rb +8 -4
- data/lib/aspera/timer_limiter.rb +3 -0
- data/lib/aspera/transfer/error.rb +4 -1
- data/lib/aspera/transfer/faux_file.rb +4 -1
- data/lib/aspera/transfer/parameters.rb +17 -14
- data/lib/aspera/transfer/result.rb +3 -0
- data/lib/aspera/transfer/resumer.rb +6 -4
- data/lib/aspera/transfer/spec.rb +9 -22
- data/lib/aspera/transfer/units.rb +75 -0
- data/lib/aspera/uri_reader.rb +57 -7
- data/lib/aspera/web_auth/index.html.erb +6 -2
- data/lib/aspera/web_auth/paste.rb +109 -0
- data/lib/aspera/web_auth/receiver.rb +50 -0
- data/lib/aspera/web_auth/relay.rb +76 -0
- data/lib/aspera/web_auth/reply.html.erb +150 -0
- data/lib/aspera/web_auth/server.rb +47 -10
- data/lib/aspera/web_page.rb +7 -2
- data/lib/aspera/web_server_simple.rb +6 -3
- data/lib/aspera/yaml.rb +5 -1
- data/llms.txt +81 -0
- data/skills/ascli/SKILL.md +88 -0
- data.tar.gz.sig +0 -0
- metadata +72 -19
- metadata.gz.sig +0 -0
- data/lib/aspera/keychain/base.rb +0 -30
- data/lib/aspera/keychain/encrypted_hash.rb +0 -192
- data/lib/aspera/keychain/factory.rb +0 -58
- data/lib/aspera/keychain/hashicorp_vault.rb +0 -77
- data/lib/aspera/keychain/macos_security.rb +0 -277
- data/lib/aspera/keychain/one_password_api.rb +0 -91
- data/lib/aspera/keychain/one_password_base.rb +0 -39
- data/lib/aspera/keychain/one_password_cli.rb +0 -100
- data/lib/aspera/secret_hider.rb +0 -196
- data/lib/aspera/secret_strength.rb +0 -114
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
|
|
6
|
+
require_relative '../log'
|
|
7
|
+
require_relative '../assert'
|
|
8
|
+
|
|
9
|
+
module Aspera
|
|
10
|
+
module Secret
|
|
11
|
+
# Estimate of the strength of a secret (e.g. a token), in bits: log2 of the number of guesses to find it
|
|
12
|
+
#
|
|
13
|
+
# Uses gem `zxcvbn` if installed (dictionaries, l33t, dates...), else a built-in estimate, the lowest of:
|
|
14
|
+
# - alphabet: length x log2(size of character classes used)
|
|
15
|
+
# - Shannon: empirical entropy of characters (catches repeats)
|
|
16
|
+
# - patterns: repeats, sequences and keyboard rows cost 1 bit per character, words and years 2 bits per character
|
|
17
|
+
# Both under-estimate random secrets: a random secret of 32 bytes (e.g. `openssl rand -hex 32`) is far above any usual minimum.
|
|
18
|
+
module Strength
|
|
19
|
+
# Default minimum strength of tokens, in bits: random tokens of 32 bytes are far above
|
|
20
|
+
DEFAULT_MIN_BITS = 80
|
|
21
|
+
# Classes of characters, with their size
|
|
22
|
+
CHARACTER_CLASSES = [[/[a-z]/, 26], [/[A-Z]/, 26], [/\d/, 10], [/[^a-zA-Z\d]/, 33]].freeze
|
|
23
|
+
# Adjacent characters in those rows form a sequence
|
|
24
|
+
KEYBOARD_ROWS = %w[1234567890 qwertyuiop asdfghjkl zxcvbnm azertyuiop qsdfghjklm wxcvbn].freeze
|
|
25
|
+
# Words (3+ letters, optionally capitalized) and years
|
|
26
|
+
LOW_ENTROPY_REGEXES = [/[A-Z]?[a-z]{3,}/, /(?:19|20)\d\d/].freeze
|
|
27
|
+
# Entropy of English text is 1 to 1.5 bit per letter: keep a margin
|
|
28
|
+
LOW_ENTROPY_BITS = 2.0
|
|
29
|
+
# zxcvbn is slow on long secrets: the beginning is enough to assess strength
|
|
30
|
+
ZXCVBN_MAX_LENGTH = 100
|
|
31
|
+
private_constant :CHARACTER_CLASSES, :KEYBOARD_ROWS, :LOW_ENTROPY_REGEXES, :LOW_ENTROPY_BITS, :ZXCVBN_MAX_LENGTH
|
|
32
|
+
|
|
33
|
+
class << self
|
|
34
|
+
# @param secret [String] Secret to assess
|
|
35
|
+
# @return [Float] Estimated strength in bits
|
|
36
|
+
def bits(secret)
|
|
37
|
+
secret = secret.to_s
|
|
38
|
+
return 0.0 if secret.empty?
|
|
39
|
+
zxcvbn_bits(secret) || estimate_bits(secret)
|
|
40
|
+
end
|
|
41
|
+
|
|
42
|
+
# Refuse an empty or weak secret: an empty one would often accept requests without secret
|
|
43
|
+
# @param secret [String] Secret to check
|
|
44
|
+
# @param name [String] Name of the parameter holding the secret, its minimum is in parameter `<name>_min_bits`
|
|
45
|
+
# @param min_bits [Integer] Minimum estimated strength in bits, `0` checks only that the secret is not empty
|
|
46
|
+
# @param type [Exception] Exception to raise
|
|
47
|
+
# @raise [Exception] if the secret is empty or weaker than `min_bits`
|
|
48
|
+
def assert_strong(secret, name:, min_bits: DEFAULT_MIN_BITS, type: ParameterError)
|
|
49
|
+
Aspera.assert(!secret.to_s.empty?, type: type) { "#{name} must not be empty" }
|
|
50
|
+
strength = bits(secret)
|
|
51
|
+
Aspera.assert(strength >= min_bits, type: type) do
|
|
52
|
+
"#{name} is too weak: about #{strength.round} bits, minimum #{min_bits} (#{name}_min_bits). Generate one with: openssl rand -hex 32"
|
|
53
|
+
end
|
|
54
|
+
end
|
|
55
|
+
|
|
56
|
+
# Built-in estimate, without dictionary
|
|
57
|
+
# @param secret [String] Secret to assess
|
|
58
|
+
# @return [Float] Estimated strength in bits
|
|
59
|
+
def estimate_bits(secret)
|
|
60
|
+
return 0.0 if secret.empty?
|
|
61
|
+
bits_per_char = Math.log2(CHARACTER_CLASSES.sum { |regex, size| secret.match?(regex) ? size : 0 })
|
|
62
|
+
[secret.size * bits_per_char, shannon_bits(secret), pattern_bits(secret, bits_per_char)].min
|
|
63
|
+
end
|
|
64
|
+
|
|
65
|
+
private
|
|
66
|
+
|
|
67
|
+
# @return [Float, nil] Strength estimated by gem `zxcvbn`, or `nil` if not installed
|
|
68
|
+
def zxcvbn_bits(secret)
|
|
69
|
+
return unless zxcvbn?
|
|
70
|
+
Math.log2(Zxcvbn.test(secret[0, ZXCVBN_MAX_LENGTH]).guesses)
|
|
71
|
+
rescue StandardError => e
|
|
72
|
+
Log.log.debug { "zxcvbn failed: #{e.message}" }
|
|
73
|
+
nil
|
|
74
|
+
end
|
|
75
|
+
|
|
76
|
+
# @return [Boolean] `true` if gem `zxcvbn` (or `zxcvbn-ruby`) is installed
|
|
77
|
+
def zxcvbn?
|
|
78
|
+
return @zxcvbn unless @zxcvbn.nil?
|
|
79
|
+
@zxcvbn =
|
|
80
|
+
begin
|
|
81
|
+
require 'zxcvbn'
|
|
82
|
+
true
|
|
83
|
+
rescue LoadError
|
|
84
|
+
false
|
|
85
|
+
end
|
|
86
|
+
end
|
|
87
|
+
|
|
88
|
+
# Empirical Shannon entropy of characters of the secret
|
|
89
|
+
def shannon_bits(secret)
|
|
90
|
+
secret.chars.tally.values.sum do |count|
|
|
91
|
+
probability = count.fdiv(secret.size)
|
|
92
|
+
-probability * Math.log2(probability)
|
|
93
|
+
end * secret.size
|
|
94
|
+
end
|
|
95
|
+
|
|
96
|
+
# Sum of bits of each character, depending on patterns
|
|
97
|
+
def pattern_bits(secret, bits_per_char)
|
|
98
|
+
# Bits of characters in words and years
|
|
99
|
+
low = Array.new(secret.size)
|
|
100
|
+
LOW_ENTROPY_REGEXES.each do |regex|
|
|
101
|
+
secret.scan(regex) { low.fill(LOW_ENTROPY_BITS, Regexp.last_match.begin(0)...Regexp.last_match.end(0)) }
|
|
102
|
+
end
|
|
103
|
+
secret.chars.each_with_index.sum do |char, index|
|
|
104
|
+
next 1.0 if index.positive? && sequence?(secret[index - 1], char)
|
|
105
|
+
low[index] || bits_per_char
|
|
106
|
+
end
|
|
107
|
+
end
|
|
108
|
+
|
|
109
|
+
# @return [Boolean] `true` if `char` repeats `previous`, or follows it in alphabet, digits or keyboard row
|
|
110
|
+
def sequence?(previous, char)
|
|
111
|
+
previous = previous.downcase
|
|
112
|
+
char = char.downcase
|
|
113
|
+
return true if (char.ord - previous.ord).abs <= 1
|
|
114
|
+
KEYBOARD_ROWS.any? { |row| (one = row.index(previous)) && (two = row.index(char)) && (one - two).abs.eql?(1) }
|
|
115
|
+
end
|
|
116
|
+
end
|
|
117
|
+
end
|
|
118
|
+
end
|
|
119
|
+
end
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
|
|
6
|
+
require_relative 'mime'
|
|
7
|
+
require_relative 'web_server_simple'
|
|
3
8
|
require 'json'
|
|
4
9
|
require 'openssl'
|
|
5
10
|
require 'uri'
|
|
6
11
|
require 'webrick'
|
|
7
|
-
require 'aspera/mime'
|
|
8
|
-
require 'aspera/web_server_simple'
|
|
9
12
|
|
|
10
13
|
module Aspera
|
|
11
14
|
# Mixin for WEBrick servlets of local web servers: JSON responses, and check of requests that a web page could send.
|
data/lib/aspera/ssh.rb
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
|
|
6
|
+
require_relative 'assert'
|
|
7
|
+
require_relative 'log'
|
|
3
8
|
require 'net/ssh'
|
|
4
|
-
require 'aspera/assert'
|
|
5
|
-
require 'aspera/log'
|
|
6
9
|
|
|
7
10
|
module Aspera
|
|
8
11
|
# A simple wrapper around Net::SSH
|
|
@@ -16,8 +19,7 @@ module Aspera
|
|
|
16
19
|
|
|
17
20
|
class << self
|
|
18
21
|
# Removes ed25519 keys from the default identity list used by Net::SSH.
|
|
19
|
-
# Called when
|
|
20
|
-
# `ASCLI_ENABLE_ED25519=false`.
|
|
22
|
+
# Called when explicitly disabled via `ASCLI_ENABLE_ED25519=false`.
|
|
21
23
|
# @return [void]
|
|
22
24
|
def disable_ed25519_keys
|
|
23
25
|
Log.log.debug('Disabling SSH ed25519 user keys')
|
|
@@ -99,7 +101,7 @@ module Aspera
|
|
|
99
101
|
Log.dump(:data, data, level: :trace1)
|
|
100
102
|
exit_code = data.read_long
|
|
101
103
|
end
|
|
102
|
-
# send command to SSH channel (execute)
|
|
104
|
+
# send command to SSH channel (execute)
|
|
103
105
|
channel.send('cexe'.reverse, cmd) do |_ch, success|
|
|
104
106
|
raise Error, "could not execute command: #{cmd}" unless success
|
|
105
107
|
channel.send_data(input) unless input.nil?
|
|
@@ -118,6 +120,7 @@ module Aspera
|
|
|
118
120
|
end
|
|
119
121
|
end
|
|
120
122
|
|
|
121
|
-
# Deactivate ed25519
|
|
122
|
-
Aspera::Ssh.disable_ed25519_keys if
|
|
123
|
+
# Deactivate ed25519 private keys from SSH identities if requested (ed25519 is natively supported by net-ssh 8 using OpenSSL)
|
|
124
|
+
Aspera::Ssh.disable_ed25519_keys if ENV.fetch('ASCLI_ENABLE_ED25519', 'true').eql?('false')
|
|
125
|
+
# Deactivate ecdsa algorithms with JRuby, as it usually causes problems
|
|
123
126
|
Aspera::Ssh.disable_ecd_sha2_algorithms if defined?(JRUBY_VERSION) && ENV.fetch('ASCLI_ENABLE_ECDSHA2', 'false').eql?('false')
|
data/lib/aspera/ssl.rb
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
|
|
6
|
+
require_relative 'assert'
|
|
7
|
+
require_relative 'log'
|
|
3
8
|
require 'openssl'
|
|
4
|
-
require 'aspera/assert'
|
|
5
|
-
require 'aspera/log'
|
|
6
9
|
|
|
7
10
|
module Aspera
|
|
8
11
|
# Give possibility to globally override SSL options
|
data/lib/aspera/string_ext.rb
CHANGED
|
@@ -10,6 +10,7 @@ type: object
|
|
|
10
10
|
properties:
|
|
11
11
|
alt_logdir:
|
|
12
12
|
type: string
|
|
13
|
+
x-cli-complete: folder
|
|
13
14
|
x-cli-option: true
|
|
14
15
|
watchd:
|
|
15
16
|
type: string
|
|
@@ -37,12 +38,14 @@ properties:
|
|
|
37
38
|
x-cli-option: true
|
|
38
39
|
local_dir:
|
|
39
40
|
type: string
|
|
41
|
+
x-cli-complete: folder
|
|
40
42
|
x-cli-option: true
|
|
41
43
|
remote_dir:
|
|
42
44
|
type: string
|
|
43
45
|
x-cli-option: true
|
|
44
46
|
local_db_dir:
|
|
45
47
|
type: string
|
|
48
|
+
x-cli-complete: folder
|
|
46
49
|
x-cli-option: true
|
|
47
50
|
remote_db_dir:
|
|
48
51
|
type: string
|
|
@@ -17,6 +17,7 @@ properties:
|
|
|
17
17
|
ascp_dir:
|
|
18
18
|
description: Directory containing ascp executable to use.
|
|
19
19
|
type: string
|
|
20
|
+
x-cli-complete: folder
|
|
20
21
|
assume_no_mods:
|
|
21
22
|
description: Assume that the directory structure has not been modified.
|
|
22
23
|
type: boolean
|
|
@@ -186,6 +187,7 @@ properties:
|
|
|
186
187
|
path:
|
|
187
188
|
description: The directory to be synchronized on the local host.
|
|
188
189
|
type: string
|
|
190
|
+
x-cli-complete: folder
|
|
189
191
|
x-cli-option: --local-dir
|
|
190
192
|
x-cli-short: -d
|
|
191
193
|
local_apply_docroot:
|
|
@@ -198,6 +200,7 @@ properties:
|
|
|
198
200
|
description: Use the specified database directory on the local host.
|
|
199
201
|
Default is `.private-asp` at the root level of the synchronized directory.
|
|
200
202
|
type: string
|
|
203
|
+
x-cli-complete: folder
|
|
201
204
|
x-cli-option: true
|
|
202
205
|
x-cli-short: -b
|
|
203
206
|
local_checksum_threads:
|
|
@@ -228,6 +231,7 @@ properties:
|
|
|
228
231
|
local_keep_dir:
|
|
229
232
|
description: Move deleted files into the specified directory on the local host.
|
|
230
233
|
type: string
|
|
234
|
+
x-cli-complete: folder
|
|
231
235
|
x-cli-option: --keep-dir-local
|
|
232
236
|
local_mount_signature:
|
|
233
237
|
description: Verify that the file system is mounted by the existence of this file on the local host.
|
|
@@ -296,6 +300,7 @@ properties:
|
|
|
296
300
|
local_dir:
|
|
297
301
|
description: Use the specified logging directory on the local host.
|
|
298
302
|
type: string
|
|
303
|
+
x-cli-complete: folder
|
|
299
304
|
x-cli-option: --alt-logdir
|
|
300
305
|
x-cli-short: -L
|
|
301
306
|
remote_dir:
|
|
@@ -692,11 +697,11 @@ properties:
|
|
|
692
697
|
`vhigh` maximizes system activity by continuously scanning files without rest.
|
|
693
698
|
type: string
|
|
694
699
|
enum:
|
|
695
|
-
- vlow
|
|
700
|
+
- vlow # cspell:disable-line
|
|
696
701
|
- low
|
|
697
702
|
- medium
|
|
698
703
|
- high
|
|
699
|
-
- vhigh
|
|
704
|
+
- vhigh # cspell:disable-line
|
|
700
705
|
default: medium
|
|
701
706
|
x-cli-option: true
|
|
702
707
|
x-cli-short: -H
|
|
@@ -806,7 +811,7 @@ properties:
|
|
|
806
811
|
type: integer
|
|
807
812
|
x-cli-option: true
|
|
808
813
|
x-cli-short: -g
|
|
809
|
-
rexmsg_size:
|
|
814
|
+
rexmsg_size: # cspell:disable-line
|
|
810
815
|
description:
|
|
811
816
|
Use the specified size (in bytes) for a retransmission request.
|
|
812
817
|
Default is determined by `aspera.conf`.
|
|
@@ -846,7 +851,7 @@ properties:
|
|
|
846
851
|
enum:
|
|
847
852
|
- none
|
|
848
853
|
- redis
|
|
849
|
-
- scalekv
|
|
854
|
+
- scalekv # cspell:disable-line
|
|
850
855
|
default: none
|
|
851
856
|
domain:
|
|
852
857
|
description: Specify the domain.
|
data/lib/aspera/sync/database.rb
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
#
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
4
5
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
6
|
+
require_relative '../ascp/installation'
|
|
7
|
+
require_relative '../agent/direct'
|
|
8
|
+
require_relative '../transfer/spec'
|
|
9
|
+
require_relative '../transfer/units'
|
|
10
|
+
require_relative '../exec_spec'
|
|
11
|
+
require_relative '../command_line_converter'
|
|
12
|
+
require_relative '../command_line_builder'
|
|
13
|
+
require_relative '../log'
|
|
14
|
+
require_relative '../assert'
|
|
15
|
+
require_relative '../duration'
|
|
16
|
+
require_relative '../environment'
|
|
17
|
+
require_relative '../schema/registry'
|
|
16
18
|
require 'json'
|
|
17
19
|
require 'base64'
|
|
18
20
|
require 'open3'
|
|
@@ -266,7 +268,7 @@ module Aspera
|
|
|
266
268
|
# Convert `target_rate` given as a string with optional suffix (e.g. `100m`) into integer bps
|
|
267
269
|
# @param params [Hash, nil] `transport` (`conf` format) or session (`args` format), modified in place
|
|
268
270
|
def normalize_target_rate(params)
|
|
269
|
-
params['target_rate'] = Transfer::
|
|
271
|
+
params['target_rate'] = Transfer::Units.rate_string_to_bps(params['target_rate']) if params.is_a?(Hash) && params['target_rate'].is_a?(String)
|
|
270
272
|
end
|
|
271
273
|
|
|
272
274
|
# Transfer specification to synchronization information
|
|
@@ -363,7 +365,7 @@ module Aspera
|
|
|
363
365
|
CONF_SCHEMA = CommandLineBuilder.read_schema(Schema::Registry::SYNC_CONF)
|
|
364
366
|
CMDLINE_PARAMS_KEYS = %w[instance sessions].freeze
|
|
365
367
|
ASYNC_ADMIN_EXECUTABLE = 'asyncadmin'
|
|
366
|
-
PRIVATE_FOLDER = "#{Environment.instance.os.eql?(Environment::OS_WINDOWS) ? '~' : '.'}private-asp"
|
|
368
|
+
PRIVATE_FOLDER = "#{Environment.instance.os.eql?(Environment::OS_WINDOWS) ? '~' : '.'}private-asp".freeze
|
|
367
369
|
ASYNC_DB = 'snap.db'
|
|
368
370
|
PARAM_KEYS = %w[local sessions].freeze
|
|
369
371
|
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
|
|
6
|
+
require_relative 'assert'
|
|
7
|
+
require_relative 'log'
|
|
5
8
|
require 'singleton'
|
|
6
9
|
require 'fileutils'
|
|
10
|
+
require 'securerandom'
|
|
7
11
|
require 'etc'
|
|
8
12
|
require 'tmpdir'
|
|
9
13
|
|
|
@@ -114,7 +118,7 @@ module Aspera
|
|
|
114
118
|
def new_file_path_global(prefix = nil, suffix: nil)
|
|
115
119
|
username =
|
|
116
120
|
begin
|
|
117
|
-
Etc.getlogin || Etc.getpwuid(Process.uid).name || 'unknown_user'
|
|
121
|
+
Etc.getlogin || Etc.getpwuid(::Process.uid).name || 'unknown_user'
|
|
118
122
|
rescue StandardError
|
|
119
123
|
'unknown_user'
|
|
120
124
|
end
|
|
@@ -128,7 +132,7 @@ module Aspera
|
|
|
128
132
|
def new_dir_path_global(prefix = nil)
|
|
129
133
|
username =
|
|
130
134
|
begin
|
|
131
|
-
Etc.getlogin || Etc.getpwuid(Process.uid).name || 'unknown_user'
|
|
135
|
+
Etc.getlogin || Etc.getpwuid(::Process.uid).name || 'unknown_user'
|
|
132
136
|
rescue StandardError
|
|
133
137
|
'unknown_user'
|
|
134
138
|
end
|
data/lib/aspera/timer_limiter.rb
CHANGED
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
|
|
3
6
|
module Aspera
|
|
4
7
|
module Transfer
|
|
5
8
|
# Generates a pseudo file stream.
|
|
6
9
|
class FauxFile
|
|
7
10
|
SCHEME = 'faux'
|
|
8
11
|
# marker for faux file
|
|
9
|
-
PREFIX = "#{SCHEME}:///"
|
|
12
|
+
PREFIX = "#{SCHEME}:///".freeze
|
|
10
13
|
# size units, kilo, mega ...
|
|
11
14
|
SIZE_UNITS = %w[k m g t p e].freeze
|
|
12
15
|
private_constant :SCHEME, :PREFIX, :SIZE_UNITS
|
|
@@ -1,22 +1,25 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
|
|
6
|
+
require_relative '../log'
|
|
7
|
+
require_relative '../assert'
|
|
8
|
+
require_relative '../exec_spec'
|
|
9
|
+
require_relative '../command_line_builder'
|
|
10
|
+
require_relative '../temp_file_manager'
|
|
11
|
+
require_relative 'error'
|
|
12
|
+
require_relative 'spec'
|
|
13
|
+
require_relative '../command_line_converter'
|
|
14
|
+
require_relative '../ascp/installation'
|
|
15
|
+
require_relative '../cli/formatter'
|
|
16
|
+
require_relative '../rest'
|
|
17
|
+
require_relative '../rainbow'
|
|
14
18
|
require 'securerandom'
|
|
15
19
|
require 'base64'
|
|
16
20
|
require 'json'
|
|
17
21
|
require 'fileutils'
|
|
18
22
|
require 'openssl'
|
|
19
|
-
require 'aspera/rainbow'
|
|
20
23
|
using Rainbow
|
|
21
24
|
|
|
22
25
|
module Aspera
|
|
@@ -89,7 +92,7 @@ module Aspera
|
|
|
89
92
|
# is the file list provided through ascp parameters?
|
|
90
93
|
ascp_file_list_provided = self.class.ascp_args_file_list?(@ascp_args)
|
|
91
94
|
# set if paths is mandatory in ts
|
|
92
|
-
@builder.required('paths', !@job_spec.key?('keepalive') && !ascp_file_list_provided)
|
|
95
|
+
@builder.required('paths', !@job_spec.key?('keepalive') && !ascp_file_list_provided)
|
|
93
96
|
# get paths in transfer spec (after setting if it is mandatory)
|
|
94
97
|
ts_paths_array = @builder.read_param('paths')
|
|
95
98
|
file_list_option = nil
|
|
@@ -221,7 +224,7 @@ module Aspera
|
|
|
221
224
|
Log.log.debug { "ascp args: #{exec_spec}" }
|
|
222
225
|
return exec_spec
|
|
223
226
|
end
|
|
224
|
-
DELETE_EQUIV = %w[remove_after_transfer remove_empty_directories remove_empty_source_directory]
|
|
227
|
+
DELETE_EQUIV = %w[remove_after_transfer remove_empty_directories remove_empty_source_directory].freeze
|
|
225
228
|
# `ascp` options to provide a file list
|
|
226
229
|
FILE_LIST_OPTIONS = ['--file-list', '--file-pair-list'].freeze
|
|
227
230
|
private_constant :DELETE_EQUIV, :FILE_LIST_OPTIONS
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
|
|
6
|
+
require_relative '../log'
|
|
7
|
+
require_relative '../assert'
|
|
8
|
+
require_relative 'error'
|
|
7
9
|
|
|
8
10
|
module Aspera
|
|
9
11
|
module Transfer
|
data/lib/aspera/transfer/spec.rb
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
|
|
6
|
+
require_relative '../agent/factory'
|
|
7
|
+
require_relative '../command_line_builder'
|
|
8
|
+
require_relative '../assert'
|
|
9
|
+
require_relative 'units'
|
|
6
10
|
|
|
7
11
|
module Aspera
|
|
8
12
|
module Transfer
|
|
@@ -37,14 +41,8 @@ module Aspera
|
|
|
37
41
|
'attrs' => 'attributes',
|
|
38
42
|
'sparse_csum' => 'sparse_checksum',
|
|
39
43
|
'full_csum' => 'full_checksum'
|
|
40
|
-
}
|
|
41
|
-
# Multipliers for rate suffix (result is in bps)
|
|
42
|
-
RATE_SUFFIX_BPS = {
|
|
43
|
-
'k' => 1_000,
|
|
44
|
-
'm' => 1_000_000,
|
|
45
|
-
'g' => 1_000_000_000
|
|
46
44
|
}.freeze
|
|
47
|
-
private_constant :POLICY_FIX
|
|
45
|
+
private_constant :POLICY_FIX
|
|
48
46
|
# translate upload/download to send/receive
|
|
49
47
|
def transfer_type_to_direction(transfer_type)
|
|
50
48
|
XFER_TYPE_TO_DIR.fetch(transfer_type)
|
|
@@ -55,23 +53,12 @@ module Aspera
|
|
|
55
53
|
XFER_DIR_TO_TYPE.fetch(direction)
|
|
56
54
|
end
|
|
57
55
|
|
|
58
|
-
# Parse a human-readable rate (as accepted by async -l) into an integer bps value.
|
|
59
|
-
# Accepted: plain integer (bps), or integer + suffix k/K (x1000), m/M (x1000000), g/G (x1000000000).
|
|
60
|
-
# @param value [String, Integer] e.g. "100m", "500000", "1g", 500000
|
|
61
|
-
# @return [Integer] value in bps
|
|
62
|
-
def rate_string_to_bps(value)
|
|
63
|
-
m = value.to_s.strip.match(/\A(\d+)([kKmMgG])?\z/)
|
|
64
|
-
Aspera.assert(m) { "Invalid rate value: #{value.inspect}. Expected integer with optional suffix k/K, m/M or g/G." }
|
|
65
|
-
multiplier = m[2] ? RATE_SUFFIX_BPS.fetch(m[2].downcase) : 1
|
|
66
|
-
return m[1].to_i * multiplier
|
|
67
|
-
end
|
|
68
|
-
|
|
69
56
|
# Resolve pseudo-parameter `target_rate` (bps) into `target_rate_kbps` (rounded down), overriding it if both are present.
|
|
70
57
|
# @param transfer_spec [Hash] Transfer spec, modified in place
|
|
71
58
|
def resolve_target_rate(transfer_spec)
|
|
72
59
|
return unless transfer_spec.key?('target_rate')
|
|
73
60
|
rate = transfer_spec.delete('target_rate')
|
|
74
|
-
transfer_spec['target_rate_kbps'] = rate_string_to_bps(rate) / 1000 unless rate.nil?
|
|
61
|
+
transfer_spec['target_rate_kbps'] = Units.rate_string_to_bps(rate) / 1000 unless rate.nil?
|
|
75
62
|
end
|
|
76
63
|
|
|
77
64
|
def fix_transferd_resume_policy(transfer_spec)
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
# SPDX-FileCopyrightText: IBM Corp.
|
|
4
|
+
# SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
|
|
6
|
+
require_relative '../assert'
|
|
7
|
+
|
|
8
|
+
module Aspera
|
|
9
|
+
module Transfer
|
|
10
|
+
# Rates, sizes and durations of transfers: parsed from user input and formatted for display.
|
|
11
|
+
# Decimal units, like `ascp`. Depends only on `aspera/assert`: usable without the CLI.
|
|
12
|
+
module Units
|
|
13
|
+
# Decimal prefixes: each one is `KILO` times the previous one
|
|
14
|
+
PREFIX = ['', 'K', 'M', 'G', 'T', 'P'].freeze
|
|
15
|
+
KILO = 1000
|
|
16
|
+
# Multiplier of each prefix, e.g. `'M' => 1_000_000`
|
|
17
|
+
MULTIPLIER = PREFIX.each_with_index.to_h { |prefix, power| [prefix, KILO**power] }.freeze
|
|
18
|
+
# Units of sizes: `B`, `KB`, `MB`...
|
|
19
|
+
BYTE_UNITS = PREFIX.map { |prefix| "#{prefix}B" }.freeze
|
|
20
|
+
# Rate typed by a user: integer with an optional prefix, case ignored
|
|
21
|
+
RATE_INPUT = /\A(\d+)([#{PREFIX.join}])?\z/i
|
|
22
|
+
BITS_PER_BYTE = 8
|
|
23
|
+
private_constant :MULTIPLIER, :BYTE_UNITS, :RATE_INPUT, :BITS_PER_BYTE
|
|
24
|
+
|
|
25
|
+
class << self
|
|
26
|
+
# Parse a human-readable rate (as accepted by async -l) into an integer bps value.
|
|
27
|
+
# Accepted: plain integer (bps), or integer + prefix of `PREFIX`, case ignored, e.g. `k` (x1000), `M` (x1000000), `g` (x1000000000).
|
|
28
|
+
# @param value [String, Integer] e.g. "100m", "500000", "1g", 500000
|
|
29
|
+
# @return [Integer] value in bps
|
|
30
|
+
def rate_string_to_bps(value)
|
|
31
|
+
m = RATE_INPUT.match(value.to_s.strip)
|
|
32
|
+
Aspera.assert(m) { "Invalid rate value: #{value.inspect}. Expected integer with optional suffix #{PREFIX.drop(1).join(', ')} (case ignored)." }
|
|
33
|
+
return m[1].to_i * MULTIPLIER.fetch(m[2].to_s.upcase)
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
# Inverse of `rate_string_to_bps`: the shortest exact text, e.g. `100M`, `1G`, `1500K`, `999`
|
|
37
|
+
# @param bps [Integer] Rate in bits per second
|
|
38
|
+
# @return [String] Rate accepted by `rate_string_to_bps`
|
|
39
|
+
def rate_bps_to_string(bps)
|
|
40
|
+
prefix = PREFIX.reverse.find { |candidate| bps.positive? && (bps % MULTIPLIER[candidate]).zero? } || ''
|
|
41
|
+
"#{bps / MULTIPLIER[prefix]}#{prefix}"
|
|
42
|
+
end
|
|
43
|
+
|
|
44
|
+
# @param bytes [Integer] Size in bytes
|
|
45
|
+
# @return [String] Size with decimal unit, e.g. `12.3 MB`
|
|
46
|
+
def format_bytes(bytes)
|
|
47
|
+
value = bytes.to_f
|
|
48
|
+
index = 0
|
|
49
|
+
while value >= KILO && index < BYTE_UNITS.length - 1
|
|
50
|
+
value /= KILO
|
|
51
|
+
index += 1
|
|
52
|
+
end
|
|
53
|
+
return "#{bytes} B" if index.zero?
|
|
54
|
+
format('%.1f %s', value, BYTE_UNITS[index])
|
|
55
|
+
end
|
|
56
|
+
|
|
57
|
+
# @param bytes_per_second [Float, nil] Rate, `nil` if unknown
|
|
58
|
+
# @return [String] Rate in megabits per second (decimal, like `ascp`)
|
|
59
|
+
def format_rate(bytes_per_second)
|
|
60
|
+
return '-- Mbps' if bytes_per_second.nil?
|
|
61
|
+
mbps = bytes_per_second * BITS_PER_BYTE / MULTIPLIER.fetch('M')
|
|
62
|
+
mbps < 10 ? format('%.2f Mbps', mbps) : format('%.0f Mbps', mbps)
|
|
63
|
+
end
|
|
64
|
+
|
|
65
|
+
# @param seconds [Numeric, nil] Duration, `nil` if unknown
|
|
66
|
+
# @return [String] Duration as `hh:mm:ss`
|
|
67
|
+
def format_duration(seconds)
|
|
68
|
+
return '--:--:--' if seconds.nil?
|
|
69
|
+
seconds = seconds.round
|
|
70
|
+
format('%02d:%02d:%02d', seconds / 3600, (seconds / 60) % 60, seconds % 60)
|
|
71
|
+
end
|
|
72
|
+
end
|
|
73
|
+
end
|
|
74
|
+
end
|
|
75
|
+
end
|