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

Ported date format changes from 1.0.x

pull/705/head
Justin Richer 2014-10-06 23:41:33 -04:00
parent 01448d99c1
commit 9c732fd1cd
3 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ import org.mitre.openid.connect.model.WhitelistedSite;
import org.mitre.openid.connect.repository.ApprovedSiteRepository; import org.mitre.openid.connect.repository.ApprovedSiteRepository;
import org.mitre.openid.connect.repository.BlacklistedSiteRepository; import org.mitre.openid.connect.repository.BlacklistedSiteRepository;
import org.mitre.openid.connect.repository.WhitelistedSiteRepository; import org.mitre.openid.connect.repository.WhitelistedSiteRepository;
import org.mitre.openid.connect.util.DateUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -172,7 +173,7 @@ public class MITREidDataService_1_0 extends MITREidDataService_1_X {
} else if (name.equals("id")) { } else if (name.equals("id")) {
currentId = reader.nextLong(); currentId = reader.nextLong();
} else if (name.equals("expiration")) { } else if (name.equals("expiration")) {
Date date = utcToDate(reader.nextString()); Date date = DateUtil.utcToDate(reader.nextString());
token.setExpiration(date); token.setExpiration(date);
} else if (name.equals("value")) { } else if (name.equals("value")) {
String value = reader.nextString(); String value = reader.nextString();
@ -241,7 +242,7 @@ public class MITREidDataService_1_0 extends MITREidDataService_1_X {
} else if (name.equals("id")) { } else if (name.equals("id")) {
currentId = reader.nextLong(); currentId = reader.nextLong();
} else if (name.equals("expiration")) { } else if (name.equals("expiration")) {
Date date = utcToDate(reader.nextString()); Date date = DateUtil.utcToDate(reader.nextString());
token.setExpiration(date); token.setExpiration(date);
} else if (name.equals("value")) { } else if (name.equals("value")) {
String value = reader.nextString(); String value = reader.nextString();
@ -454,15 +455,15 @@ public class MITREidDataService_1_0 extends MITREidDataService_1_X {
} 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")) {
Date date = utcToDate(reader.nextString()); Date date = DateUtil.utcToDate(reader.nextString());
site.setAccessDate(date); 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")) {
Date date = utcToDate(reader.nextString()); Date date = DateUtil.utcToDate(reader.nextString());
site.setCreationDate(date); site.setCreationDate(date);
} else if (name.equals("timeoutDate")) { } else if (name.equals("timeoutDate")) {
Date date = utcToDate(reader.nextString()); Date date = DateUtil.utcToDate(reader.nextString());
site.setTimeoutDate(date); site.setTimeoutDate(date);
} else if (name.equals("userId")) { } else if (name.equals("userId")) {
site.setUserId(reader.nextString()); site.setUserId(reader.nextString());

21
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java
View File

@ -53,6 +53,7 @@ import org.mitre.openid.connect.model.WhitelistedSite;
import org.mitre.openid.connect.repository.ApprovedSiteRepository; import org.mitre.openid.connect.repository.ApprovedSiteRepository;
import org.mitre.openid.connect.repository.BlacklistedSiteRepository; import org.mitre.openid.connect.repository.BlacklistedSiteRepository;
import org.mitre.openid.connect.repository.WhitelistedSiteRepository; import org.mitre.openid.connect.repository.WhitelistedSiteRepository;
import org.mitre.openid.connect.util.DateUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -152,7 +153,7 @@ public class MITREidDataService_1_1 extends MITREidDataService_1_X {
for (OAuth2RefreshTokenEntity token : tokenRepository.getAllRefreshTokens()) { for (OAuth2RefreshTokenEntity token : tokenRepository.getAllRefreshTokens()) {
writer.beginObject(); writer.beginObject();
writer.name("id").value(token.getId()); writer.name("id").value(token.getId());
writer.name("expiration").value(toUTCString(token.getExpiration())); writer.name("expiration").value(DateUtil.toUTCString(token.getExpiration()));
writer.name("clientId") writer.name("clientId")
.value((token.getClient() != null) ? token.getClient().getClientId() : null); .value((token.getClient() != null) ? token.getClient().getClientId() : null);
writer.name("authenticationHolderId") writer.name("authenticationHolderId")
@ -171,7 +172,7 @@ public class MITREidDataService_1_1 extends MITREidDataService_1_X {
for (OAuth2AccessTokenEntity token : tokenRepository.getAllAccessTokens()) { for (OAuth2AccessTokenEntity token : tokenRepository.getAllAccessTokens()) {
writer.beginObject(); writer.beginObject();
writer.name("id").value(token.getId()); writer.name("id").value(token.getId());
writer.name("expiration").value(toUTCString(token.getExpiration())); writer.name("expiration").value(DateUtil.toUTCString(token.getExpiration()));
writer.name("clientId") writer.name("clientId")
.value((token.getClient() != null) ? token.getClient().getClientId() : null); .value((token.getClient() != null) ? token.getClient().getClientId() : null);
writer.name("authenticationHolderId") writer.name("authenticationHolderId")
@ -271,10 +272,10 @@ public class MITREidDataService_1_1 extends MITREidDataService_1_X {
for (ApprovedSite site : approvedSiteRepository.getAll()) { for (ApprovedSite site : approvedSiteRepository.getAll()) {
writer.beginObject(); writer.beginObject();
writer.name("id").value(site.getId()); writer.name("id").value(site.getId());
writer.name("accessDate").value(toUTCString(site.getAccessDate())); writer.name("accessDate").value(DateUtil.toUTCString(site.getAccessDate()));
writer.name("clientId").value(site.getClientId()); writer.name("clientId").value(site.getClientId());
writer.name("creationDate").value(toUTCString(site.getCreationDate())); writer.name("creationDate").value(DateUtil.toUTCString(site.getCreationDate()));
writer.name("timeoutDate").value(toUTCString(site.getTimeoutDate())); writer.name("timeoutDate").value(DateUtil.toUTCString(site.getTimeoutDate()));
writer.name("userId").value(site.getUserId()); writer.name("userId").value(site.getUserId());
writer.name("allowedScopes"); writer.name("allowedScopes");
writeNullSafeArray(writer, site.getAllowedScopes()); writeNullSafeArray(writer, site.getAllowedScopes());
@ -511,7 +512,7 @@ public class MITREidDataService_1_1 extends MITREidDataService_1_X {
} else if (name.equals("id")) { } else if (name.equals("id")) {
currentId = reader.nextLong(); currentId = reader.nextLong();
} else if (name.equals("expiration")) { } else if (name.equals("expiration")) {
Date date = utcToDate(reader.nextString()); Date date = DateUtil.utcToDate(reader.nextString());
token.setExpiration(date); token.setExpiration(date);
} else if (name.equals("value")) { } else if (name.equals("value")) {
String value = reader.nextString(); String value = reader.nextString();
@ -580,7 +581,7 @@ public class MITREidDataService_1_1 extends MITREidDataService_1_X {
} else if (name.equals("id")) { } else if (name.equals("id")) {
currentId = reader.nextLong(); currentId = reader.nextLong();
} else if (name.equals("expiration")) { } else if (name.equals("expiration")) {
Date date = utcToDate(reader.nextString()); Date date = DateUtil.utcToDate(reader.nextString());
token.setExpiration(date); token.setExpiration(date);
} else if (name.equals("value")) { } else if (name.equals("value")) {
String value = reader.nextString(); String value = reader.nextString();
@ -799,15 +800,15 @@ public class MITREidDataService_1_1 extends MITREidDataService_1_X {
} 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")) {
Date date = utcToDate(reader.nextString()); Date date = DateUtil.utcToDate(reader.nextString());
site.setAccessDate(date); 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")) {
Date date = utcToDate(reader.nextString()); Date date = DateUtil.utcToDate(reader.nextString());
site.setCreationDate(date); site.setCreationDate(date);
} else if (name.equals("timeoutDate")) { } else if (name.equals("timeoutDate")) {
Date date = utcToDate(reader.nextString()); Date date = DateUtil.utcToDate(reader.nextString());
site.setTimeoutDate(date); site.setTimeoutDate(date);
} else if (name.equals("userId")) { } else if (name.equals("userId")) {
site.setUserId(reader.nextString()); site.setUserId(reader.nextString());

24
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_X.java
View File

@ -45,30 +45,6 @@ import org.slf4j.LoggerFactory;
*/ */
public abstract class MITREidDataService_1_X implements MITREidDataService { public abstract class MITREidDataService_1_X implements MITREidDataService {
private static Logger logger = LoggerFactory.getLogger(MITREidDataService_1_X.class); private static Logger logger = LoggerFactory.getLogger(MITREidDataService_1_X.class);
private static final String ISO_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
private static final TimeZone utc = TimeZone.getTimeZone("UTC");
private static final SimpleDateFormat sdf = new SimpleDateFormat(ISO_FORMAT);
protected static String toUTCString(Date date) {
if (date == null) {
return null;
}
sdf.setTimeZone(utc);
return sdf.format(date);
}
protected static Date utcToDate(String s) {
if (s == null) {
return null;
}
Date d = null;
try {
d = sdf.parse(s);
} catch(ParseException ex) {
logger.error("Unable to parse date string {}", s, ex);
}
return d;
}
protected static <T> T base64UrlDecodeObject(String encoded, Class<T> type) { protected static <T> T base64UrlDecodeObject(String encoded, Class<T> type) {
if (encoded == null) { if (encoded == null) {