libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-4329 Fix NPE when not providing KeyInfo element in IdP initiated SSO SAML

Browse source
This commit is contained in:
Hynek Mlnarik 2017-01-30 11:40:48 +01:00
parent b42af99866
commit ad0630d04f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
saml-core/src/main/java/org/keycloak/saml/processing/api/util/KeyInfoTools.java
View file

@ -35,6 +35,9 @@ public class KeyInfoTools {
* @return The object or {@code null} if not found. * @return The object or {@code null} if not found.
*/ */
public static <T> T getContent(Iterable<Object> objects, Class<T> clazz) { public static <T> T getContent(Iterable<Object> objects, Class<T> clazz) {
if (objects == null) {
return null;
}
for (Object o : objects) { for (Object o : objects) {
if (clazz.isInstance(o)) { if (clazz.isInstance(o)) {
return (T) o; return (T) o;
@ -45,11 +48,11 @@ public class KeyInfoTools {
public static KeyName getKeyName(KeyInfo keyInfo) { public static KeyName getKeyName(KeyInfo keyInfo) {
return getContent(keyInfo.getContent(), KeyName.class); return keyInfo == null ? null : getContent(keyInfo.getContent(), KeyName.class);
} }
public static X509Data getX509Data(KeyInfo keyInfo) { public static X509Data getX509Data(KeyInfo keyInfo) {
return getContent(keyInfo.getContent(), X509Data.class); return keyInfo == null ? null : getContent(keyInfo.getContent(), X509Data.class);
} }
public static X509Certificate getX509Certificate(KeyInfo keyInfo) { public static X509Certificate getX509Certificate(KeyInfo keyInfo) {