feat(jans-auth-server): allow end session with expired id_token_hint …

…(by checking signature and sid) #2430 (#2431) docs: no docs (swagger is updated) #2430
JanssenProject · Sep 21, 2022 · 1b46b44 · 1b46b44
1 parent 110cb14
commit 1b46b44
Show file tree

Hide file tree

Showing 7 changed files with 319 additions and 64 deletions.
diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java b/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java
@@ -262,6 +262,8 @@ public class AppConfiguration implements Configuration {
     private Boolean useLocalCache = false;
     private Boolean fapiCompatibility = false;
     private Boolean forceIdTokenHintPrecense = false;
+    private Boolean rejectEndSessionIfIdTokenExpired = false;
+    private Boolean allowEndSessionWithUnmatchedSid = false;
     private Boolean forceOfflineAccessScopeToEnableRefreshToken = true;
     private Boolean errorReasonEnabled = false;
     private Boolean removeRefreshTokensForClientOnLogout = true;
@@ -727,6 +729,22 @@ public void setForceIdTokenHintPrecense(Boolean forceIdTokenHintPrecense) {
         this.forceIdTokenHintPrecense = forceIdTokenHintPrecense;
     }
 
+    public Boolean getRejectEndSessionIfIdTokenExpired() {
+        return rejectEndSessionIfIdTokenExpired;
+    }
+
+    public void setRejectEndSessionIfIdTokenExpired(Boolean rejectEndSessionIfIdTokenExpired) {
+        this.rejectEndSessionIfIdTokenExpired = rejectEndSessionIfIdTokenExpired;
+    }
+
+    public Boolean getAllowEndSessionWithUnmatchedSid() {
+        return allowEndSessionWithUnmatchedSid;
+    }
+
+    public void setAllowEndSessionWithUnmatchedSid(Boolean allowEndSessionWithUnmatchedSid) {
+        this.allowEndSessionWithUnmatchedSid = allowEndSessionWithUnmatchedSid;
+    }
+
     public Boolean getRemoveRefreshTokensForClientOnLogout() {
         if (removeRefreshTokensForClientOnLogout == null) removeRefreshTokensForClientOnLogout = true;
         return removeRefreshTokensForClientOnLogout;

diff --git a/...er/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImpl.java b/...er/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImpl.java
diff --git a/...erver/src/test/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImplTest.java b/...erver/src/test/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImplTest.java
@@ -0,0 +1,176 @@
+package io.jans.as.server.session.ws.rs;
+
+import io.jans.as.common.model.session.SessionId;
+import io.jans.as.model.common.GrantType;
+import io.jans.as.model.configuration.AppConfiguration;
+import io.jans.as.model.crypto.AbstractCryptoProvider;
+import io.jans.as.model.error.ErrorResponseFactory;
+import io.jans.as.model.jwt.Jwt;
+import io.jans.as.server.audit.ApplicationAuditLogger;
+import io.jans.as.server.model.common.AuthorizationGrant;
+import io.jans.as.server.model.common.AuthorizationGrantList;
+import io.jans.as.server.service.*;
+import io.jans.as.server.service.external.ExternalApplicationSessionService;
+import io.jans.as.server.service.external.ExternalEndSessionService;
+import io.jans.model.security.Identity;
+import jakarta.ws.rs.WebApplicationException;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.testng.MockitoTestNGListener;
+import org.slf4j.Logger;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertNull;
+import static org.testng.AssertJUnit.assertNotNull;
+
+/**
+ * @author Yuriy Z
+ */
+@Listeners(MockitoTestNGListener.class)
+public class EndSessionRestWebServiceImplTest {
+
+    private static final String DUMMY_JWT = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJPbmxpbmUgSldUIEJ1aWxkZXIiLCJpYXQiOjE2NjM2NzcxODUsImV4cCI6MTY5NTIxMzE4NSwiYXVkIjoid3d3LmV4YW1wbGUuY29tIiwic3ViIjoianJvY2tldEBleGFtcGxlLmNvbSIsIkdpdmVuTmFtZSI6IkpvaG5ueSIsIlN1cm5hbWUiOiJSb2NrZXQiLCJFbWFpbCI6Impyb2NrZXRAZXhhbXBsZS5jb20iLCJzaWQiOiIxMjM0IiwiUm9sZSI6IlByb2plY3QgQWRtaW5pc3RyYXRvciJ9.pmJ5kTvxyfOUGOXTzYA1DMjbF96lfCF1dVSn_70nf2Q";
+    private static final AuthorizationGrant GRANT = new AuthorizationGrant() {
+        @Override
+        public GrantType getGrantType() {
+            return GrantType.AUTHORIZATION_CODE;
+        }
+    };
+
+    @InjectMocks
+    private EndSessionRestWebServiceImpl endSessionRestWebService;
+
+    @Mock
+    private Logger log;
+
+    @Mock
+    private ErrorResponseFactory errorResponseFactory;
+
+    @Mock
+    private RedirectionUriService redirectionUriService;
+
+    @Mock
+    private AuthorizationGrantList authorizationGrantList;
+
+    @Mock
+    private ExternalApplicationSessionService externalApplicationSessionService;
+
+    @Mock
+    private ExternalEndSessionService externalEndSessionService;
+
+    @Mock
+    private SessionIdService sessionIdService;
+
+    @Mock
+    private CookieService cookieService;
+
+    @Mock
+    private ClientService clientService;
+
+    @Mock
+    private GrantService grantService;
+
+    @Mock
+    private Identity identity;
+
+    @Mock
+    private ApplicationAuditLogger applicationAuditLogger;
+
+    @Mock
+    private AppConfiguration appConfiguration;
+
+    @Mock
+    private LogoutTokenFactory logoutTokenFactory;
+
+    @Mock
+    private AbstractCryptoProvider cryptoProvider;
+
+    @Test
+    public void validateIdTokenHint_whenIdTokenHintIsBlank_shouldGetNoError() {
+        assertNull(endSessionRestWebService.validateIdTokenHint("", null, "http://postlogout.com"));
+    }
+
+    @Test(expectedExceptions = WebApplicationException.class)
+    public void validateIdTokenHint_whenIdTokenHintIsBlankButRequired_shouldGetError() {
+        when(appConfiguration.getForceIdTokenHintPrecense()).thenReturn(true);
+
+        endSessionRestWebService.validateIdTokenHint("", null, "http://postlogout.com");
+    }
+
+    @Test(expectedExceptions = WebApplicationException.class)
+    public void validateIdTokenHint_whenIdTokenIsNotInDbAndExpiredIsNotAllowed_shouldGetError() {
+        when(appConfiguration.getRejectEndSessionIfIdTokenExpired()).thenReturn(true);
+        when(endSessionRestWebService.getTokenHintGrant("test")).thenReturn(null);
+
+        endSessionRestWebService.validateIdTokenHint("testToken", null, "http://postlogout.com");
+    }
+
+    @Test(expectedExceptions = WebApplicationException.class)
+    public void validateIdTokenHint_whenIdTokenIsNotValidJwt_shouldGetError() {
+        when(appConfiguration.getEndSessionWithAccessToken()).thenReturn(true);
+        when(endSessionRestWebService.getTokenHintGrant("notValidJwt")).thenReturn(GRANT);
+
+        endSessionRestWebService.validateIdTokenHint("notValidJwt", null, "http://postlogout.com");
+    }
+
+    @Test
+    public void validateIdTokenHint_whenIdTokenIsValidJwt_shouldGetValidJwt() {
+        when(appConfiguration.getEndSessionWithAccessToken()).thenReturn(true);
+        when(endSessionRestWebService.getTokenHintGrant(DUMMY_JWT)).thenReturn(GRANT);
+
+        final Jwt jwt = endSessionRestWebService.validateIdTokenHint(DUMMY_JWT, null, "http://postlogout.com");
+        assertNotNull(jwt);
+    }
+
+    @Test(expectedExceptions = WebApplicationException.class)
+    public void validateIdTokenHint_whenIdTokenSignatureIsBad_shouldGetError() throws Exception {
+        when(appConfiguration.getEndSessionWithAccessToken()).thenReturn(false);
+        when(appConfiguration.getAllowEndSessionWithUnmatchedSid()).thenReturn(true);
+        when(endSessionRestWebService.getTokenHintGrant(DUMMY_JWT)).thenReturn(null);
+        when(cryptoProvider.verifySignature(anyString(), anyString(), anyString(), isNull(), isNull(), any())).thenReturn(false);
+
+        assertNull(endSessionRestWebService.validateIdTokenHint(DUMMY_JWT, null, "http://postlogout.com"));
+    }
+
+    @Test
+    public void validateIdTokenHint_whenIdTokenIsExpiredAndSidCheckIsNotRequired_shouldGetValidJwt() throws Exception {
+        when(appConfiguration.getEndSessionWithAccessToken()).thenReturn(false);
+        when(appConfiguration.getAllowEndSessionWithUnmatchedSid()).thenReturn(true);
+        when(endSessionRestWebService.getTokenHintGrant(DUMMY_JWT)).thenReturn(null);
+        when(cryptoProvider.verifySignature(anyString(), anyString(), isNull(), isNull(), isNull(), any())).thenReturn(true);
+
+        final Jwt jwt = endSessionRestWebService.validateIdTokenHint(DUMMY_JWT, null, "http://postlogout.com");
+        assertNotNull(jwt);
+    }
+
+    @Test
+    public void validateIdTokenHint_whenIdTokenIsExpiredAndSidCheckIsRequired_shouldGetValidJwt() throws Exception {
+        when(appConfiguration.getEndSessionWithAccessToken()).thenReturn(false);
+        when(appConfiguration.getAllowEndSessionWithUnmatchedSid()).thenReturn(false);
+        when(endSessionRestWebService.getTokenHintGrant(DUMMY_JWT)).thenReturn(null);
+        when(cryptoProvider.verifySignature(anyString(), anyString(), isNull(), isNull(), isNull(), any())).thenReturn(true);
+
+        SessionId sidSession = new SessionId();
+        sidSession.setOutsideSid("1234"); // sid encoded into DUMMY_JWT
+
+        final Jwt jwt = endSessionRestWebService.validateIdTokenHint(DUMMY_JWT, sidSession, "http://postlogout.com");
+        assertNotNull(jwt);
+    }
+
+    @Test(expectedExceptions = WebApplicationException.class)
+    public void validateIdTokenHint_whenIdTokenIsExpiredAndSidCheckIsRequiredButSessionHasAnotherSid_shouldGetError() throws Exception {
+        when(appConfiguration.getEndSessionWithAccessToken()).thenReturn(false);
+        when(appConfiguration.getAllowEndSessionWithUnmatchedSid()).thenReturn(false);
+        when(endSessionRestWebService.getTokenHintGrant(DUMMY_JWT)).thenReturn(null);
+        when(cryptoProvider.verifySignature(anyString(), anyString(), isNull(), isNull(), isNull(), any())).thenReturn(true);
+
+        SessionId sidSession = new SessionId();
+        sidSession.setOutsideSid("12345"); // sid encoded into DUMMY_JWT
+
+        final Jwt jwt = endSessionRestWebService.validateIdTokenHint(DUMMY_JWT, sidSession, "http://postlogout.com");
+        assertNotNull(jwt);
+    }
+}
diff --git a/jans-auth-server/server/src/test/resources/testng.xml b/jans-auth-server/server/src/test/resources/testng.xml
@@ -22,6 +22,7 @@
             <class name="io.jans.as.server.token.ws.rs.TokenRestWebServiceValidatorTest" />
             <class name="io.jans.as.server.ws.rs.stat.MonthsTest" />
             <class name="io.jans.as.server.authorize.ws.rs.AuthorizeRestWebServiceValidatorTest" />
+            <class name="io.jans.as.server.session.ws.rs.EndSessionRestWebServiceImplTest" />
         </classes>
     </test>
 

diff --git a/jans-config-api/docs/jans-config-api-swagger-auto.yaml b/jans-config-api/docs/jans-config-api-swagger-auto.yaml
@@ -4329,6 +4329,10 @@ components:
           type: boolean
         forceIdTokenHintPrecense:
           type: boolean
+        rejectEndSessionIfIdTokenExpired:
+          type: boolean
+        allowEndSessionWithUnmatchedSid:
+          type: boolean
         forceOfflineAccessScopeToEnableRefreshToken:
           type: boolean
         errorReasonEnabled:

diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml
@@ -5288,6 +5288,12 @@ components:
         forceIdTokenHintPrecense:
           type: boolean
           description: Boolean value specifying whether force id_token_hint parameter presence.
+        rejectEndSessionIfIdTokenExpired:
+          type: boolean
+          description: default value false. If true and id_token is not found in db, request is rejected.
+        allowEndSessionWithUnmatchedSid:
+          type: boolean
+          description: default value false. If true, sid check will be skipped.
         forceOfflineAccessScopeToEnableRefreshToken:
           type: boolean
           description: Boolean value specifying whether force offline_access scope to enable refresh_token grant type.

diff --git a/...-config-api/server/src/test/resources/feature/config/properties/openid/config/config.json b/...-config-api/server/src/test/resources/feature/config/properties/openid/config/config.json
@@ -44,6 +44,8 @@
   "frontChannelLogoutSessionSupported": true,
   "spontaneousScopeLifetime": 86400,
   "forceIdTokenHintPrecense": false,
+  "rejectEndSessionIfIdTokenExpired": false,
+  "allowEndSessionWithUnmatchedSid": false,
   "claimsParameterSupported": false,
   "claimTypesSupported": [
     "normal"