Skip to content

Commit 98a5725

Browse files
LEDfanLEDfan
committed
Merge branch 'release/1.2.3'
2 parents b3bdf4e + dafce69 commit 98a5725

287 files changed

Lines changed: 323 additions & 293 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
<groupId>eu.openanalytics</groupId>
77
<artifactId>containerproxy</artifactId>
8-
<version>1.2.2</version>
8+
<version>1.2.3</version>
99
<name>ContainerProxy</name>
1010
<packaging>jar</packaging>
1111
<inceptionYear>2016</inceptionYear>
1212

1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>3.4.11</version>
16+
<version>3.4.13</version>
1717
<relativePath/>
1818
</parent>
1919

@@ -23,7 +23,7 @@
2323
<maven.compiler.source>21</maven.compiler.source>
2424
<maven.compiler.target>21</maven.compiler.target>
2525
<!-- Dependency versions -->
26-
<spring-boot.version>3.4.11</spring-boot.version>
26+
<spring-boot.version>3.4.13</spring-boot.version>
2727
<aws-java-sdk.version>2.31.21</aws-java-sdk.version>
2828
<commons-collections4.version>4.4</commons-collections4.version>
2929
<commons-io.version>2.19.0</commons-io.version>
@@ -430,6 +430,28 @@
430430
<groupId>jakarta.mail</groupId>
431431
<artifactId>jakarta.mail-api</artifactId>
432432
</dependency>
433+
434+
<!-- Transitive dependencies updated for security -->
435+
<dependency>
436+
<groupId>io.undertow</groupId>
437+
<artifactId>undertow-core</artifactId>
438+
<version>2.3.21.Final</version>
439+
</dependency>
440+
<dependency>
441+
<groupId>io.undertow</groupId>
442+
<artifactId>undertow-servlet</artifactId>
443+
<version>2.3.21.Final</version>
444+
</dependency>
445+
<dependency>
446+
<groupId>io.undertow</groupId>
447+
<artifactId>undertow-websockets-jsr</artifactId>
448+
<version>2.3.21.Final</version>
449+
</dependency>
450+
<dependency>
451+
<groupId>org.apache.logging.log4j</groupId>
452+
<artifactId>log4j-api</artifactId>
453+
<version>2.25.3</version>
454+
</dependency>
433455
</dependencies>
434456

435457
<dependencyManagement>

‎src/main/java/eu/openanalytics/containerproxy/ContainerFailedToStartException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ContainerProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

‎src/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ContainerProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*
@@ -30,6 +30,7 @@
3030
import eu.openanalytics.containerproxy.util.LoggingConfigurer;
3131
import eu.openanalytics.containerproxy.util.ProxyMappingManager;
3232
import io.undertow.Handlers;
33+
import io.undertow.UndertowOptions;
3334
import io.undertow.server.handlers.SameSiteCookieHandler;
3435
import io.undertow.servlet.api.ServletSessionConfig;
3536
import io.undertow.servlet.api.SessionManagerFactory;
@@ -338,6 +339,12 @@ public UndertowServletWebServerFactory servletContainer() {
338339
throw new IllegalArgumentException("Invalid bind address specified", e);
339340
}
340341
factory.setPort(Integer.parseInt(environment.getProperty("proxy.port", "8080")));
342+
factory.addBuilderCustomizers(builder -> {
343+
// allow uploads of unlimited size
344+
builder.setServerOption(UndertowOptions.MAX_ENTITY_SIZE, -1L);
345+
// limit parsing of multipart requests to 2MB (see #36099), multipart requests are not used in ShinyProxy
346+
builder.setServerOption(UndertowOptions.MULTIPART_MAX_ENTITY_SIZE, 2097152L);
347+
});
341348
return factory;
342349
}
343350

‎src/main/java/eu/openanalytics/containerproxy/ContainerProxyException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ContainerProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

‎src/main/java/eu/openanalytics/containerproxy/MemoryStoreConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ContainerProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

‎src/main/java/eu/openanalytics/containerproxy/ProxyFailedToStartException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ContainerProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

‎src/main/java/eu/openanalytics/containerproxy/ProxyStartValidationException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ContainerProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

‎src/main/java/eu/openanalytics/containerproxy/RedisSessionConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ContainerProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

‎src/main/java/eu/openanalytics/containerproxy/RedisStoreConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ContainerProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

‎src/main/java/eu/openanalytics/containerproxy/api/ApiSecurityService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* ContainerProxy
33
*
4-
* Copyright (C) 2016-2025 Open Analytics
4+
* Copyright (C) 2016-2026 Open Analytics
55
*
66
* ===========================================================================
77
*

0 commit comments

Comments
 (0)