Skip to content

Commit 540b611

Browse files
committed
chore: fix formatting with gradlew build using kotlinter
1 parent fe55b15 commit 540b611

File tree

5 files changed

+248
-242
lines changed

5 files changed

+248
-242
lines changed

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

+46-43
Original file line numberDiff line numberDiff line change
@@ -9,67 +9,70 @@ import com.nimbusds.jose.jwk.KeyType
99
import com.nimbusds.jose.jwk.RSAKey
1010
import com.nimbusds.jose.jwk.source.JWKSource
1111
import com.nimbusds.jose.proc.SecurityContext
12+
import no.nav.security.mock.oauth2.OAuth2Exception
1213
import java.util.concurrent.ConcurrentHashMap
1314
import java.util.concurrent.LinkedBlockingDeque
14-
import no.nav.security.mock.oauth2.OAuth2Exception
1515

1616
open class KeyProvider
17-
@JvmOverloads
18-
constructor(
19-
private val initialKeys: List<JWK> = keysFromFile(INITIAL_KEYS_FILE),
20-
private val algorithm: String = JWSAlgorithm.RS256.name,
21-
) : JWKSource<SecurityContext> {
22-
private val signingKeys: ConcurrentHashMap<String, JWK> = ConcurrentHashMap()
17+
@JvmOverloads
18+
constructor(
19+
private val initialKeys: List<JWK> = keysFromFile(INITIAL_KEYS_FILE),
20+
private val algorithm: String = JWSAlgorithm.RS256.name,
21+
) : JWKSource<SecurityContext> {
22+
private val signingKeys: ConcurrentHashMap<String, JWK> = ConcurrentHashMap()
2323

24-
private var generator: KeyGenerator = KeyGenerator(JWSAlgorithm.parse(algorithm))
24+
private var generator: KeyGenerator = KeyGenerator(JWSAlgorithm.parse(algorithm))
2525

26-
private val keyDeque =
27-
LinkedBlockingDeque<JWK>().apply {
28-
initialKeys.forEach {
29-
put(it)
26+
private val keyDeque =
27+
LinkedBlockingDeque<JWK>().apply {
28+
initialKeys.forEach {
29+
put(it)
30+
}
3031
}
31-
}
3232

33-
fun signingKey(keyId: String): JWK = signingKeys.computeIfAbsent(keyId) { keyFromDequeOrNew(keyId) }
33+
fun signingKey(keyId: String): JWK = signingKeys.computeIfAbsent(keyId) { keyFromDequeOrNew(keyId) }
3434

35-
private fun keyFromDequeOrNew(keyId: String): JWK =
36-
keyDeque.poll()?.let { polledJwk ->
37-
when (polledJwk.keyType.value) {
38-
KeyType.RSA.value -> {
39-
RSAKey.Builder(polledJwk.toRSAKey()).keyID(keyId).build()
40-
}
35+
private fun keyFromDequeOrNew(keyId: String): JWK =
36+
keyDeque.poll()?.let { polledJwk ->
37+
when (polledJwk.keyType.value) {
38+
KeyType.RSA.value -> {
39+
RSAKey.Builder(polledJwk.toRSAKey()).keyID(keyId).build()
40+
}
4141

42-
KeyType.EC.value -> {
43-
ECKey.Builder(polledJwk.toECKey()).keyID(keyId).build()
44-
}
42+
KeyType.EC.value -> {
43+
ECKey.Builder(polledJwk.toECKey()).keyID(keyId).build()
44+
}
4545

46-
else -> {
47-
throw OAuth2Exception("Unsupported key type: ${polledJwk.keyType.value}")
46+
else -> {
47+
throw OAuth2Exception("Unsupported key type: ${polledJwk.keyType.value}")
48+
}
4849
}
49-
}
50-
} ?: generator.generateKey(keyId)
50+
} ?: generator.generateKey(keyId)
5151

52-
fun algorithm(): JWSAlgorithm = JWSAlgorithm.parse(algorithm)
52+
fun algorithm(): JWSAlgorithm = JWSAlgorithm.parse(algorithm)
5353

54-
fun keyType(): String = generator.keyGenerator.algorithm
54+
fun keyType(): String = generator.keyGenerator.algorithm
5555

56-
fun generate(algorithm: String) {
57-
generator = KeyGenerator(JWSAlgorithm.parse(algorithm))
58-
}
56+
fun generate(algorithm: String) {
57+
generator = KeyGenerator(JWSAlgorithm.parse(algorithm))
58+
}
5959

60-
companion object {
61-
const val INITIAL_KEYS_FILE = "/mock-oauth2-server-keys.json"
60+
companion object {
61+
const val INITIAL_KEYS_FILE = "/mock-oauth2-server-keys.json"
6262

63-
fun keysFromFile(filename: String): List<JWK> {
64-
val keysFromFile = KeyProvider::class.java.getResource(filename)
65-
if (keysFromFile != null) {
66-
return JWKSet.parse(keysFromFile.readText()).keys.map { it as JWK }
63+
fun keysFromFile(filename: String): List<JWK> {
64+
val keysFromFile = KeyProvider::class.java.getResource(filename)
65+
if (keysFromFile != null) {
66+
return JWKSet.parse(keysFromFile.readText()).keys.map { it as JWK }
67+
}
68+
return emptyList()
6769
}
68-
return emptyList()
6970
}
70-
}
7171

72-
override fun get(jwkSelector: JWKSelector?, context: SecurityContext?): MutableList<JWK> {
73-
return signingKeys.values.toMutableList()
72+
override fun get(
73+
jwkSelector: JWKSelector?,
74+
context: SecurityContext?,
75+
): MutableList<JWK> {
76+
return signingKeys.values.toMutableList()
77+
}
7478
}
75-
}

0 commit comments

Comments
 (0)