Skip to content

A couple more CSP enhancements #1112

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

Open
wants to merge 3 commits into
base: release25.7-SNAPSHOT
Choose a base branch
from
Open

A couple more CSP enhancements #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ac31a5
A couple more CSP enhancements
labkey-adam Jun 30, 2025
35520d5
Merge remote-tracking branch 'origin/develop' into fb_csp_issues
labkey-adam Jul 1, 2025
e26d7b1
Comment dropped in merge from 25.3
labkey-adam Jul 1, 2025
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
1 change: 1 addition & 0 deletions server/configs/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ context.encryptionKey=@@encryptionKey@@

## By default, we serve LabKey at the root context path (e.g. http://localhost:8080)
## You may customize the context path if you wish (e.g. http://localhost:8080/labkey)
## The context path value must start with a slash
#context.contextPath=@@contextPath@@

## Using a legacy context path provides backwards compatibility with old deployments. A typical use case would be to
Expand Down
2 changes: 1 addition & 1 deletion server/embedded/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 2 additions & 3 deletions server/embedded/src/org/labkey/embedded/LabKeyServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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");
Expand All @@ -71,7 +71,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} ;
Expand Down Expand Up @@ -871,5 +871,4 @@ public void setKeyStore(String keyStore)
this.keyStore = keyStore;
}
}

}
2 changes: 1 addition & 1 deletion server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down