Fix SQLi + XXE CVEs (CVE-2026-82583, -78224, -82578) with regression tests - #441
jonbartels wants to merge 3 commits into
Conversation
f263cd7 to
5b8b1bd
Compare
|
@abhinavagarwal07 - OpenIntegrationEngine is a fork of Mirth Connect. OIE is often affected by the same historical security risks as OIE. We learned about your security findings at https://abhinavagarwal07.github.io/posts/nextgen-mirth-connect-sqli-xxe/ Would you be willing to evaluate our fixes against your findings please? |
There was a problem hiding this comment.
🟡 Changes recommended
XML namespace behavior regresses, and the SQL injection test can falsely pass on MariaDB.
Get a fresh assessment by requesting another Copilot review.
Pull request overview
Hardens JDBC metadata, XSLT, and XML batch processing against SQL injection and XXE vulnerabilities, with regression coverage.
Changes:
- Adds allowlist validation for JDBC
selectLimit. - Secures XSLT and XML batch parsing.
- Adds unit/smoke tests and CI database configuration.
File summaries
| File | Description |
|---|---|
smoketest/.../base-vm-noop.xml |
Adds security-test channel fixture. |
smoketest/.../XsltStepXxeTest.java |
Tests XSLT XXE rejection. |
smoketest/.../XmlBatchXxeTest.java |
Tests XML batch entity rejection. |
smoketest/.../SecurityChannels.java |
Builds security-test channels. |
smoketest/.../OieServer.java |
Adds security-test server helpers. |
smoketest/.../DatabaseConnectorSqlInjectionTest.java |
Tests JDBC SQL injection blocking. |
smoketest/build.gradle |
Adds test compile dependencies. |
server/.../XsltStepSecurityTest.java |
Verifies generated XSLT hardening. |
server/.../XsltStep.java |
Secures generated transformer factories. |
server/.../XMLBatchAdaptor.java |
Uses hardened XML parsing. |
server/.../DatabaseConnectorServlet.java |
Validates selectLimit. |
ci/run-configuration.sh |
Supplies database test parameters. |
ci/harness.compose.yml |
Forwards harness JVM options. |
Review details
- Files reviewed: 13/13 changed files
- Comments generated: 2
- Review effort level: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
|
@jonbartels Sure. I will review it. |
mgaffigan
left a comment
There was a problem hiding this comment.
I'm not sure about the database connector. XML and XsltStep look legitimate. The tests need to be substantially simplified:
- The SQL test should be a unit test - does not need a live server to confirm that it validates
- The Xxe repros should be fixture tests. See https://github.com/OpenIntegrationEngine/engine/blob/main/ci/README.md#add-a-fixture-test or https://github.com/OpenIntegrationEngine/engine/tree/main/ci/tests/110-hl7-no-op/channels/01-hl7-no-op
abhinavagarwal07
left a comment
There was a problem hiding this comment.
Reviewed at 42db3da5 — notes inline.
The XXE fixes look right for the default JDK factory, and the batch fix covers Element_Name and Level as well as XPath_Query, which is broader than what was reported.
Three things I wanted to check: the selectLimit allowlist is populated from an API-writable source, the XSLT hardening is dropped silently on Saxon 9.x, and the batch parser is no longer namespace-aware. Measurements are in the inline comments — all run standalone on JDK 21, none against a live OIE server.
| addSelectLimits(allowedSelectLimits, DriverInfo.getDefaultDrivers()); | ||
|
|
||
| try { | ||
| addSelectLimits(allowedSelectLimits, configurationController.getDatabaseDrivers()); |
There was a problem hiding this comment.
The allowlist is populated from configuration the same caller can write.
PUT /api/server/databaseDrivers takes a caller-supplied selectLimit. It's annotated DATABASE_DRIVERS_EDIT, but stock DefaultAuthorizationController.isUserAuthorized() returns true unconditionally (:40-45) and is the only implementation in the tree. The value lands in the config property getDatabaseDrivers() reads first, ahead of dbdrivers.xml and the defaults (DefaultConfigurationController.java:753, :685).
So: PUT the payload as a driver's selectLimit, replay it here, reach executeQuery at :178.
Am I reading the stock authorization path right? If so, deriving selectLimit server-side from driver would avoid depending on it.
| * disable the check (fail closed). | ||
| */ | ||
| private void validateSelectLimit(String selectLimit) { | ||
| if (StringUtils.isBlank(selectLimit)) { |
There was a problem hiding this comment.
isBlank here and isEmpty at :160 differ. A whitespace-only selectLimit skips validation and then takes the query branch, trimming to "" and erroring into the fallback, so nothing executes. Is the difference deliberate?
| // are not resolved. setAttribute is guarded because some implementations (e.g. Saxon) reject | ||
| // these attributes; secure processing alone still applies. Mirrors XmlProcessor.configureSecureTF. | ||
| script.append("tFactory.setFeature(Packages.javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);\n"); | ||
| script.append("try { tFactory.setAttribute(Packages.javax.xml.XMLConstants.ACCESS_EXTERNAL_DTD, ''); } catch (e) {}\n"); |
There was a problem hiding this comment.
These catch blocks drop the restrictions with no signal when a factory rejects them. Emitted sequence on JDK 21:
| Saxon | FEATURE_SECURE_PROCESSING |
ACCESS_EXTERNAL_* |
source-document XXE |
|---|---|---|---|
| 9.5.1-5, 9.7.0-21, 9.9.1-8 | accepted | both throw IllegalArgumentException |
file read succeeds |
| 10.9, 11.6, 12.5 | accepted | accepted | blocked |
Secure processing succeeding on 9.x means nothing indicates the other two failed — it covers extension functions, not external document access.
useCustomFactory is supported and both tests set it false. In scope here? Failing closed when either attribute can't be set would cover it.
| // letting XPath.evaluate(InputSource) build its own DOCTYPE-resolving parser (XXE, | ||
| // CVE-2026-82578). getSecureDocumentBuilderFactory() already sets disallow-doctype-decl; | ||
| // the extra features below block external entities/DTDs and entity expansion outright. | ||
| DocumentBuilderFactory dbf = DocumentSerializer.getSecureDocumentBuilderFactory(); |
There was a problem hiding this comment.
DocumentBuilderFactory defaults namespaceAware to false; the previous XPath.evaluate(InputSource, ...) path parsed namespace-aware. On JDK 21:
//*[local-name()='message' and namespace-uri()='urn:test']— 1 match before, 0 after<batch xmlns="urn:test">splits to<message>hello</message>- prefixed input splits to
<p:message>hi</p:message>with noxmlns:p
Element_Name and Level serialize the same way, so it isn't limited to XPath_Query. dbf.setNamespaceAware(true) restored all three. Was this checked against the old path?
| dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); | ||
| dbf.setXIncludeAware(false); | ||
| dbf.setExpandEntityReferences(false); | ||
| Document document = dbf.newDocumentBuilder().parse(new InputSource(bufferedReader)); |
There was a problem hiding this comment.
Separately: disallow-doctype-decl rejects every DOCTYPE, including internal-only DTDs that previously parsed. Worth a release note?
| @Test | ||
| void selectLimitDoesNotExecuteArbitrarySql() throws Exception { | ||
| Db db = Db.fromSystemProperties(); | ||
| assumeTrue(db != null, "oie.db.* coordinates not provided; skipping (embedded-database configuration)"); |
There was a problem hiding this comment.
This skips whenever oie.db.* is unset — the embedded-Derby configurations. That's the default deployment and the one the reported impact used (SYSCS_EXPORT_QUERY writing the channel table to an unauthenticated path). Deliberate?
| long messageId = server.submitMessage(channelId, payload, new LinkedHashMap<>()); | ||
|
|
||
| Status sourceStatus = awaitSourceStatus(server, channelId, messageId); | ||
| assertEquals(Status.ERROR, sourceStatus, "XSLT step resolved an external entity instead of denying " |
There was a problem hiding this comment.
Status.ERROR is also reached on a deploy or template failure, so it doesn't separate "external access denied" from "threw for another reason". Would a benign control plus asserting the file contents are absent work?
| String channelId = server.deployChannel(channel, "xml-batch-xxe"); | ||
| try { | ||
| String payload = "<?xml version=\"1.0\"?>" | ||
| + "<!DOCTYPE batch [<!ENTITY x \"" + MARKER + "\">]>" |
There was a problem hiding this comment.
Internal entity, so this covers expansion rather than external resolution. It passes because disallow-doctype-decl blocks both; under external-general-entities=false alone it'd fail while the file-read path stayed closed. Worth an external canary case?
| + "<batch><message>&x;</message></batch>"; | ||
| try { | ||
| server.submitMessage(channelId, payload, new LinkedHashMap<>()); | ||
| } catch (Exception batchRejected) { |
There was a problem hiding this comment.
Same as the SQLi test — a failure before XMLBatchAdaptor runs is indistinguishable from the fix working.
|
|
||
| String script = step.getScript(false); | ||
|
|
||
| assertTrue("secure processing should be enabled on the transformer factory", |
There was a problem hiding this comment.
This asserts the constant names appear in the generated string, so it passes on the Saxon 9.x configuration noted in XsltStep.java. Would stubbing a factory that accepts FEATURE_SECURE_PROCESSING and rejects both attributes be a better fit?
tonygermano
left a comment
There was a problem hiding this comment.
As you rework this to address some of the other feedback, can you split it up into multiple commits? Probably one for any harness pre-work that needs to be done, and then 1 commit per CVE? It should be plainly obvious which changes are related to which fixes.
42db3da to
b767e4e
Compare
|
Thanks all — this was substantive feedback and it changed the shape of the PR. I force-pushed a rework: the branch is now three per-CVE commits ( SQL injection (CVE-2026-82583) — reworked, not just re-tested. @mgaffigan's question ("why is it a parameter?") and @abhinavagarwal07's point about the allowlist source are the same problem from two sides, and both are right. I verified it: So
XSLT step XXE (CVE-2026-78224). Now fails closed — the XML batch XXE (CVE-2026-82578). Kept the hardened-DBF parse and added Behavior-change note: The two XXE fixes themselves are essentially unchanged from what you all endorsed. CI is green across all seven configurations. Re-requesting review — thanks again. |
DatabaseConnectorServlet.getTables executed the caller-supplied selectLimit query parameter as SQL via Statement.executeQuery. selectLimit is only ever a driver-specific metadata-probe template (the metadata dialog sends the driver's own value), so it is now ignored and resolved server-side from the built-in DriverInfo list keyed by the JDBC driver class; anything unrecognised uses the safe DatabaseMetaData.getColumns() path. Resolving only from DriverInfo.getDefaultDrivers() -- never the API-writable configured driver list -- closes the injection regardless of the deployment's authorization model. resolveSelectLimit is static and covered by a unit test that needs no database or live server. The probe query also embeds the schema/table identifier. Those names come from database metadata but may themselves contain a double quote, which would break out of the quoting (a second-order injection); quoteSchemaTable now doubles any embedded quote per the SQL standard. The generic getColumns() paths are scoped to the connecting user's discovered schema so a same-named table in another schema cannot leak its columns. Trade-off: an admin-configured custom (non-built-in) driver no longer gets its optimized probe and falls back to the generic getColumns() path. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Jon Bartels <jonathan.bartels@gmail.com>
b767e4e to
55f3ac1
Compare
|
Pushed another rework after a cross-review (two independent AIs comparing this branch against BridgeLink's backport Adopted:
Rejected: BridgeLink catches and continues when a custom XSLT factory rejects the security attributes (fails open — reproducible external-file resolution on Xalan 2.7.2). This branch fails closed there; that's deliberate and I'm keeping it. The endpoint's missing permission/audit and unconstrained
|
XsltStep builds a TransformerFactory inside generated JavaScript, so it was missed
by the Java-side XML hardening elsewhere in the tree. The attacker-controlled source
XML is now protected by ACCESS_EXTERNAL_DTD = "", denying external DTDs/entities in
it -- this is what closes the CVE. These are not swallowed: a factory that rejects
the attribute fails the transform rather than running with external access silently
left open.
The stylesheet is channel-author content, so per the OWASP XXE cheat sheet ("restrict
rather than close" external references in your own stylesheets) ACCESS_EXTERNAL_STYLESHEET
is restricted to the "file" protocol rather than blocked: local xsl:import / xsl:include /
document() keep working, while http(s) SSRF is denied.
FEATURE_SECURE_PROCESSING is deliberately not enabled: on the JDK's built-in Xalan
it also disables Java XSLT extension functions, which would break existing stylesheets
that call Java.
Covered by a unit test on the generated script and a ci/tests fixture: an
external-entity message errors, a well-formed control transforms.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Signed-off-by: Jon Bartels <jonathan.bartels@gmail.com>
XMLBatchAdaptor evaluated XPath directly over an InputSource, letting the XPath engine build its own DOCTYPE-resolving parser. It now parses with DocumentSerializer.getSecureDocumentBuilderFactory() (disallow-doctype-decl, external entities/DTD off, no entity expansion) and evaluates against the parsed Document. namespaceAware is set true to preserve the prior XPath path's namespace-aware parsing (namespace-uri()/prefix-sensitive split queries). The hardened parse is factored into a static parseBatchSecurely helper and covered by a server unit test that asserts external- and internal-entity DOCTYPEs are rejected (a specific DOCTYPE oracle, not catch-all) and that a benign namespaced batch still parses and splits. A smoke test additionally deploys a batch-splitting channel and pairs the malicious batch with a benign control that must split, so the "marker not expanded" assertion cannot pass on an unrelated failure. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Jon Bartels <jonathan.bartels@gmail.com>
55f3ac1 to
a8157c7
Compare
|
Small XSLT adjustment after comparing against the Saga/BridgeLink backport: the previous revision set Rather than leave stylesheet access fully open (as the BridgeLink/Saga port does), I followed the OWASP XXE cheat sheet, which says to "restrict rather than close" external references in your own stylesheets via a protocol filter. So Still one commit per CVE; only the XSLT commit changed. |
gibson9583
left a comment
There was a problem hiding this comment.
The disclosed CVEs are addressed by the current code:
- CVE-2026-82583: caller-supplied and API-configured
selectLimitvalues no longer reachexecuteQuery; only immutable built-in templates are selected. - CVE-2026-78224: external DTD access and HTTP(S) stylesheet/document access are denied, and factories that reject the security attributes fail closed.
- CVE-2026-82578: every affected XML-batch mode parses through the hardened parser before XPath evaluation or child traversal, and all DOCTYPE declarations are rejected.
I found no bypass of those three reported attack paths.
I am requesting changes for one merge-blocking functional regression described inline: the JDBC generic metadata path discards catalog/schema identity and can combine columns from same-named tables. This behavior existed in the old fallback, but the PR newly routes custom drivers that previously had a configured metadata query into that path.
Please preserve the catalog/schema/table tuple through table and column discovery, and add an endpoint-level regression test covering a login that differs from the active schema with duplicate table names.
| rs = dbMetaData.getColumns(null, null, tableName, null); | ||
| // Scope to the discovered schema (may be null) so a same-named table in | ||
| // another schema does not leak its columns into the result. | ||
| rs = dbMetaData.getColumns(null, schema, tableName, null); |
There was a problem hiding this comment.
schema remains null whenever the login name does not match the active schema. In that case, both getTables(null, null, ...) and this getColumns(null, null, tableName, ...) search every visible schema/catalog. Because only TABLE_NAME is retained, columns from same-named tables are combined.
The ambiguous fallback existed previously, but this PR newly routes custom drivers into it by ignoring their configured metadata query. Please preserve each result row’s TABLE_CAT, TABLE_SCHEM, and TABLE_NAME and pass that exact tuple to getColumns(), or explicitly restrict discovery to the connection’s active catalog/schema.
Please add an endpoint-level regression test where the login differs from the active schema and duplicate table names exist.
| * doubled so the value is always a single quoted identifier. Package-private and static so it is | ||
| * unit-testable without a live database. | ||
| */ | ||
| static String quoteSchemaTable(String schema, String tableName) { |
There was a problem hiding this comment.
Nonblocking follow-up:
quoteSchemaTable() assumes every supported database uses SQL-standard double quotes for identifiers. MySQL/MariaDB use backticks by default unless ANSI_QUOTES is enabled, so their optimized probe can fail and enter the generic fallback.
This portability limitation predates the current PR and does not reopen CVE-2026-82583. A follow-up should use DatabaseMetaData.getIdentifierQuoteString() with delimiter-aware escaping, or remove the optimized SQL probe in favor of exact catalog/schema metadata lookup. Runtime MySQL/MariaDB coverage would also be valuable.
|
As you all know, I prefer to start the car after the battery is replaced, so I (and Claude) I wrote a test per CVE that runs the attack against a deployed channel and asserts the
"Blocked" there means the engine refused the attack for a reason it named, not that A stylesheet pulling in a lookup file with Chris reached the same conclusion by reading the code, so treat this as that result from a I did not test Chris's metadata regression: these tests exercise the attack paths, not Tony is right. There are two halves to that. Ran on JREs 17 and 21, Derby, linux/arm64. Not amd64, and not the other databases. The tests are throwaway: they assert the attacks work, so merging them would leave a suite |
pacmano1
left a comment
There was a problem hiding this comment.
Approve based on my last comment demonstrating running engine behavior before and after the fix.
Summary
Fixes three publicly-disclosed vulnerabilities (advisory) present in this tree (4.6.0 is below every upstream fix version). Each fix uses an idiom already established in this codebase; the branch is one commit per CVE (fix + its tests together).
DatabaseConnectorServletselectLimit; resolve the probe template server-side from the built-in driver list; escape identifiersXsltStepfileprotocol (fail-closed)XMLBatchAdaptorDocumentBuilderFactory, then evaluate XPathThe fixes
CVE-2026-82583 — SQL injection
DatabaseConnectorServlet.getTablesexecuted the caller-suppliedselectLimitquery parameter as SQL viaStatement.executeQuery.selectLimitis only ever a driver-specific metadata-probe template (the metadata dialog sends the driver's own value), so it is now ignored and resolved server-side from the built-inDriverInfolist keyed by the JDBC driver class; anything unrecognised uses the safeDatabaseMetaData.getColumns()path.Resolving only from
DriverInfo.getDefaultDrivers()— never the API-writable configured driver list — closes the injection regardless of the deployment's authorization model.resolveSelectLimitisstaticand unit-tested with no database or live server.The probe query also embeds the schema/table identifier. Those names come from database metadata but may themselves contain a
", which would break out of the quoting (a second-order injection);quoteSchemaTablenow doubles any embedded quote per the SQL standard. The genericgetColumns()paths are scoped to the connecting user's discovered schema so a same-named table in another schema cannot leak its columns.Deliberately out of scope (follow-ups): the endpoint's
@MirthOperationhas nopermissionandauditable = false, anddriver/urlare unconstrained. The same gap exists on every other connector test servlet (file/tcp/http/smtp/ws/jms) and is better handled as its own change.CVE-2026-78224 — XSLT step XXE
XsltStepbuilds aTransformerFactoryinside generated JavaScript, so it was never reached by the Java-side XML hardening elsewhere in the tree. The source XML is attacker-controlled, so the generated script setsACCESS_EXTERNAL_DTD=""on both the normal and iterator paths — denying external DTDs/entities in it, which is what closes the CVE. The stylesheet is channel-author content, so following the OWASP XXE cheat sheet ("restrict rather than close" external references in your own stylesheets),ACCESS_EXTERNAL_STYLESHEETis restricted to thefileprotocol rather than blocked: localxsl:import/xsl:include/document()keep working whilehttp(s)SSRF is denied. Neither is swallowed: a factory that rejects the attribute fails the transform rather than running with external access silently open.FEATURE_SECURE_PROCESSINGis deliberately not enabled: on the JDK's built-in Xalan it also disables Java XSLT extension functions, which would break existing stylesheets that call Java.Note: the stylesheet is loaded from a
StringReaderwith no base URI, so relativehrefs may not resolve regardless; thefilefilter mainly governs absolutefile:///…references.CVE-2026-82578 — XML batch adaptor XXE
XMLBatchAdaptorevaluated XPath directly over anInputSource, letting the XPath engine build its own DOCTYPE-resolving parser. It now parses withDocumentSerializer.getSecureDocumentBuilderFactory()(disallow-doctype-decl, external entities/DTD off, no entity expansion) and evaluates against the parsedDocument.namespaceAwareis set true to preserve the prior path's namespace-aware parsing (namespace-uri()/prefix-sensitive split queries). The hardened parse is factored into astatic parseBatchSecurelyhelper.Tests
DatabaseConnectorServletTest(server unit test) —resolveSelectLimitreturns the built-in template per driver and""for unknown/injected drivers (proof the caller value never reachesexecuteQuery);quoteSchemaTabledoubles embedded quotes (second-order-injection payload stays a single quoted identifier).XsltStepSecurityTest(server unit test) — the generated script denies external DTD access ('') and restricts stylesheet access to'file'on both paths, does not emitFEATURE_SECURE_PROCESSING, and is not wrapped in a swallowingcatch.ci/tests/200-xslt-step-xxe(fixture) — an external-entity message →ERROR; a well-formed control →TRANSFORMED.XMLBatchAdaptorSecurityTest(server unit test) — external- and internal-entity DOCTYPEs are rejected with a specific DOCTYPE oracle (not catch-all); a benign namespaced batch still parses and anamespace-uri()predicate matches.XmlBatchXxeTest(smoketest) — deploys a batch-splitting channel and pairs the malicious batch with a benign control that must split, so the "marker not expanded" assertion cannot pass on an unrelated failure.Behavior changes
disallow-doctype-declrejects all DOCTYPEs — batches with an internal-subset DTD that previously parsed now error.getColumns()path (correct, possibly slower), now scoped to the connecting user's schema when one is discovered; identifiers are escaped.fileprotocol (OWASP "restrict rather than close"), so localxsl:import/xsl:include/document()still work buthttp(s)stylesheet fetches are denied.FEATURE_SECURE_PROCESSINGis intentionally not enabled, so Java XSLT extension functions keep working.Verification
./gradlew :server:test—DatabaseConnectorServletTest,XsltStepSecurityTest,XMLBatchAdaptorSecurityTestpass; existingdatatypes.xml,DocumentSerializer, andjdbctests still pass.ci/runtests.sh alpine-temurin21-derby— the XSLT fixture (maliciousERROR/ benignTRANSFORMED) and the hardenedXmlBatchXxeTestrun in every configuration; nooie.db.*or--add-opensneeded.🤖 Generated with Claude Code