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

Fix CVE-2023-25613 #12194

Merged

Conversation

kotwanikunal
Copy link
Member

Description

Related Issues

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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.

@kotwanikunal
Copy link
Member Author

@reta Can you please review this?

Copy link
Contributor

github-actions bot commented Feb 6, 2024

Compatibility status:

Checks if related components are compatible with change 3582329

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/flow-framework.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/sql.git]

Copy link
Contributor

github-actions bot commented Feb 6, 2024

❌ Gradle check result for e9ceaa1: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Feb 6, 2024

❌ Gradle check result for e9ceaa1:

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Feb 6, 2024

❌ Gradle check result for e9ceaa1: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@kotwanikunal kotwanikunal added the backport 2.12 Backport to 2.12 branch label Feb 6, 2024
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
Copy link
Contributor

github-actions bot commented Feb 7, 2024

❕ Gradle check result for 3582329: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Feb 7, 2024

Codecov Report

Attention: 138 lines in your changes are missing coverage. Please review.

Comparison is base (3cbf54e) 71.40% compared to head (3582329) 71.40%.
Report is 5 commits behind head on main.

Files Patch % Lines
...rch/search/fetch/subphase/MatchedQueriesPhase.java 0.00% 37 Missing ⚠️
...src/main/java/org/opensearch/search/SearchHit.java 58.73% 17 Missing and 9 partials ⚠️
...ansport/top_queries/TransportTopQueriesAction.java 24.00% 18 Missing and 1 partial ⚠️
.../insights/core/listener/QueryInsightsListener.java 73.58% 10 Missing and 4 partials ⚠️
...opensearch/search/builder/SearchSourceBuilder.java 42.85% 4 Missing and 4 partials ⚠️
.../resthandler/top_queries/RestTopQueriesAction.java 61.11% 7 Missing ⚠️
.../insights/rules/action/top_queries/TopQueries.java 66.66% 5 Missing ⚠️
...search/ingest/common/RemoveByPatternProcessor.java 95.77% 1 Missing and 2 partials ⚠️
...s/rules/action/top_queries/TopQueriesResponse.java 93.18% 3 Missing ⚠️
...g/opensearch/search/internal/SubSearchContext.java 0.00% 3 Missing ⚠️
... and 8 more
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #12194      +/-   ##
============================================
- Coverage     71.40%   71.40%   -0.01%     
- Complexity    59636    59681      +45     
============================================
  Files          4944     4952       +8     
  Lines        280322   280637     +315     
  Branches      40728    40773      +45     
============================================
+ Hits         200175   200385     +210     
- Misses        63501    63654     +153     
+ Partials      16646    16598      -48     

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

@kotwanikunal kotwanikunal merged commit 2ce15a5 into opensearch-project:main Feb 7, 2024
30 of 31 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 7, 2024
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
(cherry picked from commit 2ce15a5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 7, 2024
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
(cherry picked from commit 2ce15a5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
kotwanikunal pushed a commit that referenced this pull request Feb 7, 2024
(cherry picked from commit 2ce15a5)

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@kotwanikunal kotwanikunal deleted the fix-CVE-2023-25613 branch February 7, 2024 02:30
kotwanikunal pushed a commit that referenced this pull request Feb 7, 2024
(cherry picked from commit 2ce15a5)

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

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

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

@harishbhakuni harishbhakuni added backport 1.3 Backport to 1.3 branch and removed backport 1.x labels Feb 28, 2024
@opensearch-trigger-bot
Copy link
Contributor

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

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

harishbhakuni pushed a commit to harishbhakuni/OpenSearch that referenced this pull request Feb 28, 2024
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
(cherry picked from commit 2ce15a5)
kotwanikunal added a commit that referenced this pull request Feb 28, 2024
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
(cherry picked from commit 2ce15a5)

Co-authored-by: Kunal Kotwani <kkotwani@amazon.com>
peteralfonsi pushed a commit to peteralfonsi/OpenSearch that referenced this pull request Mar 1, 2024
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 Backport to 1.3 branch backport 2.x Backport to 2.x branch backport 2.12 Backport to 2.12 branch backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants