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

Update restPathMatches to handle case with missing leading slash #5061

Merged
merged 5 commits into from
Jan 27, 2025

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Jan 27, 2025

Description

This PR contains a bugfix for the logic in restPathMatches to account for a case where some REST clients can send a request without a leading slash.

  • Category (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)

Bugfix

Testing

Unit tests added

Check List

  • New functionality includes testing
  • New functionality has been documented
  • New Roles/Permissions have a corresponding security dashboards plugin PR
  • API changes companion pull request created
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@willyborankin willyborankin added the backport 2.x backport to 2.x branch label Jan 27, 2025
Copy link

codecov bot commented Jan 27, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.53%. Comparing base (9b73490) to head (eb0c890).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #5061      +/-   ##
==========================================
+ Coverage   71.49%   71.53%   +0.04%     
==========================================
  Files         336      336              
  Lines       22621    22623       +2     
  Branches     3600     3601       +1     
==========================================
+ Hits        16172    16183      +11     
+ Misses       4649     4642       -7     
+ Partials     1800     1798       -2     
Files with missing lines Coverage Δ
...opensearch/security/filter/SecurityRestFilter.java 84.32% <100.00%> (+0.23%) ⬆️

... and 4 files with indirect coverage changes

@willyborankin willyborankin merged commit 772eef6 into opensearch-project:main Jan 27, 2025
43 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-5061-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 772eef6d48017022e0bc5fe68f011e97d88aa598
# Push it to GitHub
git push --set-upstream origin backport/backport-5061-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-5061-to-2.x.

cwperks added a commit that referenced this pull request Feb 1, 2025
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 1, 2025
…leading slash (#5061) (#5077)

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 1d4f54e)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
cwperks pushed a commit that referenced this pull request Feb 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants