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

Update Netty to latest version, 4.1.117.Final #3279

Merged
merged 3 commits into from
Jan 31, 2025
Merged

Update Netty to latest version, 4.1.117.Final #3279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c47b84c
Update Netty to latest version, `4.1.117.Final`
guizmaii Jan 19, 2025
eeceb6e
Improve tests
guizmaii Jan 26, 2025
647386a
Remove `@@ nonFlaky(20)` as we get connection timeouts
guizmaii Jan 26, 2025
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
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbt.*

object Dependencies {
val JwtCoreVersion = "10.0.1"
val NettyVersion = "4.1.116.Final"
val NettyVersion = "4.1.117.Final"
val NettyIncubatorVersion = "0.0.25.Final"
val ScalaCompactCollectionVersion = "2.12.0"
val ZioVersion = "2.1.11"
Expand Down
15 changes: 6 additions & 9 deletions zio-http/jvm/src/main/scala/zio/http/netty/model/Conversions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import scala.collection.AbstractIterator
import zio.http.Server.Config.CompressionOptions
import zio.http._

import com.aayushatharva.brotli4j.encoder.Encoder
import io.netty.handler.codec.compression.StandardCompressionOptions
import io.netty.handler.codec.compression.{BrotliMode, StandardCompressionOptions}
import io.netty.handler.codec.http._
import io.netty.handler.codec.http.websocketx.WebSocketScheme

Expand Down Expand Up @@ -150,15 +149,13 @@ private[netty] object Conversions {
case CompressionOptions.Deflate(cfg) =>
StandardCompressionOptions.deflate(cfg.level, cfg.bits, cfg.mem)
case CompressionOptions.Brotli(cfg) =>
StandardCompressionOptions.brotli(
new Encoder.Parameters().setQuality(cfg.quality).setWindow(cfg.lgwin).setMode(brotliModeToJava(cfg.mode)),
)
StandardCompressionOptions.brotli(cfg.quality, cfg.lgwin, brotliModeToJava(cfg.mode))
}

def brotliModeToJava(brotli: CompressionOptions.Mode): Encoder.Mode = brotli match {
case CompressionOptions.Mode.Font => Encoder.Mode.FONT
case CompressionOptions.Mode.Text => Encoder.Mode.TEXT
case CompressionOptions.Mode.Generic => Encoder.Mode.GENERIC
def brotliModeToJava(brotli: CompressionOptions.Mode): BrotliMode = brotli match {
case CompressionOptions.Mode.Font => BrotliMode.FONT
case CompressionOptions.Mode.Text => BrotliMode.TEXT
case CompressionOptions.Mode.Generic => BrotliMode.GENERIC
Comment on lines +155 to +158
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See netty/netty@01e14bc#diff-1a60d6878ee958e6a605be7eb9beb9e1ce4c101dc8f1bf69fa52702467d2cb94R44-R68

}

def versionToNetty(version: Version): HttpVersion = version match {
Expand Down
29 changes: 19 additions & 10 deletions zio-http/jvm/src/test/scala/zio/http/ClientHttpsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,29 @@ package zio.http

import zio._
import zio.test.Assertion._
import zio.test.TestAspect.{flaky, ignore, nonFlaky}
import zio.test.{TestAspect, assertZIO}
import zio.test.TestAspect.{ignore, nonFlaky}
import zio.test.{Spec, TestAspect, TestEnvironment, assertZIO}

import zio.http.netty.NettyConfig
import zio.http.netty.client.NettyClientDriver

abstract class ClientHttpsSpecBase extends ZIOHttpSpec {
val sslConfig: ClientSSLConfig

val zioDev =
private val zioDev =
URL.decode("https://zio.dev").toOption.get

val badRequest =
private val badRequest =
URL
.decode(
"https://httpbin.org/status/400",
)
.toOption
.get

val untrusted =
private val untrusted =
URL.decode("https://untrusted-root.badssl.com/").toOption.get

override def spec = suite("Https Client request")(
def tests(sslConfig: ClientSSLConfig) = suite("Client")(
test("respond Ok") {
val actual = Client.batched(Request.get(zioDev))
assertZIO(actual)(anything)
Expand Down Expand Up @@ -74,7 +73,7 @@ abstract class ClientHttpsSpecBase extends ZIOHttpSpec {
),
),
)
} @@ nonFlaky(20),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This nonFlaky was generating too many calls to https://untrusted-root.badssl.com/, which was leading to connect timeouts (probably some anti-ddos/ratelimiting mechanism there)

},
)
.provideShared(
ZLayer.succeed(ZClient.Config.default.ssl(sslConfig)),
Expand All @@ -91,17 +90,27 @@ abstract class ClientHttpsSpecBase extends ZIOHttpSpec {

object ClientHttpsSpec extends ClientHttpsSpecBase {

val sslConfig = ClientSSLConfig.FromTrustStoreResource(
private val sslConfig = ClientSSLConfig.FromTrustStoreResource(
trustStorePath = "truststore.jks",
trustStorePassword = "changeit",
)

override def spec: Spec[TestEnvironment & Scope, Throwable] =
suite("Https Client request - From Trust Store")(
tests(sslConfig),
)
}

object ClientHttpsFromJavaxNetSslSpec extends ClientHttpsSpecBase {

val sslConfig =
private val sslConfig =
ClientSSLConfig.FromJavaxNetSsl
.builderWithTrustManagerResource("trustStore.jks")
.trustManagerPassword("changeit")
.build()

override def spec: Spec[TestEnvironment & Scope, Throwable] =
suite("Https Client request - From Javax Net Ssl")(
tests(sslConfig),
)
}
Loading