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

Upgrade tough-cookie to fix CVE-2023-26136 #198

Merged
merged 1 commit into from
Jul 11, 2023

Conversation

rupal-bq
Copy link
Member

Description

  • Added tough-cookie v4.1.3 to resolution

Issues Resolved

CVE-2023-26136

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • 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.

@codecov
Copy link

codecov bot commented Jul 11, 2023

Codecov Report

Merging #198 (9684d82) into main (1877182) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #198   +/-   ##
=======================================
  Coverage   94.73%   94.73%           
=======================================
  Files           5        5           
  Lines         152      152           
  Branches       45       45           
=======================================
  Hits          144      144           
  Misses          8        8           

@rupal-bq rupal-bq merged commit f5e26d0 into opensearch-project:main Jul 11, 2023
12 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 11, 2023
Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit f5e26d0)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 11, 2023
Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit f5e26d0)
rupal-bq added a commit that referenced this pull request Jul 11, 2023
Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit f5e26d0)

Co-authored-by: Rupal Mahajan <[email protected]>
rupal-bq added a commit that referenced this pull request Jul 11, 2023
Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit f5e26d0)

Co-authored-by: Rupal Mahajan <[email protected]>
@opensearch-trigger-bot
Copy link
Contributor

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 backport 2.x backport 2.9 dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants