Skip to content

Compatibility with older versions of xerces sax parser #104

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

Merged
pitbulk merged 2 commits into from
Apr 14, 2017
Merged

Compatibility with older versions of xerces sax parser #104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b1362a
Older parsers (e.g. old version of xercesImpl.jar) can throw a Throwa…
shoe54 Apr 14, 2017
d3ae154
Merge branch 'fixing_compatibility_with_older_DocumentBuilderFactory'
shoe54 Apr 14, 2017
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
14 changes: 7 additions & 7 deletions core/src/main/java/com/onelogin/saml2/util/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,28 +302,28 @@ public static Document convertStringToDocument(String xmlStr) throws ParserConfi
try {
// do not include external general entities
docfactory.setAttribute("http://xml.org/sax/features/external-general-entities", Boolean.FALSE);
} catch (Exception e) {}
} catch (Throwable e) {}
try {
// do not include external parameter entities or the external DTD subset
docfactory.setAttribute("http://xml.org/sax/features/external-parameter-entities", Boolean.FALSE);
} catch (Exception e) {}
} catch (Throwable e) {}
try {
docfactory.setAttribute("http://apache.org/xml/features/disallow-doctype-decl", Boolean.TRUE);
} catch (Exception e) {}
} catch (Throwable e) {}
try {
docfactory.setAttribute("http://javax.xml.XMLConstants/feature/secure-processing", Boolean.TRUE);
} catch (Exception e) {}
} catch (Throwable e) {}
try {
// ignore the external DTD completely
docfactory.setAttribute("http://apache.org/xml/features/nonvalidating/load-external-dtd", Boolean.FALSE);
} catch (Exception e) {}
} catch (Throwable e) {}
try {
// build the grammar but do not use the default attributes and attribute types information it contains
docfactory.setAttribute("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", Boolean.FALSE);
} catch (Exception e) {}
} catch (Throwable e) {}
try {
docfactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
} catch (Exception e) {}
} catch (Throwable e) {}

DocumentBuilder builder = docfactory.newDocumentBuilder();
Document doc = builder.parse(new InputSource(new StringReader(xmlStr)));
Expand Down