Skip to content

Use centrally configured SchemaFactory #1264

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
labkey-jeckels wants to merge 1 commit into
base: release26.7-SNAPSHOT
Choose a base branch
from
+3 −4
Open

Use centrally configured SchemaFactory #1264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions src/org/labkey/targetedms/parser/skyaudit/SkylineAuditLogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.labkey.targetedms.parser.XmlUtil;
import org.xml.sax.SAXException;

import javax.xml.XMLConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.stream.StreamSource;
Expand Down Expand Up @@ -114,10 +113,10 @@ private void validateXml() throws IOException, SAXException, AuditLogParsingExce
try (InputStream schemaStream = new BufferedInputStream(openSchemaInputStream());
InputStream auditLogStream = new BufferedInputStream(new FileInputStream(_file)))
{
//prepare validator
SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
//prepare validator, hardened against XXE (CWE-611) since the audit log is attacker-supplied
SchemaFactory schemaFactory = XmlBeansUtil.schemaFactory();
Schema schema = schemaFactory.newSchema(new StreamSource(schemaStream));
Validator validator = schema.newValidator();
Validator validator = XmlBeansUtil.hardenValidator(schema.newValidator());
validator.validate(new StreamSource(auditLogStream));
}
}
Expand Down
Loading