Don't NPE on ServerChannel.getRemoteAddress

erikvanzijst · Sep 3, 2021 · 21374c1 · 21374c1
1 parent b52c4ad
commit 21374c1
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/main/scala/io/github/erikvanzijst/scalatlsproxy/TlsProxyHandler.scala b/src/main/scala/io/github/erikvanzijst/scalatlsproxy/TlsProxyHandler.scala
@@ -45,13 +45,11 @@ class TlsProxyHandler(selector: Selector, clientChannel: SocketChannel, config:
 
  private var phase = Destination
 
- def getServerAddress: String = Option(serverChannel)
- .filter(_.isOpen)
- .map(_.getRemoteAddress.toString)
- .orElse(Option(destination)
- .map(d => d._1 + ":" + d._2)
- .orElse(Some("unconnected")) )
- .get
+ def getServerAddress: String =
+ Try(serverChannel.getRemoteAddress.toString)
+ .recover { case _ => destination._1 + ":" + destination._2 }
+ .recover { case _ => "unconnected" }
+ .get
 
  private def readClient(): Unit = {
  if (clientKey.isValid && clientKey.isReadable && clientChannel.read(clientBuffer) == -1)