mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Handle files larger than Integer.MAX_VALUE bytes in bootJar and bootWar
Fixes gh-24618
This commit is contained in:
parent
f02951fb17
commit
997505005b
@ -32,6 +32,7 @@ import java.util.Set;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.zip.CRC32;
|
||||
import java.util.zip.ZipEntry;
|
||||
|
||||
import org.apache.commons.compress.archivers.zip.UnixStat;
|
||||
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
|
||||
@ -53,7 +54,6 @@ import org.springframework.boot.loader.tools.JarModeLibrary;
|
||||
import org.springframework.boot.loader.tools.Layer;
|
||||
import org.springframework.boot.loader.tools.LayersIndex;
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.util.FileCopyUtils;
|
||||
import org.springframework.util.StreamUtils;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
@ -376,12 +376,7 @@ class BootZipCopyAction implements CopyAction {
|
||||
}
|
||||
|
||||
private void prepareStoredEntry(InputStream input, ZipArchiveEntry archiveEntry) throws IOException {
|
||||
archiveEntry.setMethod(java.util.zip.ZipEntry.STORED);
|
||||
Crc32OutputStream crcStream = new Crc32OutputStream();
|
||||
int size = FileCopyUtils.copy(input, crcStream);
|
||||
archiveEntry.setSize(size);
|
||||
archiveEntry.setCompressedSize(size);
|
||||
archiveEntry.setCrc(crcStream.getCrc());
|
||||
new CrcAndSize(input).setUpStoredEntry(archiveEntry);
|
||||
}
|
||||
|
||||
private Long getTime() {
|
||||
@ -464,29 +459,39 @@ class BootZipCopyAction implements CopyAction {
|
||||
}
|
||||
|
||||
/**
|
||||
* An {@code OutputStream} that provides a CRC-32 of the data that is written to it.
|
||||
* Data holder for CRC and Size.
|
||||
*/
|
||||
private static final class Crc32OutputStream extends OutputStream {
|
||||
private static class CrcAndSize {
|
||||
|
||||
private static final int BUFFER_SIZE = 32 * 1024;
|
||||
|
||||
private final CRC32 crc = new CRC32();
|
||||
|
||||
@Override
|
||||
public void write(int b) throws IOException {
|
||||
this.crc.update(b);
|
||||
private long size;
|
||||
|
||||
CrcAndSize(InputStream inputStream) throws IOException {
|
||||
try {
|
||||
load(inputStream);
|
||||
}
|
||||
finally {
|
||||
inputStream.close();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(byte[] b) throws IOException {
|
||||
this.crc.update(b);
|
||||
private void load(InputStream inputStream) throws IOException {
|
||||
byte[] buffer = new byte[BUFFER_SIZE];
|
||||
int bytesRead;
|
||||
while ((bytesRead = inputStream.read(buffer)) != -1) {
|
||||
this.crc.update(buffer, 0, bytesRead);
|
||||
this.size += bytesRead;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(byte[] b, int off, int len) throws IOException {
|
||||
this.crc.update(b, off, len);
|
||||
}
|
||||
|
||||
private long getCrc() {
|
||||
return this.crc.getValue();
|
||||
void setUpStoredEntry(ZipArchiveEntry entry) {
|
||||
entry.setSize(this.size);
|
||||
entry.setCompressedSize(this.size);
|
||||
entry.setCrc(this.crc.getValue());
|
||||
entry.setMethod(ZipEntry.STORED);
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user