Polish gh-1941

jgrandja · jgrandja · commit 2b58aafecac3 · 2021-10-20T14:15:12.000-04:00
diff --git a/samples/oauth2/sparklr/src/main/java/org/springframework/security/oauth/examples/sparklr/mvc/AdminController.java b/samples/oauth2/sparklr/src/main/java/org/springframework/security/oauth/examples/sparklr/mvc/AdminController.java
@@ -97,8 +97,7 @@ private void checkResourceOwner(String user, Principal principal) {
 		if (principal instanceof OAuth2Authentication) {
 			OAuth2Authentication authentication = (OAuth2Authentication) principal;
 			if (!authentication.isClientOnly() && !user.equals(principal.getName())) {
-				throw new AccessDeniedException(String.format("User '%s' cannot obtain tokens for user '%s'",
-						principal.getName(), user));
+				throw new AccessDeniedException("User cannot obtain tokens for user");
 			}
 		}
 	}
diff --git a/spring-security-oauth/src/main/java/org/springframework/security/oauth/config/ConsumerDetailsFactoryBean.java b/spring-security-oauth/src/main/java/org/springframework/security/oauth/config/ConsumerDetailsFactoryBean.java
@@ -96,14 +96,14 @@ public ConsumerDetails getObject() throws Exception {
 				consumer.setSignatureSecret(new RSAKeySecret(cert.getPublicKey()));
 			}
 			catch (IOException e) {
-				throw new BeanCreationException("RSA certificate not found at " + secret + ".",
+				throw new BeanCreationException("RSA certificate not found",
 						e);
 			}
 			catch (CertificateException e) {
-				throw new BeanCreationException("Invalid RSA certificate at " + secret + ".", e);
+				throw new BeanCreationException("Invalid RSA certificate", e);
 			}
 			catch (NullPointerException e) {
-				throw new BeanCreationException("Could not load RSA certificate at " + secret + ".", e);
+				throw new BeanCreationException("Could not load RSA certificate", e);
 			}
 			finally {
 				try {
diff --git a/spring-security-oauth/src/main/java/org/springframework/security/oauth/consumer/client/CoreOAuthConsumerSupport.java b/spring-security-oauth/src/main/java/org/springframework/security/oauth/consumer/client/CoreOAuthConsumerSupport.java
@@ -138,7 +138,7 @@ public OAuthConsumerToken getAccessToken(ProtectedResourceDetails details, OAuth
     Map<String, String> additionalParameters = new TreeMap<String, String>();
     if (details.isUse10a()) {
       if (verifier == null) {
-        throw new UnverifiedRequestTokenException("Unverified request token: " + requestToken);
+        throw new UnverifiedRequestTokenException("Unverified request token");
       }
       additionalParameters.put(OAuthConsumerParameter.oauth_verifier.toString(), verifier);
     }
diff --git a/spring-security-oauth/src/main/java/org/springframework/security/oauth/provider/InMemoryConsumerDetailsService.java b/spring-security-oauth/src/main/java/org/springframework/security/oauth/provider/InMemoryConsumerDetailsService.java
@@ -37,7 +37,7 @@ public class InMemoryConsumerDetailsService implements ConsumerDetailsService {
   public ConsumerDetails loadConsumerByConsumerKey(String consumerKey) throws OAuthException {
     ConsumerDetails details = consumerDetailsStore.get(consumerKey);
     if (details == null) {
-      throw new InvalidOAuthParametersException("Consumer not found: " + consumerKey);
+      throw new InvalidOAuthParametersException("Consumer not found");
     }
     return details;
   }
diff --git a/spring-security-oauth/src/main/java/org/springframework/security/oauth/provider/filter/UserAuthorizationProcessingFilter.java b/spring-security-oauth/src/main/java/org/springframework/security/oauth/provider/filter/UserAuthorizationProcessingFilter.java
@@ -80,12 +80,12 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ
 
     OAuthProviderToken token = getTokenServices().getToken(requestToken);
     if (token == null) {
-      throw new InvalidOAuthTokenException("No callback value has been provided for request token " + requestToken + ".");
+      throw new InvalidOAuthTokenException("No callback value has been provided for request token");
     }
 
     String callbackURL = token.getCallbackUrl();
     if (isRequire10a() && callbackURL == null) {
-      throw new InvalidOAuthTokenException("No callback value has been provided for request token " + requestToken + ".");
+      throw new InvalidOAuthTokenException("No callback value has been provided for request token");
     }
 
     if (callbackURL != null) {
diff --git a/spring-security-oauth/src/main/java/org/springframework/security/oauth/provider/nonce/InMemoryNonceServices.java b/spring-security-oauth/src/main/java/org/springframework/security/oauth/provider/nonce/InMemoryNonceServices.java
@@ -65,7 +65,7 @@ public void validateNonce(ConsumerDetails consumerDetails, long timestamp, Strin
 
 		synchronized (NONCES) {
 			if (NONCES.contains(entry)) {
-				throw new NonceAlreadyUsedException("Nonce already used: " + nonce);
+				throw new NonceAlreadyUsedException("Nonce already used");
 			}
 			else {
 				NONCES.add(entry);
diff --git a/spring-security-oauth/src/main/java/org/springframework/security/oauth/provider/token/RandomValueProviderTokenServices.java b/spring-security-oauth/src/main/java/org/springframework/security/oauth/provider/token/RandomValueProviderTokenServices.java
@@ -84,7 +84,7 @@ public OAuthProviderToken getToken(String token) throws AuthenticationException
     OAuthProviderTokenImpl tokenImpl = readToken(token);
 
     if (tokenImpl == null) {
-      throw new InvalidOAuthTokenException("Invalid token: " + token);
+      throw new InvalidOAuthTokenException("Invalid token");
     }
     else if (isExpired(tokenImpl)) {
       removeToken(token);
@@ -138,7 +138,7 @@ public void authorizeRequestToken(String requestToken, String verifier, Authenti
     OAuthProviderTokenImpl tokenImpl = readToken(requestToken);
 
     if (tokenImpl == null) {
-      throw new InvalidOAuthTokenException("Invalid token: " + requestToken);
+      throw new InvalidOAuthTokenException("Invalid token");
     }
     else if (isExpired(tokenImpl)) {
       removeToken(requestToken);
@@ -159,7 +159,7 @@ public OAuthAccessProviderToken createAccessToken(String requestToken) throws Au
     OAuthProviderTokenImpl tokenImpl = readToken(requestToken);
 
     if (tokenImpl == null) {
-      throw new InvalidOAuthTokenException("Invalid token: " + requestToken);
+      throw new InvalidOAuthTokenException("Invalid token");
     }
     else if (isExpired(tokenImpl)) {
       removeToken(requestToken);
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/http/converter/jaxb/AbstractJaxbMessageConverter.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/http/converter/jaxb/AbstractJaxbMessageConverter.java
@@ -84,7 +84,7 @@ protected final void writeToResult(E accessToken, HttpHeaders headers, Result re
 			createMarshaller().marshal(convertedAccessToken, result);
 		}
 		catch (MarshalException ex) {
-			throw new HttpMessageNotWritableException("Could not marshal [" + accessToken + "]: " + ex.getMessage(), ex);
+			throw new HttpMessageNotWritableException("Could not marshal accessToken: " + ex.getMessage(), ex);
 		}
 		catch (JAXBException ex) {
 			throw new HttpMessageConversionException("Could not instantiate JAXBContext: " + ex.getMessage(), ex);
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/approval/ApprovalStoreUserApprovalHandler.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/approval/ApprovalStoreUserApprovalHandler.java
@@ -135,7 +135,7 @@ public AuthorizationRequest checkForPreApproval(AuthorizationRequest authorizati
 				}
 			}
 			catch (ClientRegistrationException e) {
-				logger.warn("Client registration problem prevent autoapproval check for client=" + clientId);
+				logger.warn("Client registration problem prevent autoapproval check for client");
 			}
 		}
 
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/authentication/OAuth2AuthenticationManager.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/authentication/OAuth2AuthenticationManager.java
@@ -86,7 +86,7 @@ public Authentication authenticate(Authentication authentication) throws Authent
 		String token = (String) authentication.getPrincipal();
 		OAuth2Authentication auth = tokenServices.loadAuthentication(token);
 		if (auth == null) {
-			throw new InvalidTokenException("Invalid token: " + token);
+			throw new InvalidTokenException("Invalid token");
 		}
 
 		Collection<String> resourceIds = auth.getOAuth2Request().getResourceIds();
@@ -123,7 +123,7 @@ private void checkClientDetails(OAuth2Authentication auth) {
 			for (String scope : auth.getOAuth2Request().getScope()) {
 				if (!allowed.contains(scope)) {
 					throw new OAuth2AccessDeniedException(
-							"Invalid token contains disallowed scope (" + scope + ") for this client");
+							"Invalid token contains disallowed scope for this client");
 				}
 			}
 		}
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/client/JdbcClientDetailsService.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/client/JdbcClientDetailsService.java
@@ -136,28 +136,28 @@ public void addClientDetails(ClientDetails clientDetails) throws ClientAlreadyEx
 			jdbcTemplate.update(insertClientDetailsSql, getFields(clientDetails));
 		}
 		catch (DuplicateKeyException e) {
-			throw new ClientAlreadyExistsException("Client already exists: " + clientDetails.getClientId(), e);
+			throw new ClientAlreadyExistsException("Client already exists", e);
 		}
 	}
 
 	public void updateClientDetails(ClientDetails clientDetails) throws NoSuchClientException {
 		int count = jdbcTemplate.update(updateClientDetailsSql, getFieldsForUpdate(clientDetails));
 		if (count != 1) {
-			throw new NoSuchClientException("No client found requested id");
+			throw new NoSuchClientException("No client found with requested id");
 		}
 	}
 
 	public void updateClientSecret(String clientId, String secret) throws NoSuchClientException {
 		int count = jdbcTemplate.update(updateClientSecretSql, passwordEncoder.encode(secret), clientId);
 		if (count != 1) {
-			throw new NoSuchClientException("No client found requested id");
+			throw new NoSuchClientException("No client found with requested id");
 		}
 	}
 
 	public void removeClientDetails(String clientId) throws NoSuchClientException {
 		int count = jdbcTemplate.update(deleteClientDetailsSql, clientId);
 		if (count != 1) {
-			throw new NoSuchClientException("No client found requested id");
+			throw new NoSuchClientException("No client found with requested id");
 		}
 	}
 
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/endpoint/AuthorizationEndpoint.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/endpoint/AuthorizationEndpoint.java
@@ -139,7 +139,7 @@ public ModelAndView authorize(Map<String, Object> model, @RequestParam Map<Strin
 		Set<String> responseTypes = authorizationRequest.getResponseTypes();
 
 		if (!responseTypes.contains("token") && !responseTypes.contains("code")) {
-			throw new UnsupportedResponseTypeException("Unsupported response types: " + responseTypes);
+			throw new UnsupportedResponseTypeException("Unsupported response types");
 		}
 
 		if (authorizationRequest.getClientId() == null) {
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/endpoint/DefaultRedirectResolver.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/endpoint/DefaultRedirectResolver.java
@@ -230,7 +230,6 @@ private String obtainMatchingRedirect(Set<String> redirectUris, String requested
 			}
 		}
 
-		throw new RedirectMismatchException("Invalid redirect: " + requestedRedirect
-				+ " does not match one of the registered values.");
+		throw new RedirectMismatchException("Invalid redirect uri does not match one of the registered values.");
 	}
 }
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java
@@ -128,7 +128,7 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
 			if (credentials != null) {
 
 				if (debug) {
-					logger.debug("Authentication credentials found for '" + credentials.getName() + "'");
+					logger.debug("Authentication credentials found");
 				}
 
 				Authentication authResult = authenticationManager.authenticate(credentials);
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/request/DefaultOAuth2RequestValidator.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/request/DefaultOAuth2RequestValidator.java
@@ -33,7 +33,7 @@ private void validateScope(Set<String> requestScopes, Set<String> clientScopes)
 		if (clientScopes != null && !clientScopes.isEmpty()) {
 			for (String scope : requestScopes) {
 				if (!clientScopes.contains(scope)) {
-					throw new InvalidScopeException("Invalid scope: " + scope, clientScopes);
+					throw new InvalidScopeException("Invalid scope", clientScopes);
 				}
 			}
 		}
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/AbstractTokenGranter.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/AbstractTokenGranter.java
@@ -65,7 +65,7 @@ public OAuth2AccessToken grant(String grantType, TokenRequest tokenRequest) {
 		validateGrantType(grantType, client);
 
 		if (logger.isDebugEnabled()) {
-			logger.debug("Getting access token for: " + clientId);
+			logger.debug("Getting access token for clientId");
 		}
 
 		return getAccessToken(client, tokenRequest);
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/DefaultTokenServices.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/DefaultTokenServices.java
@@ -220,8 +220,7 @@ private OAuth2Authentication createRefreshedAuthentication(OAuth2Authentication
 		if (scope != null && !scope.isEmpty()) {
 			Set<String> originalScope = clientAuth.getScope();
 			if (originalScope == null || !originalScope.containsAll(scope)) {
-				throw new InvalidScopeException("Unable to narrow the scope of the client authentication to " + scope
-						+ ".", originalScope);
+				throw new InvalidScopeException("Unable to narrow the scope of the client authentication", originalScope);
 			}
 			else {
 				clientAuth = clientAuth.narrowScope(scope);
diff --git a/spring-security-oauth2/src/test/java/org/springframework/security/oauth2/provider/code/RedisAuthorizationCodeServicesTests.java b/spring-security-oauth2/src/test/java/org/springframework/security/oauth2/provider/code/RedisAuthorizationCodeServicesTests.java
@@ -100,7 +100,7 @@ public void verifyCreateAndConsumeAuthorizationCode() {
 		}
 		catch (InvalidGrantException e) {
 			assertThat("Wrong error message!", e.getMessage(),
-					allOf(containsString("Invalid"), containsString(authorizationCode)));
+					allOf(containsString("Invalid authorization code")));
 		}
 	}
 }
diff --git a/spring-security-oauth2/src/test/java/org/springframework/security/oauth2/provider/endpoint/DefaultRedirectResolverTests.java b/spring-security-oauth2/src/test/java/org/springframework/security/oauth2/provider/endpoint/DefaultRedirectResolverTests.java
@@ -204,7 +204,7 @@ public void testRedirectNotMatchingReturnsGenericErrorMessage() throws Exception
 			resolver.resolveRedirect(requestedRedirect, client);
 			fail();
 		} catch (RedirectMismatchException ex) {
-			assertEquals("Invalid redirect: https://anywhere.com/myendpoint does not match one of the registered values.", ex.getMessage());
+			assertEquals("Invalid redirect uri does not match one of the registered values.", ex.getMessage());
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,7 @@ private void checkResourceOwner(String user, Principal principal) {`
`97`	`97`	`if (principal instanceof OAuth2Authentication) {`
`98`	`98`	`OAuth2Authentication authentication = (OAuth2Authentication) principal;`
`99`	`99`	`if (!authentication.isClientOnly() && !user.equals(principal.getName())) {`
`100`		`- throw new AccessDeniedException(String.format("User '%s' cannot obtain tokens for user '%s'",`
`101`		`- principal.getName(), user));`
	`100`	`+ throw new AccessDeniedException("User cannot obtain tokens for user");`
`102`	`101`	`}`
`103`	`102`	`}`
`104`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,14 +96,14 @@ public ConsumerDetails getObject() throws Exception {`
`96`	`96`	`consumer.setSignatureSecret(new RSAKeySecret(cert.getPublicKey()));`
`97`	`97`	`}`
`98`	`98`	`catch (IOException e) {`
`99`		`- throw new BeanCreationException("RSA certificate not found at " + secret + ".",`
	`99`	`+ throw new BeanCreationException("RSA certificate not found",`
`100`	`100`	`e);`
`101`	`101`	`}`
`102`	`102`	`catch (CertificateException e) {`
`103`		`- throw new BeanCreationException("Invalid RSA certificate at " + secret + ".", e);`
	`103`	`+ throw new BeanCreationException("Invalid RSA certificate", e);`
`104`	`104`	`}`
`105`	`105`	`catch (NullPointerException e) {`
`106`		`- throw new BeanCreationException("Could not load RSA certificate at " + secret + ".", e);`
	`106`	`+ throw new BeanCreationException("Could not load RSA certificate", e);`
`107`	`107`	`}`
`108`	`108`	`finally {`
`109`	`109`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public OAuthConsumerToken getAccessToken(ProtectedResourceDetails details, OAuth`
`138`	`138`	`Map<String, String> additionalParameters = new TreeMap<String, String>();`
`139`	`139`	`if (details.isUse10a()) {`
`140`	`140`	`if (verifier == null) {`
`141`		`- throw new UnverifiedRequestTokenException("Unverified request token: " + requestToken);`
	`141`	`+ throw new UnverifiedRequestTokenException("Unverified request token");`
`142`	`142`	`}`
`143`	`143`	`additionalParameters.put(OAuthConsumerParameter.oauth_verifier.toString(), verifier);`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class InMemoryConsumerDetailsService implements ConsumerDetailsService {`
`37`	`37`	`public ConsumerDetails loadConsumerByConsumerKey(String consumerKey) throws OAuthException {`
`38`	`38`	`ConsumerDetails details = consumerDetailsStore.get(consumerKey);`
`39`	`39`	`if (details == null) {`
`40`		`- throw new InvalidOAuthParametersException("Consumer not found: " + consumerKey);`
	`40`	`+ throw new InvalidOAuthParametersException("Consumer not found");`
`41`	`41`	`}`
`42`	`42`	`return details;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,12 +80,12 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ`
`80`	`80`
`81`	`81`	`OAuthProviderToken token = getTokenServices().getToken(requestToken);`
`82`	`82`	`if (token == null) {`
`83`		`- throw new InvalidOAuthTokenException("No callback value has been provided for request token " + requestToken + ".");`
	`83`	`+ throw new InvalidOAuthTokenException("No callback value has been provided for request token");`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`String callbackURL = token.getCallbackUrl();`
`87`	`87`	`if (isRequire10a() && callbackURL == null) {`
`88`		`- throw new InvalidOAuthTokenException("No callback value has been provided for request token " + requestToken + ".");`
	`88`	`+ throw new InvalidOAuthTokenException("No callback value has been provided for request token");`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (callbackURL != null) {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public void validateNonce(ConsumerDetails consumerDetails, long timestamp, Strin`
`65`	`65`
`66`	`66`	`synchronized (NONCES) {`
`67`	`67`	`if (NONCES.contains(entry)) {`
`68`		`- throw new NonceAlreadyUsedException("Nonce already used: " + nonce);`
	`68`	`+ throw new NonceAlreadyUsedException("Nonce already used");`
`69`	`69`	`}`
`70`	`70`	`else {`
`71`	`71`	`NONCES.add(entry);`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected final void writeToResult(E accessToken, HttpHeaders headers, Result re`
`84`	`84`	`createMarshaller().marshal(convertedAccessToken, result);`
`85`	`85`	`}`
`86`	`86`	`catch (MarshalException ex) {`
`87`		`- throw new HttpMessageNotWritableException("Could not marshal [" + accessToken + "]: " + ex.getMessage(), ex);`
	`87`	`+ throw new HttpMessageNotWritableException("Could not marshal accessToken: " + ex.getMessage(), ex);`
`88`	`88`	`}`
`89`	`89`	`catch (JAXBException ex) {`
`90`	`90`	`throw new HttpMessageConversionException("Could not instantiate JAXBContext: " + ex.getMessage(), ex);`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public AuthorizationRequest checkForPreApproval(AuthorizationRequest authorizati`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`catch (ClientRegistrationException e) {`
`138`		`- logger.warn("Client registration problem prevent autoapproval check for client=" + clientId);`
	`138`	`+ logger.warn("Client registration problem prevent autoapproval check for client");`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public Authentication authenticate(Authentication authentication) throws Authent`
`86`	`86`	`String token = (String) authentication.getPrincipal();`
`87`	`87`	`OAuth2Authentication auth = tokenServices.loadAuthentication(token);`
`88`	`88`	`if (auth == null) {`
`89`		`- throw new InvalidTokenException("Invalid token: " + token);`
	`89`	`+ throw new InvalidTokenException("Invalid token");`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`Collection<String> resourceIds = auth.getOAuth2Request().getResourceIds();`
`@@ -123,7 +123,7 @@ private void checkClientDetails(OAuth2Authentication auth) {`
`123`	`123`	`for (String scope : auth.getOAuth2Request().getScope()) {`
`124`	`124`	`if (!allowed.contains(scope)) {`
`125`	`125`	`throw new OAuth2AccessDeniedException(`
`126`		`- "Invalid token contains disallowed scope (" + scope + ") for this client");`
	`126`	`+ "Invalid token contains disallowed scope for this client");`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`}`