From 724545df7fdb6e5842bec5354046b96a2157f2cc Mon Sep 17 00:00:00 2001
From: labkey-tchad <tchad@labkey.com>
Date: Mon, 3 Aug 2026 11:50:03 -0700
Subject: [PATCH] Enable CSP enforcement between tests

---
 src/org/labkey/test/TestScrubber.java      | 10 ++++++++++
 src/org/labkey/test/tests/CrawlerTest.java |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/org/labkey/test/TestScrubber.java b/src/org/labkey/test/TestScrubber.java
index b7abbfcb88..e3efd60a97 100644
--- a/src/org/labkey/test/TestScrubber.java
+++ b/src/org/labkey/test/TestScrubber.java
@@ -28,6 +28,7 @@
 import org.labkey.test.util.LogMethod;
 import org.labkey.test.util.PipelineToolsHelper;
 import org.labkey.test.util.TestLogger;
+import org.labkey.test.util.core.admin.CspConfigHelper;
 import org.labkey.test.util.core.login.DbLoginUtils;
 import org.labkey.test.util.login.AuthenticationAPIUtils;
 import org.openqa.selenium.WebDriverException;
@@ -171,6 +172,15 @@ public void cleanSiteSettings()
             TestLogger.error("Failed to disable pipeline triggers after test", e);
         }
 
+        try
+        {
+            new CspConfigHelper(this::createDefaultConnection).setEnforceCsp(true);
+        }
+        catch (NullPointerException e)
+        {
+            TestLogger.error("Failed to enable CSP enforcement after test", e);
+        }
+
     }
 
     @LogMethod(quiet = true)
diff --git a/src/org/labkey/test/tests/CrawlerTest.java b/src/org/labkey/test/tests/CrawlerTest.java
index 3ee8d37ec9..e45f32752b 100644
--- a/src/org/labkey/test/tests/CrawlerTest.java
+++ b/src/org/labkey/test/tests/CrawlerTest.java
@@ -59,6 +59,7 @@ protected void doCleanup(boolean afterTest)
     {
         super.doCleanup(afterTest);
         _userHelper.deleteUsers(afterTest, USER);
+        _cspConfigHelper.setEnforceCsp(true);
     }
 
     @BeforeClass