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

TLSActor: apply check to avoid an endless loop (#443)

Browse source 
* TLSActor: apply check to avoid an endless loop

* add constant
This commit is contained in:
PJ Fanning 2023-06-21 17:51:26 +01:00 • committed by GitHub
parent 279d65a7fa
commit 966204814e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
stream/src/main/scala/org/apache/pekko/stream/impl/io/TLSActor.scala
View file

@ -71,6 +71,8 @@ import pekko.util.ByteString
import TLSActor._
private val maxTLSIterations = 1000
private var unwrapPutBackCounter: Int = 0
protected val outputBunch = new OutputBunch(outputCount = 2, self, this)
outputBunch.markAllOutputs()
@ -364,6 +366,7 @@ import pekko.util.ByteString
def flushToUser(): Unit = {
if (tracing) log.debug("flushToUser")
if (unwrapPutBackCounter > 0) unwrapPutBackCounter = 0
userOutBuffer.flip()
if (userOutBuffer.hasRemaining) {
val bs = ByteString(userOutBuffer)
@ -419,6 +422,17 @@ import pekko.util.ByteString
result.getHandshakeStatus match {
case NEED_WRAP =>
flushToUser()
// https://github.com/apache/incubator-pekko/issues/442
// A second workaround for an infinite loop we have not been able to reproduce/isolate,
// if you see this, and can reproduce consistently, please report back to the Apache Pekko team
// with a reproducer or details about the client causing it
unwrapPutBackCounter += 1
if (unwrapPutBackCounter > maxTLSIterations) {
throw new IllegalStateException(
s"Stuck in unwrap loop, bailing out, last handshake status [$lastHandshakeStatus], " +
s"remaining=${transportInBuffer.remaining}, out=${userOutBuffer.position()}, " +
"(https://github.com/apache/incubator-pekko/issues/442)")
}
transportInChoppingBlock.putBack(transportInBuffer)
case FINISHED =>
flushToUser()