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

Add fix for CVE-2023-2251 #102

Merged
merged 1 commit into from
Apr 26, 2023
Merged

Conversation

rupal-bq
Copy link
Contributor

Description

  • Added resolution for yaml v2.2.2

Issues Resolved

#100

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.

Signed-off-by: Rupal Mahajan <[email protected]>
@joshuali925 joshuali925 merged commit 3eb68dd into opensearch-project:main Apr 26, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 26, 2023
Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit 3eb68dd)
@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-102-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3eb68dd6deb1986425e5994a96391a3154ec7211
# Push it to GitHub
git push --set-upstream origin backport/backport-102-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-102-to-1.3.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 26, 2023
Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit 3eb68dd)
rupal-bq added a commit that referenced this pull request Apr 26, 2023
Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit 3eb68dd)

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

Co-authored-by: Rupal Mahajan <[email protected]>
@rupal-bq
Copy link
Contributor Author

Cannot backport to 1.3

yarn run v1.22.19
$ node ../../scripts/osd bootstrap
 info [opensearch-dashboards] running yarn

$ node ./preinstall_check
[1/5] Validating package.json...
[2/5] Resolving packages...
warning Resolution field "[email protected]" is incompatible with requested version "typescript@~4.8.4"
warning Resolution field "[email protected]" is incompatible with requested version "shelljs@^0.6.0"
success Already up-to-date.

 info [reports-dashboards] running yarn

[1/4] Resolving packages...
warning Resolution field "[email protected]" is incompatible with requested version "[email protected]"
warning Resolution field "[email protected]" is incompatible with requested version "ansi-regex@^2.0.0"
warning Resolution field "[email protected]" is incompatible with requested version "ansi-regex@^2.0.0"
warning Resolution field "[email protected]" is incompatible with requested version "[email protected]"
warning Resolution field "[email protected]" is incompatible with requested version "ansi-regex@^3.0.0"
[2/4] Fetching packages...
error [email protected]: The engine "node" is incompatible with this module. Expected version ">= 14". Got "10.24.1"
error Found incompatible module.
info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.
ERROR [bootstrap] failed:
ERROR Error: Command failed with exit code 1: /home/ubuntu/.nvm/versions/node/v10.24.1/lib/node_modules/yarn/bin/yarn.js install --non-interactive
          at makeError (/home/ubuntu/workspace/OpenSearch-Dashboards/packages/osd-pm/dist/index.js:25139:11)
          at handlePromise (/home/ubuntu/workspace/OpenSearch-Dashboards/packages/osd-pm/dist/index.js:24074:26)
          at process._tickCallback (internal/process/next_tick.js:68:7)
error Command failed with exit code 1.
info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.

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.

3 participants