raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Ignore length field value when provided computeFrameSize (#27884) (#27938)

Browse source 
* Add test for computed frame sizes from negative length field values
* Skip check for length field value < 0 when using computeFrameSize
This commit is contained in:
Eric Cartner 2019-10-09 06:40:34 -05:00 • committed by Johan Andrén
parent c0d8df94e4
commit ca8995be68
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
akka-stream-tests/src/test/scala/akka/stream/scaladsl/FramingSpec.scala
View file

@ -380,6 +380,22 @@ class FramingSpec extends StreamSpec {
ex.getMessage should ===("Decoded frame header reported negative size -4")
}
"ignore length field value when provided computeFrameSize (#27884)" in {
implicit val bo = java.nio.ByteOrder.LITTLE_ENDIAN
def computeFrameSize(@unused arr: Array[Byte], @unused l: Int): Int = 8
val bs = ByteString.newBuilder.putInt(0xFF010203).putInt(0x04050607).result
val res =
Source
.single(bs)
.via(Flow[ByteString].via(Framing.lengthField(4, 0, 1000, bo, computeFrameSize)))
.runWith(Sink.seq)
res.futureValue should equal(Seq(bs))
}
"fail the stage on computeFrameSize values less than minimum chunk size" in {
implicit val bo = java.nio.ByteOrder.LITTLE_ENDIAN

2
akka-stream/src/main/scala/akka/stream/scaladsl/Framing.scala
View file

@ -421,7 +421,7 @@ object Framing {
if (frameSize > maximumFrameLength) {
failStage(new FramingException(
s"Maximum allowed frame size is $maximumFrameLength but decoded frame header reported size $frameSize"))
} else if (parsedLength < 0) {
} else if (computeFrameSize.isEmpty && parsedLength < 0) {
failStage(new FramingException(s"Decoded frame header reported negative size $parsedLength"))
} else if (frameSize < minimumChunkSize) {
failStage(