Merge pull request #1392 from reportportal/sax-parser-fix

EPMRPP-62610 || Sax parser fix
reportportal · Jun 2, 2021 · a73e0df · a73e0df
2 parents d5152d8 + 974a2b2
commit a73e0df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ sudo: true
 
 before_install:
   - sudo apt-get install -y fonts-noto
-script: ./gradlew buildDocker --full-stacktrace --no-build-cache
+script: ./gradlew build --full-stacktrace --no-build-cache
 
 env:
   global:

diff --git a/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitParseJob.java b/src/main/java/com/epam/ta/reportportal/core/imprt/impl/junit/XunitParseJob.java
@@ -52,13 +52,18 @@ public ParseResults call() {
 			// Xerces 1 - http://xerces.apache.org/xerces-j/features.html#external-general-entities
 			// Xerces 2 - http://xerces.apache.org/xerces2-j/features.html#external-general-entities
 
+			// Xerces 2 only - http://xerces.apache.org/xerces-j/features.html#external-general-entities
+			spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
 			// Using the SAXParserFactory's setFeature
 			spf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+			spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+			spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+			spf.setXIncludeAware(false);
 			// Using the XMLReader's setFeature
+			reader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+			reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
 			reader.setFeature("http://xml.org/sax/features/external-general-entities", false);
-
-			// Xerces 2 only - http://xerces.apache.org/xerces-j/features.html#external-general-entities
-			spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+			reader.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
 
 			saxParser.parse(xmlInputStream, handler);
 		} catch (SAXException | IOException | ParserConfigurationException e) {