-
Notifications
You must be signed in to change notification settings - Fork 63
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.
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
Provide a custom way to handle SSL exceptions #849
Open
arturaz
wants to merge
1
commit into
http4s:series/0.23
Choose a base branch
from
arturaz:series/0.23
base: series/0.23
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,10 +54,30 @@ private object SSLStage { | |
private case class SSLFailure(t: Throwable) extends SSLResult | ||
} | ||
|
||
final class SSLStage(engine: SSLEngine, maxWrite: Int = 1024 * 1024) | ||
extends MidStage[ByteBuffer, ByteBuffer] { | ||
/** Default values for the [[SSLStage]] constructors. | ||
* | ||
* A separate `object` because the [[SSLStage]] `object` is `private`. | ||
*/ | ||
object SSLStageDefaults { | ||
|
||
/** Default value for [[SSLStage.maxWrite]] */ | ||
final val MaxWrite = 1024 * 1024 | ||
} | ||
|
||
/** @param maxWrite | ||
* \@see [[SSLStageDefaults.MaxWrite]]. | ||
*/ | ||
Comment on lines
+67
to
+69
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It seems like missing scaladoc |
||
final class SSLStage( | ||
engine: SSLEngine, | ||
maxWrite: Int, | ||
sslHandshakeExceptionHandler: PartialFunction[Throwable, Unit] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If it's expected to handle |
||
) extends MidStage[ByteBuffer, ByteBuffer] { | ||
import SSLStage._ | ||
|
||
/** Constructor to keep backwards compatibility with old versions. */ | ||
def this(engine: SSLEngine, maxWrite: Int = SSLStageDefaults.MaxWrite) = | ||
this(engine, maxWrite, PartialFunction.empty) | ||
|
||
def name: String = "SSLStage" | ||
|
||
// We use a serial executor to ensure single threaded behavior. This makes | ||
|
@@ -248,13 +268,15 @@ final class SSLStage(engine: SSLEngine, maxWrite: Int = 1024 * 1024) | |
val start = System.nanoTime | ||
try sslHandshakeLoop(data, r) | ||
catch { | ||
case t: SSLException => | ||
logger.warn(t)("SSLException in SSL handshake") | ||
handshakeFailure(t) | ||
|
||
case NonFatal(t) => | ||
logger.error(t)("Error in SSL handshake") | ||
handshakeFailure(t) | ||
try | ||
if (sslHandshakeExceptionHandler.isDefinedAt(t)) sslHandshakeExceptionHandler(t) | ||
else | ||
t match { | ||
case t: SSLException => logger.warn(t)("SSLException in SSL handshake") | ||
case _ => logger.error(t)("Error in SSL handshake") | ||
} | ||
finally handshakeFailure(t) | ||
} | ||
logger.trace(s"${engine.##}: sslHandshake completed in ${System.nanoTime - start}ns") | ||
} | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't it be more beneficial to have a general error handler exposed to users and not only for SSL exceptions?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIUC, Ember exposes a general error handler? https://github.com/http4s/http4s/blob/series/0.23/ember-server/shared/src/main/scala/org/http4s/ember/server/EmberServerBuilder.scala#L46-L47
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For what it's worth, Ember's general error handler just came up in http4s/http4s#7399. This is more in the direction that Ember is going, but probably away from the direction I'd prefer to go.