Skip to content

Commit ac78695

Browse files
ybelMekkybelMekk
authored
chore(build): netty-all with netty-codec-http (#723)
* chore(build): netty-all with netty-codec-http * fix deprecated * chore(build): kotlinter
1 parent fce7e50 commit ac78695

File tree

64 files changed

+928
-733
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+928
-733
lines changed

‎build.gradle.kts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import java.time.Duration
22
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
34

45
val assertjVersion = "3.26.3"
56
val kotlinLoggingVersion = "3.0.5"
@@ -61,7 +62,7 @@ dependencies {
6162
implementation("ch.qos.logback:logback-classic:$logbackVersion")
6263
api("com.squareup.okhttp3:mockwebserver:$mockWebServerVersion")
6364
api("com.nimbusds:oauth2-oidc-sdk:$nimbusSdkVersion")
64-
implementation("io.netty:netty-all:$nettyVersion")
65+
implementation("io.netty:netty-codec-http:$nettyVersion")
6566
implementation("io.github.microutils:kotlin-logging:$kotlinLoggingVersion")
6667
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
6768
implementation("org.freemarker:freemarker:$freemarkerVersion")
@@ -123,7 +124,7 @@ dependencies {
123124
}
124125

125126
configurations {
126-
all {
127+
all {
127128
resolutionStrategy.force("com.fasterxml.woodstox:woodstox-core:7.0.0")
128129
}
129130
}
@@ -289,8 +290,8 @@ tasks {
289290
}
290291

291292
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
292-
kotlinOptions {
293-
jvmTarget = JavaVersion.VERSION_17.toString()
293+
compilerOptions {
294+
jvmTarget.set(JvmTarget.JVM_17)
294295
}
295296
}
296297

‎src/main/kotlin/no/nav/security/mock/oauth2/MockOAuth2Server.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ open class MockOAuth2Server(
111111
@Deprecated("Use MockWebServer method/function instead", ReplaceWith("MockWebServer.enqueue()"))
112112
fun enqueueResponse(
113113
@Suppress("UNUSED_PARAMETER") response: MockResponse,
114-
) {
115-
throw UnsupportedOperationException("cannot enqueue MockResponse, please use the MockWebServer directly with QueueDispatcher")
116-
}
114+
): Unit = throw UnsupportedOperationException("cannot enqueue MockResponse, please use the MockWebServer directly with QueueDispatcher")
117115

118116
/**
119117
* Enqueues a callback at the server's HTTP request handler.
@@ -328,7 +326,8 @@ open class MockOAuth2Server(
328326
}
329327

330328
internal fun Map<String, Any>.toJwtClaimsSet(): JWTClaimsSet =
331-
JWTClaimsSet.Builder()
329+
JWTClaimsSet
330+
.Builder()
332331
.apply {
333332
this@toJwtClaimsSet.forEach {
334333
this.claim(it.key, it.value)

‎src/main/kotlin/no/nav/security/mock/oauth2/OAuth2Config.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ data class OAuth2Config
119119
}
120120

121121
companion object {
122-
fun fromJson(json: String): OAuth2Config {
123-
return jacksonObjectMapper().readValue(json)
124-
}
122+
fun fromJson(json: String): OAuth2Config = jacksonObjectMapper().readValue(json)
125123
}
126124
}

‎src/main/kotlin/no/nav/security/mock/oauth2/OAuth2Exception.kt

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ import com.nimbusds.oauth2.sdk.OAuth2Error
66
import com.nimbusds.oauth2.sdk.http.HTTPResponse
77

88
@Suppress("unused")
9-
class OAuth2Exception(val errorObject: ErrorObject?, msg: String, throwable: Throwable?) :
10-
RuntimeException(msg, throwable) {
9+
class OAuth2Exception(
10+
val errorObject: ErrorObject?,
11+
msg: String,
12+
throwable: Throwable?,
13+
) : RuntimeException(msg, throwable) {
1114
constructor(msg: String) : this(null, msg, null)
1215
constructor(msg: String, throwable: Throwable?) : this(null, msg, throwable)
1316
constructor(errorObject: ErrorObject?, msg: String) : this(errorObject, msg, null)

‎src/main/kotlin/no/nav/security/mock/oauth2/StandaloneMockOAuth2Server.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ object StandaloneConfig {
2020
const val PORT = "PORT" // Supports running Docker image on Heroku.
2121

2222
fun hostname(): InetAddress =
23-
SERVER_HOSTNAME.fromEnv()
23+
SERVER_HOSTNAME
24+
.fromEnv()
2425
?.let { InetAddress.getByName(it) } ?: InetSocketAddress(0).address
2526

2627
fun port(): Int = (SERVER_PORT.fromEnv()?.toInt() ?: PORT.fromEnv()?.toInt()) ?: 8080

‎src/main/kotlin/no/nav/security/mock/oauth2/debugger/Client.kt

+22-15
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ internal class TokenRequest(
4545
"\n\n$body"
4646

4747
private fun Map<String, String>.toKeyValueString(entrySeparator: String): String =
48-
this.map { "${it.key}=${it.value}" }
49-
.toList().joinToString(entrySeparator)
48+
this
49+
.map { "${it.key}=${it.value}" }
50+
.toList()
51+
.joinToString(entrySeparator)
5052
}
5153

5254
internal data class ClientAuthentication(
@@ -79,21 +81,26 @@ internal data class ClientAuthentication(
7981
internal fun String.urlEncode(): String = URLEncoder.encode(this, StandardCharsets.UTF_8)
8082

8183
internal fun OkHttpClient.post(tokenRequest: TokenRequest): String =
82-
this.newCall(
83-
Request.Builder()
84-
.headers(tokenRequest.headers)
85-
.url(tokenRequest.url)
86-
.post(tokenRequest.body.toRequestBody("application/x-www-form-urlencoded".toMediaType()))
87-
.build(),
88-
).execute().body?.string() ?: throw RuntimeException("could not get response body from url=${tokenRequest.url}")
84+
this
85+
.newCall(
86+
Request
87+
.Builder()
88+
.headers(tokenRequest.headers)
89+
.url(tokenRequest.url)
90+
.post(tokenRequest.body.toRequestBody("application/x-www-form-urlencoded".toMediaType()))
91+
.build(),
92+
).execute()
93+
.body
94+
?.string() ?: throw RuntimeException("could not get response body from url=${tokenRequest.url}")
8995

9096
fun OkHttpClient.withSsl(
9197
ssl: Ssl,
9298
followRedirects: Boolean = false,
9399
): OkHttpClient =
94-
newBuilder().apply {
95-
followRedirects(followRedirects)
96-
val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()).apply { init(ssl.sslKeystore.keyStore) }
97-
val sslContext = SSLContext.getInstance("TLS").apply { init(null, trustManagerFactory.trustManagers, null) }
98-
sslSocketFactory(sslContext.socketFactory, trustManagerFactory.trustManagers[0] as X509TrustManager)
99-
}.build()
100+
newBuilder()
101+
.apply {
102+
followRedirects(followRedirects)
103+
val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()).apply { init(ssl.sslKeystore.keyStore) }
104+
val sslContext = SSLContext.getInstance("TLS").apply { init(null, trustManagerFactory.trustManagers, null) }
105+
sslSocketFactory(sslContext.socketFactory, trustManagerFactory.trustManagers[0] as X509TrustManager)
106+
}.build()

‎src/main/kotlin/no/nav/security/mock/oauth2/debugger/DebuggerRequestHandler.kt

+15-10
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,27 @@ private fun Route.Builder.debuggerForm(sessionManager: SessionManager) =
5252
get(DEBUGGER) {
5353
log.debug("handling GET request, return html form")
5454
val url =
55-
it.url.toAuthorizationEndpointUrl().newBuilder().query(
56-
"client_id=debugger" +
57-
"&response_type=code" +
58-
"&redirect_uri=${it.url.toDebuggerCallbackUrl()}" +
59-
"&response_mode=query" +
60-
"&scope=openid+somescope" +
61-
"&state=1234" +
62-
"&nonce=5678",
63-
).build()
55+
it.url
56+
.toAuthorizationEndpointUrl()
57+
.newBuilder()
58+
.query(
59+
"client_id=debugger" +
60+
"&response_type=code" +
61+
"&redirect_uri=${it.url.toDebuggerCallbackUrl()}" +
62+
"&response_mode=query" +
63+
"&scope=openid+somescope" +
64+
"&state=1234" +
65+
"&nonce=5678",
66+
).build()
6467
html(templateMapper.debuggerFormHtml(url, "CLIENT_SECRET_BASIC"))
6568
}
6669
post(DEBUGGER) {
6770
log.debug("handling POST request, return redirect")
6871
val authorizeUrl = it.formParameters.get("authorize_url") ?: error("authorize_url is missing")
6972
val httpUrl =
70-
authorizeUrl.toHttpUrl().newBuilder()
73+
authorizeUrl
74+
.toHttpUrl()
75+
.newBuilder()
7176
.encodedQuery(it.formParameters.parameterString)
7277
.removeAllEncodedQueryParams("authorize_url", "token_url", "client_secret", "client_auth_method")
7378
.build()

‎src/main/kotlin/no/nav/security/mock/oauth2/debugger/SessionManager.kt

+10-5
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ private val log = KotlinLogging.logger { }
1818

1919
class SessionManager {
2020
private val encryptionKey: SecretKey =
21-
KeyGenerator.getInstance("AES")
22-
.apply { this.init(128) }.generateKey()
21+
KeyGenerator
22+
.getInstance("AES")
23+
.apply { this.init(128) }
24+
.generateKey()
2325

2426
fun session(request: OAuth2HttpRequest): Session = Session(encryptionKey, request)
2527

@@ -52,9 +54,12 @@ class SessionManager {
5254
}.serialize()
5355

5456
private fun String.decrypt(key: SecretKey): String =
55-
JWEObject.parse(this).also {
56-
it.decrypt(DirectDecrypter(key))
57-
}.payload.toString()
57+
JWEObject
58+
.parse(this)
59+
.also {
60+
it.decrypt(DirectDecrypter(key))
61+
}.payload
62+
.toString()
5863

5964
private fun getSessionCookie(): String? =
6065
runCatching {

‎src/main/kotlin/no/nav/security/mock/oauth2/extensions/HttpUrlExtensions.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ private fun HttpUrl.issuer(path: String = ""): HttpUrl =
111111
private fun joinPaths(vararg path: String) = path.filter { it.isNotEmpty() }.joinToString("/") { it.trimPath() }
112112

113113
private fun HttpUrl.baseUrl(): HttpUrl =
114-
HttpUrl.Builder()
114+
HttpUrl
115+
.Builder()
115116
.scheme(this.scheme)
116117
.host(this.host)
117118
.port(this.port)

‎src/main/kotlin/no/nav/security/mock/oauth2/extensions/NimbusExtensions.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ fun ClientAuthentication.requirePrivateKeyJwt(
116116
it.clientAssertion.expiresIn() > maxLifetimeSeconds -> {
117117
invalidRequest("invalid client_assertion: client_assertion expiry is too long( should be < $maxLifetimeSeconds)")
118118
}
119-
!it.clientAssertion.jwtClaimsSet.audience.contains(requiredAudience) -> {
119+
!it.clientAssertion.jwtClaimsSet.audience
120+
.contains(requiredAudience) -> {
120121
invalidRequest("invalid client_assertion: client_assertion must contain required audience '$requiredAudience'")
121122
}
122123
else -> it

‎src/main/kotlin/no/nav/security/mock/oauth2/extensions/String.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import java.net.URLDecoder
44
import java.nio.charset.StandardCharsets
55

66
internal fun String.keyValuesToMap(listDelimiter: String): Map<String, String> =
7-
this.split(listDelimiter)
7+
this
8+
.split(listDelimiter)
89
.filter { it.contains("=") }
910
.associate {
1011
val (key, value) = it.split("=")

‎src/main/kotlin/no/nav/security/mock/oauth2/extensions/Template.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ fun Map<String, Any>.replaceValues(templates: Map<String, Any>): Map<String, Any
1818
}
1919
}
2020

21-
fun replaceValue(value: Any): Any {
22-
return when (value) {
21+
fun replaceValue(value: Any): Any =
22+
when (value) {
2323
is String -> replaceTemplateString(value, templates)
2424
is List<*> -> value.map { it?.let { replaceValue(it) } }
2525
is Map<*, *> -> value.mapValues { v -> v.value?.let { replaceValue(it) } }
2626
else -> value
2727
}
28-
}
2928

3029
return this.mapValues { replaceValue(it.value) }
3130
}

‎src/main/kotlin/no/nav/security/mock/oauth2/grant/AuthorizationCodeHandler.kt

+8-5
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,19 @@ internal class AuthorizationCodeHandler(
9393
private fun getLoginTokenCallbackOrDefault(
9494
code: AuthorizationCode,
9595
OAuth2TokenCallback: OAuth2TokenCallback,
96-
): OAuth2TokenCallback {
97-
return takeLoginFromCache(code)?.let {
96+
): OAuth2TokenCallback =
97+
takeLoginFromCache(code)?.let {
9898
LoginOAuth2TokenCallback(it, OAuth2TokenCallback)
9999
} ?: OAuth2TokenCallback
100-
}
101100

102101
private fun takeLoginFromCache(code: AuthorizationCode): Login? = codeToLoginCache.remove(code)
103102

104103
private fun takeAuthenticationRequestFromCache(code: AuthorizationCode): AuthenticationRequest? = codeToAuthRequestCache.remove(code)
105104

106-
private class LoginOAuth2TokenCallback(val login: Login, val oAuth2TokenCallback: OAuth2TokenCallback) : OAuth2TokenCallback {
105+
private class LoginOAuth2TokenCallback(
106+
val login: Login,
107+
val oAuth2TokenCallback: OAuth2TokenCallback,
108+
) : OAuth2TokenCallback {
107109
override fun issuerId(): String = oAuth2TokenCallback.issuerId()
108110

109111
override fun subject(tokenRequest: TokenRequest): String = login.username
@@ -116,7 +118,8 @@ internal class AuthorizationCodeHandler(
116118
oAuth2TokenCallback.addClaims(tokenRequest).toMutableMap().apply {
117119
login.claims?.let {
118120
try {
119-
jsonMapper.readTree(it)
121+
jsonMapper
122+
.readTree(it)
120123
.fields()
121124
.forEach { field ->
122125
put(field.key, jsonMapper.readValue(field.value.toString()))

‎src/main/kotlin/no/nav/security/mock/oauth2/grant/JwtBearerGrantHandler.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ import no.nav.security.mock.oauth2.token.OAuth2TokenCallback
1313
import no.nav.security.mock.oauth2.token.OAuth2TokenProvider
1414
import okhttp3.HttpUrl
1515

16-
internal class JwtBearerGrantHandler(private val tokenProvider: OAuth2TokenProvider) : GrantHandler {
16+
internal class JwtBearerGrantHandler(
17+
private val tokenProvider: OAuth2TokenProvider,
18+
) : GrantHandler {
1719
override fun tokenResponse(
1820
request: OAuth2HttpRequest,
1921
issuerUrl: HttpUrl,
@@ -36,11 +38,10 @@ internal class JwtBearerGrantHandler(private val tokenProvider: OAuth2TokenProvi
3638
)
3739
}
3840

39-
private fun TokenRequest.responseScope(): String {
40-
return scope?.toString()
41+
private fun TokenRequest.responseScope(): String =
42+
scope?.toString()
4143
?: assertion().getClaim("scope")?.toString()
4244
?: invalidRequest("scope must be specified in request or as a claim in assertion parameter")
43-
}
4445

4546
private fun TokenRequest.assertion(): JWTClaimsSet =
4647
(this.authorizationGrant as? JWTBearerGrant)?.jwtAssertion?.jwtClaimsSet

‎src/main/kotlin/no/nav/security/mock/oauth2/grant/TokenExchangeGrant.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ class TokenExchangeGrant(
2525
TokenExchangeGrant(
2626
parameters.require("subject_token_type"),
2727
parameters.require("subject_token"),
28-
parameters.require("audience")
28+
parameters
29+
.require("audience")
2930
.split(" ")
3031
.toMutableList(),
3132
)

‎src/main/kotlin/no/nav/security/mock/oauth2/grant/TokenExchangeGrantHandler.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ import no.nav.security.mock.oauth2.token.OAuth2TokenCallback
1010
import no.nav.security.mock.oauth2.token.OAuth2TokenProvider
1111
import okhttp3.HttpUrl
1212

13-
internal class TokenExchangeGrantHandler(private val tokenProvider: OAuth2TokenProvider) : GrantHandler {
13+
internal class TokenExchangeGrantHandler(
14+
private val tokenProvider: OAuth2TokenProvider,
15+
) : GrantHandler {
1416
override fun tokenResponse(
1517
request: OAuth2HttpRequest,
1618
issuerUrl: HttpUrl,

‎src/main/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpRequest.kt

+5-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ data class OAuth2HttpRequest(
8686
)
8787

8888
internal fun proxyAwareUrl(): HttpUrl =
89-
HttpUrl.Builder()
89+
HttpUrl
90+
.Builder()
9091
.scheme(resolveScheme())
9192
.host(resolveHost())
9293
.port(resolvePort())
@@ -127,7 +128,9 @@ data class OAuth2HttpRequest(
127128
return null
128129
}
129130

130-
data class Parameters(val parameterString: String?) {
131+
data class Parameters(
132+
val parameterString: String?,
133+
) {
131134
val map: Map<String, String> = parameterString?.keyValuesToMap("&") ?: emptyMap()
132135

133136
fun get(name: String): String? = map[name]

‎src/main/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpRequestHandler.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ import java.util.concurrent.LinkedBlockingQueue
5353

5454
private val log = KotlinLogging.logger {}
5555

56-
class OAuth2HttpRequestHandler(private val config: OAuth2Config) {
56+
class OAuth2HttpRequestHandler(
57+
private val config: OAuth2Config,
58+
) {
5759
private val loginRequestHandler = LoginRequestHandler(templateMapper, config)
5860
private val debuggerRequestHandler = DebuggerRequestHandler(ssl = config.httpServer.sslConfig())
5961
private val tokenCallbackQueue: BlockingQueue<OAuth2TokenCallback> = LinkedBlockingQueue()
@@ -180,7 +182,10 @@ class OAuth2HttpRequestHandler(private val config: OAuth2Config) {
180182
apply {
181183
if (config.staticAssetsPath != null) {
182184
get("/static/*") {
183-
val path = it.url.pathSegments.drop(1).joinToString("/")
185+
val path =
186+
it.url.pathSegments
187+
.drop(1)
188+
.joinToString("/")
184189
val normalized = Paths.get(path).normalize().toString()
185190
val file = File(config.staticAssetsPath, normalized)
186191

0 commit comments

Comments
 (0)