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

[CVE-2023-26159] Bump follow-redirects from 1.15.2 to 1.15.4 #5669

Merged
merged 2 commits into from
Jan 9, 2024

Conversation

ZilongX
Copy link
Collaborator

@ZilongX ZilongX commented Jan 9, 2024

Description

Issues Resolved

  • No auto-cut issue of this CVE was spotted yet.

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

Signed-off-by: Zilong Xia <zilongx@amazon.com>
@ZilongX
Copy link
Collaborator Author

ZilongX commented Jan 9, 2024

This CVE fix would unblock the failed WhiteSource check like https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5668/checks?check_run_id=20282084601

Copy link

codecov bot commented Jan 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (bf5e842) 67.02% compared to head (7b78e29) 59.27%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5669      +/-   ##
==========================================
- Coverage   67.02%   59.27%   -7.76%     
==========================================
  Files        3294     2983     -311     
  Lines       63307    56620    -6687     
  Branches    10071     8728    -1343     
==========================================
- Hits        42432    33560    -8872     
- Misses      18430    21265    +2835     
+ Partials     2445     1795     -650     
Flag Coverage Δ
Linux_1 35.24% <ø> (ø)
Linux_2 55.19% <ø> (ø)
Linux_3 ?
Linux_4 35.34% <ø> (ø)
Windows_1 ?
Windows_2 ?
Windows_3 ?
Windows_4 ?

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ZilongX ZilongX merged commit f2a44ae into opensearch-project:main Jan 9, 2024
65 of 67 checks passed
@ZilongX ZilongX deleted the cve-2023-26159 branch January 9, 2024 19:09
yujin-emma pushed a commit to yujin-emma/OpenSearch-Dashboards that referenced this pull request Feb 5, 2024
…rch-project#5669)

Signed-off-by: Zilong Xia <zilongx@amazon.com>
Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>
@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/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-5669-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f2a44ae0d3dd87ac9d693b71ad7fa9484c1df0ec
# Push it to GitHub
git push --set-upstream origin backport/backport-5669-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 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/OpenSearch-Dashboards/backport-2.12 2.12
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.12
# Create a new branch
git switch --create backport/backport-5669-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f2a44ae0d3dd87ac9d693b71ad7fa9484c1df0ec
# Push it to GitHub
git push --set-upstream origin backport/backport-5669-to-2.12
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.12

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-5669-to-2.12.

ashwin-pc pushed a commit to ashwin-pc/OpenSearch-Dashboards that referenced this pull request Feb 9, 2024
…rch-project#5669)

Signed-off-by: Zilong Xia <zilongx@amazon.com>
(cherry picked from commit f2a44ae)
Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
ashwin-pc pushed a commit to ashwin-pc/OpenSearch-Dashboards that referenced this pull request Feb 9, 2024
…rch-project#5669)

Signed-off-by: Zilong Xia <zilongx@amazon.com>
(cherry picked from commit f2a44ae)
Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
ashwin-pc added a commit that referenced this pull request Feb 9, 2024
…5.2 to 1.15.4 (#5669) (#5859)

* [CVE-2023-26159] Bump follow-redirects from 1.15.2 to 1.15.4 (#5669)

Signed-off-by: Zilong Xia <zilongx@amazon.com>
(cherry picked from commit f2a44ae)
Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

* fix changelog

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

---------

Signed-off-by: Zilong Xia <zilongx@amazon.com>
Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
Co-authored-by: ZilongX <99905560+ZilongX@users.noreply.github.com>
AMoo-Miki pushed a commit that referenced this pull request Feb 10, 2024
…5860)

(cherry picked from commit f2a44ae)

Signed-off-by: Zilong Xia <zilongx@amazon.com>
Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
Co-authored-by: ZilongX <99905560+ZilongX@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants