Polish logs

jzheaux · jgrandja · commit e96d2c738757 · 2021-10-20T13:13:47.000-04:00
Closes gh-1941
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/client/InMemoryClientDetailsService.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/client/InMemoryClientDetailsService.java
@@ -40,7 +40,7 @@ public class InMemoryClientDetailsService implements ClientDetailsService {
   public ClientDetails loadClientByClientId(String clientId) throws ClientRegistrationException {
     ClientDetails details = clientDetailsStore.get(clientId);
     if (details == null) {
-      throw new NoSuchClientException("No client with requested id: " + clientId);
+      throw new NoSuchClientException("No client with requested id");
     }
     return details;
   }
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
@@ -125,7 +125,7 @@ public ClientDetails loadClientByClientId(String clientId) throws InvalidClientE
 			details = jdbcTemplate.queryForObject(selectClientDetailsSql, new ClientDetailsRowMapper(), clientId);
 		}
 		catch (EmptyResultDataAccessException e) {
-			throw new NoSuchClientException("No client with requested id: " + clientId);
+			throw new NoSuchClientException("No client with requested id");
 		}
 
 		return details;
@@ -143,21 +143,21 @@ public void addClientDetails(ClientDetails clientDetails) throws ClientAlreadyEx
 	public void updateClientDetails(ClientDetails clientDetails) throws NoSuchClientException {
 		int count = jdbcTemplate.update(updateClientDetailsSql, getFieldsForUpdate(clientDetails));
 		if (count != 1) {
-			throw new NoSuchClientException("No client found with id = " + clientDetails.getClientId());
+			throw new NoSuchClientException("No client found 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 with id = " + clientId);
+			throw new NoSuchClientException("No client found requested id");
 		}
 	}
 
 	public void removeClientDetails(String clientId) throws NoSuchClientException {
 		int count = jdbcTemplate.update(deleteClientDetailsSql, clientId);
 		if (count != 1) {
-			throw new NoSuchClientException("No client found with id = " + clientId);
+			throw new NoSuchClientException("No client found requested id");
 		}
 	}
 
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/code/AuthorizationCodeTokenGranter.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/code/AuthorizationCodeTokenGranter.java
@@ -74,7 +74,7 @@ protected OAuth2Authentication getOAuth2Authentication(ClientDetails client, Tok
 
 		OAuth2Authentication storedAuth = authorizationCodeServices.consumeAuthorizationCode(authorizationCode);
 		if (storedAuth == null) {
-			throw new InvalidGrantException("Invalid authorization code: " + authorizationCode);
+			throw new InvalidGrantException("Invalid authorization code");
 		}
 
 		OAuth2Request pendingOAuth2Request = storedAuth.getOAuth2Request();
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/code/RandomValueAuthorizationCodeServices.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/code/RandomValueAuthorizationCodeServices.java
@@ -32,7 +32,7 @@ public OAuth2Authentication consumeAuthorizationCode(String code)
 			throws InvalidGrantException {
 		OAuth2Authentication auth = this.remove(code);
 		if (auth == null) {
-			throw new InvalidGrantException("Invalid authorization code: " + code);
+			throw new InvalidGrantException("Invalid authorization code");
 		}
 		return auth;
 	}
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/password/ResourceOwnerPasswordTokenGranter.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/password/ResourceOwnerPasswordTokenGranter.java
@@ -85,10 +85,10 @@ protected OAuth2Authentication getOAuth2Authentication(ClientDetails client, Tok
 		}
 		catch (UsernameNotFoundException e) {
 			// If the user is not found, report a generic error message
-			throw new InvalidGrantException(e.getMessage());
+			throw new InvalidGrantException("username not found");
 		}
 		if (userAuth == null || !userAuth.isAuthenticated()) {
-			throw new InvalidGrantException("Could not authenticate user: " + username);
+			throw new InvalidGrantException("Could not authenticate user");
 		}
 		
 		OAuth2Request storedOAuth2Request = getRequestFactory().createOAuth2Request(client, tokenRequest);		
diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/refresh/RefreshTokenGranter.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/refresh/RefreshTokenGranter.java
@@ -59,7 +59,7 @@ protected OAuth2AccessToken getAccessToken(ClientDetails client, TokenRequest to
 			throw new InvalidGrantException(ase.getMessage());
 		} catch (UsernameNotFoundException e) {
 			// If the user is not found, report a generic error message
-			throw new InvalidGrantException(e.getMessage());
+			throw new InvalidGrantException("user not found");
 		}
 	}
 }
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
@@ -85,7 +85,7 @@ protected void validateGrantType(String grantType, ClientDetails clientDetails)
 		Collection<String> authorizedGrantTypes = clientDetails.getAuthorizedGrantTypes();
 		if (authorizedGrantTypes != null && !authorizedGrantTypes.isEmpty()
 				&& !authorizedGrantTypes.contains(grantType)) {
-			throw new InvalidClientException("Unauthorized grant type: " + grantType);
+			throw new InvalidClientException("Unauthorized grant type");
 		}
 	}
 
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
@@ -146,12 +146,12 @@ public OAuth2AccessToken refreshAccessToken(String refreshTokenValue, TokenReque
 			throws AuthenticationException {
 
 		if (!supportRefreshToken) {
-			throw new InvalidGrantException("Invalid refresh token: " + refreshTokenValue);
+			throw new InvalidGrantException("Invalid refresh token");
 		}
 
 		OAuth2RefreshToken refreshToken = tokenStore.readRefreshToken(refreshTokenValue);
 		if (refreshToken == null) {
-			throw new InvalidGrantException("Invalid refresh token: " + refreshTokenValue);
+			throw new InvalidGrantException("Invalid refresh token");
 		}
 
 		OAuth2Authentication authentication = tokenStore.readAuthenticationForRefreshToken(refreshToken);
@@ -174,7 +174,7 @@ public OAuth2AccessToken refreshAccessToken(String refreshTokenValue, TokenReque
 		}
 		String clientId = authentication.getOAuth2Request().getClientId();
 		if (clientId == null || !clientId.equals(tokenRequest.getClientId())) {
-			throw new InvalidGrantException("Wrong client for this refresh token: " + refreshTokenValue);
+			throw new InvalidGrantException("Wrong client for this refresh token");
 		}
 
 		// clear out any access tokens already associated with the refresh
@@ -183,7 +183,7 @@ public OAuth2AccessToken refreshAccessToken(String refreshTokenValue, TokenReque
 
 		if (isExpired(refreshToken)) {
 			tokenStore.removeRefreshToken(refreshToken);
-			throw new InvalidTokenException("Invalid refresh token (expired): " + refreshToken);
+			throw new InvalidTokenException("Invalid refresh token (expired)");
 		}
 
 		authentication = createRefreshedAuthentication(authentication, tokenRequest);
@@ -248,25 +248,25 @@ public OAuth2Authentication loadAuthentication(String accessTokenValue) throws A
 			InvalidTokenException {
 		OAuth2AccessToken accessToken = tokenStore.readAccessToken(accessTokenValue);
 		if (accessToken == null) {
-			throw new InvalidTokenException("Invalid access token: " + accessTokenValue);
+			throw new InvalidTokenException("Invalid access token");
 		}
 		else if (accessToken.isExpired()) {
 			tokenStore.removeAccessToken(accessToken);
-			throw new InvalidTokenException("Access token expired: " + accessTokenValue);
+			throw new InvalidTokenException("Access token expired");
 		}
 
 		OAuth2Authentication result = tokenStore.readAuthentication(accessToken);
 		if (result == null) {
 			// in case of race condition
-			throw new InvalidTokenException("Invalid access token: " + accessTokenValue);
+			throw new InvalidTokenException("Invalid access token");
 		}
 		if (clientDetailsService != null) {
 			String clientId = result.getOAuth2Request().getClientId();
 			try {
 				clientDetailsService.loadClientByClientId(clientId);
 			}
 			catch (ClientRegistrationException e) {
-				throw new InvalidTokenException("Client not valid: " + clientId, e);
+				throw new InvalidTokenException("Client not valid", e);
 			}
 		}
 		return result;
@@ -275,11 +275,11 @@ else if (accessToken.isExpired()) {
 	public String getClientId(String tokenValue) {
 		OAuth2Authentication authentication = tokenStore.readAuthentication(tokenValue);
 		if (authentication == null) {
-			throw new InvalidTokenException("Invalid access token: " + tokenValue);
+			throw new InvalidTokenException("Invalid access token");
 		}
 		OAuth2Request clientAuth = authentication.getOAuth2Request();
 		if (clientAuth == null) {
-			throw new InvalidTokenException("Invalid access token (no client id): " + tokenValue);
+			throw new InvalidTokenException("Invalid access token (no client id)");
 		}
 		return clientAuth.getClientId();
 	}

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public class InMemoryClientDetailsService implements ClientDetailsService {`
`40`	`40`	`public ClientDetails loadClientByClientId(String clientId) throws ClientRegistrationException {`
`41`	`41`	`ClientDetails details = clientDetailsStore.get(clientId);`
`42`	`42`	`if (details == null) {`
`43`		`- throw new NoSuchClientException("No client with requested id: " + clientId);`
	`43`	`+ throw new NoSuchClientException("No client with requested id");`
`44`	`44`	`}`
`45`	`45`	`return details;`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public ClientDetails loadClientByClientId(String clientId) throws InvalidClientE`
`125`	`125`	`details = jdbcTemplate.queryForObject(selectClientDetailsSql, new ClientDetailsRowMapper(), clientId);`
`126`	`126`	`}`
`127`	`127`	`catch (EmptyResultDataAccessException e) {`
`128`		`- throw new NoSuchClientException("No client with requested id: " + clientId);`
	`128`	`+ throw new NoSuchClientException("No client with requested id");`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`return details;`
`@@ -143,21 +143,21 @@ public void addClientDetails(ClientDetails clientDetails) throws ClientAlreadyEx`
`143`	`143`	`public void updateClientDetails(ClientDetails clientDetails) throws NoSuchClientException {`
`144`	`144`	`int count = jdbcTemplate.update(updateClientDetailsSql, getFieldsForUpdate(clientDetails));`
`145`	`145`	`if (count != 1) {`
`146`		`- throw new NoSuchClientException("No client found with id = " + clientDetails.getClientId());`
	`146`	`+ throw new NoSuchClientException("No client found requested id");`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`public void updateClientSecret(String clientId, String secret) throws NoSuchClientException {`
`151`	`151`	`int count = jdbcTemplate.update(updateClientSecretSql, passwordEncoder.encode(secret), clientId);`
`152`	`152`	`if (count != 1) {`
`153`		`- throw new NoSuchClientException("No client found with id = " + clientId);`
	`153`	`+ throw new NoSuchClientException("No client found requested id");`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`public void removeClientDetails(String clientId) throws NoSuchClientException {`
`158`	`158`	`int count = jdbcTemplate.update(deleteClientDetailsSql, clientId);`
`159`	`159`	`if (count != 1) {`
`160`		`- throw new NoSuchClientException("No client found with id = " + clientId);`
	`160`	`+ throw new NoSuchClientException("No client found requested id");`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ protected OAuth2Authentication getOAuth2Authentication(ClientDetails client, Tok`
`74`	`74`
`75`	`75`	`OAuth2Authentication storedAuth = authorizationCodeServices.consumeAuthorizationCode(authorizationCode);`
`76`	`76`	`if (storedAuth == null) {`
`77`		`- throw new InvalidGrantException("Invalid authorization code: " + authorizationCode);`
	`77`	`+ throw new InvalidGrantException("Invalid authorization code");`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`OAuth2Request pendingOAuth2Request = storedAuth.getOAuth2Request();`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public OAuth2Authentication consumeAuthorizationCode(String code)`
`32`	`32`	`throws InvalidGrantException {`
`33`	`33`	`OAuth2Authentication auth = this.remove(code);`
`34`	`34`	`if (auth == null) {`
`35`		`- throw new InvalidGrantException("Invalid authorization code: " + code);`
	`35`	`+ throw new InvalidGrantException("Invalid authorization code");`
`36`	`36`	`}`
`37`	`37`	`return auth;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,10 @@ protected OAuth2Authentication getOAuth2Authentication(ClientDetails client, Tok`
`85`	`85`	`}`
`86`	`86`	`catch (UsernameNotFoundException e) {`
`87`	`87`	`// If the user is not found, report a generic error message`
`88`		`- throw new InvalidGrantException(e.getMessage());`
	`88`	`+ throw new InvalidGrantException("username not found");`
`89`	`89`	`}`
`90`	`90`	`if (userAuth == null \|\| !userAuth.isAuthenticated()) {`
`91`		`- throw new InvalidGrantException("Could not authenticate user: " + username);`
	`91`	`+ throw new InvalidGrantException("Could not authenticate user");`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`OAuth2Request storedOAuth2Request = getRequestFactory().createOAuth2Request(client, tokenRequest);`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected OAuth2AccessToken getAccessToken(ClientDetails client, TokenRequest to`
`59`	`59`	`throw new InvalidGrantException(ase.getMessage());`
`60`	`60`	`} catch (UsernameNotFoundException e) {`
`61`	`61`	`// If the user is not found, report a generic error message`
`62`		`- throw new InvalidGrantException(e.getMessage());`
	`62`	`+ throw new InvalidGrantException("user not found");`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ protected void validateGrantType(String grantType, ClientDetails clientDetails)`
`85`	`85`	`Collection<String> authorizedGrantTypes = clientDetails.getAuthorizedGrantTypes();`
`86`	`86`	`if (authorizedGrantTypes != null && !authorizedGrantTypes.isEmpty()`
`87`	`87`	`&& !authorizedGrantTypes.contains(grantType)) {`
`88`		`- throw new InvalidClientException("Unauthorized grant type: " + grantType);`
	`88`	`+ throw new InvalidClientException("Unauthorized grant type");`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -146,12 +146,12 @@ public OAuth2AccessToken refreshAccessToken(String refreshTokenValue, TokenReque`
`146`	`146`	`throws AuthenticationException {`
`147`	`147`
`148`	`148`	`if (!supportRefreshToken) {`
`149`		`- throw new InvalidGrantException("Invalid refresh token: " + refreshTokenValue);`
	`149`	`+ throw new InvalidGrantException("Invalid refresh token");`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`OAuth2RefreshToken refreshToken = tokenStore.readRefreshToken(refreshTokenValue);`
`153`	`153`	`if (refreshToken == null) {`
`154`		`- throw new InvalidGrantException("Invalid refresh token: " + refreshTokenValue);`
	`154`	`+ throw new InvalidGrantException("Invalid refresh token");`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`OAuth2Authentication authentication = tokenStore.readAuthenticationForRefreshToken(refreshToken);`
`@@ -174,7 +174,7 @@ public OAuth2AccessToken refreshAccessToken(String refreshTokenValue, TokenReque`
`174`	`174`	`}`
`175`	`175`	`String clientId = authentication.getOAuth2Request().getClientId();`
`176`	`176`	`if (clientId == null \|\| !clientId.equals(tokenRequest.getClientId())) {`
`177`		`- throw new InvalidGrantException("Wrong client for this refresh token: " + refreshTokenValue);`
	`177`	`+ throw new InvalidGrantException("Wrong client for this refresh token");`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`// clear out any access tokens already associated with the refresh`
`@@ -183,7 +183,7 @@ public OAuth2AccessToken refreshAccessToken(String refreshTokenValue, TokenReque`
`183`	`183`
`184`	`184`	`if (isExpired(refreshToken)) {`
`185`	`185`	`tokenStore.removeRefreshToken(refreshToken);`
`186`		`- throw new InvalidTokenException("Invalid refresh token (expired): " + refreshToken);`
	`186`	`+ throw new InvalidTokenException("Invalid refresh token (expired)");`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`authentication = createRefreshedAuthentication(authentication, tokenRequest);`
`@@ -248,25 +248,25 @@ public OAuth2Authentication loadAuthentication(String accessTokenValue) throws A`
`248`	`248`	`InvalidTokenException {`
`249`	`249`	`OAuth2AccessToken accessToken = tokenStore.readAccessToken(accessTokenValue);`
`250`	`250`	`if (accessToken == null) {`
`251`		`- throw new InvalidTokenException("Invalid access token: " + accessTokenValue);`
	`251`	`+ throw new InvalidTokenException("Invalid access token");`
`252`	`252`	`}`
`253`	`253`	`else if (accessToken.isExpired()) {`
`254`	`254`	`tokenStore.removeAccessToken(accessToken);`
`255`		`- throw new InvalidTokenException("Access token expired: " + accessTokenValue);`
	`255`	`+ throw new InvalidTokenException("Access token expired");`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`OAuth2Authentication result = tokenStore.readAuthentication(accessToken);`
`259`	`259`	`if (result == null) {`
`260`	`260`	`// in case of race condition`
`261`		`- throw new InvalidTokenException("Invalid access token: " + accessTokenValue);`
	`261`	`+ throw new InvalidTokenException("Invalid access token");`
`262`	`262`	`}`
`263`	`263`	`if (clientDetailsService != null) {`
`264`	`264`	`String clientId = result.getOAuth2Request().getClientId();`
`265`	`265`	`try {`
`266`	`266`	`clientDetailsService.loadClientByClientId(clientId);`
`267`	`267`	`}`
`268`	`268`	`catch (ClientRegistrationException e) {`
`269`		`- throw new InvalidTokenException("Client not valid: " + clientId, e);`
	`269`	`+ throw new InvalidTokenException("Client not valid", e);`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`	`return result;`
`@@ -275,11 +275,11 @@ else if (accessToken.isExpired()) {`
`275`	`275`	`public String getClientId(String tokenValue) {`
`276`	`276`	`OAuth2Authentication authentication = tokenStore.readAuthentication(tokenValue);`
`277`	`277`	`if (authentication == null) {`
`278`		`- throw new InvalidTokenException("Invalid access token: " + tokenValue);`
	`278`	`+ throw new InvalidTokenException("Invalid access token");`
`279`	`279`	`}`
`280`	`280`	`OAuth2Request clientAuth = authentication.getOAuth2Request();`
`281`	`281`	`if (clientAuth == null) {`
`282`		`- throw new InvalidTokenException("Invalid access token (no client id): " + tokenValue);`
	`282`	`+ throw new InvalidTokenException("Invalid access token (no client id)");`
`283`	`283`	`}`
`284`	`284`	`return clientAuth.getClientId();`
`285`	`285`	`}`