Merge pull request #69 from ing-bank/fix/missing-session-token-exception

Get empty string for logs if request doesn't contain sessionToken
ing-bank · Mar 24, 2023 · 873fe91 · 873fe91
2 parents f7fac50 + 05ef1cf
commit 873fe91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/scala/com/ing/wbaa/rokku/sts/api/UserApi.scala b/src/main/scala/com/ing/wbaa/rokku/sts/api/UserApi.scala
@@ -48,7 +48,7 @@ trait UserApi extends JwtToken {
             verifyInternalToken(bearerToken) {
               parameters("accessKey", "sessionToken".?) { (accessKey, sessionToken) =>
                 containsOnlyAlphanumeric(accessKey, s"bad accessKey format=$accessKey") {
-                  containsOnlyAlphanumeric(sessionToken getOrElse "", s"bad sessionToken format=${sessionToken.get}") {
+                  containsOnlyAlphanumeric(sessionToken getOrElse "", s"bad sessionToken format=${sessionToken getOrElse ""}") {
 
                     onSuccess(isCredentialActive(AwsAccessKey(accessKey), sessionToken.map(AwsSessionToken))) {
                       case Some(userInfo) =>

diff --git a/src/test/scala/com/ing/wbaa/rokku/sts/api/UserApiTest.scala b/src/test/scala/com/ing/wbaa/rokku/sts/api/UserApiTest.scala
@@ -113,6 +113,13 @@ class UserApiTest extends AnyWordSpec
           }
       }
 
+      "check credential and return ok because the accessKey exist and sessionToken is missing (NPA)" in {
+        Get(s"/isCredentialActive?accessKey=access")
+          .addHeader(RawHeader("Authorization", generateBearerToken())) ~> testRoute ~> check {
+            assert(status == StatusCodes.OK)
+          }
+      }
+
     }
   }
 }