mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge pull request #29675 from mhalbritter
* gh-29675: Ignore invalid stream types when reading log update events Closes gh-29675
This commit is contained in:
commit
430d510a33
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -22,6 +22,8 @@ import java.nio.charset.StandardCharsets;
|
|||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import org.springframework.util.StreamUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An update event used to provide log updates.
|
* An update event used to provide log updates.
|
||||||
*
|
*
|
||||||
@ -80,6 +82,16 @@ public class LogUpdateEvent extends UpdateEvent {
|
|||||||
consumer.accept(event);
|
consumer.accept(event);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (IllegalStateException ex) {
|
||||||
|
// Parsing has failed, abort further parsing
|
||||||
|
LogUpdateEvent abortedEvent = new LogUpdateEvent(StreamType.STD_ERR,
|
||||||
|
ex.getMessage().getBytes(StandardCharsets.UTF_8));
|
||||||
|
consumer.accept(abortedEvent);
|
||||||
|
|
||||||
|
// At this point, the inputStream is burned, consume it fully to prevent
|
||||||
|
// further processing
|
||||||
|
StreamUtils.drain(inputStream);
|
||||||
|
}
|
||||||
finally {
|
finally {
|
||||||
inputStream.close();
|
inputStream.close();
|
||||||
}
|
}
|
||||||
@ -90,12 +102,21 @@ public class LogUpdateEvent extends UpdateEvent {
|
|||||||
if (header == null) {
|
if (header == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
StreamType streamType = StreamType.values()[header[0]];
|
|
||||||
|
// First byte denotes stream type. 0 = stdin, 1 = stdout, 2 = stderr
|
||||||
|
byte streamTypeId = header[0];
|
||||||
|
if (streamTypeId < 0 || streamTypeId >= StreamType.values().length) {
|
||||||
|
throw new IllegalStateException("Stream type is out of bounds. Must be >= 0 and < "
|
||||||
|
+ StreamType.values().length + ", but was " + streamTypeId + ". Will abort parsing.");
|
||||||
|
}
|
||||||
|
|
||||||
long size = 0;
|
long size = 0;
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
size = (size << 8) + (header[i + 4] & 0xff);
|
size = (size << 8) + (header[i + 4] & 0xff);
|
||||||
}
|
}
|
||||||
byte[] payload = read(inputStream, size);
|
byte[] payload = read(inputStream, size);
|
||||||
|
|
||||||
|
StreamType streamType = StreamType.values()[streamTypeId];
|
||||||
return new LogUpdateEvent(streamType, payload);
|
return new LogUpdateEvent(streamType, payload);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -53,6 +53,14 @@ class LogUpdateEventTests {
|
|||||||
assertThat(events.get(2).toString()).isEqualTo(" OpenJDK JRE 11.0.5: Reusing cached layer");
|
assertThat(events.get(2).toString()).isEqualTo(" OpenJDK JRE 11.0.5: Reusing cached layer");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void readSucceedsWhenStreamTypeIsInvalid() throws IOException {
|
||||||
|
List<LogUpdateEvent> events = readAll("log-update-event-invalid-stream-type.stream");
|
||||||
|
assertThat(events).hasSize(1);
|
||||||
|
assertThat(events.get(0).toString())
|
||||||
|
.isEqualTo("Stream type is out of bounds. Must be >= 0 and < 3, but was 3. Will abort parsing.");
|
||||||
|
}
|
||||||
|
|
||||||
private List<LogUpdateEvent> readAll(String name) throws IOException {
|
private List<LogUpdateEvent> readAll(String name) throws IOException {
|
||||||
List<LogUpdateEvent> events = new ArrayList<>();
|
List<LogUpdateEvent> events = new ArrayList<>();
|
||||||
try (InputStream inputStream = getClass().getResourceAsStream(name)) {
|
try (InputStream inputStream = getClass().getResourceAsStream(name)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user