Upgrade to commons-fileupload2

This indirectly addresses a CVE in commons-io that does not affect
S3Proxy.
pull/751/head
Andrew Gaul 2024-12-26 20:02:07 -08:00
rodzic 62fd4b0017
commit a06ddeb92e
2 zmienionych plików z 8 dodań i 6 usunięć

Wyświetl plik

@ -465,9 +465,9 @@
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.5</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-javax</artifactId>
<version>2.0.0-M2</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>

Wyświetl plik

@ -82,7 +82,7 @@ import com.google.common.net.PercentEscaper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.fileupload.MultipartStream;
import org.apache.commons.fileupload2.core.MultipartInput;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.KeyNotFoundException;
import org.jclouds.blobstore.domain.Blob;
@ -2051,8 +2051,10 @@ public class S3ProxyHandler {
String signature = null;
String algorithm = null;
byte[] payload = null;
var multipartStream = new MultipartStream(is,
boundary.getBytes(StandardCharsets.UTF_8), 4096, null);
var multipartStream = MultipartInput.builder()
.setBoundary(boundary.getBytes(StandardCharsets.UTF_8))
.setInputStream(is)
.get();
boolean nextPart = multipartStream.skipPreamble();
while (nextPart) {
String header = multipartStream.readHeaders();