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.

Sign up for GitHub

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

Jump to bottom

Fix upload/download issue of objects containing a "+" in their key #651

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Fix upload/download issue of objects containing a "+" in their key #651

merged 2 commits into from
Oct 10, 2023

Conversation

JBWatenbergScality
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Oct 9, 2023

Hello jbwatenbergscality,

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.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 9, 2023

Incorrect fix version

The Fix Version/s in issue ZKUI-383 contains:

  • None

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

  • 2.1.4

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

@codecov-commenter
Copy link

Codecov Report

Merging #651 (1a37f88) into development/2.1 (5fc8476) will decrease coverage by 0.11%.
The diff coverage is n/a.

@@                 Coverage Diff                 @@
##           development/2.1     #651      +/-   ##
===================================================
- Coverage            58.19%   58.08%   -0.11%     
===================================================
  Files                  208      208              
  Lines                10157    10157              
  Branches              2942     2942              
===================================================
- Hits                  5911     5900      -11     
- Misses                4230     4241      +11     
  Partials                16       16

see 3 files with indirect coverage changes

@JBWatenbergScality
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 9, 2023

Waiting for approval

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

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@JBWatenbergScality
fix: upload, download and listing of objects with "+" in their keys
1cf657b 
When uploading an object containing several + in their keys, nginx considers the "+" as being a "valid" url charcter, then it is not re-encoding it when proxy_pass the url.

This ends up in signature validation issues on cloudserver side, because cloud server receives the request with a plain "+" character instead of its urlencode counterpart "%2B".
To solve the issue, we create a new variable named "urlencore_proxy_uri" where we urlencode the "+" and give that URL to the proxy_pass, this way nginx is not re-encoding it.

We had to introduce lua to do this operation via a set_by_lua_block because a simple map module in nginx is not replacing ALL the occurences but only the last match.

Ref: ZKUI-317
@bert-e
Copy link
Contributor

bert-e commented Oct 10, 2023

Build failed

The build for commit did not succeed in branch bugfix/ZKUI-383.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 10, 2023

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.1

The following branches will NOT be impacted:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 10, 2023

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

  • ✔️ development/2.1

The following branches have NOT changed:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0

Please check the status of the associated issue ZKUI-383.

Goodbye jbwatenbergscality.

@bert-e bert-e merged commit 1cf657b into development/2.1 Oct 10, 2023
15 checks passed
@bert-e bert-e deleted the bugfix/ZKUI-383 branch October 10, 2023 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MonPote MonPote MonPote approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JBWatenbergScality @bert-e @codecov-commenter @MonPote