Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDSRV-584 Limit backbeat API versioning check to replication operations #5707

Open
wants to merge 1 commit into
base: development/7.10
Choose a base branch
from

Conversation

nicolas2bert
Copy link
Contributor

@nicolas2bert nicolas2bert commented Nov 26, 2024

Context:

In Artesca, when creating a location (whether used for replication or not), you specify both the endpoint and the bucket name where data will be stored. At this stage, Zenko checks that the bucket has versioning enabled.

In S3C, it is a bit different, a “replication location” consists of a list of S3C endpoints (replicationEndpoints), and the destination bucket is specified later in the API replication rule (with put-bucket-replication API). Currently, S3C does not check if the destination bucket has versioning enabled. This means data could be replicated from a versioned source bucket to a non-versioned or suspended destination bucket, which can cause issues. e.g. https://scality.atlassian.net/browse/S3C-821

Current solution:

A validation step was added to the Backbeat API in cloudserver. This check rejects any requests made to buckets that either do not have versioning enabled or have versioning suspended. This check makes sure the Backbeat API only works with buckets that have versioning enabled. This prevents operations on destination buckets where versioning is disabled or suspended, hense maintaining proper version control.

On the source, we should be fine. Cloudserver prevents setting up replication on a bucket if its versioning is disabled or suspended, and it prevents changing a bucket’s versioning to suspended while replication is ongoing.

Issue:

The Backbeat API is also used for lifecycle, which works on both versioned and non-versioned buckets. The current versioning check affects the lifecycle operations, which should be allowed on non-versioned buckets.

Proposed solution:

Modify the Backbeat API to apply the bucket versioning check only to actions related to the replication destination buckets (such as PUT, POST, and DELETE requests).

Implement a new client header x-scal-versioning-required in the Backbeat client to make sure that replication targets only versioned buckets. When this header is set, Cloudserver will make sure that the destination bucket has versioning enabled, preventing replication to non-versioned buckets.

This change will ensure that replication only targets versioned buckets and allows lifecycle operations on non-versioned buckets.

@bert-e
Copy link
Contributor

bert-e commented Nov 26, 2024

Hello nicolas2bert,

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
/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 TBA
/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.

@nicolas2bert nicolas2bert changed the base branch from development/8.8 to development/7.70 November 26, 2024 13:59
@bert-e
Copy link
Contributor

bert-e commented Nov 26, 2024

Branches have diverged

This pull request's source branch bugfix/CLDSRV-584/backbeat-api has diverged from
development/8.8 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/8.8 into bugfix/CLDSRV-584/backbeat-api
  • Rebase bugfix/CLDSRV-584/backbeat-api onto origin/development/8.8

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

@bert-e
Copy link
Contributor

bert-e commented Nov 26, 2024

Branches have diverged

This pull request's source branch bugfix/CLDSRV-584/backbeat-api has diverged from
development/7.70 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/7.70 into bugfix/CLDSRV-584/backbeat-api
  • Rebase bugfix/CLDSRV-584/backbeat-api onto origin/development/7.70

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

@nicolas2bert nicolas2bert force-pushed the bugfix/CLDSRV-584/backbeat-api branch from 130300a to 87a5fbf Compare November 26, 2024 14:01
@nicolas2bert nicolas2bert changed the base branch from development/7.70 to development/7.10 November 26, 2024 14:01
@bert-e
Copy link
Contributor

bert-e commented Nov 26, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-584 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.51

  • 7.70.59

  • 8.6.29

  • 8.7.50

  • 8.8.38

Please check the Fix Version/s of CLDSRV-584, or the target
branch of this pull request.

@nicolas2bert
Copy link
Contributor Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Nov 26, 2024

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Nov 26, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-584 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.51

  • 7.70.59

  • 8.6.29

  • 8.7.50

  • 8.8.38

Please check the Fix Version/s of CLDSRV-584, or the target
branch of this pull request.

@nicolas2bert
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Nov 26, 2024

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

Copy link
Contributor

