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

Employ a patched version of hoek that addresses CVE-2020-36604 #6148

Merged
merged 1 commit into from
Mar 15, 2024

Conversation

AMoo-Miki
Copy link
Collaborator

@AMoo-Miki AMoo-Miki commented Mar 14, 2024

Description

Employ a patched version of hoek that addresses CVE-2020-36604.

Note: the patched library has tests added for prototype poisoning.

% npm run test

> @amoo-miki/hoek@6.1.3 test
> lab -a code -t 100 -L

  ..................................................
  ..................................................
  ..................................................
  ................................

182 tests complete
Test duration: 159 ms
Assertions count: 522 (verbosity: 2.87)
The following leaks were detected:globalThis, FinalizationRegistry, WeakRef
Coverage: 100.00%
Linting results: No issues

Can safely be backported to all versions that use this specific version.

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

Copy link

codecov bot commented Mar 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.18%. Comparing base (31e8481) to head (4c88b82).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6148      +/-   ##
==========================================
- Coverage   67.20%   67.18%   -0.02%     
==========================================
  Files        3328     3328              
  Lines       64461    64461              
  Branches    10376    10376              
==========================================
- Hits        43318    43306      -12     
- Misses      18610    18622      +12     
  Partials     2533     2533              
Flag Coverage Δ
Linux_1 31.74% <ø> (ø)
Linux_2 55.29% <ø> (ø)
Linux_3 44.77% <ø> (ø)
Linux_4 35.05% <ø> (ø)
Windows_1 31.77% <ø> (-0.03%) ⬇️
Windows_2 55.26% <ø> (ø)
Windows_3 44.78% <ø> (ø)
Windows_4 35.05% <ø> (ø)

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.

@ashwin-pc ashwin-pc merged commit 8c4f49a into opensearch-project:main Mar 15, 2024
68 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/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-6148-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8c4f49a2200bb4622aea3ff70bb7a8c96983af5d
# Push it to GitHub
git push --set-upstream origin backport/backport-6148-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-6148-to-2.x.

manasvinibs pushed a commit to manasvinibs/OpenSearch-Dashboards that referenced this pull request Mar 19, 2024
…earch-project#6148)

Signed-off-by: Miki <miki@amazon.com>
(cherry picked from commit 8c4f49a)
@manasvinibs
Copy link
Member

Manual backport #6206

manasvinibs added a commit that referenced this pull request Mar 19, 2024
#6206)

Signed-off-by: Miki <miki@amazon.com>
(cherry picked from commit 8c4f49a)

Co-authored-by: Miki <miki@amazon.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.

6 participants