fix #1695

MAIF · Aug 30, 2023 · 82fc26e · 82fc26e
1 parent b5e45d8
commit 82fc26e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/otoroshi/app/ssl/ssl.scala b/otoroshi/app/ssl/ssl.scala
@@ -2311,12 +2311,16 @@ class CustomSSLEngine(delegate: SSLEngine, appProto: Option[String]) extends SSL
   override def setHandshakeApplicationProtocolSelector(
       selector: BiFunction[SSLEngine, util.List[String], String]
   ): Unit = {
-    delegate.setHandshakeApplicationProtocolSelector(selector)
+    if (!lock) {
+      delegate.setHandshakeApplicationProtocolSelector(selector)
+    }
   }
 
   override def getHandshakeApplicationProtocolSelector: BiFunction[SSLEngine, util.List[String], String] =
     delegate.getHandshakeApplicationProtocolSelector
+
   override def getHandshakeApplicationProtocol: String                                                   = delegate.getHandshakeApplicationProtocol
+
   override def getApplicationProtocol: String                                                            = appProto match {
     case None           => delegate.getApplicationProtocol
     case Some(protocol) => protocol

diff --git a/otoroshi/build.sbt b/otoroshi/build.sbt
@@ -65,8 +65,8 @@ lazy val bouncyCastleVersion     = "1.70"
 lazy val pulsarVersion           = "2.8.1"
 lazy val openTelemetryVersion    = "1.28.0"
 lazy val jacksonVersion          = "2.13.4"
-lazy val akkaHttpVersion         = "10.2.15"
-lazy val akkaHttp2Version        = "10.2.10" // WHAT ???
+lazy val akkaHttpVersion         = "10.2.10"
+lazy val akkaHttp2Version        = "10.2.10"
 lazy val reactorNettyVersion     = "1.1.7"
 lazy val nettyVersion            = "4.1.93.Final"
 lazy val excludesJackson         = Seq(
@@ -78,6 +78,8 @@ lazy val excludeScalaJava8Compat = Seq(
   ExclusionRule(organization = "org.scala-lang.modules")
 )
 
+// BEWARE: akka-stream is a patched version bundled from the lib directory because of . see https://github.com/MAIF/akka/tree/fix-tls-1-3-hanshake-session-update
+
 libraryDependencies ++= Seq(
   ws,
   filters,

diff --git a/otoroshi/lib/akka-stream_2.12-2.6.21+5-a72bf6ba-SNAPSHOT.jar b/otoroshi/lib/akka-stream_2.12-2.6.21+5-a72bf6ba-SNAPSHOT.jar