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

[1.3] Fix CVE dependencies #1308

Merged
merged 2 commits into from
Jan 26, 2023

Conversation

RyanL1997
Copy link
Collaborator

@RyanL1997 RyanL1997 commented Jan 25, 2023

Signed-off-by: Ryan Liang [email protected]

Description

Upgrade loader-utils to 2.0.4 and above to fix CVE-2022-37601
Upgrade loader-utils to 2.0.4 and above to fix CVE-2022-37603
Upgrade glob-parent to 6.0.0 and above to fix CVE-2020-28469
Upgrade decode-uri-component to 0.2.2 and above to fix CVE-2022-38900

Category

Maintenance

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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.

Signed-off-by: Ryan Liang <[email protected]>
@codecov-commenter
Copy link

codecov-commenter commented Jan 25, 2023

Codecov Report

Merging #1308 (f46674a) into 1.3 (25d60ce) will not change coverage.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@           Coverage Diff           @@
##              1.3    #1308   +/-   ##
=======================================
  Coverage   72.02%   72.02%           
=======================================
  Files          88       88           
  Lines        1916     1916           
  Branches      250      250           
=======================================
  Hits         1380     1380           
  Misses        480      480           
  Partials       56       56           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@RyanL1997 RyanL1997 marked this pull request as ready for review January 25, 2023 22:14
@RyanL1997 RyanL1997 requested a review from a team January 25, 2023 22:14
@RyanL1997 RyanL1997 changed the title Fix CVE dependencies [1.3] Fix CVE dependencies Jan 25, 2023
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

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

Please update the pull request description with more details about this change.

Mend isn't reporting link any issues have been fixed, how do we know these changes are correct?

@peternied
Copy link
Member

Please include the CVE referenced in the change like was done here, opensearch-project/security#2350

Multiple entries, one on each line is a good way to do this.

Copy link
Member

@DarshitChanpura DarshitChanpura left a comment

Choose a reason for hiding this comment

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

Why delete yarn.lock? If needed you can push updated yarn.lock. Check out this link that talks about whether or not yarn.lock should be deleted.
Apologies. I do see that it is not deleted.

Also, can you add a brief description of why this change is required or point to the issue that requires this change?

@cwperks
Copy link
Member

cwperks commented Jan 26, 2023

@DarshitChanpura This does not delete the yarn.lock, there are just a lot of lines deleted. I believe a lot of these dependencies were coming from storybook from OSD core which was deleted so there were a lot of deletions in this yarn.lock as well.

For some additional context, main does not have a yarn.lock, but 1.3 does. The reason for that is because of the backport of the SAML integration tests which needed to lock in a version of selenium that was compatible with node 10.24.1.

@DarshitChanpura
Copy link
Member

DarshitChanpura commented Jan 26, 2023

@DarshitChanpura This does not delete the yarn.lock, there are just a lot of lines deleted. I believe a lot of these dependencies were coming from storybook from OSD core which was deleted so there were a lot of deletions in this yarn.lock as well.

Yep I saw 4/5 red bars on yarn.lock and concluded it was deleted 🤦 .

For some additional context, main does not have a yarn.lock, but 1.3 does. The reason for that is because of the backport of the SAML integration tests which needed to lock in a version of selenium that was compatible with node 10.24.1.

Yep, it was introduced with that PR and that is why I was trying to make sure it wasn't deleted.

@RyanL1997
Copy link
Collaborator Author

@peternied @DarshitChanpura Thanks for the review, and I just attach the dependencies names and version number with the issue links.

@cwperks
Copy link
Member

cwperks commented Jan 26, 2023

@RyanL1997 Can you rebase this with the latest from 1.3? The version increment was just merged.

@DarshitChanpura DarshitChanpura merged commit 8e10167 into opensearch-project:1.3 Jan 26, 2023
@RyanL1997
Copy link
Collaborator Author

Update: I also run the sanity tests with this changes and it is all good.

@RyanL1997 RyanL1997 added the backport 1.x backport to 1.x branch label Jan 26, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-1308-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8e101672d9e9c8bc0bb03d88c9aac7054a2f79e0
# Push it to GitHub
git push --set-upstream origin backport/backport-1308-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport to 1.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants