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

WebClient updates #37

Merged
merged 1 commit into from
Nov 20, 2023
Merged

WebClient updates #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 68 additions & 32 deletions src/main/kotlin/eu/europa/ec/eudi/pidissuer/PidIssuerApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import eu.europa.ec.eudi.pidissuer.adapter.out.jose.EncryptCredentialResponseWit
import eu.europa.ec.eudi.pidissuer.adapter.out.persistence.InMemoryCNonceRepository
import eu.europa.ec.eudi.pidissuer.adapter.out.persistence.InMemoryDeferredCredentialRepository
import eu.europa.ec.eudi.pidissuer.adapter.out.pid.*
import eu.europa.ec.eudi.pidissuer.adapter.out.webclient.WebClients
import eu.europa.ec.eudi.pidissuer.domain.*
import eu.europa.ec.eudi.pidissuer.port.input.GetCredentialIssuerMetaData
import eu.europa.ec.eudi.pidissuer.port.input.GetDeferredCredential
Expand All @@ -40,8 +39,11 @@ import eu.europa.ec.eudi.pidissuer.port.out.asDeferred
import eu.europa.ec.eudi.pidissuer.port.out.persistence.GenerateCNonce
import eu.europa.ec.eudi.pidissuer.port.out.persistence.GenerateTransactionId
import eu.europa.ec.eudi.sdjwt.HashAlgorithm
import io.netty.handler.ssl.SslContextBuilder
import io.netty.handler.ssl.util.InsecureTrustManagerFactory
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.json.Json
import org.slf4j.LoggerFactory
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.autoconfigure.security.oauth2.resource.OAuth2ResourceServerProperties
import org.springframework.boot.runApplication
Expand All @@ -53,6 +55,7 @@ import org.springframework.core.env.Environment
import org.springframework.core.env.getProperty
import org.springframework.core.env.getRequiredProperty
import org.springframework.http.HttpStatus
import org.springframework.http.client.reactive.ReactorClientHttpConnector
import org.springframework.http.codec.ServerCodecConfigurer
import org.springframework.http.codec.json.KotlinSerializationJsonDecoder
import org.springframework.http.codec.json.KotlinSerializationJsonEncoder
Expand All @@ -63,31 +66,67 @@ import org.springframework.security.oauth2.server.resource.introspection.SpringR
import org.springframework.security.web.server.authentication.HttpStatusServerEntryPoint
import org.springframework.web.reactive.config.EnableWebFlux
import org.springframework.web.reactive.config.WebFluxConfigurer
import org.springframework.web.reactive.function.client.WebClient
import reactor.netty.http.client.HttpClient
import java.time.Clock
import java.time.Duration

private val log = LoggerFactory.getLogger(PidIssuerApplication::class.java)

/**
* [WebClient] instances for usage within the application.
*/
private object WebClients {

/**
* A [WebClient] with [Json] serialization enabled.
*/
val Default: WebClient by lazy {
val json = Json { ignoreUnknownKeys = true }
WebClient
.builder()
.codecs {
it.defaultCodecs().kotlinSerializationJsonDecoder(KotlinSerializationJsonDecoder(json))
it.defaultCodecs().kotlinSerializationJsonEncoder(KotlinSerializationJsonEncoder(json))
it.defaultCodecs().enableLoggingRequestDetails(true)
}
.build()
}

/**
* A [WebClient] with [Json] serialization enabled that trusts *all* certificates.
*/
val Insecure: WebClient by lazy {
log.warn("Using insecure WebClient trusting all certificates")
val sslContext = SslContextBuilder.forClient()
.trustManager(InsecureTrustManagerFactory.INSTANCE)
.build()
val httpClient = HttpClient.create().secure { it.sslContext(sslContext) }
Default.mutate()
.clientConnector(ReactorClientHttpConnector(httpClient))
.build()
}
}

