Update exception variable names
Consistently use `ex` for caught exception and `cause` for Exception constructor arguments. Issue gh-8945
This commit is contained in:
Phillip Webb
Rob Winch
parent
e9130489a6
commit
8d80166aaf
|
|
@ -34,10 +34,10 @@ public class IdentityUnavailableException extends RuntimeException {
|
|||
* Constructs an <code>IdentityUnavailableException</code> with the specified message
|
||||
* and root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public IdentityUnavailableException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public IdentityUnavailableException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,8 +77,8 @@ public class ObjectIdentityImpl implements ObjectIdentity {
|
|||
Method method = typeClass.getMethod("getId", new Class[] {});
|
||||
result = method.invoke(object);
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new IdentityUnavailableException("Could not extract identity from object " + object, e);
|
||||
catch (Exception ex) {
|
||||
throw new IdentityUnavailableException("Could not extract identity from object " + object, ex);
|
||||
}
|
||||
|
||||
Assert.notNull(result, "getId() is required to return a non-null value");
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ class AclClassIdUtils {
|
|||
try {
|
||||
hasClassIdType = classIdTypeFrom(resultSet) != null;
|
||||
}
|
||||
catch (SQLException e) {
|
||||
log.debug("Unable to obtain the class id type", e);
|
||||
catch (SQLException ex) {
|
||||
log.debug("Unable to obtain the class id type", ex);
|
||||
}
|
||||
return hasClassIdType;
|
||||
}
|
||||
|
|
@ -101,8 +101,8 @@ class AclClassIdUtils {
|
|||
try {
|
||||
targetType = Class.forName(className);
|
||||
}
|
||||
catch (ClassNotFoundException e) {
|
||||
log.debug("Unable to find class id type on classpath", e);
|
||||
catch (ClassNotFoundException ex) {
|
||||
log.debug("Unable to find class id type on classpath", ex);
|
||||
}
|
||||
}
|
||||
return targetType;
|
||||
|
|
|
|||
|
|
@ -194,8 +194,8 @@ public class BasicLookupStrategy implements LookupStrategy {
|
|||
try {
|
||||
return (List<AccessControlEntryImpl>) this.fieldAces.get(acl);
|
||||
}
|
||||
catch (IllegalAccessException e) {
|
||||
throw new IllegalStateException("Could not obtain AclImpl.aces field", e);
|
||||
catch (IllegalAccessException ex) {
|
||||
throw new IllegalStateException("Could not obtain AclImpl.aces field", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -203,8 +203,8 @@ public class BasicLookupStrategy implements LookupStrategy {
|
|||
try {
|
||||
this.fieldAcl.set(ace, acl);
|
||||
}
|
||||
catch (IllegalAccessException e) {
|
||||
throw new IllegalStateException("Could not or set AclImpl on AccessControlEntryImpl fields", e);
|
||||
catch (IllegalAccessException ex) {
|
||||
throw new IllegalStateException("Could not or set AclImpl on AccessControlEntryImpl fields", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -212,8 +212,8 @@ public class BasicLookupStrategy implements LookupStrategy {
|
|||
try {
|
||||
this.fieldAces.set(acl, aces);
|
||||
}
|
||||
catch (IllegalAccessException e) {
|
||||
throw new IllegalStateException("Could not set AclImpl entries", e);
|
||||
catch (IllegalAccessException ex) {
|
||||
throw new IllegalStateException("Could not set AclImpl entries", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@ public class AlreadyExistsException extends AclDataAccessException {
|
|||
* Constructs an <code>AlreadyExistsException</code> with the specified message and
|
||||
* root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public AlreadyExistsException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public AlreadyExistsException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@ public class ChildrenExistException extends AclDataAccessException {
|
|||
* Constructs an <code>ChildrenExistException</code> with the specified message and
|
||||
* root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public ChildrenExistException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public ChildrenExistException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@ public class NotFoundException extends AclDataAccessException {
|
|||
* Constructs an <code>NotFoundException</code> with the specified message and root
|
||||
* cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public NotFoundException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public NotFoundException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ public class UnloadedSidException extends AclDataAccessException {
|
|||
* Constructs an <code>NotFoundException</code> with the specified message and root
|
||||
* cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public UnloadedSidException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public UnloadedSidException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -628,8 +628,8 @@ public class AclImplTests {
|
|||
((AuditableAccessControlEntry) ac).isAuditFailure()));
|
||||
}
|
||||
}
|
||||
catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
catch (IllegalAccessException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
|
||||
return acl;
|
||||
|
|
|
|||
|
|
@ -121,9 +121,9 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin
|
|||
// new DatabaseSeeder(dataSource, new
|
||||
// ClassPathResource("createAclSchemaPostgres.sql"));
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
throw e;
|
||||
catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
throw ex;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -156,8 +156,8 @@ public class CasAuthenticationProvider implements AuthenticationProvider, Initia
|
|||
return new CasAuthenticationToken(this.key, userDetails, authentication.getCredentials(),
|
||||
this.authoritiesMapper.mapAuthorities(userDetails.getAuthorities()), userDetails, assertion);
|
||||
}
|
||||
catch (final TicketValidationException e) {
|
||||
throw new BadCredentialsException(e.getMessage(), e);
|
||||
catch (TicketValidationException ex) {
|
||||
throw new BadCredentialsException(ex.getMessage(), ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -74,8 +74,8 @@ public class ServiceAuthenticationDetailsSource
|
|||
return new DefaultServiceAuthenticationDetails(this.serviceProperties.getService(), context,
|
||||
this.artifactPattern);
|
||||
}
|
||||
catch (MalformedURLException e) {
|
||||
throw new RuntimeException(e);
|
||||
catch (MalformedURLException ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -102,8 +102,8 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
|
|||
try {
|
||||
return build();
|
||||
}
|
||||
catch (Exception e) {
|
||||
this.logger.debug("Failed to perform build. Returning null", e);
|
||||
catch (Exception ex) {
|
||||
this.logger.debug("Failed to perform build. Returning null", ex);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -595,7 +595,7 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild
|
|||
try (ServerSocket serverSocket = new ServerSocket(DEFAULT_PORT)) {
|
||||
return serverSocket.getLocalPort();
|
||||
}
|
||||
catch (IOException e) {
|
||||
catch (IOException ex) {
|
||||
return RANDOM_PORT;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,9 +63,9 @@ final class AutowireBeanFactoryObjectPostProcessor
|
|||
try {
|
||||
result = (T) this.autowireBeanFactory.initializeBean(object, object.toString());
|
||||
}
|
||||
catch (RuntimeException e) {
|
||||
catch (RuntimeException ex) {
|
||||
Class<?> type = object.getClass();
|
||||
throw new RuntimeException("Could not postProcess " + object + " of type " + type, e);
|
||||
throw new RuntimeException("Could not postProcess " + object + " of type " + type, ex);
|
||||
}
|
||||
this.autowireBeanFactory.autowireBean(object);
|
||||
if (result instanceof DisposableBean) {
|
||||
|
|
|
|||
|
|
@ -153,8 +153,8 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit
|
|||
try {
|
||||
initializeMethodSecurityInterceptor();
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
catch (Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
|
||||
PermissionEvaluator permissionEvaluator = getSingleBeanOrNull(PermissionEvaluator.class);
|
||||
|
|
@ -182,7 +182,7 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit
|
|||
try {
|
||||
return this.context.getBean(type);
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -311,26 +311,26 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder<Filter,
|
|||
try {
|
||||
this.defaultWebSecurityExpressionHandler.setRoleHierarchy(applicationContext.getBean(RoleHierarchy.class));
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
}
|
||||
|
||||
try {
|
||||
this.defaultWebSecurityExpressionHandler
|
||||
.setPermissionEvaluator(applicationContext.getBean(PermissionEvaluator.class));
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
}
|
||||
|
||||
this.ignoredRequestRegistry = new IgnoredRequestConfigurer(applicationContext);
|
||||
try {
|
||||
this.httpFirewall = applicationContext.getBean(HttpFirewall.class);
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
}
|
||||
try {
|
||||
this.requestRejectedHandler = applicationContext.getBean(RequestRejectedHandler.class);
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -165,8 +165,8 @@ class SecurityReactorContextConfiguration {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onError(Throwable t) {
|
||||
this.delegate.onError(t);
|
||||
public void onError(Throwable ex) {
|
||||
this.delegate.onError(ex);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ public final class RequestCacheConfigurer<H extends HttpSecurityBuilder<H>>
|
|||
try {
|
||||
return context.getBean(type);
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -560,7 +560,7 @@ public final class SessionManagementConfigurer<H extends HttpSecurityBuilder<H>>
|
|||
try {
|
||||
return context.getBean(type);
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -506,7 +506,7 @@ public final class OAuth2ResourceServerConfigurer<H extends HttpSecurityBuilder<
|
|||
try {
|
||||
return this.bearerTokenResolver.resolve(request) != null;
|
||||
}
|
||||
catch (OAuth2AuthenticationException e) {
|
||||
catch (OAuth2AuthenticationException ex) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ public final class Saml2LoginConfigurer<B extends HttpSecurityBuilder<B>>
|
|||
try {
|
||||
return context.getBean(clazz);
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends A
|
|||
try {
|
||||
return this.context.getBean(SimpAnnotationMethodMessageHandler.class).getPathMatcher();
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
return new AntPathMatcher();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,9 +51,9 @@ public class AuthenticationManagerFactoryBean implements FactoryBean<Authenticat
|
|||
try {
|
||||
return (AuthenticationManager) this.bf.getBean(BeanIds.AUTHENTICATION_MANAGER);
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
if (!BeanIds.AUTHENTICATION_MANAGER.equals(e.getBeanName())) {
|
||||
throw e;
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
if (!BeanIds.AUTHENTICATION_MANAGER.equals(ex.getBeanName())) {
|
||||
throw ex;
|
||||
}
|
||||
|
||||
UserDetailsService uds = getBeanOrNull(UserDetailsService.class);
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ public class UserServiceBeanDefinitionParser extends AbstractUserDetailsServiceB
|
|||
try {
|
||||
this.random = SecureRandom.getInstance("SHA1PRNG");
|
||||
}
|
||||
catch (NoSuchAlgorithmException e) {
|
||||
catch (NoSuchAlgorithmException ex) {
|
||||
// Shouldn't happen...
|
||||
throw new RuntimeException("Failed find SHA1PRNG algorithm!");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,8 +113,8 @@ public class RsaKeyConversionServicePostProcessor implements BeanFactoryPostProc
|
|||
try {
|
||||
return resource.getInputStream();
|
||||
}
|
||||
catch (IOException e) {
|
||||
throw new UncheckedIOException(e);
|
||||
catch (IOException ex) {
|
||||
throw new UncheckedIOException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -123,8 +123,8 @@ public class RsaKeyConversionServicePostProcessor implements BeanFactoryPostProc
|
|||
try (InputStream is = inputStream) {
|
||||
return inputStreamKeyConverter.convert(is);
|
||||
}
|
||||
catch (IOException e) {
|
||||
throw new UncheckedIOException(e);
|
||||
catch (IOException ex) {
|
||||
throw new UncheckedIOException(ex);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain
|
|||
try {
|
||||
filters = fcp.getFilters(loginPage);
|
||||
}
|
||||
catch (Exception e) {
|
||||
catch (Exception ex) {
|
||||
// May happen legitimately if a filter-chain request matcher requires more
|
||||
// request data than that provided
|
||||
// by the dummy request used when creating the filter invocation.
|
||||
|
|
@ -196,19 +196,19 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain
|
|||
try {
|
||||
fsi.getAccessDecisionManager().decide(token, loginRequest, attributes);
|
||||
}
|
||||
catch (AccessDeniedException e) {
|
||||
catch (AccessDeniedException ex) {
|
||||
this.logger
|
||||
.warn("Anonymous access to the login page doesn't appear to be enabled. This is almost certainly "
|
||||
+ "an error. Please check your configuration allows unauthenticated access to the configured "
|
||||
+ "login page. (Simulated access was rejected: " + e + ")");
|
||||
+ "login page. (Simulated access was rejected: " + ex + ")");
|
||||
}
|
||||
catch (Exception e) {
|
||||
catch (Exception ex) {
|
||||
// May happen legitimately if a filter-chain request matcher requires more
|
||||
// request data than that provided
|
||||
// by the dummy request used when creating the filter invocation. See SEC-1878
|
||||
this.logger.info(
|
||||
"Unable to check access to the login page to determine if anonymous access is allowed. This might be an error, but can happen under normal circumstances.",
|
||||
e);
|
||||
ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -478,9 +478,9 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
|
|||
try {
|
||||
builder.addConstructorArgValue(new StaticAllowFromStrategy(new URI(value)));
|
||||
}
|
||||
catch (URISyntaxException e) {
|
||||
catch (URISyntaxException ex) {
|
||||
parserContext.getReaderContext().error("'value' attribute doesn't represent a valid URI.", frameElement,
|
||||
e);
|
||||
ex);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -363,7 +363,7 @@ final class OAuth2ResourceServerBeanDefinitionParser implements BeanDefinitionPa
|
|||
try {
|
||||
return this.bearerTokenResolver.resolve(request) != null;
|
||||
}
|
||||
catch (OAuth2AuthenticationException e) {
|
||||
catch (OAuth2AuthenticationException ex) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,10 +52,10 @@ class ContextSourceSettingPostProcessor implements BeanFactoryPostProcessor, Ord
|
|||
contextSourceClass = ClassUtils.forName(REQUIRED_CONTEXT_SOURCE_CLASS_NAME,
|
||||
ClassUtils.getDefaultClassLoader());
|
||||
}
|
||||
catch (ClassNotFoundException e) {
|
||||
catch (ClassNotFoundException ex) {
|
||||
throw new ApplicationContextException("Couldn't locate: " + REQUIRED_CONTEXT_SOURCE_CLASS_NAME + ". "
|
||||
+ " If you are using LDAP with Spring Security, please ensure that you include the spring-ldap "
|
||||
+ "jar file in your application", e);
|
||||
+ "jar file in your application", ex);
|
||||
}
|
||||
|
||||
String[] sources = bf.getBeanNamesForType(contextSourceClass, false, false);
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ public class LdapServerBeanDefinitionParser implements BeanDefinitionParser {
|
|||
try (ServerSocket serverSocket = new ServerSocket(DEFAULT_PORT)) {
|
||||
return String.valueOf(serverSocket.getLocalPort());
|
||||
}
|
||||
catch (IOException e) {
|
||||
catch (IOException ex) {
|
||||
return RANDOM_PORT;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -489,12 +489,12 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP
|
|||
try {
|
||||
this.delegate = this.beanFactory.getBean(this.authMgrBean, AuthenticationManager.class);
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e) {
|
||||
if (BeanIds.AUTHENTICATION_MANAGER.equals(e.getBeanName())) {
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
if (BeanIds.AUTHENTICATION_MANAGER.equals(ex.getBeanName())) {
|
||||
throw new NoSuchBeanDefinitionException(BeanIds.AUTHENTICATION_MANAGER,
|
||||
AuthenticationManagerFactoryBean.MISSING_BEAN_ERROR_MESSAGE);
|
||||
}
|
||||
throw e;
|
||||
throw ex;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,8 +122,8 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor {
|
|||
try {
|
||||
methods = bean.getClass().getMethods();
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new IllegalStateException(e.getMessage());
|
||||
catch (Exception ex) {
|
||||
throw new IllegalStateException(ex.getMessage());
|
||||
}
|
||||
|
||||
// Check to see if any of those methods are compatible with our pointcut
|
||||
|
|
|
|||
|
|
@ -1426,8 +1426,8 @@ public class ServerHttpSecurity {
|
|||
return writer.toString();
|
||||
}
|
||||
}
|
||||
catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
catch (IOException ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@ public class InvalidConfigurationTests {
|
|||
setContext("<http auto-config='true' />");
|
||||
fail();
|
||||
}
|
||||
catch (BeanCreationException e) {
|
||||
Throwable cause = ultimateCause(e);
|
||||
catch (BeanCreationException ex) {
|
||||
Throwable cause = ultimateCause(ex);
|
||||
assertThat(cause instanceof NoSuchBeanDefinitionException).isTrue();
|
||||
NoSuchBeanDefinitionException nsbe = (NoSuchBeanDefinitionException) cause;
|
||||
assertThat(nsbe.getBeanName()).isEqualTo(BeanIds.AUTHENTICATION_MANAGER);
|
||||
|
|
@ -71,11 +71,11 @@ public class InvalidConfigurationTests {
|
|||
}
|
||||
}
|
||||
|
||||
private Throwable ultimateCause(Throwable e) {
|
||||
if (e.getCause() == null) {
|
||||
return e;
|
||||
private Throwable ultimateCause(Throwable ex) {
|
||||
if (ex.getCause() == null) {
|
||||
return ex;
|
||||
}
|
||||
return ultimateCause(e.getCause());
|
||||
return ultimateCause(ex.getCause());
|
||||
}
|
||||
|
||||
private void setContext(String context) {
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ public class GlobalMethodSecurityConfigurationTests {
|
|||
try {
|
||||
this.authenticationManager.authenticate(new UsernamePasswordAuthenticationToken("foo", "bar"));
|
||||
}
|
||||
catch (AuthenticationException e) {
|
||||
catch (AuthenticationException ex) {
|
||||
}
|
||||
|
||||
assertThat(this.events.getEvents()).extracting(Object::getClass)
|
||||
|
|
|
|||
|
|
@ -120,8 +120,8 @@ public class NamespaceHttpX509Tests {
|
|||
CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
|
||||
return (T) certFactory.generateCertificate(is);
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new IllegalArgumentException(e);
|
||||
catch (Exception ex) {
|
||||
throw new IllegalArgumentException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -244,8 +244,8 @@ public class NamespaceHttpX509Tests {
|
|||
try {
|
||||
return ((X500Name) certificate.getSubjectDN()).getCommonName();
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new IllegalArgumentException(e);
|
||||
catch (Exception ex) {
|
||||
throw new IllegalArgumentException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -209,8 +209,8 @@ public class ServletApiConfigurerTests {
|
|||
try {
|
||||
return (T) FieldUtils.getFieldValue(target, fieldName);
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
catch (Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -94,8 +94,8 @@ public class X509ConfigurerTests {
|
|||
CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
|
||||
return (T) certFactory.generateCertificate(is);
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new IllegalArgumentException(e);
|
||||
catch (Exception ex) {
|
||||
throw new IllegalArgumentException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -256,8 +256,8 @@ public class Saml2LoginConfigurerTests {
|
|||
iout.finish();
|
||||
return new String(out.toByteArray(), StandardCharsets.UTF_8);
|
||||
}
|
||||
catch (IOException e) {
|
||||
throw new Saml2Exception("Unable to inflate string", e);
|
||||
catch (IOException ex) {
|
||||
throw new Saml2Exception("Unable to inflate string", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@ public class TestSaml2Credentials {
|
|||
return (X509Certificate) factory
|
||||
.generateCertificate(new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8)));
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new IllegalArgumentException(e);
|
||||
catch (Exception ex) {
|
||||
throw new IllegalArgumentException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ public class XmlParser implements AutoCloseable {
|
|||
|
||||
return new XmlNode(dBuilder.parse(this.xml));
|
||||
}
|
||||
catch (IOException | ParserConfigurationException | SAXException e) {
|
||||
throw new IllegalStateException(e);
|
||||
catch (IOException | ParserConfigurationException | SAXException ex) {
|
||||
throw new IllegalStateException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -418,8 +418,8 @@ public class SessionManagementConfigTests {
|
|||
try {
|
||||
return (T) FieldUtils.getFieldValue(target, fieldName);
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
catch (Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ public class SpringTestContext implements Closeable {
|
|||
try {
|
||||
this.context.close();
|
||||
}
|
||||
catch (Exception e) {
|
||||
catch (Exception ex) {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -447,8 +447,8 @@ public class OAuth2ResourceServerSpecTests {
|
|||
KeyFactory factory = KeyFactory.getInstance("RSA");
|
||||
rsaPublicKey = (RSAPublicKey) factory.generatePublic(spec);
|
||||
}
|
||||
catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
|
||||
e.printStackTrace();
|
||||
catch (NoSuchAlgorithmException | InvalidKeySpecException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
return rsaPublicKey;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -470,7 +470,7 @@ public class ServerHttpSecurityTests {
|
|||
Object converter = ReflectionTestUtils.getField(filter, "authenticationConverter");
|
||||
return converter.getClass().isAssignableFrom(ServerX509AuthenticationConverter.class);
|
||||
}
|
||||
catch (IllegalArgumentException e) {
|
||||
catch (IllegalArgumentException ex) {
|
||||
// field doesn't exist
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ public class AccessDeniedException extends RuntimeException {
|
|||
* Constructs an <code>AccessDeniedException</code> with the specified message and
|
||||
* root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public AccessDeniedException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public AccessDeniedException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,10 +39,10 @@ public class AuthorizationServiceException extends AccessDeniedException {
|
|||
* Constructs an <code>AuthorizationServiceException</code> with the specified message
|
||||
* and root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public AuthorizationServiceException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public AuthorizationServiceException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,9 @@ public final class ExpressionUtils {
|
|||
try {
|
||||
return expr.getValue(ctx, Boolean.class);
|
||||
}
|
||||
catch (EvaluationException e) {
|
||||
throw new IllegalArgumentException("Failed to evaluate expression '" + expr.getExpressionString() + "'", e);
|
||||
catch (EvaluationException ex) {
|
||||
throw new IllegalArgumentException("Failed to evaluate expression '" + expr.getExpressionString() + "'",
|
||||
ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ public class ExpressionBasedAnnotationAttributeFactory implements PrePostInvocat
|
|||
: parser.parseExpression(preFilterAttribute);
|
||||
return new PreInvocationExpressionAttribute(preFilterExpression, filterObject, preAuthorizeExpression);
|
||||
}
|
||||
catch (ParseException e) {
|
||||
throw new IllegalArgumentException("Failed to parse expression '" + e.getExpressionString() + "'", e);
|
||||
catch (ParseException ex) {
|
||||
throw new IllegalArgumentException("Failed to parse expression '" + ex.getExpressionString() + "'", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -73,8 +73,8 @@ public class ExpressionBasedAnnotationAttributeFactory implements PrePostInvocat
|
|||
return new PostInvocationExpressionAttribute(postFilterExpression, postAuthorizeExpression);
|
||||
}
|
||||
}
|
||||
catch (ParseException e) {
|
||||
throw new IllegalArgumentException("Failed to parse expression '" + e.getExpressionString() + "'", e);
|
||||
catch (ParseException ex) {
|
||||
throw new IllegalArgumentException("Failed to parse expression '" + ex.getExpressionString() + "'", ex);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ public class AccountExpiredException extends AccountStatusException {
|
|||
* Constructs a <code>AccountExpiredException</code> with the specified message and
|
||||
* root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public AccountExpiredException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public AccountExpiredException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ public abstract class AccountStatusException extends AuthenticationException {
|
|||
super(msg);
|
||||
}
|
||||
|
||||
public AccountStatusException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public AccountStatusException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ public class AuthenticationCredentialsNotFoundException extends AuthenticationEx
|
|||
* Constructs an <code>AuthenticationCredentialsNotFoundException</code> with the
|
||||
* specified message and root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public AuthenticationCredentialsNotFoundException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public AuthenticationCredentialsNotFoundException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@ public class AuthenticationServiceException extends AuthenticationException {
|
|||
* Constructs an <code>AuthenticationServiceException</code> with the specified
|
||||
* message and root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public AuthenticationServiceException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public AuthenticationServiceException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@ public class BadCredentialsException extends AuthenticationException {
|
|||
* Constructs a <code>BadCredentialsException</code> with the specified message and
|
||||
* root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public BadCredentialsException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public BadCredentialsException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ public class CredentialsExpiredException extends AccountStatusException {
|
|||
* Constructs a <code>CredentialsExpiredException</code> with the specified message
|
||||
* and root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public CredentialsExpiredException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public CredentialsExpiredException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ public class DefaultAuthenticationEventPublisher
|
|||
Assert.isAssignable(AbstractAuthenticationFailureEvent.class, clazz);
|
||||
addMapping((String) exceptionClass, (Class<? extends AbstractAuthenticationFailureEvent>) clazz);
|
||||
}
|
||||
catch (ClassNotFoundException e) {
|
||||
catch (ClassNotFoundException ex) {
|
||||
throw new RuntimeException("Failed to load authentication event class " + eventClass);
|
||||
}
|
||||
}
|
||||
|
|
@ -194,7 +194,7 @@ public class DefaultAuthenticationEventPublisher
|
|||
this.defaultAuthenticationFailureEventConstructor = defaultAuthenticationFailureEventClass
|
||||
.getConstructor(Authentication.class, AuthenticationException.class);
|
||||
}
|
||||
catch (NoSuchMethodException e) {
|
||||
catch (NoSuchMethodException ex) {
|
||||
throw new RuntimeException("Default Authentication Failure event class "
|
||||
+ defaultAuthenticationFailureEventClass.getName() + " has no suitable constructor");
|
||||
}
|
||||
|
|
@ -206,7 +206,7 @@ public class DefaultAuthenticationEventPublisher
|
|||
.getConstructor(Authentication.class, AuthenticationException.class);
|
||||
this.exceptionMappings.put(exceptionClass, constructor);
|
||||
}
|
||||
catch (NoSuchMethodException e) {
|
||||
catch (NoSuchMethodException ex) {
|
||||
throw new RuntimeException(
|
||||
"Authentication event class " + eventClass.getName() + " has no suitable constructor");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ public class DisabledException extends AccountStatusException {
|
|||
* Constructs a <code>DisabledException</code> with the specified message and root
|
||||
* cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public DisabledException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public DisabledException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,10 +46,10 @@ public class InsufficientAuthenticationException extends AuthenticationException
|
|||
* Constructs an <code>InsufficientAuthenticationException</code> with the specified
|
||||
* message and root cause.
|
||||
* @param msg the detail message
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public InsufficientAuthenticationException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public InsufficientAuthenticationException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ public class LockedException extends AccountStatusException {
|
|||
* Constructs a <code>LockedException</code> with the specified message and root
|
||||
* cause.
|
||||
* @param msg the detail message.
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public LockedException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public LockedException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -188,14 +188,14 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar
|
|||
break;
|
||||
}
|
||||
}
|
||||
catch (AccountStatusException | InternalAuthenticationServiceException e) {
|
||||
prepareException(e, authentication);
|
||||
catch (AccountStatusException | InternalAuthenticationServiceException ex) {
|
||||
prepareException(ex, authentication);
|
||||
// SEC-546: Avoid polling additional providers if auth failure is due to
|
||||
// invalid account status
|
||||
throw e;
|
||||
throw ex;
|
||||
}
|
||||
catch (AuthenticationException e) {
|
||||
lastException = e;
|
||||
catch (AuthenticationException ex) {
|
||||
lastException = ex;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -205,15 +205,15 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar
|
|||
parentResult = this.parent.authenticate(authentication);
|
||||
result = parentResult;
|
||||
}
|
||||
catch (ProviderNotFoundException e) {
|
||||
catch (ProviderNotFoundException ex) {
|
||||
// ignore as we will throw below if no other exception occurred prior to
|
||||
// calling parent and the parent
|
||||
// may throw ProviderNotFound even though a provider in the child already
|
||||
// handled the request
|
||||
}
|
||||
catch (AuthenticationException e) {
|
||||
parentException = e;
|
||||
lastException = e;
|
||||
catch (AuthenticationException ex) {
|
||||
parentException = ex;
|
||||
lastException = ex;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -256,8 +256,8 @@ public abstract class AbstractJaasAuthenticationProvider implements Authenticati
|
|||
+ "The LoginContext is unavailable");
|
||||
}
|
||||
}
|
||||
catch (LoginException e) {
|
||||
this.log.warn("Error error logging out of LoginContext", e);
|
||||
catch (LoginException ex) {
|
||||
this.log.warn("Error error logging out of LoginContext", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ import org.springframework.security.core.AuthenticationException;
|
|||
public class DefaultLoginExceptionResolver implements LoginExceptionResolver {
|
||||
|
||||
@Override
|
||||
public AuthenticationException resolveException(LoginException e) {
|
||||
return new AuthenticationServiceException(e.getMessage(), e);
|
||||
public AuthenticationException resolveException(LoginException ex) {
|
||||
return new AuthenticationServiceException(ex.getMessage(), ex);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ public class JaasAuthenticationProvider extends AbstractJaasAuthenticationProvid
|
|||
|
||||
return new URL("file", "", loginConfigPath).toString();
|
||||
}
|
||||
catch (IOException e) {
|
||||
catch (IOException ex) {
|
||||
// SEC-1700: May be inside a jar
|
||||
return this.loginConfig.getURL().toString();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@ public interface LoginExceptionResolver {
|
|||
|
||||
/**
|
||||
* Translates a Jaas LoginException to an SpringSecurityException.
|
||||
* @param e The LoginException thrown by the configured LoginModule.
|
||||
* @param ex The LoginException thrown by the configured LoginModule.
|
||||
* @return The AuthenticationException that the JaasAuthenticationProvider should
|
||||
* throw.
|
||||
*/
|
||||
AuthenticationException resolveException(LoginException e);
|
||||
AuthenticationException resolveException(LoginException ex);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,8 +82,8 @@ public class RsaKeyConverters {
|
|||
try {
|
||||
return (RSAPrivateKey) keyFactory.generatePrivate(new PKCS8EncodedKeySpec(pkcs8));
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new IllegalArgumentException(e);
|
||||
catch (Exception ex) {
|
||||
throw new IllegalArgumentException(ex);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -115,8 +115,8 @@ public class RsaKeyConverters {
|
|||
try {
|
||||
return (RSAPublicKey) keyFactory.generatePublic(new X509EncodedKeySpec(x509));
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new IllegalArgumentException(e);
|
||||
catch (Exception ex) {
|
||||
throw new IllegalArgumentException(ex);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -130,8 +130,8 @@ public class RsaKeyConverters {
|
|||
try {
|
||||
return KeyFactory.getInstance("RSA");
|
||||
}
|
||||
catch (NoSuchAlgorithmException e) {
|
||||
throw new IllegalStateException(e);
|
||||
catch (NoSuchAlgorithmException ex) {
|
||||
throw new IllegalStateException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ public abstract class AuthenticationException extends RuntimeException {
|
|||
* Constructs an {@code AuthenticationException} with the specified message and root
|
||||
* cause.
|
||||
* @param msg the detail message
|
||||
* @param t the root cause
|
||||
* @param cause the root cause
|
||||
*/
|
||||
public AuthenticationException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public AuthenticationException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ public class SpringSecurityCoreVersion {
|
|||
properties.load(SpringSecurityCoreVersion.class.getClassLoader()
|
||||
.getResourceAsStream("META-INF/spring-security.versions"));
|
||||
}
|
||||
catch (IOException | NullPointerException e) {
|
||||
catch (IOException | NullPointerException ex) {
|
||||
return null;
|
||||
}
|
||||
return properties.getProperty("org.springframework:spring-core");
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ public abstract class Sha512DigestUtils {
|
|||
try {
|
||||
return MessageDigest.getInstance("SHA-512");
|
||||
}
|
||||
catch (NoSuchAlgorithmException e) {
|
||||
throw new RuntimeException(e.getMessage());
|
||||
catch (NoSuchAlgorithmException ex) {
|
||||
throw new RuntimeException(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@ public class UsernameNotFoundException extends AuthenticationException {
|
|||
* Constructs a {@code UsernameNotFoundException} with the specified message and root
|
||||
* cause.
|
||||
* @param msg the detail message.
|
||||
* @param t root cause
|
||||
* @param cause root cause
|
||||
*/
|
||||
public UsernameNotFoundException(String msg, Throwable t) {
|
||||
super(msg, t);
|
||||
public UsernameNotFoundException(String msg, Throwable cause) {
|
||||
super(msg, cause);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,9 +107,9 @@ public final class SecurityJackson2Modules {
|
|||
instance = securityModule.newInstance();
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
catch (Exception ex) {
|
||||
if (logger.isDebugEnabled()) {
|
||||
logger.debug("Cannot load module " + className, e);
|
||||
logger.debug("Cannot load module " + className, ex);
|
||||
}
|
||||
}
|
||||
return instance;
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ public final class MethodInvocationUtils {
|
|||
try {
|
||||
method = clazz.getMethod(methodName, classArgs);
|
||||
}
|
||||
catch (NoSuchMethodException e) {
|
||||
catch (NoSuchMethodException ex) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -117,21 +117,21 @@ public class RoleHierarchyImplTests {
|
|||
roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_A");
|
||||
fail("Cycle in role hierarchy was not detected!");
|
||||
}
|
||||
catch (CycleInRoleHierarchyException e) {
|
||||
catch (CycleInRoleHierarchyException ex) {
|
||||
}
|
||||
|
||||
try {
|
||||
roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_A");
|
||||
fail("Cycle in role hierarchy was not detected!");
|
||||
}
|
||||
catch (CycleInRoleHierarchyException e) {
|
||||
catch (CycleInRoleHierarchyException ex) {
|
||||
}
|
||||
|
||||
try {
|
||||
roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C\nROLE_C > ROLE_A");
|
||||
fail("Cycle in role hierarchy was not detected!");
|
||||
}
|
||||
catch (CycleInRoleHierarchyException e) {
|
||||
catch (CycleInRoleHierarchyException ex) {
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
@ -139,14 +139,14 @@ public class RoleHierarchyImplTests {
|
|||
"ROLE_A > ROLE_B\nROLE_B > ROLE_C\nROLE_C > ROLE_E\nROLE_E > ROLE_D\nROLE_D > ROLE_B");
|
||||
fail("Cycle in role hierarchy was not detected!");
|
||||
}
|
||||
catch (CycleInRoleHierarchyException e) {
|
||||
catch (CycleInRoleHierarchyException ex) {
|
||||
}
|
||||
|
||||
try {
|
||||
roleHierarchyImpl.setHierarchy("ROLE_C > ROLE_B\nROLE_B > ROLE_A\nROLE_A > ROLE_B");
|
||||
fail("Cycle in role hierarchy was not detected!");
|
||||
}
|
||||
catch (CycleInRoleHierarchyException e) {
|
||||
catch (CycleInRoleHierarchyException ex) {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -157,7 +157,7 @@ public class RoleHierarchyImplTests {
|
|||
try {
|
||||
roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_A > ROLE_C\nROLE_C > ROLE_D\nROLE_B > ROLE_D");
|
||||
}
|
||||
catch (CycleInRoleHierarchyException e) {
|
||||
catch (CycleInRoleHierarchyException ex) {
|
||||
fail("A cycle in role hierarchy was incorrectly detected!");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -271,8 +271,8 @@ public class ProviderManagerTests {
|
|||
mgr.authenticate(authReq);
|
||||
fail("Expected exception");
|
||||
}
|
||||
catch (BadCredentialsException e) {
|
||||
assertThat(e).isSameAs(expected);
|
||||
catch (BadCredentialsException ex) {
|
||||
assertThat(ex).isSameAs(expected);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -289,8 +289,8 @@ public class ProviderManagerTests {
|
|||
mgr.authenticate(authReq);
|
||||
fail("Expected exception");
|
||||
}
|
||||
catch (LockedException e) {
|
||||
assertThat(e).isSameAs(expected);
|
||||
catch (LockedException ex) {
|
||||
assertThat(ex).isSameAs(expected);
|
||||
}
|
||||
verify(publisher).publishAuthenticationFailure(expected, authReq);
|
||||
}
|
||||
|
|
@ -329,18 +329,18 @@ public class ProviderManagerTests {
|
|||
childMgr.authenticate(authReq);
|
||||
fail("Expected exception");
|
||||
}
|
||||
catch (BadCredentialsException e) {
|
||||
assertThat(e).isSameAs(badCredentialsExParent);
|
||||
catch (BadCredentialsException ex) {
|
||||
assertThat(ex).isSameAs(badCredentialsExParent);
|
||||
}
|
||||
verify(publisher).publishAuthenticationFailure(badCredentialsExParent, authReq); // Parent
|
||||
// publishes
|
||||
verifyNoMoreInteractions(publisher); // Child should not publish (duplicate event)
|
||||
}
|
||||
|
||||
private AuthenticationProvider createProviderWhichThrows(final AuthenticationException e) {
|
||||
private AuthenticationProvider createProviderWhichThrows(final AuthenticationException ex) {
|
||||
AuthenticationProvider provider = mock(AuthenticationProvider.class);
|
||||
given(provider.supports(any(Class.class))).willReturn(true);
|
||||
given(provider.authenticate(any(Authentication.class))).willThrow(e);
|
||||
given(provider.authenticate(any(Authentication.class))).willThrow(ex);
|
||||
|
||||
return provider;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ public class JaasAuthenticationProviderTests {
|
|||
this.jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user", "asdf"));
|
||||
fail("LoginException should have been thrown for the bad password");
|
||||
}
|
||||
catch (AuthenticationException e) {
|
||||
catch (AuthenticationException ex) {
|
||||
}
|
||||
|
||||
assertThat(this.eventCheck.failedEvent).as("Failure event not fired").isNotNull();
|
||||
|
|
@ -92,7 +92,7 @@ public class JaasAuthenticationProviderTests {
|
|||
this.jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("asdf", "password"));
|
||||
fail("LoginException should have been thrown for the bad user");
|
||||
}
|
||||
catch (AuthenticationException e) {
|
||||
catch (AuthenticationException ex) {
|
||||
}
|
||||
|
||||
assertThat(this.eventCheck.failedEvent).as("Failure event not fired").isNotNull();
|
||||
|
|
@ -241,9 +241,9 @@ public class JaasAuthenticationProviderTests {
|
|||
try {
|
||||
this.jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user", "password"));
|
||||
}
|
||||
catch (LockedException e) {
|
||||
catch (LockedException ex) {
|
||||
}
|
||||
catch (Exception e) {
|
||||
catch (Exception ex) {
|
||||
fail("LockedException should have been thrown and caught");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ public class SecurityContextLoginModuleTests {
|
|||
this.module.login();
|
||||
fail("LoginException expected, there is no Authentication in the SecurityContext");
|
||||
}
|
||||
catch (LoginException e) {
|
||||
catch (LoginException ex) {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ public class SecurityContextLoginModuleTests {
|
|||
this.module.login();
|
||||
fail("LoginException expected, the authentication is null in the SecurityContext");
|
||||
}
|
||||
catch (Exception e) {
|
||||
catch (Exception ex) {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -63,8 +63,8 @@ public class TestLoginModule implements LoginModule {
|
|||
this.password = new String(passwordCallback.getPassword());
|
||||
this.user = nameCallback.getName();
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
catch (Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@ public class KeyBasedPersistenceTokenServiceTests {
|
|||
service.setSecureRandom(rnd);
|
||||
service.afterPropertiesSet();
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
catch (Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
return service;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,8 +107,8 @@ public class Argon2PasswordEncoder implements PasswordEncoder {
|
|||
try {
|
||||
decoded = Argon2EncodingUtils.decode(encodedPassword);
|
||||
}
|
||||
catch (IllegalArgumentException e) {
|
||||
this.logger.warn("Malformed password hash", e);
|
||||
catch (IllegalArgumentException ex) {
|
||||
this.logger.warn("Malformed password hash", ex);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ public final class Base64 {
|
|||
try {
|
||||
decode(bytes);
|
||||
}
|
||||
catch (InvalidBase64CharacterException e) {
|
||||
catch (InvalidBase64CharacterException ex) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ public final class Utf8 {
|
|||
|
||||
return bytesCopy;
|
||||
}
|
||||
catch (CharacterCodingException e) {
|
||||
throw new IllegalArgumentException("Encoding failed", e);
|
||||
catch (CharacterCodingException ex) {
|
||||
throw new IllegalArgumentException("Encoding failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -55,8 +55,8 @@ public final class Utf8 {
|
|||
try {
|
||||
return CHARSET.newDecoder().decode(ByteBuffer.wrap(bytes)).toString();
|
||||
}
|
||||
catch (CharacterCodingException e) {
|
||||
throw new IllegalArgumentException("Decoding failed", e);
|
||||
catch (CharacterCodingException ex) {
|
||||
throw new IllegalArgumentException("Decoding failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -74,8 +74,8 @@ public class BouncyCastleAesCbcBytesEncryptor extends BouncyCastleAesBytesEncryp
|
|||
try {
|
||||
bytesWritten += blockCipher.doFinal(buf, bytesWritten);
|
||||
}
|
||||
catch (InvalidCipherTextException e) {
|
||||
throw new IllegalStateException("unable to encrypt/decrypt", e);
|
||||
catch (InvalidCipherTextException ex) {
|
||||
throw new IllegalStateException("unable to encrypt/decrypt", ex);
|
||||
}
|
||||
if (bytesWritten == buf.length) {
|
||||
return buf;
|
||||
|
|
|
|||
|
|
@ -71,8 +71,8 @@ public class BouncyCastleAesGcmBytesEncryptor extends BouncyCastleAesBytesEncryp
|
|||
try {
|
||||
bytesWritten += blockCipher.doFinal(buf, bytesWritten);
|
||||
}
|
||||
catch (InvalidCipherTextException e) {
|
||||
throw new IllegalStateException("unable to encrypt/decrypt", e);
|
||||
catch (InvalidCipherTextException ex) {
|
||||
throw new IllegalStateException("unable to encrypt/decrypt", ex);
|
||||
}
|
||||
if (bytesWritten == buf.length) {
|
||||
return buf;
|
||||
|
|
|
|||
|
|
@ -56,11 +56,11 @@ final class CipherUtils {
|
|||
SecretKeyFactory factory = SecretKeyFactory.getInstance(algorithm);
|
||||
return factory.generateSecret(keySpec);
|
||||
}
|
||||
catch (NoSuchAlgorithmException e) {
|
||||
throw new IllegalArgumentException("Not a valid encryption algorithm", e);
|
||||
catch (NoSuchAlgorithmException ex) {
|
||||
throw new IllegalArgumentException("Not a valid encryption algorithm", ex);
|
||||
}
|
||||
catch (InvalidKeySpecException e) {
|
||||
throw new IllegalArgumentException("Not a valid secret key", e);
|
||||
catch (InvalidKeySpecException ex) {
|
||||
throw new IllegalArgumentException("Not a valid secret key", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -71,11 +71,11 @@ final class CipherUtils {
|
|||
try {
|
||||
return Cipher.getInstance(algorithm);
|
||||
}
|
||||
catch (NoSuchAlgorithmException e) {
|
||||
throw new IllegalArgumentException("Not a valid encryption algorithm", e);
|
||||
catch (NoSuchAlgorithmException ex) {
|
||||
throw new IllegalArgumentException("Not a valid encryption algorithm", ex);
|
||||
}
|
||||
catch (NoSuchPaddingException e) {
|
||||
throw new IllegalStateException("Should not happen", e);
|
||||
catch (NoSuchPaddingException ex) {
|
||||
throw new IllegalStateException("Should not happen", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -86,8 +86,8 @@ final class CipherUtils {
|
|||
try {
|
||||
return cipher.getParameters().getParameterSpec(parameterSpecClass);
|
||||
}
|
||||
catch (InvalidParameterSpecException e) {
|
||||
throw new IllegalArgumentException("Unable to access parameter", e);
|
||||
catch (InvalidParameterSpecException ex) {
|
||||
throw new IllegalArgumentException("Unable to access parameter", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -117,11 +117,11 @@ final class CipherUtils {
|
|||
cipher.init(mode, secretKey);
|
||||
}
|
||||
}
|
||||
catch (InvalidKeyException e) {
|
||||
throw new IllegalArgumentException("Unable to initialize due to invalid secret key", e);
|
||||
catch (InvalidKeyException ex) {
|
||||
throw new IllegalArgumentException("Unable to initialize due to invalid secret key", ex);
|
||||
}
|
||||
catch (InvalidAlgorithmParameterException e) {
|
||||
throw new IllegalStateException("Unable to initialize due to invalid decryption parameter spec", e);
|
||||
catch (InvalidAlgorithmParameterException ex) {
|
||||
throw new IllegalStateException("Unable to initialize due to invalid decryption parameter spec", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -133,11 +133,11 @@ final class CipherUtils {
|
|||
try {
|
||||
return cipher.doFinal(input);
|
||||
}
|
||||
catch (IllegalBlockSizeException e) {
|
||||
throw new IllegalStateException("Unable to invoke Cipher due to illegal block size", e);
|
||||
catch (IllegalBlockSizeException ex) {
|
||||
throw new IllegalStateException("Unable to invoke Cipher due to illegal block size", ex);
|
||||
}
|
||||
catch (BadPaddingException e) {
|
||||
throw new IllegalStateException("Unable to invoke Cipher due to bad padding", e);
|
||||
catch (BadPaddingException ex) {
|
||||
throw new IllegalStateException("Unable to invoke Cipher due to bad padding", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@ final class Digester {
|
|||
try {
|
||||
return MessageDigest.getInstance(algorithm);
|
||||
}
|
||||
catch (NoSuchAlgorithmException e) {
|
||||
throw new IllegalStateException("No such hashing algorithm", e);
|
||||
catch (NoSuchAlgorithmException ex) {
|
||||
throw new IllegalStateException("No such hashing algorithm", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ public class LdapShaPasswordEncoder implements PasswordEncoder {
|
|||
sha = MessageDigest.getInstance("SHA");
|
||||
sha.update(Utf8.encode(rawPassword));
|
||||
}
|
||||
catch (java.security.NoSuchAlgorithmException e) {
|
||||
catch (java.security.NoSuchAlgorithmException ex) {
|
||||
throw new IllegalStateException("No SHA implementation available!");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -112,8 +112,8 @@ public class Pbkdf2PasswordEncoder implements PasswordEncoder {
|
|||
try {
|
||||
SecretKeyFactory.getInstance(algorithmName);
|
||||
}
|
||||
catch (NoSuchAlgorithmException e) {
|
||||
throw new IllegalArgumentException("Invalid algorithm '" + algorithmName + "'.", e);
|
||||
catch (NoSuchAlgorithmException ex) {
|
||||
throw new IllegalArgumentException("Invalid algorithm '" + algorithmName + "'.", ex);
|
||||
}
|
||||
this.algorithm = algorithmName;
|
||||
}
|
||||
|
|
@ -163,8 +163,8 @@ public class Pbkdf2PasswordEncoder implements PasswordEncoder {
|
|||
SecretKeyFactory skf = SecretKeyFactory.getInstance(this.algorithm);
|
||||
return EncodingUtils.concatenate(salt, skf.generateSecret(spec).getEncoded());
|
||||
}
|
||||
catch (GeneralSecurityException e) {
|
||||
throw new IllegalStateException("Could not create hash", e);
|
||||
catch (GeneralSecurityException ex) {
|
||||
throw new IllegalStateException("Could not create hash", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,11 +41,11 @@ public class CryptoAssumptions {
|
|||
Cipher.getInstance(cipherAlgorithm.toString());
|
||||
aes256Available = Cipher.getMaxAllowedKeyLength("AES") >= 256;
|
||||
}
|
||||
catch (NoSuchAlgorithmException e) {
|
||||
throw new AssumptionViolatedException(cipherAlgorithm + " not available, skipping test", e);
|
||||
catch (NoSuchAlgorithmException ex) {
|
||||
throw new AssumptionViolatedException(cipherAlgorithm + " not available, skipping test", ex);
|
||||
}
|
||||
catch (NoSuchPaddingException e) {
|
||||
throw new AssumptionViolatedException(cipherAlgorithm + " padding not available, skipping test", e);
|
||||
catch (NoSuchPaddingException ex) {
|
||||
throw new AssumptionViolatedException(cipherAlgorithm + " padding not available, skipping test", ex);
|
||||
}
|
||||
Assume.assumeTrue("AES key length of 256 not allowed, skipping test", aes256Available);
|
||||
|
||||
|
|
|
|||
|
|
@ -552,9 +552,9 @@ ReactiveJwtDecoder jwtDecoder() {
|
|||
----
|
||||
[[webflux-oauth2resourceserver-opaque-minimaldependencies]]
|
||||
=== Minimal Dependencies for Introspection
|
||||
As described in <<oauth2resourceserver-jwt-minimaldependencies,Minimal Dependencies for JWT>> most of Resource Server support is collected in `spring-security-oauth2-resource-server`.
|
||||
However unless a custom <<webflux-oauth2resourceserver-opaque-introspector-bean,`ReactiveOpaqueTokenIntrospector`>> is provided, the Resource Server will fallback to ReactiveOpaqueTokenIntrospector.
|
||||
Meaning that both `spring-security-oauth2-resource-server` and `oauth2-oidc-sdk` are necessary in order to have a working minimal Resource Server that supports opaque Bearer Tokens.
|
||||
As described in <<oauth2resourceserver-jwt-minimaldependencies,Minimal Dependencies for JWT>> most of Resource Server support is collected in `spring-security-oauth2-resource-server`.
|
||||
However unless a custom <<webflux-oauth2resourceserver-opaque-introspector-bean,`ReactiveOpaqueTokenIntrospector`>> is provided, the Resource Server will fallback to ReactiveOpaqueTokenIntrospector.
|
||||
Meaning that both `spring-security-oauth2-resource-server` and `oauth2-oidc-sdk` are necessary in order to have a working minimal Resource Server that supports opaque Bearer Tokens.
|
||||
Please refer to `spring-security-oauth2-resource-server` in order to determin the correct version for `oauth2-oidc-sdk`.
|
||||
|
||||
[[webflux-oauth2resourceserver-opaque-minimalconfiguration]]
|
||||
|
|
@ -925,8 +925,8 @@ public class JwtOpaqueTokenIntrospector implements ReactiveOpaqueTokenIntrospect
|
|||
public Mono<JWTClaimsSet> convert(JWT jwt) {
|
||||
try {
|
||||
return Mono.just(jwt.getJWTClaimsSet());
|
||||
} catch (Exception e) {
|
||||
return Mono.error(e);
|
||||
} catch (Exception ex) {
|
||||
return Mono.error(ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ The pseudocode for `ExceptionTranslationFilter` looks something like this:
|
|||
----
|
||||
try {
|
||||
filterChain.doFilter(request, response); // <1>
|
||||
} catch (AccessDeniedException | AuthenticationException e) {
|
||||
if (!authenticated || e instanceof AuthenticationException) {
|
||||
} catch (AccessDeniedException | AuthenticationException ex) {
|
||||
if (!authenticated || ex instanceof AuthenticationException) {
|
||||
startAuthentication(); // <2>
|
||||
} else {
|
||||
accessDenied(); // <3>
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ For example, the following would attempt to authenticate with the username "user
|
|||
----
|
||||
try {
|
||||
httpServletRequest.login("user","password");
|
||||
} catch(ServletException e) {
|
||||
} catch(ServletException ex) {
|
||||
// fail to authenticate
|
||||
}
|
||||
----
|
||||
|
|
@ -111,8 +111,8 @@ async.start(new Runnable() {
|
|||
asyncResponse.setStatus(HttpServletResponse.SC_OK);
|
||||
asyncResponse.getWriter().write(String.valueOf(authentication));
|
||||
async.complete();
|
||||
} catch(Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
} catch(Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -174,8 +174,8 @@ new Thread("AsyncThread") {
|
|||
|
||||
// Write to and commit the httpServletResponse
|
||||
httpServletResponse.getOutputStream().flush();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
|
|
|
|||
|
|
@ -1055,9 +1055,9 @@ To do so, remember that `NimbusJwtDecoder` ships with a constructor that takes N
|
|||
|
||||
[[oauth2resourceserver-opaque-minimaldependencies]]
|
||||
=== Minimal Dependencies for Introspection
|
||||
As described in <<oauth2resourceserver-jwt-minimaldependencies,Minimal Dependencies for JWT>> most of Resource Server support is collected in `spring-security-oauth2-resource-server`.
|
||||
However unless a custom <<oauth2resourceserver-opaque-introspector,`OpaqueTokenIntrospector`>> is provided, the Resource Server will fallback to NimbusOpaqueTokenIntrospector.
|
||||
Meaning that both `spring-security-oauth2-resource-server` and `oauth2-oidc-sdk` are necessary in order to have a working minimal Resource Server that supports opaque Bearer Tokens.
|
||||
As described in <<oauth2resourceserver-jwt-minimaldependencies,Minimal Dependencies for JWT>> most of Resource Server support is collected in `spring-security-oauth2-resource-server`.
|
||||
However unless a custom <<oauth2resourceserver-opaque-introspector,`OpaqueTokenIntrospector`>> is provided, the Resource Server will fallback to NimbusOpaqueTokenIntrospector.
|
||||
Meaning that both `spring-security-oauth2-resource-server` and `oauth2-oidc-sdk` are necessary in order to have a working minimal Resource Server that supports opaque Bearer Tokens.
|
||||
Please refer to `spring-security-oauth2-resource-server` in order to determin the correct version for `oauth2-oidc-sdk`.
|
||||
|
||||
[[oauth2resourceserver-opaque-minimalconfiguration]]
|
||||
|
|
@ -1626,8 +1626,8 @@ public class JwtOpaqueTokenIntrospector implements OpaqueTokenIntrospector {
|
|||
try {
|
||||
Jwt jwt = this.jwtDecoder.decode(token);
|
||||
return new DefaultOAuth2AuthenticatedPrincipal(jwt.getClaims(), NO_AUTHORITIES);
|
||||
} catch (JwtException e) {
|
||||
throw new OAuth2IntrospectionException(e);
|
||||
} catch (JwtException ex) {
|
||||
throw new OAuth2IntrospectionException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1899,8 +1899,8 @@ public class TenantJWSKeySelector
|
|||
private JWSKeySelector<SecurityContext> fromUri(String uri) {
|
||||
try {
|
||||
return JWSAlgorithmFamilyJWSKeySelector.fromJWKSetURL(new URL(uri)); <4>
|
||||
} catch (Exception e) {
|
||||
throw new IllegalArgumentException(e);
|
||||
} catch (Exception ex) {
|
||||
throw new IllegalArgumentException(ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
|
||||
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
|
||||
<suppressions>
|
||||
<suppress files=".*" checks="SpringCatch" />
|
||||
<suppress files=".*" checks="SpringHeader" />
|
||||
<suppress files=".*" checks="SpringHideUtilityClassConstructor" />
|
||||
<suppress files=".*" checks="SpringJavadoc" />
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ public class PythonInterpreterPreInvocationAdvice implements PreInvocationAuthor
|
|||
try {
|
||||
python.execfile(scriptResource.getInputStream());
|
||||
}
|
||||
catch (IOException e) {
|
||||
throw new IllegalArgumentException("Couldn't run python script, " + script, e);
|
||||
catch (IOException ex) {
|
||||
throw new IllegalArgumentException("Couldn't run python script, " + script, ex);
|
||||
}
|
||||
|
||||
PyObject allowed = python.get("allow");
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ public class DefaultSpringSecurityContextSourceTests {
|
|||
try {
|
||||
ctx = this.contextSource.getContext("uid=Bob,ou=people,dc=springframework,dc=org", "bobspassword");
|
||||
}
|
||||
catch (Exception e) {
|
||||
catch (Exception ex) {
|
||||
}
|
||||
assertThat(ctx).isNotNull();
|
||||
// com.sun.jndi.ldap.LdapPoolManager.showStats(System.out);
|
||||
|
|
|
|||
|
|
@ -69,12 +69,12 @@ public class ApacheDSContainerTests {
|
|||
try {
|
||||
server1.destroy();
|
||||
}
|
||||
catch (Throwable t) {
|
||||
catch (Throwable ex) {
|
||||
}
|
||||
try {
|
||||
server2.destroy();
|
||||
}
|
||||
catch (Throwable t) {
|
||||
catch (Throwable ex) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -95,12 +95,12 @@ public class ApacheDSContainerTests {
|
|||
try {
|
||||
server1.destroy();
|
||||
}
|
||||
catch (Throwable t) {
|
||||
catch (Throwable ex) {
|
||||
}
|
||||
try {
|
||||
server2.destroy();
|
||||
}
|
||||
catch (Throwable t) {
|
||||
catch (Throwable ex) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -116,8 +116,8 @@ public class ApacheDSContainerTests {
|
|||
server.afterPropertiesSet();
|
||||
fail("Expected an IllegalArgumentException to be thrown.");
|
||||
}
|
||||
catch (IllegalArgumentException e) {
|
||||
assertThat(e).hasMessage("When LdapOverSsl is enabled, the keyStoreFile property must be set.");
|
||||
catch (IllegalArgumentException ex) {
|
||||
assertThat(ex).hasMessage("When LdapOverSsl is enabled, the keyStoreFile property must be set.");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -143,9 +143,9 @@ public class ApacheDSContainerTests {
|
|||
server.afterPropertiesSet();
|
||||
fail("Expected a RuntimeException to be thrown.");
|
||||
}
|
||||
catch (RuntimeException e) {
|
||||
assertThat(e).hasMessage("Server startup failed");
|
||||
assertThat(e).hasRootCauseInstanceOf(UnrecoverableKeyException.class);
|
||||
catch (RuntimeException ex) {
|
||||
assertThat(ex).hasMessage("Server startup failed");
|
||||
assertThat(ex).hasRootCauseInstanceOf(UnrecoverableKeyException.class);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -187,7 +187,7 @@ public class ApacheDSContainerTests {
|
|||
try {
|
||||
server.destroy();
|
||||
}
|
||||
catch (Throwable t) {
|
||||
catch (Throwable ex) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,9 +75,9 @@ public class UnboundIdContainerLdifTests {
|
|||
this.appCtx = new AnnotationConfigApplicationContext(MalformedLdifConfig.class);
|
||||
failBecauseExceptionWasNotThrown(IllegalStateException.class);
|
||||
}
|
||||
catch (Exception e) {
|
||||
assertThat(e.getCause()).isInstanceOf(IllegalStateException.class);
|
||||
assertThat(e.getMessage()).contains("Unable to load LDIF classpath:test-server-malformed.txt");
|
||||
catch (Exception ex) {
|
||||
assertThat(ex.getCause()).isInstanceOf(IllegalStateException.class);
|
||||
assertThat(ex.getMessage()).contains("Unable to load LDIF classpath:test-server-malformed.txt");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -87,9 +87,9 @@ public class UnboundIdContainerLdifTests {
|
|||
this.appCtx = new AnnotationConfigApplicationContext(MissingLdifConfig.class);
|
||||
failBecauseExceptionWasNotThrown(IllegalStateException.class);
|
||||
}
|
||||
catch (Exception e) {
|
||||
assertThat(e.getCause()).isInstanceOf(IllegalStateException.class);
|
||||
assertThat(e.getMessage()).contains("Unable to load LDIF classpath:does-not-exist.ldif");
|
||||
catch (Exception ex) {
|
||||
assertThat(ex.getCause()).isInstanceOf(IllegalStateException.class);
|
||||
assertThat(ex.getMessage()).contains("Unable to load LDIF classpath:does-not-exist.ldif");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ public final class LdapUtils {
|
|||
ctx.close();
|
||||
}
|
||||
}
|
||||
catch (NamingException e) {
|
||||
logger.error("Failed to close context.", e);
|
||||
catch (NamingException ex) {
|
||||
logger.error("Failed to close context.", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -64,8 +64,8 @@ public final class LdapUtils {
|
|||
ne.close();
|
||||
}
|
||||
}
|
||||
catch (NamingException e) {
|
||||
logger.error("Failed to close enumeration.", e);
|
||||
catch (NamingException ex) {
|
||||
logger.error("Failed to close enumeration.", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -177,9 +177,9 @@ public final class LdapUtils {
|
|||
try {
|
||||
return new URI(url);
|
||||
}
|
||||
catch (URISyntaxException e) {
|
||||
catch (URISyntaxException ex) {
|
||||
IllegalArgumentException iae = new IllegalArgumentException("Unable to parse url: " + url);
|
||||
iae.initCause(e);
|
||||
iae.initCause(ex);
|
||||
throw iae;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -197,8 +197,8 @@ public class SpringSecurityLdapTemplate extends LdapTemplate {
|
|||
extractStringAttributeValues(adapter, record, attr.getID());
|
||||
}
|
||||
}
|
||||
catch (NamingException x) {
|
||||
org.springframework.ldap.support.LdapUtils.convertLdapException(x);
|
||||
catch (NamingException ex) {
|
||||
org.springframework.ldap.support.LdapUtils.convertLdapException(ex);
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
@ -316,7 +316,7 @@ public class SpringSecurityLdapTemplate extends LdapTemplate {
|
|||
results.add(dca);
|
||||
}
|
||||
}
|
||||
catch (PartialResultException e) {
|
||||
catch (PartialResultException ex) {
|
||||
LdapUtils.closeEnumeration(resultsEnum);
|
||||
logger.info("Ignoring PartialResultException");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -127,20 +127,20 @@ public class BindAuthenticator extends AbstractLdapAuthenticator {
|
|||
|
||||
return result;
|
||||
}
|
||||
catch (NamingException e) {
|
||||
catch (NamingException ex) {
|
||||
// This will be thrown if an invalid user name is used and the method may
|
||||
// be called multiple times to try different names, so we trap the exception
|
||||
// unless a subclass wishes to implement more specialized behaviour.
|
||||
if ((e instanceof org.springframework.ldap.AuthenticationException)
|
||||
|| (e instanceof org.springframework.ldap.OperationNotSupportedException)) {
|
||||
handleBindException(userDnStr, username, e);
|
||||
if ((ex instanceof org.springframework.ldap.AuthenticationException)
|
||||
|| (ex instanceof org.springframework.ldap.OperationNotSupportedException)) {
|
||||
handleBindException(userDnStr, username, ex);
|
||||
}
|
||||
else {
|
||||
throw e;
|
||||
throw ex;
|
||||
}
|
||||
}
|
||||
catch (javax.naming.NamingException e) {
|
||||
throw LdapUtils.convertLdapException(e);
|
||||
catch (javax.naming.NamingException ex) {
|
||||
throw LdapUtils.convertLdapException(ex);
|
||||
}
|
||||
finally {
|
||||
LdapUtils.closeContext(ctx);
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue