A couple more CSP enhancements

Author: labkey-adam

server/embedded/build.gradle

@@ -161,7 +161,7 @@ project.publishing {
             artifact project.tasks.bootJar.outputs.files.singleFile
             pom {
                 name = "LabKey Server Embedded"
-                description = "LabKey classes for producing distributions with embedded TomCat."
+                description = "Embedded Tomcat, Spring Boot, and the LabKey classes that configure these components"
                 developers PomFileHelper.getLabKeyTeamDevelopers()
                 licenses PomFileHelper.getApacheLicense()
                 organization PomFileHelper.getLabKeyOrganization()

server/embedded/src/org/labkey/embedded/LabKeyServer.java

@@ -45,7 +45,7 @@ public static void main(String[] args)
             return;
         }
 
-        // Issue 40038: Ride-or-die Mode - default to shutting down by default in embedded deployment scenario
+        // Issue 40038: Ride-or-die Mode - default to shutting down by default
         if (System.getProperty(TERMINATE_ON_STARTUP_FAILURE) == null)
         {
             System.setProperty(TERMINATE_ON_STARTUP_FAILURE, "true");
@@ -70,7 +70,7 @@ public static void main(String[] args)
         String baseCsp = """
                 default-src 'self' ;
                 connect-src 'self' ${CONNECTION.SOURCES} ;
-                object-src 'none' ;
+                object-src ${OBJECT.SOURCES} ;  /* Substitution value defaults to 'none' unless overridden by an admin */
                 style-src 'self' 'unsafe-inline' ${STYLE.SOURCES} ;
                 img-src 'self' data: ${IMAGE.SOURCES} ;
                 font-src 'self' data: ${FONT.SOURCES} ;
@@ -862,5 +862,4 @@ public void setKeyStore(String keyStore)
             this.keyStore = keyStore;
         }
     }
-
 }

server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java

@@ -275,7 +275,7 @@ private void addContextProperty(StandardContext context, String value, String na
         }
     }
 
-    // Issue 48565: allow for JSON-formatted access logs in embedded tomcat
+    // Issue 48565: allow for JSON-formatted access logs
     private void configureJsonAccessLogging(Tomcat tomcat, LabKeyServer.JsonAccessLog logConfig)
     {
         var v = new JsonAccessLogValve();