Merge pull request #34 from joonasroosalung/dev

feat: 497 enable reading comma separated values from issuer property
buerokratt · Jul 23, 2024 · 6ab844c · 6ab844c
2 parents f41097c + 75180d3
commit 6ab844c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/ee/eesti/authentication/configuration/jwt/JwtUtils.java b/src/main/java/ee/eesti/authentication/configuration/jwt/JwtUtils.java
@@ -97,7 +97,7 @@ public SignedJWT getSignedJWTWithClaims(UUID jwtTokenId, String subject, Map<Str
 
         JWTClaimsSet.Builder claimsSetBuilder = new JWTClaimsSet.Builder()
                 .jwtID(jwtTokenId.toString())
-                .issuer(jwtSignatureConfig.getIssuer())
+                .issuer(getFirstIssuer())
                 .issueTime(issueDate)
                 .expirationTime(expirationDate)
                 .subject(subject);
@@ -229,7 +229,7 @@ public boolean isJwtTokenValid(String jwtTokenToCheck, boolean isCustomJwtToken)
             if (signedJWT.getJWTClaimsSet().getJWTID() == null
                     || signedJWT.getJWTClaimsSet().getExpirationTime() == null
                     || signedJWT.getJWTClaimsSet().getIssueTime() == null
-                    || !jwtSignatureConfig.getIssuer().equals(signedJWT.getJWTClaimsSet().getIssuer())
+                    || !containsIssuer(signedJWT.getJWTClaimsSet().getIssuer())
                     ) {
                 log.warn("some attributes of the JWT token (id:{}) are invalid", signedJWT.getJWTClaimsSet().getJWTID());
                 valid = false;
@@ -272,4 +272,12 @@ public static String removeNewlines(String in) {
         return in.replaceAll("[\n\r]+"," ");
     }
 
+    public String getFirstIssuer() {
+        return jwtSignatureConfig.getIssuer().split(",")[0];
+    }
+
+    public boolean containsIssuer(String tokenIssuer) {
+        return Set.of(jwtSignatureConfig.getIssuer().split(",")).contains(tokenIssuer);
+    }
+
 }
diff --git a/src/test/java/ee/eesti/authentication/configuration/jwt/JwtUtilsTest.java b/src/test/java/ee/eesti/authentication/configuration/jwt/JwtUtilsTest.java
@@ -63,7 +63,7 @@ private SignedJWT getSignedJwtFromTestKeystore(UserInfo userInfo) throws Excepti
         SignedJWT signedJWT = new SignedJWT(new JWSHeader(JWSAlgorithm.RS256),
                 new JWTClaimsSet.Builder()
                         .jwtID(UUID.randomUUID().toString())
-                        .issuer(jwtSignatureConfig.getIssuer())
+                        .issuer(jwtUtils.getFirstIssuer())
                         .issueTime(issueDate)
                         .expirationTime(expirationDate)
                         .subject(userInfo.getPersonalCode())

diff --git a/src/test/java/ee/eesti/authentication/controller/JwtControllerTest.java b/src/test/java/ee/eesti/authentication/controller/JwtControllerTest.java
@@ -128,7 +128,7 @@ void testUserinfoEndpoint() throws Exception {
 
         mvc.perform(
                         get("/jwt/userinfo")
-                                .cookie(new Cookie(jwtSignatureConfig.getCookieName(), getJwtTokenString(issueTime, expirationDate, jwtSignatureConfig.getIssuer(), UUID.randomUUID().toString(), claimSetToAdd, personalCode))))
+                                .cookie(new Cookie(jwtSignatureConfig.getCookieName(), getJwtTokenString(issueTime, expirationDate, jwtUtils.getFirstIssuer(), UUID.randomUUID().toString(), claimSetToAdd, personalCode))))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("personalCode", is(personalCode)))
                 .andExpect(jsonPath("firstName", is(firstName)))
@@ -161,7 +161,7 @@ void testVerificationProcess() throws Exception {
         //Valid Token
         mvc.perform(
                         post("/jwt/verify")
-                                .content(getJwtTokenString(new Date(), DateUtils.addMinutes(new Date(), 30), jwtSignatureConfig.getIssuer(), UUID.randomUUID().toString(), null, personalCode)))
+                                .content(getJwtTokenString(new Date(), DateUtils.addMinutes(new Date(), 30), jwtUtils.getFirstIssuer(), UUID.randomUUID().toString(), null, personalCode)))
                 .andExpect(status().isOk());
 
         //invalid token
@@ -173,7 +173,7 @@ void testVerificationProcess() throws Exception {
         //Expired token
         mvc.perform(
                         post("/jwt/verify")
-                                .content(getJwtTokenString(new Date(), new Date(), jwtSignatureConfig.getIssuer(), UUID.randomUUID().toString(), null, personalCode)))
+                                .content(getJwtTokenString(new Date(), new Date(), jwtUtils.getFirstIssuer(), UUID.randomUUID().toString(), null, personalCode)))
                 .andExpect(status().isBadRequest());
 
         //Invalid issuer