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

A little more error-checking

pull/650/head
arielak 2014-07-29 15:42:31 -04:00
parent 7d66b15a0f
commit 4eafb4efa9
1 changed files with 93 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java
View File

@ -520,7 +520,6 @@ public class MITREidDataService_1_0 implements MITREidDataService {
switch (tok) { switch (tok) {
case NAME: case NAME:
String name = reader.nextName(); String name = reader.nextName();
// find out which member it is // find out which member it is
if (name.equals(CLIENTS)) { if (name.equals(CLIENTS)) {
readClients(reader); readClients(reader);
@ -567,27 +566,33 @@ public class MITREidDataService_1_0 implements MITREidDataService {
String clientId = null; String clientId = null;
Long authHolderId = null; Long authHolderId = null;
while (reader.hasNext()) { while (reader.hasNext()) {
String name = reader.nextName(); switch (reader.peek()) {
if (reader.peek() == JsonToken.NULL) { case END_OBJECT:
reader.skipValue(); continue;
} else if (name.equals("id")) { case NAME:
currentId = reader.nextLong(); String name = reader.nextName();
} else if (name.equals("expiration")) { if (reader.peek() == JsonToken.NULL) {
if (reader.peek() == JsonToken.NULL) { reader.skipValue();
reader.nextNull(); } else if (name.equals("id")) {
} else { currentId = reader.nextLong();
Date date = utcToDate(reader.nextString()); } else if (name.equals("expiration")) {
token.setExpiration(date); Date date = utcToDate(reader.nextString());
} token.setExpiration(date);
} else if (name.equals("value")) { } else if (name.equals("value")) {
token.setValue(reader.nextString()); token.setValue(reader.nextString());
} else if (name.equals("clientId")) { } else if (name.equals("clientId")) {
clientId = reader.nextString(); clientId = reader.nextString();
} else if (name.equals("authenticationHolderId")) { } else if (name.equals("authenticationHolderId")) {
authHolderId = reader.nextLong(); authHolderId = reader.nextLong();
} else { } else {
logger.debug("Found unexpected entry"); logger.debug("Found unexpected entry");
reader.skipValue(); reader.skipValue();
}
break;
default:
logger.debug("Found unexpected entry");
reader.skipValue();
continue;
} }
} }
reader.endObject(); reader.endObject();
@ -626,44 +631,42 @@ public class MITREidDataService_1_0 implements MITREidDataService {
Long refreshTokenId = null; Long refreshTokenId = null;
Long idTokenId = null; Long idTokenId = null;
while (reader.hasNext()) { while (reader.hasNext()) {
String name = reader.nextName(); switch (reader.peek()) {
if (reader.peek() == JsonToken.NULL) { case END_OBJECT:
reader.skipValue(); continue;
} else if (name.equals("id")) { case NAME:
currentId = reader.nextLong(); String name = reader.nextName();
} else if (name.equals("expiration")) { if (reader.peek() == JsonToken.NULL) {
if (reader.peek() == JsonToken.NULL) { reader.skipValue();
reader.nextNull(); } else if (name.equals("id")) {
} else { currentId = reader.nextLong();
Date date = utcToDate(reader.nextString()); } else if (name.equals("expiration")) {
token.setExpiration(date); Date date = utcToDate(reader.nextString());
} token.setExpiration(date);
} else if (name.equals("value")) { } else if (name.equals("value")) {
token.setValue(reader.nextString()); token.setValue(reader.nextString());
} else if (name.equals("clientId")) { } else if (name.equals("clientId")) {
clientId = reader.nextString(); clientId = reader.nextString();
} else if (name.equals("authenticationHolderId")) { } else if (name.equals("authenticationHolderId")) {
authHolderId = reader.nextLong(); authHolderId = reader.nextLong();
} else if (name.equals("refreshTokenId")) { } else if (name.equals("refreshTokenId")) {
if (reader.peek() == JsonToken.NULL) { refreshTokenId = reader.nextLong();
reader.nextNull(); } else if (name.equals("idTokenId")) {
} else { idTokenId = reader.nextLong();
refreshTokenId = reader.nextLong(); } else if (name.equals("scope")) {
} Set<String> scope = readSet(reader);
} else if (name.equals("idTokenId")) { token.setScope(scope);
if (reader.peek() == JsonToken.NULL) { } else if (name.equals("type")) {
reader.nextNull(); token.setTokenType(reader.nextString());
} else { } else {
idTokenId = reader.nextLong(); logger.debug("Found unexpected entry");
} reader.skipValue();
} else if (name.equals("scope")) { }
Set<String> scope = readSet(reader); break;
token.setScope(scope); default:
} else if (name.equals("type")) { logger.debug("Found unexpected entry");
token.setTokenType(reader.nextString()); reader.skipValue();
} else { continue;
logger.debug("Found unexpected entry");
reader.skipValue();
} }
} }
reader.endObject(); reader.endObject();
@ -848,28 +851,16 @@ public class MITREidDataService_1_0 implements MITREidDataService {
} else if (name.equals("id")) { } else if (name.equals("id")) {
currentId = reader.nextLong(); currentId = reader.nextLong();
} else if (name.equals("accessDate")) { } else if (name.equals("accessDate")) {
if (reader.peek() == JsonToken.NULL) { Date date = utcToDate(reader.nextString());
reader.nextNull(); site.setAccessDate(date);
} else {
Date date = utcToDate(reader.nextString());
site.setAccessDate(date);
}
} else if (name.equals("clientId")) { } else if (name.equals("clientId")) {
site.setClientId(reader.nextString()); site.setClientId(reader.nextString());
} else if (name.equals("creationDate")) { } else if (name.equals("creationDate")) {
if (reader.peek() == JsonToken.NULL) { Date date = utcToDate(reader.nextString());
reader.nextNull(); site.setCreationDate(date);
} else {
Date date = utcToDate(reader.nextString());
site.setCreationDate(date);
}
} else if (name.equals("timeoutDate")) { } else if (name.equals("timeoutDate")) {
if (reader.peek() == JsonToken.NULL) { Date date = utcToDate(reader.nextString());
reader.nextNull(); site.setTimeoutDate(date);
} else {
Date date = utcToDate(reader.nextString());
site.setTimeoutDate(date);
}
} else if (name.equals("userId")) { } else if (name.equals("userId")) {
site.setUserId(reader.nextString()); site.setUserId(reader.nextString());
} else if (name.equals("allowedScopes")) { } else if (name.equals("allowedScopes")) {
@ -879,20 +870,30 @@ public class MITREidDataService_1_0 implements MITREidDataService {
WhitelistedSite wlSite = new WhitelistedSite(); WhitelistedSite wlSite = new WhitelistedSite();
reader.beginObject(); reader.beginObject();
while (reader.hasNext()) { while (reader.hasNext()) {
String wlName = reader.nextName(); switch (reader.peek()) {
if (wlName.equals("id")) { case END_OBJECT:
//not needed continue;
reader.skipValue(); case NAME:
} else if (name.equals("clientId")) { String wlName = reader.nextName();
wlSite.setClientId(reader.nextString()); if (wlName.equals("id")) {
} else if (name.equals("creatorUserId")) { //not needed
wlSite.setCreatorUserId(reader.nextString()); reader.skipValue();
} else if (name.equals("allowedScopes")) { } else if (name.equals("clientId")) {
Set<String> allowedScopes = readSet(reader); wlSite.setClientId(reader.nextString());
wlSite.setAllowedScopes(allowedScopes); } else if (name.equals("creatorUserId")) {
} else { wlSite.setCreatorUserId(reader.nextString());
logger.debug("Found unexpected entry"); } else if (name.equals("allowedScopes")) {
reader.skipValue(); Set<String> allowedScopes = readSet(reader);
wlSite.setAllowedScopes(allowedScopes);
} else {
logger.debug("Found unexpected entry");
reader.skipValue();
}
break;
default:
logger.debug("Found unexpected entry");
reader.skipValue();
continue;
} }
} }
reader.endObject(); reader.endObject();