Skip to content

Fix/build keycloak 26.1.x #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmzcode merged 7 commits into from
Aug 8, 2025
Merged

Fix/build keycloak 26.1.x #3

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4448a3e
Support Keycloak 26.1.x and resolve API changes, add diffgen tool.
tmzcode Aug 7, 2025
1ba9449
Support Keycloak 26.1.x and resolve API changes, add diffgen tool.
tmzcode Aug 7, 2025
ca26e79
Support Keycloak 26.1.x and resolve API changes, add diffgen tool.
tmzcode Aug 7, 2025
e1a17f8
Support Keycloak 26.1.x and resolve API changes, add diffgen tool.
tmzcode Aug 8, 2025
c26b6b5
Support Keycloak 26.1.x and resolve API changes, add diffgen tool.
tmzcode Aug 8, 2025
682f534
Support Keycloak 26.1.x and resolve API changes, add diffgen tool.
tmzcode Aug 8, 2025
dcb78c7
Support Keycloak 26.1.x and resolve API changes, add diffgen tool.
tmzcode Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 105 additions & 0 deletions diffgen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
#!/bin/bash

if [ $# -ne 2 ]; then
echo "Usage: $0 OLD_BRANCH NEW_BRANCH"
exit 1
fi

OLD_BRANCH="$1"
NEW_BRANCH="$2"
Copy link
Copy Markdown
Collaborator

@0314R 0314R Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Als je een random branch neem geeft die niet bestaat, geeft het geen melding en gaat het proces door. Ook als je het script niet in de keycloak repo draait. Misschien mooier als het in die gevallen niets doet


echo "Comparing Java files between branches:"
echo " OLD_BRANCH: $OLD_BRANCH"
echo " NEW_BRANCH: $NEW_BRANCH"

OLD_DIR="./diff/old"
NEW_DIR="./diff/new"
PATCH_FILE="./diffgen.patch"

FILES=(
services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java
Copy link
Copy Markdown
Collaborator

@0314R 0314R Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SerializedBrokeredIdentityContext.java gebruiken we niet meer, daarom gaf dat oude script een error voor .../broker/util

services/src/main/java/org/keycloak/broker/saml/mappers/AdvancedAttributeToRoleMapper.java
services/src/main/java/org/keycloak/broker/saml/mappers/AttributeToRoleMapper.java
services/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java
services/src/main/java/org/keycloak/broker/saml/mappers/UsernameTemplateMapper.java
services/src/main/java/org/keycloak/broker/saml/SAMLDataMarshaller.java
services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java
services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java
services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderConfig.java
services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java
saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AssertionType.java
saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AttributeStatementType.java
saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/AttributeConsumingServiceType.java
saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/EntitiesDescriptorType.java
saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/EntityDescriptorType.java
saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/SPSSODescriptorType.java
saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/ResponseType.java
services/src/main/java/org/keycloak/protocol/saml/mappers/SamlMetadataDescriptorUpdater.java
services/src/main/java/org/keycloak/protocol/saml/JaxrsSAML2BindingBuilder.java
services/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java
saml-core-api/src/main/java/org/keycloak/saml/common/constants/JBossSAMLConstants.java
saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/request/SAML2Request.java
saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/request/SecurityActions.java
saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/response/SAML2Response.java
saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/sig/SAML2Signature.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/AbstractStaxSamlAssertionParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionQNames.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeStatementParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeValueParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeConsumingServiceParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLSPSSODescriptorParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLArtifactResponseParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLResponseParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParser.java
saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java
saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/factories/SAMLAssertionFactory.java
saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/AssertionUtil.java
saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SAMLMetadataUtil.java
saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/BaseWriter.java
saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLAssertionWriter.java
saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLMetadataWriter.java
saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLRequestWriter.java
saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLResponseWriter.java
saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLSignatureUtil.java
saml-core/src/main/java/org/keycloak/saml/SAML2AuthnRequestBuilder.java
saml-core/src/main/java/org/keycloak/saml/SAMLRequestParser.java
services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java
Comment thread
tmzcode marked this conversation as resolved.
Outdated
)

# Clean up any previous run
rm -rf "$OLD_DIR" "$NEW_DIR" "$PATCH_FILE"
mkdir -p "$OLD_DIR" "$NEW_DIR"

echo "Exporting files..."

for FILE in "${FILES[@]}"; do
mkdir -p "$OLD_DIR/$(dirname "$FILE")"
git show "$OLD_BRANCH:$FILE" > "$OLD_DIR/$FILE" 2>/dev/null || echo "Missing in $OLD_BRANCH: $FILE"

mkdir -p "$NEW_DIR/$(dirname "$FILE")"
git show "$NEW_BRANCH:$FILE" > "$NEW_DIR/$FILE" 2>/dev/null || echo "Missing in $NEW_BRANCH: $FILE"
done

echo "File count (.java only):"
echo " $OLD_BRANCH: $(find "$OLD_DIR" -type f -name '*.java' | wc -l)"
echo " $NEW_BRANCH: $(find "$NEW_DIR" -type f -name '*.java' | wc -l)"

echo "Creating patch..."
diff --color=never -ruN "$OLD_DIR" "$NEW_DIR" > "$PATCH_FILE"

# Post-process diff for portability or project-specific needs
safe_sed() {
sed "$1" "$2" > "$2.tmp" && mv "$2.tmp" "$2"
}

safe_sed "s|$OLD_DIR/saml-core/||g" "$PATCH_FILE"
safe_sed "s|$NEW_DIR/saml-core/||g" "$PATCH_FILE"
safe_sed "s|$OLD_DIR/services/||g" "$PATCH_FILE"
safe_sed "s|$NEW_DIR/services/||g" "$PATCH_FILE"
safe_sed 's|org/keycloak/|nl/first8/keycloak/|g' "$PATCH_FILE"

echo "Patch created at: $PATCH_FILE"
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<keycloak.version>26.0.0</keycloak.version>
<keycloak.version>26.1.5</keycloak.version>
<spotbugs.version>4.8.3.1</spotbugs.version>

<jib-maven-plugin.version>3.4.1</jib-maven-plugin.version>
Expand Down Expand Up @@ -383,4 +383,4 @@
</profile>
</profiles>

</project>
</project>
4 changes: 2 additions & 2 deletions src/main/java/nl/first8/keycloak/protocol/saml/SamlProtocolUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.net.URI;

import java.nio.charset.StandardCharsets;
import java.security.PublicKey;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
Expand Down Expand Up @@ -151,7 +151,7 @@ public static void verifyRedirectSignature(SAMLDocumentHolder documentHolder, Ke
String decodedAlgorithm = RedirectBindingUtil.urlDecode(encodedParams.getFirst(GeneralConstants.SAML_SIG_ALG_REQUEST_KEY));
SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.getFromXmlMethod(decodedAlgorithm);
if (!RedirectBindingSignatureUtil.validateRedirectBindingSignature(signatureAlgorithm,
rawQuery.getBytes("UTF-8"), decodedSignature, locator, keyId)) {
rawQuery.getBytes(StandardCharsets.UTF_8), decodedSignature, locator, keyId)) {
throw new VerificationException("Invalid query param signature");
}
} catch (Exception e) {
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/nl/first8/keycloak/services/resources/IdentityBrokerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,8 @@ public Response performLogin(@PathParam("provider_alias") String providerAlias,
}
return response;
}
} catch (WebApplicationException e) {
return e.getResponse();
} catch (IdentityBrokerException e) {
return redirectToErrorPage(Response.Status.BAD_GATEWAY, Messages.COULD_NOT_SEND_AUTHENTICATION_REQUEST, e, providerAlias);
} catch (Exception e) {
Expand Down Expand Up @@ -1123,7 +1125,7 @@ private AuthenticationSessionModel parseSessionCode(String code, String clientId

private Response checkAccountManagementFailedLinking(AuthenticationSessionModel authSession, String error, Object... parameters) {
UserSessionModel userSession = new AuthenticationSessionManager(session).getUserSession(authSession);
if (userSession != null && authSession.getClient() != null && authSession.getClient().getClientId().equals(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID)) {
if (userSession != null && authSession.getClient() != null) {

this.event.event(EventType.FEDERATED_IDENTITY_LINK);
UserModel user = userSession.getUser();
Expand Down Expand Up @@ -1154,7 +1156,7 @@ private Response checkPassiveLoginError(AuthenticationSessionModel authSession,
.setHttpHeaders(headers)
.setUriInfo(session.getContext().getUri())
.setEventBuilder(event);
return protocol.sendError(authSession, error);
return protocol.sendError(authSession, error, null);
}
return null;
}
Expand Down