Skip to content

Only send HTML to browser-type clients #7423

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
labkey-jeckels merged 2 commits into from
Feb 16, 2026
Merged

Only send HTML to browser-type clients #7423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
249d6f7
Only send HTML to browser-type clients
labkey-jeckels Feb 16, 2026
fce765c
Comments and consistency
labkey-jeckels Feb 16, 2026
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
4 changes: 3 additions & 1 deletion api/src/org/labkey/api/action/ExtFormResponseWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.labkey.api.query.PropertyValidationError;
import org.labkey.api.query.ValidationError;
import org.labkey.api.query.ValidationException;
import org.labkey.api.util.HttpUtil;
import org.labkey.api.util.MimeMap;
import org.springframework.validation.Errors;
import org.springframework.validation.FieldError;
Expand Down Expand Up @@ -70,7 +71,8 @@ public class ExtFormResponseWriter extends ApiJsonWriter
public ExtFormResponseWriter(HttpServletRequest request, HttpServletResponse response) throws IOException
{
boolean sendHtml = !"XMLHttpRequest".equals(request.getHeader("X-Requested-With")) &&
request instanceof MultipartHttpServletRequest;
request instanceof MultipartHttpServletRequest &&
HttpUtil.isBrowser(request);
super(response, sendHtml ? MimeMap.MimeType.HTML.getContentType() : CONTENT_TYPE_JSON);
setErrorResponseStatus(HttpServletResponse.SC_OK);
}
Expand Down
6 changes: 6 additions & 0 deletions api/src/org/labkey/api/util/XmlBeansUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,13 @@ public static void addComment(XmlTokenSource doc, String comment)
SAX_PARSER_FACTORY.setNamespaceAware(true);
SAX_PARSER_FACTORY.setFeature("http://xml.org/sax/features/validation", false);
SAX_PARSER_FACTORY.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);

// Disable features that could lead to XXE or other vulnerabilities
// Keep in sync with ModuleArchive.nameFromModuleXML()
SAX_PARSER_FACTORY.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
SAX_PARSER_FACTORY.setFeature("http://xml.org/sax/features/external-general-entities", false);
SAX_PARSER_FACTORY.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
SAX_PARSER_FACTORY.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);

DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
DOCUMENT_BUILDER_FACTORY.setNamespaceAware(true);
Expand Down