aws-sdk-s3 1.68.1 → 1.83.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/aws-sdk-s3.rb +5 -2
- data/lib/aws-sdk-s3/arn/access_point_arn.rb +62 -0
- data/lib/aws-sdk-s3/arn/outpost_access_point_arn.rb +71 -0
- data/lib/aws-sdk-s3/bucket.rb +58 -7
- data/lib/aws-sdk-s3/bucket_acl.rb +7 -0
- data/lib/aws-sdk-s3/bucket_cors.rb +14 -1
- data/lib/aws-sdk-s3/bucket_lifecycle.rb +14 -1
- data/lib/aws-sdk-s3/bucket_lifecycle_configuration.rb +14 -1
- data/lib/aws-sdk-s3/bucket_logging.rb +7 -0
- data/lib/aws-sdk-s3/bucket_notification.rb +7 -0
- data/lib/aws-sdk-s3/bucket_policy.rb +14 -1
- data/lib/aws-sdk-s3/bucket_region_cache.rb +2 -0
- data/lib/aws-sdk-s3/bucket_request_payment.rb +7 -0
- data/lib/aws-sdk-s3/bucket_tagging.rb +14 -1
- data/lib/aws-sdk-s3/bucket_versioning.rb +17 -0
- data/lib/aws-sdk-s3/bucket_website.rb +14 -1
- data/lib/aws-sdk-s3/client.rb +2133 -678
- data/lib/aws-sdk-s3/client_api.rb +150 -0
- data/lib/aws-sdk-s3/customizations.rb +3 -0
- data/lib/aws-sdk-s3/customizations/bucket.rb +9 -4
- data/lib/aws-sdk-s3/customizations/multipart_upload.rb +2 -0
- data/lib/aws-sdk-s3/customizations/object.rb +14 -1
- data/lib/aws-sdk-s3/customizations/object_summary.rb +2 -0
- data/lib/aws-sdk-s3/customizations/types/list_object_versions_output.rb +2 -0
- data/lib/aws-sdk-s3/encryption.rb +4 -0
- data/lib/aws-sdk-s3/encryption/client.rb +13 -0
- data/lib/aws-sdk-s3/encryption/decrypt_handler.rb +72 -26
- data/lib/aws-sdk-s3/encryption/default_cipher_provider.rb +43 -5
- data/lib/aws-sdk-s3/encryption/default_key_provider.rb +2 -0
- data/lib/aws-sdk-s3/encryption/encrypt_handler.rb +13 -2
- data/lib/aws-sdk-s3/encryption/errors.rb +2 -0
- data/lib/aws-sdk-s3/encryption/io_auth_decrypter.rb +2 -0
- data/lib/aws-sdk-s3/encryption/io_decrypter.rb +11 -3
- data/lib/aws-sdk-s3/encryption/io_encrypter.rb +2 -0
- data/lib/aws-sdk-s3/encryption/key_provider.rb +2 -0
- data/lib/aws-sdk-s3/encryption/kms_cipher_provider.rb +34 -3
- data/lib/aws-sdk-s3/encryption/materials.rb +2 -0
- data/lib/aws-sdk-s3/encryption/utils.rb +25 -0
- data/lib/aws-sdk-s3/encryptionV2/client.rb +566 -0
- data/lib/aws-sdk-s3/encryptionV2/decrypt_handler.rb +226 -0
- data/lib/aws-sdk-s3/encryptionV2/default_cipher_provider.rb +170 -0
- data/lib/aws-sdk-s3/encryptionV2/default_key_provider.rb +40 -0
- data/lib/aws-sdk-s3/encryptionV2/encrypt_handler.rb +69 -0
- data/lib/aws-sdk-s3/encryptionV2/errors.rb +37 -0
- data/lib/aws-sdk-s3/encryptionV2/io_auth_decrypter.rb +58 -0
- data/lib/aws-sdk-s3/encryptionV2/io_decrypter.rb +37 -0
- data/lib/aws-sdk-s3/encryptionV2/io_encrypter.rb +73 -0
- data/lib/aws-sdk-s3/encryptionV2/key_provider.rb +31 -0
- data/lib/aws-sdk-s3/encryptionV2/kms_cipher_provider.rb +169 -0
- data/lib/aws-sdk-s3/encryptionV2/materials.rb +60 -0
- data/lib/aws-sdk-s3/encryptionV2/utils.rb +103 -0
- data/lib/aws-sdk-s3/encryption_v2.rb +23 -0
- data/lib/aws-sdk-s3/errors.rb +2 -0
- data/lib/aws-sdk-s3/event_streams.rb +2 -0
- data/lib/aws-sdk-s3/file_downloader.rb +2 -0
- data/lib/aws-sdk-s3/file_part.rb +2 -0
- data/lib/aws-sdk-s3/file_uploader.rb +13 -0
- data/lib/aws-sdk-s3/legacy_signer.rb +2 -0
- data/lib/aws-sdk-s3/multipart_file_uploader.rb +39 -2
- data/lib/aws-sdk-s3/multipart_stream_uploader.rb +2 -0
- data/lib/aws-sdk-s3/multipart_upload.rb +17 -0
- data/lib/aws-sdk-s3/multipart_upload_error.rb +2 -0
- data/lib/aws-sdk-s3/multipart_upload_part.rb +66 -7
- data/lib/aws-sdk-s3/object.rb +160 -19
- data/lib/aws-sdk-s3/object_acl.rb +15 -0
- data/lib/aws-sdk-s3/object_copier.rb +2 -0
- data/lib/aws-sdk-s3/object_multipart_copier.rb +2 -0
- data/lib/aws-sdk-s3/object_summary.rb +173 -17
- data/lib/aws-sdk-s3/object_version.rb +29 -3
- data/lib/aws-sdk-s3/plugins/accelerate.rb +29 -38
- data/lib/aws-sdk-s3/plugins/arn.rb +187 -0
- data/lib/aws-sdk-s3/plugins/bucket_dns.rb +2 -2
- data/lib/aws-sdk-s3/plugins/bucket_name_restrictions.rb +3 -1
- data/lib/aws-sdk-s3/plugins/dualstack.rb +5 -1
- data/lib/aws-sdk-s3/plugins/expect_100_continue.rb +2 -0
- data/lib/aws-sdk-s3/plugins/get_bucket_location_fix.rb +2 -0
- data/lib/aws-sdk-s3/plugins/http_200_errors.rb +4 -1
- data/lib/aws-sdk-s3/plugins/iad_regional_endpoint.rb +2 -0
- data/lib/aws-sdk-s3/plugins/location_constraint.rb +2 -0
- data/lib/aws-sdk-s3/plugins/md5s.rb +2 -0
- data/lib/aws-sdk-s3/plugins/redirects.rb +2 -0
- data/lib/aws-sdk-s3/plugins/s3_host_id.rb +2 -0
- data/lib/aws-sdk-s3/plugins/s3_signer.rb +31 -7
- data/lib/aws-sdk-s3/plugins/sse_cpk.rb +3 -1
- data/lib/aws-sdk-s3/plugins/streaming_retry.rb +118 -0
- data/lib/aws-sdk-s3/plugins/url_encoded_keys.rb +2 -0
- data/lib/aws-sdk-s3/presigned_post.rb +64 -28
- data/lib/aws-sdk-s3/presigner.rb +5 -2
- data/lib/aws-sdk-s3/resource.rb +3 -1
- data/lib/aws-sdk-s3/types.rb +1881 -222
- data/lib/aws-sdk-s3/waiters.rb +2 -0
- metadata +22 -5
- data/lib/aws-sdk-s3/plugins/bucket_arn.rb +0 -210
@@ -1,6 +1,9 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
# utility classes
|
2
4
|
require 'aws-sdk-s3/bucket_region_cache'
|
3
5
|
require 'aws-sdk-s3/encryption'
|
6
|
+
require 'aws-sdk-s3/encryption_v2'
|
4
7
|
require 'aws-sdk-s3/file_part'
|
5
8
|
require 'aws-sdk-s3/file_uploader'
|
6
9
|
require 'aws-sdk-s3/file_downloader'
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'uri'
|
2
4
|
|
3
5
|
module Aws
|
@@ -10,13 +12,12 @@ module Aws
|
|
10
12
|
# Define a new initialize method that extracts out a bucket ARN.
|
11
13
|
define_method(:initialize) do |*args|
|
12
14
|
old_initialize.bind(self).call(*args)
|
13
|
-
|
15
|
+
resolved_region, arn = Plugins::ARN.resolve_arn!(
|
14
16
|
name,
|
15
17
|
client.config.region,
|
16
18
|
client.config.s3_use_arn_region
|
17
19
|
)
|
18
|
-
@
|
19
|
-
@client.config.region = region
|
20
|
+
@resolved_region = resolved_region
|
20
21
|
@arn = arn
|
21
22
|
end
|
22
23
|
|
@@ -100,7 +101,11 @@ module Aws
|
|
100
101
|
if options[:virtual_host]
|
101
102
|
"http://#{name}"
|
102
103
|
elsif @arn
|
103
|
-
Plugins::
|
104
|
+
Plugins::ARN.resolve_url!(
|
105
|
+
client.config.endpoint.dup,
|
106
|
+
@arn,
|
107
|
+
@resolved_region
|
108
|
+
).to_s
|
104
109
|
else
|
105
110
|
s3_bucket_url
|
106
111
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Aws
|
2
4
|
module S3
|
3
5
|
class Object
|
@@ -294,6 +296,14 @@ module Aws
|
|
294
296
|
# etag = response.etag
|
295
297
|
# end
|
296
298
|
#
|
299
|
+
# You can provide a callback to monitor progress of the upload:
|
300
|
+
#
|
301
|
+
# # bytes and totals are each an array with 1 entry per part
|
302
|
+
# progress = Proc.new do |bytes, totals|
|
303
|
+
# puts bytes.map.with_index { |b, i| "Part #{i+1}: #{b} / #{totals[i]}"}.join(' ') + "Total: #{100.0 * bytes.sum / totals.sum }%" }
|
304
|
+
# end
|
305
|
+
# obj.upload_file('/path/to/file')
|
306
|
+
#
|
297
307
|
# @param [String, Pathname, File, Tempfile] source A file on the local
|
298
308
|
# file system that will be uploaded as this object. This can either be
|
299
309
|
# a String or Pathname to the file, an open File object, or an open
|
@@ -310,6 +320,10 @@ module Aws
|
|
310
320
|
# multipart uploads. This option is not used if the file is smaller than
|
311
321
|
# `:multipart_threshold`.
|
312
322
|
#
|
323
|
+
# @option options [Proc] :progress_callback
|
324
|
+
# A Proc that will be called when each chunk of the upload is sent.
|
325
|
+
# It will be invoked with [bytes_read], [total_sizes]
|
326
|
+
#
|
313
327
|
# @raise [MultipartUploadError] If an object is being uploaded in
|
314
328
|
# parts, and the upload can not be completed, then the upload is
|
315
329
|
# aborted and this error is raised. The raised error has a `#errors`
|
@@ -318,7 +332,6 @@ module Aws
|
|
318
332
|
#
|
319
333
|
# @return [Boolean] Returns `true` when the object is uploaded
|
320
334
|
# without any errors.
|
321
|
-
#
|
322
335
|
def upload_file(source, options = {})
|
323
336
|
uploading_options = options.dup
|
324
337
|
uploader = FileUploader.new(
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'aws-sdk-s3/encryption/client'
|
2
4
|
require 'aws-sdk-s3/encryption/decrypt_handler'
|
3
5
|
require 'aws-sdk-s3/encryption/default_cipher_provider'
|
@@ -15,5 +17,7 @@ require 'aws-sdk-s3/encryption/default_key_provider'
|
|
15
17
|
module Aws
|
16
18
|
module S3
|
17
19
|
module Encryption; end
|
20
|
+
AES_GCM_TAG_LEN_BYTES = 16
|
21
|
+
EC_USER_AGENT = 'S3CryptoV1n'
|
18
22
|
end
|
19
23
|
end
|
@@ -1,8 +1,14 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'forwardable'
|
2
4
|
|
3
5
|
module Aws
|
4
6
|
module S3
|
5
7
|
|
8
|
+
# [MAINTENANCE MODE] There is a new version of the Encryption Client.
|
9
|
+
# AWS strongly recommends upgrading to the {Aws::S3::EncryptionV2::Client},
|
10
|
+
# which provides updated data security best practices.
|
11
|
+
# See documentation for {Aws::S3::EncryptionV2::Client}.
|
6
12
|
# Provides an encryption client that encrypts and decrypts data client-side,
|
7
13
|
# storing the encrypted data in Amazon S3.
|
8
14
|
#
|
@@ -227,6 +233,13 @@ module Aws
|
|
227
233
|
@envelope_location = extract_location(options)
|
228
234
|
@instruction_file_suffix = extract_suffix(options)
|
229
235
|
end
|
236
|
+
deprecated :initialize,
|
237
|
+
message:
|
238
|
+
'[MAINTENANCE MODE] This version of the S3 Encryption client is currently in maintenance mode. ' \
|
239
|
+
'AWS strongly recommends upgrading to the Aws::S3::EncryptionV2::Client, ' \
|
240
|
+
'which provides updated data security best practices. ' \
|
241
|
+
'See documentation for Aws::S3::EncryptionV2::Client.'
|
242
|
+
|
230
243
|
|
231
244
|
# @return [S3::Client]
|
232
245
|
attr_reader :client
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'base64'
|
2
4
|
|
3
5
|
module Aws
|
@@ -5,6 +7,7 @@ module Aws
|
|
5
7
|
module Encryption
|
6
8
|
# @api private
|
7
9
|
class DecryptHandler < Seahorse::Client::Handler
|
10
|
+
@@warned_response_target_proc = false
|
8
11
|
|
9
12
|
V1_ENVELOPE_KEYS = %w(
|
10
13
|
x-amz-key
|
@@ -20,7 +23,17 @@ module Aws
|
|
20
23
|
x-amz-matdesc
|
21
24
|
)
|
22
25
|
|
23
|
-
|
26
|
+
V2_OPTIONAL_KEYS = %w(x-amz-tag-len)
|
27
|
+
|
28
|
+
POSSIBLE_ENVELOPE_KEYS = (V1_ENVELOPE_KEYS +
|
29
|
+
V2_ENVELOPE_KEYS + V2_OPTIONAL_KEYS).uniq
|
30
|
+
|
31
|
+
POSSIBLE_WRAPPING_FORMATS = %w(
|
32
|
+
AES/GCM
|
33
|
+
kms
|
34
|
+
kms+context
|
35
|
+
RSA-OAEP-SHA1
|
36
|
+
)
|
24
37
|
|
25
38
|
POSSIBLE_ENCRYPTION_FORMATS = %w(
|
26
39
|
AES/GCM/NoPadding
|
@@ -28,8 +41,21 @@ module Aws
|
|
28
41
|
AES/CBC/PKCS7Padding
|
29
42
|
)
|
30
43
|
|
44
|
+
AUTH_REQUIRED_CEK_ALGS = %w(AES/GCM/NoPadding)
|
45
|
+
|
31
46
|
def call(context)
|
32
47
|
attach_http_event_listeners(context)
|
48
|
+
apply_cse_user_agent(context)
|
49
|
+
|
50
|
+
if context[:response_target].is_a?(Proc) && !@@warned_response_target_proc
|
51
|
+
@@warned_response_target_proc = true
|
52
|
+
warn(':response_target is a Proc, or a block was provided. ' \
|
53
|
+
'Read the entire object to the ' \
|
54
|
+
'end before you start using the decrypted data. This is to ' \
|
55
|
+
'verify that the object has not been modified since it ' \
|
56
|
+
'was encrypted.')
|
57
|
+
end
|
58
|
+
|
33
59
|
@handler.call(context)
|
34
60
|
end
|
35
61
|
|
@@ -38,9 +64,9 @@ module Aws
|
|
38
64
|
def attach_http_event_listeners(context)
|
39
65
|
|
40
66
|
context.http_response.on_headers(200) do
|
41
|
-
cipher = decryption_cipher(context)
|
42
|
-
decrypter = body_contains_auth_tag?(
|
43
|
-
authenticated_decrypter(context, cipher) :
|
67
|
+
cipher, envelope = decryption_cipher(context)
|
68
|
+
decrypter = body_contains_auth_tag?(envelope) ?
|
69
|
+
authenticated_decrypter(context, cipher, envelope) :
|
44
70
|
IODecrypter.new(cipher, context.http_response.body)
|
45
71
|
context.http_response.body = decrypter
|
46
72
|
end
|
@@ -60,8 +86,13 @@ module Aws
|
|
60
86
|
end
|
61
87
|
|
62
88
|
def decryption_cipher(context)
|
63
|
-
if envelope = get_encryption_envelope(context)
|
64
|
-
context[:encryption][:cipher_provider]
|
89
|
+
if (envelope = get_encryption_envelope(context))
|
90
|
+
cipher = context[:encryption][:cipher_provider]
|
91
|
+
.decryption_cipher(
|
92
|
+
envelope,
|
93
|
+
context[:encryption]
|
94
|
+
)
|
95
|
+
[cipher, envelope]
|
65
96
|
else
|
66
97
|
raise Errors::DecryptionError, "unable to locate encryption envelope"
|
67
98
|
end
|
@@ -97,13 +128,12 @@ module Aws
|
|
97
128
|
end
|
98
129
|
|
99
130
|
def extract_envelope(hash)
|
131
|
+
return nil unless hash
|
100
132
|
return v1_envelope(hash) if hash.key?('x-amz-key')
|
101
133
|
return v2_envelope(hash) if hash.key?('x-amz-key-v2')
|
102
134
|
if hash.keys.any? { |key| key.match(/^x-amz-key-(.+)$/) }
|
103
135
|
msg = "unsupported envelope encryption version #{$1}"
|
104
136
|
raise Errors::DecryptionError, msg
|
105
|
-
else
|
106
|
-
nil # no envelope found
|
107
137
|
end
|
108
138
|
end
|
109
139
|
|
@@ -117,39 +147,31 @@ module Aws
|
|
117
147
|
msg = "unsupported content encrypting key (cek) format: #{alg}"
|
118
148
|
raise Errors::DecryptionError, msg
|
119
149
|
end
|
120
|
-
unless envelope['x-amz-wrap-alg']
|
121
|
-
# possible to support
|
122
|
-
# RSA/ECB/OAEPWithSHA-256AndMGF1Padding
|
150
|
+
unless POSSIBLE_WRAPPING_FORMATS.include? envelope['x-amz-wrap-alg']
|
123
151
|
alg = envelope['x-amz-wrap-alg'].inspect
|
124
152
|
msg = "unsupported key wrapping algorithm: #{alg}"
|
125
153
|
raise Errors::DecryptionError, msg
|
126
154
|
end
|
127
|
-
unless V2_ENVELOPE_KEYS
|
155
|
+
unless (missing_keys = V2_ENVELOPE_KEYS - envelope.keys).empty?
|
128
156
|
msg = "incomplete v2 encryption envelope:\n"
|
129
|
-
msg += "
|
130
|
-
msg += " got: #{envelope_keys.join(', ')}"
|
157
|
+
msg += " missing: #{missing_keys.join(',')}\n"
|
131
158
|
raise Errors::DecryptionError, msg
|
132
159
|
end
|
133
160
|
envelope
|
134
161
|
end
|
135
162
|
|
136
|
-
# When the x-amz-meta-x-amz-tag-len header is present, it indicates
|
137
|
-
# that the body of this object has a trailing auth tag. The header
|
138
|
-
# indicates the length of that tag.
|
139
|
-
#
|
140
163
|
# This method fetches the tag from the end of the object by
|
141
164
|
# making a GET Object w/range request. This auth tag is used
|
142
165
|
# to initialize the cipher, and the decrypter truncates the
|
143
166
|
# auth tag from the body when writing the final bytes.
|
144
|
-
def authenticated_decrypter(context, cipher)
|
167
|
+
def authenticated_decrypter(context, cipher, envelope)
|
145
168
|
if RUBY_VERSION.match(/1.9/)
|
146
|
-
raise "authenticated decryption not supported by
|
169
|
+
raise "authenticated decryption not supported by OpenSSL in Ruby version ~> 1.9"
|
147
170
|
raise Aws::Errors::NonSupportedRubyVersionError, msg
|
148
171
|
end
|
149
172
|
http_resp = context.http_response
|
150
173
|
content_length = http_resp.headers['content-length'].to_i
|
151
|
-
auth_tag_length =
|
152
|
-
auth_tag_length = auth_tag_length.to_i / 8
|
174
|
+
auth_tag_length = auth_tag_length(envelope)
|
153
175
|
|
154
176
|
auth_tag = context.client.get_object(
|
155
177
|
bucket: context.params[:bucket],
|
@@ -161,16 +183,40 @@ module Aws
|
|
161
183
|
cipher.auth_data = ''
|
162
184
|
|
163
185
|
# The encrypted object contains both the cipher text
|
164
|
-
# plus a trailing auth tag.
|
165
|
-
# expect for the trailing auth tag.
|
186
|
+
# plus a trailing auth tag.
|
166
187
|
IOAuthDecrypter.new(
|
167
188
|
io: http_resp.body,
|
168
189
|
encrypted_content_length: content_length - auth_tag_length,
|
169
190
|
cipher: cipher)
|
170
191
|
end
|
171
192
|
|
172
|
-
def body_contains_auth_tag?(
|
173
|
-
|
193
|
+
def body_contains_auth_tag?(envelope)
|
194
|
+
AUTH_REQUIRED_CEK_ALGS.include?(envelope['x-amz-cek-alg'])
|
195
|
+
end
|
196
|
+
|
197
|
+
# Determine the auth tag length from the algorithm
|
198
|
+
# Validate it against the value provided in the x-amz-tag-len
|
199
|
+
# Return the tag length in bytes
|
200
|
+
def auth_tag_length(envelope)
|
201
|
+
tag_length =
|
202
|
+
case envelope['x-amz-cek-alg']
|
203
|
+
when 'AES/GCM/NoPadding' then AES_GCM_TAG_LEN_BYTES
|
204
|
+
else
|
205
|
+
raise ArgumentError, 'Unsupported cek-alg: ' \
|
206
|
+
"#{envelope['x-amz-cek-alg']}"
|
207
|
+
end
|
208
|
+
if (tag_length * 8) != envelope['x-amz-tag-len'].to_i
|
209
|
+
raise Errors::DecryptionError, 'x-amz-tag-len does not match expected'
|
210
|
+
end
|
211
|
+
tag_length
|
212
|
+
end
|
213
|
+
|
214
|
+
def apply_cse_user_agent(context)
|
215
|
+
if context.config.user_agent_suffix.nil?
|
216
|
+
context.config.user_agent_suffix = EC_USER_AGENT
|
217
|
+
elsif !context.config.user_agent_suffix.include? EC_USER_AGENT
|
218
|
+
context.config.user_agent_suffix += " #{EC_USER_AGENT}"
|
219
|
+
end
|
174
220
|
end
|
175
221
|
|
176
222
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'base64'
|
2
4
|
|
3
5
|
module Aws
|
@@ -24,11 +26,48 @@ module Aws
|
|
24
26
|
|
25
27
|
# @return [Cipher] Given an encryption envelope, returns a
|
26
28
|
# decryption cipher.
|
27
|
-
def decryption_cipher(envelope)
|
29
|
+
def decryption_cipher(envelope, options = {})
|
28
30
|
master_key = @key_provider.key_for(envelope['x-amz-matdesc'])
|
29
|
-
|
30
|
-
|
31
|
-
|
31
|
+
if envelope.key? 'x-amz-key'
|
32
|
+
# Support for decryption of legacy objects
|
33
|
+
key = Utils.decrypt(master_key, decode64(envelope['x-amz-key']))
|
34
|
+
iv = decode64(envelope['x-amz-iv'])
|
35
|
+
Utils.aes_decryption_cipher(:CBC, key, iv)
|
36
|
+
else
|
37
|
+
if envelope['x-amz-cek-alg'] != 'AES/GCM/NoPadding'
|
38
|
+
raise ArgumentError, 'Unsupported cek-alg: ' \
|
39
|
+
"#{envelope['x-amz-cek-alg']}"
|
40
|
+
end
|
41
|
+
key =
|
42
|
+
case envelope['x-amz-wrap-alg']
|
43
|
+
when 'AES/GCM'
|
44
|
+
if master_key.is_a? OpenSSL::PKey::RSA
|
45
|
+
raise ArgumentError, 'Key mismatch - Client is configured' \
|
46
|
+
' with an RSA key and the x-amz-wrap-alg is AES/GCM.'
|
47
|
+
end
|
48
|
+
Utils.decrypt_aes_gcm(master_key,
|
49
|
+
decode64(envelope['x-amz-key-v2']),
|
50
|
+
envelope['x-amz-cek-alg'])
|
51
|
+
when 'RSA-OAEP-SHA1'
|
52
|
+
unless master_key.is_a? OpenSSL::PKey::RSA
|
53
|
+
raise ArgumentError, 'Key mismatch - Client is configured' \
|
54
|
+
' with an AES key and the x-amz-wrap-alg is RSA-OAEP-SHA1.'
|
55
|
+
end
|
56
|
+
key, cek_alg = Utils.decrypt_rsa(master_key, decode64(envelope['x-amz-key-v2']))
|
57
|
+
raise Errors::DecryptionError unless cek_alg == envelope['x-amz-cek-alg']
|
58
|
+
key
|
59
|
+
when 'kms+context'
|
60
|
+
raise ArgumentError, 'Key mismatch - Client is configured' \
|
61
|
+
' with a user provided key and the x-amz-wrap-alg is' \
|
62
|
+
' kms+context. Please configure the client with the' \
|
63
|
+
' required kms_key_id'
|
64
|
+
else
|
65
|
+
raise ArgumentError, 'Unsupported wrap-alg: ' \
|
66
|
+
"#{envelope['x-amz-wrap-alg']}"
|
67
|
+
end
|
68
|
+
iv = decode64(envelope['x-amz-iv'])
|
69
|
+
Utils.aes_decryption_cipher(:GCM, key, iv)
|
70
|
+
end
|
32
71
|
end
|
33
72
|
|
34
73
|
private
|
@@ -56,7 +95,6 @@ module Aws
|
|
56
95
|
def decode64(str)
|
57
96
|
Base64.decode64(str)
|
58
97
|
end
|
59
|
-
|
60
98
|
end
|
61
99
|
end
|
62
100
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'base64'
|
2
4
|
|
3
5
|
module Aws
|
@@ -10,6 +12,7 @@ module Aws
|
|
10
12
|
envelope, cipher = context[:encryption][:cipher_provider].encryption_cipher
|
11
13
|
apply_encryption_envelope(context, envelope, cipher)
|
12
14
|
apply_encryption_cipher(context, cipher)
|
15
|
+
apply_cse_user_agent(context)
|
13
16
|
@handler.call(context)
|
14
17
|
end
|
15
18
|
|
@@ -36,14 +39,22 @@ module Aws
|
|
36
39
|
context.params[:body] = IOEncrypter.new(cipher, io)
|
37
40
|
context.params[:metadata] ||= {}
|
38
41
|
context.params[:metadata]['x-amz-unencrypted-content-length'] = io.size
|
39
|
-
if
|
40
|
-
|
42
|
+
if context.params.delete(:content_md5)
|
43
|
+
warn('Setting content_md5 on client side encrypted objects is deprecated')
|
41
44
|
end
|
42
45
|
context.http_response.on_headers do
|
43
46
|
context.params[:body].close
|
44
47
|
end
|
45
48
|
end
|
46
49
|
|
50
|
+
def apply_cse_user_agent(context)
|
51
|
+
if context.config.user_agent_suffix.nil?
|
52
|
+
context.config.user_agent_suffix = EC_USER_AGENT
|
53
|
+
elsif !context.config.user_agent_suffix.include? EC_USER_AGENT
|
54
|
+
context.config.user_agent_suffix += " #{EC_USER_AGENT}"
|
55
|
+
end
|
56
|
+
end
|
57
|
+
|
47
58
|
end
|
48
59
|
end
|
49
60
|
end
|