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

NMS-15699: Prevent external xml entity loading #6355

Merged
merged 1 commit into from
Jul 17, 2023

Conversation

fooker
Copy link
Member

@fooker fooker commented Jul 13, 2023

All Contributors

Contribution Checklist

  • Please make an issue in the OpenNMS issue tracker if there isn't one already.
    Once there is an issue, please:
    1. update the title of this PR to be in the format: ${JIRA-ISSUE-NUMBER}: subject of pull request
    2. update the Jira link at the bottom of this comment to refer to the real issue number
    3. prefix your commit messages with the issue number, if possible
    4. once you've created this PR, please link to it in a comment in the Jira issue
      Don't worry if this sounds like a lot, we can help you get things set up properly.
  • If this code is likely to affect the UI, did you name your branch with -smoke in it to trigger smoke tests?
  • If this is a new or updated feature, is there documentation for the new behavior?
  • If this is new code, are there unit and/or integration tests?
  • If this PR targets a foundation-* branch, does it try to avoid changing files in $OPENNMS_HOME/etc/?

What's Next?

A PR should be assigned at least 2 reviewers. If you know that someone would be a good person to review your code, feel free to add them.

If you need help making additions or changes to the documentation related to your changes, please let us know.

In any case, if anything is unclear or you want help getting your PR ready for merge, please don't hesitate to say something in the comments here,
or in the #opennms-development chat channel.

Once reviewer(s) accept the PR and the branch passes continuous integration, the PR is eligible for merge.

At that time, if you have commit access (are an OpenNMS Group employee or a member of the OGP) you are welcome to merge the PR when you're ready.
Otherwise, a reviewer can merge it for you.

Thanks for taking time to contribute!

External References

christianpape
christianpape previously approved these changes Jul 13, 2023
Copy link
Contributor

@christianpape christianpape left a comment

Choose a reason for hiding this comment

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

LGTM.

Copy link
Contributor

@RangerRick RangerRick left a comment

Choose a reason for hiding this comment

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

another that should go back to foundation-2023 or earlier if possible

@fooker fooker marked this pull request as ready for review July 13, 2023 15:45
@fooker
Copy link
Member Author

fooker commented Jul 13, 2023

another that should go back to foundation-2023 or earlier if possible

This was just introduced in 2023

@fooker fooker changed the base branch from develop to foundation-2023 July 13, 2023 15:53
Copy link
Contributor

@RangerRick RangerRick left a comment

Choose a reason for hiding this comment

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

assuming this passes, looks good

Copy link
Contributor

@christianpape christianpape left a comment

Choose a reason for hiding this comment

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

LGTM.

@fooker fooker merged commit 5a3b0b6 into foundation-2023 Jul 17, 2023
5 checks passed
@fooker fooker deleted the jira/NMS-15699-smoke branch July 17, 2023 07:44
@qunhe
Copy link

qunhe commented Aug 1, 2023

@RangerRick @christianpape Do we have a rough idea when this fix will be released? Since the defect was reported by external researchers, they are approaching for a timeframe of the release. Thanks!

@RangerRick
Copy link
Contributor

RangerRick commented Aug 1, 2023

Do we have a rough idea when this fix will be released? Since the defect was reported by external researchers, they are approaching for a timeframe of the release. Thanks!

@qunhe it's merged, so it'll be in the normal monthly (2nd Wednesday of the month) release schedule, which means it should go out with the August 9th Meridian 2023 and Horizon 32 builds.

(In general, if you see something has been merged, barring complications you can expect it will apply to the branch it was merged to and up, on the next 2nd Wednesday.)

@known-samy
Copy link

Readme need to update

Copy link

@known-samy known-samy left a comment

Choose a reason for hiding this comment

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

Upgrade

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants