Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix TLS socket read stall immediately after handshake #2469

Merged
merged 1 commit into from
Jul 8, 2021
Merged

Fix TLS socket read stall immediately after handshake #2469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions io/src/main/scala/fs2/io/tls/TLSEngine.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,13 @@ private[tls] object TLSEngine {

private def read0(maxBytes: Int, timeout: Option[FiniteDuration]): F[Option[Chunk[Byte]]] =
// Check if the initial handshake has finished -- if so, read; otherwise, handshake and then read
dequeueUnwrap(maxBytes).flatMap { out =>
unwrapThenTakeUnwrapped(maxBytes, timeout).flatMap { out =>
if (out.isEmpty)
initialHandshakeDone.ifM(
read1(maxBytes, timeout),
write(Chunk.empty, None) >> dequeueUnwrap(maxBytes).flatMap { out =>
if (out.isEmpty) read1(maxBytes, timeout) else Applicative[F].pure(out)
write(Chunk.empty, None) >> unwrapThenTakeUnwrapped(maxBytes, timeout).flatMap {
out =>
if (out.isEmpty) read1(maxBytes, timeout) else Applicative[F].pure(out)
}
)
else Applicative[F].pure(out)
Expand Down Expand Up @@ -161,7 +162,7 @@ private[tls] object TLSEngine {
case SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING =>
unwrapBuffer.inputRemains
.map(_ > 0 && result.bytesConsumed > 0)
.ifM(unwrap(maxBytes, timeout), dequeueUnwrap(maxBytes))
.ifM(unwrap(maxBytes, timeout), takeUnwrapped(maxBytes))
case SSLEngineResult.HandshakeStatus.FINISHED =>
unwrap(maxBytes, timeout)
case _ =>
Expand All @@ -172,17 +173,23 @@ private[tls] object TLSEngine {
)
}
case SSLEngineResult.Status.BUFFER_UNDERFLOW =>
dequeueUnwrap(maxBytes)
takeUnwrapped(maxBytes)
case SSLEngineResult.Status.BUFFER_OVERFLOW =>
unwrapBuffer.expandOutput >> unwrap(maxBytes, timeout)
case SSLEngineResult.Status.CLOSED =>
stopWrap >> stopUnwrap >> dequeueUnwrap(maxBytes)
stopWrap >> stopUnwrap >> takeUnwrapped(maxBytes)
}
}

private def dequeueUnwrap(maxBytes: Int): F[Option[Chunk[Byte]]] =
private def takeUnwrapped(maxBytes: Int): F[Option[Chunk[Byte]]] =
unwrapBuffer.output(maxBytes).map(out => if (out.isEmpty) None else Some(out))

private def unwrapThenTakeUnwrapped(
maxBytes: Int,
timeout: Option[FiniteDuration]
): F[Option[Chunk[Byte]]] =
unwrapBuffer.inputRemains.map(_ > 0).ifM(unwrap(maxBytes, timeout), takeUnwrapped(maxBytes))

/** Determines what to do next given the result of a handshake operation.
* Must be called with `handshakeSem`.
*/
Expand Down