From 7e59421f33895356ea8c1921dba79dd5b7b107da Mon Sep 17 00:00:00 2001 From: Amanda Anganes Date: Thu, 11 Apr 2013 10:33:27 -0400 Subject: [PATCH] Commented out XRD endpoint and added TODO reference to webfinger issue --- .../mitre/discovery/view/XrdJsonResponse.java | 105 ------------------ .../discovery/web/DiscoveryEndpoint.java | 27 ++--- 2 files changed, 14 insertions(+), 118 deletions(-) delete mode 100644 openid-connect-server/src/main/java/org/mitre/discovery/view/XrdJsonResponse.java diff --git a/openid-connect-server/src/main/java/org/mitre/discovery/view/XrdJsonResponse.java b/openid-connect-server/src/main/java/org/mitre/discovery/view/XrdJsonResponse.java deleted file mode 100644 index 109862e1b..000000000 --- a/openid-connect-server/src/main/java/org/mitre/discovery/view/XrdJsonResponse.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * Copyright 2012 The MITRE Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - ******************************************************************************/ -/** - * - */ -package org.mitre.discovery.view; - -import java.io.IOException; -import java.io.Writer; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -import org.springframework.validation.BeanPropertyBindingResult; -import org.springframework.web.servlet.view.AbstractView; - -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.JsonObject; - -/** - * @author jricher - * - */ -@Component("jsonXrdResponseView") -public class XrdJsonResponse extends AbstractView { - - private static Logger logger = LoggerFactory.getLogger(XrdJsonResponse.class); - - /* (non-Javadoc) - * @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) { - Gson gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() { - - @Override - public boolean shouldSkipField(FieldAttributes f) { - return false; - } - - @Override - public boolean shouldSkipClass(Class clazz) { - // skip the JPA binding wrapper - if (clazz.equals(BeanPropertyBindingResult.class)) { - return true; - } else { - return false; - } - } - - }) - .create(); - - response.setContentType("application/json"); - - Map links = (Map) model.get("links"); - - JsonObject obj = new JsonObject(); - JsonArray linksList = new JsonArray(); - obj.add("links", linksList); - - // map of "rel" -> "link" values - for (Map.Entry link : links.entrySet()) { - JsonObject l = new JsonObject(); - l.addProperty("rel", link.getKey()); - l.addProperty("link", link.getValue()); - - linksList.add(l); - } - - Writer out; - - try { - - out = response.getWriter(); - gson.toJson(obj, out); - - } catch (IOException e) { - - logger.error("IOException in XrdJsonResponse.java: ", e); - - } - } -} \ No newline at end of file diff --git a/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java b/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java index 92ceaf297..c99149595 100644 --- a/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java +++ b/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java @@ -34,19 +34,20 @@ public class DiscoveryEndpoint { @Autowired ConfigurationPropertiesBean config; - @RequestMapping(value={"/.well-known/host-meta", "/.well-known/host-meta.json"}, - params={"resource", "rel=http://openid.net/specs/connect/1.0/issuer"}, produces = "application/json") - public ModelAndView xrdDiscovery(@RequestParam("resource") String resource, ModelAndView modelAndView) { - - Map relMap = new HashMap(); - relMap.put("http://openid.net/specs/connect/1.0/issuer", config.getIssuer()); - - modelAndView.getModel().put("links", relMap); - - modelAndView.setViewName("jsonXrdResponseView"); - - return modelAndView; - } + //TODO: rewrite, see issue #279, Webfinger +// @RequestMapping(value={"/.well-known/host-meta", "/.well-known/host-meta.json"}, +// params={"resource", "rel=http://openid.net/specs/connect/1.0/issuer"}, produces = "application/json") +// public ModelAndView xrdDiscovery(@RequestParam("resource") String resource, ModelAndView modelAndView) { +// +// Map relMap = new HashMap(); +// relMap.put("http://openid.net/specs/connect/1.0/issuer", config.getIssuer()); +// +// modelAndView.getModel().put("links", relMap); +// +// modelAndView.setViewName("jsonXrdResponseView"); +// +// return modelAndView; +// } @RequestMapping("/.well-known/openid-configuration") public ModelAndView providerConfiguration(ModelAndView modelAndView, Principal p) {