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.

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

Add content compression support to StyxServer object #595

Merged
merged 3 commits into from
Jan 24, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ object StyxHttpServer {
val SCHEMA = `object`(
field("port", integer()),
field("handler", string()),
optional("compressResponses", bool()),
optional("tlsSettings", `object`(
optional("sslProvider", string()),
optional("certificateFile", string()),
Expand Down Expand Up @@ -79,6 +80,7 @@ private data class StyxHttpServerTlsSettings(
private data class StyxHttpServerConfiguration(
val port: Int,
val handler: String,
val compressResponses: Boolean,
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe this defaults to false?

val tlsSettings: StyxHttpServerTlsSettings?,

val maxInitialLength: Int = 4096,
Expand All @@ -101,6 +103,7 @@ internal class StyxHttpServerFactory : StyxServerFactory {

val environment = context.environment()
val proxyServerConfig = ProxyServerConfig.Builder()
.setCompressResponses(config.compressResponses)
.setMaxInitialLength(config.maxInitialLength)
.setMaxHeaderSize(config.maxHeaderSize)
.setMaxChunkSize(config.maxChunkSize)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ import io.kotlintest.specs.FeatureSpec
import reactor.core.publisher.Flux
import reactor.core.publisher.toFlux
import reactor.core.publisher.toMono
import java.nio.charset.Charset
import java.nio.charset.StandardCharsets.UTF_8
import java.util.zip.GZIPInputStream

class StyxHttpServerTest : FeatureSpec({
feature("HTTP request handling") {
Expand Down Expand Up @@ -109,6 +111,46 @@ class StyxHttpServerTest : FeatureSpec({
}
}

feature("Response compression") {

val serverConfig = configBlock("""
port: 0
handler: aHandler
compressResponses: true
""".trimIndent())

val server = StyxHttpServerFactory().create("test-01", routingContext, serverConfig, db)
val guavaServer = toGuavaService(server)
guavaServer.startAsync().awaitRunning()

scenario("Responses are compressed if accept-encoding is set to gzip") {
StyxHttpClient.Builder().build().send(get("/blah")
.header(HOST, "localhost:${server.inetAddress().port}")
.header("accept-encoding", "7z, gzip")
.build())
.wait()!!
.let {
it.status() shouldBe OK
it.header("content-encoding").get() shouldBe "gzip"
ungzip(it.body(), UTF_8) shouldBe "Hello, test!"
}
}

scenario("Does not compress response if accept-encoding not sent") {
StyxHttpClient.Builder().build().send(get("/blah")
.header(HOST, "localhost:${server.inetAddress().port}")
.build())
.wait()!!
.let {
it.status() shouldBe OK
it.header("content-encoding").isPresent shouldBe false
it.bodyAs(UTF_8) shouldBe "Hello, test!"
}
}

guavaServer.stopAsync().awaitTerminated()
}

feature("Max initial line length") {
val serverConfig = configBlock("""
port: 0
Expand Down Expand Up @@ -302,12 +344,25 @@ private fun createConnection(port: Int) = NettyConnectionFactory.Builder()

private val response = HttpResponse.response(OK)
.header("source", "secure")
.header("content-type", "text/plain")
.body("Hello, test!", UTF_8)
.build()

private val compressedResponse = HttpResponse.response(OK)
Copy link
Contributor

Choose a reason for hiding this comment

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

Static import response.

.header("source", "secure")
.header("content-type", "text/plain")
.header("content-encoding", "gzip")
.body("Hello, test!", UTF_8) // Not actually compressed, just claims to be, which is all we want.
.build()

private val routingContext = RoutingObjectFactoryContext(
routeRefLookup = routeLookup {
ref("aHandler" to RoutingObject { _, _ -> Eventual.of(response.stream()) })
ref("aHandler" to RoutingObject { request, _ ->
when(request.url().toString()) {
"/compressed" -> Eventual.of(compressedResponse.stream())
else -> Eventual.of(response.stream())
}
})

ref("aggregator" to RoutingObject { request, _ ->
request
Expand All @@ -317,6 +372,8 @@ private val routingContext = RoutingObjectFactoryContext(
})
.get()

private fun ungzip(content: ByteArray, charset: Charset): String = GZIPInputStream(content.inputStream()).bufferedReader(charset).use { it.readText() }

private val db = StyxObjectStore<StyxObjectRecord<InetServer>>()

private val crtFile = fixturesHome(StyxHttpServerTest::class.java, "/ssl/testCredentials.crt").toString()
Expand Down