[arch-commits] Commit in keycloak/repos (9 files)
Frederik Schwan
freswa at gemini.archlinux.org
Wed Apr 20 20:11:59 UTC 2022
Date: Wednesday, April 20, 2022 @ 20:11:59
Author: freswa
Revision: 1187185
archrelease: copy trunk to community-testing-any
Added:
keycloak/repos/community-testing-any/
keycloak/repos/community-testing-any/0001-KEYCLOAK-19177-Disable-ECP-flow-by-default-for-all-S.patch
(from rev 1187184, keycloak/trunk/0001-KEYCLOAK-19177-Disable-ECP-flow-by-default-for-all-S.patch)
keycloak/repos/community-testing-any/PKGBUILD
(from rev 1187184, keycloak/trunk/PKGBUILD)
keycloak/repos/community-testing-any/common.sh
(from rev 1187184, keycloak/trunk/common.sh)
keycloak/repos/community-testing-any/keycloak.install
(from rev 1187184, keycloak/trunk/keycloak.install)
keycloak/repos/community-testing-any/keycloak.service
(from rev 1187184, keycloak/trunk/keycloak.service)
keycloak/repos/community-testing-any/keycloak.sysusers
(from rev 1187184, keycloak/trunk/keycloak.sysusers)
keycloak/repos/community-testing-any/keycloak.tmpfiles
(from rev 1187184, keycloak/trunk/keycloak.tmpfiles)
keycloak/repos/community-testing-any/pin-java-version.patch
(from rev 1187184, keycloak/trunk/pin-java-version.patch)
-----------------------------------------------------------------+
0001-KEYCLOAK-19177-Disable-ECP-flow-by-default-for-all-S.patch | 367 ++++++++++
PKGBUILD | 85 ++
common.sh | 3
keycloak.install | 7
keycloak.service | 51 +
keycloak.sysusers | 1
keycloak.tmpfiles | 3
pin-java-version.patch | 56 +
8 files changed, 573 insertions(+)
Copied: keycloak/repos/community-testing-any/0001-KEYCLOAK-19177-Disable-ECP-flow-by-default-for-all-S.patch (from rev 1187184, keycloak/trunk/0001-KEYCLOAK-19177-Disable-ECP-flow-by-default-for-all-S.patch)
===================================================================
--- community-testing-any/0001-KEYCLOAK-19177-Disable-ECP-flow-by-default-for-all-S.patch (rev 0)
+++ community-testing-any/0001-KEYCLOAK-19177-Disable-ECP-flow-by-default-for-all-S.patch 2022-04-20 20:11:59 UTC (rev 1187185)
@@ -0,0 +1,367 @@
+From 44000caaf5051d7f218d1ad79573bd3d175cad0d Mon Sep 17 00:00:00 2001
+From: Michal Hajas <mhajas at redhat.com>
+Date: Mon, 4 Oct 2021 15:26:29 +0200
+Subject: [PATCH] KEYCLOAK-19177 Disable ECP flow by default for all Saml
+ clients; ecp flow creates only transient users sessions
+
+---
+ .../keycloak/protocol/saml/SamlClient.java | 8 ++
+ .../protocol/saml/SamlConfigAttributes.java | 1 +
+ .../protocol/saml/SamlProtocolFactory.java | 4 +
+ .../saml/SamlRepresentationAttributes.java | 5 ++
+ .../profile/ecp/SamlEcpProfileService.java | 11 ++-
+ .../testsuite/saml/SOAPBindingTest.java | 79 ++++++++++++++++++-
+ .../adapter-test/keycloak-saml/testsaml.json | 3 +-
+ .../clients/settings/ClientSettingsForm.java | 2 +
+ .../console/clients/AbstractClientTest.java | 3 +-
+ .../messages/admin-messages_en.properties | 2 +
+ .../admin/resources/js/controllers/clients.js | 14 ++++
+ .../resources/partials/client-detail.html | 7 ++
+ 12 files changed, 135 insertions(+), 4 deletions(-)
+
+diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlClient.java b/services/src/main/java/org/keycloak/protocol/saml/SamlClient.java
+index 1b8f23495e..9cf0cd1847 100755
+--- a/services/src/main/java/org/keycloak/protocol/saml/SamlClient.java
++++ b/services/src/main/java/org/keycloak/protocol/saml/SamlClient.java
+@@ -120,6 +120,14 @@ public class SamlClient extends ClientConfigResolver {
+ client.setAttribute(SamlConfigAttributes.SAML_FORCE_NAME_ID_FORMAT_ATTRIBUTE, Boolean.toString(val));
+ }
+
++ public boolean allowECPFlow() {
++ return "true".equals(resolveAttribute(SamlConfigAttributes.SAML_ALLOW_ECP_FLOW));
++ }
++
++ public void setAllowECPFlow(boolean val) {
++ client.setAttribute(SamlConfigAttributes.SAML_ALLOW_ECP_FLOW, Boolean.toString(val));
++ }
++
+ public boolean forceArtifactBinding(){
+ return "true".equals(resolveAttribute(SamlConfigAttributes.SAML_ARTIFACT_BINDING));
+ }
+diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlConfigAttributes.java b/services/src/main/java/org/keycloak/protocol/saml/SamlConfigAttributes.java
+index 59f27f50ab..02a41c4831 100755
+--- a/services/src/main/java/org/keycloak/protocol/saml/SamlConfigAttributes.java
++++ b/services/src/main/java/org/keycloak/protocol/saml/SamlConfigAttributes.java
+@@ -44,4 +44,5 @@ public interface SamlConfigAttributes {
+ String SAML_ENCRYPTION_PRIVATE_KEY_ATTRIBUTE = "saml.encryption." + CertificateInfoHelper.PRIVATE_KEY;
+ String SAML_ASSERTION_LIFESPAN = "saml.assertion.lifespan";
+ String SAML_ARTIFACT_BINDING_IDENTIFIER = "saml.artifact.binding.identifier";
++ String SAML_ALLOW_ECP_FLOW = "saml.allow.ecp.flow";
+ }
+diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java
+index fae3e4de09..772885553b 100755
+--- a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java
++++ b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java
+@@ -154,6 +154,10 @@ public class SamlProtocolFactory extends AbstractLoginProtocolFactory {
+ client.setForceNameIDFormat(false);
+ }
+
++ if (rep.getAllowEcpFlow() == null) {
++ client.setAllowECPFlow(false);
++ }
++
+ if (rep.getSamlServerSignature() == null) {
+ client.setRequiresRealmSignature(true);
+ }
+diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlRepresentationAttributes.java b/services/src/main/java/org/keycloak/protocol/saml/SamlRepresentationAttributes.java
+index a64b847b80..e4da38eee9 100755
+--- a/services/src/main/java/org/keycloak/protocol/saml/SamlRepresentationAttributes.java
++++ b/services/src/main/java/org/keycloak/protocol/saml/SamlRepresentationAttributes.java
+@@ -61,6 +61,11 @@ public class SamlRepresentationAttributes {
+ return getAttributes().get(SamlConfigAttributes.SAML_FORCE_NAME_ID_FORMAT_ATTRIBUTE);
+ }
+
++ public String getAllowEcpFlow() {
++ if (getAttributes() == null) return null;
++ return getAttributes().get(SamlConfigAttributes.SAML_ALLOW_ECP_FLOW);
++ }
++
+ public String getSamlArtifactBinding() {
+ if (getAttributes() == null) return null;
+ return getAttributes().get(SamlConfigAttributes.SAML_ARTIFACT_BINDING);
+diff --git a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java
+index 7457381d22..f3202a7c3b 100755
+--- a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java
++++ b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java
+@@ -26,6 +26,7 @@ import org.keycloak.models.RealmModel;
+ import org.keycloak.models.UserSessionModel;
+ import org.keycloak.models.utils.DefaultAuthenticationFlows;
+ import org.keycloak.protocol.saml.JaxrsSAML2BindingBuilder;
++import org.keycloak.protocol.saml.SamlClient;
+ import org.keycloak.protocol.saml.SamlConfigAttributes;
+ import org.keycloak.protocol.saml.SamlProtocol;
+ import org.keycloak.protocol.saml.SamlService;
+@@ -36,6 +37,7 @@ import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
+ import org.keycloak.saml.common.exceptions.ConfigurationException;
+ import org.keycloak.saml.common.exceptions.ProcessingException;
+ import org.keycloak.saml.validators.DestinationValidator;
++import org.keycloak.services.managers.AuthenticationManager;
+ import org.keycloak.sessions.AuthenticationSessionModel;
+ import org.w3c.dom.Document;
+
+@@ -44,7 +46,6 @@ import javax.xml.soap.SOAPException;
+ import javax.xml.soap.SOAPHeaderElement;
+ import java.io.IOException;
+ import java.io.InputStream;
+-import java.util.Map;
+ import java.util.Objects;
+
+ /**
+@@ -79,6 +80,12 @@ public class SamlEcpProfileService extends SamlService {
+
+ @Override
+ protected Response loginRequest(String relayState, AuthnRequestType requestAbstractType, ClientModel client) {
++ // Do not allow ECP login when client does not support it
++ if (!new SamlClient(client).allowECPFlow()) {
++ logger.errorf("Client %s is not allowed to execute ECP flow", client.getClientId());
++ throw new RuntimeException("Client is not allowed to use ECP profile.");
++ }
++
+ // force passive authentication when executing this profile
+ requestAbstractType.setIsPassive(true);
+ requestAbstractType.setDestination(session.getContext().getUri().getAbsolutePath());
+@@ -99,6 +106,8 @@ public class SamlEcpProfileService extends SamlService {
+
+ @Override
+ protected Response newBrowserAuthentication(AuthenticationSessionModel authSession, boolean isPassive, boolean redirectToAuthentication, SamlProtocol samlProtocol) {
++ // Saml ECP flow creates only TRANSIENT user sessions
++ authSession.setClientNote(AuthenticationManager.USER_SESSION_PERSISTENT_STATE, UserSessionModel.SessionPersistenceState.TRANSIENT.toString());
+ return super.newBrowserAuthentication(authSession, isPassive, redirectToAuthentication, createEcpSamlProtocol());
+ }
+
+diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java
+index 4afbbbbe12..41007f70e9 100644
+--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java
++++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java
+@@ -17,17 +17,34 @@
+ package org.keycloak.testsuite.saml;
+
+ import org.junit.Test;
++import org.keycloak.dom.saml.v2.SAML2Object;
++import org.keycloak.dom.saml.v2.assertion.AuthnStatementType;
+ import org.keycloak.dom.saml.v2.protocol.ResponseType;
+ import org.keycloak.dom.saml.v2.protocol.StatusResponseType;
++import org.keycloak.models.RealmModel;
++import org.keycloak.models.UserSessionModel;
+ import org.keycloak.protocol.saml.SamlConfigAttributes;
++import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
+ import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder;
+ import org.keycloak.testsuite.updaters.ClientAttributeUpdater;
+ import org.keycloak.testsuite.util.SamlClientBuilder;
+
++import javax.ws.rs.core.Response;
++import javax.xml.soap.MessageFactory;
++import javax.xml.soap.SOAPException;
++import javax.xml.soap.SOAPMessage;
++
++import java.io.IOException;
++
++import static org.hamcrest.MatcherAssert.assertThat;
+ import static org.hamcrest.Matchers.empty;
++import static org.hamcrest.Matchers.equalTo;
+ import static org.hamcrest.Matchers.instanceOf;
++import static org.hamcrest.Matchers.is;
+ import static org.hamcrest.Matchers.not;
+-import static org.junit.Assert.assertThat;
++import static org.hamcrest.Matchers.nullValue;
++import static org.keycloak.testsuite.util.Matchers.isSamlResponse;
++import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC;
+ import static org.keycloak.testsuite.util.SamlClient.Binding.POST;
+ import static org.keycloak.testsuite.util.SamlClient.Binding.SOAP;
+
+@@ -214,4 +231,64 @@ public class SOAPBindingTest extends AbstractSamlTest {
+
+ assertThat(response.getSamlObject(), instanceOf(StatusResponseType.class));
+ }
++
++ @Test
++ public void soapBindingIsNotPossibleForClientsWithSamlEcpFlowAttributeFalse() {
++ // Disable ECP_FLOW_ENABLED switch
++ getCleanup().addCleanup(ClientAttributeUpdater.forClient(adminClient, REALM_NAME, SAML_CLIENT_ID_ECP_SP)
++ .setAttribute(SamlConfigAttributes.SAML_ALLOW_ECP_FLOW, "false")
++ .setAttribute(SamlConfigAttributes.SAML_SERVER_SIGNATURE, "false")
++ .setAttribute(SamlConfigAttributes.SAML_CLIENT_SIGNATURE_ATTRIBUTE, "false")
++ .update());
++
++ new SamlClientBuilder()
++ .authnRequest(getAuthServerSamlEndpoint(REALM_NAME), SAML_CLIENT_ID_ECP_SP, SAML_ASSERTION_CONSUMER_URL_ECP_SP, SOAP)
++ .basicAuthentication(bburkeUser)
++ .build()
++ .execute(response -> {
++ assertThat(response, statusCodeIsHC(Response.Status.INTERNAL_SERVER_ERROR));
++
++ try {
++ MessageFactory messageFactory = MessageFactory.newInstance();
++ SOAPMessage soapMessage = messageFactory.createMessage(null, response.getEntity().getContent());
++ String faultDetail = soapMessage.getSOAPBody().getFault().getDetail().getValue();
++ assertThat(faultDetail, is(equalTo("Client is not allowed to use ECP profile.")));
++ } catch (SOAPException | IOException e) {
++ throw new RuntimeException(e);
++ }
++ });
++
++ }
++
++ @Test
++ public void ecpFlowCreatesTransientSessions() {
++ // Disable ECP_FLOW_ENABLED switch
++ getCleanup().addCleanup(ClientAttributeUpdater.forClient(adminClient, REALM_NAME, SAML_CLIENT_ID_ECP_SP)
++ .setAttribute(SamlConfigAttributes.SAML_SERVER_SIGNATURE, "false")
++ .setAttribute(SamlConfigAttributes.SAML_CLIENT_SIGNATURE_ATTRIBUTE, "false")
++ .update());
++
++ // Successfully login using ECP flow
++ SAML2Object samlObject = new SamlClientBuilder()
++ .authnRequest(getAuthServerSamlEndpoint(REALM_NAME), SAML_CLIENT_ID_ECP_SP, SAML_ASSERTION_CONSUMER_URL_ECP_SP, SOAP)
++ .basicAuthentication(bburkeUser)
++ .build()
++ .executeAndTransform(SOAP::extractResponse).getSamlObject();
++
++ assertThat(samlObject, isSamlResponse(JBossSAMLURIConstants.STATUS_SUCCESS));
++ ResponseType loginResp1 = (ResponseType) samlObject;
++ AuthnStatementType sessionId = (AuthnStatementType) loginResp1.getAssertions().get(0).getAssertion().getStatements().iterator().next();
++
++ String userSessionId = sessionId.getSessionIndex().split("::")[0];
++
++ // Test that the user session with the given ID does not exist
++ testingClient.server().run(session -> {
++ RealmModel realmByName = session.realms().getRealmByName(REALM_NAME);
++ UserSessionModel userSession = session.sessions().getUserSession(realmByName, userSessionId);
++
++ assertThat(userSession, nullValue());
++ });
++
++
++ }
+ }
+diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/testsaml.json b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/testsaml.json
+index 604c32b39b..8b4f721ffd 100755
+--- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/testsaml.json
++++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/testsaml.json
+@@ -716,7 +716,8 @@
+ "saml.signature.algorithm": "RSA_SHA256",
+ "saml.client.signature": "true",
+ "saml.authnstatement": "true",
+- "saml.signing.certificate": "MIIB1DCCAT0CBgFJGP5dZDANBgkqhkiG9w0BAQsFADAwMS4wLAYDVQQDEyVodHRwOi8vbG9jYWxob3N0OjgwODAvc2FsZXMtcG9zdC1zaWcvMB4XDTE0MTAxNjEyNDQyM1oXDTI0MTAxNjEyNDYwM1owMDEuMCwGA1UEAxMlaHR0cDovL2xvY2FsaG9zdDo4MDgwL3NhbGVzLXBvc3Qtc2lnLzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1RvGu8RjemSJA23nnMksoHA37MqY1DDTxOECY4rPAd9egr7GUNIXE0y1MokaR5R2crNpN8RIRwR8phQtQDjXL82c6W+NLQISxztarQJ7rdNJIYwHY0d5ri1XRpDP8zAuxubPYiMAVYcDkIcvlbBpwh/dRM5I2eElRK+eSiaMkCUCAwEAATANBgkqhkiG9w0BAQsFAAOBgQCLms6htnPaY69k1ntm9a5jgwSn/K61cdai8R8B0ccY7zvinn9AfRD7fiROQpFyY29wKn8WCLrJ86NBXfgFUGyR5nLNHVy3FghE36N2oHy53uichieMxffE6vhkKJ4P8ChfJMMOZlmCPsQPDvjoAghHt4mriFiQgRdPgIy/zDjSNw=="
++ "saml.signing.certificate": "MIIB1DCCAT0CBgFJGP5dZDANBgkqhkiG9w0BAQsFADAwMS4wLAYDVQQDEyVodHRwOi8vbG9jYWxob3N0OjgwODAvc2FsZXMtcG9zdC1zaWcvMB4XDTE0MTAxNjEyNDQyM1oXDTI0MTAxNjEyNDYwM1owMDEuMCwGA1UEAxMlaHR0cDovL2xvY2FsaG9zdDo4MDgwL3NhbGVzLXBvc3Qtc2lnLzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1RvGu8RjemSJA23nnMksoHA37MqY1DDTxOECY4rPAd9egr7GUNIXE0y1MokaR5R2crNpN8RIRwR8phQtQDjXL82c6W+NLQISxztarQJ7rdNJIYwHY0d5ri1XRpDP8zAuxubPYiMAVYcDkIcvlbBpwh/dRM5I2eElRK+eSiaMkCUCAwEAATANBgkqhkiG9w0BAQsFAAOBgQCLms6htnPaY69k1ntm9a5jgwSn/K61cdai8R8B0ccY7zvinn9AfRD7fiROQpFyY29wKn8WCLrJ86NBXfgFUGyR5nLNHVy3FghE36N2oHy53uichieMxffE6vhkKJ4P8ChfJMMOZlmCPsQPDvjoAghHt4mriFiQgRdPgIy/zDjSNw==",
++ "saml.allow.ecp.flow": "true"
+ }
+ },
+ {
+diff --git a/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/clients/settings/ClientSettingsForm.java b/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/clients/settings/ClientSettingsForm.java
+index 88de5cafb8..97f0fd55f3 100644
+--- a/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/clients/settings/ClientSettingsForm.java
++++ b/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/clients/settings/ClientSettingsForm.java
+@@ -4,6 +4,7 @@ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Map;
+
++import org.keycloak.protocol.saml.SamlConfigAttributes;
+ import org.keycloak.representations.idm.ClientRepresentation;
+ import org.keycloak.testsuite.console.page.clients.CreateClientForm;
+ import org.keycloak.testsuite.console.page.fragment.OnOffSwitch;
+@@ -262,6 +263,7 @@ public class ClientSettingsForm extends CreateClientForm {
+ public static final String SAML_ASSERTION_CONSUMER_URL_REDIRECT = "saml_assertion_consumer_url_redirect";
+ public static final String SAML_FORCE_NAME_ID_FORMAT = "saml_force_name_id_format";
+ public static final String SAML_NAME_ID_FORMAT = "saml_name_id_format";
++ public static final String SAML_ALLOW_ECP_FLOW = SamlConfigAttributes.SAML_ALLOW_ECP_FLOW;
+ public static final String SAML_SIGNATURE_CANONICALIZATION_METHOD = "saml_signature_canonicalization_method";
+ public static final String SAML_SINGLE_LOGOUT_SERVICE_URL_POST = "saml_single_logout_service_url_post";
+ public static final String SAML_SINGLE_LOGOUT_SERVICE_URL_REDIRECT = "saml_single_logout_service_url_redirect";
+diff --git a/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/clients/AbstractClientTest.java b/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/clients/AbstractClientTest.java
+index 20c2f2aefd..86b148a7e8 100644
+--- a/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/clients/AbstractClientTest.java
++++ b/testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/clients/AbstractClientTest.java
+@@ -23,10 +23,10 @@ import static org.keycloak.testsuite.auth.page.login.OIDCLogin.OIDC;
+ import static org.keycloak.testsuite.auth.page.login.OIDCLogin.SAML;
+ import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.SAMLClientSettingsForm.SAML_AUTHNSTATEMENT;
+ import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.SAMLClientSettingsForm.SAML_CLIENT_SIGNATURE;
++import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.SAMLClientSettingsForm.SAML_ALLOW_ECP_FLOW;
+ import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.SAMLClientSettingsForm.SAML_FORCE_NAME_ID_FORMAT;
+ import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.SAMLClientSettingsForm.SAML_FORCE_POST_BINDING;
+ import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.SAMLClientSettingsForm.SAML_NAME_ID_FORMAT;
+-import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.SAMLClientSettingsForm.SAML_ONETIMEUSE_CONDITION;
+ import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.SAMLClientSettingsForm.SAML_SERVER_SIGNATURE;
+ import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.SAMLClientSettingsForm.SAML_SIGNATURE_ALGORITHM;
+ import static org.keycloak.testsuite.util.AttributesAssert.assertEqualsBooleanAttributes;
+@@ -89,6 +89,7 @@ public abstract class AbstractClientTest extends AbstractConsoleTest {
+ attributes.put(SAML_SIGNATURE_ALGORITHM, "RSA_SHA256");
+ attributes.put(SAML_FORCE_NAME_ID_FORMAT, "false");
+ attributes.put(SAML_NAME_ID_FORMAT, "username");
++ attributes.put(SAML_ALLOW_ECP_FLOW, "false");
+ attributes.put(SamlConfigAttributes.SAML_ARTIFACT_BINDING_IDENTIFIER, ArtifactBindingUtils.computeArtifactBindingIdentifierString("saml"));
+ return attributes;
+ }
+diff --git a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
+index 0cd25e66fa..3ead1891e2 100644
+--- a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
++++ b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
+@@ -371,6 +371,8 @@ front-channel-logout-session-required.tooltip=Specifying whether a sid (session
+
+ force-name-id-format=Force Name ID Format
+ force-name-id-format.tooltip=Ignore requested NameID subject format and use admin console configured one.
++allow-ecp-flow=Allow ECP Flow
++allow-ecp-flow.tooltip=This client is allowed to use ECP flow for authenticating users.
+ name-id-format=Name ID Format
+ name-id-format.tooltip=The name ID format to use for the subject.
+ mapper.nameid.format.tooltip=Name ID Format using Mapper
+diff --git a/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js b/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
+index ce245a5085..30a7faa65c 100755
+--- a/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
++++ b/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
+@@ -1197,6 +1197,7 @@ module.controller('ClientDetailCtrl', function($scope, realm, client, flows, $ro
+ $scope.samlEncrypt = false;
+ $scope.samlForcePostBinding = false;
+ $scope.samlForceNameIdFormat = false;
++ $scope.samlAllowECPFlow = false;
+ $scope.samlXmlKeyNameTranformer = $scope.xmlKeyNameTranformers[1];
+ $scope.disableAuthorizationTab = !client.authorizationServicesEnabled;
+ $scope.disableServiceAccountRolesTab = !client.serviceAccountsEnabled;
+@@ -1351,6 +1352,13 @@ module.controller('ClientDetailCtrl', function($scope, realm, client, flows, $ro
+ $scope.samlForceNameIdFormat = false;
+ }
+ }
++ if ($scope.client.attributes["saml.allow.ecp.flow"]) {
++ if ($scope.client.attributes["saml.allow.ecp.flow"] == "true") {
++ $scope.samlAllowECPFlow = true;
++ } else {
++ $scope.samlAllowECPFlow = false;
++ }
++ }
+ if ($scope.client.attributes["saml.multivalued.roles"]) {
+ if ($scope.client.attributes["saml.multivalued.roles"] == "true") {
+ $scope.samlMultiValuedRoles = true;
+@@ -1961,6 +1969,12 @@ module.controller('ClientDetailCtrl', function($scope, realm, client, flows, $ro
+ } else {
+ $scope.clientEdit.attributes["saml_force_name_id_format"] = "false";
+
++ }
++ if ($scope.samlAllowECPFlow == true) {
++ $scope.clientEdit.attributes["saml.allow.ecp.flow"] = "true";
++ } else {
++ $scope.clientEdit.attributes["saml.allow.ecp.flow"] = "false";
++
+ }
+ if ($scope.samlMultiValuedRoles == true) {
+ $scope.clientEdit.attributes["saml.multivalued.roles"] = "true";
+diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html b/themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html
+index 0b0b8c9a71..779aacef6e 100755
+--- a/themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html
++++ b/themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html
+@@ -299,6 +299,13 @@
+ </div>
+ <kc-tooltip>{{:: 'force-name-id-format.tooltip' | translate}}</kc-tooltip>
+ </div>
++ <div class="form-group clearfix block" data-ng-show="protocol == 'saml'">
++ <label class="col-md-2 control-label" for="samlAllowECPFlow">{{:: 'allow-ecp-flow' | translate}}</label>
++ <div class="col-sm-6">
++ <input ng-model="samlAllowECPFlow" ng-click="switchChange()" name="samlAllowECPFlow" id="samlAllowECPFlow" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}"/>
++ </div>
++ <kc-tooltip>{{:: 'allow-ecp-flow.tooltip' | translate}}</kc-tooltip>
++ </div>
+ <div class="form-group" data-ng-show="protocol == 'saml'">
+ <label class="col-md-2 control-label" for="samlNameIdFormat">{{:: 'name-id-format' | translate}}</label>
+ <div class="col-sm-6">
+--
+2.35.1
+
Copied: keycloak/repos/community-testing-any/PKGBUILD (from rev 1187184, keycloak/trunk/PKGBUILD)
===================================================================
--- community-testing-any/PKGBUILD (rev 0)
+++ community-testing-any/PKGBUILD 2022-04-20 20:11:59 UTC (rev 1187185)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
+# Contributor: Nikita Volodin <volodin.n at gmail dot com>
+
+pkgname=keycloak
+pkgver=18.0.0
+_java=11
+pkgrel=1
+pkgdesc="Open Source Identity and Access Management For Modern Applications and Services"
+arch=('any')
+url="https://www.keycloak.org/"
+license=('Apache')
+depends=("java-runtime=${_java}" 'grep' 'bash' 'coreutils' 'util-linux')
+makedepends=('maven' "java-environment=${_java}")
+backup=(
+ 'etc/keycloak/keycloak.conf'
+)
+install=keycloak.install
+options=(emptydirs)
+source=(https://github.com/keycloak/keycloak/archive/$pkgver/$pkgname-$pkgver.tar.gz
+ keycloak.service
+ keycloak.sysusers
+ keycloak.tmpfiles
+ common.sh
+ pin-java-version.patch)
+sha512sums=('a1e10168c7a6ff123f0e4f7c9e6fd505811c1c98dcecb046f2e14ff0fd330e83a31ea28de42b010817d0e9b0ce93f98444d004518e6a8ba50b49d34548b543f6'
+ '1512520528b6893997b8a3c4899fbb84a897f604f279f64fc1228785a27544499f1c8951f8997129fb2b857d2d3c11b09fb9493f83faa20a0594c759adbe0823'
+ '2e2ba147007ad74e38579a8838d79de47beac509b4bd1a14d7f80905953d79a7396d781f141b461ec688f5ceef9a1081a825a4ca8afc1ea12c178d8ae7f5a7dd'
+ '155db40105c08d0aaa810ca5533dc16fc9f82060280541ede6fafd754d30b4844f6d10ace1417a5ad68d89fc54e1b9e6d906ce7ccf973f4ac964422211ed9a72'
+ '4ae3f9fc42bfee602480c1c8cc2d65b44305622b426b74070758fe1c92a06ff12901ffebacbfe2ba34cbf783a8787f6073f74db3674c96e7a6109ed5b45d3a07'
+ 'c0351896427c7b7b73f446481a30dc735365a91541e7039cd613d1c7357c55c9559e388bc260e004c2a52211df1d23d9e24cc9c8ca956398f6e508ef96cb0ee2')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i "$srcdir"/pin-java-version.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ export PATH="/usr/lib/jvm/java-${_java}-openjdk/bin:$PATH"
+ mvn -am \
+ -s maven-settings.xml \
+ -DskipTestsuite \
+ -DskipExamples \
+ -DskipTests \
+ -Dproject.build.outputTimestamp="$SOURCE_DATE_EPOCH" \
+ clean package
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ install -vdm 755 "${pkgdir}"/{usr/share/java,var/log}/"${pkgname}"
+ install -vdm 755 "${pkgdir}"/var/lib/"${pkgname}"/{deployments,data}
+ install -vdm 755 "${pkgdir}"/usr/bin
+
+ tar xf quarkus/dist/target/${pkgname}-${pkgver}.tar.gz --strip 1 \
+ -C "${pkgdir}/usr/share/java/${pkgname}"
+ install -vDm 755 "${srcdir}/common.sh" "${pkgdir}/usr/share/java/${pkgname}/bin/common.sh"
+ # Clean up unwanted files
+ rm -rvf "${pkgdir}/usr/share/java/${pkgname}"/LICENSE.txt
+ rm -rvf "${pkgdir}/usr/share/java/${pkgname}"/bin/*.bat
+ # Fix permissions from untar
+ chown -R root:root "${pkgdir}/usr/share/java/${pkgname}"
+
+ install -vdm 755 "${pkgdir}/etc"
+ mv -v "${pkgdir}/usr/share/java/${pkgname}/conf" "${pkgdir}/etc/${pkgname}"
+
+ ln -svf /var/log/keycloak "${pkgdir}/usr/share/java/${pkgname}/log"
+ ln -svf /var/lib/keycloak/deployments "${pkgdir}/usr/share/java/${pkgname}/deployments"
+ ln -svf /var/lib/keycloak/data "${pkgdir}/usr/share/java/${pkgname}/data"
+
+ install -vDm 644 "${srcdir}"/keycloak.service "${pkgdir}"/usr/lib/systemd/system/keycloak.service
+ install -vDm 644 "${srcdir}"/keycloak.sysusers "${pkgdir}"/usr/lib/sysusers.d/keycloak.conf
+ install -vDm 644 "${srcdir}"/keycloak.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/keycloak.conf
+
+ ln -svf /usr/share/java/keycloak/bin/kc.sh "${pkgdir}"/usr/bin/kc.sh
+ ln -svf /usr/share/java/keycloak/bin/kcadm.sh "${pkgdir}"/usr/bin/kcadm.sh
+ ln -svf /usr/share/java/keycloak/bin/kcreg.sh "${pkgdir}"/usr/bin/kcreg.sh
+
+ install -Dm 644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+}
+
+# vim: ts=2 sw=2 et:
Copied: keycloak/repos/community-testing-any/common.sh (from rev 1187184, keycloak/trunk/common.sh)
===================================================================
--- community-testing-any/common.sh (rev 0)
+++ community-testing-any/common.sh 2022-04-20 20:11:59 UTC (rev 1187185)
@@ -0,0 +1,3 @@
+# Pin java version
+export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+export JAVA="$JAVA_HOME/bin/java"
Copied: keycloak/repos/community-testing-any/keycloak.install (from rev 1187184, keycloak/trunk/keycloak.install)
===================================================================
--- community-testing-any/keycloak.install (rev 0)
+++ community-testing-any/keycloak.install 2022-04-20 20:11:59 UTC (rev 1187185)
@@ -0,0 +1,7 @@
+post_upgrade() {
+ if (($(vercmp $2 17.0.1) < 0)); then
+ usermod -d /var/lib/keycloak keycloak
+ fi
+}
+
+# vim: ts=2 sw=2 et:
\ No newline at end of file
Copied: keycloak/repos/community-testing-any/keycloak.service (from rev 1187184, keycloak/trunk/keycloak.service)
===================================================================
--- community-testing-any/keycloak.service (rev 0)
+++ community-testing-any/keycloak.service 2022-04-20 20:11:59 UTC (rev 1187185)
@@ -0,0 +1,51 @@
+[Unit]
+Description=Keycloak server
+After=network-online.target
+Wants=network-online.target systemd-networkd-wait-online.service
+
+[Service]
+User=keycloak
+Group=keycloak
+
+# Running the ExecStartPre as root is not ideal, but at the moment
+# the only solution for Quarkus modifying the serialized
+# data under <keycloak-home>/lib/quarkus
+# Raised upstream as https://github.com/keycloak/keycloak/discussions/10323
+ExecStartPre=!/usr/bin/kc.sh -cf /etc/keycloak/keycloak.conf build
+
+ExecStart=/usr/bin/kc.sh -cf /etc/keycloak/keycloak.conf start
+ReadWritePaths=/var/lib/keycloak
+ReadWritePaths=/var/log/keycloak
+ReadWritePaths=/usr/share/java/keycloak/lib/quarkus
+ReadOnlyPaths=/etc/keycloak
+
+# Disable timeout logic and wait until process is stopped
+TimeoutStopSec=0
+
+# SIGTERM signal is used to stop the Java process
+KillSignal=SIGTERM
+
+# Send the signal only to the JVM rather than its control group
+KillMode=process
+
+# Java process is never killed
+SendSIGKILL=no
+
+# When a JVM receives a SIGTERM signal it exits with code 143
+SuccessExitStatus=143
+
+# Hardening options
+CapabilityBoundingSet=
+AmbientCapabilities=
+NoNewPrivileges=true
+ProtectHome=true
+ProtectSystem=strict
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectControlGroups=true
+PrivateTmp=true
+PrivateDevices=true
+LockPersonality=true
+
+[Install]
+WantedBy=multi-user.target
Copied: keycloak/repos/community-testing-any/keycloak.sysusers (from rev 1187184, keycloak/trunk/keycloak.sysusers)
===================================================================
--- community-testing-any/keycloak.sysusers (rev 0)
+++ community-testing-any/keycloak.sysusers 2022-04-20 20:11:59 UTC (rev 1187185)
@@ -0,0 +1 @@
+u keycloak - "keycloak user" /var/lib/keycloak -
Copied: keycloak/repos/community-testing-any/keycloak.tmpfiles (from rev 1187184, keycloak/trunk/keycloak.tmpfiles)
===================================================================
--- community-testing-any/keycloak.tmpfiles (rev 0)
+++ community-testing-any/keycloak.tmpfiles 2022-04-20 20:11:59 UTC (rev 1187185)
@@ -0,0 +1,3 @@
+z /var/log/keycloak - keycloak keycloak -
+z /var/lib/keycloak/data - keycloak keycloak -
+Z /var/lib/keycloak/deployments - keycloak keycloak -
\ No newline at end of file
Copied: keycloak/repos/community-testing-any/pin-java-version.patch (from rev 1187184, keycloak/trunk/pin-java-version.patch)
===================================================================
--- community-testing-any/pin-java-version.patch (rev 0)
+++ community-testing-any/pin-java-version.patch 2022-04-20 20:11:59 UTC (rev 1187185)
@@ -0,0 +1,56 @@
+diff --git a/integration/client-cli/admin-cli/src/main/bin/kcadm.sh b/integration/client-cli/admin-cli/src/main/bin/kcadm.sh
+index a7bfc6a48a..770e28c332 100755
+--- a/integration/client-cli/admin-cli/src/main/bin/kcadm.sh
++++ b/integration/client-cli/admin-cli/src/main/bin/kcadm.sh
+@@ -20,7 +20,7 @@ if [ "x$RESOLVED_NAME" = "x" ]; then
+ fi
+
+ DIRNAME=`dirname "$RESOLVED_NAME"`
++. "$DIRNAME/common.sh"
+
+-
+-java $KC_OPTS -cp $DIRNAME/client/keycloak-admin-cli-${project.version}.jar org.keycloak.client.admin.cli.KcAdmMain "$@"
++$JAVA $KC_OPTS -cp $DIRNAME/client/keycloak-admin-cli-${project.version}.jar org.keycloak.client.admin.cli.KcAdmMain "$@"
+
+diff --git a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh
+index 83bd4b70e4..9cac612b5f 100755
+--- a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh
++++ b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh
+@@ -20,4 +20,6 @@ if [ "x$RESOLVED_NAME" = "x" ]; then
+ fi
+
+ DIRNAME=`dirname "$RESOLVED_NAME"`
+-java $KC_OPTS -cp $DIRNAME/client/keycloak-client-registration-cli-${project.version}.jar org.keycloak.client.registration.cli.KcRegMain "$@"
+\ No newline at end of file
++. "$DIRNAME/common.sh"
++
++$JAVA $KC_OPTS -cp $DIRNAME/client/keycloak-client-registration-cli-${project.version}.jar org.keycloak.client.registration.cli.KcRegMain "$@"
+\ No newline at end of file
+diff --git a/quarkus/dist/src/main/content/bin/kc.sh b/quarkus/dist/src/main/content/bin/kc.sh
+index 3097ea7a0a..90f134538a 100644
+--- a/quarkus/dist/src/main/content/bin/kc.sh
++++ b/quarkus/dist/src/main/content/bin/kc.sh
+@@ -22,6 +22,7 @@ fi
+
+ GREP="grep"
+ DIRNAME=`dirname "$RESOLVED_NAME"`
++. "$DIRNAME/common.sh"
+
+ SERVER_OPTS="-Dkc.home.dir=$DIRNAME/../ -Djboss.server.config.dir=$DIRNAME/../conf -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dquarkus-log-max-startup-records=10000"
+
+@@ -88,11 +89,11 @@ CLASSPATH_OPTS="$DIRNAME/../lib/quarkus-run.jar"
+ JAVA_RUN_OPTS="$JAVA_OPTS $SERVER_OPTS -cp $CLASSPATH_OPTS io.quarkus.bootstrap.runner.QuarkusEntryPoint ${CONFIG_ARGS#?}"
+
+ if [[ $CONFIG_ARGS = *"--auto-build"* ]]; then
+- eval java -Dkc.config.rebuild-and-exit=true $JAVA_RUN_OPTS
++ eval $JAVA -Dkc.config.rebuild-and-exit=true $JAVA_RUN_OPTS
+ EXIT_CODE=$?
+ if [ $EXIT_CODE != 0 ]; then
+ exit $EXIT_CODE
+ fi
+ fi
+
+-eval exec java ${JAVA_RUN_OPTS}
+\ No newline at end of file
++eval exec $JAVA ${JAVA_RUN_OPTS}
+\ No newline at end of file
More information about the arch-commits
mailing list