Skip to content

Make CSP error logging validation more robust #2868

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 4, 2026
Merged

Make CSP error logging validation more robust #2868

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6a05c4
Make CSP error logging validation more robust
labkey-jeckels Feb 3, 2026
d921022
Better approach to avoid log de-duplication
labkey-jeckels Feb 4, 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
21 changes: 14 additions & 7 deletions src/org/labkey/test/tests/wiki/WikiCspTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
@BaseWebDriverTest.ClassTimeout(minutes = 2)
public class WikiCspTest extends BaseWebDriverTest
{
private static final String PROJECT_NAME = TRICKY_CHARACTERS_FOR_PROJECT_NAMES + "WikiCspTest";
// Add something unique to make sure log de-duping doesn't suppress the logging. Otherwise, running the test multiple
// times against the same server won't actually log the CSP error after the first hit
private static final String PROJECT_NAME = TRICKY_CHARACTERS_FOR_PROJECT_NAMES + "WikiCspTest" + System.currentTimeMillis();
Comment thread
labkey-jeckels marked this conversation as resolved.
Outdated
private static final String WIKI_PAGE_TITLE = "TOC_with_inline";
private static final String WIKI_PAGE_BODY =
// Issue 52483: HTML substitution patterns can throw errors during wiki validation
Expand Down Expand Up @@ -76,13 +78,18 @@ public void testCspChecks()

waitForText("Click me");

try
waitFor(() ->
{
CspLogUtil.checkNewCspWarnings(getArtifactCollector());
}
catch (CspLogUtil.CspWarningDetectedException ignore) {}

goToAdminConsole().goToSettingsSection();
try
{
CspLogUtil.checkNewCspWarnings(getArtifactCollector());
return false;
}
catch (CspLogUtil.CspWarningDetectedException ignore)
{
return true;
}
}, "Should have triggered a CSP error", WAIT_FOR_PAGE);

SiteValidationPage validationPage = goToAdminConsole().clickSiteValidation();
validationPage.setAllValidators(false);
Expand Down