MLE-30494: Support isolated HTTP and XDBC requests#608
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates how mlcp detects forwarded/isolated request context when deciding whether to enable host restriction (“HTTP compliant mode”), aiming to support both HTTP and XDBC request types while remaining compatible with older MarkLogic Server versions.
Changes:
- Centralizes forward-header detection XQuery into
ContentOutputFormat.HEADER_QUERYandXDBC_HEADER_QUERY, usingfn:function-lookupfor backward compatibility. - Updates
MarkLogicInputFormatto evaluate both HTTP and XDBC forward-header checks and enable host restriction if either is true.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/main/java/com/marklogic/mapreduce/MarkLogicInputFormat.java | Uses shared header-detection XQuery constants and combines HTTP/XDBC forward-header results to decide whether to restrict hosts. |
| src/main/java/com/marklogic/mapreduce/ContentOutputFormat.java | Implements backward-compatible XQuery snippets for detecting forwarded requests for both HTTP and XDBC contexts. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+131
to
+138
| "let $f := fn:function-lookup(xs:QName('xdmp:is-forwarded'),0)\n" + | ||
| "return if (exists($f)) then $f() " + | ||
| "else fn:exists(xdmp:get-request-header('x-forwarded-for'))"; | ||
| // For XDBC Server | ||
| public static final String XDBC_HEADER_QUERY = | ||
| "let $f := fn:function-lookup(xs:QName('xdmp:is-forwarded'),0)\n" + | ||
| "return if (exists($f)) then $f() " + | ||
| "else (" + |
Comment on lines
403
to
+407
| if (getForwardHeader) { | ||
| forwardHeaderExists = item.asString().equals("true"); | ||
| item = result.next(); | ||
| forwardHeaderExists |= item.asString().equals("true"); | ||
| item = result.next(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
xdmp:is-isolated