@anurag4DSB anurag4DSB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@francoisferrand francoisferrand self-assigned this Nov 29, 2024
// The following makes sure that only replication destination-related operations (non-GET requests)
// target buckets with versioning enabled.
// This allows lifecycle operations (which use GET requests) to work on non-versioned buckets.
if (request.method !== 'GET' && (!versioningConfig || versioningConfig.Status !== 'Enabled')) {
Copy link
Contributor

@francoisferrand francoisferrand Dec 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lifecycle does not only perform GET operations : it also deletes objects (expiration), deletes data associated with objects (transition and restored-object-expiration), and puts metadata of objects...

so i fear such broad filtering in the router may introduce other issues.

→ Is there a way instead to identify the few "actions" performed by CRR replication (e.g. putObjectVersion, putObjectMetadata), maybe with some additional condition on the parameters/fields, to confirm? Then the check cna be performed direclty in each of these action handlers.
→ Otherwise, may be better to "isolate" the calls with specific CRR/lifecycle routes, or maybe simply add an extra parameter to enforce the check (IfVersioned maybe ?)
→ Alternatively, instead of making it a "core" feature in the code, could it be achieve through policies? e.g. the replication user will not have permissions to write to non-versioned bucket? (need to check if this is a kind of policy we support or even can define, but would be an elegant and simple solution I think)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • S3C Lifecycle expiration (transition is not supported yet) only uses backbeat client GET operation: getMetadata. Delete object/version is done by the S3 client itself that uses the s3 route.

Is there a way instead to identify the few "actions" performed by CRR replication (e.g. putObjectVersion, putObjectMetadata)

  • Replication uses putData, putMetadata and batchDelete 's backebatAPI routes. Limiting the versioning check to those actions makes sense and is more explicit. However putMetadata is also used by lifecycle transition so it will not solve the lifecycle transition future implementation.

  • This PR is a fix, so I am not comfortable introducing new CRR/lifeycle routes for it. But it will be needed once we introduce lifecycle transition in S3C.

the replication user will not have permissions to write to non-versioned bucket?

  • I thought about it, but it does not exist.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

batchDelete route is used for lifecycle as well.

This PR is a fix, so I am not comfortable introducing new CRR/lifeycle routes for it. But it will be needed once we introduce lifecycle transition in S3C.

Fine with me ; however the code will waterflow and in the not-so-long future we should converge Cloudserver: so whatever you change will break lifecycle in Zenko.

So I'd rather make the check conditional anyway, and let the "caller" decide if the bucket must be versionned: e..g. simply add an extra parameter to enforce the check (IfVersioned maybe ?) : then backbeat can be updated to required versioning if and if required, without introducing backbeat logic/constraints in cloudserver.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I am aligned with it.

@bert-e
Copy link
Contributor

bert-e commented Dec 4, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-584 contains:

  • 7.10.51

  • 7.70.59

  • 8.6.29

  • 8.7.50

  • 8.8.39

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.51

  • 7.70.59

  • 8.8.39

Please check the Fix Version/s of CLDSRV-584, or the target
branch of this pull request.

@bert-e
Copy link
Contributor

bert-e commented Dec 9, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-584 contains:

  • 7.10.51

  • 7.70.59

  • 8.6.29

  • 8.7.50

  • 8.8.39

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.51

  • 7.70.59

  • 8.8.40

Please check the Fix Version/s of CLDSRV-584, or the target
branch of this pull request.

@bert-e
Copy link
Contributor

bert-e commented Dec 10, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-584 contains:

  • 7.10.51

  • 7.70.59

  • 8.6.29

  • 8.7.50

  • 8.8.40

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.51

  • 7.70.59

  • 8.8.40

Please check the Fix Version/s of CLDSRV-584, or the target
branch of this pull request.

@nicolas2bert nicolas2bert force-pushed the bugfix/CLDSRV-584/backbeat-api branch from 87a5fbf to b5160b9 Compare December 10, 2024 17:13
@bert-e
Copy link
Contributor

bert-e commented Dec 12, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-584 contains:

  • 7.10.51

  • 7.70.59

  • 8.6.29

  • 8.7.50

  • 8.8.40

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.51

  • 7.70.59

  • 8.8.40

  • 8.9.0

Please check the Fix Version/s of CLDSRV-584, or the target
branch of this pull request.

Comment on lines 1292 to 1297
// The following makes sure that only replication destination-related operations
// target buckets with versioning enabled.
// This allows lifecycle expiration operations (getMetadata) to work on non-versioned buckets.
const isCRRDestinationRequest = request.method === 'PUT' &&
(request.resourceType === 'data' || request.resourceType === 'metadata');
if (isCRRDestinationRequest && (!versioningConfig || versioningConfig.Status !== 'Enabled')) {
Copy link
Contributor

@francoisferrand francoisferrand Dec 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To reduce coupling, I'd rather make this generic and let the caller (i.e. backbeat, who has full context!) specify if versioning is required, without introducing replication-related logic (which could actually change!) here.

something like:

Suggested change
// The following makes sure that only replication destination-related operations
// target buckets with versioning enabled.
// This allows lifecycle expiration operations (getMetadata) to work on non-versioned buckets.
const isCRRDestinationRequest = request.method === 'PUT' &&
(request.resourceType === 'data' || request.resourceType === 'metadata');
if (isCRRDestinationRequest && (!versioningConfig || versioningConfig.Status !== 'Enabled')) {
if (request.headers['x-scal-if-versionning-enabled'] && (!versioningConfig || versioningConfig.Status !== 'Enabled')) {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

@nicolas2bert nicolas2bert force-pushed the bugfix/CLDSRV-584/backbeat-api branch 3 times, most recently from 887d250 to b3f446a Compare December 12, 2024 21:09
if (!versioningConfig || versioningConfig.Status !== 'Enabled') {
// The following makes sure that only replication destination-related operations
// target buckets with versioning enabled.
const isVersioningEnabled = request.headers['x-scal-versioning-enabled'] === 'true';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: isVersioningEnabled should be something like checkVersioningEnabled

similarly, i wonder if the header should be renamed to something more explicit, like x-scal-versioning-required or x-scal-if-versioning-enabled ?

@bert-e
Copy link
Contributor

bert-e commented Dec 13, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-584 contains:

  • 7.10.51

  • 7.70.59

  • 8.6.29

  • 8.7.50

  • 8.8.40

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.51

  • 7.70.59

  • 8.8.40

  • 9.0.0

Please check the Fix Version/s of CLDSRV-584, or the target
branch of this pull request.

@@ -1513,13 +1514,16 @@ describeSkipIfAWS('backbeat routes', () => {
done();
}));
Copy link
Contributor

@francoisferrand francoisferrand Dec 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should add tests to verify versioning is not checked when x-scal-versioning-enabled is not defined or false.
("should not refuse PUT data when bucket is not versioned if x-scal-versioning-enabled is not set")

Copy link
Contributor

@francoisferrand francoisferrand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just some small cleanup.

In addition, I wonder if we should be more strict and fail the request if this header is passed to other routes (which do not support it) ?

@nicolas2bert
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Dec 20, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/bugfix/CLDSRV-584/backbeat-api with contents from w/7.70/bugfix/CLDSRV-584/backbeat-api
and development/8.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.8/bugfix/CLDSRV-584/backbeat-api origin/development/8.8
 $ git merge origin/w/7.70/bugfix/CLDSRV-584/backbeat-api
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/bugfix/CLDSRV-584/backbeat-api

The following options are set: approve

@nicolas2bert nicolas2bert force-pushed the bugfix/CLDSRV-584/backbeat-api branch from 0ec3584 to b762233 Compare December 20, 2024 08:39
@bert-e
Copy link
Contributor

bert-e commented Dec 20, 2024

History mismatch

Merge commit #0ec3584cbe3dd3ed61cc0f305ec4d6704b72b177 on the integration branch
w/7.70/bugfix/CLDSRV-584/backbeat-api is merging a branch which is neither the current
branch bugfix/CLDSRV-584/backbeat-api nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-584/backbeat-api and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

Context:

In Artesca, when creating a location (whether used for replication or not), you specify both the endpoint and the bucket name where data will be stored. At this stage, Zenko checks that the bucket has versioning enabled.

In S3C, it is a bit different, a “replication location” consists of a list of S3C endpoints (replicationEndpoints), and the destination bucket is specified later in the API replication rule (with put-bucket-replication API). Currently, S3C does not check if the destination bucket has versioning enabled. This means data could be replicated from a versioned source bucket to a non-versioned or suspended destination bucket, which can cause issues. e.g. https://scality.atlassian.net/browse/S3C-821

Current solution:

A validation step was added to the Backbeat API in cloudserver. This check rejects any requests made to buckets that either do not have versioning enabled or have versioning suspended. This check makes sure the Backbeat API only works with buckets that have versioning enabled. This prevents operations on destination buckets where versioning is disabled or suspended, hense maintaining proper version control.

On the source, we should be fine. Cloudserver prevents setting up replication on a bucket if its versioning is disabled or suspended, and it prevents changing a bucket’s versioning to suspended while replication is ongoing.

Issue:

The Backbeat API is also used for lifecycle, which works on both versioned and non-versioned buckets. The current versioning check affects the lifecycle operations, which should be allowed on non-versioned buckets.

Proposed solution:

Modify the Backbeat API to apply the bucket versioning check only to actions related to the replication destination buckets (such as PUT, POST, and DELETE requests).

Implement a new client header x-scal-versioning-required in the Backbeat client to make sure that replication targets only versioned buckets. When this header is set, Cloudserver will make sure that the destination bucket has versioning enabled, preventing replication to non-versioned buckets.

This change will ensure that replication only targets versioned buckets and allows lifecycle operations on non-versioned buckets.
@nicolas2bert nicolas2bert force-pushed the bugfix/CLDSRV-584/backbeat-api branch from b762233 to 1bd502a Compare December 20, 2024 09:43
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.

4 participants