Skip to content

Commit 09bd616

Browse files
Update labkeyVersion to 25.3.14
2 parents 0d37624 + 7710b9b commit 09bd616

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ buildFromSource=true
4444

4545
# The default version for LabKey artifacts that are built or that we depend on.
4646
# override in an individual module's gradle.properties file as necessary
47-
labkeyVersion=25.3.13
47+
labkeyVersion=25.3.14
4848
labkeyClientApiVersion=6.2.0
4949

5050
# Version numbers for the various binary artifacts that are included when
@@ -60,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0
6060
artifactoryPluginVersion=5.2.5
6161
gradleNodePluginVersion=7.1.0
6262
gradlePluginsVersion=6.1.0
63-
owaspDependencyCheckPluginVersion=12.1.0
63+
owaspDependencyCheckPluginVersion=12.1.3
6464
versioningPluginVersion=1.1.2
6565

6666
# Versions of node and npm to use during the build. If set, these versions
@@ -99,7 +99,7 @@ apacheDirectoryVersion=2.1.7
9999
apacheMinaVersion=2.2.4
100100

101101
# Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
102-
apacheTomcatVersion=10.1.41
102+
apacheTomcatVersion=10.1.42
103103

104104
# (mothership) -> json-path -> json-smart -> accessor-smart
105105
# (core) -> graalvm
@@ -290,7 +290,7 @@ slf4jLog4jApiVersion=2.0.16
290290
snappyJavaVersion=1.1.10.7
291291

292292
# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
293-
springBootVersion=3.4.5
293+
springBootVersion=3.5.3
294294
# This usually matches the Spring Framework version dictated by springBootVersion
295295
springVersion=6.2.8
296296

server/configs/application.properties

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ context.encryptionKey=@@encryptionKey@@
4646

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

5152
## Using a legacy context path provides backwards compatibility with old deployments. A typical use case would be to
@@ -65,6 +66,14 @@ context.encryptionKey=@@encryptionKey@@
6566
#context.bypass2FA=true
6667
#context.workDirLocation=/path/to/desired/workDir
6768

69+
## Tomcat v10.1.42 lowered the default for part count from 1000 to 10. Our default is now 500.
70+
## Tomcat also lowered the header size default from 10Kb to 512, which is also our default.
71+
## We lower max connections from default 8192 to 250, providing ample concurrent requests for LabKey Server scenarios.
72+
## These settings can be overridden if needed, but reasonable limits reduce your server's vulnerability to DoS attacks.
73+
server.tomcat.max-part-count=500
74+
server.tomcat.max-part-header-size=512
75+
server.tomcat.max-connections=250
76+
6877
## SMTP configuration
6978
mail.smtpHost=@@smtpHost@@
7079
mail.smtpPort=@@smtpPort@@

server/configs/webapps/embedded/config/application.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ mail.smtpUser=Anonymous
103103
#context.bypass2FA=true
104104
#context.workDirLocation=@@/path/to/desired/workDir@@
105105

106+
## Tomcat v10.1.42 lowered the default for part count from 1000 to 10. Our default is now 500.
107+
## Tomcat also lowered the header size default from 10Kb to 512, which is also our default.
108+
## We lower max connections from default 8192 to 250, providing ample concurrent requests for LabKey Server scenarios.
109+
## These settings can be overridden if needed, but reasonable limits reduce your server's vulnerability to DoS attacks.
110+
server.tomcat.max-part-count=500
111+
server.tomcat.max-part-header-size=512
112+
server.tomcat.max-connections=250
113+
106114
## Other webapps to be deployed, most commonly to deliver a set of static files. The context path to deploy into is the
107115
## property name after the "context.additionalWebapps." prefix, and the value is the location of the webapp on disk
108116
#context.additionalWebapps.firstContextPath=@@/my/webapp/path@@

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static void main(String[] args)
9393
base-uri 'self' ;
9494
frame-ancestors 'self' ;
9595
frame-src 'self' ${FRAME.SOURCES} ;
96-
report-uri /admin-contentSecurityPolicyReport.api?cspVersion=r11&${CSP.REPORT.PARAMS}
96+
report-uri ${context.contextPath:}/admin-contentSecurityPolicyReport.api?cspVersion=r11&${CSP.REPORT.PARAMS}
9797
"""
9898
));
9999
application.setBannerMode(Banner.Mode.OFF);

0 commit comments

Comments
 (0)