Skip to content

Commit 8ad715c

Browse files
ybelMekkybelMekk
committed
feat(jsonelement): im on something here..
1 parent c1e3872 commit 8ad715c

File tree

3 files changed

+116
-50
lines changed

3 files changed

+116
-50
lines changed

‎build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ dependencies {
6666
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
6767
implementation("org.freemarker:freemarker:$freemarkerVersion")
6868
implementation("org.bouncycastle:bcpkix-jdk18on:$bouncyCastleVersion")
69+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
6970
testImplementation("org.assertj:assertj-core:$assertjVersion")
7071
testImplementation("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion")
7172
testImplementation("org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion")

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

+80-50
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@ package no.nav.security.mock.oauth2.token
33
import com.nimbusds.jose.JOSEObjectType
44
import com.nimbusds.oauth2.sdk.GrantType
55
import com.nimbusds.oauth2.sdk.TokenRequest
6+
import kotlinx.serialization.json.Json
7+
import kotlinx.serialization.json.JsonArray
8+
import kotlinx.serialization.json.JsonObject
9+
import kotlinx.serialization.json.JsonPrimitive
610
import no.nav.security.mock.oauth2.extensions.clientIdAsString
711
import no.nav.security.mock.oauth2.extensions.grantType
812
import no.nav.security.mock.oauth2.extensions.scopesWithoutOidcScopes
913
import no.nav.security.mock.oauth2.extensions.tokenExchangeGrantOrNull
14+
import no.nav.security.mock.oauth2.http.objectMapper
1015
import java.time.Duration
11-
import java.util.UUID
16+
import java.util.*
1217

1318
interface OAuth2TokenCallback {
1419
fun issuerId(): String
@@ -26,49 +31,49 @@ interface OAuth2TokenCallback {
2631

2732
// TODO: for JwtBearerGrant and TokenExchange should be able to ovverride sub, make sub nullable and return some default
2833
open class DefaultOAuth2TokenCallback
29-
@JvmOverloads
30-
constructor(
31-
private val issuerId: String = "default",
32-
private val subject: String = UUID.randomUUID().toString(),
33-
private val typeHeader: String = JOSEObjectType.JWT.type,
34-
// needs to be nullable in order to know if a list has explicitly been set, empty list should be a allowable value
35-
private val audience: List<String>? = null,
36-
private val claims: Map<String, Any> = emptyMap(),
37-
private val expiry: Long = 3600,
38-
) : OAuth2TokenCallback {
39-
override fun issuerId(): String = issuerId
40-
41-
override fun subject(tokenRequest: TokenRequest): String {
42-
return when (GrantType.CLIENT_CREDENTIALS) {
43-
tokenRequest.grantType() -> tokenRequest.clientIdAsString()
44-
else -> subject
45-
}
46-
}
34+
@JvmOverloads
35+
constructor(
36+
private val issuerId: String = "default",
37+
private val subject: String = UUID.randomUUID().toString(),
38+
private val typeHeader: String = JOSEObjectType.JWT.type,
39+
// needs to be nullable in order to know if a list has explicitly been set, empty list should be a allowable value
40+
private val audience: List<String>? = null,
41+
private val claims: Map<String, Any> = emptyMap(),
42+
private val expiry: Long = 3600,
43+
) : OAuth2TokenCallback {
44+
override fun issuerId(): String = issuerId
4745

48-
override fun typeHeader(tokenRequest: TokenRequest): String {
49-
return typeHeader
46+
override fun subject(tokenRequest: TokenRequest): String {
47+
return when (GrantType.CLIENT_CREDENTIALS) {
48+
tokenRequest.grantType() -> tokenRequest.clientIdAsString()
49+
else -> subject
5050
}
51+
}
5152

52-
override fun audience(tokenRequest: TokenRequest): List<String> {
53-
val audienceParam = tokenRequest.tokenExchangeGrantOrNull()?.audience
54-
return when {
55-
audience != null -> audience
56-
audienceParam != null -> audienceParam
57-
tokenRequest.scope != null -> tokenRequest.scopesWithoutOidcScopes()
58-
else -> listOf("default")
59-
}
53+
override fun typeHeader(tokenRequest: TokenRequest): String {
54+
return typeHeader
55+
}
56+
57+
override fun audience(tokenRequest: TokenRequest): List<String> {
58+
val audienceParam = tokenRequest.tokenExchangeGrantOrNull()?.audience
59+
return when {
60+
audience != null -> audience
61+
audienceParam != null -> audienceParam
62+
tokenRequest.scope != null -> tokenRequest.scopesWithoutOidcScopes()
63+
else -> listOf("default")
6064
}
65+
}
6166

62-
override fun addClaims(tokenRequest: TokenRequest): Map<String, Any> =
63-
mutableMapOf<String, Any>(
64-
"tid" to issuerId,
65-
).apply {
66-
putAll(claims)
67-
put("azp", tokenRequest.clientIdAsString())
68-
}
67+
override fun addClaims(tokenRequest: TokenRequest): Map<String, Any> =
68+
mutableMapOf<String, Any>(
69+
"tid" to issuerId,
70+
).apply {
71+
putAll(claims)
72+
put("azp", tokenRequest.clientIdAsString())
73+
}
6974

70-
override fun tokenExpiry(): Long = expiry
71-
}
75+
override fun tokenExpiry(): Long = expiry
76+
}
7277

7378
data class RequestMappingTokenCallback(
7479
val issuerId: String,
@@ -96,16 +101,44 @@ data class RequestMappingTokenCallback(
96101
}).toMap() + mapOf("clientId" to tokenRequest.clientIdAsString())
97102

98103
return claims.mapValues { (_, value) ->
99-
when (value) {
100-
is String -> replaceVariables(value, params)
101-
is List<*> ->
102-
value.map { v ->
103-
if (v is String) {
104-
replaceVariables(v, params)
104+
val v = objectMapper.writeValueAsString(value)
105+
val jsonElement = Json.parseToJsonElement(v)
106+
when (jsonElement) {
107+
is JsonPrimitive ->
108+
if (jsonElement.isString) {
109+
replaceVariables(jsonElement.content, params)
110+
} else {
111+
jsonElement.content
112+
}
113+
114+
is JsonObject -> {
115+
jsonElement.mapValues { (_, value) ->
116+
if (value is JsonPrimitive) {
117+
replaceVariables(value.content, params)
118+
} else if (value is JsonArray)
119+
value.map { element ->
120+
if (element is JsonPrimitive) {
121+
replaceVariables(element.content, params)
122+
} else {
123+
element
124+
}
125+
}
126+
else {
127+
value
128+
}
129+
}
130+
}
131+
132+
is JsonArray -> {
133+
jsonElement.map { element ->
134+
if (element is JsonPrimitive) {
135+
replaceVariables(element.content, params)
105136
} else {
106-
v
137+
element
107138
}
108139
}
140+
}
141+
109142
else -> value
110143
}
111144
}
@@ -122,11 +155,8 @@ data class RequestMappingTokenCallback(
122155
input: String,
123156
replacements: Map<String, String>,
124157
): String {
125-
val pattern = Regex("""\$\{(\w+)}""")
126-
return pattern.replace(input) { result ->
127-
val variableName = result.groupValues[1]
128-
val replacement = replacements[variableName]
129-
replacement ?: result.value
158+
return replacements.entries.fold(input) { acc, (key, value) ->
159+
acc.replace("\${$key}", value)
130160
}
131161
}
132162
}

‎src/test/kotlin/no/nav/security/mock/oauth2/token/OAuth2TokenCallbackTest.kt

+35
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,41 @@ internal class OAuth2TokenCallbackTest {
151151
}
152152
}
153153

154+
@Test
155+
fun `token request with custom parameters in token request should include claims with placeholder names`() {
156+
val request = clientCredentialsRequest(
157+
"mock_token_type" to "custom",
158+
"participantId" to "participantId",
159+
"actAs" to "actAs",
160+
"readAs" to "readAs",
161+
)
162+
RequestMappingTokenCallback(
163+
issuerId = "issuer1",
164+
requestMappings =
165+
listOf(
166+
RequestMapping(
167+
requestParam = "mock_token_type",
168+
match = "custom",
169+
claims = mapOf(
170+
"https://daml.com/ledger-api" to mapOf(
171+
"participantId" to "\${participantId}",
172+
"actAs" to listOf("\${actAs}"),
173+
"readAs" to listOf("\${readAs}"),
174+
),
175+
),
176+
),
177+
)
178+
).addClaims(request).asClue {
179+
it shouldContainAll mapOf(
180+
"https://daml.com/ledger-api" to mapOf(
181+
"participantId" to "participantId",
182+
"actAs" to listOf("actAs"),
183+
"readAs" to listOf("readAs")
184+
),
185+
)
186+
}
187+
}
188+
154189
@Nested
155190
inner class DefaultOAuth2TokenCallbacks {
156191
@Test

0 commit comments

Comments
 (0)