artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 17:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature/Add function getCurrentConsumerViaMtls

Browse Source
This commit is contained in:
Marko Milić 2024-06-17 09:37:36 +02:00
parent 3d068cf1dd
commit 1d9771ccec
5 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
obp-api/src/main/scala/code/api/util/APIUtil.scala
View File

@ -2976,8 +2976,8 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
Some(consent.jsonWebToken),
// Note: At this point we are getting the Consumer from the Consumer in the Consent.
// This may later be cross checked via the value in consumer_validation_method_for_consent.
// TODO: Get the source of truth for Consumer (e.g. CONSUMER_CERTIFICATE) as early as possible.
cc.copy(consumer = Consumers.consumers.vend.getConsumerByConsumerId(consent.consumerId))
// Get the source of truth for Consumer (e.g. CONSUMER_CERTIFICATE) as early as possible.
cc.copy(consumer = Consent.getCurrentConsumerViaMtls(callContext = cc))
)
case _ =>
JwtUtil.checkIfStringIsJWTValue(consentValue.getOrElse("")).isDefined match {

18
obp-api/src/main/scala/code/api/util/ConsentUtil.scala
View File

@ -119,6 +119,20 @@ object Consent extends MdcLoggable {
case _ => None
}
}
/**
* Purpose of this helper function is to get the Consumer via MTLS info i.e. PEM certificate.
* @return the boxed Consumer
*/
def getCurrentConsumerViaMtls(callContext: CallContext): Box[Consumer] = {
val clientCert: String = APIUtil.`getPSD2-CERT`(callContext.requestHeaders)
.getOrElse(SecureRandomUtil.csprng.nextLong().toString)
def removeBreakLines(input: String) = input
.replace("\n", "")
.replace("\r", "")
Consumers.consumers.vend.getConsumerByPemCertificate(clientCert).or(
Consumers.consumers.vend.getConsumerByPemCertificate(removeBreakLines(clientCert))
)
}
private def verifyHmacSignedJwt(jwtToken: String, c: MappedConsent): Boolean = {
JwtUtil.verifyHmacSignedJwt(jwtToken, c.secret)
@ -357,7 +371,7 @@ object Consent extends MdcLoggable {
try {
val consent = net.liftweb.json.parse(jsonAsString).extract[ConsentJWT]
// Set Consumer into Call Context
val consumer = Consumers.consumers.vend.getConsumerByConsumerId(consent.aud)
val consumer = getCurrentConsumerViaMtls(callContext)
val updatedCallContext = callContext.copy(consumer = consumer)
checkConsent(consent, consentAsJwt, updatedCallContext) match { // Check is it Consent-JWT expired
case (Full(true)) => // OK
@ -466,7 +480,7 @@ object Consent extends MdcLoggable {
Consents.consentProvider.vend.getConsentByConsentId(consentId) match {
case Full(storedConsent) =>
// Set Consumer into Call Context
val consumer = Consumers.consumers.vend.getConsumerByConsumerId(storedConsent.consumerId)
val consumer = getCurrentConsumerViaMtls(callContext)
val updatedCallContext = callContext.copy(consumer = consumer)
// This function MUST be called only once per call. I.e. it's date dependent
val (canBeUsed, currentCounterState) = checkFrequencyPerDay(storedConsent)

2
obp-api/src/main/scala/code/consumer/ConsumerProvider.scala
View File

@ -28,6 +28,7 @@ trait ConsumersProvider {
def getConsumerByPrimaryId(id: Long): Box[Consumer]
def getConsumerByConsumerKey(consumerKey: String): Box[Consumer]
def getConsumerByConsumerKeyFuture(consumerKey: String): Future[Box[Consumer]]
def getConsumerByPemCertificate(pem: String): Box[Consumer]
def getConsumerByConsumerId(consumerId: String): Box[Consumer]
def getConsumerByConsumerIdFuture(consumerId: String): Future[Box[Consumer]]
def getConsumersByUserIdFuture(userId: String): Future[List[Consumer]]
@ -61,6 +62,7 @@ class RemotedataConsumersCaseClasses {
case class getConsumerByPrimaryId(id: Long)
case class getConsumerByConsumerKey(consumerKey: String)
case class getConsumerByConsumerKeyFuture(consumerKey: String)
case class getConsumerByPemCertificate(pem: String)
case class getConsumerByConsumerId(consumerId: String)
case class getConsumerByConsumerIdFuture(consumerId: String)
case class getConsumersByUserIdFuture(userId: String)

4
obp-api/src/main/scala/code/model/OAuth.scala
View File

@ -103,6 +103,10 @@ object MappedConsumersProvider extends ConsumersProvider with MdcLoggable {
}
}
def getConsumerByPemCertificate(pem: String): Box[Consumer] = {
Consumer.find(By(Consumer.clientCertificate, pem))
}
def getConsumerByConsumerId(consumerId: String): Box[Consumer] = {
Consumer.find(By(Consumer.consumerId, consumerId))
}

3
obp-api/src/main/scala/code/remotedata/RemotedataConsumers.scala
View File

@ -20,6 +20,9 @@ object RemotedataConsumers extends ObpActorInit with ConsumersProvider {
def getConsumerByPrimaryId(id: Long): Box[Consumer] = getValueFromFuture(
(actor ? cc.getConsumerByPrimaryId(id)).mapTo[Box[Consumer]]
)
def getConsumerByPemCertificate(pem: String): Box[Consumer] = getValueFromFuture(
(actor ? cc.getConsumerByPemCertificate(pem)).mapTo[Box[Consumer]]
)
def getConsumerByConsumerId(consumerId: String): Box[Consumer] = getValueFromFuture(
(actor ? cc.getConsumerByConsumerId(consumerId)).mapTo[Box[Consumer]]
)