diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospection.java b/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospection.java index 664c262d9..8f3ab3dac 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospection.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospection.java @@ -15,16 +15,15 @@ ******************************************************************************/ package org.mitre.oauth2.view; +import java.io.IOException; import java.io.Writer; import java.lang.reflect.Type; -import java.text.DateFormat; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.mitre.oauth2.model.OAuth2AccessTokenEntity; -import org.springframework.security.core.GrantedAuthority; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -42,7 +41,7 @@ import com.google.gson.JsonSerializer; public class TokenIntrospection extends AbstractView { @Override - protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { + protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { Gson gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() { @@ -101,15 +100,25 @@ public class TokenIntrospection extends AbstractView { response.setContentType("application/json"); - Writer out = response.getWriter(); + Writer out; + + try { + + out = response.getWriter(); + Object obj = model.get("entity"); + if (obj == null) { + obj = model; + } - Object obj = model.get("entity"); - if (obj == null) { - obj = model; + gson.toJson(obj, out); + + } catch (IOException e) { + + // TODO Auto-generated catch block + e.printStackTrace(); + } - gson.toJson(obj, out); - } } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ExceptionAsJSONView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ExceptionAsJSONView.java index e5da29707..c6f2293ad 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ExceptionAsJSONView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ExceptionAsJSONView.java @@ -15,6 +15,7 @@ ******************************************************************************/ package org.mitre.openid.connect.view; +import java.io.IOException; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -39,9 +40,7 @@ public class ExceptionAsJSONView extends AbstractView { * javax.servlet.http.HttpServletResponse) */ @Override - protected void renderMergedOutputModel(Map model, - HttpServletRequest requesr, HttpServletResponse response) - throws Exception { + protected void renderMergedOutputModel(Map model, HttpServletRequest requesr, HttpServletResponse response) { response.setContentType("application/json"); @@ -53,7 +52,16 @@ public class ExceptionAsJSONView extends AbstractView { jsonObject.addProperty("error_description", ((Exception) ex).getMessage()); - response.getWriter().write(jsonObject.toString()); + try { + + response.getWriter().write(jsonObject.toString()); + + } catch (IOException e) { + + // TODO Auto-generated catch block + e.printStackTrace(); + + } } } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java index 258a51f28..f34c5dfb7 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java @@ -5,6 +5,7 @@ package org.mitre.openid.connect.view; */ +import java.io.IOException; import java.io.Writer; import java.util.Map; @@ -19,14 +20,12 @@ import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -public class JSONClientView extends AbstractView{ +public class JSONClientView extends AbstractView { /* (non-Javadoc) * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ - protected void renderMergedOutputModel(Map model, - HttpServletRequest request, HttpServletResponse response) - throws Exception { + protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { Gson gson = new GsonBuilder() .setExclusionStrategies(new ExclusionStrategy() { @@ -48,14 +47,23 @@ public class JSONClientView extends AbstractView{ response.setContentType("application/json"); - Writer out = response.getWriter(); + Writer out; + + try { + + out = response.getWriter(); + Object obj = model.get("entity"); + if (obj == null) { + obj = model; + } - Object obj = model.get("entity"); - if (obj == null) { - obj = model; - } - - gson.toJson(obj, out); + gson.toJson(obj, out); + + } catch (IOException e) { + + // TODO Auto-generated catch block + e.printStackTrace(); + + } } - } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONIdTokenView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONIdTokenView.java index 2c29b8b4e..84b7ada14 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONIdTokenView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONIdTokenView.java @@ -15,16 +15,15 @@ ******************************************************************************/ package org.mitre.openid.connect.view; +import java.io.IOException; import java.io.Writer; import java.lang.reflect.Type; -import java.security.PublicKey; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.mitre.jwt.model.ClaimSet; -import org.mitre.openid.connect.model.IdToken; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -34,7 +33,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import com.google.gson.JsonNull; -import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; @@ -43,9 +41,7 @@ public class JSONIdTokenView extends AbstractView { /* (non-Javadoc) * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ - protected void renderMergedOutputModel(Map model, - HttpServletRequest request, HttpServletResponse response) - throws Exception { + protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { Gson gson = new GsonBuilder() .setExclusionStrategies(new ExclusionStrategy() { @@ -78,14 +74,27 @@ public class JSONIdTokenView extends AbstractView { response.setContentType("application/json"); - Writer out = response.getWriter(); - Object obj = model.get("entity"); - if (obj == null) { - obj = model; + Writer out; + + try { + + out = response.getWriter(); + + Object obj = model.get("entity"); + if (obj == null) { + obj = model; + } + + gson.toJson(obj, out); + + } catch (IOException e) { + + // TODO Auto-generated catch block + e.printStackTrace(); + } - - gson.toJson(obj, out); + } } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java index 65cb4e122..5a38a4093 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java @@ -15,6 +15,7 @@ ******************************************************************************/ package org.mitre.openid.connect.view; +import java.io.IOException; import java.io.Writer; import java.util.Map; import java.util.Set; @@ -37,9 +38,7 @@ public class JSONUserInfoView extends AbstractView{ /* (non-Javadoc) * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ - protected void renderMergedOutputModel(Map model, - HttpServletRequest request, HttpServletResponse response) - throws Exception { + protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { UserInfo userInfo = (UserInfo) model.get("userInfo"); @@ -64,11 +63,25 @@ public class JSONUserInfoView extends AbstractView{ }).create(); response.setContentType("application/json"); - Writer out = response.getWriter(); - gson.toJson(toJson(userInfo, scope), out); + + Writer out; + + try { + + out = response.getWriter(); + gson.toJson(toJson(userInfo, scope), out); + + } catch (IOException e) { + + // TODO Auto-generated catch block + e.printStackTrace(); + + } + } private JsonObject toJson(UserInfo ui, Set scope) { + JsonObject obj = new JsonObject(); if (scope.contains("openid")) { diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java index f1895e744..f68cf07a9 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java @@ -18,11 +18,9 @@ */ package org.mitre.openid.connect.view; +import java.io.IOException; import java.io.Writer; -import java.lang.reflect.Type; import java.math.BigInteger; -import java.security.PublicKey; -import java.security.interfaces.ECPublicKey; import java.security.interfaces.RSAPublicKey; import java.util.Map; @@ -35,16 +33,12 @@ import org.mitre.jwt.signer.impl.RsaSigner; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; -import com.google.common.collect.BiMap; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; /** * @author jricher @@ -53,7 +47,7 @@ import com.google.gson.JsonSerializer; public class JwkKeyListView extends AbstractView { @Override - protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { + protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { Gson gson = new GsonBuilder() .setExclusionStrategies(new ExclusionStrategy() { @@ -73,11 +67,9 @@ public class JwkKeyListView extends AbstractView { }) .create(); - response.setContentType("application/json"); - Writer out = response.getWriter(); //BiMap keyMap = (BiMap) model.get("keys"); Map signers = (Map) model.get("signers"); @@ -115,7 +107,19 @@ public class JwkKeyListView extends AbstractView { } // TODO: deal with non-RSA key types } - gson.toJson(obj, out); + Writer out; + + try { + + out = response.getWriter(); + gson.toJson(obj, out); + + } catch (IOException e) { + + // TODO Auto-generated catch block + e.printStackTrace(); + + } } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/POCOUserInfoView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/POCOUserInfoView.java index d50d27db0..1ffee295f 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/POCOUserInfoView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/POCOUserInfoView.java @@ -15,6 +15,7 @@ ******************************************************************************/ package org.mitre.openid.connect.view; +import java.io.IOException; import java.io.Writer; import java.util.Map; import java.util.Set; @@ -38,9 +39,7 @@ public class POCOUserInfoView extends AbstractView{ /* (non-Javadoc) * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ - protected void renderMergedOutputModel(Map model, - HttpServletRequest request, HttpServletResponse response) - throws Exception { + protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { UserInfo userInfo = (UserInfo) model.get("userInfo"); @@ -65,8 +64,21 @@ public class POCOUserInfoView extends AbstractView{ }).create(); response.setContentType("application/json"); - Writer out = response.getWriter(); - gson.toJson(toPoco(userInfo, scope), out); + + Writer out; + + try { + + out = response.getWriter(); + gson.toJson(toPoco(userInfo, scope), out); + + } catch (IOException e) { + + // TODO Auto-generated catch block + e.printStackTrace(); + + } + } private JsonObject toPoco(UserInfo ui, Set scope) { diff --git a/openid-connect-server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java b/openid-connect-server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java index 7189cec29..8c754471e 100644 --- a/openid-connect-server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java +++ b/openid-connect-server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java @@ -15,6 +15,7 @@ ******************************************************************************/ package org.mitre.swd.view; +import java.io.IOException; import java.io.Writer; import java.util.Map; @@ -32,7 +33,7 @@ import com.google.gson.GsonBuilder; public class JsonOpenIdConfigurationView extends AbstractView { @Override - protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { + protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { Gson gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() { @Override @@ -55,15 +56,24 @@ public class JsonOpenIdConfigurationView extends AbstractView { response.setContentType("application/json"); - Writer out = response.getWriter(); - Object obj = model.get("entity"); if (obj == null) { obj = model; } - - gson.toJson(obj, out); + Writer out; + + try { + + out = response.getWriter(); + gson.toJson(obj, out); + + } catch (IOException e) { + + // TODO Auto-generated catch block + e.printStackTrace(); + + } } diff --git a/openid-connect-server/src/main/java/org/mitre/swd/view/SwdResponse.java b/openid-connect-server/src/main/java/org/mitre/swd/view/SwdResponse.java index 047473a10..25d5eb21c 100644 --- a/openid-connect-server/src/main/java/org/mitre/swd/view/SwdResponse.java +++ b/openid-connect-server/src/main/java/org/mitre/swd/view/SwdResponse.java @@ -18,6 +18,7 @@ */ package org.mitre.swd.view; +import java.io.IOException; import java.io.Writer; import java.util.Map; @@ -42,7 +43,7 @@ public class SwdResponse extends AbstractView { * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ @Override - protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { + protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { Gson gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() { @Override @@ -65,14 +66,25 @@ public class SwdResponse extends AbstractView { response.setContentType("application/json"); - Writer out = response.getWriter(); - Object obj = model.get("entity"); if (obj == null) { obj = model; } - - gson.toJson(obj, out); + + Writer out; + + try { + + out = response.getWriter(); + gson.toJson(obj, out); + + } catch (IOException e) { + + // TODO Auto-generated catch block + e.printStackTrace(); + + } + } }