From 009d8150ccabb627bcf31123db273d2e40a6a429 Mon Sep 17 00:00:00 2001
From: Konstantinos Georgilakis <cgeorgilakis@grnet.gr>
Date: Wed, 13 Sep 2023 12:06:53 +0300
Subject: [PATCH] find IdP issuer from saml request also (saml federation
 login-logout)

---
 pom.xml                                                   | 2 +-
 .../services/resources/IdentityBrokerService.java         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b7081a45fd0..51e43aa792a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
         <jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url>
 
         <quarkus.version>2.7.5.Final</quarkus.version>
-        <eosc-kc.version>${project.version}-2.17rc1</eosc-kc.version>
+        <eosc-kc.version>${project.version}-2.17rc2</eosc-kc.version>
 
         <!--
         Performing a Wildfly upgrade? Run the:
diff --git a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java
index cae1dbfee5cd..9324abfd04e1 100755
--- a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java
+++ b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java
@@ -456,9 +456,9 @@ public Object getEndpoint(@PathParam("provider_id") String providerId) {
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
     @Path(ENDPOINT_PATH)
     public Response getIdpFederationEndpointPOST(@FormParam(GeneralConstants.SAML_REQUEST_KEY) String samlRequest, @FormParam(GeneralConstants.SAML_RESPONSE_KEY) String samlResponse, @FormParam(GeneralConstants.RELAY_STATE) String relayState) {
-        if (samlResponse == null)
+        if (samlResponse == null && samlRequest == null)
             return errorForNullSamlResponse();
-        byte[] samlBytes = PostBindingUtil.base64Decode(samlResponse);
+        byte[] samlBytes = PostBindingUtil.base64Decode(samlRequest != null ? samlRequest : samlResponse);
         SAMLDocumentHolder samlDocumentHolder = SAMLRequestParser.parseResponseDocument(samlBytes);
         StatusResponseType statusResponse = (StatusResponseType) samlDocumentHolder.getSamlObject();
         String issuer = statusResponse.getIssuer().getValue(); //this should be the entityId
@@ -474,9 +474,9 @@ public Response getIdpFederationEndpointPOST(@FormParam(GeneralConstants.SAML_RE
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
     @Path(ENDPOINT_PATH)
     public Response getIdpFederationEndpointGET(@QueryParam(GeneralConstants.SAML_REQUEST_KEY) String samlRequest, @QueryParam(GeneralConstants.SAML_RESPONSE_KEY) String samlResponse, @QueryParam(GeneralConstants.RELAY_STATE) String relayState) {
-        if (samlResponse == null)
+        if (samlResponse == null && samlRequest == null)
             return errorForNullSamlResponse();
-        SAMLDocumentHolder samlDocumentHolder = SAMLRequestParser.parseResponseRedirectBinding(samlResponse);
+        SAMLDocumentHolder samlDocumentHolder = SAMLRequestParser.parseResponseRedirectBinding(samlRequest != null ? samlRequest : samlResponse);
         StatusResponseType statusResponse = (StatusResponseType)samlDocumentHolder.getSamlObject();
         String issuer = statusResponse.getIssuer().getValue(); //this should be the entityId
         String alias = SAMLFederationProvider.getHash(issuer);