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

Support SSL condition #5724

Merged
merged 1 commit into from
Feb 12, 2025
Merged

Support SSL condition #5724

merged 1 commit into from
Feb 12, 2025

Conversation

williamlardier
Copy link
Contributor

Currently, behind a proxy, we cannot detect the right http scheme. Also, we use the request.connection.encrypted variable, that is (1) deprecated and (2) already removed since Node 16, so the whole thing end up being undefined.

Here we call the new function in Arsenal to detect the right scheme, and add it to the request contexts constructor.

We also improve how bucket policies are evaluated:

  • Previously we were computing the request context for each policy statement, and twice per statement
  • There was a case where, if the request is undefined, then one of the internal evaluation would crash

@bert-e
Copy link
Contributor

bert-e commented Jan 6, 2025

Hello williamlardier,

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.

@scality scality deleted a comment from bert-e Jan 6, 2025
@bert-e
Copy link
Contributor

bert-e commented Jan 6, 2025

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

codecov bot commented Jan 6, 2025

Codecov Report

Attention: Patch coverage is 84.61538% with 2 lines in your changes missing coverage. Please review.

Project coverage is 64.92%. Comparing base (66491bd) to head (de8fec1).
Report is 1 commits behind head on development/9.0.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
lib/api/apiUtils/object/objectLockHelpers.js 0.00% 1 Missing ⚠️
lib/routes/routeMetadata.js 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

Files with missing lines Coverage Δ
lib/api/apiUtils/authorization/permissionChecks.js 87.59% <100.00%> (ø)
...i/apiUtils/authorization/prepareRequestContexts.js 89.84% <100.00%> (+0.07%) ⬆️
lib/api/bucketPut.js 92.23% <100.00%> (+0.07%) ⬆️
lib/api/multiObjectDelete.js 69.02% <100.00%> (+0.49%) ⬆️
lib/api/apiUtils/object/objectLockHelpers.js 81.73% <0.00%> (-0.80%) ⬇️
lib/routes/routeMetadata.js 0.00% <0.00%> (ø)
@@               Coverage Diff                @@
##           development/9.0    #5724   +/-   ##
================================================
  Coverage            64.92%   64.92%           
================================================
  Files                  185      185           
  Lines                11663    11668    +5     
================================================
+ Hits                  7572     7576    +4     
- Misses                4091     4092    +1     
Flag Coverage Δ
unit 64.92% <84.61%> (+<0.01%) ⬆️

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

@williamlardier williamlardier changed the base branch from development/8.8 to development/9.0 January 10, 2025 13:45
@scality scality deleted a comment from bert-e Jan 10, 2025
@bert-e
Copy link
Contributor

bert-e commented Jan 10, 2025

Waiting for approval

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

  • the author

  • 2 peers

@bert-e
Copy link
Contributor

bert-e commented Feb 11, 2025

Conflict

There is a conflict between your branch bugfix/CLDSRV-602 and the
destination branch development/9.0.

Please resolve the conflict on the feature branch (bugfix/CLDSRV-602).

git fetch && \
git checkout origin/bugfix/CLDSRV-602 && \
git merge origin/development/9.0

Resolve merge conflicts and commit

git push origin HEAD:bugfix/CLDSRV-602

@bert-e
Copy link
Contributor

bert-e commented Feb 12, 2025

Waiting for approval

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

  • the author

  • 2 peers

- Bucket policies evaluation is also updated to not compute
  the request context for each statement, as it will remain
  the same for a given request anyway.
- The isSecure flag is computed every time we need to create
  request contexts to send to the IAM service.

Issue: CLDSRV-602
@williamlardier
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Feb 12, 2025

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/9.0

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8

Please check the status of the associated issue CLDSRV-602.

Goodbye williamlardier.

The following options are set: approve

@bert-e bert-e merged commit de8fec1 into development/9.0 Feb 12, 2025
19 checks passed
@bert-e bert-e deleted the bugfix/CLDSRV-602 branch February 12, 2025 12: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