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

[CVE-2017-16100] Use a patched version of dns-sync #7811

Merged
merged 3 commits into from
Aug 23, 2024

Conversation

AMoo-Miki
Copy link
Collaborator

@AMoo-Miki AMoo-Miki commented Aug 22, 2024

Description

[CVE-2017-16100] Use a patched version of dns-sync

dns-sync

The library hasn't been updated in years. Even though an upstream PR was created, due to the criticality of the CVE, until upstream package is updated a patched version is employed.

Changelog

  • security: [CVE-2017-16100] Use a patched version for the dns-sync dependency

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

ZilongX
ZilongX previously approved these changes Aug 22, 2024
@@ -190,7 +190,7 @@
"core-js": "^3.6.5",
"deep-freeze-strict": "^1.1.1",
"del": "^6.1.1",
"dns-sync": "^0.2.1",
"dns-sync": "npm:@amoo-miki/dns-sync@^0.2.1",
Copy link
Member

Choose a reason for hiding this comment

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

@AMoo-Miki I have been thinking why not publishing under @opensearch-project? Or do we have the plan to move these forked packages to @opensearch-project?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

While we could, publishing them under the project name would create an expectation of ownership and support which we don't have the bandwidth for.

Copy link
Member

Choose a reason for hiding this comment

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

the only concern is it might not be scale to put on personal repo just for one fix. but it should be ok if we don't have other option.

@@ -190,7 +190,7 @@
"core-js": "^3.6.5",
"deep-freeze-strict": "^1.1.1",
"del": "^6.1.1",
"dns-sync": "^0.2.1",
"dns-sync": "npm:@amoo-miki/dns-sync@^0.2.1",
Copy link
Member

Choose a reason for hiding this comment

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

the only concern is it might not be scale to put on personal repo just for one fix. but it should be ok if we don't have other option.

@@ -0,0 +1,2 @@
security:
Copy link
Member

Choose a reason for hiding this comment

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

not related to this PR.
in 2.14 we proved we could generate release note without changelog file. the maintainers should consider deprecate the needs of this file and simplify the contribution process

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is the auto-generated one.

@ZilongX ZilongX self-requested a review August 23, 2024 15:55
@AMoo-Miki
Copy link
Collaborator Author

the only concern is it might not be scale to put on personal repo just for one fix. but it should be ok if we don't have other option.

There are many [abandoned] packages that use my patched releases :)

@AMoo-Miki AMoo-Miki merged commit dcd170a into opensearch-project:main Aug 23, 2024
66 of 69 checks passed
@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-Dashboards/backport-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-1.3
# Create a new branch
git switch --create backport/backport-7811-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dcd170aa7d6ee0d09bbd0f8d397a93e5a73d8f67
# Push it to GitHub
git push --set-upstream origin backport/backport-7811-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-1.3

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

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-7811-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dcd170aa7d6ee0d09bbd0f8d397a93e5a73d8f67
# Push it to GitHub
git push --set-upstream origin backport/backport-7811-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-7811-to-2.x.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 10, 2024
* [CVE-2017-16100] Use a patched version of `dns-sync`

Signed-off-by: Miki <miki@amazon.com>

* Changeset file for PR #7811 created/updated

---------

Signed-off-by: Miki <miki@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: ZilongX <99905560+ZilongX@users.noreply.github.com>
(cherry picked from commit dcd170a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@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-Dashboards/backport-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-1.3
# Create a new branch
git switch --create backport/backport-7811-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dcd170aa7d6ee0d09bbd0f8d397a93e5a73d8f67
# Push it to GitHub
git push --set-upstream origin backport/backport-7811-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-1.3

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

@AMoo-Miki
Copy link
Collaborator Author

Manually backported to 1.3.

AMoo-Miki pushed a commit that referenced this pull request Sep 11, 2024
* [CVE-2017-16100] Use a patched version of `dns-sync`



* Changeset file for PR #7811 created/updated

---------




(cherry picked from commit dcd170a)

Signed-off-by: Miki <miki@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>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: ZilongX <99905560+ZilongX@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 11, 2024
* [CVE-2017-16100] Use a patched version of `dns-sync`

* Changeset file for PR #7811 created/updated

---------

(cherry picked from commit dcd170a)

Signed-off-by: Miki <miki@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>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: ZilongX <99905560+ZilongX@users.noreply.github.com>
(cherry picked from commit a8fca1c)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ashwin-pc pushed a commit that referenced this pull request Sep 13, 2024
…8145)

* [CVE-2017-16100] Use a patched version of `dns-sync`

* Changeset file for PR #7811 created/updated

---------

(cherry picked from commit dcd170a)






(cherry picked from commit a8fca1c)

Signed-off-by: Miki <miki@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>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: ZilongX <99905560+ZilongX@users.noreply.github.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.

4 participants