fix: Less information in auth error messages (DEV-3260)

dasch-swiss · Feb 2, 2024 · d06a666 · d06a666
1 parent 785b573
commit d06a666
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/integration/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala b/integration/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala
@@ -15,6 +15,7 @@ import org.knora.webapi.messages.v2.routing.authenticationmessages.CredentialsId
 import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraJWTTokenCredentialsV2
 import org.knora.webapi.messages.v2.routing.authenticationmessages.KnoraCredentialsV2.KnoraPasswordCredentialsV2
 import org.knora.webapi.routing.Authenticator.AUTHENTICATION_INVALIDATION_CACHE_NAME
+import org.knora.webapi.routing.Authenticator.BAD_CRED_NOT_VALID
 import org.knora.webapi.sharedtestdata.SharedTestDataADM
 import org.knora.webapi.slice.admin.domain.model.Email
 import org.knora.webapi.slice.admin.domain.model.User
@@ -43,7 +44,7 @@ class AuthenticatorSpec extends CoreSpec with ImplicitSender with PrivateMethodT
 
       "fail with the wrong 'email' " in {
         val actual = UnsafeZioRun.run(Authenticator.getUserByEmail(Email.unsafeFrom("wronguser@example.com")))
-        assertFailsWithA[BadCredentialsException](actual)
+        assertFailsWithA[BadCredentialsException](actual, BAD_CRED_NOT_VALID)
       }
     }
 

diff --git a/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala b/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala
@@ -34,8 +34,6 @@ import org.knora.webapi.messages.v2.routing.authenticationmessages.*
 import org.knora.webapi.routing.Authenticator.AUTHENTICATION_INVALIDATION_CACHE_NAME
 import org.knora.webapi.routing.Authenticator.BAD_CRED_NONE_SUPPLIED
 import org.knora.webapi.routing.Authenticator.BAD_CRED_NOT_VALID
-import org.knora.webapi.routing.Authenticator.BAD_CRED_USER_INACTIVE
-import org.knora.webapi.routing.Authenticator.BAD_CRED_USER_NOT_FOUND
 import org.knora.webapi.slice.admin.domain.model.Email
 import org.knora.webapi.slice.admin.domain.model.User
 import org.knora.webapi.slice.admin.domain.model.UserIri
@@ -149,11 +147,8 @@ trait Authenticator {
 }
 
 object Authenticator {
-
-  val BAD_CRED_USER_NOT_FOUND = "bad credentials: user not found"
-  val BAD_CRED_NONE_SUPPLIED  = "bad credentials: none found"
-  val BAD_CRED_USER_INACTIVE  = "bad credentials: user inactive"
-  val BAD_CRED_NOT_VALID      = "bad credentials: not valid"
+  val BAD_CRED_NONE_SUPPLIED = "bad credentials: none found"
+  val BAD_CRED_NOT_VALID     = "bad credentials: not valid"
 
   val AUTHENTICATION_INVALIDATION_CACHE_NAME = "authenticationInvalidationCache"
 }
@@ -407,7 +402,7 @@ final case class AuthenticatorLive(
                               }
 
                       /* check if the user is active, if not, then no need to check the password */
-                      _ <- ZIO.fail(BadCredentialsException(BAD_CRED_USER_INACTIVE)).when(!user.isActive)
+                      _ <- ZIO.fail(BadCredentialsException(BAD_CRED_NOT_VALID)).when(!user.isActive)
                       _ <- ZIO
                              .fail(BadCredentialsException(BAD_CRED_NOT_VALID))
                              .when(!user.passwordMatch(passCreds.password))
@@ -661,7 +656,7 @@ final case class AuthenticatorLive(
     messageRelay
       .ask[Option[User]](UserGetByIriADM(iri, UserInformationTypeADM.Full, KnoraSystemInstances.Users.SystemUser))
       .flatMap(ZIO.fromOption(_))
-      .orElseFail(BadCredentialsException(BAD_CRED_USER_NOT_FOUND))
+      .orElseFail(BadCredentialsException(BAD_CRED_NOT_VALID))
 
   /**
    * Tries to get a [[User]].
@@ -677,7 +672,7 @@ final case class AuthenticatorLive(
         UserGetByEmailADM(email, UserInformationTypeADM.Full, KnoraSystemInstances.Users.SystemUser)
       )
       .flatMap(ZIO.fromOption(_))
-      .orElseFail(BadCredentialsException(BAD_CRED_USER_NOT_FOUND))
+      .orElseFail(BadCredentialsException(BAD_CRED_NOT_VALID))
 
   /**
    * Tries to get a [[User]].
@@ -693,7 +688,7 @@ final case class AuthenticatorLive(
         UserGetByUsernameADM(username, UserInformationTypeADM.Full, KnoraSystemInstances.Users.SystemUser)
       )
       .flatMap(ZIO.fromOption(_))
-      .orElseFail(BadCredentialsException(BAD_CRED_USER_NOT_FOUND))
+      .orElseFail(BadCredentialsException(BAD_CRED_NOT_VALID))
 
   /**
    * Calculates the cookie name, where the external host and port are encoded as a base32 string