github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make software statement processing null-safe

pull/1108/head
Justin Richer 2016-07-24 14:55:12 -04:00
parent bd9932d56f
commit 42ccb8b39e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openid-connect-common/src/main/java/org/mitre/openid/connect/ClientDetailsEntityJsonProcessor.java
View File

@ -82,6 +82,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@ -204,12 +205,14 @@ public class ClientDetailsEntityJsonProcessor {
c.setClaimsRedirectUris(getAsStringSet(o, CLAIMS_REDIRECT_URIS)); c.setClaimsRedirectUris(getAsStringSet(o, CLAIMS_REDIRECT_URIS));
String softwareStatement = getAsString(o, SOFTWARE_STATEMENT); String softwareStatement = getAsString(o, SOFTWARE_STATEMENT);
try { if (!Strings.isNullOrEmpty(softwareStatement)) {
JWT softwareStatementJwt = JWTParser.parse(softwareStatement); try {
c.setSoftwareStatement(softwareStatementJwt); JWT softwareStatementJwt = JWTParser.parse(softwareStatement);
} catch (ParseException e) { c.setSoftwareStatement(softwareStatementJwt);
logger.warn("Error parsing software statement", e); } catch (ParseException e) {
return null; logger.warn("Error parsing software statement", e);
return null;
}
} }