Merge 26.2 to develop

Author: labkey-teamcity

src/org/labkey/test/tests/wiki/WikiCspTest.java

@@ -13,6 +13,7 @@
 import org.labkey.test.util.CspLogUtil;
 import org.labkey.test.util.TextSearcher;
 import org.labkey.test.util.WikiHelper;
+import org.labkey.test.util.core.admin.CspConfigHelper;
 
 import java.util.Arrays;
 import java.util.List;
@@ -21,7 +22,7 @@
 @BaseWebDriverTest.ClassTimeout(minutes = 2)
 public class WikiCspTest extends BaseWebDriverTest
 {
-    private static final String PROJECT_NAME = TRICKY_CHARACTERS_FOR_PROJECT_NAMES + "WikiCspTest";
+    private static final String PROJECT_NAME = TRICKY_CHARACTERS_FOR_PROJECT_NAMES;
     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
@@ -53,6 +54,17 @@ private void doSetup()
         _containerHelper.createProject(PROJECT_NAME, null);
         _containerHelper.enableModules(Arrays.asList("Wiki"));
         goToProjectHome();
+        CspConfigHelper.debugCspWarnings();  // Ensure that CSP violation logs aren't suppressed by de-duping efforts
+    }
+
+    @Override
+    protected void doCleanup(boolean afterTest)
+    {
+        super.doCleanup(afterTest);
+        if (afterTest)
+        {
+            CspConfigHelper.infoCspWarnings();
+        }
     }
 
     @Override
@@ -76,13 +88,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);

src/org/labkey/test/util/AuditLogHelper.java

@@ -293,6 +293,17 @@ public Map<String, Object> getTransactionAuditLogDetails(Integer transactionAudi
         return new JSONObject(detailJSON).toMap();
     }
 
+    public static String getExpectedAuditDataChange(String field, Object oldValue, Object newValue)
+    {
+        String dataChangeString = field + ": ";
+        if (oldValue != null)
+            dataChangeString += oldValue;
+        if (newValue != null)
+            dataChangeString +=  " > " + newValue;
+        return dataChangeString;
+    }
+
+
     public void checkLastTransactionAuditLogDetails(String containerPath, Map<TransactionDetail, Object> expectedDetails)
     {
         Integer transactionAuditId = getLastTransactionId(containerPath);

src/org/labkey/test/util/core/admin/CspConfigHelper.java

@@ -75,6 +75,11 @@ public static void debugCspWarnings()
         Log4jUtils.setLogLevel("org.labkey.core.admin.AdminController.ContentSecurityPolicyReportAction", ManagerPage.LoggingLevel.DEBUG);
     }
 
+    public static void infoCspWarnings()
+    {
+        Log4jUtils.setLogLevel("org.labkey.core.admin.AdminController.ContentSecurityPolicyReportAction", ManagerPage.LoggingLevel.INFO);
+    }
+
     public static class AllowedHost
     {
         private final Directive _directive;