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

fixed data export to comply with new auth holder

pull/819/merge
Justin Richer 2015-05-22 16:12:19 -04:00
parent 84167396da
commit 441b19f0c5
2 changed files with 66 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openid-connect-common/src/main/java/org/mitre/util/JsonUtils.java
View File

@ -272,25 +272,6 @@ public class JsonUtils {
} }
} }
public static String base64UrlEncodeObject(Serializable obj) {
if (obj == null) {
return null;
} else {
String encoded = null;
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(obj);
encoded = BaseEncoding.base64Url().encode(baos.toByteArray());
oos.close();
baos.close();
} catch (IOException ex) {
logger.error("Unable to encode object", ex);
}
return encoded;
}
}
public static Map readMap(JsonReader reader) throws IOException { public static Map readMap(JsonReader reader) throws IOException {
Map map = new HashMap<String, Object>(); Map map = new HashMap<String, Object>();
reader.beginObject(); reader.beginObject();

67
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_2.java
View File

@ -65,7 +65,6 @@ import com.nimbusds.jose.JWEAlgorithm;
import com.nimbusds.jose.JWSAlgorithm; import com.nimbusds.jose.JWSAlgorithm;
import static org.mitre.util.JsonUtils.base64UrlDecodeObject; import static org.mitre.util.JsonUtils.base64UrlDecodeObject;
import static org.mitre.util.JsonUtils.base64UrlEncodeObject;
import static org.mitre.util.JsonUtils.readMap; import static org.mitre.util.JsonUtils.readMap;
import static org.mitre.util.JsonUtils.readSet; import static org.mitre.util.JsonUtils.readSet;
import static org.mitre.util.JsonUtils.writeNullSafeArray; import static org.mitre.util.JsonUtils.writeNullSafeArray;
@ -211,31 +210,15 @@ public class MITREidDataService_1_2 extends MITREidDataServiceSupport implements
for (AuthenticationHolderEntity holder : authHolderRepository.getAll()) { for (AuthenticationHolderEntity holder : authHolderRepository.getAll()) {
writer.beginObject(); writer.beginObject();
writer.name("id").value(holder.getId()); writer.name("id").value(holder.getId());
writer.name("authentication");
writer.beginObject();
writer.name("authorizationRequest");
OAuth2Authentication oa2Auth = holder.getAuthentication();
writeAuthorizationRequest(oa2Auth.getOAuth2Request(), writer);
String userAuthentication = base64UrlEncodeObject(oa2Auth.getUserAuthentication());
writer.name("userAuthentication").value(userAuthentication);
writer.endObject();
writer.endObject();
logger.debug("Wrote authentication holder {}", holder.getId());
}
logger.info("Done writing authentication holders");
}
//used by writeAuthenticationHolders
private void writeAuthorizationRequest(OAuth2Request authReq, JsonWriter writer) throws IOException {
writer.beginObject();
writer.name("requestParameters"); writer.name("requestParameters");
writer.beginObject(); writer.beginObject();
for (Entry<String, String> entry : authReq.getRequestParameters().entrySet()) { for (Entry<String, String> entry : holder.getRequestParameters().entrySet()) {
writer.name(entry.getKey()).value(entry.getValue()); writer.name(entry.getKey()).value(entry.getValue());
} }
writer.endObject(); writer.endObject();
writer.name("clientId").value(authReq.getClientId()); writer.name("clientId").value(holder.getClientId());
Set<String> scope = authReq.getScope(); Set<String> scope = holder.getScope();
writer.name("scope"); writer.name("scope");
writer.beginArray(); writer.beginArray();
for (String s : scope) { for (String s : scope) {
@ -244,33 +227,61 @@ public class MITREidDataService_1_2 extends MITREidDataServiceSupport implements
writer.endArray(); writer.endArray();
writer.name("resourceIds"); writer.name("resourceIds");
writer.beginArray(); writer.beginArray();
if (authReq.getResourceIds() != null) { if (holder.getResourceIds() != null) {
for (String s : authReq.getResourceIds()) { for (String s : holder.getResourceIds()) {
writer.value(s); writer.value(s);
} }
} }
writer.endArray(); writer.endArray();
writer.name("authorities"); writer.name("authorities");
writer.beginArray(); writer.beginArray();
for (GrantedAuthority authority : authReq.getAuthorities()) { for (GrantedAuthority authority : holder.getAuthorities()) {
writer.value(authority.getAuthority()); writer.value(authority.getAuthority());
} }
writer.endArray(); writer.endArray();
writer.name("approved").value(authReq.isApproved()); writer.name("approved").value(holder.isApproved());
writer.name("redirectUri").value(authReq.getRedirectUri()); writer.name("redirectUri").value(holder.getRedirectUri());
writer.name("responseTypes"); writer.name("responseTypes");
writer.beginArray(); writer.beginArray();
for (String s : authReq.getResponseTypes()) { for (String s : holder.getResponseTypes()) {
writer.value(s); writer.value(s);
} }
writer.endArray(); writer.endArray();
writer.name("extensions"); writer.name("extensions");
writer.beginObject(); writer.beginObject();
for (Entry<String, Serializable> entry : authReq.getExtensions().entrySet()) { for (Entry<String, Serializable> entry : holder.getExtensions().entrySet()) {
writer.name(entry.getKey()).value(base64UrlEncodeObject(entry.getValue())); // while the extension map itself is Serializable, we enforce storage of Strings
if (entry.getValue() instanceof String) {
writer.name(entry.getKey()).value((String) entry.getValue());
} else {
logger.warn("Skipping non-string extension: " + entry);
}
} }
writer.endObject(); writer.endObject();
writer.name("savedUserAuthentication");
if (holder.getUserAuth() != null) {
writer.beginObject();
writer.name("name").value(holder.getUserAuth().getName());
writer.name("sourceClass").value(holder.getUserAuth().getSourceClass());
writer.name("authorities");
writer.beginArray();
for (GrantedAuthority authority : holder.getUserAuth().getAuthorities()) {
writer.value(authority.getAuthority());
}
writer.endArray();
writer.endObject(); writer.endObject();
} else {
writer.nullValue();
}
writer.endObject();
logger.debug("Wrote authentication holder {}", holder.getId());
}
logger.info("Done writing authentication holders");
} }
/** /**