Skip to content

CLDSRV-1032: Check the key ARN on PutBucketEncryption when the bucket has a key - #6349

Open
dvasilas wants to merge 1 commit into
development/9.6from
bugfix/CLDSRV-1032-check-key-arn-on-put-bucket-encryption
Open

dvasilas wants to merge 1 commit into
development/9.6from
bugfix/CLDSRV-1032-check-key-arn-on-put-bucket-encryption

Conversation

@dvasilas

@dvasilas dvasilas commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

When a bucket already had a bucket key, PutBucketEncryption stored the KMSMasterKeyID without checking its ARN.

It accepted a key for a KMS that wasn't configured, and every later write to the bucket using it failed with InvalidArgument.

It now rejects it with InvalidArgument when PutBucketEncryption is called, as it does for a bucket without a key and for' CreateBucket'.

@bert-e

bert-e commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

Hello dvasilas,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval ⭐
/bypass_build_status Bypass the build and test status ⭐
/bypass_commit_size Bypass the check on the size of the changeset TBA ⭐
/bypass_incompatible_branch Bypass the check on the source branch prefix ⭐
/bypass_jira_check Bypass the Jira issue check ⭐
/bypass_peer_approval Bypass the pull request peers' approval ⭐
/bypass_leader_approval Bypass the pull request leaders' approval ⭐
/bypass_source_branch_lineage Bypass the cross-branch contamination check ⭐
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request.
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e

bert-e commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Comment thread tests/unit/api/bucketPutEncryption.js Resolved
@codecov

codecov Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 90.72%. Comparing base (5fd3808) to head (854620d).
⚠️ Report is 15 commits behind head on development/9.6.
✅ All tests successful. No failed tests found.

Additional details and impacted files

Impacted file tree graph

Files with missing lines Coverage Δ
lib/api/bucketPutEncryption.js 100.00% <100.00%> (ø)
lib/kms/wrapper.js 89.53% <100.00%> (+0.13%) ⬆️

... and 2 files with indirect coverage changes

@@                 Coverage Diff                 @@
##           development/9.6    #6349      +/-   ##
===================================================
- Coverage            90.73%   90.72%   -0.02%     
===================================================
  Files                  207      207              
  Lines                38913    38925      +12     
===================================================
+ Hits                 35308    35313       +5     
- Misses                3605     3612       +7     
Flag Coverage Δ
checksums-disabled-tests 46.08% <50.00%> (+<0.01%) ⬆️
file-ft-tests 75.73% <71.42%> (-0.01%) ⬇️
file-ft-tests-null-compat 76.25% <71.42%> (+0.02%) ⬆️
kmip-ft-tests 43.56% <100.00%> (+0.03%) ⬆️
mongo-v0-ft-tests 76.81% <71.42%> (-0.01%) ⬇️
mongo-v1-ft-tests 76.80% <71.42%> (+<0.01%) ⬆️
multiple-backend 44.45% <50.00%> (+<0.01%) ⬆️
s3c-ft-tests-v0 71.63% <71.42%> (-0.01%) ⬇️
s3c-ft-tests-v0-null-compat 71.69% <71.42%> (+<0.01%) ⬆️
s3c-ft-tests-v1 71.60% <71.42%> (-0.01%) ⬇️
sur-tests 44.98% <50.00%> (-0.02%) ⬇️
sur-tests-inflights 48.37% <50.00%> (-0.02%) ⬇️
unit 80.38% <100.00%> (+<0.01%) ⬆️
utapi-v2-tests 44.99% <50.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

… has a key

A key from an unconfigured KMS was stored and only rejected on the next write.
@dvasilas
dvasilas force-pushed the bugfix/CLDSRV-1032-check-key-arn-on-put-bucket-encryption branch from 8844a76 to 854620d Compare November 4, 2026 14:20

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants