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

bugfix/added the starConnectorSupportedTypes guard for the getResourceUser external

Browse Source
This commit is contained in:
hongwei 2020-07-14 10:33:12 +02:00
parent b1dfea7380
commit c209e3409f
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
View File

@ -317,6 +317,7 @@ import net.liftweb.util.Helpers._
val usernameLockedStateCode = Long.MaxValue
val connector = APIUtil.getPropsValue("connector").openOrThrowException("no connector set")
val starConnectorSupportedTypes = APIUtil.getPropsValue("starConnector_supported_types","")
override def emailFrom = APIUtil.getPropsValue("mail.users.userinfo.sender.address", "sender-not-set")
@ -617,8 +618,11 @@ import net.liftweb.util.Helpers._
case Full(user) if (user.getProvider() != APIUtil.getPropsValue("hostname","")) =>
connector match {
case Helper.matchAnyKafka() if ( APIUtil.getPropsAsBoolValue("kafka.user.authentication", false) &&
! LoginAttempt.userIsLocked(username) ) =>
case Helper.matchAnyKafka() if (
(starConnectorSupportedTypes contains("kafka"))
&& APIUtil.getPropsAsBoolValue("kafka.user.authentication", false)
&& ! LoginAttempt.userIsLocked(username)
) =>
val userId = for { kafkaUser <- getUserFromConnector(username, password)
kafkaUserId <- tryo{kafkaUser.user} } yield {
LoginAttempt.resetBadLoginAttempts(username)
@ -630,8 +634,11 @@ import net.liftweb.util.Helpers._
LoginAttempt.incrementBadLoginAttempts(username)
Empty
}
case "obpjvm" if ( APIUtil.getPropsAsBoolValue("obpjvm.user.authentication", false) &&
! LoginAttempt.userIsLocked(username) ) =>
case "obpjvm" if (
(starConnectorSupportedTypes contains("obpjvm"))
&& APIUtil.getPropsAsBoolValue("obpjvm.user.authentication", false)
&& ! LoginAttempt.userIsLocked(username)
) =>
val userId = for { obpjvmUser <- getUserFromConnector(username, password)
obpjvmUserId <- tryo{obpjvmUser.user} } yield {
LoginAttempt.resetBadLoginAttempts(username)
@ -643,7 +650,11 @@ import net.liftweb.util.Helpers._
LoginAttempt.incrementBadLoginAttempts(username)
Empty
}
case Helper.matchAnyStoredProcedure() if !LoginAttempt.userIsLocked(username) =>
case Helper.matchAnyStoredProcedure() if (
(starConnectorSupportedTypes contains("stored_procedure"))
&& APIUtil.getPropsAsBoolValue("connector.user.authentication", false)
&& !LoginAttempt.userIsLocked(username)
) =>
val userId =
for {
authUser <- checkExternalUserViaConnector(username, password)

1
obp-api/src/main/scala/code/util/Helper.scala
View File

@ -239,7 +239,6 @@ object Helper{
/**
* Used for version extraction from props string
*/
val matchKafkaVersion = "kafka_v([0-9a-zA-Z_]+)|^star$".r
val matchAnyKafka = "^(kafka.*|star)$|^star$".r
val matchAnyStoredProcedure = "^stored_procedure.*$|^star$".r