From 61433cc23a605ac13f9f204490b54ff6fbfb45e5 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Fri, 29 Jan 2016 15:38:17 -0500 Subject: [PATCH] deepen webfinger, endpoint is looser closes #1008 --- .../java/org/mitre/discovery/web/DiscoveryEndpoint.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 3d42aaeb4..7d92a8167 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 @@ -101,10 +101,13 @@ public class DiscoveryEndpoint { } }; - @RequestMapping(value={"/" + WEBFINGER_URL}, - params={"resource", "rel=http://openid.net/specs/connect/1.0/issuer"}, produces = MediaType.APPLICATION_JSON_VALUE) - public String webfinger(@RequestParam("resource") String resource, Model model) { + @RequestMapping(value={"/" + WEBFINGER_URL}, produces = MediaType.APPLICATION_JSON_VALUE) + public String webfinger(@RequestParam("resource") String resource, @RequestParam(value = "rel", required = false) String rel, Model model) { + if (!Strings.isNullOrEmpty(rel) && !rel.equals("https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/issues")) { + logger.warn("Responding to webfinger request for non-OIDC relation: " + rel); + } + if (!resource.equals(config.getIssuer())) { // it's not the issuer directly, need to check other methods