KEYCLOAK-12732 Improve SAMLAttribute parsing of unknown attributes #6681
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Is the Java update needed? saml-core is used in adapters and I believe we still support 1.7 in some cases :/ |
|
I updated the Java Version to be able to use the Stream API. Of course I could rework that again, but I thought the upgrade would be fine, since most of the other Keycloak modules on the server-side are also using Java 8 API. |
thomasdarimont
force-pushed
the
issue/KEYCLOAK-12732-Improve-Unknown-SAMLAttribute-Handling
branch
from
66e60c8
to
6bc31c1
Compare
|
I downgraded the PR to be compatible with Java 7 API. |
thomasdarimont
force-pushed
the
issue/KEYCLOAK-12732-Improve-Unknown-SAMLAttribute-Handling
branch
from
6bc31c1
to
e1101ae
Compare
hmlnarik
requested changes
Jan 30, 2020
.../main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeParser.java
Outdated
Show resolved
Hide resolved
.../main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeParser.java
Outdated
Show resolved
Hide resolved
.../main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeParser.java
Outdated
Show resolved
Hide resolved
.../main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeParser.java
Show resolved
Hide resolved
.../main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeParser.java
Outdated
Show resolved
Hide resolved
We now store all unknown attributes present on a SAMLAttribute element in the "otherAttributes" map associated with the element. Previously only the x500:encoding attribute was handled while parsing attribute elements.
thomasdarimont
force-pushed
the
issue/KEYCLOAK-12732-Improve-Unknown-SAMLAttribute-Handling
branch
from
e1101ae
to
abd5ef1
Compare
|
@hmlnarik thanks for the review! I just applied the requested changes, except for the logging, please see comments for rationale. |
hmlnarik
approved these changes
Jan 31, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We now store all unknown attributes present on a SAMLAttribute element
in the "otherAttributes" map associated with the element.
Previously only the x500:encoding attribute was handled while parsing
attribute elements.
Note that I updated the allowed Java version in the maven pom from 1.7 to 1.8 since the rest of Keycloak also uses Java 8 "already".