Skip to content

ESB-1157 Fix XEE in PageModel #949

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

Open
MEM2677 wants to merge 2 commits into
base: 5.1.1-dev
Choose a base branch
from
Open

ESB-1157 Fix XEE in PageModel #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59dc196
set release to 5.1.0
pietrangelo Apr 4, 2019
f69dfa7
ESB-1157 Fix XEE in PageModelDOM
MEM2677 Jul 9, 2026
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ It provides the basic structure, tools, and functionality to build an instance o
2. **admin-console**, includes tools to manage administrative core features and WCMS functionality
3. **portal-ui**, provides tools to create interactive web apps UI/UX

The Entando platform **v5.1.0-SNAPSHOT** project includes also the following Github projects:
The Entando platform **v5.1.0** project includes also the following Github projects:

* **entando-components**: https://github.com/entando/entando-components. Entando platform relies on a number of components or extensions that add functionality not included with the standard Entando platform. There are two types of components: Plugins and Bundles. Plugins extend the functionality of Entando engine, admin-console and portal-ui; Bundles extend the functionality of UI/UX Applications.

Expand Down
8 changes: 4 additions & 4 deletions admin-console/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<artifactId>entando-core</artifactId>
<groupId>org.entando.entando</groupId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
</parent>
<groupId>org.entando.entando</groupId>
<artifactId>entando-admin-console</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
<packaging>war</packaging>
<name>Entando Core: Administration Console</name>
<description>Entando Administration Console: an agile, modern and user-centric open source Portal platform.</description>
Expand Down Expand Up @@ -233,12 +233,12 @@
<dependency>
<groupId>org.entando.entando</groupId>
<artifactId>entando-engine</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
</dependency>
<dependency>
<groupId>org.entando.entando</groupId>
<artifactId>entando-engine</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<artifactId>entando-core</artifactId>
<groupId>org.entando.entando</groupId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
</parent>
<groupId>org.entando.entando</groupId>
<artifactId>entando-engine</artifactId>
<packaging>jar</packaging>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
<name>Entando Core: Engine</name>
<description>Entando Engine: an agile, modern and user-centric open source Portal platform.</description>
<url>http://www.entando.com/</url>
Expand Down
4 changes: 4 additions & 0 deletions engine/src/main/java/com/agiletec/aps/system/services/pagemodel/PageModelDOM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ private Element buildSketchXML(Frame frame) {
private void decodeDOM(String xmlText) throws ApsSystemException {
SAXBuilder builder = new SAXBuilder();
builder.setValidation(false);
builder.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
builder.setFeature("http://xml.org/sax/features/external-general-entities", false);
builder.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
builder.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
StringReader reader = new StringReader(xmlText);
try {
_doc = builder.build(reader);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.entando.entando</groupId>
<artifactId>entando-core</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
<packaging>pom</packaging>
<name>Entando Core</name>
<description>Entando Core: an agile, modern and user-centric open source Portal platform.</description>
Expand Down
14 changes: 7 additions & 7 deletions portal-ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<artifactId>entando-core</artifactId>
<groupId>org.entando.entando</groupId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
</parent>
<groupId>org.entando.entando</groupId>
<artifactId>entando-portal-ui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
<packaging>war</packaging>
<name>Entando Core: Portal UI</name>
<description>Entando Portal UI: an agile, modern and user-centric open source Portal platform.</description>
Expand Down Expand Up @@ -232,12 +232,12 @@
<dependency>
<groupId>org.entando.entando</groupId>
<artifactId>entando-engine</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
</dependency>
<dependency>
<groupId>org.entando.entando</groupId>
<artifactId>entando-engine</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand All @@ -247,18 +247,18 @@
<dependency>
<groupId>org.entando.entando</groupId>
<artifactId>entando-admin-console</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
</dependency>
<dependency>
<groupId>org.entando.entando</groupId>
<artifactId>entando-admin-console</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.entando.entando</groupId>
<artifactId>entando-admin-console</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down