From 275c1b7e1cd0912f3c0201ca7782af2818b6b88a Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Wed, 21 Dec 2016 14:48:37 -0500
Subject: [PATCH] user info fetcher cache throws error instead of returning
 null (as per library contract), closes #1144

---
 .../connect/client/UserInfoFetcher.java       | 87 +++++++++----------
 1 file changed, 41 insertions(+), 46 deletions(-)

diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java
index f1142d970..1de305b72 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java
@@ -18,6 +18,7 @@ package org.mitre.openid.connect.client;
 
 import java.io.IOException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
@@ -89,7 +90,7 @@ public class UserInfoFetcher {
 			this.factory = new HttpComponentsClientHttpRequestFactory(httpClient);
 		}
 
-		public UserInfo load(final PendingOIDCAuthenticationToken token) {
+		public UserInfo load(final PendingOIDCAuthenticationToken token) throws URISyntaxException {
 	
 			ServerConfiguration serverConfiguration = token.getServerConfiguration();
 	
@@ -103,52 +104,46 @@ public class UserInfoFetcher {
 				return null;
 			}
 	
-			try {
+			String userInfoString = null;
 	
-				String userInfoString = null;
-	
-				if (serverConfiguration.getUserInfoTokenMethod() == null || serverConfiguration.getUserInfoTokenMethod().equals(UserInfoTokenMethod.HEADER)) {
-					RestTemplate restTemplate = new RestTemplate(factory) {
-	
-						@Override
-						protected ClientHttpRequest createRequest(URI url, HttpMethod method) throws IOException {
-							ClientHttpRequest httpRequest = super.createRequest(url, method);
-							httpRequest.getHeaders().add("Authorization", String.format("Bearer %s", token.getAccessTokenValue()));
-							return httpRequest;
-						}
-					};
-	
-					userInfoString = restTemplate.getForObject(serverConfiguration.getUserInfoUri(), String.class);
-	
-				} else if (serverConfiguration.getUserInfoTokenMethod().equals(UserInfoTokenMethod.FORM)) {
-					MultiValueMap<String, String> form = new LinkedMultiValueMap<>();
-					form.add("access_token", token.getAccessTokenValue());
-	
-					RestTemplate restTemplate = new RestTemplate(factory);
-					userInfoString = restTemplate.postForObject(serverConfiguration.getUserInfoUri(), form, String.class);
-				} else if (serverConfiguration.getUserInfoTokenMethod().equals(UserInfoTokenMethod.QUERY)) {
-					URIBuilder builder = new URIBuilder(serverConfiguration.getUserInfoUri());
-					builder.setParameter("access_token",  token.getAccessTokenValue());
-	
-					RestTemplate restTemplate = new RestTemplate(factory);
-					userInfoString = restTemplate.getForObject(builder.toString(), String.class);
-				}
-	
-	
-				if (!Strings.isNullOrEmpty(userInfoString)) {
-	
-					JsonObject userInfoJson = new JsonParser().parse(userInfoString).getAsJsonObject();
-	
-					UserInfo userInfo = fromJson(userInfoJson);
-	
-					return userInfo;
-				} else {
-					// didn't get anything, return null
-					return null;
-				}
-			} catch (Exception e) {
-				logger.warn("Error fetching userinfo", e);
-				return null;
+			if (serverConfiguration.getUserInfoTokenMethod() == null || serverConfiguration.getUserInfoTokenMethod().equals(UserInfoTokenMethod.HEADER)) {
+				RestTemplate restTemplate = new RestTemplate(factory) {
+
+					@Override
+					protected ClientHttpRequest createRequest(URI url, HttpMethod method) throws IOException {
+						ClientHttpRequest httpRequest = super.createRequest(url, method);
+						httpRequest.getHeaders().add("Authorization", String.format("Bearer %s", token.getAccessTokenValue()));
+						return httpRequest;
+					}
+				};
+
+				userInfoString = restTemplate.getForObject(serverConfiguration.getUserInfoUri(), String.class);
+
+			} else if (serverConfiguration.getUserInfoTokenMethod().equals(UserInfoTokenMethod.FORM)) {
+				MultiValueMap<String, String> form = new LinkedMultiValueMap<>();
+				form.add("access_token", token.getAccessTokenValue());
+
+				RestTemplate restTemplate = new RestTemplate(factory);
+				userInfoString = restTemplate.postForObject(serverConfiguration.getUserInfoUri(), form, String.class);
+			} else if (serverConfiguration.getUserInfoTokenMethod().equals(UserInfoTokenMethod.QUERY)) {
+				URIBuilder builder = new URIBuilder(serverConfiguration.getUserInfoUri());
+				builder.setParameter("access_token",  token.getAccessTokenValue());
+
+				RestTemplate restTemplate = new RestTemplate(factory);
+				userInfoString = restTemplate.getForObject(builder.toString(), String.class);
+			}
+
+
+			if (!Strings.isNullOrEmpty(userInfoString)) {
+
+				JsonObject userInfoJson = new JsonParser().parse(userInfoString).getAsJsonObject();
+
+				UserInfo userInfo = fromJson(userInfoJson);
+
+				return userInfo;
+			} else {
+				// didn't get anything throw exception
+				throw new IllegalArgumentException("Unable to load user info");
 			}
 	
 		}