A couple more CSP enhancements #6809
Open
Conversation
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
| @@ -94,7 +94,7 @@ public HtmlOutputView(ParamReplacement param, String label) | |||
| protected String renderInternalAsString(File file) throws Exception | |||
| { | |||
| if (exists(file)) | |||
| return PageFlowUtil.getFileContentsAsString(file); | |||
| return PageFlowUtil.addScriptNonces(PageFlowUtil.getFileContentsAsString(file)); | |||
There was a problem hiding this comment.
This seems fine. I'm curious about all the R caching scenarios, but I think this happens "late".
labkey-matthewb
approved these changes
Jun 30, 2025
| */ | ||
| public static String addScriptNonces(String html) | ||
| { | ||
| Document doc = JSoupUtil.convertHtmlToDocument(StringUtils.trimToEmpty(html), false, new LinkedList<>()); |
There was a problem hiding this comment.
Of course this will do various transformations to the code if it is not well-formed. I guess I'm alright with that.
labkey-matthewb
approved these changes
Jun 30, 2025
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.
Rationale
Two enhancements to address strict CSP limitations:
object-src: 'none' ;directive, providing allowed hosts. https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=53226<script>tags. https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=53211Related Pull Requests
Tasks