From eab835baadee6f04ba2082da5a01d7740bd08dfc Mon Sep 17 00:00:00 2001 From: Jon Koops Date: Tue, 31 Jan 2023 16:42:07 +0100 Subject: [PATCH] Deprecate legacy cookies behind `LEGACY_COOKIES` profile Co-authored-by: Alexander Schwartz --- common/src/main/java/org/keycloak/common/Profile.java | 3 +++ common/src/test/java/org/keycloak/common/ProfileTest.java | 2 +- .../HelpCommandDistTest.testBuildHelp.unix.approved.txt | 8 ++++---- ...HelpCommandDistTest.testBuildHelp.windows.approved.txt | 8 ++++---- ...HelpCommandDistTest.testStartDevHelp.unix.approved.txt | 8 ++++---- ...pCommandDistTest.testStartDevHelp.windows.approved.txt | 8 ++++---- ...pCommandDistTest.testStartDevHelpAll.unix.approved.txt | 8 ++++---- ...mmandDistTest.testStartDevHelpAll.windows.approved.txt | 8 ++++---- .../HelpCommandDistTest.testStartHelp.unix.approved.txt | 8 ++++---- ...HelpCommandDistTest.testStartHelp.windows.approved.txt | 8 ++++---- ...HelpCommandDistTest.testStartHelpAll.unix.approved.txt | 8 ++++---- ...pCommandDistTest.testStartHelpAll.windows.approved.txt | 8 ++++---- .../java/org/keycloak/services/util/CookieHelper.java | 7 ++++--- .../keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java | 3 +++ .../testsuite/cluster/AbstractFailoverClusterTest.java | 3 +++ .../java/org/keycloak/testsuite/cookies/CookieTest.java | 2 ++ .../testsuite/federation/storage/UserStorageTest.java | 2 ++ 17 files changed, 58 insertions(+), 44 deletions(-) diff --git a/common/src/main/java/org/keycloak/common/Profile.java b/common/src/main/java/org/keycloak/common/Profile.java index 242619e3eb8f..b6fe95c6796a 100755 --- a/common/src/main/java/org/keycloak/common/Profile.java +++ b/common/src/main/java/org/keycloak/common/Profile.java @@ -58,6 +58,9 @@ public enum Feature { IMPERSONATION("Ability for admins to impersonate users", Type.DEFAULT), + @Deprecated + LEGACY_COOKIES("Allow cookies without 'SameSite=None' for older browsers.", Type.DEPRECATED), + OPENSHIFT_INTEGRATION("Extension to enable securing OpenShift", Type.PREVIEW), SCRIPTS("Write custom authenticators using JavaScript", Type.PREVIEW), diff --git a/common/src/test/java/org/keycloak/common/ProfileTest.java b/common/src/test/java/org/keycloak/common/ProfileTest.java index 33501253e170..4c79959459b1 100644 --- a/common/src/test/java/org/keycloak/common/ProfileTest.java +++ b/common/src/test/java/org/keycloak/common/ProfileTest.java @@ -57,7 +57,7 @@ public void checkDefaults() { Assert.assertFalse(Profile.isFeatureEnabled(DEPRECATED_FEATURE)); Assert.assertEquals(Profile.ProfileName.DEFAULT, profile.getName()); - assertEquals(profile.getDisabledFeatures(), Profile.Feature.ADMIN, Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.DYNAMIC_SCOPES, Profile.Feature.DOCKER, Profile.Feature.RECOVERY_CODES, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.OPENSHIFT_INTEGRATION, Profile.Feature.MAP_STORAGE, Profile.Feature.DECLARATIVE_USER_PROFILE, Profile.Feature.CLIENT_SECRET_ROTATION, Profile.Feature.UPDATE_EMAIL); + assertEquals(profile.getDisabledFeatures(), Profile.Feature.ADMIN, Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.DYNAMIC_SCOPES, Profile.Feature.DOCKER, Profile.Feature.RECOVERY_CODES, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.LEGACY_COOKIES, Profile.Feature.OPENSHIFT_INTEGRATION, Profile.Feature.MAP_STORAGE, Profile.Feature.DECLARATIVE_USER_PROFILE, Profile.Feature.CLIENT_SECRET_ROTATION, Profile.Feature.UPDATE_EMAIL); assertEquals(profile.getPreviewFeatures(), Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.RECOVERY_CODES, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.OPENSHIFT_INTEGRATION, Profile.Feature.DECLARATIVE_USER_PROFILE, Profile.Feature.CLIENT_SECRET_ROTATION, Profile.Feature.UPDATE_EMAIL); } diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt index caae3ba5cf7c..6b72f4254199 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.unix.approved.txt @@ -46,15 +46,15 @@ Feature: --features Enables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. HTTP/TLS: diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt index 839bde452734..e9ccea9fff55 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBuildHelp.windows.approved.txt @@ -46,15 +46,15 @@ Feature: --features Enables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. HTTP/TLS: diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt index b89d6fa08558..e08a2d02d2c3 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.unix.approved.txt @@ -69,15 +69,15 @@ Feature: --features Enables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. Hostname: diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt index db0809b796b5..27a817f86883 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.windows.approved.txt @@ -69,15 +69,15 @@ Feature: --features Enables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. Hostname: diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt index ce8bceadd543..d7cfe4f85d02 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.unix.approved.txt @@ -127,15 +127,15 @@ Feature: --features Enables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. Hostname: diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt index abbd5af81cf4..4ae34aee0226 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.windows.approved.txt @@ -127,15 +127,15 @@ Feature: --features Enables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. Hostname: diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt index 038352fd328a..13fe84dd57c7 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.unix.approved.txt @@ -75,15 +75,15 @@ Feature: --features Enables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. Hostname: diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt index 12c999ebcec0..bbec0d01a781 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.windows.approved.txt @@ -75,15 +75,15 @@ Feature: --features Enables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. Hostname: diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt index 3ec881f5adff..46e258aa71ac 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.unix.approved.txt @@ -133,15 +133,15 @@ Feature: --features Enables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. Hostname: diff --git a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt index 337ab9b1a18f..cce68b91e4da 100644 --- a/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt +++ b/quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.windows.approved.txt @@ -133,15 +133,15 @@ Feature: --features Enables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. --features-disabled Disables a set of one or more features. Possible values are: account-api, account2, admin, admin-api, admin-fine-grained-authz, admin2, authorization, ciba, client-policies, client-secret-rotation, declarative-user-profile, - docker, dynamic-scopes, impersonation, js-adapter, kerberos, map-storage, - openshift-integration, par, preview, recovery-codes, scripts, + docker, dynamic-scopes, impersonation, js-adapter, kerberos, legacy-cookies, + map-storage, openshift-integration, par, preview, recovery-codes, scripts, step-up-authentication, token-exchange, update-email, web-authn. Hostname: diff --git a/services/src/main/java/org/keycloak/services/util/CookieHelper.java b/services/src/main/java/org/keycloak/services/util/CookieHelper.java index f6a6743cb7a9..c05782157bec 100755 --- a/services/src/main/java/org/keycloak/services/util/CookieHelper.java +++ b/services/src/main/java/org/keycloak/services/util/CookieHelper.java @@ -22,6 +22,7 @@ import org.jboss.resteasy.util.CookieParser; import org.keycloak.common.util.Resteasy; import org.keycloak.common.util.ServerCookie; +import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; import javax.ws.rs.core.Cookie; @@ -73,7 +74,7 @@ public static void addCookie(String name, String value, String path, String doma response.addHeader(HttpHeaders.SET_COOKIE, cookie); // a workaround for browser in older Apple OSs – browsers ignore cookies with SameSite=None - if (sameSiteParam == SameSiteAttributeValue.NONE) { + if (Profile.isFeatureEnabled(Profile.Feature.LEGACY_COOKIES) && sameSiteParam == SameSiteAttributeValue.NONE) { addCookie(name + LEGACY_COOKIE, value, path, domain, comment, maxAge, secure, httpOnly, null, session); } } @@ -96,7 +97,7 @@ public static void addCookie(String name, String value, String path, String doma public static Set getCookieValue(KeycloakSession session, String name) { Set ret = getInternalCookieValue(session, name); - if (ret.size() == 0) { + if (Profile.isFeatureEnabled(Profile.Feature.LEGACY_COOKIES) && ret.size() == 0) { String legacy = name + LEGACY_COOKIE; logger.debugv("Could not find any cookies with name '{0}', trying '{1}'", name, legacy); ret = getInternalCookieValue(session, legacy); @@ -142,7 +143,7 @@ public static Set parseCookie(String header, String name) { public static Cookie getCookie(Map cookies, String name) { Cookie cookie = cookies.get(name); - if (cookie != null) { + if (!Profile.isFeatureEnabled(Profile.Feature.LEGACY_COOKIES) || cookie != null) { return cookie; } else { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java index f1ea10f0075a..6c0223dfd7ce 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java @@ -3,11 +3,13 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.keycloak.common.Profile; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.util.CookieHelper; +import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.util.OAuthClient; @@ -20,6 +22,7 @@ import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; +@EnableFeature(value = Profile.Feature.LEGACY_COOKIES, skipRestart = true) public class KcOidcBrokerLogoutTest extends AbstractBaseBrokerTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java index 7da32d1a9864..1fecf81dcd8d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java @@ -23,12 +23,14 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.keycloak.common.Profile; import org.keycloak.OAuth2Constants; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.InfoPage; import org.keycloak.testsuite.pages.LoginPage; @@ -48,6 +50,7 @@ import static org.keycloak.testsuite.util.OAuthClient.AUTH_SERVER_ROOT; import static org.keycloak.testsuite.util.WaitUtils.pause; +@EnableFeature(value = Profile.Feature.LEGACY_COOKIES, skipRestart = true) public abstract class AbstractFailoverClusterTest extends AbstractClusterTest { public static final String KEYCLOAK_SESSION_COOKIE = "KEYCLOAK_SESSION"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java index a7435e01ff6b..753cf6badd14 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java @@ -32,6 +32,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; +import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.ContainerAssume; @@ -62,6 +63,7 @@ * @author Vaclav Muzikar */ @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) +@EnableFeature(value = Profile.Feature.LEGACY_COOKIES, skipRestart = true) public class CookieTest extends AbstractKeycloakTest { @Page diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java index 85d727187cdc..6c5accdd3cb2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java @@ -40,6 +40,7 @@ import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; +import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.federation.UserMapStorage; import org.keycloak.testsuite.federation.UserMapStorageFactory; @@ -101,6 +102,7 @@ * @author tkyjovsk */ @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) +@EnableFeature(value = Profile.Feature.LEGACY_COOKIES, skipRestart = true) public class UserStorageTest extends AbstractAuthTest { private String memProviderId;