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.

Sign up for GitHub

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

Jump to bottom

opensearch-dashboards-2/cve-2024-21534: remediation #35114

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −1
Open

opensearch-dashboards-2/cve-2024-21534: remediation #35114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion opensearch-dashboards-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: opensearch-dashboards-2
version: 2.17.1 # when updating please check if we can remove the patched package.json for the reporting plugin
epoch: 1
epoch: 2
description: Open source visualization dashboards for OpenSearch
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -63,6 +63,10 @@ pipeline:
cherry-picks: |
main/5e19749ec40230316ba2688c38e5c62f74ddb71d: CVE-2024-37890
- uses: patch
with:
patches: cve-2024-21538.patch
Copy link
Member

Choose a reason for hiding this comment

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

This is good, but I am still not convinced with adding patches which aren't cleaned it up :/.

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah though it's no different from what's happening today when someone adds any node CVE remediation

cleaning these up definitely needs to be automated too.


- runs: |
# Workaround for "OpenSearch Dashboards should not be run as root. Use --allow-root to continue."
# This change will add the --allow-root when running the build_ts_refs and register_git_hook scripts
Expand Down
12 changes: 12 additions & 0 deletions opensearch-dashboards-2/cve-2024-21538.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/package.json b/package.json
index 6cb7fec4e..c4c724f9c 100644
--- a/package.json
+++ b/package.json
@@ -187,6 +187,7 @@
"**/async": "^3.2.3",
"**/cpy/globby": "^10.0.1",
"**/d3-color": "^3.1.0",
+ "**/cross-spawn": "^7.0.5",
"**/flat": "^5.0.2",
"**/elasticsearch/agentkeepalive": "^4.5.0",
"**/es5-ext": "^0.10.63",
Loading