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

chore(security) #28388 : XML External Entity (XXE) Injection in JDOM #29006

Merged
merged 6 commits into from
Jun 26, 2024

Conversation

jcastro-dotcms
Copy link
Contributor

@jcastro-dotcms jcastro-dotcms commented Jun 25, 2024

Proposed Changes

  • Removes the use of the JDOM library altogether.
  • The classes using the JDOM library living under the dotCMS/src/main/java/org/apache/velocity/anakia/ and dotcms-integration/src/test/java/com/ettrema/ packages were removed altogether as well.
  • As per Steve Bolton's suggestion, we're now using the JAXB library to handle XML data representing Portlets in dotCMS. This includes both the Portlets defined in the /WEB-INF/portlet.xml and /WEB-INF/portlet-ext.xml files, and the database.
  • Additional Javadoc and code refactoring was done.
  • The dotcms-postman/src/main/resources/postman/PortletResource.json Postman suite was refactored to use JWT, organized into folders, and reviewed t make sure that the REST Endpoint is tested as much as possible.

This PR fixes: #28388

@jcastro-dotcms jcastro-dotcms linked an issue Jun 25, 2024 that may be closed by this pull request
@jcastro-dotcms jcastro-dotcms added this pull request to the merge queue Jun 25, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 26, 2024
@jcastro-dotcms jcastro-dotcms added this pull request to the merge queue Jun 26, 2024
Merged via the queue into master with commit 7f3a48f Jun 26, 2024
26 checks passed
@jcastro-dotcms jcastro-dotcms deleted the issue-28388-XXE-Injection-in-JDOM branch June 26, 2024 15:54
oidacra pushed a commit that referenced this pull request Jun 26, 2024
…29006)

### Proposed Changes
* Removes the use of the JDOM library altogether.
* The classes using the JDOM library living under the
`dotCMS/src/main/java/org/apache/velocity/anakia/` and
`dotcms-integration/src/test/java/com/ettrema/` packages were removed
altogether as well.
* As per Steve Bolton's suggestion, we're now using the JAXB library to
handle XML data representing Portlets in dotCMS. This includes both the
Portlets defined in the `/WEB-INF/portlet.xml` and
`/WEB-INF/portlet-ext.xml` files, and the database.
* Additional Javadoc and code refactoring was done.
* The `dotcms-postman/src/main/resources/postman/PortletResource.json`
Postman suite was refactored to use JWT, organized into folders, and
reviewed t make sure that the REST Endpoint is tested as much as
possible.
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.

[EPIC]: Review security-related PRs created by Dependabot
3 participants