From cd7d3532e2bf5cbda22f1b97a738be4d7ccf1b9e Mon Sep 17 00:00:00 2001 From: Ryan Emery Date: Mon, 27 Oct 2025 21:51:15 -0700 Subject: [PATCH 1/5] Update to latest Ruby unit tests --- test-server/ruby-v2-server/local-ruby-sdk | 2 +- test-server/ruby-v3-server/local-ruby-sdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test-server/ruby-v2-server/local-ruby-sdk b/test-server/ruby-v2-server/local-ruby-sdk index 8f550866..4debb642 160000 --- a/test-server/ruby-v2-server/local-ruby-sdk +++ b/test-server/ruby-v2-server/local-ruby-sdk @@ -1 +1 @@ -Subproject commit 8f5508662bbb5cdc04be76083244b814b0f2c828 +Subproject commit 4debb642c1439c76a6c4fc1ab35c27715c3ff78e diff --git a/test-server/ruby-v3-server/local-ruby-sdk b/test-server/ruby-v3-server/local-ruby-sdk index 8f550866..4debb642 160000 --- a/test-server/ruby-v3-server/local-ruby-sdk +++ b/test-server/ruby-v3-server/local-ruby-sdk @@ -1 +1 @@ -Subproject commit 8f5508662bbb5cdc04be76083244b814b0f2c828 +Subproject commit 4debb642c1439c76a6c4fc1ab35c27715c3ff78e From ced23789bd6ce3cd7375d39a7c70b3250818a045 Mon Sep 17 00:00:00 2001 From: Ryan Emery Date: Tue, 28 Oct 2025 12:18:39 -0700 Subject: [PATCH 2/5] update to add security policy and tests --- test-server/ruby-v2-server/local-ruby-sdk | 2 +- test-server/ruby-v3-server/lib/client_manager.rb | 4 +++- test-server/ruby-v3-server/local-ruby-sdk | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test-server/ruby-v2-server/local-ruby-sdk b/test-server/ruby-v2-server/local-ruby-sdk index 4debb642..0e454ee8 160000 --- a/test-server/ruby-v2-server/local-ruby-sdk +++ b/test-server/ruby-v2-server/local-ruby-sdk @@ -1 +1 @@ -Subproject commit 4debb642c1439c76a6c4fc1ab35c27715c3ff78e +Subproject commit 0e454ee82dd4c47182bb52bc2dcd9d9e2a19051b diff --git a/test-server/ruby-v3-server/lib/client_manager.rb b/test-server/ruby-v3-server/lib/client_manager.rb index 7c125458..be5b5781 100644 --- a/test-server/ruby-v3-server/lib/client_manager.rb +++ b/test-server/ruby-v3-server/lib/client_manager.rb @@ -39,7 +39,9 @@ def create_client(config) end end if !config['enableLegacyWrappingAlgorithms'].nil? || !config['enableLegacyUnauthenticatedModes'].nil? - hash[:legacy_modes] = config['enableLegacyWrappingAlgorithms'] || config['enableLegacyUnauthenticatedModes'] + legacy_modes = config['enableLegacyWrappingAlgorithms'] || config['enableLegacyUnauthenticatedModes'] + # Set security profile based on legacy wrapping algorithms setting + hash[:security_profile] = legacy_modes ? :v3_and_legacy : :v3 end end diff --git a/test-server/ruby-v3-server/local-ruby-sdk b/test-server/ruby-v3-server/local-ruby-sdk index 4debb642..0e454ee8 160000 --- a/test-server/ruby-v3-server/local-ruby-sdk +++ b/test-server/ruby-v3-server/local-ruby-sdk @@ -1 +1 @@ -Subproject commit 4debb642c1439c76a6c4fc1ab35c27715c3ff78e +Subproject commit 0e454ee82dd4c47182bb52bc2dcd9d9e2a19051b From 8b440d0b8782f866142411c55864bc7a6b24e0c2 Mon Sep 17 00:00:00 2001 From: Ryan Emery Date: Wed, 29 Oct 2025 22:11:56 -0700 Subject: [PATCH 3/5] Latest ruby with more tests --- test-server/ruby-v2-server/local-ruby-sdk | 2 +- test-server/ruby-v3-server/.duvet/config.toml | 4 ++++ test-server/ruby-v3-server/local-ruby-sdk | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test-server/ruby-v2-server/local-ruby-sdk b/test-server/ruby-v2-server/local-ruby-sdk index 0e454ee8..f36b9aa9 160000 --- a/test-server/ruby-v2-server/local-ruby-sdk +++ b/test-server/ruby-v2-server/local-ruby-sdk @@ -1 +1 @@ -Subproject commit 0e454ee82dd4c47182bb52bc2dcd9d9e2a19051b +Subproject commit f36b9aa9c4d913bab464ee882b2984a89e553201 diff --git a/test-server/ruby-v3-server/.duvet/config.toml b/test-server/ruby-v3-server/.duvet/config.toml index eaea972c..54b7ab1a 100644 --- a/test-server/ruby-v3-server/.duvet/config.toml +++ b/test-server/ruby-v3-server/.duvet/config.toml @@ -4,6 +4,10 @@ pattern = "local-ruby-sdk/gems/aws-sdk-s3/lib/**/*.rb" comment-style = { meta = "##=", content = "##%" } +[[source]] +pattern = "local-ruby-sdk/gems/aws-sdk-s3/spec/**/*.rb" +comment-style = { meta = "##=", content = "##%" } + # Include required specifications here [[specification]] source = "../specification/s3-encryption/data-format/content-metadata.md" diff --git a/test-server/ruby-v3-server/local-ruby-sdk b/test-server/ruby-v3-server/local-ruby-sdk index 0e454ee8..f36b9aa9 160000 --- a/test-server/ruby-v3-server/local-ruby-sdk +++ b/test-server/ruby-v3-server/local-ruby-sdk @@ -1 +1 @@ -Subproject commit 0e454ee82dd4c47182bb52bc2dcd9d9e2a19051b +Subproject commit f36b9aa9c4d913bab464ee882b2984a89e553201 From 52f6a121e2efabdf7f555b7a5e21f51dbc7e466d Mon Sep 17 00:00:00 2001 From: Ryan Emery Date: Thu, 30 Oct 2025 16:15:13 -0700 Subject: [PATCH 4/5] All the specs --- test-server/ruby-v3-server/.duvet/config.toml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test-server/ruby-v3-server/.duvet/config.toml b/test-server/ruby-v3-server/.duvet/config.toml index 54b7ab1a..7a34c0ff 100644 --- a/test-server/ruby-v3-server/.duvet/config.toml +++ b/test-server/ruby-v3-server/.duvet/config.toml @@ -10,17 +10,19 @@ comment-style = { meta = "##=", content = "##%" } # Include required specifications here [[specification]] -source = "../specification/s3-encryption/data-format/content-metadata.md" +source = "../specification/s3-encryption/client.md" [[specification]] -source = "../specification/s3-encryption/data-format/metadata-strategy.md" +source = "../specification/s3-encryption/decryption.md" [[specification]] source = "../specification/s3-encryption/encryption.md" [[specification]] -source = "../specification/s3-encryption/decryption.md" +source = "../specification/s3-encryption/key-commitment.md" [[specification]] source = "../specification/s3-encryption/key-derivation.md" [[specification]] -source = "../specification/s3-encryption/key-commitment.md" +source = "../specification/s3-encryption/data-format/content-metadata.md" +[[specification]] +source = "../specification/s3-encryption/data-format/metadata-strategy.md" [report.html] From 70ca8a73ce4b28fe633901dcaad535c9bc4308b8 Mon Sep 17 00:00:00 2001 From: Ryan Emery Date: Thu, 30 Oct 2025 20:52:46 -0700 Subject: [PATCH 5/5] Latest tests --- test-server/ruby-v2-server/local-ruby-sdk | 2 +- test-server/ruby-v3-server/lib/client_manager.rb | 3 +++ test-server/ruby-v3-server/local-ruby-sdk | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test-server/ruby-v2-server/local-ruby-sdk b/test-server/ruby-v2-server/local-ruby-sdk index f36b9aa9..f04deb72 160000 --- a/test-server/ruby-v2-server/local-ruby-sdk +++ b/test-server/ruby-v2-server/local-ruby-sdk @@ -1 +1 @@ -Subproject commit f36b9aa9c4d913bab464ee882b2984a89e553201 +Subproject commit f04deb7227dca1ad1a193d11f7c57803843a197e diff --git a/test-server/ruby-v3-server/lib/client_manager.rb b/test-server/ruby-v3-server/lib/client_manager.rb index be5b5781..158b4462 100644 --- a/test-server/ruby-v3-server/lib/client_manager.rb +++ b/test-server/ruby-v3-server/lib/client_manager.rb @@ -37,6 +37,9 @@ def create_client(config) else raise "Unsupported commitment_policy " + config['commitmentPolicy'] end + if config['commitmentPolicy'] == 'FORBID_ENCRYPT_ALLOW_DECRYPT' && config['encryptionAlgorithm'].nil? + hash[:content_encryption_schema] = :aes_gcm_no_padding + end end if !config['enableLegacyWrappingAlgorithms'].nil? || !config['enableLegacyUnauthenticatedModes'].nil? legacy_modes = config['enableLegacyWrappingAlgorithms'] || config['enableLegacyUnauthenticatedModes'] diff --git a/test-server/ruby-v3-server/local-ruby-sdk b/test-server/ruby-v3-server/local-ruby-sdk index f36b9aa9..f04deb72 160000 --- a/test-server/ruby-v3-server/local-ruby-sdk +++ b/test-server/ruby-v3-server/local-ruby-sdk @@ -1 +1 @@ -Subproject commit f36b9aa9c4d913bab464ee882b2984a89e553201 +Subproject commit f04deb7227dca1ad1a193d11f7c57803843a197e