fun beans(clock: Clock) = beans {
//
// Adapters (out ports)
//
bean { clock }
profile("!insecure") {
bean {
GetPidDataFromAuthServer(
env.readRequiredUrl("issuer.authorizationServer.userinfo"),
env.getRequiredProperty("issuer.pid.issuingCountry").let(::IsoCountry),
clock,
)
bean {
if ("insecure" in env.activeProfiles) {
WebClients.Insecure
} else {
WebClients.Default
}
}
profile("insecure") {
bean {
GetPidDataFromAuthServer.insecure(
env.readRequiredUrl("issuer.authorizationServer.userinfo"),
env.getRequiredProperty("issuer.pid.issuingCountry").let(::IsoCountry),
clock,
)
}
bean {
GetPidDataFromAuthServer(
env.readRequiredUrl("issuer.authorizationServer.userinfo"),
env.getRequiredProperty("issuer.pid.issuingCountry").let(::IsoCountry),
clock,
ref(),
)
}
//
// Encryption of credential response
Expand Down Expand Up @@ -122,7 +161,7 @@ fun beans(clock: Clock) = beans {
val issuerPublicUrl = env.readRequiredUrl("issuer.publicUrl")

bean {
EncodePidInCborWithMicroService(env.readRequiredUrl("issuer.pid.mso_mdoc.encoderUrl"))
EncodePidInCborWithMicroService(env.readRequiredUrl("issuer.pid.mso_mdoc.encoderUrl"), ref())
}

CredentialIssuerMetaData(
Expand Down Expand Up @@ -210,20 +249,6 @@ fun beans(clock: Clock) = beans {
//
// Security
//
profile("insecure") {
bean {
val properties = ref<OAuth2ResourceServerProperties>()

SpringReactiveOpaqueTokenIntrospector(
properties.opaquetoken.introspectionUri,
WebClients.insecure {
defaultHeaders {
it.setBasicAuth(properties.opaquetoken.clientId, properties.opaquetoken.clientSecret)
}
},
)
}
}
bean {
/*
* This is a Spring naming convention
Expand Down Expand Up @@ -262,7 +287,18 @@ fun beans(clock: Clock) = beans {
}

oauth2ResourceServer {
opaqueToken {}
opaqueToken {
val properties = ref<OAuth2ResourceServerProperties>()
introspector = SpringReactiveOpaqueTokenIntrospector(
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@babisRoutis By default Spring Security creates its own instance of a WebClient.
Thus we provide a SpringReactiveOpaqueTokenIntrospector instance that uses the WebClient we define as a bean.

properties.opaquetoken.introspectionUri,
ref<WebClient>()
.mutate()
.defaultHeaders {
it.setBasicAuth(properties.opaquetoken.clientId, properties.opaquetoken.clientSecret)
}
.build(),
)
}
}
}
}
Expand Down
20 changes: 5 additions & 15 deletions ...ain/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/pid/EncodePidInCborWithMicroService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import org.bouncycastle.util.io.pem.PemObject
import org.bouncycastle.util.io.pem.PemWriter
import org.slf4j.LoggerFactory
import org.springframework.http.MediaType
import org.springframework.http.codec.json.KotlinSerializationJsonDecoder
import org.springframework.http.codec.json.KotlinSerializationJsonEncoder
import org.springframework.web.reactive.function.client.WebClient
import org.springframework.web.reactive.function.client.awaitBody
import java.io.StringWriter
Expand All @@ -35,24 +33,15 @@ import kotlin.io.encoding.ExperimentalEncodingApi

private val log = LoggerFactory.getLogger(EncodePidInCborWithMicroService::class.java)

class EncodePidInCborWithMicroService(private val creatorUrl: HttpsUrl) : EncodePidInCbor {
class EncodePidInCborWithMicroService(
private val creatorUrl: HttpsUrl,
private val webClient: WebClient,
) : EncodePidInCbor {

init {
log.info("Initialized using: $creatorUrl")
}

private val webClient: WebClient by lazy {
val json = Json { ignoreUnknownKeys = true }
WebClient
.builder()
.codecs { configurer ->
configurer.defaultCodecs().kotlinSerializationJsonDecoder(KotlinSerializationJsonDecoder(json))
configurer.defaultCodecs().kotlinSerializationJsonEncoder(KotlinSerializationJsonEncoder(json))
configurer.defaultCodecs().enableLoggingRequestDetails(true)
}.baseUrl(creatorUrl.externalForm)
.build()
}

override suspend fun invoke(
pid: Pid,
pidMetaData: PidMetaData,
Expand All @@ -61,6 +50,7 @@ class EncodePidInCborWithMicroService(private val creatorUrl: HttpsUrl) : Encode
log.info("Requesting PID in mso_mdoc for ${pid.familyName} ...")
val request = createMsoMdocReq(pid, pidMetaData, holderKey)
webClient.post()
.uri(creatorUrl.externalForm)
.accept(MediaType.APPLICATION_JSON)
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(request)
Expand Down
44 changes: 5 additions & 39 deletions src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/pid/GetPidDataFromAuthServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package eu.europa.ec.eudi.pidissuer.adapter.out.pid

import eu.europa.ec.eudi.pidissuer.adapter.out.oauth.OidcAddressClaim
import eu.europa.ec.eudi.pidissuer.adapter.out.oauth.OidcAssurancePlaceOfBirth
import eu.europa.ec.eudi.pidissuer.adapter.out.webclient.WebClients
import eu.europa.ec.eudi.pidissuer.domain.HttpsUrl
import kotlinx.serialization.Required
import kotlinx.serialization.SerialName
Expand All @@ -33,7 +32,8 @@ import java.time.LocalDate

private val log = LoggerFactory.getLogger(GetPidDataFromAuthServer::class.java)

class GetPidDataFromAuthServer private constructor(
class GetPidDataFromAuthServer(
private val authorizationServerUserInfoEndPoint: HttpsUrl,
private val issuerCountry: IsoCountry,
private val clock: Clock,
private val webClient: WebClient,
Expand All @@ -52,7 +52,9 @@ class GetPidDataFromAuthServer private constructor(
}

private suspend fun userInfo(accessToken: String): UserInfo =
webClient.get().accept(MediaType.APPLICATION_JSON)
webClient.get()
.uri(authorizationServerUserInfoEndPoint.externalForm)
.accept(MediaType.APPLICATION_JSON)
.headers { headers -> headers.setBearerAuth(accessToken) }
.retrieve()
.awaitBody<UserInfo>()
Expand Down Expand Up @@ -92,42 +94,6 @@ class GetPidDataFromAuthServer private constructor(

return pid to pidMetaData
}

companion object {

/**
* Creates a new [GetPidDataFromAuthServer] using the provided data.
*/
operator fun invoke(
authorizationServerUserInfoEndPoint: HttpsUrl,
issuerCountry: IsoCountry,
clock: Clock,
): GetPidDataFromAuthServer =
GetPidDataFromAuthServer(
issuerCountry,
clock,
WebClients.default {
baseUrl(authorizationServerUserInfoEndPoint.externalForm)
},
)

/**
* Creates a new *insecure* [GetPidDataFromAuthServer] that trusts all certificates.
*/
fun insecure(
authorizationServerUserInfoEndPoint: HttpsUrl,
issuerCountry: IsoCountry,
clock: Clock,
): GetPidDataFromAuthServer {
return GetPidDataFromAuthServer(
issuerCountry,
clock,
WebClients.insecure {
baseUrl(authorizationServerUserInfoEndPoint.externalForm)
},
)
}
}
}

@Serializable
Expand Down
54 changes: 0 additions & 54 deletions src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/webclient/WebClients.kt
View file
Open in desktop

This file was deleted.