diff --git a/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java b/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java index d44ce0075a..c57bf5ec71 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java +++ b/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java @@ -135,7 +135,7 @@ public class AclEntryVoter extends AbstractAclVoter { * which will be the domain object used for ACL evaluation */ protected String getInternalMethod() { - return internalMethod; + return this.internalMethod; } public void setInternalMethod(String internalMethod) { @@ -143,7 +143,7 @@ public class AclEntryVoter extends AbstractAclVoter { } protected String getProcessConfigAttribute() { - return processConfigAttribute; + return this.processConfigAttribute; } public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) { @@ -181,41 +181,41 @@ public class AclEntryVoter extends AbstractAclVoter { } // Evaluate if we are required to use an inner domain object - if (StringUtils.hasText(internalMethod)) { + if (StringUtils.hasText(this.internalMethod)) { try { Class clazz = domainObject.getClass(); - Method method = clazz.getMethod(internalMethod, new Class[0]); + Method method = clazz.getMethod(this.internalMethod, new Class[0]); domainObject = method.invoke(domainObject); } catch (NoSuchMethodException nsme) { throw new AuthorizationServiceException("Object of class '" + domainObject.getClass() - + "' does not provide the requested internalMethod: " + internalMethod); + + "' does not provide the requested internalMethod: " + this.internalMethod); } catch (IllegalAccessException iae) { logger.debug("IllegalAccessException", iae); throw new AuthorizationServiceException( - "Problem invoking internalMethod: " + internalMethod + " for object: " + domainObject); + "Problem invoking internalMethod: " + this.internalMethod + " for object: " + domainObject); } catch (InvocationTargetException ite) { logger.debug("InvocationTargetException", ite); throw new AuthorizationServiceException( - "Problem invoking internalMethod: " + internalMethod + " for object: " + domainObject); + "Problem invoking internalMethod: " + this.internalMethod + " for object: " + domainObject); } } // Obtain the OID applicable to the domain object - ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy.getObjectIdentity(domainObject); + ObjectIdentity objectIdentity = this.objectIdentityRetrievalStrategy.getObjectIdentity(domainObject); // Obtain the SIDs applicable to the principal - List sids = sidRetrievalStrategy.getSids(authentication); + List sids = this.sidRetrievalStrategy.getSids(authentication); Acl acl; try { // Lookup only ACLs for SIDs we're interested in - acl = aclService.readAclById(objectIdentity, sids); + acl = this.aclService.readAclById(objectIdentity, sids); } catch (NotFoundException nfe) { if (logger.isDebugEnabled()) { @@ -226,7 +226,7 @@ public class AclEntryVoter extends AbstractAclVoter { } try { - if (acl.isGranted(requirePermission, sids, false)) { + if (acl.isGranted(this.requirePermission, sids, false)) { if (logger.isDebugEnabled()) { logger.debug("Voting to grant access"); } diff --git a/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java b/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java index 240aed171e..26f327a961 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java +++ b/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java @@ -63,17 +63,17 @@ public class AclPermissionCacheOptimizer implements PermissionCacheOptimizer { if (domainObject == null) { continue; } - ObjectIdentity oid = oidRetrievalStrategy.getObjectIdentity(domainObject); + ObjectIdentity oid = this.oidRetrievalStrategy.getObjectIdentity(domainObject); oidsToCache.add(oid); } - List sids = sidRetrievalStrategy.getSids(authentication); + List sids = this.sidRetrievalStrategy.getSids(authentication); - if (logger.isDebugEnabled()) { - logger.debug("Eagerly loading Acls for " + oidsToCache.size() + " objects"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Eagerly loading Acls for " + oidsToCache.size() + " objects"); } - aclService.readAclsById(oidsToCache, sids); + this.aclService.readAclsById(oidsToCache, sids); } public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) { diff --git a/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java b/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java index 08a86995ef..0477f03b88 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java +++ b/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java @@ -75,49 +75,49 @@ public class AclPermissionEvaluator implements PermissionEvaluator { return false; } - ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy.getObjectIdentity(domainObject); + ObjectIdentity objectIdentity = this.objectIdentityRetrievalStrategy.getObjectIdentity(domainObject); return checkPermission(authentication, objectIdentity, permission); } public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Object permission) { - ObjectIdentity objectIdentity = objectIdentityGenerator.createObjectIdentity(targetId, targetType); + ObjectIdentity objectIdentity = this.objectIdentityGenerator.createObjectIdentity(targetId, targetType); return checkPermission(authentication, objectIdentity, permission); } private boolean checkPermission(Authentication authentication, ObjectIdentity oid, Object permission) { // Obtain the SIDs applicable to the principal - List sids = sidRetrievalStrategy.getSids(authentication); + List sids = this.sidRetrievalStrategy.getSids(authentication); List requiredPermission = resolvePermission(permission); - final boolean debug = logger.isDebugEnabled(); + final boolean debug = this.logger.isDebugEnabled(); if (debug) { - logger.debug("Checking permission '" + permission + "' for object '" + oid + "'"); + this.logger.debug("Checking permission '" + permission + "' for object '" + oid + "'"); } try { // Lookup only ACLs for SIDs we're interested in - Acl acl = aclService.readAclById(oid, sids); + Acl acl = this.aclService.readAclById(oid, sids); if (acl.isGranted(requiredPermission, sids, false)) { if (debug) { - logger.debug("Access is granted"); + this.logger.debug("Access is granted"); } return true; } if (debug) { - logger.debug("Returning false - ACLs returned, but insufficient permissions for this principal"); + this.logger.debug("Returning false - ACLs returned, but insufficient permissions for this principal"); } } catch (NotFoundException nfe) { if (debug) { - logger.debug("Returning false - no ACLs apply for this principal"); + this.logger.debug("Returning false - no ACLs apply for this principal"); } } @@ -127,7 +127,7 @@ public class AclPermissionEvaluator implements PermissionEvaluator { List resolvePermission(Object permission) { if (permission instanceof Integer) { - return Arrays.asList(permissionFactory.buildFromMask((Integer) permission)); + return Arrays.asList(this.permissionFactory.buildFromMask((Integer) permission)); } if (permission instanceof Permission) { @@ -143,10 +143,10 @@ public class AclPermissionEvaluator implements PermissionEvaluator { Permission p; try { - p = permissionFactory.buildFromName(permString); + p = this.permissionFactory.buildFromName(permString); } catch (IllegalArgumentException notfound) { - p = permissionFactory.buildFromName(permString.toUpperCase(Locale.ENGLISH)); + p = this.permissionFactory.buildFromName(permString.toUpperCase(Locale.ENGLISH)); } if (p != null) { diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java index da4a3464f1..743b945c11 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java @@ -68,21 +68,21 @@ public abstract class AbstractAclProvider implements AfterInvocationProvider { } protected Class getProcessDomainObjectClass() { - return processDomainObjectClass; + return this.processDomainObjectClass; } protected boolean hasPermission(Authentication authentication, Object domainObject) { // Obtain the OID applicable to the domain object - ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy.getObjectIdentity(domainObject); + ObjectIdentity objectIdentity = this.objectIdentityRetrievalStrategy.getObjectIdentity(domainObject); // Obtain the SIDs applicable to the principal - List sids = sidRetrievalStrategy.getSids(authentication); + List sids = this.sidRetrievalStrategy.getSids(authentication); try { // Lookup only ACLs for SIDs we're interested in - Acl acl = aclService.readAclById(objectIdentity, sids); + Acl acl = this.aclService.readAclById(objectIdentity, sids); - return acl.isGranted(requirePermission, sids, false); + return acl.isGranted(this.requirePermission, sids, false); } catch (NotFoundException ignore) { return false; @@ -110,7 +110,7 @@ public abstract class AbstractAclProvider implements AfterInvocationProvider { } public boolean supports(ConfigAttribute attribute) { - return processConfigAttribute.equals(attribute.getAttribute()); + return this.processConfigAttribute.equals(attribute.getAttribute()); } /** diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java index be28dc0811..5483ccc937 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java @@ -103,7 +103,7 @@ public class AclEntryAfterInvocationProvider extends AbstractAclProvider impleme logger.debug("Denying access"); - throw new AccessDeniedException(messages.getMessage("AclEntryAfterInvocationProvider.noPermission", + throw new AccessDeniedException(this.messages.getMessage("AclEntryAfterInvocationProvider.noPermission", new Object[] { authentication.getName(), returnedObject }, "Authentication {0} has NO permissions to the domain object {1}")); } diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java index c908ef52aa..ae5d2d23f2 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java @@ -45,7 +45,7 @@ class ArrayFilterer implements Filterer { // Collect the removed objects to a HashSet so that // it is fast to lookup them when a filtered array // is constructed. - removeList = new HashSet<>(); + this.removeList = new HashSet<>(); } /** @@ -55,14 +55,14 @@ class ArrayFilterer implements Filterer { @SuppressWarnings("unchecked") public T[] getFilteredObject() { // Recreate an array of same type and filter the removed objects. - int originalSize = list.length; - int sizeOfResultingList = originalSize - removeList.size(); - T[] filtered = (T[]) Array.newInstance(list.getClass().getComponentType(), sizeOfResultingList); + int originalSize = this.list.length; + int sizeOfResultingList = originalSize - this.removeList.size(); + T[] filtered = (T[]) Array.newInstance(this.list.getClass().getComponentType(), sizeOfResultingList); - for (int i = 0, j = 0; i < list.length; i++) { - T object = list[i]; + for (int i = 0, j = 0; i < this.list.length; i++) { + T object = this.list[i]; - if (!removeList.contains(object)) { + if (!this.removeList.contains(object)) { filtered[j] = object; j++; } @@ -85,14 +85,14 @@ class ArrayFilterer implements Filterer { private int index = 0; public boolean hasNext() { - return index < list.length; + return this.index < ArrayFilterer.this.list.length; } public T next() { if (!hasNext()) { throw new NoSuchElementException(); } - return list[index++]; + return ArrayFilterer.this.list[this.index++]; } public void remove() { @@ -106,7 +106,7 @@ class ArrayFilterer implements Filterer { * @see org.springframework.security.acls.afterinvocation.Filterer#remove(java.lang.Object) */ public void remove(T object) { - removeList.add(object); + this.removeList.add(object); } } diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java index 9ca71e2b4d..4c68101c09 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java @@ -48,7 +48,7 @@ class CollectionFilterer implements Filterer { // to the method may not necessarily be re-constructable (as // the Collection(collection) constructor is not guaranteed and // manually adding may lose sort order or other capabilities) - removeList = new HashSet<>(); + this.removeList = new HashSet<>(); } /** @@ -57,20 +57,20 @@ class CollectionFilterer implements Filterer { */ public Object getFilteredObject() { // Now the Iterator has ended, remove Objects from Collection - Iterator removeIter = removeList.iterator(); + Iterator removeIter = this.removeList.iterator(); - int originalSize = collection.size(); + int originalSize = this.collection.size(); while (removeIter.hasNext()) { - collection.remove(removeIter.next()); + this.collection.remove(removeIter.next()); } if (logger.isDebugEnabled()) { logger.debug("Original collection contained " + originalSize + " elements; now contains " - + collection.size() + " elements"); + + this.collection.size() + " elements"); } - return collection; + return this.collection; } /** @@ -78,7 +78,7 @@ class CollectionFilterer implements Filterer { * @see org.springframework.security.acls.afterinvocation.Filterer#iterator() */ public Iterator iterator() { - return collection.iterator(); + return this.collection.iterator(); } /** @@ -86,7 +86,7 @@ class CollectionFilterer implements Filterer { * @see org.springframework.security.acls.afterinvocation.Filterer#remove(java.lang.Object) */ public void remove(T object) { - removeList.add(object); + this.removeList.add(object); } } diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java b/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java index ff5d8fd9a9..9c45624976 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java @@ -65,15 +65,15 @@ public abstract class AbstractPermission implements Permission { } public final int getMask() { - return mask; + return this.mask; } public String getPattern() { - return AclFormattingUtils.printBinary(mask, code); + return AclFormattingUtils.printBinary(this.mask, this.code); } public final String toString() { - return this.getClass().getSimpleName() + "[" + getPattern() + "=" + mask + "]"; + return this.getClass().getSimpleName() + "[" + getPattern() + "=" + this.mask + "]"; } public final int hashCode() { diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java index 5c189c52d9..8a6ff5bee6 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java @@ -134,37 +134,37 @@ public class AccessControlEntryImpl implements AccessControlEntry, AuditableAcce @Override public Acl getAcl() { - return acl; + return this.acl; } @Override public Serializable getId() { - return id; + return this.id; } @Override public Permission getPermission() { - return permission; + return this.permission; } @Override public Sid getSid() { - return sid; + return this.sid; } @Override public boolean isAuditFailure() { - return auditFailure; + return this.auditFailure; } @Override public boolean isAuditSuccess() { - return auditSuccess; + return this.auditSuccess; } @Override public boolean isGranting() { - return granting; + return this.granting; } void setAuditFailure(boolean auditFailure) { diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java index 60b887dd69..5dae15cc60 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java @@ -68,12 +68,12 @@ public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy { Assert.isTrue(auths != null && (auths.length == 3 || auths.length == 1), "One or three GrantedAuthority instances required"); if (auths.length == 3) { - gaTakeOwnership = auths[0]; - gaModifyAuditing = auths[1]; - gaGeneralChanges = auths[2]; + this.gaTakeOwnership = auths[0]; + this.gaModifyAuditing = auths[1]; + this.gaGeneralChanges = auths[2]; } else { - gaTakeOwnership = gaModifyAuditing = gaGeneralChanges = auths[0]; + this.gaTakeOwnership = this.gaModifyAuditing = this.gaGeneralChanges = auths[0]; } } @@ -117,7 +117,7 @@ public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy { } // Try to get permission via ACEs within the ACL - List sids = sidRetrievalStrategy.getSids(authentication); + List sids = this.sidRetrievalStrategy.getSids(authentication); if (acl.isGranted(Arrays.asList(BasePermission.ADMINISTRATION), sids, false)) { return; diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java index a5493ca43d..01b0303d55 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java @@ -121,10 +121,10 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { @Override public void deleteAce(int aceIndex) throws NotFoundException { - aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); + this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); verifyAceIndexExists(aceIndex); - synchronized (aces) { + synchronized (this.aces) { this.aces.remove(aceIndex); } } @@ -135,14 +135,14 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { } if (aceIndex >= this.aces.size()) { throw new NotFoundException("aceIndex must refer to an index of the AccessControlEntry list. " - + "List size is " + aces.size() + ", index was " + aceIndex); + + "List size is " + this.aces.size() + ", index was " + aceIndex); } } @Override public void insertAce(int atIndexLocation, Permission permission, Sid sid, boolean granting) throws NotFoundException { - aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); + this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); Assert.notNull(permission, "Permission required"); Assert.notNull(sid, "Sid required"); if (atIndexLocation < 0) { @@ -155,7 +155,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { AccessControlEntryImpl ace = new AccessControlEntryImpl(null, this, sid, permission, granting, false, false); - synchronized (aces) { + synchronized (this.aces) { this.aces.add(atIndexLocation, ace); } } @@ -164,7 +164,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { public List getEntries() { // Can safely return AccessControlEntry directly, as they're immutable outside the // ACL package - return new ArrayList<>(aces); + return new ArrayList<>(this.aces); } @Override @@ -174,12 +174,12 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { @Override public ObjectIdentity getObjectIdentity() { - return objectIdentity; + return this.objectIdentity; } @Override public boolean isEntriesInheriting() { - return entriesInheriting; + return this.entriesInheriting; } /** @@ -198,7 +198,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { throw new UnloadedSidException("ACL was not loaded for one or more SID"); } - return permissionGrantingStrategy.isGranted(this, permission, sids, administrativeMode); + return this.permissionGrantingStrategy.isGranted(this, permission, sids, administrativeMode); } @Override @@ -213,7 +213,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { for (Sid sid : sids) { boolean found = false; - for (Sid loadedSid : loadedSids) { + for (Sid loadedSid : this.loadedSids) { if (sid.equals(loadedSid)) { // this SID is OK found = true; @@ -232,13 +232,13 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { @Override public void setEntriesInheriting(boolean entriesInheriting) { - aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); + this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); this.entriesInheriting = entriesInheriting; } @Override public void setOwner(Sid newOwner) { - aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_OWNERSHIP); + this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_OWNERSHIP); Assert.notNull(newOwner, "Owner required"); this.owner = newOwner; } @@ -250,34 +250,34 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { @Override public void setParent(Acl newParent) { - aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); + this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); Assert.isTrue(newParent == null || !newParent.equals(this), "Cannot be the parent of yourself"); this.parentAcl = newParent; } @Override public Acl getParentAcl() { - return parentAcl; + return this.parentAcl; } @Override public void updateAce(int aceIndex, Permission permission) throws NotFoundException { - aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); + this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL); verifyAceIndexExists(aceIndex); - synchronized (aces) { - AccessControlEntryImpl ace = (AccessControlEntryImpl) aces.get(aceIndex); + synchronized (this.aces) { + AccessControlEntryImpl ace = (AccessControlEntryImpl) this.aces.get(aceIndex); ace.setPermission(permission); } } @Override public void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure) { - aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_AUDITING); + this.aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_AUDITING); verifyAceIndexExists(aceIndex); - synchronized (aces) { - AccessControlEntryImpl ace = (AccessControlEntryImpl) aces.get(aceIndex); + synchronized (this.aces) { + AccessControlEntryImpl ace = (AccessControlEntryImpl) this.aces.get(aceIndex); ace.setAuditSuccess(auditSuccess); ace.setAuditFailure(auditFailure); } @@ -342,7 +342,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { int count = 0; - for (AccessControlEntry ace : aces) { + for (AccessControlEntry ace : this.aces) { count++; if (count == 1) { diff --git a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java index a830067997..068b786069 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java @@ -103,21 +103,21 @@ public class DefaultPermissionFactory implements PermissionFactory { Integer mask = perm.getMask(); // Ensure no existing Permission uses this integer or code - Assert.isTrue(!registeredPermissionsByInteger.containsKey(mask), + Assert.isTrue(!this.registeredPermissionsByInteger.containsKey(mask), () -> "An existing Permission already provides mask " + mask); - Assert.isTrue(!registeredPermissionsByName.containsKey(permissionName), + Assert.isTrue(!this.registeredPermissionsByName.containsKey(permissionName), () -> "An existing Permission already provides name '" + permissionName + "'"); // Register the new Permission - registeredPermissionsByInteger.put(mask, perm); - registeredPermissionsByName.put(permissionName, perm); + this.registeredPermissionsByInteger.put(mask, perm); + this.registeredPermissionsByName.put(permissionName, perm); } public Permission buildFromMask(int mask) { - if (registeredPermissionsByInteger.containsKey(mask)) { + if (this.registeredPermissionsByInteger.containsKey(mask)) { // The requested mask has an exact match against a statically-defined // Permission, so return it - return registeredPermissionsByInteger.get(mask); + return this.registeredPermissionsByInteger.get(mask); } // To get this far, we have to use a CumulativePermission @@ -127,7 +127,7 @@ public class DefaultPermissionFactory implements PermissionFactory { int permissionToCheck = 1 << i; if ((mask & permissionToCheck) == permissionToCheck) { - Permission p = registeredPermissionsByInteger.get(permissionToCheck); + Permission p = this.registeredPermissionsByInteger.get(permissionToCheck); if (p == null) { throw new IllegalStateException( @@ -141,7 +141,7 @@ public class DefaultPermissionFactory implements PermissionFactory { } public Permission buildFromName(String name) { - Permission p = registeredPermissionsByName.get(name); + Permission p = this.registeredPermissionsByName.get(name); if (p == null) { throw new IllegalArgumentException("Unknown permission '" + name + "'"); diff --git a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java index 18027573d5..edd3f85a56 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java @@ -90,7 +90,7 @@ public class DefaultPermissionGrantingStrategy implements PermissionGrantingStra if (ace.isGranting()) { // Success if (!administrativeMode) { - auditLogger.logIfNeeded(true, ace); + this.auditLogger.logIfNeeded(true, ace); } return true; @@ -120,7 +120,7 @@ public class DefaultPermissionGrantingStrategy implements PermissionGrantingStra // We found an ACE to reject the request at this point, as no // other ACEs were found that granted a different permission if (!administrativeMode) { - auditLogger.logIfNeeded(false, firstRejection); + this.auditLogger.logIfNeeded(false, firstRejection); } return false; diff --git a/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java b/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java index 2091760b3a..f9c16a8e96 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java @@ -61,8 +61,8 @@ public class EhCacheBasedAclCache implements AclCache { MutableAcl acl = getFromCache(pk); if (acl != null) { - cache.remove(acl.getId()); - cache.remove(acl.getObjectIdentity()); + this.cache.remove(acl.getId()); + this.cache.remove(acl.getObjectIdentity()); } } @@ -72,8 +72,8 @@ public class EhCacheBasedAclCache implements AclCache { MutableAcl acl = getFromCache(objectIdentity); if (acl != null) { - cache.remove(acl.getId()); - cache.remove(acl.getObjectIdentity()); + this.cache.remove(acl.getId()); + this.cache.remove(acl.getObjectIdentity()); } } @@ -83,7 +83,7 @@ public class EhCacheBasedAclCache implements AclCache { Element element = null; try { - element = cache.get(objectIdentity); + element = this.cache.get(objectIdentity); } catch (CacheException ignored) { } @@ -101,7 +101,7 @@ public class EhCacheBasedAclCache implements AclCache { Element element = null; try { - element = cache.get(pk); + element = this.cache.get(pk); } catch (CacheException ignored) { } @@ -131,8 +131,8 @@ public class EhCacheBasedAclCache implements AclCache { putInCache((MutableAcl) acl.getParentAcl()); } - cache.put(new Element(acl.getObjectIdentity(), acl)); - cache.put(new Element(acl.getId(), acl)); + this.cache.put(new Element(acl.getObjectIdentity(), acl)); + this.cache.put(new Element(acl.getId(), acl)); } private MutableAcl initializeTransientFields(MutableAcl value) { @@ -148,7 +148,7 @@ public class EhCacheBasedAclCache implements AclCache { } public void clearCache() { - cache.removeAll(); + this.cache.removeAll(); } } diff --git a/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java b/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java index abc1b19aaf..1389700d94 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java @@ -62,7 +62,7 @@ public class GrantedAuthoritySid implements Sid { } public String getGrantedAuthority() { - return grantedAuthority; + return this.grantedAuthority; } @Override diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java index bfc975f355..727e81ee77 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java @@ -69,7 +69,7 @@ public class ObjectIdentityImpl implements ObjectIdentity { Assert.notNull(object, "object cannot be null"); Class typeClass = ClassUtils.getUserClass(object.getClass()); - type = typeClass.getName(); + this.type = typeClass.getName(); Object result; @@ -105,30 +105,30 @@ public class ObjectIdentityImpl implements ObjectIdentity { ObjectIdentityImpl other = (ObjectIdentityImpl) arg0; - if (identifier instanceof Number && other.identifier instanceof Number) { + if (this.identifier instanceof Number && other.identifier instanceof Number) { // Integers and Longs with same value should be considered equal - if (((Number) identifier).longValue() != ((Number) other.identifier).longValue()) { + if (((Number) this.identifier).longValue() != ((Number) other.identifier).longValue()) { return false; } } else { // Use plain equality for other serializable types - if (!identifier.equals(other.identifier)) { + if (!this.identifier.equals(other.identifier)) { return false; } } - return type.equals(other.type); + return this.type.equals(other.type); } @Override public Serializable getIdentifier() { - return identifier; + return this.identifier; } @Override public String getType() { - return type; + return this.type; } /** diff --git a/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java b/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java index 22326bd469..71dae880aa 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java @@ -62,7 +62,7 @@ public class PrincipalSid implements Sid { } public String getPrincipal() { - return principal; + return this.principal; } @Override diff --git a/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java index 10df1af2d0..2a9619a46a 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java @@ -52,7 +52,7 @@ public class SidRetrievalStrategyImpl implements SidRetrievalStrategy { } public List getSids(Authentication authentication) { - Collection authorities = roleHierarchy + Collection authorities = this.roleHierarchy .getReachableGrantedAuthorities(authentication.getAuthorities()); List sids = new ArrayList<>(authorities.size() + 1); diff --git a/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java b/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java index a2e9eda533..1d2913602c 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java @@ -62,8 +62,8 @@ public class SpringCacheBasedAclCache implements AclCache { MutableAcl acl = getFromCache(pk); if (acl != null) { - cache.evict(acl.getId()); - cache.evict(acl.getObjectIdentity()); + this.cache.evict(acl.getId()); + this.cache.evict(acl.getObjectIdentity()); } } @@ -73,8 +73,8 @@ public class SpringCacheBasedAclCache implements AclCache { MutableAcl acl = getFromCache(objectIdentity); if (acl != null) { - cache.evict(acl.getId()); - cache.evict(acl.getObjectIdentity()); + this.cache.evict(acl.getId()); + this.cache.evict(acl.getObjectIdentity()); } } @@ -97,12 +97,12 @@ public class SpringCacheBasedAclCache implements AclCache { putInCache((MutableAcl) acl.getParentAcl()); } - cache.put(acl.getObjectIdentity(), acl); - cache.put(acl.getId(), acl); + this.cache.put(acl.getObjectIdentity(), acl); + this.cache.put(acl.getId(), acl); } private MutableAcl getFromCache(Object key) { - Cache.ValueWrapper element = cache.get(key); + Cache.ValueWrapper element = this.cache.get(key); if (element == null) { return null; @@ -124,7 +124,7 @@ public class SpringCacheBasedAclCache implements AclCache { } public void clearCache() { - cache.clear(); + this.cache.clear(); } } diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java b/acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java index a244cbf1f4..d8b4ca7555 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java @@ -109,11 +109,11 @@ class AclClassIdUtils { } private boolean canConvertFromStringTo(Class targetType) { - return conversionService.canConvert(String.class, targetType); + return this.conversionService.canConvert(String.class, targetType); } private T convertFromStringTo(String identifier, Class targetType) { - return conversionService.convert(identifier, targetType); + return this.conversionService.convert(identifier, targetType); } /** @@ -128,8 +128,8 @@ class AclClassIdUtils { */ private Long convertToLong(Serializable identifier) { Long idAsLong; - if (conversionService.canConvert(identifier.getClass(), Long.class)) { - idAsLong = conversionService.convert(identifier, Long.class); + if (this.conversionService.canConvert(identifier.getClass(), Long.class)) { + idAsLong = this.conversionService.convert(identifier, Long.class); } else { idAsLong = Long.valueOf(identifier.toString()); diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java index 326b2f2c76..a8314d2dd7 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java @@ -156,21 +156,21 @@ public class BasicLookupStrategy implements LookupStrategy { Assert.notNull(aclCache, "AclCache required"); Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required"); Assert.notNull(grantingStrategy, "grantingStrategy required"); - jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = new JdbcTemplate(dataSource); this.aclCache = aclCache; this.aclAuthorizationStrategy = aclAuthorizationStrategy; this.grantingStrategy = grantingStrategy; this.aclClassIdUtils = new AclClassIdUtils(); - fieldAces.setAccessible(true); - fieldAcl.setAccessible(true); + this.fieldAces.setAccessible(true); + this.fieldAcl.setAccessible(true); } private String computeRepeatingSql(String repeatingSql, int requiredRepetitions) { assert requiredRepetitions > 0 : "requiredRepetitions must be > 0"; - final String startSql = selectClause; + final String startSql = this.selectClause; - final String endSql = orderByClause; + final String endSql = this.orderByClause; StringBuilder sqlStringBldr = new StringBuilder( startSql.length() + endSql.length() + requiredRepetitions * (repeatingSql.length() + 4)); @@ -192,7 +192,7 @@ public class BasicLookupStrategy implements LookupStrategy { @SuppressWarnings("unchecked") private List readAces(AclImpl acl) { try { - return (List) fieldAces.get(acl); + return (List) this.fieldAces.get(acl); } catch (IllegalAccessException e) { throw new IllegalStateException("Could not obtain AclImpl.aces field", e); @@ -201,7 +201,7 @@ public class BasicLookupStrategy implements LookupStrategy { private void setAclOnAce(AccessControlEntryImpl ace, AclImpl acl) { try { - fieldAcl.set(ace, acl); + this.fieldAcl.set(ace, acl); } catch (IllegalAccessException e) { throw new IllegalStateException("Could not or set AclImpl on AccessControlEntryImpl fields", e); @@ -210,7 +210,7 @@ public class BasicLookupStrategy implements LookupStrategy { private void setAces(AclImpl acl, List aces) { try { - fieldAces.set(acl, aces); + this.fieldAces.set(acl, aces); } catch (IllegalAccessException e) { throw new IllegalStateException("Could not set AclImpl entries", e); @@ -228,9 +228,9 @@ public class BasicLookupStrategy implements LookupStrategy { Assert.notNull(acls, "ACLs are required"); Assert.notEmpty(findNow, "Items to find now required"); - String sql = computeRepeatingSql(lookupPrimaryKeysWhereClause, findNow.size()); + String sql = computeRepeatingSql(this.lookupPrimaryKeysWhereClause, findNow.size()); - Set parentsToLookup = jdbcTemplate.query(sql, ps -> { + Set parentsToLookup = this.jdbcTemplate.query(sql, ps -> { int i = 0; for (Long toFind : findNow) { @@ -265,7 +265,7 @@ public class BasicLookupStrategy implements LookupStrategy { * automatically create entries if required) */ public final Map readAclsById(List objects, List sids) { - Assert.isTrue(batchSize >= 1, "BatchSize must be >= 1"); + Assert.isTrue(this.batchSize >= 1, "BatchSize must be >= 1"); Assert.notEmpty(objects, "Objects to lookup required"); // Map @@ -288,7 +288,7 @@ public class BasicLookupStrategy implements LookupStrategy { // Check cache for the present ACL entry if (!aclFound) { - Acl acl = aclCache.getFromCache(oid); + Acl acl = this.aclCache.getFromCache(oid); // Ensure any cached element supports all the requested SIDs // (they should always, as our base impl doesn't filter on SID) @@ -321,7 +321,7 @@ public class BasicLookupStrategy implements LookupStrategy { // Add the loaded batch to the cache for (Acl loadedAcl : loadedBatch.values()) { - aclCache.putInCache((AclImpl) loadedAcl); + this.aclCache.putInCache((AclImpl) loadedAcl); } currentBatchToLoad.clear(); @@ -354,9 +354,9 @@ public class BasicLookupStrategy implements LookupStrategy { // Make the "acls" map contain all requested objectIdentities // (including markers to each parent in the hierarchy) - String sql = computeRepeatingSql(lookupObjectIdentitiesWhereClause, objectIdentities.size()); + String sql = computeRepeatingSql(this.lookupObjectIdentitiesWhereClause, objectIdentities.size()); - Set parentsToLookup = jdbcTemplate.query(sql, ps -> { + Set parentsToLookup = this.jdbcTemplate.query(sql, ps -> { int i = 0; for (ObjectIdentity oid : objectIdentities) { // Determine prepared statement values for this iteration @@ -421,8 +421,8 @@ public class BasicLookupStrategy implements LookupStrategy { } // Now we have the parent (if there is one), create the true AclImpl - AclImpl result = new AclImpl(inputAcl.getObjectIdentity(), inputAcl.getId(), aclAuthorizationStrategy, - grantingStrategy, parent, null, inputAcl.isEntriesInheriting(), inputAcl.getOwner()); + AclImpl result = new AclImpl(inputAcl.getObjectIdentity(), inputAcl.getId(), this.aclAuthorizationStrategy, + this.grantingStrategy, parent, null, inputAcl.isEntriesInheriting(), inputAcl.getOwner()); // Copy the "aces" from the input to the destination @@ -548,27 +548,27 @@ public class BasicLookupStrategy implements LookupStrategy { while (rs.next()) { // Convert current row into an Acl (albeit with a StubAclParent) - convertCurrentResultIntoObject(acls, rs); + convertCurrentResultIntoObject(this.acls, rs); // Figure out if this row means we need to lookup another parent long parentId = rs.getLong("parent_object"); if (parentId != 0) { // See if it's already in the "acls" - if (acls.containsKey(parentId)) { + if (this.acls.containsKey(parentId)) { continue; // skip this while iteration } // Now try to find it in the cache - MutableAcl cached = aclCache.getFromCache(parentId); + MutableAcl cached = BasicLookupStrategy.this.aclCache.getFromCache(parentId); - if ((cached == null) || !cached.isSidLoaded(sids)) { + if ((cached == null) || !cached.isSidLoaded(this.sids)) { parentIdsToLookup.add(parentId); } else { // Pop into the acls map, so our convert method doesn't // need to deal with an unsynchronized AclCache - acls.put(cached.getId(), cached); + this.acls.put(cached.getId(), cached); } } } @@ -597,7 +597,7 @@ public class BasicLookupStrategy implements LookupStrategy { // If the Java type is a String, check to see if we can convert it to the // target id type, e.g. UUID. Serializable identifier = (Serializable) rs.getObject("object_id_identity"); - identifier = aclClassIdUtils.identifierFrom(identifier, rs); + identifier = BasicLookupStrategy.this.aclClassIdUtils.identifierFrom(identifier, rs); ObjectIdentity objectIdentity = new ObjectIdentityImpl(rs.getString("class"), identifier); Acl parentAcl = null; @@ -610,8 +610,8 @@ public class BasicLookupStrategy implements LookupStrategy { boolean entriesInheriting = rs.getBoolean("entries_inheriting"); Sid owner = createSid(rs.getBoolean("acl_principal"), rs.getString("acl_sid")); - acl = new AclImpl(objectIdentity, id, aclAuthorizationStrategy, grantingStrategy, parentAcl, null, - entriesInheriting, owner); + acl = new AclImpl(objectIdentity, id, BasicLookupStrategy.this.aclAuthorizationStrategy, + BasicLookupStrategy.this.grantingStrategy, parentAcl, null, entriesInheriting, owner); acls.put(id, acl); } @@ -624,7 +624,7 @@ public class BasicLookupStrategy implements LookupStrategy { Sid recipient = createSid(rs.getBoolean("ace_principal"), rs.getString("ace_sid")); int mask = rs.getInt("mask"); - Permission permission = permissionFactory.buildFromMask(mask); + Permission permission = BasicLookupStrategy.this.permissionFactory.buildFromMask(mask); boolean granting = rs.getBoolean("granting"); boolean auditSuccess = rs.getBoolean("audit_success"); boolean auditFailure = rs.getBoolean("audit_failure"); @@ -657,7 +657,7 @@ public class BasicLookupStrategy implements LookupStrategy { } public Long getId() { - return id; + return this.id; } public ObjectIdentity getObjectIdentity() { diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java index c6d2479b34..4899243c8d 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java @@ -92,10 +92,10 @@ public class JdbcAclService implements AclService { public List findChildren(ObjectIdentity parentIdentity) { Object[] args = { parentIdentity.getIdentifier().toString(), parentIdentity.getType() }; - List objects = jdbcOperations.query(findChildrenSql, args, (rs, rowNum) -> { + List objects = this.jdbcOperations.query(this.findChildrenSql, args, (rs, rowNum) -> { String javaType = rs.getString("class"); Serializable identifier = (Serializable) rs.getObject("obj_id"); - identifier = aclClassIdUtils.identifierFrom(identifier, rs); + identifier = this.aclClassIdUtils.identifierFrom(identifier, rs); return new ObjectIdentityImpl(javaType, identifier); }); @@ -124,7 +124,7 @@ public class JdbcAclService implements AclService { public Map readAclsById(List objects, List sids) throws NotFoundException { - Map result = lookupStrategy.readAclsById(objects, sids); + Map result = this.lookupStrategy.readAclsById(objects, sids); // Check every requested object identity was found (throw NotFoundException if // needed) @@ -163,7 +163,7 @@ public class JdbcAclService implements AclService { } protected boolean isAclClassIdSupported() { - return aclClassIdSupported; + return this.aclClassIdSupported; } } diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java index 88271c7ec1..144085607a 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java @@ -136,7 +136,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS if (acl.getEntries().isEmpty()) { return; } - jdbcOperations.batchUpdate(insertEntry, new BatchPreparedStatementSetter() { + this.jdbcOperations.batchUpdate(this.insertEntry, new BatchPreparedStatementSetter() { public int getBatchSize() { return acl.getEntries().size(); } @@ -168,7 +168,8 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS protected void createObjectIdentity(ObjectIdentity object, Sid owner) { Long sidId = createOrRetrieveSidPrimaryKey(owner, true); Long classId = createOrRetrieveClassPrimaryKey(object.getType(), true, object.getIdentifier().getClass()); - jdbcOperations.update(insertObjectIdentity, classId, object.getIdentifier().toString(), sidId, Boolean.TRUE); + this.jdbcOperations.update(this.insertObjectIdentity, classId, object.getIdentifier().toString(), sidId, + Boolean.TRUE); } /** @@ -179,7 +180,8 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS * @return the primary key or null if not found */ protected Long createOrRetrieveClassPrimaryKey(String type, boolean allowCreate, Class idType) { - List classIds = jdbcOperations.queryForList(selectClassPrimaryKey, new Object[] { type }, Long.class); + List classIds = this.jdbcOperations.queryForList(this.selectClassPrimaryKey, new Object[] { type }, + Long.class); if (!classIds.isEmpty()) { return classIds.get(0); @@ -187,13 +189,13 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS if (allowCreate) { if (!isAclClassIdSupported()) { - jdbcOperations.update(insertClass, type); + this.jdbcOperations.update(this.insertClass, type); } else { - jdbcOperations.update(insertClass, type, idType.getCanonicalName()); + this.jdbcOperations.update(this.insertClass, type, idType.getCanonicalName()); } Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(), "Transaction must be running"); - return jdbcOperations.queryForObject(classIdentityQuery, Long.class); + return this.jdbcOperations.queryForObject(this.classIdentityQuery, Long.class); } return null; @@ -238,17 +240,17 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS */ protected Long createOrRetrieveSidPrimaryKey(String sidName, boolean sidIsPrincipal, boolean allowCreate) { - List sidIds = jdbcOperations.queryForList(selectSidPrimaryKey, new Object[] { sidIsPrincipal, sidName }, - Long.class); + List sidIds = this.jdbcOperations.queryForList(this.selectSidPrimaryKey, + new Object[] { sidIsPrincipal, sidName }, Long.class); if (!sidIds.isEmpty()) { return sidIds.get(0); } if (allowCreate) { - jdbcOperations.update(insertSid, sidIsPrincipal, sidName); + this.jdbcOperations.update(this.insertSid, sidIsPrincipal, sidName); Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(), "Transaction must be running"); - return jdbcOperations.queryForObject(sidIdentityQuery, Long.class); + return this.jdbcOperations.queryForObject(this.sidIdentityQuery, Long.class); } return null; @@ -267,7 +269,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS } } else { - if (!foreignKeysInDatabase) { + if (!this.foreignKeysInDatabase) { // We need to perform a manual verification for what a FK would normally // do // We generally don't do this, in the interests of deadlock management @@ -288,7 +290,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS deleteObjectIdentity(oidPrimaryKey); // Clear the cache - aclCache.evictFromCache(objectIdentity); + this.aclCache.evictFromCache(objectIdentity); } /** @@ -297,7 +299,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS * @param oidPrimaryKey the rows in acl_entry to delete */ protected void deleteEntries(Long oidPrimaryKey) { - jdbcOperations.update(deleteEntryByObjectIdentityForeignKey, oidPrimaryKey); + this.jdbcOperations.update(this.deleteEntryByObjectIdentityForeignKey, oidPrimaryKey); } /** @@ -310,7 +312,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS */ protected void deleteObjectIdentity(Long oidPrimaryKey) { // Delete the acl_object_identity row - jdbcOperations.update(deleteObjectIdentityByPrimaryKey, oidPrimaryKey); + this.jdbcOperations.update(this.deleteObjectIdentityByPrimaryKey, oidPrimaryKey); } /** @@ -322,7 +324,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS */ protected Long retrieveObjectIdentityPrimaryKey(ObjectIdentity oid) { try { - return jdbcOperations.queryForObject(selectObjectIdentityPrimaryKey, Long.class, oid.getType(), + return this.jdbcOperations.queryForObject(this.selectObjectIdentityPrimaryKey, Long.class, oid.getType(), oid.getIdentifier().toString()); } catch (DataAccessException notFound) { @@ -364,7 +366,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS clearCacheIncludingChildren(child); } } - aclCache.evictFromCache(objectIdentity); + this.aclCache.evictFromCache(objectIdentity); } /** @@ -388,7 +390,7 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS Assert.notNull(acl.getOwner(), "Owner is required in this implementation"); Long ownerSid = createOrRetrieveSidPrimaryKey(acl.getOwner(), true); - int count = jdbcOperations.update(updateObjectIdentity, parentId, ownerSid, acl.isEntriesInheriting(), + int count = this.jdbcOperations.update(this.updateObjectIdentity, parentId, ownerSid, acl.isEntriesInheriting(), acl.getId()); if (count != 1) { diff --git a/acl/src/test/java/org/springframework/security/acls/TargetObjectWithUUID.java b/acl/src/test/java/org/springframework/security/acls/TargetObjectWithUUID.java index 11b297257d..199eff0eb2 100644 --- a/acl/src/test/java/org/springframework/security/acls/TargetObjectWithUUID.java +++ b/acl/src/test/java/org/springframework/security/acls/TargetObjectWithUUID.java @@ -27,7 +27,7 @@ public final class TargetObjectWithUUID { private UUID id; public UUID getId() { - return id; + return this.id; } public void setId(UUID id) { diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImplTests.java index 219c434806..907f7c1cc0 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImplTests.java @@ -46,9 +46,9 @@ public class AclAuthorizationStrategyImplTests { @Before public void setup() { - authority = new SimpleGrantedAuthority("ROLE_AUTH"); + this.authority = new SimpleGrantedAuthority("ROLE_AUTH"); TestingAuthenticationToken authentication = new TestingAuthenticationToken("foo", "bar", - Arrays.asList(authority)); + Arrays.asList(this.authority)); authentication.setAuthenticated(true); SecurityContextHolder.getContext().setAuthentication(authentication); } @@ -61,8 +61,8 @@ public class AclAuthorizationStrategyImplTests { // gh-4085 @Test public void securityCheckWhenCustomAuthorityThenNameIsUsed() { - strategy = new AclAuthorizationStrategyImpl(new CustomAuthority()); - strategy.securityCheck(acl, AclAuthorizationStrategy.CHANGE_GENERAL); + this.strategy = new AclAuthorizationStrategyImpl(new CustomAuthority()); + this.strategy.securityCheck(this.acl, AclAuthorizationStrategy.CHANGE_GENERAL); } @SuppressWarnings("serial") @@ -70,7 +70,7 @@ public class AclAuthorizationStrategyImplTests { @Override public String getAuthority() { - return authority.getAuthority(); + return AclAuthorizationStrategyImplTests.this.authority.getAuthority(); } } diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java index 187b1a6631..e49c990ab1 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java @@ -83,12 +83,12 @@ public class AclImplTests { @Before public void setUp() { - SecurityContextHolder.getContext().setAuthentication(auth); - authzStrategy = mock(AclAuthorizationStrategy.class); - mockAuditLogger = mock(AuditLogger.class); - pgs = new DefaultPermissionGrantingStrategy(mockAuditLogger); - auth.setAuthenticated(true); - permissionFactory = new DefaultPermissionFactory(); + SecurityContextHolder.getContext().setAuthentication(this.auth); + this.authzStrategy = mock(AclAuthorizationStrategy.class); + this.mockAuditLogger = mock(AuditLogger.class); + this.pgs = new DefaultPermissionGrantingStrategy(this.mockAuditLogger); + this.auth.setAuthenticated(true); + this.permissionFactory = new DefaultPermissionFactory(); } @After @@ -99,41 +99,43 @@ public class AclImplTests { @Test(expected = IllegalArgumentException.class) public void constructorsRejectNullObjectIdentity() { try { - new AclImpl(null, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + new AclImpl(null, 1, this.authzStrategy, this.pgs, null, null, true, new PrincipalSid("joe")); fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { } - new AclImpl(null, 1, authzStrategy, mockAuditLogger); + new AclImpl(null, 1, this.authzStrategy, this.mockAuditLogger); } @Test(expected = IllegalArgumentException.class) public void constructorsRejectNullId() { try { - new AclImpl(objectIdentity, null, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + new AclImpl(this.objectIdentity, null, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { } - new AclImpl(objectIdentity, null, authzStrategy, mockAuditLogger); + new AclImpl(this.objectIdentity, null, this.authzStrategy, this.mockAuditLogger); } @SuppressWarnings("deprecation") @Test(expected = IllegalArgumentException.class) public void constructorsRejectNullAclAuthzStrategy() { try { - new AclImpl(objectIdentity, 1, null, new DefaultPermissionGrantingStrategy(mockAuditLogger), null, null, - true, new PrincipalSid("joe")); + new AclImpl(this.objectIdentity, 1, null, new DefaultPermissionGrantingStrategy(this.mockAuditLogger), null, + null, true, new PrincipalSid("joe")); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { } - new AclImpl(objectIdentity, 1, null, mockAuditLogger); + new AclImpl(this.objectIdentity, 1, null, this.mockAuditLogger); } @Test public void insertAceRejectsNullParameters() { - MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + MutableAcl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); try { acl.insertAce(0, null, new GrantedAuthoritySid("ROLE_IGNORED"), true); fail("It should have thrown IllegalArgumentException"); @@ -150,7 +152,8 @@ public class AclImplTests { @Test public void insertAceAddsElementAtCorrectIndex() { - MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + MutableAcl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); MockAclService service = new MockAclService(); // Insert one permission @@ -186,7 +189,8 @@ public class AclImplTests { @Test(expected = NotFoundException.class) public void insertAceFailsForNonExistentElement() { - MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + MutableAcl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); MockAclService service = new MockAclService(); // Insert one permission @@ -198,7 +202,8 @@ public class AclImplTests { @Test public void deleteAceKeepsInitialOrdering() { - MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + MutableAcl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); MockAclService service = new MockAclService(); // Add several permissions @@ -233,7 +238,8 @@ public class AclImplTests { AclAuthorizationStrategyImpl strategy = new AclAuthorizationStrategyImpl( new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL")); - MutableAcl acl = new AclImpl(objectIdentity, (1), strategy, pgs, null, null, true, new PrincipalSid("joe")); + MutableAcl acl = new AclImpl(this.objectIdentity, (1), strategy, this.pgs, null, null, true, + new PrincipalSid("joe")); try { acl.deleteAce(99); fail("It should have thrown NotFoundException"); @@ -244,7 +250,8 @@ public class AclImplTests { @Test public void isGrantingRejectsEmptyParameters() { - MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + MutableAcl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); Sid ben = new PrincipalSid("ben"); try { acl.isGranted(new ArrayList<>(0), Arrays.asList(ben), false); @@ -268,7 +275,8 @@ public class AclImplTests { ObjectIdentity rootOid = new ObjectIdentityImpl(TARGET_CLASS, 100); // Create an ACL which owner is not the authenticated principal - MutableAcl rootAcl = new AclImpl(rootOid, 1, authzStrategy, pgs, null, null, false, new PrincipalSid("joe")); + MutableAcl rootAcl = new AclImpl(rootOid, 1, this.authzStrategy, this.pgs, null, null, false, + new PrincipalSid("joe")); // Grant some permissions rootAcl.insertAce(0, BasePermission.READ, new PrincipalSid("ben"), false); @@ -314,11 +322,12 @@ public class AclImplTests { // Create ACLs PrincipalSid joe = new PrincipalSid("joe"); - MutableAcl grandParentAcl = new AclImpl(grandParentOid, 1, authzStrategy, pgs, null, null, false, joe); - MutableAcl parentAcl1 = new AclImpl(parentOid1, 2, authzStrategy, pgs, null, null, true, joe); - MutableAcl parentAcl2 = new AclImpl(parentOid2, 3, authzStrategy, pgs, null, null, true, joe); - MutableAcl childAcl1 = new AclImpl(childOid1, 4, authzStrategy, pgs, null, null, true, joe); - MutableAcl childAcl2 = new AclImpl(childOid2, 4, authzStrategy, pgs, null, null, false, joe); + MutableAcl grandParentAcl = new AclImpl(grandParentOid, 1, this.authzStrategy, this.pgs, null, null, false, + joe); + MutableAcl parentAcl1 = new AclImpl(parentOid1, 2, this.authzStrategy, this.pgs, null, null, true, joe); + MutableAcl parentAcl2 = new AclImpl(parentOid2, 3, this.authzStrategy, this.pgs, null, null, true, joe); + MutableAcl childAcl1 = new AclImpl(childOid1, 4, this.authzStrategy, this.pgs, null, null, true, joe); + MutableAcl childAcl2 = new AclImpl(childOid2, 4, this.authzStrategy, this.pgs, null, null, false, joe); // Create hierarchies childAcl2.setParent(childAcl1); @@ -376,7 +385,8 @@ public class AclImplTests { Authentication auth = new TestingAuthenticationToken("ben", "ignored", "ROLE_GENERAL"); auth.setAuthenticated(true); SecurityContextHolder.getContext().setAuthentication(auth); - MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, false, new PrincipalSid("joe")); + MutableAcl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, false, + new PrincipalSid("joe")); MockAclService service = new MockAclService(); acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_USER_READ"), true); @@ -404,7 +414,8 @@ public class AclImplTests { Authentication auth = new TestingAuthenticationToken("ben", "ignored", "ROLE_AUDITING", "ROLE_GENERAL"); auth.setAuthenticated(true); SecurityContextHolder.getContext().setAuthentication(auth); - MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, false, new PrincipalSid("joe")); + MutableAcl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, false, + new PrincipalSid("joe")); MockAclService service = new MockAclService(); acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_USER_READ"), true); @@ -432,8 +443,10 @@ public class AclImplTests { SecurityContextHolder.getContext().setAuthentication(auth); ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, (100)); ObjectIdentity identity2 = new ObjectIdentityImpl(TARGET_CLASS, (101)); - MutableAcl acl = new AclImpl(identity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); - MutableAcl parentAcl = new AclImpl(identity2, 2, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + MutableAcl acl = new AclImpl(identity, 1, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); + MutableAcl parentAcl = new AclImpl(identity2, 2, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); MockAclService service = new MockAclService(); acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_USER_READ"), true); acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_USER_READ"), true); @@ -459,7 +472,7 @@ public class AclImplTests { @Test public void isSidLoadedBehavesAsExpected() { List loadedSids = Arrays.asList(new PrincipalSid("ben"), new GrantedAuthoritySid("ROLE_IGNORED")); - MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, loadedSids, true, + MutableAcl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, loadedSids, true, new PrincipalSid("joe")); assertThat(acl.isSidLoaded(loadedSids)).isTrue(); @@ -482,19 +495,22 @@ public class AclImplTests { @Test(expected = NotFoundException.class) public void insertAceRaisesNotFoundExceptionForIndexLessThanZero() { - AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + AclImpl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); acl.insertAce(-1, mock(Permission.class), mock(Sid.class), true); } @Test(expected = NotFoundException.class) public void deleteAceRaisesNotFoundExceptionForIndexLessThanZero() { - AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + AclImpl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); acl.deleteAce(-1); } @Test(expected = NotFoundException.class) public void insertAceRaisesNotFoundExceptionForIndexGreaterThanSize() { - AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + AclImpl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); // Insert at zero, OK. acl.insertAce(0, mock(Permission.class), mock(Sid.class), true); // Size is now 1 @@ -504,7 +520,8 @@ public class AclImplTests { // SEC-1151 @Test(expected = NotFoundException.class) public void deleteAceRaisesNotFoundExceptionForIndexEqualToSize() { - AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe")); + AclImpl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, this.pgs, null, null, true, + new PrincipalSid("joe")); acl.insertAce(0, mock(Permission.class), mock(Sid.class), true); // Size is now 1 acl.deleteAce(1); @@ -513,9 +530,9 @@ public class AclImplTests { // SEC-1795 @Test public void changingParentIsSuccessful() { - AclImpl parentAcl = new AclImpl(objectIdentity, 1L, authzStrategy, mockAuditLogger); - AclImpl childAcl = new AclImpl(objectIdentity, 2L, authzStrategy, mockAuditLogger); - AclImpl changeParentAcl = new AclImpl(objectIdentity, 3L, authzStrategy, mockAuditLogger); + AclImpl parentAcl = new AclImpl(this.objectIdentity, 1L, this.authzStrategy, this.mockAuditLogger); + AclImpl childAcl = new AclImpl(this.objectIdentity, 2L, this.authzStrategy, this.mockAuditLogger); + AclImpl changeParentAcl = new AclImpl(this.objectIdentity, 3L, this.authzStrategy, this.mockAuditLogger); childAcl.setParent(parentAcl); childAcl.setParent(changeParentAcl); @@ -524,10 +541,11 @@ public class AclImplTests { // SEC-2342 @Test public void maskPermissionGrantingStrategy() { - DefaultPermissionGrantingStrategy maskPgs = new MaskPermissionGrantingStrategy(mockAuditLogger); + DefaultPermissionGrantingStrategy maskPgs = new MaskPermissionGrantingStrategy(this.mockAuditLogger); MockAclService service = new MockAclService(); - AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, maskPgs, null, null, true, new PrincipalSid("joe")); - Permission permission = permissionFactory + AclImpl acl = new AclImpl(this.objectIdentity, 1, this.authzStrategy, maskPgs, null, null, true, + new PrincipalSid("joe")); + Permission permission = this.permissionFactory .buildFromMask(BasePermission.READ.getMask() | BasePermission.WRITE.getMask()); Sid sid = new PrincipalSid("ben"); acl.insertAce(0, permission, sid, true); diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java index 491bffcc4f..095983b49c 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java @@ -46,52 +46,52 @@ public class AuditLoggerTests { @Before public void setUp() { - logger = new ConsoleAuditLogger(); - ace = mock(AuditableAccessControlEntry.class); - console = System.out; - System.setOut(new PrintStream(bytes)); + this.logger = new ConsoleAuditLogger(); + this.ace = mock(AuditableAccessControlEntry.class); + this.console = System.out; + System.setOut(new PrintStream(this.bytes)); } @After public void tearDown() { - System.setOut(console); - bytes.reset(); + System.setOut(this.console); + this.bytes.reset(); } @Test public void nonAuditableAceIsIgnored() { AccessControlEntry ace = mock(AccessControlEntry.class); - logger.logIfNeeded(true, ace); - assertThat(bytes.size()).isZero(); + this.logger.logIfNeeded(true, ace); + assertThat(this.bytes.size()).isZero(); } @Test public void successIsNotLoggedIfAceDoesntRequireSuccessAudit() { - when(ace.isAuditSuccess()).thenReturn(false); - logger.logIfNeeded(true, ace); - assertThat(bytes.size()).isZero(); + when(this.ace.isAuditSuccess()).thenReturn(false); + this.logger.logIfNeeded(true, this.ace); + assertThat(this.bytes.size()).isZero(); } @Test public void successIsLoggedIfAceRequiresSuccessAudit() { - when(ace.isAuditSuccess()).thenReturn(true); + when(this.ace.isAuditSuccess()).thenReturn(true); - logger.logIfNeeded(true, ace); - assertThat(bytes.toString()).startsWith("GRANTED due to ACE"); + this.logger.logIfNeeded(true, this.ace); + assertThat(this.bytes.toString()).startsWith("GRANTED due to ACE"); } @Test public void failureIsntLoggedIfAceDoesntRequireFailureAudit() { - when(ace.isAuditFailure()).thenReturn(false); - logger.logIfNeeded(false, ace); - assertThat(bytes.size()).isZero(); + when(this.ace.isAuditFailure()).thenReturn(false); + this.logger.logIfNeeded(false, this.ace); + assertThat(this.bytes.size()).isZero(); } @Test public void failureIsLoggedIfAceRequiresFailureAudit() { - when(ace.isAuditFailure()).thenReturn(true); - logger.logIfNeeded(false, ace); - assertThat(bytes.toString()).startsWith("DENIED due to ACE"); + when(this.ace.isAuditFailure()).thenReturn(true); + this.logger.logIfNeeded(false, this.ace); + assertThat(this.bytes.toString()).startsWith("DENIED due to ACE"); } } diff --git a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java index 160f233fab..aa0c527ca4 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java @@ -179,7 +179,7 @@ public class ObjectIdentityImplTests { private Object id; public Object getId() { - return id; + return this.id; } public void setId(Object id) { @@ -193,7 +193,7 @@ public class ObjectIdentityImplTests { private Object id; public Object getId() { - return id; + return this.id; } public void setId(Object id) { diff --git a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java index 30d894d2ed..4cf3431e7b 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java @@ -47,7 +47,7 @@ public class ObjectIdentityRetrievalStrategyImplTests { private Object id; public Object getId() { - return id; + return this.id; } public void setId(Object id) { diff --git a/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java b/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java index 518b908be3..f81c64ff6d 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java @@ -33,12 +33,12 @@ public class PermissionTests { @Before public void createPermissionfactory() { - permissionFactory = new DefaultPermissionFactory(); + this.permissionFactory = new DefaultPermissionFactory(); } @Test public void basePermissionTest() { - Permission p = permissionFactory.buildFromName("WRITE"); + Permission p = this.permissionFactory.buildFromName("WRITE"); assertThat(p).isNotNull(); } @@ -54,13 +54,13 @@ public class PermissionTests { @Test public void fromInteger() { - Permission permission = permissionFactory.buildFromMask(7); - permission = permissionFactory.buildFromMask(4); + Permission permission = this.permissionFactory.buildFromMask(7); + permission = this.permissionFactory.buildFromMask(4); } @Test public void stringConversion() { - permissionFactory.registerPublicPermissions(SpecialPermission.class); + this.permissionFactory.registerPublicPermissions(SpecialPermission.class); assertThat(BasePermission.READ.toString()).isEqualTo("BasePermission[...............................R=1]"); diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/AbstractBasicLookupStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/AbstractBasicLookupStrategyTests.java index 4aa9a8e0e4..d3a32c1996 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/AbstractBasicLookupStrategyTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/AbstractBasicLookupStrategyTests.java @@ -109,9 +109,9 @@ public abstract class AbstractBasicLookupStrategyTests { @Before public void initializeBeans() { - strategy = new BasicLookupStrategy(getDataSource(), aclCache(), aclAuthStrategy(), + this.strategy = new BasicLookupStrategy(getDataSource(), aclCache(), aclAuthStrategy(), new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger())); - strategy.setPermissionFactory(new DefaultPermissionFactory()); + this.strategy.setPermissionFactory(new DefaultPermissionFactory()); } protected AclAuthorizationStrategy aclAuthStrategy() { @@ -159,7 +159,7 @@ public abstract class AbstractBasicLookupStrategyTests { ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, 102L); // Objects were put in cache - strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null); + this.strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null); // Let's empty the database to force acls retrieval from cache emptyDatabase(); @@ -299,8 +299,8 @@ public abstract class AbstractBasicLookupStrategyTests { List sids = Arrays.asList(BEN_SID); List childOids = Arrays.asList(childOid); - strategy.setBatchSize(6); - Map foundAcls = strategy.readAclsById(childOids, sids); + this.strategy.setBatchSize(6); + Map foundAcls = this.strategy.readAclsById(childOids, sids); Acl foundChildAcl = foundAcls.get(childOid); assertThat(foundChildAcl).isNotNull(); @@ -313,7 +313,7 @@ public abstract class AbstractBasicLookupStrategyTests { // cache List allOids = Arrays.asList(grandParentOid, parent1Oid, parent2Oid, childOid); try { - foundAcls = strategy.readAclsById(allOids, sids); + foundAcls = this.strategy.readAclsById(allOids, sids); } catch (NotFoundException notExpected) { @@ -333,12 +333,12 @@ public abstract class AbstractBasicLookupStrategyTests { ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, 104L); - strategy.readAclsById(Arrays.asList(oid), Arrays.asList(BEN_SID)); + this.strategy.readAclsById(Arrays.asList(oid), Arrays.asList(BEN_SID)); } @Test public void testCreatePrincipalSid() { - Sid result = strategy.createSid(true, "sid"); + Sid result = this.strategy.createSid(true, "sid"); assertThat(result.getClass()).isEqualTo(PrincipalSid.class); assertThat(((PrincipalSid) result).getPrincipal()).isEqualTo("sid"); @@ -346,7 +346,7 @@ public abstract class AbstractBasicLookupStrategyTests { @Test public void testCreateGrantedAuthority() { - Sid result = strategy.createSid(false, "sid"); + Sid result = this.strategy.createSid(false, "sid"); assertThat(result.getClass()).isEqualTo(GrantedAuthoritySid.class); assertThat(((GrantedAuthoritySid) result).getGrantedAuthority()).isEqualTo("sid"); diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTests.java index 8cea9d0570..bf913fcab9 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTests.java @@ -56,13 +56,13 @@ public class AclClassIdUtilsTests { @Before public void setUp() { - aclClassIdUtils = new AclClassIdUtils(); + this.aclClassIdUtils = new AclClassIdUtils(); } @Test public void shouldReturnLongIfIdentifierIsLong() throws SQLException { // when - Serializable newIdentifier = aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER, resultSet); + Serializable newIdentifier = this.aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER, this.resultSet); // then assertThat(newIdentifier).isEqualTo(DEFAULT_IDENTIFIER); @@ -71,7 +71,7 @@ public class AclClassIdUtilsTests { @Test public void shouldReturnLongIfIdentifierIsBigInteger() throws SQLException { // when - Serializable newIdentifier = aclClassIdUtils.identifierFrom(BIGINT_IDENTIFIER, resultSet); + Serializable newIdentifier = this.aclClassIdUtils.identifierFrom(BIGINT_IDENTIFIER, this.resultSet); // then assertThat(newIdentifier).isEqualTo(DEFAULT_IDENTIFIER); @@ -80,10 +80,10 @@ public class AclClassIdUtilsTests { @Test public void shouldReturnLongIfClassIdTypeIsNull() throws SQLException { // given - given(resultSet.getString("class_id_type")).willReturn(null); + given(this.resultSet.getString("class_id_type")).willReturn(null); // when - Serializable newIdentifier = aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, resultSet); + Serializable newIdentifier = this.aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, this.resultSet); // then assertThat(newIdentifier).isEqualTo(DEFAULT_IDENTIFIER); @@ -92,10 +92,10 @@ public class AclClassIdUtilsTests { @Test public void shouldReturnLongIfNoClassIdTypeColumn() throws SQLException { // given - given(resultSet.getString("class_id_type")).willThrow(SQLException.class); + given(this.resultSet.getString("class_id_type")).willThrow(SQLException.class); // when - Serializable newIdentifier = aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, resultSet); + Serializable newIdentifier = this.aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, this.resultSet); // then assertThat(newIdentifier).isEqualTo(DEFAULT_IDENTIFIER); @@ -104,10 +104,10 @@ public class AclClassIdUtilsTests { @Test public void shouldReturnLongIfTypeClassNotFound() throws SQLException { // given - given(resultSet.getString("class_id_type")).willReturn("com.example.UnknownType"); + given(this.resultSet.getString("class_id_type")).willReturn("com.example.UnknownType"); // when - Serializable newIdentifier = aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, resultSet); + Serializable newIdentifier = this.aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, this.resultSet); // then assertThat(newIdentifier).isEqualTo(DEFAULT_IDENTIFIER); @@ -116,12 +116,12 @@ public class AclClassIdUtilsTests { @Test public void shouldReturnLongEvenIfCustomConversionServiceDoesNotSupportLongConversion() throws SQLException { // given - given(resultSet.getString("class_id_type")).willReturn("java.lang.Long"); - given(conversionService.canConvert(String.class, Long.class)).willReturn(false); - aclClassIdUtils.setConversionService(conversionService); + given(this.resultSet.getString("class_id_type")).willReturn("java.lang.Long"); + given(this.conversionService.canConvert(String.class, Long.class)).willReturn(false); + this.aclClassIdUtils.setConversionService(this.conversionService); // when - Serializable newIdentifier = aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, resultSet); + Serializable newIdentifier = this.aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, this.resultSet); // then assertThat(newIdentifier).isEqualTo(DEFAULT_IDENTIFIER); @@ -130,10 +130,10 @@ public class AclClassIdUtilsTests { @Test public void shouldReturnLongWhenLongClassIdType() throws SQLException { // given - given(resultSet.getString("class_id_type")).willReturn("java.lang.Long"); + given(this.resultSet.getString("class_id_type")).willReturn("java.lang.Long"); // when - Serializable newIdentifier = aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, resultSet); + Serializable newIdentifier = this.aclClassIdUtils.identifierFrom(DEFAULT_IDENTIFIER_AS_STRING, this.resultSet); // then assertThat(newIdentifier).isEqualTo(DEFAULT_IDENTIFIER); @@ -143,10 +143,10 @@ public class AclClassIdUtilsTests { public void shouldReturnUUIDWhenUUIDClassIdType() throws SQLException { // given UUID identifier = UUID.randomUUID(); - given(resultSet.getString("class_id_type")).willReturn("java.util.UUID"); + given(this.resultSet.getString("class_id_type")).willReturn("java.util.UUID"); // when - Serializable newIdentifier = aclClassIdUtils.identifierFrom(identifier.toString(), resultSet); + Serializable newIdentifier = this.aclClassIdUtils.identifierFrom(identifier.toString(), this.resultSet); // then assertThat(newIdentifier).isEqualTo(identifier); @@ -156,10 +156,10 @@ public class AclClassIdUtilsTests { public void shouldReturnStringWhenStringClassIdType() throws SQLException { // given String identifier = "MY_STRING_IDENTIFIER"; - given(resultSet.getString("class_id_type")).willReturn("java.lang.String"); + given(this.resultSet.getString("class_id_type")).willReturn("java.lang.String"); // when - Serializable newIdentifier = aclClassIdUtils.identifierFrom(identifier, resultSet); + Serializable newIdentifier = this.aclClassIdUtils.identifierFrom(identifier, this.resultSet); // then assertThat(newIdentifier).isEqualTo(identifier); @@ -174,7 +174,7 @@ public class AclClassIdUtilsTests { @Test(expected = IllegalArgumentException.class) public void shouldNotAcceptNullConversionServiceInSetter() { // when - aclClassIdUtils.setConversionService(null); + this.aclClassIdUtils.setConversionService(null); } } diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTestsDbHelper.java b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTestsDbHelper.java index c181522900..b15647d16c 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTestsDbHelper.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTestsDbHelper.java @@ -50,7 +50,7 @@ public class BasicLookupStrategyTestsDbHelper { // Use a different connection url so the tests can run in parallel String connectionUrl; String sqlClassPathResource; - if (!withAclClassIdType) { + if (!this.withAclClassIdType) { connectionUrl = "jdbc:hsqldb:mem:lookupstrategytest"; sqlClassPathResource = ACL_SCHEMA_SQL_FILE; } @@ -59,21 +59,21 @@ public class BasicLookupStrategyTestsDbHelper { sqlClassPathResource = ACL_SCHEMA_SQL_FILE_WITH_ACL_CLASS_ID; } - dataSource = new SingleConnectionDataSource(connectionUrl, "sa", "", true); - dataSource.setDriverClassName("org.hsqldb.jdbcDriver"); - jdbcTemplate = new JdbcTemplate(dataSource); + this.dataSource = new SingleConnectionDataSource(connectionUrl, "sa", "", true); + this.dataSource.setDriverClassName("org.hsqldb.jdbcDriver"); + this.jdbcTemplate = new JdbcTemplate(this.dataSource); Resource resource = new ClassPathResource(sqlClassPathResource); String sql = new String(FileCopyUtils.copyToByteArray(resource.getInputStream())); - jdbcTemplate.execute(sql); + this.jdbcTemplate.execute(sql); } public JdbcTemplate getJdbcTemplate() { - return jdbcTemplate; + return this.jdbcTemplate; } public SingleConnectionDataSource getDataSource() { - return dataSource; + return this.dataSource; } } diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyWithAclClassTypeTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyWithAclClassTypeTests.java index f540a9e9ab..f4d80a3e72 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyWithAclClassTypeTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyWithAclClassTypeTests.java @@ -70,11 +70,11 @@ public class BasicLookupStrategyWithAclClassTypeTests extends AbstractBasicLooku @Before public void initializeBeans() { super.initializeBeans(); - uuidEnabledStrategy = new BasicLookupStrategy(getDataSource(), aclCache(), aclAuthStrategy(), + this.uuidEnabledStrategy = new BasicLookupStrategy(getDataSource(), aclCache(), aclAuthStrategy(), new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger())); - uuidEnabledStrategy.setPermissionFactory(new DefaultPermissionFactory()); - uuidEnabledStrategy.setAclClassIdSupported(true); - uuidEnabledStrategy.setConversionService(new DefaultConversionService()); + this.uuidEnabledStrategy.setPermissionFactory(new DefaultPermissionFactory()); + this.uuidEnabledStrategy.setAclClassIdSupported(true); + this.uuidEnabledStrategy.setConversionService(new DefaultConversionService()); } @Before @@ -93,7 +93,7 @@ public class BasicLookupStrategyWithAclClassTypeTests extends AbstractBasicLooku @Test public void testReadObjectIdentityUsingUuidType() { ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS_WITH_UUID, OBJECT_IDENTITY_UUID); - Map foundAcls = uuidEnabledStrategy.readAclsById(Arrays.asList(oid), + Map foundAcls = this.uuidEnabledStrategy.readAclsById(Arrays.asList(oid), Arrays.asList(BEN_SID)); Assert.assertEquals(1, foundAcls.size()); Assert.assertNotNull(foundAcls.get(oid)); @@ -102,7 +102,7 @@ public class BasicLookupStrategyWithAclClassTypeTests extends AbstractBasicLooku @Test public void testReadObjectIdentityUsingLongTypeWithConversionServiceEnabled() { ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, 100L); - Map foundAcls = uuidEnabledStrategy.readAclsById(Arrays.asList(oid), + Map foundAcls = this.uuidEnabledStrategy.readAclsById(Arrays.asList(oid), Arrays.asList(BEN_SID)); Assert.assertEquals(1, foundAcls.size()); Assert.assertNotNull(foundAcls.get(oid)); @@ -111,7 +111,7 @@ public class BasicLookupStrategyWithAclClassTypeTests extends AbstractBasicLooku @Test(expected = ConversionFailedException.class) public void testReadObjectIdentityUsingNonUuidInDatabase() { ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS_WITH_UUID, OBJECT_IDENTITY_LONG_AS_UUID); - uuidEnabledStrategy.readAclsById(Arrays.asList(oid), Arrays.asList(BEN_SID)); + this.uuidEnabledStrategy.readAclsById(Arrays.asList(oid), Arrays.asList(BEN_SID)); } } diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java index 008345bf25..d8a48ccf8b 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java @@ -78,7 +78,8 @@ public class EhCacheBasedAclCacheTests { @Before public void setup() { - myCache = new EhCacheBasedAclCache(cache, new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), + this.myCache = new EhCacheBasedAclCache(this.cache, + new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_USER"))); ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, 100L); @@ -86,7 +87,7 @@ public class EhCacheBasedAclCacheTests { new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL")); - acl = new AclImpl(identity, 1L, aclAuthorizationStrategy, new ConsoleAuditLogger()); + this.acl = new AclImpl(identity, 1L, aclAuthorizationStrategy, new ConsoleAuditLogger()); } @After @@ -104,7 +105,7 @@ public class EhCacheBasedAclCacheTests { public void methodsRejectNullParameters() { try { Serializable id = null; - myCache.evictFromCache(id); + this.myCache.evictFromCache(id); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -112,7 +113,7 @@ public class EhCacheBasedAclCacheTests { try { ObjectIdentity obj = null; - myCache.evictFromCache(obj); + this.myCache.evictFromCache(obj); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -120,7 +121,7 @@ public class EhCacheBasedAclCacheTests { try { Serializable id = null; - myCache.getFromCache(id); + this.myCache.getFromCache(id); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -128,7 +129,7 @@ public class EhCacheBasedAclCacheTests { try { ObjectIdentity obj = null; - myCache.getFromCache(obj); + this.myCache.getFromCache(obj); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -136,7 +137,7 @@ public class EhCacheBasedAclCacheTests { try { MutableAcl acl = null; - myCache.putInCache(acl); + this.myCache.putInCache(acl); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -150,7 +151,7 @@ public class EhCacheBasedAclCacheTests { File file = File.createTempFile("SEC_TEST", ".object"); FileOutputStream fos = new FileOutputStream(file); ObjectOutputStream oos = new ObjectOutputStream(fos); - oos.writeObject(acl); + oos.writeObject(this.acl); oos.close(); FileInputStream fis = new FileInputStream(file); @@ -158,7 +159,7 @@ public class EhCacheBasedAclCacheTests { MutableAcl retrieved = (MutableAcl) ois.readObject(); ois.close(); - assertThat(retrieved).isEqualTo(acl); + assertThat(retrieved).isEqualTo(this.acl); Object retrieved1 = FieldUtils.getProtectedFieldValue("aclAuthorizationStrategy", retrieved); assertThat(retrieved1).isNull(); @@ -169,20 +170,20 @@ public class EhCacheBasedAclCacheTests { @Test public void clearCache() { - myCache.clearCache(); + this.myCache.clearCache(); - verify(cache).removeAll(); + verify(this.cache).removeAll(); } @Test public void putInCache() { - myCache.putInCache(acl); + this.myCache.putInCache(this.acl); - verify(cache, times(2)).put(element.capture()); - assertThat(element.getValue().getKey()).isEqualTo(acl.getId()); - assertThat(element.getValue().getObjectValue()).isEqualTo(acl); - assertThat(element.getAllValues().get(0).getKey()).isEqualTo(acl.getObjectIdentity()); - assertThat(element.getAllValues().get(0).getObjectValue()).isEqualTo(acl); + verify(this.cache, times(2)).put(this.element.capture()); + assertThat(this.element.getValue().getKey()).isEqualTo(this.acl.getId()); + assertThat(this.element.getValue().getObjectValue()).isEqualTo(this.acl); + assertThat(this.element.getAllValues().get(0).getKey()).isEqualTo(this.acl.getObjectIdentity()); + assertThat(this.element.getAllValues().get(0).getObjectValue()).isEqualTo(this.acl); } @Test @@ -196,13 +197,13 @@ public class EhCacheBasedAclCacheTests { new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL")); MutableAcl parentAcl = new AclImpl(identityParent, 2L, aclAuthorizationStrategy, new ConsoleAuditLogger()); - acl.setParent(parentAcl); + this.acl.setParent(parentAcl); - myCache.putInCache(acl); + this.myCache.putInCache(this.acl); - verify(cache, times(4)).put(element.capture()); + verify(this.cache, times(4)).put(this.element.capture()); - List allValues = element.getAllValues(); + List allValues = this.element.getAllValues(); assertThat(allValues.get(0).getKey()).isEqualTo(parentAcl.getObjectIdentity()); assertThat(allValues.get(0).getObjectValue()).isEqualTo(parentAcl); @@ -210,30 +211,30 @@ public class EhCacheBasedAclCacheTests { assertThat(allValues.get(1).getKey()).isEqualTo(parentAcl.getId()); assertThat(allValues.get(1).getObjectValue()).isEqualTo(parentAcl); - assertThat(allValues.get(2).getKey()).isEqualTo(acl.getObjectIdentity()); - assertThat(allValues.get(2).getObjectValue()).isEqualTo(acl); + assertThat(allValues.get(2).getKey()).isEqualTo(this.acl.getObjectIdentity()); + assertThat(allValues.get(2).getObjectValue()).isEqualTo(this.acl); - assertThat(allValues.get(3).getKey()).isEqualTo(acl.getId()); - assertThat(allValues.get(3).getObjectValue()).isEqualTo(acl); + assertThat(allValues.get(3).getKey()).isEqualTo(this.acl.getId()); + assertThat(allValues.get(3).getObjectValue()).isEqualTo(this.acl); } @Test public void getFromCacheSerializable() { - when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl)); + when(this.cache.get(this.acl.getId())).thenReturn(new Element(this.acl.getId(), this.acl)); - assertThat(myCache.getFromCache(acl.getId())).isEqualTo(acl); + assertThat(this.myCache.getFromCache(this.acl.getId())).isEqualTo(this.acl); } @Test public void getFromCacheSerializablePopulatesTransient() { - when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl)); + when(this.cache.get(this.acl.getId())).thenReturn(new Element(this.acl.getId(), this.acl)); - myCache.putInCache(acl); + this.myCache.putInCache(this.acl); - ReflectionTestUtils.setField(acl, "permissionGrantingStrategy", null); - ReflectionTestUtils.setField(acl, "aclAuthorizationStrategy", null); + ReflectionTestUtils.setField(this.acl, "permissionGrantingStrategy", null); + ReflectionTestUtils.setField(this.acl, "aclAuthorizationStrategy", null); - MutableAcl fromCache = myCache.getFromCache(acl.getId()); + MutableAcl fromCache = this.myCache.getFromCache(this.acl.getId()); assertThat(ReflectionTestUtils.getField(fromCache, "aclAuthorizationStrategy")).isNotNull(); assertThat(ReflectionTestUtils.getField(fromCache, "permissionGrantingStrategy")).isNotNull(); @@ -241,21 +242,21 @@ public class EhCacheBasedAclCacheTests { @Test public void getFromCacheObjectIdentity() { - when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl)); + when(this.cache.get(this.acl.getId())).thenReturn(new Element(this.acl.getId(), this.acl)); - assertThat(myCache.getFromCache(acl.getId())).isEqualTo(acl); + assertThat(this.myCache.getFromCache(this.acl.getId())).isEqualTo(this.acl); } @Test public void getFromCacheObjectIdentityPopulatesTransient() { - when(cache.get(acl.getObjectIdentity())).thenReturn(new Element(acl.getId(), acl)); + when(this.cache.get(this.acl.getObjectIdentity())).thenReturn(new Element(this.acl.getId(), this.acl)); - myCache.putInCache(acl); + this.myCache.putInCache(this.acl); - ReflectionTestUtils.setField(acl, "permissionGrantingStrategy", null); - ReflectionTestUtils.setField(acl, "aclAuthorizationStrategy", null); + ReflectionTestUtils.setField(this.acl, "permissionGrantingStrategy", null); + ReflectionTestUtils.setField(this.acl, "aclAuthorizationStrategy", null); - MutableAcl fromCache = myCache.getFromCache(acl.getObjectIdentity()); + MutableAcl fromCache = this.myCache.getFromCache(this.acl.getObjectIdentity()); assertThat(ReflectionTestUtils.getField(fromCache, "aclAuthorizationStrategy")).isNotNull(); assertThat(ReflectionTestUtils.getField(fromCache, "permissionGrantingStrategy")).isNotNull(); @@ -263,22 +264,22 @@ public class EhCacheBasedAclCacheTests { @Test public void evictCacheSerializable() { - when(cache.get(acl.getObjectIdentity())).thenReturn(new Element(acl.getId(), acl)); + when(this.cache.get(this.acl.getObjectIdentity())).thenReturn(new Element(this.acl.getId(), this.acl)); - myCache.evictFromCache(acl.getObjectIdentity()); + this.myCache.evictFromCache(this.acl.getObjectIdentity()); - verify(cache).remove(acl.getId()); - verify(cache).remove(acl.getObjectIdentity()); + verify(this.cache).remove(this.acl.getId()); + verify(this.cache).remove(this.acl.getObjectIdentity()); } @Test public void evictCacheObjectIdentity() { - when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl)); + when(this.cache.get(this.acl.getId())).thenReturn(new Element(this.acl.getId(), this.acl)); - myCache.evictFromCache(acl.getId()); + this.myCache.evictFromCache(this.acl.getId()); - verify(cache).remove(acl.getId()); - verify(cache).remove(acl.getObjectIdentity()); + verify(this.cache).remove(this.acl.getId()); + verify(this.cache).remove(this.acl.getObjectIdentity()); } } diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java index 3176a54592..a6e7ac36ce 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java @@ -74,30 +74,30 @@ public class JdbcAclServiceTests { @Before public void setUp() { - aclService = new JdbcAclService(jdbcOperations, lookupStrategy); - aclServiceIntegration = new JdbcAclService(embeddedDatabase, lookupStrategy); + this.aclService = new JdbcAclService(this.jdbcOperations, this.lookupStrategy); + this.aclServiceIntegration = new JdbcAclService(this.embeddedDatabase, this.lookupStrategy); } @Before public void setUpEmbeddedDatabase() { - embeddedDatabase = new EmbeddedDatabaseBuilder()// + this.embeddedDatabase = new EmbeddedDatabaseBuilder()// .addScript("createAclSchemaWithAclClassIdType.sql").addScript("db/sql/test_data_hierarchy.sql").build(); } @After public void tearDownEmbeddedDatabase() { - embeddedDatabase.shutdown(); + this.embeddedDatabase.shutdown(); } // SEC-1898 @Test(expected = NotFoundException.class) public void readAclByIdMissingAcl() { Map result = new HashMap<>(); - when(lookupStrategy.readAclsById(anyList(), anyList())).thenReturn(result); + when(this.lookupStrategy.readAclsById(anyList(), anyList())).thenReturn(result); ObjectIdentity objectIdentity = new ObjectIdentityImpl(Object.class, 1); List sids = Arrays.asList(new PrincipalSid("user")); - aclService.readAclById(objectIdentity, sids); + this.aclService.readAclById(objectIdentity, sids); } @Test @@ -105,10 +105,10 @@ public class JdbcAclServiceTests { List result = new ArrayList<>(); result.add(new ObjectIdentityImpl(Object.class, "5577")); Object[] args = { "1", "org.springframework.security.acls.jdbc.JdbcAclServiceTests$MockLongIdDomainObject" }; - when(jdbcOperations.query(anyString(), aryEq(args), any(RowMapper.class))).thenReturn(result); + when(this.jdbcOperations.query(anyString(), aryEq(args), any(RowMapper.class))).thenReturn(result); ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 1L); - List objectIdentities = aclService.findChildren(objectIdentity); + List objectIdentities = this.aclService.findChildren(objectIdentity); assertThat(objectIdentities.size()).isEqualTo(1); assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("5577"); } @@ -117,7 +117,7 @@ public class JdbcAclServiceTests { public void findNoChildren() { ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 1L); - List objectIdentities = aclService.findChildren(objectIdentity); + List objectIdentities = this.aclService.findChildren(objectIdentity); assertThat(objectIdentities).isNull(); } @@ -125,7 +125,7 @@ public class JdbcAclServiceTests { public void findChildrenWithoutIdType() { ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 4711L); - List objectIdentities = aclServiceIntegration.findChildren(objectIdentity); + List objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity); assertThat(objectIdentities.size()).isEqualTo(1); assertThat(objectIdentities.get(0).getType()).isEqualTo(MockUntypedIdDomainObject.class.getName()); assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo(5000L); @@ -135,7 +135,7 @@ public class JdbcAclServiceTests { public void findChildrenForUnknownObject() { ObjectIdentity objectIdentity = new ObjectIdentityImpl(Object.class, 33); - List objectIdentities = aclServiceIntegration.findChildren(objectIdentity); + List objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity); assertThat(objectIdentities).isNull(); } @@ -143,7 +143,7 @@ public class JdbcAclServiceTests { public void findChildrenOfIdTypeLong() { ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US-PAL"); - List objectIdentities = aclServiceIntegration.findChildren(objectIdentity); + List objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity); assertThat(objectIdentities.size()).isEqualTo(2); assertThat(objectIdentities.get(0).getType()).isEqualTo(MockLongIdDomainObject.class.getName()); assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo(4711L); @@ -155,8 +155,8 @@ public class JdbcAclServiceTests { public void findChildrenOfIdTypeString() { ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US"); - aclServiceIntegration.setAclClassIdSupported(true); - List objectIdentities = aclServiceIntegration.findChildren(objectIdentity); + this.aclServiceIntegration.setAclClassIdSupported(true); + List objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity); assertThat(objectIdentities.size()).isEqualTo(1); assertThat(objectIdentities.get(0).getType()).isEqualTo("location"); assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("US-PAL"); @@ -166,8 +166,8 @@ public class JdbcAclServiceTests { public void findChildrenOfIdTypeUUID() { ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockUntypedIdDomainObject.class, 5000L); - aclServiceIntegration.setAclClassIdSupported(true); - List objectIdentities = aclServiceIntegration.findChildren(objectIdentity); + this.aclServiceIntegration.setAclClassIdSupported(true); + List objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity); assertThat(objectIdentities.size()).isEqualTo(1); assertThat(objectIdentities.get(0).getType()).isEqualTo("costcenter"); assertThat(objectIdentities.get(0).getIdentifier()) @@ -179,7 +179,7 @@ public class JdbcAclServiceTests { private Object id; public Object getId() { - return id; + return this.id; } public void setId(Object id) { @@ -193,7 +193,7 @@ public class JdbcAclServiceTests { private Object id; public Object getId() { - return id; + return this.id; } public void setId(Object id) { diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java index bab5a11958..b4eb501350 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java @@ -99,15 +99,15 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin } protected ObjectIdentity getTopParentOid() { - return topParentOid; + return this.topParentOid; } protected ObjectIdentity getMiddleParentOid() { - return middleParentOid; + return this.middleParentOid; } protected ObjectIdentity getChildOid() { - return childOid; + return this.childOid; } protected String getTargetClass() { @@ -117,7 +117,7 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @BeforeTransaction public void createTables() throws Exception { try { - new DatabaseSeeder(dataSource, new ClassPathResource(getSqlClassPathResource())); + new DatabaseSeeder(this.dataSource, new ClassPathResource(getSqlClassPathResource())); // new DatabaseSeeder(dataSource, new // ClassPathResource("createAclSchemaPostgres.sql")); } @@ -130,39 +130,39 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @AfterTransaction public void clearContextAndData() { SecurityContextHolder.clearContext(); - jdbcTemplate.execute("drop table acl_entry"); - jdbcTemplate.execute("drop table acl_object_identity"); - jdbcTemplate.execute("drop table acl_class"); - jdbcTemplate.execute("drop table acl_sid"); - aclCache.clearCache(); + this.jdbcTemplate.execute("drop table acl_entry"); + this.jdbcTemplate.execute("drop table acl_object_identity"); + this.jdbcTemplate.execute("drop table acl_class"); + this.jdbcTemplate.execute("drop table acl_sid"); + this.aclCache.clearCache(); } @Test @Transactional public void testLifecycle() { - SecurityContextHolder.getContext().setAuthentication(auth); + SecurityContextHolder.getContext().setAuthentication(this.auth); - MutableAcl topParent = jdbcMutableAclService.createAcl(getTopParentOid()); - MutableAcl middleParent = jdbcMutableAclService.createAcl(getMiddleParentOid()); - MutableAcl child = jdbcMutableAclService.createAcl(getChildOid()); + MutableAcl topParent = this.jdbcMutableAclService.createAcl(getTopParentOid()); + MutableAcl middleParent = this.jdbcMutableAclService.createAcl(getMiddleParentOid()); + MutableAcl child = this.jdbcMutableAclService.createAcl(getChildOid()); // Specify the inheritance hierarchy middleParent.setParent(topParent); child.setParent(middleParent); // Now let's add a couple of permissions - topParent.insertAce(0, BasePermission.READ, new PrincipalSid(auth), true); - topParent.insertAce(1, BasePermission.WRITE, new PrincipalSid(auth), false); - middleParent.insertAce(0, BasePermission.DELETE, new PrincipalSid(auth), true); - child.insertAce(0, BasePermission.DELETE, new PrincipalSid(auth), false); + topParent.insertAce(0, BasePermission.READ, new PrincipalSid(this.auth), true); + topParent.insertAce(1, BasePermission.WRITE, new PrincipalSid(this.auth), false); + middleParent.insertAce(0, BasePermission.DELETE, new PrincipalSid(this.auth), true); + child.insertAce(0, BasePermission.DELETE, new PrincipalSid(this.auth), false); // Explicitly save the changed ACL - jdbcMutableAclService.updateAcl(topParent); - jdbcMutableAclService.updateAcl(middleParent); - jdbcMutableAclService.updateAcl(child); + this.jdbcMutableAclService.updateAcl(topParent); + this.jdbcMutableAclService.updateAcl(middleParent); + this.jdbcMutableAclService.updateAcl(child); // Let's check if we can read them back correctly - Map map = jdbcMutableAclService + Map map = this.jdbcMutableAclService .readAclsById(Arrays.asList(getTopParentOid(), getMiddleParentOid(), getChildOid())); assertThat(map).hasSize(3); @@ -190,7 +190,7 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin List read = Arrays.asList(BasePermission.READ); List write = Arrays.asList(BasePermission.WRITE); List delete = Arrays.asList(BasePermission.DELETE); - List pSid = Arrays.asList((Sid) new PrincipalSid(auth)); + List pSid = Arrays.asList((Sid) new PrincipalSid(this.auth)); assertThat(topParent.isGranted(read, pSid, false)).isTrue(); assertThat(topParent.isGranted(write, pSid, false)).isFalse(); @@ -212,8 +212,8 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin // Next change the child so it doesn't inherit permissions from above child.setEntriesInheriting(false); - jdbcMutableAclService.updateAcl(child); - child = (MutableAcl) jdbcMutableAclService.readAclById(getChildOid()); + this.jdbcMutableAclService.updateAcl(child); + child = (MutableAcl) this.jdbcMutableAclService.readAclById(getChildOid()); assertThat(child.isEntriesInheriting()).isFalse(); // Check the child permissions no longer inherit @@ -237,14 +237,14 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin // Let's add an identical permission to the child, but it'll appear AFTER the // current permission, so has no impact - child.insertAce(1, BasePermission.DELETE, new PrincipalSid(auth), true); + child.insertAce(1, BasePermission.DELETE, new PrincipalSid(this.auth), true); // Let's also add another permission to the child - child.insertAce(2, BasePermission.CREATE, new PrincipalSid(auth), true); + child.insertAce(2, BasePermission.CREATE, new PrincipalSid(this.auth), true); // Save the changed child - jdbcMutableAclService.updateAcl(child); - child = (MutableAcl) jdbcMutableAclService.readAclById(getChildOid()); + this.jdbcMutableAclService.updateAcl(child); + child = (MutableAcl) this.jdbcMutableAclService.readAclById(getChildOid()); assertThat(child.getEntries()).hasSize(3); // Output permissions @@ -262,7 +262,7 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin // non-granting AccessControlEntry entry = child.getEntries().get(0); assertThat(entry.getPermission().getMask()).isEqualTo(BasePermission.DELETE.getMask()); - assertThat(entry.getSid()).isEqualTo(new PrincipalSid(auth)); + assertThat(entry.getSid()).isEqualTo(new PrincipalSid(this.auth)); assertThat(entry.isGranting()).isFalse(); assertThat(entry.getId()).isNotNull(); @@ -270,7 +270,7 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin child.deleteAce(0); // Save and check it worked - child = jdbcMutableAclService.updateAcl(child); + child = this.jdbcMutableAclService.updateAcl(child); assertThat(child.getEntries()).hasSize(2); assertThat(child.isGranted(delete, pSid, false)).isTrue(); @@ -283,38 +283,38 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @Test @Transactional public void deleteAclAlsoDeletesChildren() { - SecurityContextHolder.getContext().setAuthentication(auth); + SecurityContextHolder.getContext().setAuthentication(this.auth); - jdbcMutableAclService.createAcl(getTopParentOid()); - MutableAcl middleParent = jdbcMutableAclService.createAcl(getMiddleParentOid()); - MutableAcl child = jdbcMutableAclService.createAcl(getChildOid()); + this.jdbcMutableAclService.createAcl(getTopParentOid()); + MutableAcl middleParent = this.jdbcMutableAclService.createAcl(getMiddleParentOid()); + MutableAcl child = this.jdbcMutableAclService.createAcl(getChildOid()); child.setParent(middleParent); - jdbcMutableAclService.updateAcl(middleParent); - jdbcMutableAclService.updateAcl(child); + this.jdbcMutableAclService.updateAcl(middleParent); + this.jdbcMutableAclService.updateAcl(child); // Check the childOid really is a child of middleParentOid - Acl childAcl = jdbcMutableAclService.readAclById(getChildOid()); + Acl childAcl = this.jdbcMutableAclService.readAclById(getChildOid()); assertThat(childAcl.getParentAcl().getObjectIdentity()).isEqualTo(getMiddleParentOid()); // Delete the mid-parent and test if the child was deleted, as well - jdbcMutableAclService.deleteAcl(getMiddleParentOid(), true); + this.jdbcMutableAclService.deleteAcl(getMiddleParentOid(), true); try { - jdbcMutableAclService.readAclById(getMiddleParentOid()); + this.jdbcMutableAclService.readAclById(getMiddleParentOid()); fail("It should have thrown NotFoundException"); } catch (NotFoundException expected) { } try { - jdbcMutableAclService.readAclById(getChildOid()); + this.jdbcMutableAclService.readAclById(getChildOid()); fail("It should have thrown NotFoundException"); } catch (NotFoundException expected) { } - Acl acl = jdbcMutableAclService.readAclById(getTopParentOid()); + Acl acl = this.jdbcMutableAclService.readAclById(getTopParentOid()); assertThat(acl).isNotNull(); assertThat(getTopParentOid()).isEqualTo(acl.getObjectIdentity()); } @@ -322,21 +322,21 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @Test public void constructorRejectsNullParameters() { try { - new JdbcMutableAclService(null, lookupStrategy, aclCache); + new JdbcMutableAclService(null, this.lookupStrategy, this.aclCache); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { } try { - new JdbcMutableAclService(dataSource, null, aclCache); + new JdbcMutableAclService(this.dataSource, null, this.aclCache); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { } try { - new JdbcMutableAclService(dataSource, lookupStrategy, null); + new JdbcMutableAclService(this.dataSource, this.lookupStrategy, null); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -346,7 +346,7 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @Test public void createAclRejectsNullParameter() { try { - jdbcMutableAclService.createAcl(null); + this.jdbcMutableAclService.createAcl(null); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -356,12 +356,12 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @Test @Transactional public void createAclForADuplicateDomainObject() { - SecurityContextHolder.getContext().setAuthentication(auth); + SecurityContextHolder.getContext().setAuthentication(this.auth); ObjectIdentity duplicateOid = new ObjectIdentityImpl(TARGET_CLASS, 100L); - jdbcMutableAclService.createAcl(duplicateOid); + this.jdbcMutableAclService.createAcl(duplicateOid); // Try to add the same object second time try { - jdbcMutableAclService.createAcl(duplicateOid); + this.jdbcMutableAclService.createAcl(duplicateOid); fail("It should have thrown AlreadyExistsException"); } catch (AlreadyExistsException expected) { @@ -372,7 +372,7 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @Transactional public void deleteAclRejectsNullParameters() { try { - jdbcMutableAclService.deleteAcl(null, true); + this.jdbcMutableAclService.deleteAcl(null, true); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -382,25 +382,25 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @Test @Transactional public void deleteAclWithChildrenThrowsException() { - SecurityContextHolder.getContext().setAuthentication(auth); - MutableAcl parent = jdbcMutableAclService.createAcl(getTopParentOid()); - MutableAcl child = jdbcMutableAclService.createAcl(getMiddleParentOid()); + SecurityContextHolder.getContext().setAuthentication(this.auth); + MutableAcl parent = this.jdbcMutableAclService.createAcl(getTopParentOid()); + MutableAcl child = this.jdbcMutableAclService.createAcl(getMiddleParentOid()); // Specify the inheritance hierarchy child.setParent(parent); - jdbcMutableAclService.updateAcl(child); + this.jdbcMutableAclService.updateAcl(child); try { - jdbcMutableAclService.setForeignKeysInDatabase(false); // switch on FK + this.jdbcMutableAclService.setForeignKeysInDatabase(false); // switch on FK // checking in the // class, not database - jdbcMutableAclService.deleteAcl(getTopParentOid(), false); + this.jdbcMutableAclService.deleteAcl(getTopParentOid(), false); fail("It should have thrown ChildrenExistException"); } catch (ChildrenExistException expected) { } finally { - jdbcMutableAclService.setForeignKeysInDatabase(true); // restore to the + this.jdbcMutableAclService.setForeignKeysInDatabase(true); // restore to the // default } } @@ -408,31 +408,31 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @Test @Transactional public void deleteAclRemovesRowsFromDatabase() { - SecurityContextHolder.getContext().setAuthentication(auth); - MutableAcl child = jdbcMutableAclService.createAcl(getChildOid()); - child.insertAce(0, BasePermission.DELETE, new PrincipalSid(auth), false); - jdbcMutableAclService.updateAcl(child); + SecurityContextHolder.getContext().setAuthentication(this.auth); + MutableAcl child = this.jdbcMutableAclService.createAcl(getChildOid()); + child.insertAce(0, BasePermission.DELETE, new PrincipalSid(this.auth), false); + this.jdbcMutableAclService.updateAcl(child); // Remove the child and check all related database rows were removed accordingly - jdbcMutableAclService.deleteAcl(getChildOid(), false); - assertThat(jdbcTemplate.queryForList(SELECT_ALL_CLASSES, new Object[] { getTargetClass() })).hasSize(1); - assertThat(jdbcTemplate.queryForList("select * from acl_object_identity")).isEmpty(); - assertThat(jdbcTemplate.queryForList("select * from acl_entry")).isEmpty(); + this.jdbcMutableAclService.deleteAcl(getChildOid(), false); + assertThat(this.jdbcTemplate.queryForList(SELECT_ALL_CLASSES, new Object[] { getTargetClass() })).hasSize(1); + assertThat(this.jdbcTemplate.queryForList("select * from acl_object_identity")).isEmpty(); + assertThat(this.jdbcTemplate.queryForList("select * from acl_entry")).isEmpty(); // Check the cache - assertThat(aclCache.getFromCache(getChildOid())).isNull(); - assertThat(aclCache.getFromCache(102L)).isNull(); + assertThat(this.aclCache.getFromCache(getChildOid())).isNull(); + assertThat(this.aclCache.getFromCache(102L)).isNull(); } /** SEC-1107 */ @Test @Transactional public void identityWithIntegerIdIsSupportedByCreateAcl() { - SecurityContextHolder.getContext().setAuthentication(auth); + SecurityContextHolder.getContext().setAuthentication(this.auth); ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, 101); - jdbcMutableAclService.createAcl(oid); + this.jdbcMutableAclService.createAcl(oid); - assertThat(jdbcMutableAclService.readAclById(new ObjectIdentityImpl(TARGET_CLASS, 101L))).isNotNull(); + assertThat(this.jdbcMutableAclService.readAclById(new ObjectIdentityImpl(TARGET_CLASS, 101L))).isNotNull(); } /** @@ -448,21 +448,21 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin ObjectIdentity parentOid = new ObjectIdentityImpl(TARGET_CLASS, 104L); ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, 105L); - MutableAcl parent = jdbcMutableAclService.createAcl(parentOid); - MutableAcl child = jdbcMutableAclService.createAcl(childOid); + MutableAcl parent = this.jdbcMutableAclService.createAcl(parentOid); + MutableAcl child = this.jdbcMutableAclService.createAcl(childOid); child.setParent(parent); - jdbcMutableAclService.updateAcl(child); + this.jdbcMutableAclService.updateAcl(child); - parent = (AclImpl) jdbcMutableAclService.readAclById(parentOid); + parent = (AclImpl) this.jdbcMutableAclService.readAclById(parentOid); parent.insertAce(0, BasePermission.READ, new PrincipalSid("ben"), true); - jdbcMutableAclService.updateAcl(parent); + this.jdbcMutableAclService.updateAcl(parent); - parent = (AclImpl) jdbcMutableAclService.readAclById(parentOid); + parent = (AclImpl) this.jdbcMutableAclService.readAclById(parentOid); parent.insertAce(1, BasePermission.READ, new PrincipalSid("scott"), true); - jdbcMutableAclService.updateAcl(parent); + this.jdbcMutableAclService.updateAcl(parent); - child = (MutableAcl) jdbcMutableAclService.readAclById(childOid); + child = (MutableAcl) this.jdbcMutableAclService.readAclById(childOid); parent = (MutableAcl) child.getParentAcl(); assertThat(parent.getEntries()).hasSize(2) @@ -483,18 +483,18 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin SecurityContextHolder.getContext().setAuthentication(auth); ObjectIdentityImpl rootObject = new ObjectIdentityImpl(TARGET_CLASS, 1L); - MutableAcl parent = jdbcMutableAclService.createAcl(rootObject); - MutableAcl child = jdbcMutableAclService.createAcl(new ObjectIdentityImpl(TARGET_CLASS, 2L)); + MutableAcl parent = this.jdbcMutableAclService.createAcl(rootObject); + MutableAcl child = this.jdbcMutableAclService.createAcl(new ObjectIdentityImpl(TARGET_CLASS, 2L)); child.setParent(parent); - jdbcMutableAclService.updateAcl(child); + this.jdbcMutableAclService.updateAcl(child); parent.insertAce(0, BasePermission.ADMINISTRATION, new GrantedAuthoritySid("ROLE_ADMINISTRATOR"), true); - jdbcMutableAclService.updateAcl(parent); + this.jdbcMutableAclService.updateAcl(parent); parent.insertAce(1, BasePermission.DELETE, new PrincipalSid("terry"), true); - jdbcMutableAclService.updateAcl(parent); + this.jdbcMutableAclService.updateAcl(parent); - child = (MutableAcl) jdbcMutableAclService.readAclById(new ObjectIdentityImpl(TARGET_CLASS, 2L)); + child = (MutableAcl) this.jdbcMutableAclService.readAclById(new ObjectIdentityImpl(TARGET_CLASS, 2L)); parent = (MutableAcl) child.getParentAcl(); @@ -513,7 +513,7 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin SecurityContextHolder.getContext().setAuthentication(auth); ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, 110L); - MutableAcl topParent = jdbcMutableAclService.createAcl(topParentOid); + MutableAcl topParent = this.jdbcMutableAclService.createAcl(topParentOid); // Add an ACE permission entry Permission cm = new CumulativePermission().set(BasePermission.READ).set(BasePermission.ADMINISTRATION); @@ -523,7 +523,7 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin assertThat(topParent.getEntries()).hasSize(1); // Explicitly save the changed ACL - topParent = jdbcMutableAclService.updateAcl(topParent); + topParent = this.jdbcMutableAclService.updateAcl(topParent); // Check the mask was retrieved correctly assertThat(topParent.getEntries().get(0).getPermission().getMask()).isEqualTo(17); @@ -535,7 +535,7 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin @Test public void testProcessingCustomSid() { CustomJdbcMutableAclService customJdbcMutableAclService = spy( - new CustomJdbcMutableAclService(dataSource, lookupStrategy, aclCache)); + new CustomJdbcMutableAclService(this.dataSource, this.lookupStrategy, this.aclCache)); CustomSid customSid = new CustomSid("Custom sid"); when(customJdbcMutableAclService.createOrRetrieveSidPrimaryKey("Custom sid", false, false)).thenReturn(1L); @@ -574,11 +574,11 @@ public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4Sprin } protected Authentication getAuth() { - return auth; + return this.auth; } protected JdbcMutableAclService getJdbcMutableAclService() { - return jdbcMutableAclService; + return this.jdbcMutableAclService; } } diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTestsWithAclClassId.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTestsWithAclClassId.java index 2a822ce95f..a0c990fe74 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTestsWithAclClassId.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTestsWithAclClassId.java @@ -52,17 +52,17 @@ public class JdbcMutableAclServiceTestsWithAclClassId extends JdbcMutableAclServ @Override protected ObjectIdentity getTopParentOid() { - return topParentOid; + return this.topParentOid; } @Override protected ObjectIdentity getMiddleParentOid() { - return middleParentOid; + return this.middleParentOid; } @Override protected ObjectIdentity getChildOid() { - return childOid; + return this.childOid; } @Override diff --git a/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java b/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java index c872258518..ab947c00e6 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java @@ -31,7 +31,7 @@ public class CustomSid implements Sid { } public String getSid() { - return sid; + return this.sid; } public void setSid(String sid) { diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java index a992aea93f..2202be86ea 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java @@ -48,7 +48,7 @@ public class SidRetrievalStrategyTests { @Test public void correctSidsAreRetrieved() { SidRetrievalStrategy retrStrategy = new SidRetrievalStrategyImpl(); - List sids = retrStrategy.getSids(authentication); + List sids = retrStrategy.getSids(this.authentication); assertThat(sids).isNotNull(); assertThat(sids).hasSize(4); @@ -72,7 +72,7 @@ public class SidRetrievalStrategyTests { when(rh.getReachableGrantedAuthorities(anyCollection())).thenReturn(rhAuthorities); SidRetrievalStrategy strat = new SidRetrievalStrategyImpl(rh); - List sids = strat.getSids(authentication); + List sids = strat.getSids(this.authentication); assertThat(sids).hasSize(2); assertThat(sids.get(0)).isNotNull(); assertThat(sids.get(0) instanceof PrincipalSid).isTrue(); diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java index 3087cf5372..7cf9bad483 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java @@ -249,7 +249,7 @@ public class SidTests { @Override public String getName() { - return principal.getName(); + return this.principal.getName(); } } @@ -263,7 +263,7 @@ public class SidTests { } String getName() { - return name; + return this.name; } } diff --git a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java index 4a9b5456f0..6a6422d6c7 100644 --- a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java +++ b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java @@ -75,15 +75,15 @@ public class AnnotationSecurityAspectTests { @Before public final void setUp() { MockitoAnnotations.initMocks(this); - interceptor = new AspectJMethodSecurityInterceptor(); + this.interceptor = new AspectJMethodSecurityInterceptor(); AccessDecisionVoter[] voters = new AccessDecisionVoter[] { new RoleVoter(), new PreInvocationAuthorizationAdviceVoter(new ExpressionBasedPreInvocationAdvice()) }; - adm = new AffirmativeBased(Arrays.>asList(voters)); - interceptor.setAccessDecisionManager(adm); - interceptor.setAuthenticationManager(authman); - interceptor.setSecurityMetadataSource(new SecuredAnnotationSecurityMetadataSource()); + this.adm = new AffirmativeBased(Arrays.>asList(voters)); + this.interceptor.setAccessDecisionManager(this.adm); + this.interceptor.setAuthenticationManager(this.authman); + this.interceptor.setSecurityMetadataSource(new SecuredAnnotationSecurityMetadataSource()); AnnotationSecurityAspect secAspect = AnnotationSecurityAspect.aspectOf(); - secAspect.setSecurityInterceptor(interceptor); + secAspect.setSecurityInterceptor(this.interceptor); } @After @@ -93,59 +93,59 @@ public class AnnotationSecurityAspectTests { @Test public void securedInterfaceMethodAllowsAllAccess() { - secured.securedMethod(); + this.secured.securedMethod(); } @Test(expected = AuthenticationCredentialsNotFoundException.class) public void securedClassMethodDeniesUnauthenticatedAccess() { - secured.securedClassMethod(); + this.secured.securedClassMethod(); } @Test public void securedClassMethodAllowsAccessToRoleA() { - SecurityContextHolder.getContext().setAuthentication(anne); - secured.securedClassMethod(); + SecurityContextHolder.getContext().setAuthentication(this.anne); + this.secured.securedClassMethod(); } @Test(expected = AccessDeniedException.class) public void internalPrivateCallIsIntercepted() { - SecurityContextHolder.getContext().setAuthentication(anne); + SecurityContextHolder.getContext().setAuthentication(this.anne); try { - secured.publicCallsPrivate(); + this.secured.publicCallsPrivate(); fail("Expected AccessDeniedException"); } catch (AccessDeniedException expected) { } - securedSub.publicCallsPrivate(); + this.securedSub.publicCallsPrivate(); } @Test(expected = AccessDeniedException.class) public void protectedMethodIsIntercepted() { - SecurityContextHolder.getContext().setAuthentication(anne); + SecurityContextHolder.getContext().setAuthentication(this.anne); - secured.protectedMethod(); + this.secured.protectedMethod(); } @Test public void overriddenProtectedMethodIsNotIntercepted() { // AspectJ doesn't inherit annotations - securedSub.protectedMethod(); + this.securedSub.protectedMethod(); } // SEC-1262 @Test(expected = AccessDeniedException.class) public void denyAllPreAuthorizeDeniesAccess() { configureForElAnnotations(); - SecurityContextHolder.getContext().setAuthentication(anne); - prePostSecured.denyAllMethod(); + SecurityContextHolder.getContext().setAuthentication(this.anne); + this.prePostSecured.denyAllMethod(); } @Test public void postFilterIsApplied() { configureForElAnnotations(); - SecurityContextHolder.getContext().setAuthentication(anne); - List objects = prePostSecured.postFilterMethod(); + SecurityContextHolder.getContext().setAuthentication(this.anne); + List objects = this.prePostSecured.postFilterMethod(); assertThat(objects).hasSize(2); assertThat(objects.contains("apple")).isTrue(); assertThat(objects.contains("aubergine")).isTrue(); @@ -153,12 +153,12 @@ public class AnnotationSecurityAspectTests { private void configureForElAnnotations() { DefaultMethodSecurityExpressionHandler eh = new DefaultMethodSecurityExpressionHandler(); - interceptor.setSecurityMetadataSource( + this.interceptor.setSecurityMetadataSource( new PrePostAnnotationSecurityMetadataSource(new ExpressionBasedAnnotationAttributeFactory(eh))); - interceptor.setAccessDecisionManager(adm); + this.interceptor.setAccessDecisionManager(this.adm); AfterInvocationProviderManager aim = new AfterInvocationProviderManager(); aim.setProviders(Arrays.asList(new PostInvocationAdviceProvider(new ExpressionBasedPostInvocationAdvice(eh)))); - interceptor.setAfterInvocationManager(aim); + this.interceptor.setAfterInvocationManager(aim); } } diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java index d08fdf3066..f44403e829 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java @@ -164,7 +164,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen } public UserDetails getUserDetails() { - return userDetails; + return this.userDetails; } @Override diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java index 19b0f6012c..c0bd4cdac0 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java @@ -37,11 +37,11 @@ public class EhCacheBasedTicketCache implements StatelessTicketCache, Initializi private Ehcache cache; public void afterPropertiesSet() { - Assert.notNull(cache, "cache mandatory"); + Assert.notNull(this.cache, "cache mandatory"); } public CasAuthenticationToken getByTicketId(final String serviceTicket) { - final Element element = cache.get(serviceTicket); + final Element element = this.cache.get(serviceTicket); if (logger.isDebugEnabled()) { logger.debug("Cache hit: " + (element != null) + "; service ticket: " + serviceTicket); @@ -51,7 +51,7 @@ public class EhCacheBasedTicketCache implements StatelessTicketCache, Initializi } public Ehcache getCache() { - return cache; + return this.cache; } public void putTicketInCache(final CasAuthenticationToken token) { @@ -61,7 +61,7 @@ public class EhCacheBasedTicketCache implements StatelessTicketCache, Initializi logger.debug("Cache put: " + element.getKey()); } - cache.put(element); + this.cache.put(element); } public void removeTicketFromCache(final CasAuthenticationToken token) { @@ -73,7 +73,7 @@ public class EhCacheBasedTicketCache implements StatelessTicketCache, Initializi } public void removeTicketFromCache(final String serviceTicket) { - cache.remove(serviceTicket); + this.cache.remove(serviceTicket); } public void setCache(final Ehcache cache) { diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java index 0c0ea3245e..28dcd5e291 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java @@ -40,7 +40,7 @@ public class SpringCacheBasedTicketCache implements StatelessTicketCache { } public CasAuthenticationToken getByTicketId(final String serviceTicket) { - final Cache.ValueWrapper element = serviceTicket != null ? cache.get(serviceTicket) : null; + final Cache.ValueWrapper element = serviceTicket != null ? this.cache.get(serviceTicket) : null; if (logger.isDebugEnabled()) { logger.debug("Cache hit: " + (element != null) + "; service ticket: " + serviceTicket); @@ -56,7 +56,7 @@ public class SpringCacheBasedTicketCache implements StatelessTicketCache { logger.debug("Cache put: " + key); } - cache.put(key, token); + this.cache.put(key, token); } public void removeTicketFromCache(final CasAuthenticationToken token) { @@ -68,7 +68,7 @@ public class SpringCacheBasedTicketCache implements StatelessTicketCache { } public void removeTicketFromCache(final String serviceTicket) { - cache.evict(serviceTicket); + this.cache.evict(serviceTicket); } } diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java index e6fb1657dc..e7666a1cdd 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java +++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java @@ -217,15 +217,15 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil return; } - if (logger.isDebugEnabled()) { - logger.debug("Authentication success. Updating SecurityContextHolder to contain: " + authResult); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Authentication success. Updating SecurityContextHolder to contain: " + authResult); } SecurityContextHolder.getContext().setAuthentication(authResult); // Fire event if (this.eventPublisher != null) { - eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass())); + this.eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass())); } chain.doFilter(request, response); @@ -237,7 +237,7 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil // if the request is a proxy request process it and return null to indicate the // request has been processed if (proxyReceptorRequest(request)) { - logger.debug("Responding to proxy receptor request"); + this.logger.debug("Responding to proxy receptor request"); CommonUtils.readAndRespondToProxyReceptorRequest(request, response, this.proxyGrantingTicketStorage); return null; } @@ -247,14 +247,14 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil String password = obtainArtifact(request); if (password == null) { - logger.debug("Failed to obtain an artifact (cas ticket)"); + this.logger.debug("Failed to obtain an artifact (cas ticket)"); password = ""; } final UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(username, password); - authRequest.setDetails(authenticationDetailsSource.buildDetails(request)); + authRequest.setDetails(this.authenticationDetailsSource.buildDetails(request)); return this.getAuthenticationManager().authenticate(authRequest); } @@ -265,7 +265,7 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil * @return if present the artifact from the {@link HttpServletRequest}, else null */ protected String obtainArtifact(HttpServletRequest request) { - return request.getParameter(artifactParameter); + return request.getParameter(this.artifactParameter); } /** @@ -275,8 +275,8 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil final boolean serviceTicketRequest = serviceTicketRequest(request, response); final boolean result = serviceTicketRequest || proxyReceptorRequest(request) || (proxyTicketRequest(serviceTicketRequest, request)); - if (logger.isDebugEnabled()) { - logger.debug("requiresAuthentication = " + result); + if (this.logger.isDebugEnabled()) { + this.logger.debug("requiresAuthentication = " + result); } return result; } @@ -321,8 +321,8 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil */ private boolean serviceTicketRequest(final HttpServletRequest request, final HttpServletResponse response) { boolean result = super.requiresAuthentication(request, response); - if (logger.isDebugEnabled()) { - logger.debug("serviceTicketRequest = " + result); + if (this.logger.isDebugEnabled()) { + this.logger.debug("serviceTicketRequest = " + result); } return result; } @@ -336,9 +336,9 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil if (serviceTicketRequest) { return false; } - final boolean result = authenticateAllArtifacts && obtainArtifact(request) != null && !authenticated(); - if (logger.isDebugEnabled()) { - logger.debug("proxyTicketRequest = " + result); + final boolean result = this.authenticateAllArtifacts && obtainArtifact(request) != null && !authenticated(); + if (this.logger.isDebugEnabled()) { + this.logger.debug("proxyTicketRequest = " + result); } return result; } @@ -359,9 +359,9 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil * @return */ private boolean proxyReceptorRequest(final HttpServletRequest request) { - final boolean result = proxyReceptorConfigured() && proxyReceptorMatcher.matches(request); - if (logger.isDebugEnabled()) { - logger.debug("proxyReceptorRequest = " + result); + final boolean result = proxyReceptorConfigured() && this.proxyReceptorMatcher.matches(request); + if (this.logger.isDebugEnabled()) { + this.logger.debug("proxyReceptorRequest = " + result); } return result; } @@ -372,9 +372,9 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil * @return */ private boolean proxyReceptorConfigured() { - final boolean result = this.proxyGrantingTicketStorage != null && proxyReceptorMatcher != null; - if (logger.isDebugEnabled()) { - logger.debug("proxyReceptorConfigured = " + result); + final boolean result = this.proxyGrantingTicketStorage != null && this.proxyReceptorMatcher != null; + if (this.logger.isDebugEnabled()) { + this.logger.debug("proxyReceptorConfigured = " + result); } return result; } @@ -401,10 +401,10 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException { if (serviceTicketRequest(request, response)) { - serviceTicketFailureHandler.onAuthenticationFailure(request, response, exception); + this.serviceTicketFailureHandler.onAuthenticationFailure(request, response, exception); } else { - proxyFailureHandler.onAuthenticationFailure(request, response, exception); + CasAuthenticationFilter.this.proxyFailureHandler.onAuthenticationFailure(request, response, exception); } } diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java index 6fc344e4f1..049bc3b8d4 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java @@ -62,14 +62,14 @@ final class DefaultServiceAuthenticationDetails extends WebAuthenticationDetails * @see org.springframework.security.cas.web.authentication.ServiceAuthenticationDetails#getServiceUrl() */ public String getServiceUrl() { - return serviceUrl; + return this.serviceUrl; } @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + serviceUrl.hashCode(); + result = prime * result + this.serviceUrl.hashCode(); return result; } @@ -82,7 +82,7 @@ final class DefaultServiceAuthenticationDetails extends WebAuthenticationDetails return false; } ServiceAuthenticationDetails that = (ServiceAuthenticationDetails) obj; - return serviceUrl.equals(that.getServiceUrl()); + return this.serviceUrl.equals(that.getServiceUrl()); } @Override @@ -90,7 +90,7 @@ final class DefaultServiceAuthenticationDetails extends WebAuthenticationDetails StringBuilder result = new StringBuilder(); result.append(super.toString()); result.append("ServiceUrl: "); - result.append(serviceUrl); + result.append(this.serviceUrl); return result.toString(); } diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java index 1ab7fd4cc3..4e8a777fa1 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java @@ -70,7 +70,8 @@ public class ServiceAuthenticationDetailsSource */ public ServiceAuthenticationDetails buildDetails(HttpServletRequest context) { try { - return new DefaultServiceAuthenticationDetails(serviceProperties.getService(), context, artifactPattern); + return new DefaultServiceAuthenticationDetails(this.serviceProperties.getService(), context, + this.artifactPattern); } catch (MalformedURLException e) { throw new RuntimeException(e); diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java index 269c463aee..b85f6baeb7 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java @@ -389,11 +389,11 @@ public class CasAuthenticationProviderTests { private Map cache = new HashMap<>(); public CasAuthenticationToken getByTicketId(String serviceTicket) { - return cache.get(serviceTicket); + return this.cache.get(serviceTicket); } public void putTicketInCache(CasAuthenticationToken token) { - cache.put(token.getCredentials().toString(), token); + this.cache.put(token.getCredentials().toString(), token); } public void removeTicketFromCache(CasAuthenticationToken token) { @@ -415,7 +415,7 @@ public class CasAuthenticationProviderTests { } public Assertion validate(final String ticket, final String service) { - if (returnTicket) { + if (this.returnTicket) { return new AssertionImpl("rod"); } throw new BadCredentialsException("As requested from mock"); diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java index e782e8ecb4..2de2cc4ea6 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java @@ -47,42 +47,42 @@ public class CasAuthenticationTokenTests { } private UserDetails makeUserDetails(final String name) { - return new User(name, "password", true, true, true, true, ROLES); + return new User(name, "password", true, true, true, true, this.ROLES); } @Test public void testConstructorRejectsNulls() { final Assertion assertion = new AssertionImpl("test"); try { - new CasAuthenticationToken(null, makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion); + new CasAuthenticationToken(null, makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion); fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { } try { - new CasAuthenticationToken("key", null, "Password", ROLES, makeUserDetails(), assertion); + new CasAuthenticationToken("key", null, "Password", this.ROLES, makeUserDetails(), assertion); fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { } try { - new CasAuthenticationToken("key", makeUserDetails(), null, ROLES, makeUserDetails(), assertion); + new CasAuthenticationToken("key", makeUserDetails(), null, this.ROLES, makeUserDetails(), assertion); fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { } try { - new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, makeUserDetails(), null); + new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), null); fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { } try { - new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, null, assertion); + new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, null, assertion); fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -107,10 +107,10 @@ public class CasAuthenticationTokenTests { public void testEqualsWhenEqual() { final Assertion assertion = new AssertionImpl("test"); - CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, + CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion); - CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, + CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion); assertThat(token2).isEqualTo(token1); @@ -120,7 +120,7 @@ public class CasAuthenticationTokenTests { public void testGetters() { // Build the proxy list returned in the ticket from CAS final Assertion assertion = new AssertionImpl("test"); - CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, + CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion); assertThat(token.getKeyHash()).isEqualTo("key".hashCode()); assertThat(token.getPrincipal()).isEqualTo(makeUserDetails()); @@ -146,11 +146,11 @@ public class CasAuthenticationTokenTests { public void testNotEqualsDueToAbstractParentEqualsCheck() { final Assertion assertion = new AssertionImpl("test"); - CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, + CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion); CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails("OTHER_NAME"), "Password", - ROLES, makeUserDetails(), assertion); + this.ROLES, makeUserDetails(), assertion); assertThat(!token1.equals(token2)).isTrue(); } @@ -159,10 +159,11 @@ public class CasAuthenticationTokenTests { public void testNotEqualsDueToDifferentAuthenticationClass() { final Assertion assertion = new AssertionImpl("test"); - CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, + CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion); - UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken("Test", "Password", ROLES); + UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken("Test", "Password", + this.ROLES); assertThat(!token1.equals(token2)).isTrue(); } @@ -170,11 +171,11 @@ public class CasAuthenticationTokenTests { public void testNotEqualsDueToKey() { final Assertion assertion = new AssertionImpl("test"); - CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, + CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion); CasAuthenticationToken token2 = new CasAuthenticationToken("DIFFERENT_KEY", makeUserDetails(), "Password", - ROLES, makeUserDetails(), assertion); + this.ROLES, makeUserDetails(), assertion); assertThat(!token1.equals(token2)).isTrue(); } @@ -184,10 +185,10 @@ public class CasAuthenticationTokenTests { final Assertion assertion = new AssertionImpl("test"); final Assertion assertion2 = new AssertionImpl("test"); - CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, + CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion); - CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, + CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion2); assertThat(!token1.equals(token2)).isTrue(); @@ -196,7 +197,7 @@ public class CasAuthenticationTokenTests { @Test public void testSetAuthenticated() { final Assertion assertion = new AssertionImpl("test"); - CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, + CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion); assertThat(token.isAuthenticated()).isTrue(); token.setAuthenticated(false); @@ -206,7 +207,7 @@ public class CasAuthenticationTokenTests { @Test public void testToString() { final Assertion assertion = new AssertionImpl("test"); - CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, + CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", this.ROLES, makeUserDetails(), assertion); String result = token.toString(); assertThat(result.lastIndexOf("Credentials (Service/Proxy Ticket):") != -1).isTrue(); diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java index 2ee90854ad..ddbaafe5e0 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java @@ -31,15 +31,15 @@ public class NullStatelessTicketCacheTests extends AbstractStatelessTicketCacheT @Test public void testGetter() { - assertThat(cache.getByTicketId(null)).isNull(); - assertThat(cache.getByTicketId("test")).isNull(); + assertThat(this.cache.getByTicketId(null)).isNull(); + assertThat(this.cache.getByTicketId("test")).isNull(); } @Test public void testInsertAndGet() { final CasAuthenticationToken token = getToken(); - cache.putTicketInCache(token); - assertThat(cache.getByTicketId((String) token.getCredentials())).isNull(); + this.cache.putTicketInCache(token); + assertThat(this.cache.getByTicketId((String) token.getCredentials())).isNull(); } } diff --git a/cas/src/test/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixinTests.java b/cas/src/test/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixinTests.java index 45956f171e..7ed182ccc9 100644 --- a/cas/src/test/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixinTests.java +++ b/cas/src/test/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixinTests.java @@ -95,15 +95,15 @@ public class CasAuthenticationTokenMixinTests { @Before public void setup() { - mapper = new ObjectMapper(); + this.mapper = new ObjectMapper(); ClassLoader loader = getClass().getClassLoader(); - mapper.registerModules(SecurityJackson2Modules.getModules(loader)); + this.mapper.registerModules(SecurityJackson2Modules.getModules(loader)); } @Test public void serializeCasAuthenticationTest() throws JsonProcessingException, JSONException { CasAuthenticationToken token = createCasAuthenticationToken(); - String actualJson = mapper.writeValueAsString(token); + String actualJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(CAS_TOKEN_JSON, actualJson, true); } @@ -112,19 +112,19 @@ public class CasAuthenticationTokenMixinTests { throws JsonProcessingException, JSONException { CasAuthenticationToken token = createCasAuthenticationToken(); token.eraseCredentials(); - String actualJson = mapper.writeValueAsString(token); + String actualJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(CAS_TOKEN_CLEARED_JSON, actualJson, true); } @Test public void deserializeCasAuthenticationTestAfterEraseCredentialInvoked() throws Exception { - CasAuthenticationToken token = mapper.readValue(CAS_TOKEN_CLEARED_JSON, CasAuthenticationToken.class); + CasAuthenticationToken token = this.mapper.readValue(CAS_TOKEN_CLEARED_JSON, CasAuthenticationToken.class); assertThat(((UserDetails) token.getPrincipal()).getPassword()).isNull(); } @Test public void deserializeCasAuthenticationTest() throws IOException { - CasAuthenticationToken token = mapper.readValue(CAS_TOKEN_JSON, CasAuthenticationToken.class); + CasAuthenticationToken token = this.mapper.readValue(CAS_TOKEN_JSON, CasAuthenticationToken.class); assertThat(token).isNotNull(); assertThat(token.getPrincipal()).isNotNull().isInstanceOf(User.class); assertThat(((User) token.getPrincipal()).getUsername()).isEqualTo("admin"); diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.java index b712aa3ce4..915a3187a0 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.java @@ -237,8 +237,8 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { } private LdapAuthenticationProvider ldapProvider() { - return ((List) ReflectionTestUtils.getField(authenticationManager, "providers")) - .get(0); + return ((List) ReflectionTestUtils.getField(this.authenticationManager, + "providers")).get(0); } private LdapAuthoritiesPopulator getAuthoritiesPopulator(LdapAuthenticationProvider provider) { diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.java index d2ae81bdc7..250197b140 100644 --- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.java @@ -40,19 +40,19 @@ public class LdapProviderBeanDefinitionParserTests { @After public void closeAppContext() { - if (appCtx != null) { - appCtx.close(); - appCtx = null; + if (this.appCtx != null) { + this.appCtx.close(); + this.appCtx = null; } } @Test public void simpleProviderAuthenticatesCorrectly() { - appCtx = new InMemoryXmlApplicationContext("" + this.appCtx = new InMemoryXmlApplicationContext("" + "" + " " + ""); - AuthenticationManager authenticationManager = appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, + AuthenticationManager authenticationManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, AuthenticationManager.class); Authentication auth = authenticationManager .authenticate(new UsernamePasswordAuthenticationToken("ben", "benspassword")); @@ -62,12 +62,12 @@ public class LdapProviderBeanDefinitionParserTests { @Test public void multipleProvidersAreSupported() { - appCtx = new InMemoryXmlApplicationContext("" + this.appCtx = new InMemoryXmlApplicationContext("" + "" + " " + " " + ""); - ProviderManager providerManager = appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, ProviderManager.class); + ProviderManager providerManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, ProviderManager.class); assertThat(providerManager.getProviders()).hasSize(2); assertThat(providerManager.getProviders()).extracting("authoritiesPopulator.groupSearchFilter") .containsExactly("member={0}", "uniqueMember={0}"); @@ -81,11 +81,11 @@ public class LdapProviderBeanDefinitionParserTests { @Test public void supportsPasswordComparisonAuthentication() { - appCtx = new InMemoryXmlApplicationContext("" + this.appCtx = new InMemoryXmlApplicationContext("" + "" + " " + " " + " " + ""); - AuthenticationManager authenticationManager = appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, + AuthenticationManager authenticationManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, AuthenticationManager.class); Authentication auth = authenticationManager .authenticate(new UsernamePasswordAuthenticationToken("ben", "benspassword")); @@ -95,13 +95,13 @@ public class LdapProviderBeanDefinitionParserTests { @Test public void supportsPasswordComparisonAuthenticationWithPasswordEncoder() { - appCtx = new InMemoryXmlApplicationContext("" + this.appCtx = new InMemoryXmlApplicationContext("" + "" + " " + " " + " " + " " + " " + "" + ""); - AuthenticationManager authenticationManager = appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, + AuthenticationManager authenticationManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, AuthenticationManager.class); Authentication auth = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken("ben", "ben")); @@ -111,13 +111,13 @@ public class LdapProviderBeanDefinitionParserTests { // SEC-2472 @Test public void supportsCryptoPasswordEncoder() { - appCtx = new InMemoryXmlApplicationContext("" + this.appCtx = new InMemoryXmlApplicationContext("" + "" + " " + " " + " " + " " + " " + "" + ""); - AuthenticationManager authenticationManager = appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, + AuthenticationManager authenticationManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, AuthenticationManager.class); Authentication auth = authenticationManager .authenticate(new UsernamePasswordAuthenticationToken("bcrypt", "password")); @@ -127,13 +127,13 @@ public class LdapProviderBeanDefinitionParserTests { @Test public void inetOrgContextMapperIsSupported() { - appCtx = new InMemoryXmlApplicationContext( + this.appCtx = new InMemoryXmlApplicationContext( "" + "" + " " + ""); - ProviderManager providerManager = appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, ProviderManager.class); + ProviderManager providerManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, ProviderManager.class); assertThat(providerManager.getProviders()).hasSize(1); assertThat(providerManager.getProviders()).extracting("userDetailsContextMapper") .allSatisfy(contextMapper -> assertThat(contextMapper).isInstanceOf(InetOrgPersonContextMapper.class)); @@ -143,12 +143,12 @@ public class LdapProviderBeanDefinitionParserTests { public void ldapAuthenticationProviderWorksWithPlaceholders() { System.setProperty("udp", "people"); System.setProperty("gsf", "member"); - appCtx = new InMemoryXmlApplicationContext("" + "" + this.appCtx = new InMemoryXmlApplicationContext("" + "" + " " + "" + ""); - ProviderManager providerManager = appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, ProviderManager.class); + ProviderManager providerManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, ProviderManager.class); assertThat(providerManager.getProviders()).hasSize(1); AuthenticationProvider authenticationProvider = providerManager.getProviders().get(0); diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java index 5eaa5a9a9e..aeb55cb2ee 100644 --- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java @@ -40,17 +40,17 @@ public class LdapServerBeanDefinitionParserTests { @After public void closeAppContext() { - if (appCtx != null) { - appCtx.close(); - appCtx = null; + if (this.appCtx != null) { + this.appCtx.close(); + this.appCtx = null; } } @Test public void embeddedServerCreationContainsExpectedContextSourceAndData() { - appCtx = new InMemoryXmlApplicationContext(""); + this.appCtx = new InMemoryXmlApplicationContext(""); - DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx + DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) this.appCtx .getBean(BeanIds.CONTEXT_SOURCE); // Check data is loaded @@ -62,14 +62,15 @@ public class LdapServerBeanDefinitionParserTests { public void useOfUrlAttributeCreatesCorrectContextSource() throws Exception { int port = getDefaultPort(); // Create second "server" with a url pointing at embedded one - appCtx = new InMemoryXmlApplicationContext("" + ""); // Check the default context source is still there. - appCtx.getBean(BeanIds.CONTEXT_SOURCE); + this.appCtx.getBean(BeanIds.CONTEXT_SOURCE); - DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx.getBean("blah"); + DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) this.appCtx + .getBean("blah"); // Check data is loaded as before LdapTemplate template = new LdapTemplate(contextSource); @@ -78,9 +79,9 @@ public class LdapServerBeanDefinitionParserTests { @Test public void loadingSpecificLdifFileIsSuccessful() { - appCtx = new InMemoryXmlApplicationContext( + this.appCtx = new InMemoryXmlApplicationContext( ""); - DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx + DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) this.appCtx .getBean(BeanIds.CONTEXT_SOURCE); LdapTemplate template = new LdapTemplate(contextSource); @@ -89,8 +90,8 @@ public class LdapServerBeanDefinitionParserTests { @Test public void defaultLdifFileIsSuccessful() { - appCtx = new InMemoryXmlApplicationContext(""); - ApacheDSContainer dsContainer = appCtx.getBean(ApacheDSContainer.class); + this.appCtx = new InMemoryXmlApplicationContext(""); + ApacheDSContainer dsContainer = this.appCtx.getBean(ApacheDSContainer.class); assertThat(ReflectionTestUtils.getField(dsContainer, "ldifResources")).isEqualTo("classpath*:*.ldif"); } diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java index 36b8921c69..219c11db0b 100644 --- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java @@ -53,9 +53,9 @@ public class LdapUserServiceBeanDefinitionParserTests { @After public void closeAppContext() { - if (appCtx != null) { - appCtx.close(); - appCtx = null; + if (this.appCtx != null) { + this.appCtx.close(); + this.appCtx = null; } } @@ -81,7 +81,7 @@ public class LdapUserServiceBeanDefinitionParserTests { setContext( ""); - UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); + UserDetailsService uds = (UserDetailsService) this.appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); Set authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities()); @@ -95,7 +95,7 @@ public class LdapUserServiceBeanDefinitionParserTests { + " user-search-filter='(cn={0})' " + " group-search-filter='member={0}' />"); - UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); + UserDetailsService uds = (UserDetailsService) this.appCtx.getBean("ldapUDS"); UserDetails joe = uds.loadUserByUsername("Joe Smeth"); assertThat(joe.getUsername()).isEqualTo("Joe Smeth"); @@ -108,11 +108,11 @@ public class LdapUserServiceBeanDefinitionParserTests { + ""); - UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); + UserDetailsService uds = (UserDetailsService) this.appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities())).contains("PREFIX_DEVELOPERS"); - uds = (UserDetailsService) appCtx.getBean("ldapUDSNoPrefix"); + uds = (UserDetailsService) this.appCtx.getBean("ldapUDSNoPrefix"); ben = uds.loadUserByUsername("ben"); assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities())).contains("DEVELOPERS"); } @@ -122,7 +122,7 @@ public class LdapUserServiceBeanDefinitionParserTests { setContext( ""); - UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); + UserDetailsService uds = (UserDetailsService) this.appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); Set authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities()); @@ -144,7 +144,7 @@ public class LdapUserServiceBeanDefinitionParserTests { public void personContextMapperIsSupported() { setContext("" + ""); - UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); + UserDetailsService uds = (UserDetailsService) this.appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); assertThat(ben instanceof Person).isTrue(); } @@ -153,7 +153,7 @@ public class LdapUserServiceBeanDefinitionParserTests { public void inetOrgContextMapperIsSupported() { setContext("" + ""); - UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); + UserDetailsService uds = (UserDetailsService) this.appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); assertThat(ben instanceof InetOrgPerson).isTrue(); } @@ -164,13 +164,13 @@ public class LdapUserServiceBeanDefinitionParserTests { + "" + ""); - UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); + UserDetailsService uds = (UserDetailsService) this.appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); assertThat(ben instanceof InetOrgPerson).isTrue(); } private void setContext(String context) { - appCtx = new InMemoryXmlApplicationContext(context); + this.appCtx = new InMemoryXmlApplicationContext(context); } } diff --git a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java index b92ff3f560..9de6be2efb 100644 --- a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java +++ b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java @@ -78,15 +78,16 @@ public final class SecurityNamespaceHandler implements NamespaceHandler { Package pkg = SpringSecurityCoreVersion.class.getPackage(); if (pkg == null || coreVersion == null) { - logger.info("Couldn't determine package version information."); + this.logger.info("Couldn't determine package version information."); return; } String version = pkg.getImplementationVersion(); - logger.info("Spring Security 'config' module version is " + version); + this.logger.info("Spring Security 'config' module version is " + version); if (version.compareTo(coreVersion) != 0) { - logger.error("You are running with different versions of the Spring Security 'core' and 'config' modules"); + this.logger.error( + "You are running with different versions of the Spring Security 'core' and 'config' modules"); } } @@ -98,7 +99,7 @@ public final class SecurityNamespaceHandler implements NamespaceHandler { element); } String name = pc.getDelegate().getLocalName(element); - BeanDefinitionParser parser = parsers.get(name); + BeanDefinitionParser parser = this.parsers.get(name); if (parser == null) { // SEC-1455. Load parsers when required, not just on init(). @@ -126,17 +127,17 @@ public final class SecurityNamespaceHandler implements NamespaceHandler { // We only handle elements if (node instanceof Element) { if (Elements.INTERCEPT_METHODS.equals(name)) { - return interceptMethodsBDD.decorate(node, definition, pc); + return this.interceptMethodsBDD.decorate(node, definition, pc); } if (Elements.FILTER_CHAIN_MAP.equals(name)) { - if (filterChainMapBDD == null) { + if (this.filterChainMapBDD == null) { loadParsers(); } - if (filterChainMapBDD == null) { + if (this.filterChainMapBDD == null) { reportMissingWebClasses(name, pc, node); } - return filterChainMapBDD.decorate(node, definition, pc); + return this.filterChainMapBDD.decorate(node, definition, pc); } } @@ -170,29 +171,32 @@ public final class SecurityNamespaceHandler implements NamespaceHandler { private void loadParsers() { // Parsers - parsers.put(Elements.LDAP_PROVIDER, new LdapProviderBeanDefinitionParser()); - parsers.put(Elements.LDAP_SERVER, new LdapServerBeanDefinitionParser()); - parsers.put(Elements.LDAP_USER_SERVICE, new LdapUserServiceBeanDefinitionParser()); - parsers.put(Elements.USER_SERVICE, new UserServiceBeanDefinitionParser()); - parsers.put(Elements.JDBC_USER_SERVICE, new JdbcUserServiceBeanDefinitionParser()); - parsers.put(Elements.AUTHENTICATION_PROVIDER, new AuthenticationProviderBeanDefinitionParser()); - parsers.put(Elements.GLOBAL_METHOD_SECURITY, new GlobalMethodSecurityBeanDefinitionParser()); - parsers.put(Elements.AUTHENTICATION_MANAGER, new AuthenticationManagerBeanDefinitionParser()); - parsers.put(Elements.METHOD_SECURITY_METADATA_SOURCE, new MethodSecurityMetadataSourceBeanDefinitionParser()); + this.parsers.put(Elements.LDAP_PROVIDER, new LdapProviderBeanDefinitionParser()); + this.parsers.put(Elements.LDAP_SERVER, new LdapServerBeanDefinitionParser()); + this.parsers.put(Elements.LDAP_USER_SERVICE, new LdapUserServiceBeanDefinitionParser()); + this.parsers.put(Elements.USER_SERVICE, new UserServiceBeanDefinitionParser()); + this.parsers.put(Elements.JDBC_USER_SERVICE, new JdbcUserServiceBeanDefinitionParser()); + this.parsers.put(Elements.AUTHENTICATION_PROVIDER, new AuthenticationProviderBeanDefinitionParser()); + this.parsers.put(Elements.GLOBAL_METHOD_SECURITY, new GlobalMethodSecurityBeanDefinitionParser()); + this.parsers.put(Elements.AUTHENTICATION_MANAGER, new AuthenticationManagerBeanDefinitionParser()); + this.parsers.put(Elements.METHOD_SECURITY_METADATA_SOURCE, + new MethodSecurityMetadataSourceBeanDefinitionParser()); // Only load the web-namespace parsers if the web classes are available if (ClassUtils.isPresent(FILTER_CHAIN_PROXY_CLASSNAME, getClass().getClassLoader())) { - parsers.put(Elements.DEBUG, new DebugBeanDefinitionParser()); - parsers.put(Elements.HTTP, new HttpSecurityBeanDefinitionParser()); - parsers.put(Elements.HTTP_FIREWALL, new HttpFirewallBeanDefinitionParser()); - parsers.put(Elements.FILTER_SECURITY_METADATA_SOURCE, new FilterInvocationSecurityMetadataSourceParser()); - parsers.put(Elements.FILTER_CHAIN, new FilterChainBeanDefinitionParser()); - filterChainMapBDD = new FilterChainMapBeanDefinitionDecorator(); - parsers.put(Elements.CLIENT_REGISTRATIONS, new ClientRegistrationsBeanDefinitionParser()); + this.parsers.put(Elements.DEBUG, new DebugBeanDefinitionParser()); + this.parsers.put(Elements.HTTP, new HttpSecurityBeanDefinitionParser()); + this.parsers.put(Elements.HTTP_FIREWALL, new HttpFirewallBeanDefinitionParser()); + this.parsers.put(Elements.FILTER_SECURITY_METADATA_SOURCE, + new FilterInvocationSecurityMetadataSourceParser()); + this.parsers.put(Elements.FILTER_CHAIN, new FilterChainBeanDefinitionParser()); + this.filterChainMapBDD = new FilterChainMapBeanDefinitionDecorator(); + this.parsers.put(Elements.CLIENT_REGISTRATIONS, new ClientRegistrationsBeanDefinitionParser()); } if (ClassUtils.isPresent(MESSAGE_CLASSNAME, getClass().getClassLoader())) { - parsers.put(Elements.WEBSOCKET_MESSAGE_BROKER, new WebSocketMessageBrokerSecurityBeanDefinitionParser()); + this.parsers.put(Elements.WEBSOCKET_MESSAGE_BROKER, + new WebSocketMessageBrokerSecurityBeanDefinitionParser()); } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java index a1e2e854fe..76f47b51cb 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java @@ -103,7 +103,7 @@ public abstract class AbstractConfiguredSecurityBuilder> C apply(C configurer) throws Exception { - configurer.addObjectPostProcessor(objectPostProcessor); + configurer.addObjectPostProcessor(this.objectPostProcessor); configurer.setBuilder((B) this); add(configurer); return configurer; @@ -179,17 +179,18 @@ public abstract class AbstractConfiguredSecurityBuilder> clazz = (Class>) configurer .getClass(); - synchronized (configurers) { - if (buildState.isConfigured()) { + synchronized (this.configurers) { + if (this.buildState.isConfigured()) { throw new IllegalStateException("Cannot apply " + configurer + " to already built object"); } - List> configs = allowConfigurersOfSameType ? this.configurers.get(clazz) : null; + List> configs = this.allowConfigurersOfSameType ? this.configurers.get(clazz) + : null; if (configs == null) { configs = new ArrayList<>(1); } configs.add(configurer); this.configurers.put(clazz, configs); - if (buildState.isInitializing()) { + if (this.buildState.isInitializing()) { this.configurersAddedInInitializing.add(configurer); } } @@ -297,22 +298,22 @@ public abstract class AbstractConfiguredSecurityBuilder configurer : configurersAddedInInitializing) { + for (SecurityConfigurer configurer : this.configurersAddedInInitializing) { configurer.init((B) this); } } @@ -376,8 +377,8 @@ public abstract class AbstractConfiguredSecurityBuilder= CONFIGURING.order; + return this.order >= CONFIGURING.order; } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java index ec8f0e290c..befa941eeb 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java @@ -60,10 +60,10 @@ public abstract class SecurityConfigurerAdapter> * @throws IllegalStateException if {@link SecurityBuilder} is null */ protected final B getBuilder() { - if (securityBuilder == null) { + if (this.securityBuilder == null) { throw new IllegalStateException("securityBuilder cannot be null"); } - return securityBuilder; + return this.securityBuilder; } /** @@ -108,7 +108,7 @@ public abstract class SecurityConfigurerAdapter> @SuppressWarnings({ "rawtypes", "unchecked" }) public Object postProcess(Object object) { - for (ObjectPostProcessor opp : postProcessors) { + for (ObjectPostProcessor opp : this.postProcessors) { Class oppClass = opp.getClass(); Class oppType = GenericTypeResolver.resolveTypeArgument(oppClass, ObjectPostProcessor.class); if (oppType == null || oppType.isAssignableFrom(object.getClass())) { @@ -125,7 +125,7 @@ public abstract class SecurityConfigurerAdapter> */ private boolean addObjectPostProcessor(ObjectPostProcessor objectPostProcessor) { boolean result = this.postProcessors.add(objectPostProcessor); - postProcessors.sort(AnnotationAwareOrderComparator.INSTANCE); + this.postProcessors.sort(AnnotationAwareOrderComparator.INSTANCE); return result; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java index f9d5e7d88d..a4080c2f8c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java @@ -220,15 +220,16 @@ public class AuthenticationManagerBuilder @Override protected ProviderManager performBuild() throws Exception { if (!isConfigured()) { - logger.debug("No authenticationProviders and no parentAuthenticationManager defined. Returning null."); + this.logger.debug("No authenticationProviders and no parentAuthenticationManager defined. Returning null."); return null; } - ProviderManager providerManager = new ProviderManager(authenticationProviders, parentAuthenticationManager); - if (eraseCredentials != null) { - providerManager.setEraseCredentialsAfterAuthentication(eraseCredentials); + ProviderManager providerManager = new ProviderManager(this.authenticationProviders, + this.parentAuthenticationManager); + if (this.eraseCredentials != null) { + providerManager.setEraseCredentialsAfterAuthentication(this.eraseCredentials); } - if (eventPublisher != null) { - providerManager.setAuthenticationEventPublisher(eventPublisher); + if (this.eventPublisher != null) { + providerManager.setAuthenticationEventPublisher(this.eventPublisher); } providerManager = postProcess(providerManager); return providerManager; @@ -250,7 +251,7 @@ public class AuthenticationManagerBuilder * false */ public boolean isConfigured() { - return !authenticationProviders.isEmpty() || parentAuthenticationManager != null; + return !this.authenticationProviders.isEmpty() || this.parentAuthenticationManager != null; } /** diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java index 32afab9466..40c54c62ad 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java @@ -115,18 +115,18 @@ public class AuthenticationConfiguration { return new AuthenticationManagerDelegator(authBuilder); } - for (GlobalAuthenticationConfigurerAdapter config : globalAuthConfigurers) { + for (GlobalAuthenticationConfigurerAdapter config : this.globalAuthConfigurers) { authBuilder.apply(config); } - authenticationManager = authBuilder.build(); + this.authenticationManager = authBuilder.build(); - if (authenticationManager == null) { - authenticationManager = getAuthenticationManagerBean(); + if (this.authenticationManager == null) { + this.authenticationManager = getAuthenticationManagerBean(); } this.authenticationManagerInitialized = true; - return authenticationManager; + return this.authenticationManager; } @Autowired(required = false) @@ -148,7 +148,7 @@ public class AuthenticationConfiguration { @SuppressWarnings("unchecked") private T lazyBean(Class interfaceName) { LazyInitTargetSource lazyTargetSource = new LazyInitTargetSource(); - String[] beanNamesForType = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(applicationContext, + String[] beanNamesForType = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.applicationContext, interfaceName); if (beanNamesForType.length == 0) { return null; @@ -168,20 +168,20 @@ public class AuthenticationConfiguration { } lazyTargetSource.setTargetBeanName(beanName); - lazyTargetSource.setBeanFactory(applicationContext); + lazyTargetSource.setBeanFactory(this.applicationContext); ProxyFactoryBean proxyFactory = new ProxyFactoryBean(); - proxyFactory = objectPostProcessor.postProcess(proxyFactory); + proxyFactory = this.objectPostProcessor.postProcess(proxyFactory); proxyFactory.setTargetSource(lazyTargetSource); return (T) proxyFactory.getObject(); } private List getPrimaryBeanNames(String[] beanNamesForType) { List list = new ArrayList<>(); - if (!(applicationContext instanceof ConfigurableApplicationContext)) { + if (!(this.applicationContext instanceof ConfigurableApplicationContext)) { return Collections.emptyList(); } for (String beanName : beanNamesForType) { - if (((ConfigurableApplicationContext) applicationContext).getBeanFactory().getBeanDefinition(beanName) + if (((ConfigurableApplicationContext) this.applicationContext).getBeanFactory().getBeanDefinition(beanName) .isPrimary()) { list.add(beanName); } @@ -214,7 +214,8 @@ public class AuthenticationConfiguration { @Override public void init(AuthenticationManagerBuilder auth) { - Map beansWithAnnotation = context.getBeansWithAnnotation(EnableGlobalAuthentication.class); + Map beansWithAnnotation = this.context + .getBeansWithAnnotation(EnableGlobalAuthentication.class); if (logger.isDebugEnabled()) { logger.debug("Eagerly initializing " + beansWithAnnotation); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java index 2e3514057c..60196d9fc7 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java @@ -98,8 +98,8 @@ public class LdapAuthenticationProviderConfigurer 0) { - ldapAuthenticator.setUserDnPatterns(userDnPatterns); + if (this.userDnPatterns != null && this.userDnPatterns.length > 0) { + ldapAuthenticator.setUserDnPatterns(this.userDnPatterns); } return postProcess(ldapAuthenticator); } @@ -206,10 +206,10 @@ public class LdapAuthenticationProviderConfigurer, C */ @Override protected void initUserDetailsService() throws Exception { - for (UserDetailsBuilder userBuilder : userBuilders) { + for (UserDetailsBuilder userBuilder : this.userBuilders) { getUserDetailsService().createUser(userBuilder.build()); } for (UserDetails userDetails : this.users) { @@ -124,7 +124,7 @@ public class UserDetailsManagerConfigurer, C * @return the {@link UserDetailsManagerConfigurer} for method chaining */ public C and() { - return builder; + return this.builder; } /** diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java index e85040f8ed..e0cf9686f1 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java @@ -45,7 +45,7 @@ abstract class AbstractDaoAuthenticationConfigurer T getSingleBeanOrNull(Class type) { try { - return context.getBean(type); + return this.context.getBean(type); } catch (NoSuchBeanDefinitionException e) { } @@ -279,7 +279,7 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit * @return the {@link MethodSecurityExpressionHandler} to use */ protected MethodSecurityExpressionHandler createExpressionHandler() { - return defaultMethodExpressionHandler; + return this.defaultMethodExpressionHandler; } /** @@ -288,10 +288,10 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit * @return a non {@code null} {@link MethodSecurityExpressionHandler} */ protected final MethodSecurityExpressionHandler getExpressionHandler() { - if (expressionHandler == null) { - expressionHandler = createExpressionHandler(); + if (this.expressionHandler == null) { + this.expressionHandler = createExpressionHandler(); } - return expressionHandler; + return this.expressionHandler; } /** @@ -313,20 +313,20 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit * @return the {@link AuthenticationManager} to use */ protected AuthenticationManager authenticationManager() throws Exception { - if (authenticationManager == null) { - DefaultAuthenticationEventPublisher eventPublisher = objectPostProcessor + if (this.authenticationManager == null) { + DefaultAuthenticationEventPublisher eventPublisher = this.objectPostProcessor .postProcess(new DefaultAuthenticationEventPublisher()); - auth = new AuthenticationManagerBuilder(objectPostProcessor); - auth.authenticationEventPublisher(eventPublisher); - configure(auth); - if (disableAuthenticationRegistry) { - authenticationManager = getAuthenticationConfiguration().getAuthenticationManager(); + this.auth = new AuthenticationManagerBuilder(this.objectPostProcessor); + this.auth.authenticationEventPublisher(eventPublisher); + configure(this.auth); + if (this.disableAuthenticationRegistry) { + this.authenticationManager = getAuthenticationConfiguration().getAuthenticationManager(); } else { - authenticationManager = auth.build(); + this.authenticationManager = this.auth.build(); } } - return authenticationManager; + return this.authenticationManager; } /** @@ -405,13 +405,13 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit public final void setImportMetadata(AnnotationMetadata importMetadata) { Map annotationAttributes = importMetadata .getAnnotationAttributes(EnableGlobalMethodSecurity.class.getName()); - enableMethodSecurity = AnnotationAttributes.fromMap(annotationAttributes); + this.enableMethodSecurity = AnnotationAttributes.fromMap(annotationAttributes); } @Autowired(required = false) public void setObjectPostProcessor(ObjectPostProcessor objectPostProcessor) { this.objectPostProcessor = objectPostProcessor; - this.defaultMethodExpressionHandler = objectPostProcessor.postProcess(defaultMethodExpressionHandler); + this.defaultMethodExpressionHandler = objectPostProcessor.postProcess(this.defaultMethodExpressionHandler); } @Autowired(required = false) @@ -429,7 +429,7 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit } private AuthenticationConfiguration getAuthenticationConfiguration() { - return context.getBean(AuthenticationConfiguration.class); + return this.context.getBean(AuthenticationConfiguration.class); } private boolean prePostEnabled() { @@ -453,7 +453,7 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit } private AnnotationAttributes enableMethodSecurity() { - if (enableMethodSecurity == null) { + if (this.enableMethodSecurity == null) { // if it is null look at this instance (i.e. a subclass was used) EnableGlobalMethodSecurity methodSecurityAnnotation = AnnotationUtils.findAnnotation(getClass(), EnableGlobalMethodSecurity.class); diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/ReactiveMethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/ReactiveMethodSecurityConfiguration.java index be94a313d1..39ac8e362b 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/ReactiveMethodSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/ReactiveMethodSecurityConfiguration.java @@ -54,7 +54,7 @@ class ReactiveMethodSecurityConfiguration implements ImportAware { public MethodSecurityMetadataSourceAdvisor methodSecurityInterceptor(AbstractMethodSecurityMetadataSource source) { MethodSecurityMetadataSourceAdvisor advisor = new MethodSecurityMetadataSourceAdvisor( "securityMethodInterceptor", source, "methodMetadataSource"); - advisor.setOrder(advisorOrder); + advisor.setOrder(this.advisorOrder); return advisor; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java index a0a6ab37fb..85a5585ebe 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java @@ -74,27 +74,29 @@ final class FilterComparator implements Comparator, Serializable { put(CorsFilter.class, order.next()); put(CsrfFilter.class, order.next()); put(LogoutFilter.class, order.next()); - filterToOrder.put("org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestRedirectFilter", + this.filterToOrder.put( + "org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestRedirectFilter", order.next()); - filterToOrder.put( + this.filterToOrder.put( "org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationRequestFilter", order.next()); put(X509AuthenticationFilter.class, order.next()); put(AbstractPreAuthenticatedProcessingFilter.class, order.next()); - filterToOrder.put("org.springframework.security.cas.web.CasAuthenticationFilter", order.next()); - filterToOrder.put("org.springframework.security.oauth2.client.web.OAuth2LoginAuthenticationFilter", + this.filterToOrder.put("org.springframework.security.cas.web.CasAuthenticationFilter", order.next()); + this.filterToOrder.put("org.springframework.security.oauth2.client.web.OAuth2LoginAuthenticationFilter", order.next()); - filterToOrder.put( + this.filterToOrder.put( "org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationFilter", order.next()); put(UsernamePasswordAuthenticationFilter.class, order.next()); order.next(); // gh-8105 - filterToOrder.put("org.springframework.security.openid.OpenIDAuthenticationFilter", order.next()); + this.filterToOrder.put("org.springframework.security.openid.OpenIDAuthenticationFilter", order.next()); put(DefaultLoginPageGeneratingFilter.class, order.next()); put(DefaultLogoutPageGeneratingFilter.class, order.next()); put(ConcurrentSessionFilter.class, order.next()); put(DigestAuthenticationFilter.class, order.next()); - filterToOrder.put("org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationFilter", + this.filterToOrder.put( + "org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationFilter", order.next()); put(BasicAuthenticationFilter.class, order.next()); put(RequestCacheAwareFilter.class, order.next()); @@ -102,7 +104,7 @@ final class FilterComparator implements Comparator, Serializable { put(JaasApiIntegrationFilter.class, order.next()); put(RememberMeAuthenticationFilter.class, order.next()); put(AnonymousAuthenticationFilter.class, order.next()); - filterToOrder.put("org.springframework.security.oauth2.client.web.OAuth2AuthorizationCodeGrantFilter", + this.filterToOrder.put("org.springframework.security.oauth2.client.web.OAuth2AuthorizationCodeGrantFilter", order.next()); put(SessionManagementFilter.class, order.next()); put(ExceptionTranslationFilter.class, order.next()); @@ -174,7 +176,7 @@ final class FilterComparator implements Comparator, Serializable { private void put(Class filter, int position) { String className = filter.getName(); - filterToOrder.put(className, position); + this.filterToOrder.put(className, position); } /** @@ -185,7 +187,7 @@ final class FilterComparator implements Comparator, Serializable { */ private Integer getOrder(Class clazz) { while (clazz != null) { - Integer result = filterToOrder.get(clazz.getName()); + Integer result = this.filterToOrder.get(clazz.getName()); if (result != null) { return result; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java index b4936abec5..7c8ceeabc7 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java @@ -2518,8 +2518,8 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder afterFilter) { - comparator.registerAfter(filter.getClass(), afterFilter); + this.comparator.registerAfter(filter.getClass(), afterFilter); return addFilter(filter); } @@ -2568,7 +2568,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder beforeFilter) { - comparator.registerBefore(filter.getClass(), beforeFilter); + this.comparator.registerBefore(filter.getClass(), beforeFilter); return addFilter(filter); } @@ -2581,7 +2581,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder filterClass = filter.getClass(); - if (!comparator.isRegistered(filterClass)) { + if (!this.comparator.isRegistered(filterClass)) { throw new IllegalArgumentException("The Filter class " + filterClass.getName() + " does not have a registered order and cannot be added without a specified order. Consider using addFilterBefore or addFilterAfter instead."); } @@ -2720,7 +2720,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder requestMatcherCustomizer) { - requestMatcherCustomizer.customize(requestMatcherConfigurer); + requestMatcherCustomizer.customize(this.requestMatcherConfigurer); return HttpSecurity.this; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java index 34abe958f3..9bb3e2183c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java @@ -101,7 +101,7 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder expressionHandler = defaultWebSecurityExpressionHandler; + private SecurityExpressionHandler expressionHandler = this.defaultWebSecurityExpressionHandler; private Runnable postBuildAction = () -> { }; @@ -156,7 +156,7 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder getExpressionHandler() { - return expressionHandler; + return this.expressionHandler; } /** @@ -238,11 +238,11 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder "At least one SecurityBuilder needs to be specified. " + "Typically this is done by exposing a SecurityFilterChain bean " + "or by adding a @Configuration that extends WebSecurityConfigurerAdapter. " + "More advanced users can invoke " + WebSecurity.class.getSimpleName() + ".addSecurityFilterChainBuilder directly"); - int chainSize = ignoredRequests.size() + securityFilterChainBuilders.size(); + int chainSize = this.ignoredRequests.size() + this.securityFilterChainBuilders.size(); List securityFilterChains = new ArrayList<>(chainSize); - for (RequestMatcher ignoredRequest : ignoredRequests) { + for (RequestMatcher ignoredRequest : this.ignoredRequests) { securityFilterChains.add(new DefaultSecurityFilterChain(ignoredRequest)); } - for (SecurityBuilder securityFilterChainBuilder : securityFilterChainBuilders) { + for (SecurityBuilder securityFilterChainBuilder : this.securityFilterChainBuilders) { securityFilterChains.add(securityFilterChainBuilder.build()); } FilterChainProxy filterChainProxy = new FilterChainProxy(securityFilterChains); - if (httpFirewall != null) { - filterChainProxy.setFirewall(httpFirewall); + if (this.httpFirewall != null) { + filterChainProxy.setFirewall(this.httpFirewall); } - if (requestRejectedHandler != null) { - filterChainProxy.setRequestRejectedHandler(requestRejectedHandler); + if (this.requestRejectedHandler != null) { + filterChainProxy.setRequestRejectedHandler(this.requestRejectedHandler); } filterChainProxy.afterPropertiesSet(); Filter result = filterChainProxy; - if (debugEnabled) { - logger.warn("\n\n" + "********************************************************************\n" + if (this.debugEnabled) { + this.logger.warn("\n\n" + "********************************************************************\n" + "********** Security debugging is enabled. *************\n" + "********** This may include sensitive information. *************\n" + "********** Do not use in a production system! *************\n" + "********************************************************************\n\n"); result = new DebugFilter(filterChainProxy); } - postBuildAction.run(); + this.postBuildAction.run(); return result; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java index 012c0fec66..5aca276c39 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java @@ -48,7 +48,7 @@ final class AutowiredWebSecurityConfigurersIgnoreParents { @SuppressWarnings({ "rawtypes", "unchecked" }) public List> getWebSecurityConfigurers() { List> webSecurityConfigurers = new ArrayList<>(); - Map beansOfType = beanFactory.getBeansOfType(WebSecurityConfigurer.class); + Map beansOfType = this.beanFactory.getBeansOfType(WebSecurityConfigurer.class); for (Entry entry : beansOfType.entrySet()) { webSecurityConfigurers.add(entry.getValue()); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java index b7ef0c280c..1a38a58bf0 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java @@ -85,7 +85,7 @@ class HttpSecurityConfiguration { this.objectPostProcessor, passwordEncoder); authenticationBuilder.parentAuthenticationManager(authenticationManager()); - HttpSecurity http = new HttpSecurity(objectPostProcessor, authenticationBuilder, createSharedObjects()); + HttpSecurity http = new HttpSecurity(this.objectPostProcessor, authenticationBuilder, createSharedObjects()); http.csrf(withDefaults()).addFilter(new WebAsyncManagerIntegrationFilter()).exceptionHandling(withDefaults()) .headers(withDefaults()).sessionManagement(withDefaults()).securityContext(withDefaults()) .requestCache(withDefaults()).anonymous(withDefaults()).servletApi(withDefaults()) @@ -105,7 +105,7 @@ class HttpSecurityConfiguration { private Map, Object> createSharedObjects() { Map, Object> sharedObjects = new HashMap<>(); - sharedObjects.put(ApplicationContext.class, context); + sharedObjects.put(ApplicationContext.class, this.context); return sharedObjects; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java index 3e6487a08e..445ba5e020 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java @@ -53,13 +53,13 @@ class WebMvcSecurityConfiguration implements WebMvcConfigurer, ApplicationContex @SuppressWarnings("deprecation") public void addArgumentResolvers(List argumentResolvers) { AuthenticationPrincipalArgumentResolver authenticationPrincipalResolver = new AuthenticationPrincipalArgumentResolver(); - authenticationPrincipalResolver.setBeanResolver(beanResolver); + authenticationPrincipalResolver.setBeanResolver(this.beanResolver); argumentResolvers.add(authenticationPrincipalResolver); argumentResolvers .add(new org.springframework.security.web.bind.support.AuthenticationPrincipalArgumentResolver()); CurrentSecurityContextArgumentResolver currentSecurityContextArgumentResolver = new CurrentSecurityContextArgumentResolver(); - currentSecurityContextArgumentResolver.setBeanResolver(beanResolver); + currentSecurityContextArgumentResolver.setBeanResolver(this.beanResolver); argumentResolvers.add(currentSecurityContextArgumentResolver); argumentResolvers.add(new CsrfTokenArgumentResolver()); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java index 4fe4959cdd..73c62f6896 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java @@ -88,7 +88,7 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa @Bean @DependsOn(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME) public SecurityExpressionHandler webSecurityExpressionHandler() { - return webSecurity.getExpressionHandler(); + return this.webSecurity.getExpressionHandler(); } /** @@ -98,28 +98,28 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa */ @Bean(name = AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME) public Filter springSecurityFilterChain() throws Exception { - boolean hasConfigurers = webSecurityConfigurers != null && !webSecurityConfigurers.isEmpty(); - boolean hasFilterChain = !securityFilterChains.isEmpty(); + boolean hasConfigurers = this.webSecurityConfigurers != null && !this.webSecurityConfigurers.isEmpty(); + boolean hasFilterChain = !this.securityFilterChains.isEmpty(); if (hasConfigurers && hasFilterChain) { throw new IllegalStateException( "Found WebSecurityConfigurerAdapter as well as SecurityFilterChain." + "Please select just one."); } if (!hasConfigurers && !hasFilterChain) { - WebSecurityConfigurerAdapter adapter = objectObjectPostProcessor + WebSecurityConfigurerAdapter adapter = this.objectObjectPostProcessor .postProcess(new WebSecurityConfigurerAdapter() { }); - webSecurity.apply(adapter); + this.webSecurity.apply(adapter); } - for (SecurityFilterChain securityFilterChain : securityFilterChains) { - webSecurity.addSecurityFilterChainBuilder(() -> securityFilterChain); + for (SecurityFilterChain securityFilterChain : this.securityFilterChains) { + this.webSecurity.addSecurityFilterChainBuilder(() -> securityFilterChain); for (Filter filter : securityFilterChain.getFilters()) { if (filter instanceof FilterSecurityInterceptor) { - webSecurity.securityInterceptor((FilterSecurityInterceptor) filter); + this.webSecurity.securityInterceptor((FilterSecurityInterceptor) filter); break; } } } - return webSecurity.build(); + return this.webSecurity.build(); } /** @@ -130,7 +130,7 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa @Bean @DependsOn(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME) public WebInvocationPrivilegeEvaluator privilegeEvaluator() { - return webSecurity.getPrivilegeEvaluator(); + return this.webSecurity.getPrivilegeEvaluator(); } /** @@ -147,9 +147,9 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa public void setFilterChainProxySecurityConfigurer(ObjectPostProcessor objectPostProcessor, @Value("#{@autowiredWebSecurityConfigurersIgnoreParents.getWebSecurityConfigurers()}") List> webSecurityConfigurers) throws Exception { - webSecurity = objectPostProcessor.postProcess(new WebSecurity(objectPostProcessor)); - if (debugEnabled != null) { - webSecurity.debug(debugEnabled); + this.webSecurity = objectPostProcessor.postProcess(new WebSecurity(objectPostProcessor)); + if (this.debugEnabled != null) { + this.webSecurity.debug(this.debugEnabled); } webSecurityConfigurers.sort(AnnotationAwareOrderComparator.INSTANCE); @@ -166,7 +166,7 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa previousConfig = config; } for (SecurityConfigurer webSecurityConfigurer : webSecurityConfigurers) { - webSecurity.apply(webSecurityConfigurer); + this.webSecurity.apply(webSecurityConfigurer); } this.webSecurityConfigurers = webSecurityConfigurers; } @@ -231,9 +231,9 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa Map enableWebSecurityAttrMap = importMetadata .getAnnotationAttributes(EnableWebSecurity.class.getName()); AnnotationAttributes enableWebSecurityAttrs = AnnotationAttributes.fromMap(enableWebSecurityAttrMap); - debugEnabled = enableWebSecurityAttrs.getBoolean("debug"); - if (webSecurity != null) { - webSecurity.debug(debugEnabled); + this.debugEnabled = enableWebSecurityAttrs.getBoolean("debug"); + if (this.webSecurity != null) { + this.webSecurity.debug(this.debugEnabled); } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java index 1125884f2f..27404b9486 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java @@ -195,21 +195,21 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu */ @SuppressWarnings({ "rawtypes", "unchecked" }) protected final HttpSecurity getHttp() throws Exception { - if (http != null) { - return http; + if (this.http != null) { + return this.http; } AuthenticationEventPublisher eventPublisher = getAuthenticationEventPublisher(); - localConfigureAuthenticationBldr.authenticationEventPublisher(eventPublisher); + this.localConfigureAuthenticationBldr.authenticationEventPublisher(eventPublisher); AuthenticationManager authenticationManager = authenticationManager(); - authenticationBuilder.parentAuthenticationManager(authenticationManager); + this.authenticationBuilder.parentAuthenticationManager(authenticationManager); Map, Object> sharedObjects = createSharedObjects(); - http = new HttpSecurity(objectPostProcessor, authenticationBuilder, sharedObjects); - if (!disableDefaults) { + this.http = new HttpSecurity(this.objectPostProcessor, this.authenticationBuilder, sharedObjects); + if (!this.disableDefaults) { // @formatter:off - http + this.http .csrf().and() .addFilter(new WebAsyncManagerIntegrationFilter()) .exceptionHandling().and() @@ -227,11 +227,11 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu .loadFactories(AbstractHttpConfigurer.class, classLoader); for (AbstractHttpConfigurer configurer : defaultHttpConfigurers) { - http.apply(configurer); + this.http.apply(configurer); } } - configure(http); - return http; + configure(this.http); + return this.http; } /** @@ -250,7 +250,7 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu * @throws Exception */ public AuthenticationManager authenticationManagerBean() throws Exception { - return new AuthenticationManagerDelegator(authenticationBuilder, context); + return new AuthenticationManagerDelegator(this.authenticationBuilder, this.context); } /** @@ -262,17 +262,17 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu * @throws Exception */ protected AuthenticationManager authenticationManager() throws Exception { - if (!authenticationManagerInitialized) { - configure(localConfigureAuthenticationBldr); - if (disableLocalConfigureAuthenticationBldr) { - authenticationManager = authenticationConfiguration.getAuthenticationManager(); + if (!this.authenticationManagerInitialized) { + configure(this.localConfigureAuthenticationBldr); + if (this.disableLocalConfigureAuthenticationBldr) { + this.authenticationManager = this.authenticationConfiguration.getAuthenticationManager(); } else { - authenticationManager = localConfigureAuthenticationBldr.build(); + this.authenticationManager = this.localConfigureAuthenticationBldr.build(); } - authenticationManagerInitialized = true; + this.authenticationManagerInitialized = true; } - return authenticationManager; + return this.authenticationManager; } /** @@ -296,8 +296,8 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu * @see #userDetailsService() */ public UserDetailsService userDetailsServiceBean() throws Exception { - AuthenticationManagerBuilder globalAuthBuilder = context.getBean(AuthenticationManagerBuilder.class); - return new UserDetailsServiceDelegator(Arrays.asList(localConfigureAuthenticationBldr, globalAuthBuilder)); + AuthenticationManagerBuilder globalAuthBuilder = this.context.getBean(AuthenticationManagerBuilder.class); + return new UserDetailsServiceDelegator(Arrays.asList(this.localConfigureAuthenticationBldr, globalAuthBuilder)); } /** @@ -308,8 +308,8 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu * @return the {@link UserDetailsService} to use */ protected UserDetailsService userDetailsService() { - AuthenticationManagerBuilder globalAuthBuilder = context.getBean(AuthenticationManagerBuilder.class); - return new UserDetailsServiceDelegator(Arrays.asList(localConfigureAuthenticationBldr, globalAuthBuilder)); + AuthenticationManagerBuilder globalAuthBuilder = this.context.getBean(AuthenticationManagerBuilder.class); + return new UserDetailsServiceDelegator(Arrays.asList(this.localConfigureAuthenticationBldr, globalAuthBuilder)); } public void init(final WebSecurity web) throws Exception { @@ -350,7 +350,7 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu * @throws Exception if an error occurs */ protected void configure(HttpSecurity http) throws Exception { - logger.debug( + this.logger.debug( "Using default configure(HttpSecurity). If subclassed this will potentially override subclass configure(HttpSecurity)."); // @formatter:off @@ -378,20 +378,20 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu ObjectPostProcessor objectPostProcessor = context.getBean(ObjectPostProcessor.class); LazyPasswordEncoder passwordEncoder = new LazyPasswordEncoder(context); - authenticationBuilder = new DefaultPasswordEncoderAuthenticationManagerBuilder(objectPostProcessor, + this.authenticationBuilder = new DefaultPasswordEncoderAuthenticationManagerBuilder(objectPostProcessor, passwordEncoder); - localConfigureAuthenticationBldr = new DefaultPasswordEncoderAuthenticationManagerBuilder(objectPostProcessor, - passwordEncoder) { + this.localConfigureAuthenticationBldr = new DefaultPasswordEncoderAuthenticationManagerBuilder( + objectPostProcessor, passwordEncoder) { @Override public AuthenticationManagerBuilder eraseCredentials(boolean eraseCredentials) { - authenticationBuilder.eraseCredentials(eraseCredentials); + WebSecurityConfigurerAdapter.this.authenticationBuilder.eraseCredentials(eraseCredentials); return super.eraseCredentials(eraseCredentials); } @Override public AuthenticationManagerBuilder authenticationEventPublisher( AuthenticationEventPublisher eventPublisher) { - authenticationBuilder.authenticationEventPublisher(eventPublisher); + WebSecurityConfigurerAdapter.this.authenticationBuilder.authenticationEventPublisher(eventPublisher); return super.authenticationEventPublisher(eventPublisher); } }; @@ -430,11 +430,11 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu */ private Map, Object> createSharedObjects() { Map, Object> sharedObjects = new HashMap<>(); - sharedObjects.putAll(localConfigureAuthenticationBldr.getSharedObjects()); + sharedObjects.putAll(this.localConfigureAuthenticationBldr.getSharedObjects()); sharedObjects.put(UserDetailsService.class, userDetailsService()); - sharedObjects.put(ApplicationContext.class, context); - sharedObjects.put(ContentNegotiationStrategy.class, contentNegotiationStrategy); - sharedObjects.put(AuthenticationTrustResolver.class, trustResolver); + sharedObjects.put(ApplicationContext.class, this.context); + sharedObjects.put(ContentNegotiationStrategy.class, this.contentNegotiationStrategy); + sharedObjects.put(AuthenticationTrustResolver.class, this.trustResolver); return sharedObjects; } @@ -462,27 +462,27 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu } public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - if (delegate != null) { - return delegate.loadUserByUsername(username); + if (this.delegate != null) { + return this.delegate.loadUserByUsername(username); } - synchronized (delegateMonitor) { - if (delegate == null) { - for (AuthenticationManagerBuilder delegateBuilder : delegateBuilders) { - delegate = delegateBuilder.getDefaultUserDetailsService(); - if (delegate != null) { + synchronized (this.delegateMonitor) { + if (this.delegate == null) { + for (AuthenticationManagerBuilder delegateBuilder : this.delegateBuilders) { + this.delegate = delegateBuilder.getDefaultUserDetailsService(); + if (this.delegate != null) { break; } } - if (delegate == null) { + if (this.delegate == null) { throw new IllegalStateException("UserDetailsService is required."); } this.delegateBuilders = null; } } - return delegate.loadUserByUsername(username); + return this.delegate.loadUserByUsername(username); } } @@ -509,24 +509,24 @@ public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigu Field parentAuthMgrField = ReflectionUtils.findField(AuthenticationManagerBuilder.class, "parentAuthenticationManager"); ReflectionUtils.makeAccessible(parentAuthMgrField); - beanNames = getAuthenticationManagerBeanNames(context); - validateBeanCycle(ReflectionUtils.getField(parentAuthMgrField, delegateBuilder), beanNames); + this.beanNames = getAuthenticationManagerBeanNames(context); + validateBeanCycle(ReflectionUtils.getField(parentAuthMgrField, delegateBuilder), this.beanNames); this.delegateBuilder = delegateBuilder; } public Authentication authenticate(Authentication authentication) throws AuthenticationException { - if (delegate != null) { - return delegate.authenticate(authentication); + if (this.delegate != null) { + return this.delegate.authenticate(authentication); } - synchronized (delegateMonitor) { - if (delegate == null) { - delegate = this.delegateBuilder.getObject(); + synchronized (this.delegateMonitor) { + if (this.delegate == null) { + this.delegate = this.delegateBuilder.getObject(); this.delegateBuilder = null; } } - return delegate.authenticate(authentication); + return this.delegate.authenticate(authentication); } private static Set getAuthenticationManagerBeanNames(ApplicationContext applicationContext) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java index 5bec102392..a0f88c138c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java @@ -141,7 +141,7 @@ public abstract class AbstractAuthenticationFilterConfigurer logoutConfigurer = getBuilder().getConfigurer(LogoutConfigurer.class); if (logoutConfigurer != null && !logoutConfigurer.isCustomLogoutSuccess()) { - logoutConfigurer.logoutSuccessUrl(loginPage + "?logout"); + logoutConfigurer.logoutSuccessUrl(this.loginPage + "?logout"); } } @@ -393,8 +393,8 @@ public abstract class AbstractAuthenticationFilterConfigurer extends A * {@link #chainRequestMatchers(java.util.List)} */ final List getUrlMappings() { - return urlMappings; + return this.urlMappings; } /** @@ -100,8 +100,8 @@ public abstract class AbstractConfigAttributeRequestMatcherRegistry extends A * {@link ConfigAttribute} instances. Cannot be null. */ final LinkedHashMap> createRequestMap() { - if (unmappedMatchers != null) { - throw new IllegalStateException("An incomplete mapping was found for " + unmappedMatchers + if (this.unmappedMatchers != null) { + throw new IllegalStateException("An incomplete mapping was found for " + this.unmappedMatchers + ". Try completing it with something like requestUrls()..hasRole('USER')"); } @@ -130,11 +130,11 @@ public abstract class AbstractConfigAttributeRequestMatcherRegistry extends A } public RequestMatcher getRequestMatcher() { - return requestMatcher; + return this.requestMatcher; } public Collection getConfigAttrs() { - return configAttrs; + return this.configAttrs; } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java index aa8bb0c8ab..dd1d6bc749 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java @@ -75,8 +75,8 @@ abstract class AbstractInterceptUrlConfigurer> @Override public void init(H http) { - if (authenticationProvider == null) { - authenticationProvider = new AnonymousAuthenticationProvider(getKey()); + if (this.authenticationProvider == null) { + this.authenticationProvider = new AnonymousAuthenticationProvider(getKey()); } - if (authenticationFilter == null) { - authenticationFilter = new AnonymousAuthenticationFilter(getKey(), principal, authorities); + if (this.authenticationFilter == null) { + this.authenticationFilter = new AnonymousAuthenticationFilter(getKey(), this.principal, this.authorities); } - authenticationProvider = postProcess(authenticationProvider); - http.authenticationProvider(authenticationProvider); + this.authenticationProvider = postProcess(this.authenticationProvider); + http.authenticationProvider(this.authenticationProvider); } @Override public void configure(H http) { - authenticationFilter.afterPropertiesSet(); - http.addFilter(authenticationFilter); + this.authenticationFilter.afterPropertiesSet(); + http.addFilter(this.authenticationFilter); } private String getKey() { - if (key == null) { - key = UUID.randomUUID().toString(); + if (this.key == null) { + this.key = UUID.randomUUID().toString(); } - return key; + return this.key; } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java index 30d08a20c9..54369e6894 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java @@ -96,7 +96,7 @@ public final class ChannelSecurityConfigurer> } public ChannelRequestMatcherRegistry getRegistry() { - return REGISTRY; + return this.REGISTRY; } @Override @@ -105,19 +105,19 @@ public final class ChannelSecurityConfigurer> channelDecisionManager.setChannelProcessors(getChannelProcessors(http)); channelDecisionManager = postProcess(channelDecisionManager); - channelFilter.setChannelDecisionManager(channelDecisionManager); + this.channelFilter.setChannelDecisionManager(channelDecisionManager); DefaultFilterInvocationSecurityMetadataSource filterInvocationSecurityMetadataSource = new DefaultFilterInvocationSecurityMetadataSource( - requestMap); - channelFilter.setSecurityMetadataSource(filterInvocationSecurityMetadataSource); + this.requestMap); + this.channelFilter.setSecurityMetadataSource(filterInvocationSecurityMetadataSource); - channelFilter = postProcess(channelFilter); - http.addFilter(channelFilter); + this.channelFilter = postProcess(this.channelFilter); + http.addFilter(this.channelFilter); } private List getChannelProcessors(H http) { - if (channelProcessors != null) { - return channelProcessors; + if (this.channelProcessors != null) { + return this.channelProcessors; } InsecureChannelProcessor insecureChannelProcessor = new InsecureChannelProcessor(); @@ -141,9 +141,9 @@ public final class ChannelSecurityConfigurer> private ChannelRequestMatcherRegistry addAttribute(String attribute, List matchers) { for (RequestMatcher matcher : matchers) { Collection attrs = Arrays.asList(new SecurityConfig(attribute)); - requestMap.put(matcher, attrs); + this.requestMap.put(matcher, attrs); } - return REGISTRY; + return this.REGISTRY; } public final class ChannelRequestMatcherRegistry @@ -233,7 +233,7 @@ public final class ChannelSecurityConfigurer> } public ChannelRequestMatcherRegistry requires(String attribute) { - return addAttribute(attribute, requestMatchers); + return addAttribute(attribute, this.requestMatchers); } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java index 0f373d4f8d..0e2d3567e1 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java @@ -84,7 +84,7 @@ public final class DefaultLoginPageConfigurer> }; this.loginPageGeneratingFilter.setResolveHiddenInputs(hiddenInputs); this.logoutPageGeneratingFilter.setResolveHiddenInputs(hiddenInputs); - http.setSharedObject(DefaultLoginPageGeneratingFilter.class, loginPageGeneratingFilter); + http.setSharedObject(DefaultLoginPageGeneratingFilter.class, this.loginPageGeneratingFilter); } @Override @@ -96,9 +96,9 @@ public final class DefaultLoginPageConfigurer> authenticationEntryPoint = exceptionConf.getAuthenticationEntryPoint(); } - if (loginPageGeneratingFilter.isEnabled() && authenticationEntryPoint == null) { - loginPageGeneratingFilter = postProcess(loginPageGeneratingFilter); - http.addFilter(loginPageGeneratingFilter); + if (this.loginPageGeneratingFilter.isEnabled() && authenticationEntryPoint == null) { + this.loginPageGeneratingFilter = postProcess(this.loginPageGeneratingFilter); + http.addFilter(this.loginPageGeneratingFilter); http.addFilter(this.logoutPageGeneratingFilter); } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java index 8d14c69455..d75c6d44b4 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java @@ -106,7 +106,7 @@ public final class ExpressionUrlAuthorizationConfigurer requestMatchers, Collection configAttributes) { for (RequestMatcher requestMatcher : requestMatchers) { - REGISTRY.addMapping( + this.REGISTRY.addMapping( new AbstractConfigAttributeRequestMatcherRegistry.UrlMapping(requestMatcher, configAttributes)); } } @@ -192,7 +192,7 @@ public final class ExpressionUrlAuthorizationConfigurer> requestMap = REGISTRY.createRequestMap(); + LinkedHashMap> requestMap = this.REGISTRY.createRequestMap(); if (requestMap.isEmpty()) { throw new IllegalStateException( "At least one mapping is required (i.e. authorizeRequests().anyRequest().authenticated())"); @@ -201,7 +201,7 @@ public final class ExpressionUrlAuthorizationConfigurer getExpressionHandler(H http) { - if (expressionHandler == null) { + if (this.expressionHandler == null) { DefaultWebSecurityExpressionHandler defaultHandler = new DefaultWebSecurityExpressionHandler(); AuthenticationTrustResolver trustResolver = http.getSharedObject(AuthenticationTrustResolver.class); if (trustResolver != null) { @@ -228,10 +228,10 @@ public final class ExpressionUrlAuthorizationConfigurer> * @return the {@link ContentTypeOptionsConfig} for additional customizations */ public ContentTypeOptionsConfig contentTypeOptions() { - return contentTypeOptions.enable(); + return this.contentTypeOptions.enable(); } /** @@ -141,7 +141,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional customizations */ public HeadersConfigurer contentTypeOptions(Customizer contentTypeOptionsCustomizer) { - contentTypeOptionsCustomizer.customize(contentTypeOptions.enable()); + contentTypeOptionsCustomizer.customize(this.contentTypeOptions.enable()); return HeadersConfigurer.this; } @@ -158,7 +158,7 @@ public class HeadersConfigurer> * @return {@link HeadersConfigurer} for additional customization. */ public HeadersConfigurer disable() { - writer = null; + this.writer = null; return and(); } @@ -175,8 +175,8 @@ public class HeadersConfigurer> * @return the {@link ContentTypeOptionsConfig} for additional customization */ private ContentTypeOptionsConfig enable() { - if (writer == null) { - writer = new XContentTypeOptionsHeaderWriter(); + if (this.writer == null) { + this.writer = new XContentTypeOptionsHeaderWriter(); } return this; } @@ -194,7 +194,7 @@ public class HeadersConfigurer> * @return the {@link XXssConfig} for additional customizations */ public XXssConfig xssProtection() { - return xssProtection.enable(); + return this.xssProtection.enable(); } /** @@ -210,7 +210,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional customizations */ public HeadersConfigurer xssProtection(Customizer xssCustomizer) { - xssCustomizer.customize(xssProtection.enable()); + xssCustomizer.customize(this.xssProtection.enable()); return HeadersConfigurer.this; } @@ -228,7 +228,7 @@ public class HeadersConfigurer> * @param enabled the new value */ public XXssConfig block(boolean enabled) { - writer.setBlock(enabled); + this.writer.setBlock(enabled); return this; } @@ -256,7 +256,7 @@ public class HeadersConfigurer> * @param enabled the new value */ public XXssConfig xssProtectionEnabled(boolean enabled) { - writer.setEnabled(enabled); + this.writer.setEnabled(enabled); return this; } @@ -265,7 +265,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional configuration */ public HeadersConfigurer disable() { - writer = null; + this.writer = null; return and(); } @@ -283,8 +283,8 @@ public class HeadersConfigurer> * @return the {@link XXssConfig} for additional customization */ private XXssConfig enable() { - if (writer == null) { - writer = new XXssProtectionHeaderWriter(); + if (this.writer == null) { + this.writer = new XXssProtectionHeaderWriter(); } return this; } @@ -302,7 +302,7 @@ public class HeadersConfigurer> * @return the {@link CacheControlConfig} for additional customizations */ public CacheControlConfig cacheControl() { - return cacheControl.enable(); + return this.cacheControl.enable(); } /** @@ -318,7 +318,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional customizations */ public HeadersConfigurer cacheControl(Customizer cacheControlCustomizer) { - cacheControlCustomizer.customize(cacheControl.enable()); + cacheControlCustomizer.customize(this.cacheControl.enable()); return HeadersConfigurer.this; } @@ -335,7 +335,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional configuration */ public HeadersConfigurer disable() { - writer = null; + this.writer = null; return HeadersConfigurer.this; } @@ -353,8 +353,8 @@ public class HeadersConfigurer> * @return the {@link CacheControlConfig} for additional customization */ private CacheControlConfig enable() { - if (writer == null) { - writer = new CacheControlHeadersWriter(); + if (this.writer == null) { + this.writer = new CacheControlHeadersWriter(); } return this; } @@ -368,7 +368,7 @@ public class HeadersConfigurer> * @return the {@link HstsConfig} for additional customizations */ public HstsConfig httpStrictTransportSecurity() { - return hsts.enable(); + return this.hsts.enable(); } /** @@ -380,7 +380,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional customizations */ public HeadersConfigurer httpStrictTransportSecurity(Customizer hstsCustomizer) { - hstsCustomizer.customize(hsts.enable()); + hstsCustomizer.customize(this.hsts.enable()); return HeadersConfigurer.this; } @@ -409,7 +409,7 @@ public class HeadersConfigurer> * @throws IllegalArgumentException if maxAgeInSeconds is negative */ public HstsConfig maxAgeInSeconds(long maxAgeInSeconds) { - writer.setMaxAgeInSeconds(maxAgeInSeconds); + this.writer.setMaxAgeInSeconds(maxAgeInSeconds); return this; } @@ -422,7 +422,7 @@ public class HeadersConfigurer> * @throws IllegalArgumentException if {@link RequestMatcher} is null */ public HstsConfig requestMatcher(RequestMatcher requestMatcher) { - writer.setRequestMatcher(requestMatcher); + this.writer.setRequestMatcher(requestMatcher); return this; } @@ -438,7 +438,7 @@ public class HeadersConfigurer> * @param includeSubDomains true to include subdomains, else false */ public HstsConfig includeSubDomains(boolean includeSubDomains) { - writer.setIncludeSubDomains(includeSubDomains); + this.writer.setIncludeSubDomains(includeSubDomains); return this; } @@ -456,7 +456,7 @@ public class HeadersConfigurer> * @author Ankur Pathak */ public HstsConfig preload(boolean preload) { - writer.setPreload(preload); + this.writer.setPreload(preload); return this; } @@ -465,7 +465,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional configuration */ public HeadersConfigurer disable() { - writer = null; + this.writer = null; return HeadersConfigurer.this; } @@ -483,8 +483,8 @@ public class HeadersConfigurer> * @return the {@link HstsConfig} for additional customization */ private HstsConfig enable() { - if (writer == null) { - writer = new HstsHeaderWriter(); + if (this.writer == null) { + this.writer = new HstsHeaderWriter(); } return this; } @@ -496,7 +496,7 @@ public class HeadersConfigurer> * @return the {@link FrameOptionsConfig} for additional customizations */ public FrameOptionsConfig frameOptions() { - return frameOptions.enable(); + return this.frameOptions.enable(); } /** @@ -506,7 +506,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional customizations */ public HeadersConfigurer frameOptions(Customizer frameOptionsCustomizer) { - frameOptionsCustomizer.customize(frameOptions.enable()); + frameOptionsCustomizer.customize(this.frameOptions.enable()); return HeadersConfigurer.this; } @@ -523,7 +523,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional customization. */ public HeadersConfigurer deny() { - writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY); + this.writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY); return and(); } @@ -537,7 +537,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional customization. */ public HeadersConfigurer sameOrigin() { - writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.SAMEORIGIN); + this.writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.SAMEORIGIN); return and(); } @@ -546,7 +546,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional configuration. */ public HeadersConfigurer disable() { - writer = null; + this.writer = null; return and(); } @@ -563,8 +563,8 @@ public class HeadersConfigurer> * @return the FrameOptionsConfig for additional customization. */ private FrameOptionsConfig enable() { - if (writer == null) { - writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY); + if (this.writer == null) { + this.writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY); } return this; } @@ -579,7 +579,7 @@ public class HeadersConfigurer> * @since 4.1 */ public HpkpConfig httpPublicKeyPinning() { - return hpkp.enable(); + return this.hpkp.enable(); } /** @@ -590,7 +590,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional customizations */ public HeadersConfigurer httpPublicKeyPinning(Customizer hpkpCustomizer) { - hpkpCustomizer.customize(hpkp.enable()); + hpkpCustomizer.customize(this.hpkp.enable()); return HeadersConfigurer.this; } @@ -617,7 +617,7 @@ public class HeadersConfigurer> * @throws IllegalArgumentException if pins is null */ public HpkpConfig withPins(Map pins) { - writer.setPins(pins); + this.writer.setPins(pins); return this; } @@ -637,7 +637,7 @@ public class HeadersConfigurer> * @throws IllegalArgumentException if a pin is null */ public HpkpConfig addSha256Pins(String... pins) { - writer.addSha256Pins(pins); + this.writer.addSha256Pins(pins); return this; } @@ -658,7 +658,7 @@ public class HeadersConfigurer> * @throws IllegalArgumentException if maxAgeInSeconds is negative */ public HpkpConfig maxAgeInSeconds(long maxAgeInSeconds) { - writer.setMaxAgeInSeconds(maxAgeInSeconds); + this.writer.setMaxAgeInSeconds(maxAgeInSeconds); return this; } @@ -675,7 +675,7 @@ public class HeadersConfigurer> * @param includeSubDomains true to include subdomains, else false */ public HpkpConfig includeSubDomains(boolean includeSubDomains) { - writer.setIncludeSubDomains(includeSubDomains); + this.writer.setIncludeSubDomains(includeSubDomains); return this; } @@ -692,7 +692,7 @@ public class HeadersConfigurer> * @param reportOnly true to report only, else false */ public HpkpConfig reportOnly(boolean reportOnly) { - writer.setReportOnly(reportOnly); + this.writer.setReportOnly(reportOnly); return this; } @@ -708,7 +708,7 @@ public class HeadersConfigurer> * @param reportUri the URI where the browser should send the report to. */ public HpkpConfig reportUri(URI reportUri) { - writer.setReportUri(reportUri); + this.writer.setReportUri(reportUri); return this; } @@ -725,7 +725,7 @@ public class HeadersConfigurer> * @throws IllegalArgumentException if the reportUri is not a valid URI */ public HpkpConfig reportUri(String reportUri) { - writer.setReportUri(reportUri); + this.writer.setReportUri(reportUri); return this; } @@ -734,7 +734,7 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional configuration. */ public HeadersConfigurer disable() { - writer = null; + this.writer = null; return and(); } @@ -753,8 +753,8 @@ public class HeadersConfigurer> * @return the {@link HstsConfig} for additional customization */ private HpkpConfig enable() { - if (writer == null) { - writer = new HpkpHeaderWriter(); + if (this.writer == null) { + this.writer = new HpkpHeaderWriter(); } return this; } @@ -788,7 +788,7 @@ public class HeadersConfigurer> */ public ContentSecurityPolicyConfig contentSecurityPolicy(String policyDirectives) { this.contentSecurityPolicy.writer = new ContentSecurityPolicyHeaderWriter(policyDirectives); - return contentSecurityPolicy; + return this.contentSecurityPolicy; } /** @@ -874,11 +874,11 @@ public class HeadersConfigurer> * @return the {@link HeadersConfigurer} for additional customization */ public HeadersConfigurer defaultsDisabled() { - contentTypeOptions.disable(); - xssProtection.disable(); - cacheControl.disable(); - hsts.disable(); - frameOptions.disable(); + this.contentTypeOptions.disable(); + this.xssProtection.disable(); + this.cacheControl.disable(); + this.hsts.disable(); + this.frameOptions.disable(); return this; } @@ -909,16 +909,16 @@ public class HeadersConfigurer> */ private List getHeaderWriters() { List writers = new ArrayList<>(); - addIfNotNull(writers, contentTypeOptions.writer); - addIfNotNull(writers, xssProtection.writer); - addIfNotNull(writers, cacheControl.writer); - addIfNotNull(writers, hsts.writer); - addIfNotNull(writers, frameOptions.writer); - addIfNotNull(writers, hpkp.writer); - addIfNotNull(writers, contentSecurityPolicy.writer); - addIfNotNull(writers, referrerPolicy.writer); - addIfNotNull(writers, featurePolicy.writer); - writers.addAll(headerWriters); + addIfNotNull(writers, this.contentTypeOptions.writer); + addIfNotNull(writers, this.xssProtection.writer); + addIfNotNull(writers, this.cacheControl.writer); + addIfNotNull(writers, this.hsts.writer); + addIfNotNull(writers, this.frameOptions.writer); + addIfNotNull(writers, this.hpkp.writer); + addIfNotNull(writers, this.contentSecurityPolicy.writer); + addIfNotNull(writers, this.referrerPolicy.writer); + addIfNotNull(writers, this.featurePolicy.writer); + writers.addAll(this.headerWriters); return writers; } @@ -1045,7 +1045,7 @@ public class HeadersConfigurer> */ public FeaturePolicyConfig featurePolicy(String policyDirectives) { this.featurePolicy.writer = new FeaturePolicyHeaderWriter(policyDirectives); - return featurePolicy; + return this.featurePolicy; } public final class FeaturePolicyConfig { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java index 67151567e6..999bd834b4 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java @@ -212,14 +212,15 @@ public final class JeeConfigurer> extends Abstr * @return the {@link J2eePreAuthenticatedProcessingFilter} to use. */ private J2eePreAuthenticatedProcessingFilter getFilter(AuthenticationManager authenticationManager) { - if (j2eePreAuthenticatedProcessingFilter == null) { - j2eePreAuthenticatedProcessingFilter = new J2eePreAuthenticatedProcessingFilter(); - j2eePreAuthenticatedProcessingFilter.setAuthenticationManager(authenticationManager); - j2eePreAuthenticatedProcessingFilter.setAuthenticationDetailsSource(createWebAuthenticationDetailsSource()); - j2eePreAuthenticatedProcessingFilter = postProcess(j2eePreAuthenticatedProcessingFilter); + if (this.j2eePreAuthenticatedProcessingFilter == null) { + this.j2eePreAuthenticatedProcessingFilter = new J2eePreAuthenticatedProcessingFilter(); + this.j2eePreAuthenticatedProcessingFilter.setAuthenticationManager(authenticationManager); + this.j2eePreAuthenticatedProcessingFilter + .setAuthenticationDetailsSource(createWebAuthenticationDetailsSource()); + this.j2eePreAuthenticatedProcessingFilter = postProcess(this.j2eePreAuthenticatedProcessingFilter); } - return j2eePreAuthenticatedProcessingFilter; + return this.j2eePreAuthenticatedProcessingFilter; } /** @@ -228,8 +229,8 @@ public final class JeeConfigurer> extends Abstr * @return the {@link AuthenticationUserDetailsService} to use */ private AuthenticationUserDetailsService getUserDetailsService() { - return authenticationUserDetailsService == null ? new PreAuthenticatedGrantedAuthoritiesUserDetailsService() - : authenticationUserDetailsService; + return this.authenticationUserDetailsService == null + ? new PreAuthenticatedGrantedAuthoritiesUserDetailsService() : this.authenticationUserDetailsService; } /** @@ -241,7 +242,7 @@ public final class JeeConfigurer> extends Abstr private J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource createWebAuthenticationDetailsSource() { J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource detailsSource = new J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource(); SimpleMappableAttributesRetriever rolesRetriever = new SimpleMappableAttributesRetriever(); - rolesRetriever.setMappableAttributes(mappableRoles); + rolesRetriever.setMappableAttributes(this.mappableRoles); detailsSource.setMappableRolesRetriever(rolesRetriever); detailsSource = postProcess(detailsSource); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java index 7b9aa5132a..bb9a63f159 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java @@ -114,7 +114,7 @@ public final class LogoutConfigurer> * @return the {@link LogoutConfigurer} for further customization */ public LogoutConfigurer clearAuthentication(boolean clearAuthentication) { - contextLogoutHandler.setClearAuthentication(clearAuthentication); + this.contextLogoutHandler.setClearAuthentication(clearAuthentication); return this; } @@ -126,7 +126,7 @@ public final class LogoutConfigurer> * @return the {@link LogoutConfigurer} for further customization */ public LogoutConfigurer invalidateHttpSession(boolean invalidateHttpSession) { - contextLogoutHandler.setInvalidateHttpSession(invalidateHttpSession); + this.contextLogoutHandler.setInvalidateHttpSession(invalidateHttpSession); return this; } @@ -259,19 +259,19 @@ public final class LogoutConfigurer> private LogoutSuccessHandler createDefaultSuccessHandler() { SimpleUrlLogoutSuccessHandler urlLogoutHandler = new SimpleUrlLogoutSuccessHandler(); - urlLogoutHandler.setDefaultTargetUrl(logoutSuccessUrl); - if (defaultLogoutSuccessHandlerMappings.isEmpty()) { + urlLogoutHandler.setDefaultTargetUrl(this.logoutSuccessUrl); + if (this.defaultLogoutSuccessHandlerMappings.isEmpty()) { return urlLogoutHandler; } DelegatingLogoutSuccessHandler successHandler = new DelegatingLogoutSuccessHandler( - defaultLogoutSuccessHandlerMappings); + this.defaultLogoutSuccessHandlerMappings); successHandler.setDefaultLogoutSuccessHandler(urlLogoutHandler); return successHandler; } @Override public void init(H http) { - if (permitAll) { + if (this.permitAll) { PermitAllSupport.permitAll(http, this.logoutSuccessUrl); PermitAllSupport.permitAll(http, this.getLogoutRequestMatcher(http)); } @@ -296,7 +296,7 @@ public final class LogoutConfigurer> * @return true if logout success handling has been customized, else false */ boolean isCustomLogoutSuccess() { - return customLogoutSuccess; + return this.customLogoutSuccess; } /** @@ -305,7 +305,7 @@ public final class LogoutConfigurer> * @return the logoutSuccessUrl */ private String getLogoutSuccessUrl() { - return logoutSuccessUrl; + return this.logoutSuccessUrl; } /** @@ -313,7 +313,7 @@ public final class LogoutConfigurer> * @return the {@link LogoutHandler} instances. Cannot be null. */ List getLogoutHandlers() { - return logoutHandlers; + return this.logoutHandlers; } /** @@ -324,9 +324,9 @@ public final class LogoutConfigurer> * @return the {@link LogoutFilter} to use. */ private LogoutFilter createLogoutFilter(H http) { - logoutHandlers.add(contextLogoutHandler); - logoutHandlers.add(postProcess(new LogoutSuccessEventPublishingLogoutHandler())); - LogoutHandler[] handlers = logoutHandlers.toArray(new LogoutHandler[0]); + this.logoutHandlers.add(this.contextLogoutHandler); + this.logoutHandlers.add(postProcess(new LogoutSuccessEventPublishingLogoutHandler())); + LogoutHandler[] handlers = this.logoutHandlers.toArray(new LogoutHandler[0]); LogoutFilter result = new LogoutFilter(getLogoutSuccessHandler(), handlers); result.setLogoutRequestMatcher(getLogoutRequestMatcher(http)); result = postProcess(result); @@ -335,8 +335,8 @@ public final class LogoutConfigurer> @SuppressWarnings("unchecked") private RequestMatcher getLogoutRequestMatcher(H http) { - if (logoutRequestMatcher != null) { - return logoutRequestMatcher; + if (this.logoutRequestMatcher != null) { + return this.logoutRequestMatcher; } if (http.getConfigurer(CsrfConfigurer.class) != null) { this.logoutRequestMatcher = new AntPathRequestMatcher(this.logoutUrl, "POST"); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java index 78ebe6417d..0d8a6cecf2 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java @@ -73,16 +73,16 @@ final class PermitAllSupport { } if ("".equals(request.getContextPath())) { - return uri.equals(processUrl); + return uri.equals(this.processUrl); } - return uri.equals(request.getContextPath() + processUrl); + return uri.equals(request.getContextPath() + this.processUrl); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("ExactUrl [processUrl='").append(processUrl).append("']"); + sb.append("ExactUrl [processUrl='").append(this.processUrl).append("']"); return sb.toString(); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java index 983cc726b2..25bd2b1b77 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java @@ -75,12 +75,12 @@ public final class PortMapperConfigurer> * @return the {@link PortMapper} to use */ private PortMapper getPortMapper() { - if (portMapper == null) { + if (this.portMapper == null) { PortMapperImpl portMapper = new PortMapperImpl(); - portMapper.setPortMappings(httpsPortMappings); + portMapper.setPortMappings(this.httpsPortMappings); this.portMapper = portMapper; } - return portMapper; + return this.portMapper; } /** @@ -109,7 +109,7 @@ public final class PortMapperConfigurer> * @return the {@link PortMapperConfigurer} for further customization */ public PortMapperConfigurer mapsTo(int httpsPort) { - httpsPortMappings.put(String.valueOf(httpPort), String.valueOf(httpsPort)); + PortMapperConfigurer.this.httpsPortMappings.put(String.valueOf(this.httpPort), String.valueOf(httpsPort)); return PortMapperConfigurer.this; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java index 878f11ed6c..a4aa031a56 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java @@ -424,7 +424,7 @@ public final class RememberMeConfigurer> private String getKey() { if (this.key == null) { if (this.rememberMeServices instanceof AbstractRememberMeServices) { - this.key = ((AbstractRememberMeServices) rememberMeServices).getKey(); + this.key = ((AbstractRememberMeServices) this.rememberMeServices).getKey(); } else { this.key = UUID.randomUUID().toString(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java index 3175ac3f30..9cc00c5862 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java @@ -70,24 +70,24 @@ public final class ServletApiConfigurer> } public ServletApiConfigurer rolePrefix(String rolePrefix) { - securityContextRequestFilter.setRolePrefix(rolePrefix); + this.securityContextRequestFilter.setRolePrefix(rolePrefix); return this; } @Override @SuppressWarnings("unchecked") public void configure(H http) { - securityContextRequestFilter.setAuthenticationManager(http.getSharedObject(AuthenticationManager.class)); + this.securityContextRequestFilter.setAuthenticationManager(http.getSharedObject(AuthenticationManager.class)); ExceptionHandlingConfigurer exceptionConf = http.getConfigurer(ExceptionHandlingConfigurer.class); AuthenticationEntryPoint authenticationEntryPoint = exceptionConf == null ? null : exceptionConf.getAuthenticationEntryPoint(http); - securityContextRequestFilter.setAuthenticationEntryPoint(authenticationEntryPoint); + this.securityContextRequestFilter.setAuthenticationEntryPoint(authenticationEntryPoint); LogoutConfigurer logoutConf = http.getConfigurer(LogoutConfigurer.class); List logoutHandlers = logoutConf == null ? null : logoutConf.getLogoutHandlers(); - securityContextRequestFilter.setLogoutHandlers(logoutHandlers); + this.securityContextRequestFilter.setLogoutHandlers(logoutHandlers); AuthenticationTrustResolver trustResolver = http.getSharedObject(AuthenticationTrustResolver.class); if (trustResolver != null) { - securityContextRequestFilter.setTrustResolver(trustResolver); + this.securityContextRequestFilter.setTrustResolver(trustResolver); } ApplicationContext context = http.getSharedObject(ApplicationContext.class); if (context != null) { @@ -95,11 +95,11 @@ public final class ServletApiConfigurer> if (grantedAuthorityDefaultsBeanNames.length == 1) { GrantedAuthorityDefaults grantedAuthorityDefaults = context .getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class); - securityContextRequestFilter.setRolePrefix(grantedAuthorityDefaults.getRolePrefix()); + this.securityContextRequestFilter.setRolePrefix(grantedAuthorityDefaults.getRolePrefix()); } } - securityContextRequestFilter = postProcess(securityContextRequestFilter); - http.addFilter(securityContextRequestFilter); + this.securityContextRequestFilter = postProcess(this.securityContextRequestFilter); + http.addFilter(this.securityContextRequestFilter); } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java index 3bb7f5c96c..3c9458ff72 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java @@ -100,7 +100,7 @@ public final class UrlAuthorizationConfigurer> * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customizations */ public StandardInterceptUrlRegistry getRegistry() { - return REGISTRY; + return this.REGISTRY; } /** @@ -176,7 +176,7 @@ public final class UrlAuthorizationConfigurer> */ @Override FilterInvocationSecurityMetadataSource createMetadataSource(H http) { - return new DefaultFilterInvocationSecurityMetadataSource(REGISTRY.createRequestMap()); + return new DefaultFilterInvocationSecurityMetadataSource(this.REGISTRY.createRequestMap()); } /** @@ -191,10 +191,10 @@ public final class UrlAuthorizationConfigurer> private StandardInterceptUrlRegistry addMapping(Iterable requestMatchers, Collection configAttributes) { for (RequestMatcher requestMatcher : requestMatchers) { - REGISTRY.addMapping( + this.REGISTRY.addMapping( new AbstractConfigAttributeRequestMatcherRegistry.UrlMapping(requestMatcher, configAttributes)); } - return REGISTRY; + return this.REGISTRY; } /** @@ -334,7 +334,7 @@ public final class UrlAuthorizationConfigurer> * @return the {@link UrlAuthorizationConfigurer} for further customization */ public StandardInterceptUrlRegistry access(String... attributes) { - addMapping(requestMatchers, SecurityConfig.createList(attributes)); + addMapping(this.requestMatchers, SecurityConfig.createList(attributes)); return UrlAuthorizationConfigurer.this.REGISTRY; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java index 072084b45b..674135f333 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java @@ -185,27 +185,27 @@ public final class X509Configurer> } private X509AuthenticationFilter getFilter(AuthenticationManager authenticationManager) { - if (x509AuthenticationFilter == null) { - x509AuthenticationFilter = new X509AuthenticationFilter(); - x509AuthenticationFilter.setAuthenticationManager(authenticationManager); - if (x509PrincipalExtractor != null) { - x509AuthenticationFilter.setPrincipalExtractor(x509PrincipalExtractor); + if (this.x509AuthenticationFilter == null) { + this.x509AuthenticationFilter = new X509AuthenticationFilter(); + this.x509AuthenticationFilter.setAuthenticationManager(authenticationManager); + if (this.x509PrincipalExtractor != null) { + this.x509AuthenticationFilter.setPrincipalExtractor(this.x509PrincipalExtractor); } - if (authenticationDetailsSource != null) { - x509AuthenticationFilter.setAuthenticationDetailsSource(authenticationDetailsSource); + if (this.authenticationDetailsSource != null) { + this.x509AuthenticationFilter.setAuthenticationDetailsSource(this.authenticationDetailsSource); } - x509AuthenticationFilter = postProcess(x509AuthenticationFilter); + this.x509AuthenticationFilter = postProcess(this.x509AuthenticationFilter); } - return x509AuthenticationFilter; + return this.x509AuthenticationFilter; } private AuthenticationUserDetailsService getAuthenticationUserDetailsService( H http) { - if (authenticationUserDetailsService == null) { + if (this.authenticationUserDetailsService == null) { userDetailsService(http.getSharedObject(UserDetailsService.class)); } - return authenticationUserDetailsService; + return this.authenticationUserDetailsService; } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java index 8c485b9850..7e5ab127bb 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java @@ -210,9 +210,9 @@ public final class Saml2LoginConfigurer> this.relyingPartyRegistrationRepository = getSharedOrBean(http, RelyingPartyRegistrationRepository.class); } - saml2WebSsoAuthenticationFilter = new Saml2WebSsoAuthenticationFilter(getAuthenticationConverter(http), + this.saml2WebSsoAuthenticationFilter = new Saml2WebSsoAuthenticationFilter(getAuthenticationConverter(http), this.loginProcessingUrl); - setAuthenticationFilter(saml2WebSsoAuthenticationFilter); + setAuthenticationFilter(this.saml2WebSsoAuthenticationFilter); super.loginProcessingUrl(this.loginProcessingUrl); if (hasText(this.loginPage)) { @@ -258,7 +258,7 @@ public final class Saml2LoginConfigurer> registerDefaultAuthenticationProvider(http); } else { - saml2WebSsoAuthenticationFilter.setAuthenticationManager(this.authenticationManager); + this.saml2WebSsoAuthenticationFilter.setAuthenticationManager(this.authenticationManager); } } @@ -281,7 +281,7 @@ public final class Saml2LoginConfigurer> return; } - csrf.ignoringRequestMatchers(new AntPathRequestMatcher(loginProcessingUrl)); + csrf.ignoringRequestMatchers(new AntPathRequestMatcher(this.loginProcessingUrl)); } private void initDefaultLoginFilter(B http) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java index 4017be49e2..ecf90a4c93 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java @@ -231,7 +231,7 @@ public class MessageSecurityMetadataSourceRegistry { matcherToExpression.put(entry.getKey().build(), entry.getValue()); } return ExpressionBasedMessageSecurityMetadataSourceFactory - .createExpressionMessageMetadataSource(matcherToExpression, expressionHandler); + .createExpressionMessageMetadataSource(matcherToExpression, this.expressionHandler); } /** @@ -378,8 +378,8 @@ public class MessageSecurityMetadataSourceRegistry { * customization */ public MessageSecurityMetadataSourceRegistry access(String attribute) { - for (MatcherBuilder messageMatcher : messageMatchers) { - matcherToExpression.put(messageMatcher, attribute); + for (MatcherBuilder messageMatcher : this.messageMatchers) { + MessageSecurityMetadataSourceRegistry.this.matcherToExpression.put(messageMatcher, attribute); } return MessageSecurityMetadataSourceRegistry.this; } @@ -418,7 +418,7 @@ public class MessageSecurityMetadataSourceRegistry { } public MessageMatcher build() { - return matcher; + return this.matcher; } } @@ -435,16 +435,19 @@ public class MessageSecurityMetadataSourceRegistry { } public MessageMatcher build() { - if (type == null) { - return new SimpDestinationMessageMatcher(pattern, pathMatcher); + if (this.type == null) { + return new SimpDestinationMessageMatcher(this.pattern, + MessageSecurityMetadataSourceRegistry.this.pathMatcher); } - else if (SimpMessageType.MESSAGE == type) { - return SimpDestinationMessageMatcher.createMessageMatcher(pattern, pathMatcher); + else if (SimpMessageType.MESSAGE == this.type) { + return SimpDestinationMessageMatcher.createMessageMatcher(this.pattern, + MessageSecurityMetadataSourceRegistry.this.pathMatcher); } - else if (SimpMessageType.SUBSCRIBE == type) { - return SimpDestinationMessageMatcher.createSubscribeMatcher(pattern, pathMatcher); + else if (SimpMessageType.SUBSCRIBE == this.type) { + return SimpDestinationMessageMatcher.createSubscribeMatcher(this.pattern, + MessageSecurityMetadataSourceRegistry.this.pathMatcher); } - throw new IllegalStateException(type + " is not supported since it does not have a destination"); + throw new IllegalStateException(this.type + " is not supported since it does not have a destination"); } } @@ -460,31 +463,31 @@ public class MessageSecurityMetadataSourceRegistry { private PathMatcher delegate = new AntPathMatcher(); public boolean isPattern(String path) { - return delegate.isPattern(path); + return this.delegate.isPattern(path); } public boolean match(String pattern, String path) { - return delegate.match(pattern, path); + return this.delegate.match(pattern, path); } public boolean matchStart(String pattern, String path) { - return delegate.matchStart(pattern, path); + return this.delegate.matchStart(pattern, path); } public String extractPathWithinPattern(String pattern, String path) { - return delegate.extractPathWithinPattern(pattern, path); + return this.delegate.extractPathWithinPattern(pattern, path); } public Map extractUriTemplateVariables(String pattern, String path) { - return delegate.extractUriTemplateVariables(pattern, path); + return this.delegate.extractUriTemplateVariables(pattern, path); } public Comparator getPatternComparator(String path) { - return delegate.getPatternComparator(path); + return this.delegate.getPatternComparator(path); } public String combine(String pattern1, String pattern2) { - return delegate.combine(pattern1, pattern2); + return this.delegate.combine(pattern1, pattern2); } void setPathMatcher(PathMatcher pathMatcher) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java index b048d19913..1e70040bd7 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java @@ -103,12 +103,12 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends A @Override public final void configureClientInboundChannel(ChannelRegistration registration) { - ChannelSecurityInterceptor inboundChannelSecurity = context.getBean(ChannelSecurityInterceptor.class); - registration.setInterceptors(context.getBean(SecurityContextChannelInterceptor.class)); + ChannelSecurityInterceptor inboundChannelSecurity = this.context.getBean(ChannelSecurityInterceptor.class); + registration.setInterceptors(this.context.getBean(SecurityContextChannelInterceptor.class)); if (!sameOriginDisabled()) { - registration.setInterceptors(context.getBean(CsrfChannelInterceptor.class)); + registration.setInterceptors(this.context.getBean(CsrfChannelInterceptor.class)); } - if (inboundRegistry.containsMapping()) { + if (this.inboundRegistry.containsMapping()) { registration.setInterceptors(inboundChannelSecurity); } customizeClientInboundChannel(registration); @@ -116,7 +116,7 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends A private PathMatcher getDefaultPathMatcher() { try { - return context.getBean(SimpAnnotationMethodMessageHandler.class).getPathMatcher(); + return this.context.getBean(SimpAnnotationMethodMessageHandler.class).getPathMatcher(); } catch (NoSuchBeanDefinitionException e) { return new AntPathMatcher(); @@ -174,9 +174,9 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends A @Bean public MessageSecurityMetadataSource inboundMessageSecurityMetadataSource() { - inboundRegistry.expressionHandler(getMessageExpressionHandler()); - configureInbound(inboundRegistry); - return inboundRegistry.createMetadataSource(); + this.inboundRegistry.expressionHandler(getMessageExpressionHandler()); + configureInbound(this.inboundRegistry); + return this.inboundRegistry.createMetadataSource(); } /** @@ -223,14 +223,14 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends A @Autowired(required = false) public void setObjectPostProcessor(ObjectPostProcessor objectPostProcessor) { - defaultExpressionHandler = objectPostProcessor.postProcess(defaultExpressionHandler); + this.defaultExpressionHandler = objectPostProcessor.postProcess(this.defaultExpressionHandler); } private SecurityExpressionHandler> getMessageExpressionHandler() { - if (expressionHandler == null) { - return defaultExpressionHandler; + if (this.expressionHandler == null) { + return this.defaultExpressionHandler; } - return expressionHandler; + return this.expressionHandler; } public void afterSingletonsInstantiated() { @@ -239,7 +239,7 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends A } String beanName = "stompWebSocketHandlerMapping"; - SimpleUrlHandlerMapping mapping = context.getBean(beanName, SimpleUrlHandlerMapping.class); + SimpleUrlHandlerMapping mapping = this.context.getBean(beanName, SimpleUrlHandlerMapping.class); Map mappings = mapping.getHandlerMap(); for (Object object : mappings.values()) { if (object instanceof SockJsHttpRequestHandler) { @@ -275,9 +275,9 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends A } } - if (inboundRegistry.containsMapping() && !inboundRegistry.isSimpDestPathMatcherConfigured()) { + if (this.inboundRegistry.containsMapping() && !this.inboundRegistry.isSimpDestPathMatcherConfigured()) { PathMatcher pathMatcher = getDefaultPathMatcher(); - inboundRegistry.simpDestPathMatcher(pathMatcher); + this.inboundRegistry.simpDestPathMatcher(pathMatcher); } } diff --git a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerFactoryBean.java b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerFactoryBean.java index 5e99b50867..0a64abf68c 100644 --- a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerFactoryBean.java +++ b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerFactoryBean.java @@ -48,7 +48,7 @@ public class AuthenticationManagerFactoryBean implements FactoryBean T getBeanOrNull(Class type) { diff --git a/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java b/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java index a0e9b5e424..0ee8d05205 100644 --- a/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java +++ b/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java @@ -76,11 +76,11 @@ public class PasswordEncoderParser { String ref = element.getAttribute(ATT_REF); if (StringUtils.hasText(ref)) { - passwordEncoder = new RuntimeBeanReference(ref); + this.passwordEncoder = new RuntimeBeanReference(ref); } else { - passwordEncoder = createPasswordEncoderBeanDefinition(hash, useBase64); - ((RootBeanDefinition) passwordEncoder).setSource(parserContext.extractSource(element)); + this.passwordEncoder = createPasswordEncoderBeanDefinition(hash, useBase64); + ((RootBeanDefinition) this.passwordEncoder).setSource(parserContext.extractSource(element)); } } @@ -91,7 +91,7 @@ public class PasswordEncoderParser { } public BeanMetadataElement getPasswordEncoder() { - return passwordEncoder; + return this.passwordEncoder; } } diff --git a/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java index f63c2d2b67..d9b806c360 100644 --- a/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java @@ -112,16 +112,16 @@ public class UserServiceBeanDefinitionParser extends AbstractUserDetailsServiceB } private String generateRandomPassword() { - if (random == null) { + if (this.random == null) { try { - random = SecureRandom.getInstance("SHA1PRNG"); + this.random = SecureRandom.getInstance("SHA1PRNG"); } catch (NoSuchAlgorithmException e) { // Shouldn't happen... throw new RuntimeException("Failed find SHA1PRNG algorithm!"); } } - return Long.toString(random.nextLong()); + return Long.toString(this.random.nextLong()); } } diff --git a/config/src/main/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBean.java b/config/src/main/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBean.java index dc30f05887..34c3ab73f8 100644 --- a/config/src/main/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBean.java +++ b/config/src/main/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBean.java @@ -41,7 +41,7 @@ public class ReactiveUserDetailsServiceResourceFactoryBean @Override public MapReactiveUserDetailsService getObject() throws Exception { - Collection users = userDetails.getObject(); + Collection users = this.userDetails.getObject(); return new MapReactiveUserDetailsService(users); } @@ -52,7 +52,7 @@ public class ReactiveUserDetailsServiceResourceFactoryBean @Override public void setResourceLoader(ResourceLoader resourceLoader) { - userDetails.setResourceLoader(resourceLoader); + this.userDetails.setResourceLoader(resourceLoader); } /** diff --git a/config/src/main/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBean.java b/config/src/main/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBean.java index ce4b7ad975..ed74783d5c 100644 --- a/config/src/main/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBean.java +++ b/config/src/main/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBean.java @@ -98,9 +98,9 @@ public class UserDetailsResourceFactoryBean implements ResourceLoaderAware, Fact } private Resource getPropertiesResource() { - Resource result = resource; - if (result == null && resourceLocation != null) { - result = resourceLoader.getResource(resourceLocation); + Resource result = this.resource; + if (result == null && this.resourceLocation != null) { + result = this.resourceLoader.getResource(this.resourceLocation); } Assert.notNull(result, "resource cannot be null if resourceLocation is null"); return result; diff --git a/config/src/main/java/org/springframework/security/config/debug/SecurityDebugBeanFactoryPostProcessor.java b/config/src/main/java/org/springframework/security/config/debug/SecurityDebugBeanFactoryPostProcessor.java index 975e0dfc43..23b00c6e45 100644 --- a/config/src/main/java/org/springframework/security/config/debug/SecurityDebugBeanFactoryPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/debug/SecurityDebugBeanFactoryPostProcessor.java @@ -36,7 +36,7 @@ public class SecurityDebugBeanFactoryPostProcessor implements BeanDefinitionRegi private final Log logger = LogFactory.getLog(getClass()); public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException { - logger.warn("\n\n" + "********************************************************************\n" + this.logger.warn("\n\n" + "********************************************************************\n" + "********** Security debugging is enabled. *************\n" + "********** This may include sensitive information. *************\n" + "********** Do not use in a production system! *************\n" diff --git a/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java b/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java index 0d2d830bdc..bf1fc0692d 100644 --- a/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java +++ b/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java @@ -235,7 +235,7 @@ final class AuthenticationConfigBuilder { this.httpElt = element; this.pc = pc; this.requestCache = requestCache; - autoConfig = forceAutoConfig | "true".equals(element.getAttribute(ATT_AUTO_CONFIG)); + this.autoConfig = forceAutoConfig | "true".equals(element.getAttribute(ATT_AUTO_CONFIG)); this.allowSessionCreation = sessionPolicy != SessionCreationPolicy.NEVER && sessionPolicy != SessionCreationPolicy.STATELESS; this.portMapper = portMapper; @@ -261,7 +261,7 @@ final class AuthenticationConfigBuilder { // Parse remember me before logout as RememberMeServices is also a LogoutHandler // implementation. - Element rememberMeElt = DomUtils.getChildElementByTagName(httpElt, Elements.REMEMBER_ME); + Element rememberMeElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.REMEMBER_ME); if (rememberMeElt != null) { String key = rememberMeElt.getAttribute(ATT_KEY); @@ -272,49 +272,49 @@ final class AuthenticationConfigBuilder { RememberMeBeanDefinitionParser rememberMeParser = new RememberMeBeanDefinitionParser(key, authenticationManager); - rememberMeFilter = rememberMeParser.parse(rememberMeElt, pc); - rememberMeServicesId = rememberMeParser.getRememberMeServicesId(); + this.rememberMeFilter = rememberMeParser.parse(rememberMeElt, this.pc); + this.rememberMeServicesId = rememberMeParser.getRememberMeServicesId(); createRememberMeProvider(key); } } private void createRememberMeProvider(String key) { RootBeanDefinition provider = new RootBeanDefinition(RememberMeAuthenticationProvider.class); - provider.setSource(rememberMeFilter.getSource()); + provider.setSource(this.rememberMeFilter.getSource()); provider.getConstructorArgumentValues().addGenericArgumentValue(key); - String id = pc.getReaderContext().generateBeanName(provider); - pc.registerBeanComponent(new BeanComponentDefinition(provider, id)); + String id = this.pc.getReaderContext().generateBeanName(provider); + this.pc.registerBeanComponent(new BeanComponentDefinition(provider, id)); - rememberMeProviderRef = new RuntimeBeanReference(id); + this.rememberMeProviderRef = new RuntimeBeanReference(id); } void createFormLoginFilter(BeanReference sessionStrategy, BeanReference authManager) { - Element formLoginElt = DomUtils.getChildElementByTagName(httpElt, Elements.FORM_LOGIN); + Element formLoginElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.FORM_LOGIN); RootBeanDefinition formFilter = null; - if (formLoginElt != null || autoConfig) { + if (formLoginElt != null || this.autoConfig) { FormLoginBeanDefinitionParser parser = new FormLoginBeanDefinitionParser("/login", "POST", - AUTHENTICATION_PROCESSING_FILTER_CLASS, requestCache, sessionStrategy, allowSessionCreation, - portMapper, portResolver); + AUTHENTICATION_PROCESSING_FILTER_CLASS, this.requestCache, sessionStrategy, + this.allowSessionCreation, this.portMapper, this.portResolver); - parser.parse(formLoginElt, pc); + parser.parse(formLoginElt, this.pc); formFilter = parser.getFilterBean(); - formEntryPoint = parser.getEntryPointBean(); - loginProcessingUrl = parser.getLoginProcessingUrl(); - formLoginPage = parser.getLoginPage(); + this.formEntryPoint = parser.getEntryPointBean(); + this.loginProcessingUrl = parser.getLoginProcessingUrl(); + this.formLoginPage = parser.getLoginPage(); } if (formFilter != null) { - formFilter.getPropertyValues().addPropertyValue("allowSessionCreation", allowSessionCreation); + formFilter.getPropertyValues().addPropertyValue("allowSessionCreation", this.allowSessionCreation); formFilter.getPropertyValues().addPropertyValue("authenticationManager", authManager); // Id is required by login page filter - formFilterId = pc.getReaderContext().generateBeanName(formFilter); - pc.registerBeanComponent(new BeanComponentDefinition(formFilter, formFilterId)); - injectRememberMeServicesRef(formFilter, rememberMeServicesId); + this.formFilterId = this.pc.getReaderContext().generateBeanName(formFilter); + this.pc.registerBeanComponent(new BeanComponentDefinition(formFilter, this.formFilterId)); + injectRememberMeServicesRef(formFilter, this.rememberMeServicesId); } } @@ -332,8 +332,8 @@ final class AuthenticationConfigBuilder { } this.oauth2LoginEnabled = true; - OAuth2LoginBeanDefinitionParser parser = new OAuth2LoginBeanDefinitionParser(requestCache, portMapper, - portResolver, sessionStrategy, allowSessionCreation); + OAuth2LoginBeanDefinitionParser parser = new OAuth2LoginBeanDefinitionParser(this.requestCache, this.portMapper, + this.portResolver, sessionStrategy, this.allowSessionCreation); BeanDefinition oauth2LoginFilterBean = parser.parse(oauth2LoginElt, this.pc); BeanDefinition defaultAuthorizedClientRepository = parser.getDefaultAuthorizedClientRepository(); @@ -343,30 +343,30 @@ final class AuthenticationConfigBuilder { // retrieve the other bean result BeanDefinition oauth2LoginAuthProvider = parser.getOAuth2LoginAuthenticationProvider(); - oauth2AuthorizationRequestRedirectFilter = parser.getOAuth2AuthorizationRequestRedirectFilter(); - oauth2LoginEntryPoint = parser.getOAuth2LoginAuthenticationEntryPoint(); + this.oauth2AuthorizationRequestRedirectFilter = parser.getOAuth2AuthorizationRequestRedirectFilter(); + this.oauth2LoginEntryPoint = parser.getOAuth2LoginAuthenticationEntryPoint(); // generate bean name to be registered - String oauth2LoginAuthProviderId = pc.getReaderContext().generateBeanName(oauth2LoginAuthProvider); - oauth2LoginFilterId = pc.getReaderContext().generateBeanName(oauth2LoginFilterBean); - String oauth2AuthorizationRequestRedirectFilterId = pc.getReaderContext() - .generateBeanName(oauth2AuthorizationRequestRedirectFilter); - oauth2LoginLinks = parser.getOAuth2LoginLinks(); + String oauth2LoginAuthProviderId = this.pc.getReaderContext().generateBeanName(oauth2LoginAuthProvider); + this.oauth2LoginFilterId = this.pc.getReaderContext().generateBeanName(oauth2LoginFilterBean); + String oauth2AuthorizationRequestRedirectFilterId = this.pc.getReaderContext() + .generateBeanName(this.oauth2AuthorizationRequestRedirectFilter); + this.oauth2LoginLinks = parser.getOAuth2LoginLinks(); // register the component - pc.registerBeanComponent(new BeanComponentDefinition(oauth2LoginFilterBean, oauth2LoginFilterId)); - pc.registerBeanComponent(new BeanComponentDefinition(oauth2AuthorizationRequestRedirectFilter, + this.pc.registerBeanComponent(new BeanComponentDefinition(oauth2LoginFilterBean, this.oauth2LoginFilterId)); + this.pc.registerBeanComponent(new BeanComponentDefinition(this.oauth2AuthorizationRequestRedirectFilter, oauth2AuthorizationRequestRedirectFilterId)); - pc.registerBeanComponent(new BeanComponentDefinition(oauth2LoginAuthProvider, oauth2LoginAuthProviderId)); + this.pc.registerBeanComponent(new BeanComponentDefinition(oauth2LoginAuthProvider, oauth2LoginAuthProviderId)); - oauth2LoginAuthenticationProviderRef = new RuntimeBeanReference(oauth2LoginAuthProviderId); + this.oauth2LoginAuthenticationProviderRef = new RuntimeBeanReference(oauth2LoginAuthProviderId); // oidc provider BeanDefinition oauth2LoginOidcAuthProvider = parser.getOAuth2LoginOidcAuthenticationProvider(); - String oauth2LoginOidcAuthProviderId = pc.getReaderContext().generateBeanName(oauth2LoginOidcAuthProvider); - pc.registerBeanComponent( + String oauth2LoginOidcAuthProviderId = this.pc.getReaderContext().generateBeanName(oauth2LoginOidcAuthProvider); + this.pc.registerBeanComponent( new BeanComponentDefinition(oauth2LoginOidcAuthProvider, oauth2LoginOidcAuthProviderId)); - oauth2LoginOidcAuthenticationProviderRef = new RuntimeBeanReference(oauth2LoginOidcAuthProviderId); + this.oauth2LoginOidcAuthenticationProviderRef = new RuntimeBeanReference(oauth2LoginOidcAuthProviderId); } void createOAuth2ClientFilter(BeanReference requestCache, BeanReference authenticationManager) { @@ -384,19 +384,19 @@ final class AuthenticationConfigBuilder { registerDefaultAuthorizedClientRepositoryIfNecessary(defaultAuthorizedClientRepository); this.authorizationRequestRedirectFilter = parser.getAuthorizationRequestRedirectFilter(); - String authorizationRequestRedirectFilterId = pc.getReaderContext() + String authorizationRequestRedirectFilterId = this.pc.getReaderContext() .generateBeanName(this.authorizationRequestRedirectFilter); this.pc.registerBeanComponent(new BeanComponentDefinition(this.authorizationRequestRedirectFilter, authorizationRequestRedirectFilterId)); this.authorizationCodeGrantFilter = parser.getAuthorizationCodeGrantFilter(); - String authorizationCodeGrantFilterId = pc.getReaderContext() + String authorizationCodeGrantFilterId = this.pc.getReaderContext() .generateBeanName(this.authorizationCodeGrantFilter); this.pc.registerBeanComponent( new BeanComponentDefinition(this.authorizationCodeGrantFilter, authorizationCodeGrantFilterId)); BeanDefinition authorizationCodeAuthenticationProvider = parser.getAuthorizationCodeAuthenticationProvider(); - String authorizationCodeAuthenticationProviderId = pc.getReaderContext() + String authorizationCodeAuthenticationProviderId = this.pc.getReaderContext() .generateBeanName(authorizationCodeAuthenticationProvider); this.pc.registerBeanComponent(new BeanComponentDefinition(authorizationCodeAuthenticationProvider, authorizationCodeAuthenticationProviderId)); @@ -406,7 +406,7 @@ final class AuthenticationConfigBuilder { void registerDefaultAuthorizedClientRepositoryIfNecessary(BeanDefinition defaultAuthorizedClientRepository) { if (!this.defaultAuthorizedClientRepositoryRegistered && defaultAuthorizedClientRepository != null) { - String authorizedClientRepositoryId = pc.getReaderContext() + String authorizedClientRepositoryId = this.pc.getReaderContext() .generateBeanName(defaultAuthorizedClientRepository); this.pc.registerBeanComponent( new BeanComponentDefinition(defaultAuthorizedClientRepository, authorizedClientRepositoryId)); @@ -428,7 +428,7 @@ final class AuthenticationConfigBuilder { } void createOpenIDLoginFilter(BeanReference sessionStrategy, BeanReference authManager) { - Element openIDLoginElt = DomUtils.getChildElementByTagName(httpElt, Elements.OPENID_LOGIN); + Element openIDLoginElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.OPENID_LOGIN); RootBeanDefinition openIDFilter = null; if (openIDLoginElt != null) { @@ -436,12 +436,12 @@ final class AuthenticationConfigBuilder { } if (openIDFilter != null) { - openIDFilter.getPropertyValues().addPropertyValue("allowSessionCreation", allowSessionCreation); + openIDFilter.getPropertyValues().addPropertyValue("allowSessionCreation", this.allowSessionCreation); openIDFilter.getPropertyValues().addPropertyValue("authenticationManager", authManager); // Required by login page filter - openIDFilterId = pc.getReaderContext().generateBeanName(openIDFilter); - pc.registerBeanComponent(new BeanComponentDefinition(openIDFilter, openIDFilterId)); - injectRememberMeServicesRef(openIDFilter, rememberMeServicesId); + this.openIDFilterId = this.pc.getReaderContext().generateBeanName(openIDFilter); + this.pc.registerBeanComponent(new BeanComponentDefinition(openIDFilter, this.openIDFilterId)); + injectRememberMeServicesRef(openIDFilter, this.rememberMeServicesId); createOpenIDProvider(); } @@ -460,14 +460,14 @@ final class AuthenticationConfigBuilder { private RootBeanDefinition parseOpenIDFilter(BeanReference sessionStrategy, Element openIDLoginElt) { RootBeanDefinition openIDFilter; FormLoginBeanDefinitionParser parser = new FormLoginBeanDefinitionParser("/login/openid", null, - OPEN_ID_AUTHENTICATION_PROCESSING_FILTER_CLASS, requestCache, sessionStrategy, allowSessionCreation, - portMapper, portResolver); + OPEN_ID_AUTHENTICATION_PROCESSING_FILTER_CLASS, this.requestCache, sessionStrategy, + this.allowSessionCreation, this.portMapper, this.portResolver); - parser.parse(openIDLoginElt, pc); + parser.parse(openIDLoginElt, this.pc); openIDFilter = parser.getFilterBean(); - openIDEntryPoint = parser.getEntryPointBean(); - openidLoginProcessingUrl = parser.getLoginProcessingUrl(); - openIDLoginPage = parser.getLoginPage(); + this.openIDEntryPoint = parser.getEntryPointBean(); + this.openidLoginProcessingUrl = parser.getLoginProcessingUrl(); + this.openIDLoginPage = parser.getLoginPage(); List attrExElts = DomUtils.getChildElementsByTagName(openIDLoginElt, Elements.OPENID_ATTRIBUTE_EXCHANGE); @@ -483,7 +483,7 @@ final class AuthenticationConfigBuilder { if (!StringUtils.hasText(identifierMatch)) { if (attrExElts.size() > 1) { - pc.getReaderContext().error("You must supply an identifier-match attribute if using more" + this.pc.getReaderContext().error("You must supply an identifier-match attribute if using more" + " than one " + Elements.OPENID_ATTRIBUTE_EXCHANGE + " element", attrExElt); } // Match anything @@ -524,7 +524,7 @@ final class AuthenticationConfigBuilder { } private void createOpenIDProvider() { - Element openIDLoginElt = DomUtils.getChildElementByTagName(httpElt, Elements.OPENID_LOGIN); + Element openIDLoginElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.OPENID_LOGIN); BeanDefinitionBuilder openIDProviderBuilder = BeanDefinitionBuilder .rootBeanDefinition(OPEN_ID_AUTHENTICATION_PROVIDER_CLASS); @@ -536,7 +536,8 @@ final class AuthenticationConfigBuilder { openIDProviderBuilder.addPropertyValue("authenticationUserDetailsService", uds); BeanDefinition openIDProvider = openIDProviderBuilder.getBeanDefinition(); - openIDProviderRef = new RuntimeBeanReference(pc.getReaderContext().registerWithGeneratedName(openIDProvider)); + this.openIDProviderRef = new RuntimeBeanReference( + this.pc.getReaderContext().registerWithGeneratedName(openIDProvider)); } private void injectRememberMeServicesRef(RootBeanDefinition bean, String rememberMeServicesId) { @@ -547,14 +548,14 @@ final class AuthenticationConfigBuilder { } void createBasicFilter(BeanReference authManager) { - Element basicAuthElt = DomUtils.getChildElementByTagName(httpElt, Elements.BASIC_AUTH); + Element basicAuthElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.BASIC_AUTH); - if (basicAuthElt == null && !autoConfig) { + if (basicAuthElt == null && !this.autoConfig) { // No basic auth, do nothing return; } - String realm = httpElt.getAttribute(ATT_REALM); + String realm = this.httpElt.getAttribute(ATT_REALM); if (!StringUtils.hasText(realm)) { realm = DEF_REALM; } @@ -565,29 +566,29 @@ final class AuthenticationConfigBuilder { if (basicAuthElt != null) { if (StringUtils.hasText(basicAuthElt.getAttribute(ATT_ENTRY_POINT_REF))) { - basicEntryPoint = new RuntimeBeanReference(basicAuthElt.getAttribute(ATT_ENTRY_POINT_REF)); + this.basicEntryPoint = new RuntimeBeanReference(basicAuthElt.getAttribute(ATT_ENTRY_POINT_REF)); } injectAuthenticationDetailsSource(basicAuthElt, filterBuilder); } - if (basicEntryPoint == null) { + if (this.basicEntryPoint == null) { RootBeanDefinition entryPoint = new RootBeanDefinition(BasicAuthenticationEntryPoint.class); - entryPoint.setSource(pc.extractSource(httpElt)); + entryPoint.setSource(this.pc.extractSource(this.httpElt)); entryPoint.getPropertyValues().addPropertyValue("realmName", realm); - entryPointId = pc.getReaderContext().generateBeanName(entryPoint); - pc.registerBeanComponent(new BeanComponentDefinition(entryPoint, entryPointId)); - basicEntryPoint = new RuntimeBeanReference(entryPointId); + entryPointId = this.pc.getReaderContext().generateBeanName(entryPoint); + this.pc.registerBeanComponent(new BeanComponentDefinition(entryPoint, entryPointId)); + this.basicEntryPoint = new RuntimeBeanReference(entryPointId); } filterBuilder.addConstructorArgValue(authManager); - filterBuilder.addConstructorArgValue(basicEntryPoint); - basicFilter = filterBuilder.getBeanDefinition(); + filterBuilder.addConstructorArgValue(this.basicEntryPoint); + this.basicFilter = filterBuilder.getBeanDefinition(); } void createBearerTokenAuthenticationFilter(BeanReference authManager) { - Element resourceServerElt = DomUtils.getChildElementByTagName(httpElt, Elements.OAUTH2_RESOURCE_SERVER); + Element resourceServerElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.OAUTH2_RESOURCE_SERVER); if (resourceServerElt == null) { // No resource server, do nothing @@ -595,19 +596,19 @@ final class AuthenticationConfigBuilder { } OAuth2ResourceServerBeanDefinitionParser resourceServerBuilder = new OAuth2ResourceServerBeanDefinitionParser( - authManager, authenticationProviders, defaultEntryPointMappings, defaultDeniedHandlerMappings, - csrfIgnoreRequestMatchers); - bearerTokenAuthenticationFilter = resourceServerBuilder.parse(resourceServerElt, pc); + authManager, this.authenticationProviders, this.defaultEntryPointMappings, + this.defaultDeniedHandlerMappings, this.csrfIgnoreRequestMatchers); + this.bearerTokenAuthenticationFilter = resourceServerBuilder.parse(resourceServerElt, this.pc); } void createX509Filter(BeanReference authManager) { - Element x509Elt = DomUtils.getChildElementByTagName(httpElt, Elements.X509); + Element x509Elt = DomUtils.getChildElementByTagName(this.httpElt, Elements.X509); RootBeanDefinition filter = null; if (x509Elt != null) { BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder .rootBeanDefinition(X509AuthenticationFilter.class); - filterBuilder.getRawBeanDefinition().setSource(pc.extractSource(x509Elt)); + filterBuilder.getRawBeanDefinition().setSource(this.pc.extractSource(x509Elt)); filterBuilder.addPropertyValue("authenticationManager", authManager); String regex = x509Elt.getAttribute("subject-principal-regex"); @@ -628,7 +629,7 @@ final class AuthenticationConfigBuilder { createX509Provider(); } - x509Filter = filter; + this.x509Filter = filter; } private void injectAuthenticationDetailsSource(Element elt, BeanDefinitionBuilder filterBuilder) { @@ -640,7 +641,7 @@ final class AuthenticationConfigBuilder { } private void createX509Provider() { - Element x509Elt = DomUtils.getChildElementByTagName(httpElt, Elements.X509); + Element x509Elt = DomUtils.getChildElementByTagName(this.httpElt, Elements.X509); BeanDefinition provider = new RootBeanDefinition(PreAuthenticatedAuthenticationProvider.class); RootBeanDefinition uds = new RootBeanDefinition(); @@ -650,26 +651,26 @@ final class AuthenticationConfigBuilder { provider.getPropertyValues().addPropertyValue("preAuthenticatedUserDetailsService", uds); - x509ProviderRef = new RuntimeBeanReference(pc.getReaderContext().registerWithGeneratedName(provider)); + this.x509ProviderRef = new RuntimeBeanReference(this.pc.getReaderContext().registerWithGeneratedName(provider)); } private void createPrauthEntryPoint(Element source) { - if (preAuthEntryPoint == null) { - preAuthEntryPoint = new RootBeanDefinition(Http403ForbiddenEntryPoint.class); - preAuthEntryPoint.setSource(pc.extractSource(source)); + if (this.preAuthEntryPoint == null) { + this.preAuthEntryPoint = new RootBeanDefinition(Http403ForbiddenEntryPoint.class); + this.preAuthEntryPoint.setSource(this.pc.extractSource(source)); } } void createJeeFilter(BeanReference authManager) { final String ATT_MAPPABLE_ROLES = "mappable-roles"; - Element jeeElt = DomUtils.getChildElementByTagName(httpElt, Elements.JEE); + Element jeeElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.JEE); RootBeanDefinition filter = null; if (jeeElt != null) { BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder .rootBeanDefinition(J2eePreAuthenticatedProcessingFilter.class); - filterBuilder.getRawBeanDefinition().setSource(pc.extractSource(jeeElt)); + filterBuilder.getRawBeanDefinition().setSource(this.pc.extractSource(jeeElt)); filterBuilder.addPropertyValue("authenticationManager", authManager); BeanDefinitionBuilder adsBldr = BeanDefinitionBuilder @@ -695,11 +696,11 @@ final class AuthenticationConfigBuilder { createJeeProvider(); } - jeeFilter = filter; + this.jeeFilter = filter; } private void createJeeProvider() { - Element jeeElt = DomUtils.getChildElementByTagName(httpElt, Elements.JEE); + Element jeeElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.JEE); BeanDefinition provider = new RootBeanDefinition(PreAuthenticatedAuthenticationProvider.class); RootBeanDefinition uds; @@ -715,15 +716,16 @@ final class AuthenticationConfigBuilder { provider.getPropertyValues().addPropertyValue("preAuthenticatedUserDetailsService", uds); - jeeProviderRef = new RuntimeBeanReference(pc.getReaderContext().registerWithGeneratedName(provider)); + this.jeeProviderRef = new RuntimeBeanReference(this.pc.getReaderContext().registerWithGeneratedName(provider)); } void createLoginPageFilterIfNeeded() { - boolean needLoginPage = formFilterId != null || openIDFilterId != null || oauth2LoginFilterId != null; + boolean needLoginPage = this.formFilterId != null || this.openIDFilterId != null + || this.oauth2LoginFilterId != null; // If no login page has been defined, add in the default page generator. - if (needLoginPage && formLoginPage == null && openIDLoginPage == null) { - logger.info("No login page configured. The default internal one will be used. Use the '" + if (needLoginPage && this.formLoginPage == null && this.openIDLoginPage == null) { + this.logger.info("No login page configured. The default internal one will be used. Use the '" + FormLoginBeanDefinitionParser.ATT_LOGIN_PAGE + "' attribute to set the URL of the login page."); BeanDefinitionBuilder loginPageFilter = BeanDefinitionBuilder .rootBeanDefinition(DefaultLoginPageGeneratingFilter.class); @@ -733,69 +735,69 @@ final class AuthenticationConfigBuilder { .rootBeanDefinition(DefaultLogoutPageGeneratingFilter.class); logoutPageFilter.addPropertyValue("resolveHiddenInputs", new CsrfTokenHiddenInputFunction()); - if (formFilterId != null) { - loginPageFilter.addConstructorArgReference(formFilterId); - loginPageFilter.addPropertyValue("authenticationUrl", loginProcessingUrl); + if (this.formFilterId != null) { + loginPageFilter.addConstructorArgReference(this.formFilterId); + loginPageFilter.addPropertyValue("authenticationUrl", this.loginProcessingUrl); } - if (openIDFilterId != null) { - loginPageFilter.addConstructorArgReference(openIDFilterId); - loginPageFilter.addPropertyValue("openIDauthenticationUrl", openidLoginProcessingUrl); + if (this.openIDFilterId != null) { + loginPageFilter.addConstructorArgReference(this.openIDFilterId); + loginPageFilter.addPropertyValue("openIDauthenticationUrl", this.openidLoginProcessingUrl); } - if (oauth2LoginFilterId != null) { - loginPageFilter.addConstructorArgReference(oauth2LoginFilterId); + if (this.oauth2LoginFilterId != null) { + loginPageFilter.addConstructorArgReference(this.oauth2LoginFilterId); loginPageFilter.addPropertyValue("Oauth2LoginEnabled", true); - loginPageFilter.addPropertyValue("Oauth2AuthenticationUrlToClientName", oauth2LoginLinks); + loginPageFilter.addPropertyValue("Oauth2AuthenticationUrlToClientName", this.oauth2LoginLinks); } - loginPageGenerationFilter = loginPageFilter.getBeanDefinition(); + this.loginPageGenerationFilter = loginPageFilter.getBeanDefinition(); this.logoutPageGenerationFilter = logoutPageFilter.getBeanDefinition(); } } void createLogoutFilter() { - Element logoutElt = DomUtils.getChildElementByTagName(httpElt, Elements.LOGOUT); - if (logoutElt != null || autoConfig) { + Element logoutElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.LOGOUT); + if (logoutElt != null || this.autoConfig) { String formLoginPage = this.formLoginPage; if (formLoginPage == null) { formLoginPage = DefaultLoginPageGeneratingFilter.DEFAULT_LOGIN_PAGE_URL; } LogoutBeanDefinitionParser logoutParser = new LogoutBeanDefinitionParser(formLoginPage, - rememberMeServicesId, csrfLogoutHandler); - logoutFilter = logoutParser.parse(logoutElt, pc); - logoutHandlers = logoutParser.getLogoutHandlers(); + this.rememberMeServicesId, this.csrfLogoutHandler); + this.logoutFilter = logoutParser.parse(logoutElt, this.pc); + this.logoutHandlers = logoutParser.getLogoutHandlers(); } } @SuppressWarnings({ "rawtypes", "unchecked" }) ManagedList getLogoutHandlers() { - if (logoutHandlers == null && rememberMeProviderRef != null) { - logoutHandlers = new ManagedList(); - if (csrfLogoutHandler != null) { - logoutHandlers.add(csrfLogoutHandler); + if (this.logoutHandlers == null && this.rememberMeProviderRef != null) { + this.logoutHandlers = new ManagedList(); + if (this.csrfLogoutHandler != null) { + this.logoutHandlers.add(this.csrfLogoutHandler); } - logoutHandlers.add(new RuntimeBeanReference(rememberMeServicesId)); - logoutHandlers.add(new RootBeanDefinition(SecurityContextLogoutHandler.class)); + this.logoutHandlers.add(new RuntimeBeanReference(this.rememberMeServicesId)); + this.logoutHandlers.add(new RootBeanDefinition(SecurityContextLogoutHandler.class)); } - return logoutHandlers; + return this.logoutHandlers; } BeanMetadataElement getEntryPointBean() { - return mainEntryPoint; + return this.mainEntryPoint; } BeanMetadataElement getAccessDeniedHandlerBean() { - return accessDeniedHandler; + return this.accessDeniedHandler; } List getCsrfIgnoreRequestMatchers() { - return csrfIgnoreRequestMatchers; + return this.csrfIgnoreRequestMatchers; } void createAnonymousFilter() { - Element anonymousElt = DomUtils.getChildElementByTagName(httpElt, Elements.ANONYMOUS); + Element anonymousElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.ANONYMOUS); if (anonymousElt != null && "false".equals(anonymousElt.getAttribute("enabled"))) { return; @@ -804,13 +806,13 @@ final class AuthenticationConfigBuilder { String grantedAuthority = null; String username = null; String key = null; - Object source = pc.extractSource(httpElt); + Object source = this.pc.extractSource(this.httpElt); if (anonymousElt != null) { grantedAuthority = anonymousElt.getAttribute("granted-authority"); username = anonymousElt.getAttribute("username"); key = anonymousElt.getAttribute(ATT_KEY); - source = pc.extractSource(anonymousElt); + source = this.pc.extractSource(anonymousElt); } if (!StringUtils.hasText(grantedAuthority)) { @@ -826,20 +828,20 @@ final class AuthenticationConfigBuilder { key = createKey(); } - anonymousFilter = new RootBeanDefinition(AnonymousAuthenticationFilter.class); - anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(0, key); - anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(1, username); - anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(2, + this.anonymousFilter = new RootBeanDefinition(AnonymousAuthenticationFilter.class); + this.anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(0, key); + this.anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(1, username); + this.anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(2, AuthorityUtils.commaSeparatedStringToAuthorityList(grantedAuthority)); - anonymousFilter.setSource(source); + this.anonymousFilter.setSource(source); RootBeanDefinition anonymousProviderBean = new RootBeanDefinition(AnonymousAuthenticationProvider.class); anonymousProviderBean.getConstructorArgumentValues().addIndexedArgumentValue(0, key); - anonymousProviderBean.setSource(anonymousFilter.getSource()); - String id = pc.getReaderContext().generateBeanName(anonymousProviderBean); - pc.registerBeanComponent(new BeanComponentDefinition(anonymousProviderBean, id)); + anonymousProviderBean.setSource(this.anonymousFilter.getSource()); + String id = this.pc.getReaderContext().generateBeanName(anonymousProviderBean); + this.pc.registerBeanComponent(new BeanComponentDefinition(anonymousProviderBean, id)); - anonymousProviderRef = new RuntimeBeanReference(id); + this.anonymousProviderRef = new RuntimeBeanReference(id); } @@ -850,14 +852,14 @@ final class AuthenticationConfigBuilder { void createExceptionTranslationFilter() { BeanDefinitionBuilder etfBuilder = BeanDefinitionBuilder.rootBeanDefinition(ExceptionTranslationFilter.class); - accessDeniedHandler = createAccessDeniedHandler(httpElt, pc); - etfBuilder.addPropertyValue("accessDeniedHandler", accessDeniedHandler); - assert requestCache != null; - mainEntryPoint = selectEntryPoint(); - etfBuilder.addConstructorArgValue(mainEntryPoint); - etfBuilder.addConstructorArgValue(requestCache); + this.accessDeniedHandler = createAccessDeniedHandler(this.httpElt, this.pc); + etfBuilder.addPropertyValue("accessDeniedHandler", this.accessDeniedHandler); + assert this.requestCache != null; + this.mainEntryPoint = selectEntryPoint(); + etfBuilder.addConstructorArgValue(this.mainEntryPoint); + etfBuilder.addConstructorArgValue(this.requestCache); - etf = etfBuilder.getBeanDefinition(); + this.etf = etfBuilder.getBeanDefinition(); } private BeanMetadataElement createAccessDeniedHandler(Element element, ParserContext pc) { @@ -905,143 +907,144 @@ final class AuthenticationConfigBuilder { private BeanMetadataElement selectEntryPoint() { // We need to establish the main entry point. // First check if a custom entry point bean is set - String customEntryPoint = httpElt.getAttribute(ATT_ENTRY_POINT_REF); + String customEntryPoint = this.httpElt.getAttribute(ATT_ENTRY_POINT_REF); if (StringUtils.hasText(customEntryPoint)) { return new RuntimeBeanReference(customEntryPoint); } - if (!defaultEntryPointMappings.isEmpty()) { - if (defaultEntryPointMappings.size() == 1) { - return defaultEntryPointMappings.values().iterator().next(); + if (!this.defaultEntryPointMappings.isEmpty()) { + if (this.defaultEntryPointMappings.size() == 1) { + return this.defaultEntryPointMappings.values().iterator().next(); } BeanDefinitionBuilder delegatingEntryPoint = BeanDefinitionBuilder .rootBeanDefinition(DelegatingAuthenticationEntryPoint.class); - delegatingEntryPoint.addConstructorArgValue(defaultEntryPointMappings); + delegatingEntryPoint.addConstructorArgValue(this.defaultEntryPointMappings); return delegatingEntryPoint.getBeanDefinition(); } - Element basicAuthElt = DomUtils.getChildElementByTagName(httpElt, Elements.BASIC_AUTH); - Element formLoginElt = DomUtils.getChildElementByTagName(httpElt, Elements.FORM_LOGIN); - Element openIDLoginElt = DomUtils.getChildElementByTagName(httpElt, Elements.OPENID_LOGIN); + Element basicAuthElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.BASIC_AUTH); + Element formLoginElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.FORM_LOGIN); + Element openIDLoginElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.OPENID_LOGIN); // Basic takes precedence if explicit element is used and no others are configured - if (basicAuthElt != null && formLoginElt == null && openIDLoginElt == null && oauth2LoginEntryPoint == null) { - return basicEntryPoint; + if (basicAuthElt != null && formLoginElt == null && openIDLoginElt == null + && this.oauth2LoginEntryPoint == null) { + return this.basicEntryPoint; } // If formLogin has been enabled either through an element or auto-config, then it // is used if no openID login page // has been set. - if (formLoginPage != null && openIDLoginPage != null) { - pc.getReaderContext().error( + if (this.formLoginPage != null && this.openIDLoginPage != null) { + this.pc.getReaderContext().error( "Only one login-page can be defined, either for OpenID or form-login, " + "but not both.", - pc.extractSource(openIDLoginElt)); + this.pc.extractSource(openIDLoginElt)); } - if (formFilterId != null && openIDLoginPage == null) { + if (this.formFilterId != null && this.openIDLoginPage == null) { // gh-6802 // If form login was enabled through element and Oauth2 login was enabled from // element then use form login - if (formLoginElt != null && oauth2LoginEntryPoint != null) { - return formEntryPoint; + if (formLoginElt != null && this.oauth2LoginEntryPoint != null) { + return this.formEntryPoint; } // If form login was enabled through auto-config, and Oauth2 login was not // enabled then use form login - if (oauth2LoginEntryPoint == null) { - return formEntryPoint; + if (this.oauth2LoginEntryPoint == null) { + return this.formEntryPoint; } } // Otherwise use OpenID if enabled - if (openIDFilterId != null) { - return openIDEntryPoint; + if (this.openIDFilterId != null) { + return this.openIDEntryPoint; } // If X.509 or JEE have been enabled, use the preauth entry point. - if (preAuthEntryPoint != null) { - return preAuthEntryPoint; + if (this.preAuthEntryPoint != null) { + return this.preAuthEntryPoint; } // OAuth2 entry point will not be null if only 1 client registration - if (oauth2LoginEntryPoint != null) { - return oauth2LoginEntryPoint; + if (this.oauth2LoginEntryPoint != null) { + return this.oauth2LoginEntryPoint; } - pc.getReaderContext().error("No AuthenticationEntryPoint could be established. Please " + this.pc.getReaderContext().error("No AuthenticationEntryPoint could be established. Please " + "make sure you have a login mechanism configured through the namespace (such as form-login) or " + "specify a custom AuthenticationEntryPoint with the '" + ATT_ENTRY_POINT_REF + "' attribute ", - pc.extractSource(httpElt)); + this.pc.extractSource(this.httpElt)); return null; } private void createUserDetailsServiceFactory() { - if (pc.getRegistry().containsBeanDefinition(BeanIds.USER_DETAILS_SERVICE_FACTORY)) { + if (this.pc.getRegistry().containsBeanDefinition(BeanIds.USER_DETAILS_SERVICE_FACTORY)) { // Multiple case return; } RootBeanDefinition bean = new RootBeanDefinition(UserDetailsServiceFactoryBean.class); bean.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); - pc.registerBeanComponent(new BeanComponentDefinition(bean, BeanIds.USER_DETAILS_SERVICE_FACTORY)); + this.pc.registerBeanComponent(new BeanComponentDefinition(bean, BeanIds.USER_DETAILS_SERVICE_FACTORY)); } List getFilters() { List filters = new ArrayList<>(); - if (anonymousFilter != null) { - filters.add(new OrderDecorator(anonymousFilter, ANONYMOUS_FILTER)); + if (this.anonymousFilter != null) { + filters.add(new OrderDecorator(this.anonymousFilter, ANONYMOUS_FILTER)); } - if (rememberMeFilter != null) { - filters.add(new OrderDecorator(rememberMeFilter, REMEMBER_ME_FILTER)); + if (this.rememberMeFilter != null) { + filters.add(new OrderDecorator(this.rememberMeFilter, REMEMBER_ME_FILTER)); } - if (logoutFilter != null) { - filters.add(new OrderDecorator(logoutFilter, LOGOUT_FILTER)); + if (this.logoutFilter != null) { + filters.add(new OrderDecorator(this.logoutFilter, LOGOUT_FILTER)); } - if (x509Filter != null) { - filters.add(new OrderDecorator(x509Filter, X509_FILTER)); + if (this.x509Filter != null) { + filters.add(new OrderDecorator(this.x509Filter, X509_FILTER)); } - if (jeeFilter != null) { - filters.add(new OrderDecorator(jeeFilter, PRE_AUTH_FILTER)); + if (this.jeeFilter != null) { + filters.add(new OrderDecorator(this.jeeFilter, PRE_AUTH_FILTER)); } - if (formFilterId != null) { - filters.add(new OrderDecorator(new RuntimeBeanReference(formFilterId), FORM_LOGIN_FILTER)); + if (this.formFilterId != null) { + filters.add(new OrderDecorator(new RuntimeBeanReference(this.formFilterId), FORM_LOGIN_FILTER)); } - if (oauth2LoginFilterId != null) { - filters.add(new OrderDecorator(new RuntimeBeanReference(oauth2LoginFilterId), OAUTH2_LOGIN_FILTER)); - filters.add( - new OrderDecorator(oauth2AuthorizationRequestRedirectFilter, OAUTH2_AUTHORIZATION_REQUEST_FILTER)); + if (this.oauth2LoginFilterId != null) { + filters.add(new OrderDecorator(new RuntimeBeanReference(this.oauth2LoginFilterId), OAUTH2_LOGIN_FILTER)); + filters.add(new OrderDecorator(this.oauth2AuthorizationRequestRedirectFilter, + OAUTH2_AUTHORIZATION_REQUEST_FILTER)); } - if (openIDFilterId != null) { - filters.add(new OrderDecorator(new RuntimeBeanReference(openIDFilterId), OPENID_FILTER)); + if (this.openIDFilterId != null) { + filters.add(new OrderDecorator(new RuntimeBeanReference(this.openIDFilterId), OPENID_FILTER)); } - if (loginPageGenerationFilter != null) { - filters.add(new OrderDecorator(loginPageGenerationFilter, LOGIN_PAGE_FILTER)); + if (this.loginPageGenerationFilter != null) { + filters.add(new OrderDecorator(this.loginPageGenerationFilter, LOGIN_PAGE_FILTER)); filters.add(new OrderDecorator(this.logoutPageGenerationFilter, LOGOUT_PAGE_FILTER)); } - if (basicFilter != null) { - filters.add(new OrderDecorator(basicFilter, BASIC_AUTH_FILTER)); + if (this.basicFilter != null) { + filters.add(new OrderDecorator(this.basicFilter, BASIC_AUTH_FILTER)); } - if (bearerTokenAuthenticationFilter != null) { - filters.add(new OrderDecorator(bearerTokenAuthenticationFilter, BEARER_TOKEN_AUTH_FILTER)); + if (this.bearerTokenAuthenticationFilter != null) { + filters.add(new OrderDecorator(this.bearerTokenAuthenticationFilter, BEARER_TOKEN_AUTH_FILTER)); } - if (authorizationCodeGrantFilter != null) { - filters.add(new OrderDecorator(authorizationRequestRedirectFilter, + if (this.authorizationCodeGrantFilter != null) { + filters.add(new OrderDecorator(this.authorizationRequestRedirectFilter, OAUTH2_AUTHORIZATION_REQUEST_FILTER.getOrder() + 1)); - filters.add(new OrderDecorator(authorizationCodeGrantFilter, OAUTH2_AUTHORIZATION_CODE_GRANT_FILTER)); + filters.add(new OrderDecorator(this.authorizationCodeGrantFilter, OAUTH2_AUTHORIZATION_CODE_GRANT_FILTER)); } - filters.add(new OrderDecorator(etf, EXCEPTION_TRANSLATION_FILTER)); + filters.add(new OrderDecorator(this.etf, EXCEPTION_TRANSLATION_FILTER)); return filters; } @@ -1049,36 +1052,36 @@ final class AuthenticationConfigBuilder { List getProviders() { List providers = new ArrayList<>(); - if (anonymousProviderRef != null) { - providers.add(anonymousProviderRef); + if (this.anonymousProviderRef != null) { + providers.add(this.anonymousProviderRef); } - if (rememberMeProviderRef != null) { - providers.add(rememberMeProviderRef); + if (this.rememberMeProviderRef != null) { + providers.add(this.rememberMeProviderRef); } - if (openIDProviderRef != null) { - providers.add(openIDProviderRef); + if (this.openIDProviderRef != null) { + providers.add(this.openIDProviderRef); } - if (x509ProviderRef != null) { - providers.add(x509ProviderRef); + if (this.x509ProviderRef != null) { + providers.add(this.x509ProviderRef); } - if (jeeProviderRef != null) { - providers.add(jeeProviderRef); + if (this.jeeProviderRef != null) { + providers.add(this.jeeProviderRef); } - if (oauth2LoginAuthenticationProviderRef != null) { - providers.add(oauth2LoginAuthenticationProviderRef); + if (this.oauth2LoginAuthenticationProviderRef != null) { + providers.add(this.oauth2LoginAuthenticationProviderRef); } - if (oauth2LoginOidcAuthenticationProviderRef != null) { - providers.add(oauth2LoginOidcAuthenticationProviderRef); + if (this.oauth2LoginOidcAuthenticationProviderRef != null) { + providers.add(this.oauth2LoginOidcAuthenticationProviderRef); } - if (authorizationCodeAuthenticationProviderRef != null) { - providers.add(authorizationCodeAuthenticationProviderRef); + if (this.authorizationCodeAuthenticationProviderRef != null) { + providers.add(this.authorizationCodeAuthenticationProviderRef); } providers.addAll(this.authenticationProviders); diff --git a/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java b/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java index 027b6e166f..360c1dfd04 100644 --- a/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java +++ b/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java @@ -123,7 +123,7 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain for (int j = i + 1; j < filters.size(); j++) { Filter f2 = filters.get(j); if (clazz.isAssignableFrom(f2.getClass())) { - logger.warn("Possible error: Filters at position " + i + " and " + j + " are both " + this.logger.warn("Possible error: Filters at position " + i + " and " + j + " are both " + "instances of " + clazz.getName()); return; } @@ -144,7 +144,7 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain } String loginPage = ((LoginUrlAuthenticationEntryPoint) etf.getAuthenticationEntryPoint()).getLoginFormUrl(); - logger.info("Checking whether login URL '" + loginPage + "' is accessible with your configuration"); + this.logger.info("Checking whether login URL '" + loginPage + "' is accessible with your configuration"); FilterInvocation loginRequest = new FilterInvocation(loginPage, "POST"); List filters = null; @@ -155,16 +155,16 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain // 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. - logger.info("Failed to obtain filter chain information for the login page. Unable to complete check."); + this.logger.info("Failed to obtain filter chain information for the login page. Unable to complete check."); } if (filters == null || filters.isEmpty()) { - logger.debug("Filter chain is empty for the login page"); + this.logger.debug("Filter chain is empty for the login page"); return; } if (getFilter(DefaultLoginPageGeneratingFilter.class, filters) != null) { - logger.debug("Default generated login page is in use"); + this.logger.debug("Default generated login page is in use"); return; } @@ -174,9 +174,9 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain Collection attributes = fids.getAttributes(loginRequest); if (attributes == null) { - logger.debug("No access attributes defined for login page URL"); + this.logger.debug("No access attributes defined for login page URL"); if (fsi.isRejectPublicInvocations()) { - logger.warn("FilterSecurityInterceptor is configured to reject public invocations." + this.logger.warn("FilterSecurityInterceptor is configured to reject public invocations." + " Your login page may not be accessible."); } return; @@ -184,7 +184,7 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain AnonymousAuthenticationFilter anonPF = getFilter(AnonymousAuthenticationFilter.class, filters); if (anonPF == null) { - logger.warn("The login page is being protected by the filter chain, but you don't appear to have" + this.logger.warn("The login page is being protected by the filter chain, but you don't appear to have" + " anonymous authentication enabled. This is almost certainly an error."); return; } @@ -196,15 +196,16 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain fsi.getAccessDecisionManager().decide(token, loginRequest, attributes); } catch (AccessDeniedException e) { - 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 + ")"); + 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 + ")"); } catch (Exception e) { // 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 - logger.info( + 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); } diff --git a/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java b/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java index 067308a6bc..d26e26dfb8 100644 --- a/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java +++ b/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java @@ -224,8 +224,8 @@ public class FilterInvocationSecurityMetadataSourceParser implements BeanDefinit private DefaultWebSecurityExpressionHandler handler = new DefaultWebSecurityExpressionHandler(); public DefaultWebSecurityExpressionHandler getBean() { - handler.setDefaultRolePrefix(this.rolePrefix); - return handler; + this.handler.setDefaultRolePrefix(this.rolePrefix); + return this.handler; } } diff --git a/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java index 626dace287..c5e844740c 100644 --- a/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java @@ -134,7 +134,7 @@ public class FormLoginBeanDefinitionParser { authenticationFailureUrl = elt.getAttribute(ATT_FORM_LOGIN_AUTHENTICATION_FAILURE_URL); WebConfigUtils.validateHttpRedirect(authenticationFailureUrl, pc, source); alwaysUseDefault = elt.getAttribute(ATT_ALWAYS_USE_DEFAULT_TARGET_URL); - loginPage = elt.getAttribute(ATT_LOGIN_PAGE); + this.loginPage = elt.getAttribute(ATT_LOGIN_PAGE); successHandlerRef = elt.getAttribute(ATT_SUCCESS_HANDLER_REF); failureHandlerRef = elt.getAttribute(ATT_FAILURE_HANDLER_REF); authDetailsSourceRef = elt.getAttribute(AuthenticationConfigBuilder.ATT_AUTH_DETAILS_SOURCE_REF); @@ -143,34 +143,34 @@ public class FormLoginBeanDefinitionParser { authenticationSuccessForwardUrl = elt.getAttribute(ATT_FORM_LOGIN_AUTHENTICATION_SUCCESS_FORWARD_URL); WebConfigUtils.validateHttpRedirect(authenticationSuccessForwardUrl, pc, source); - if (!StringUtils.hasText(loginPage)) { - loginPage = null; + if (!StringUtils.hasText(this.loginPage)) { + this.loginPage = null; } - WebConfigUtils.validateHttpRedirect(loginPage, pc, source); + WebConfigUtils.validateHttpRedirect(this.loginPage, pc, source); usernameParameter = elt.getAttribute(ATT_USERNAME_PARAMETER); passwordParameter = elt.getAttribute(ATT_PASSWORD_PARAMETER); } - filterBean = createFilterBean(loginUrl, defaultTargetUrl, alwaysUseDefault, loginPage, authenticationFailureUrl, - successHandlerRef, failureHandlerRef, authDetailsSourceRef, authenticationFailureForwardUrl, - authenticationSuccessForwardUrl); + this.filterBean = createFilterBean(loginUrl, defaultTargetUrl, alwaysUseDefault, this.loginPage, + authenticationFailureUrl, successHandlerRef, failureHandlerRef, authDetailsSourceRef, + authenticationFailureForwardUrl, authenticationSuccessForwardUrl); if (StringUtils.hasText(usernameParameter)) { - filterBean.getPropertyValues().addPropertyValue("usernameParameter", usernameParameter); + this.filterBean.getPropertyValues().addPropertyValue("usernameParameter", usernameParameter); } if (StringUtils.hasText(passwordParameter)) { - filterBean.getPropertyValues().addPropertyValue("passwordParameter", passwordParameter); + this.filterBean.getPropertyValues().addPropertyValue("passwordParameter", passwordParameter); } - filterBean.setSource(source); + this.filterBean.setSource(source); BeanDefinitionBuilder entryPointBuilder = BeanDefinitionBuilder .rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class); entryPointBuilder.getRawBeanDefinition().setSource(source); - entryPointBuilder.addConstructorArgValue(loginPage != null ? loginPage : DEF_LOGIN_PAGE); - entryPointBuilder.addPropertyValue("portMapper", portMapper); - entryPointBuilder.addPropertyValue("portResolver", portResolver); - entryPointBean = (RootBeanDefinition) entryPointBuilder.getBeanDefinition(); + entryPointBuilder.addConstructorArgValue(this.loginPage != null ? this.loginPage : DEF_LOGIN_PAGE); + entryPointBuilder.addPropertyValue("portMapper", this.portMapper); + entryPointBuilder.addPropertyValue("portResolver", this.portResolver); + this.entryPointBean = (RootBeanDefinition) entryPointBuilder.getBeanDefinition(); return null; } @@ -180,10 +180,10 @@ public class FormLoginBeanDefinitionParser { String authDetailsSourceRef, String authenticationFailureForwardUrl, String authenticationSuccessForwardUrl) { - BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder.rootBeanDefinition(filterClassName); + BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder.rootBeanDefinition(this.filterClassName); if (!StringUtils.hasText(loginUrl)) { - loginUrl = defaultLoginProcessingUrl; + loginUrl = this.defaultLoginProcessingUrl; } this.loginProcessingUrl = loginUrl; @@ -191,7 +191,7 @@ public class FormLoginBeanDefinitionParser { BeanDefinitionBuilder matcherBuilder = BeanDefinitionBuilder .rootBeanDefinition("org.springframework.security.web.util.matcher.AntPathRequestMatcher"); matcherBuilder.addConstructorArgValue(loginUrl); - if (loginMethod != null) { + if (this.loginMethod != null) { matcherBuilder.addConstructorArgValue("POST"); } @@ -212,7 +212,7 @@ public class FormLoginBeanDefinitionParser { if ("true".equals(alwaysUseDefault)) { successHandler.addPropertyValue("alwaysUseDefaultTargetUrl", Boolean.TRUE); } - successHandler.addPropertyValue("requestCache", requestCache); + successHandler.addPropertyValue("requestCache", this.requestCache); successHandler.addPropertyValue("defaultTargetUrl", StringUtils.hasText(defaultTargetUrl) ? defaultTargetUrl : DEF_FORM_LOGIN_TARGET_URL); filterBuilder.addPropertyValue("authenticationSuccessHandler", successHandler.getBeanDefinition()); @@ -222,8 +222,8 @@ public class FormLoginBeanDefinitionParser { filterBuilder.addPropertyReference("authenticationDetailsSource", authDetailsSourceRef); } - if (sessionStrategy != null) { - filterBuilder.addPropertyValue("sessionAuthenticationStrategy", sessionStrategy); + if (this.sessionStrategy != null) { + filterBuilder.addPropertyValue("sessionAuthenticationStrategy", this.sessionStrategy); } if (StringUtils.hasText(failureHandlerRef)) { @@ -248,7 +248,7 @@ public class FormLoginBeanDefinitionParser { } } failureHandler.addPropertyValue("defaultFailureUrl", authenticationFailureUrl); - failureHandler.addPropertyValue("allowSessionCreation", allowSessionCreation); + failureHandler.addPropertyValue("allowSessionCreation", this.allowSessionCreation); filterBuilder.addPropertyValue("authenticationFailureHandler", failureHandler.getBeanDefinition()); } @@ -256,19 +256,19 @@ public class FormLoginBeanDefinitionParser { } RootBeanDefinition getFilterBean() { - return filterBean; + return this.filterBean; } RootBeanDefinition getEntryPointBean() { - return entryPointBean; + return this.entryPointBean; } String getLoginPage() { - return loginPage; + return this.loginPage; } String getLoginProcessingUrl() { - return loginProcessingUrl; + return this.loginProcessingUrl; } } diff --git a/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java index 924a17ffe2..332e83199b 100644 --- a/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java @@ -125,7 +125,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { public BeanDefinition parse(Element element, ParserContext parserContext) { - headerWriters = new ManagedList<>(); + this.headerWriters = new ManagedList<>(); BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(HeaderWriterFilter.class); boolean disabled = element != null && "true".equals(resolveAttribute(parserContext, element, "disabled")); @@ -150,7 +150,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { parseHeaderElements(element); - boolean noWriters = headerWriters.isEmpty(); + boolean noWriters = this.headerWriters.isEmpty(); if (disabled && !noWriters) { parserContext.getReaderContext().error("Cannot specify with child elements.", element); @@ -159,7 +159,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { return null; } - builder.addConstructorArgValue(headerWriters); + builder.addConstructorArgValue(this.headerWriters); return builder.getBeanDefinition(); } @@ -190,7 +190,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { private void addCacheControl() { BeanDefinitionBuilder headersWriter = BeanDefinitionBuilder .genericBeanDefinition(CacheControlHeadersWriter.class); - headerWriters.add(headersWriter.getBeanDefinition()); + this.headerWriters.add(headersWriter.getBeanDefinition()); } private void parseHstsElement(boolean addIfNotPresent, Element element, ParserContext context) { @@ -238,7 +238,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { } } if (addIfNotPresent || hstsElement != null) { - headerWriters.add(headersWriter.getBeanDefinition()); + this.headerWriters.add(headersWriter.getBeanDefinition()); } } @@ -306,7 +306,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { } if (addIfNotPresent) { - headerWriters.add(headersWriter.getBeanDefinition()); + this.headerWriters.add(headersWriter.getBeanDefinition()); } } } @@ -337,7 +337,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { headersWriter.addPropertyValue("reportOnly", reportOnly); } - headerWriters.add(headersWriter.getBeanDefinition()); + this.headerWriters.add(headersWriter.getBeanDefinition()); } private void parseReferrerPolicyElement(Element element, ParserContext context) { @@ -356,7 +356,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { if (StringUtils.hasLength(policy)) { headersWriter.addConstructorArgValue(ReferrerPolicy.get(policy)); } - headerWriters.add(headersWriter.getBeanDefinition()); + this.headerWriters.add(headersWriter.getBeanDefinition()); } private void parseFeaturePolicyElement(Element element, ParserContext context) { @@ -380,7 +380,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { headersWriter.addConstructorArgValue(policyDirectives); } - headerWriters.add(headersWriter.getBeanDefinition()); + this.headerWriters.add(headersWriter.getBeanDefinition()); } private void attrNotAllowed(ParserContext context, String attrName, String otherAttrName, Element element) { @@ -394,13 +394,13 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { for (Element headerElt : headerElts) { String headerFactoryRef = headerElt.getAttribute(ATT_REF); if (StringUtils.hasText(headerFactoryRef)) { - headerWriters.add(new RuntimeBeanReference(headerFactoryRef)); + this.headerWriters.add(new RuntimeBeanReference(headerFactoryRef)); } else { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(StaticHeadersWriter.class); builder.addConstructorArgValue(headerElt.getAttribute(ATT_NAME)); builder.addConstructorArgValue(headerElt.getAttribute(ATT_VALUE)); - headerWriters.add(builder.getBeanDefinition()); + this.headerWriters.add(builder.getBeanDefinition()); } } } @@ -420,7 +420,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { private void addContentTypeOptions() { BeanDefinitionBuilder builder = BeanDefinitionBuilder .genericBeanDefinition(XContentTypeOptionsHeaderWriter.class); - headerWriters.add(builder.getBeanDefinition()); + this.headerWriters.add(builder.getBeanDefinition()); } private void parseFrameOptionsElement(boolean addIfNotPresent, Element element, ParserContext parserContext) { @@ -495,7 +495,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { } if (addIfNotPresent || frameElt != null) { - headerWriters.add(builder.getBeanDefinition()); + this.headerWriters.add(builder.getBeanDefinition()); } } @@ -526,7 +526,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { } } if (addIfNotPresent || xssElt != null) { - headerWriters.add(builder.getBeanDefinition()); + this.headerWriters.add(builder.getBeanDefinition()); } } diff --git a/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java b/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java index c6b14f77cf..babb529960 100644 --- a/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java +++ b/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java @@ -194,9 +194,9 @@ class HttpConfigurationBuilder { this.portMapper = portMapper; this.portResolver = portResolver; this.matcherType = MatcherType.fromElement(element); - interceptUrls = DomUtils.getChildElementsByTagName(element, Elements.INTERCEPT_URL); + this.interceptUrls = DomUtils.getChildElementsByTagName(element, Elements.INTERCEPT_URL); - for (Element urlElt : interceptUrls) { + for (Element urlElt : this.interceptUrls) { if (StringUtils.hasText(urlElt.getAttribute(ATT_FILTERS))) { pc.getReaderContext() .error("The use of \"filters='none'\" is no longer supported. Please define a" @@ -208,10 +208,10 @@ class HttpConfigurationBuilder { String createSession = element.getAttribute(ATT_CREATE_SESSION); if (StringUtils.hasText(createSession)) { - sessionPolicy = createPolicy(createSession); + this.sessionPolicy = createPolicy(createSession); } else { - sessionPolicy = SessionCreationPolicy.IF_REQUIRED; + this.sessionPolicy = SessionCreationPolicy.IF_REQUIRED; } createCsrfFilter(); @@ -248,30 +248,30 @@ class HttpConfigurationBuilder { @SuppressWarnings("rawtypes") void setLogoutHandlers(ManagedList logoutHandlers) { if (logoutHandlers != null) { - if (concurrentSessionFilter != null) { - concurrentSessionFilter.getPropertyValues().add("logoutHandlers", logoutHandlers); + if (this.concurrentSessionFilter != null) { + this.concurrentSessionFilter.getPropertyValues().add("logoutHandlers", logoutHandlers); } - if (servApiFilter != null) { - servApiFilter.getPropertyValues().add("logoutHandlers", logoutHandlers); + if (this.servApiFilter != null) { + this.servApiFilter.getPropertyValues().add("logoutHandlers", logoutHandlers); } } } void setEntryPoint(BeanMetadataElement entryPoint) { - if (servApiFilter != null) { - servApiFilter.getPropertyValues().add("authenticationEntryPoint", entryPoint); + if (this.servApiFilter != null) { + this.servApiFilter.getPropertyValues().add("authenticationEntryPoint", entryPoint); } } void setAccessDeniedHandler(BeanMetadataElement accessDeniedHandler) { - if (csrfParser != null) { - csrfParser.initAccessDeniedHandler(this.invalidSession, accessDeniedHandler); + if (this.csrfParser != null) { + this.csrfParser.initAccessDeniedHandler(this.invalidSession, accessDeniedHandler); } } void setCsrfIgnoreRequestMatchers(List requestMatchers) { - if (csrfParser != null) { - csrfParser.setIgnoreCsrfRequestMatchers(requestMatchers); + if (this.csrfParser != null) { + this.csrfParser.setIgnoreCsrfRequestMatchers(requestMatchers); } } @@ -283,25 +283,25 @@ class HttpConfigurationBuilder { private void createSecurityContextPersistenceFilter() { BeanDefinitionBuilder scpf = BeanDefinitionBuilder.rootBeanDefinition(SecurityContextPersistenceFilter.class); - String repoRef = httpElt.getAttribute(ATT_SECURITY_CONTEXT_REPOSITORY); - String disableUrlRewriting = httpElt.getAttribute(ATT_DISABLE_URL_REWRITING); + String repoRef = this.httpElt.getAttribute(ATT_SECURITY_CONTEXT_REPOSITORY); + String disableUrlRewriting = this.httpElt.getAttribute(ATT_DISABLE_URL_REWRITING); if (!StringUtils.hasText(disableUrlRewriting)) { disableUrlRewriting = "true"; } if (StringUtils.hasText(repoRef)) { - if (sessionPolicy == SessionCreationPolicy.ALWAYS) { + if (this.sessionPolicy == SessionCreationPolicy.ALWAYS) { scpf.addPropertyValue("forceEagerSessionCreation", Boolean.TRUE); } } else { BeanDefinitionBuilder contextRepo; - if (sessionPolicy == SessionCreationPolicy.STATELESS) { + if (this.sessionPolicy == SessionCreationPolicy.STATELESS) { contextRepo = BeanDefinitionBuilder.rootBeanDefinition(NullSecurityContextRepository.class); } else { contextRepo = BeanDefinitionBuilder.rootBeanDefinition(HttpSessionSecurityContextRepository.class); - switch (sessionPolicy) { + switch (this.sessionPolicy) { case ALWAYS: contextRepo.addPropertyValue("allowSessionCreation", Boolean.TRUE); scpf.addPropertyValue("forceEagerSessionCreation", Boolean.TRUE); @@ -321,18 +321,18 @@ class HttpConfigurationBuilder { } BeanDefinition repoBean = contextRepo.getBeanDefinition(); - repoRef = pc.getReaderContext().generateBeanName(repoBean); - pc.registerBeanComponent(new BeanComponentDefinition(repoBean, repoRef)); + repoRef = this.pc.getReaderContext().generateBeanName(repoBean); + this.pc.registerBeanComponent(new BeanComponentDefinition(repoBean, repoRef)); } - contextRepoRef = new RuntimeBeanReference(repoRef); - scpf.addConstructorArgValue(contextRepoRef); + this.contextRepoRef = new RuntimeBeanReference(repoRef); + scpf.addConstructorArgValue(this.contextRepoRef); - securityContextPersistenceFilter = scpf.getBeanDefinition(); + this.securityContextPersistenceFilter = scpf.getBeanDefinition(); } private void createSessionManagementFilters() { - Element sessionMgmtElt = DomUtils.getChildElementByTagName(httpElt, Elements.SESSION_MANAGEMENT); + Element sessionMgmtElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.SESSION_MANAGEMENT); Element sessionCtrlElt = null; String sessionFixationAttribute = null; @@ -343,11 +343,11 @@ class HttpConfigurationBuilder { boolean sessionControlEnabled = false; if (sessionMgmtElt != null) { - if (sessionPolicy == SessionCreationPolicy.STATELESS) { - pc.getReaderContext() + if (this.sessionPolicy == SessionCreationPolicy.STATELESS) { + this.pc.getReaderContext() .error(Elements.SESSION_MANAGEMENT + " cannot be used" + " in combination with " + ATT_CREATE_SESSION + "='" + SessionCreationPolicy.STATELESS + "'", - pc.extractSource(sessionMgmtElt)); + this.pc.extractSource(sessionMgmtElt)); } sessionFixationAttribute = sessionMgmtElt.getAttribute(ATT_SESSION_FIXATION_PROTECTION); invalidSessionUrl = sessionMgmtElt.getAttribute(ATT_INVALID_SESSION_URL); @@ -359,16 +359,17 @@ class HttpConfigurationBuilder { sessionControlEnabled = sessionCtrlElt != null; if (StringUtils.hasText(invalidSessionUrl) && StringUtils.hasText(invalidSessionStrategyRef)) { - pc.getReaderContext().error(ATT_INVALID_SESSION_URL + " attribute cannot be used in combination with" - + " the " + ATT_INVALID_SESSION_STRATEGY_REF + " attribute.", sessionMgmtElt); + this.pc.getReaderContext() + .error(ATT_INVALID_SESSION_URL + " attribute cannot be used in combination with" + " the " + + ATT_INVALID_SESSION_STRATEGY_REF + " attribute.", sessionMgmtElt); } if (sessionControlEnabled) { if (StringUtils.hasText(sessionAuthStratRef)) { - pc.getReaderContext() + this.pc.getReaderContext() .error(ATT_SESSION_AUTH_STRATEGY_REF + " attribute cannot be used" + " in combination with <" + Elements.CONCURRENT_SESSIONS + ">", - pc.extractSource(sessionCtrlElt)); + this.pc.extractSource(sessionCtrlElt)); } createConcurrencyControlFilterAndSessionRegistry(sessionCtrlElt); } @@ -378,11 +379,11 @@ class HttpConfigurationBuilder { sessionFixationAttribute = OPT_CHANGE_SESSION_ID; } else if (StringUtils.hasText(sessionAuthStratRef)) { - pc.getReaderContext().error(ATT_SESSION_FIXATION_PROTECTION + " attribute cannot be used" - + " in combination with " + ATT_SESSION_AUTH_STRATEGY_REF, pc.extractSource(sessionMgmtElt)); + this.pc.getReaderContext().error(ATT_SESSION_FIXATION_PROTECTION + " attribute cannot be used" + + " in combination with " + ATT_SESSION_AUTH_STRATEGY_REF, this.pc.extractSource(sessionMgmtElt)); } - if (sessionPolicy == SessionCreationPolicy.STATELESS) { + if (this.sessionPolicy == SessionCreationPolicy.STATELESS) { // SEC-1424: do nothing return; } @@ -395,15 +396,15 @@ class HttpConfigurationBuilder { BeanDefinitionBuilder sessionFixationStrategy = null; BeanDefinitionBuilder registerSessionStrategy; - if (csrfAuthStrategy != null) { - delegateSessionStrategies.add(csrfAuthStrategy); + if (this.csrfAuthStrategy != null) { + delegateSessionStrategies.add(this.csrfAuthStrategy); } if (sessionControlEnabled) { - assert sessionRegistryRef != null; + assert this.sessionRegistryRef != null; concurrentSessionStrategy = BeanDefinitionBuilder .rootBeanDefinition(ConcurrentSessionControlAuthenticationStrategy.class); - concurrentSessionStrategy.addConstructorArgValue(sessionRegistryRef); + concurrentSessionStrategy.addConstructorArgValue(this.sessionRegistryRef); String maxSessions = sessionCtrlElt.getAttribute("max-sessions"); @@ -438,12 +439,12 @@ class HttpConfigurationBuilder { if (sessionControlEnabled) { registerSessionStrategy = BeanDefinitionBuilder .rootBeanDefinition(RegisterSessionAuthenticationStrategy.class); - registerSessionStrategy.addConstructorArgValue(sessionRegistryRef); + registerSessionStrategy.addConstructorArgValue(this.sessionRegistryRef); delegateSessionStrategies.add(registerSessionStrategy.getBeanDefinition()); } if (delegateSessionStrategies.isEmpty()) { - sfpf = null; + this.sfpf = null; return; } @@ -454,7 +455,7 @@ class HttpConfigurationBuilder { failureHandler.getPropertyValues().addPropertyValue("defaultFailureUrl", errorUrl); } sessionMgmtFilter.addPropertyValue("authenticationFailureHandler", failureHandler); - sessionMgmtFilter.addConstructorArgValue(contextRepoRef); + sessionMgmtFilter.addConstructorArgValue(this.contextRepoRef); if (!StringUtils.hasText(sessionAuthStratRef) && sessionFixationStrategy != null && !useChangeSessionId) { @@ -469,8 +470,8 @@ class HttpConfigurationBuilder { .rootBeanDefinition(CompositeSessionAuthenticationStrategy.class); BeanDefinition strategyBean = sessionStrategy.getBeanDefinition(); sessionStrategy.addConstructorArgValue(delegateSessionStrategies); - sessionAuthStratRef = pc.getReaderContext().generateBeanName(strategyBean); - pc.registerBeanComponent(new BeanComponentDefinition(strategyBean, sessionAuthStratRef)); + sessionAuthStratRef = this.pc.getReaderContext().generateBeanName(strategyBean); + this.pc.registerBeanComponent(new BeanComponentDefinition(strategyBean, sessionAuthStratRef)); } @@ -478,8 +479,8 @@ class HttpConfigurationBuilder { BeanDefinitionBuilder invalidSessionBldr = BeanDefinitionBuilder .rootBeanDefinition(SimpleRedirectInvalidSessionStrategy.class); invalidSessionBldr.addConstructorArgValue(invalidSessionUrl); - invalidSession = invalidSessionBldr.getBeanDefinition(); - sessionMgmtFilter.addPropertyValue("invalidSessionStrategy", invalidSession); + this.invalidSession = invalidSessionBldr.getBeanDefinition(); + sessionMgmtFilter.addPropertyValue("invalidSessionStrategy", this.invalidSession); } else if (StringUtils.hasText(invalidSessionStrategyRef)) { sessionMgmtFilter.addPropertyReference("invalidSessionStrategy", invalidSessionStrategyRef); @@ -487,8 +488,8 @@ class HttpConfigurationBuilder { sessionMgmtFilter.addConstructorArgReference(sessionAuthStratRef); - sfpf = (RootBeanDefinition) sessionMgmtFilter.getBeanDefinition(); - sessionStrategyRef = new RuntimeBeanReference(sessionAuthStratRef); + this.sfpf = (RootBeanDefinition) sessionMgmtFilter.getBeanDefinition(); + this.sessionStrategyRef = new RuntimeBeanReference(sessionAuthStratRef); } private void createConcurrencyControlFilterAndSessionRegistry(Element element) { @@ -498,18 +499,18 @@ class HttpConfigurationBuilder { final String ATT_SESSION_REGISTRY_REF = "session-registry-ref"; CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), - pc.extractSource(element)); - pc.pushContainingComponent(compositeDef); + this.pc.extractSource(element)); + this.pc.pushContainingComponent(compositeDef); - BeanDefinitionRegistry beanRegistry = pc.getRegistry(); + BeanDefinitionRegistry beanRegistry = this.pc.getRegistry(); String sessionRegistryId = element.getAttribute(ATT_SESSION_REGISTRY_REF); if (!StringUtils.hasText(sessionRegistryId)) { // Register an internal SessionRegistryImpl if no external reference supplied. RootBeanDefinition sessionRegistry = new RootBeanDefinition(SessionRegistryImpl.class); - sessionRegistryId = pc.getReaderContext().registerWithGeneratedName(sessionRegistry); - pc.registerComponent(new BeanComponentDefinition(sessionRegistry, sessionRegistryId)); + sessionRegistryId = this.pc.getReaderContext().registerWithGeneratedName(sessionRegistry); + this.pc.registerComponent(new BeanComponentDefinition(sessionRegistry, sessionRegistryId)); } String registryAlias = element.getAttribute(ATT_SESSION_REGISTRY_ALIAS); @@ -520,7 +521,7 @@ class HttpConfigurationBuilder { BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder.rootBeanDefinition(ConcurrentSessionFilter.class); filterBuilder.addConstructorArgReference(sessionRegistryId); - Object source = pc.extractSource(element); + Object source = this.pc.extractSource(element); filterBuilder.getRawBeanDefinition().setSource(source); filterBuilder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); @@ -528,7 +529,7 @@ class HttpConfigurationBuilder { String expiredSessionStrategyRef = element.getAttribute(ATT_EXPIRED_SESSION_STRATEGY_REF); if (StringUtils.hasText(expiryUrl) && StringUtils.hasText(expiredSessionStrategyRef)) { - pc.getReaderContext().error( + this.pc.getReaderContext().error( "Cannot use 'expired-url' attribute and 'expired-session-strategy-ref'" + " attribute together.", source); } @@ -543,16 +544,16 @@ class HttpConfigurationBuilder { filterBuilder.addConstructorArgReference(expiredSessionStrategyRef); } - pc.popAndRegisterContainingComponent(); + this.pc.popAndRegisterContainingComponent(); - concurrentSessionFilter = filterBuilder.getBeanDefinition(); - sessionRegistryRef = new RuntimeBeanReference(sessionRegistryId); + this.concurrentSessionFilter = filterBuilder.getBeanDefinition(); + this.sessionRegistryRef = new RuntimeBeanReference(sessionRegistryId); } private void createWebAsyncManagerFilter() { boolean asyncSupported = ClassUtils.hasMethod(ServletRequest.class, "startAsync"); if (asyncSupported) { - webAsyncManagerFilter = new RootBeanDefinition(WebAsyncManagerIntegrationFilter.class); + this.webAsyncManagerFilter = new RootBeanDefinition(WebAsyncManagerIntegrationFilter.class); } } @@ -561,15 +562,15 @@ class HttpConfigurationBuilder { final String ATT_SERVLET_API_PROVISION = "servlet-api-provision"; final String DEF_SERVLET_API_PROVISION = "true"; - String provideServletApi = httpElt.getAttribute(ATT_SERVLET_API_PROVISION); + String provideServletApi = this.httpElt.getAttribute(ATT_SERVLET_API_PROVISION); if (!StringUtils.hasText(provideServletApi)) { provideServletApi = DEF_SERVLET_API_PROVISION; } if ("true".equals(provideServletApi)) { - servApiFilter = GrantedAuthorityDefaultsParserUtils.registerWithDefaultRolePrefix(pc, + this.servApiFilter = GrantedAuthorityDefaultsParserUtils.registerWithDefaultRolePrefix(this.pc, SecurityContextHolderAwareRequestFilterBeanFactory.class); - servApiFilter.getPropertyValues().add("authenticationManager", authenticationManager); + this.servApiFilter.getPropertyValues().add("authenticationManager", authenticationManager); } } @@ -578,13 +579,13 @@ class HttpConfigurationBuilder { final String ATT_JAAS_API_PROVISION = "jaas-api-provision"; final String DEF_JAAS_API_PROVISION = "false"; - String provideJaasApi = httpElt.getAttribute(ATT_JAAS_API_PROVISION); + String provideJaasApi = this.httpElt.getAttribute(ATT_JAAS_API_PROVISION); if (!StringUtils.hasText(provideJaasApi)) { provideJaasApi = DEF_JAAS_API_PROVISION; } if ("true".equals(provideJaasApi)) { - jaasApiFilter = new RootBeanDefinition(JaasApiIntegrationFilter.class); + this.jaasApiFilter = new RootBeanDefinition(JaasApiIntegrationFilter.class); } } @@ -610,10 +611,10 @@ class HttpConfigurationBuilder { RootBeanDefinition retryWithHttp = new RootBeanDefinition(RetryWithHttpEntryPoint.class); RootBeanDefinition retryWithHttps = new RootBeanDefinition(RetryWithHttpsEntryPoint.class); - retryWithHttp.getPropertyValues().addPropertyValue("portMapper", portMapper); - retryWithHttp.getPropertyValues().addPropertyValue("portResolver", portResolver); - retryWithHttps.getPropertyValues().addPropertyValue("portMapper", portMapper); - retryWithHttps.getPropertyValues().addPropertyValue("portResolver", portResolver); + retryWithHttp.getPropertyValues().addPropertyValue("portMapper", this.portMapper); + retryWithHttp.getPropertyValues().addPropertyValue("portResolver", this.portResolver); + retryWithHttps.getPropertyValues().addPropertyValue("portMapper", this.portMapper); + retryWithHttps.getPropertyValues().addPropertyValue("portResolver", this.portResolver); secureChannelProcessor.getPropertyValues().addPropertyValue("entryPoint", retryWithHttps); RootBeanDefinition inSecureChannelProcessor = new RootBeanDefinition(InsecureChannelProcessor.class); inSecureChannelProcessor.getPropertyValues().addPropertyValue("entryPoint", retryWithHttp); @@ -621,9 +622,9 @@ class HttpConfigurationBuilder { channelProcessors.add(inSecureChannelProcessor); channelDecisionManager.getPropertyValues().addPropertyValue("channelProcessors", channelProcessors); - String id = pc.getReaderContext().registerWithGeneratedName(channelDecisionManager); + String id = this.pc.getReaderContext().registerWithGeneratedName(channelDecisionManager); channelFilter.getPropertyValues().addPropertyValue("channelDecisionManager", new RuntimeBeanReference(id)); - cpf = channelFilter; + this.cpf = channelFilter; } /** @@ -635,21 +636,21 @@ class HttpConfigurationBuilder { ManagedMap channelRequestMap = new ManagedMap<>(); - for (Element urlElt : interceptUrls) { + for (Element urlElt : this.interceptUrls) { String path = urlElt.getAttribute(ATT_PATH_PATTERN); String method = urlElt.getAttribute(ATT_HTTP_METHOD); String matcherRef = urlElt.getAttribute(ATT_REQUEST_MATCHER_REF); boolean hasMatcherRef = StringUtils.hasText(matcherRef); if (!hasMatcherRef && !StringUtils.hasText(path)) { - pc.getReaderContext().error("pattern attribute cannot be empty or null", urlElt); + this.pc.getReaderContext().error("pattern attribute cannot be empty or null", urlElt); } String requiredChannel = urlElt.getAttribute(ATT_REQUIRES_CHANNEL); if (StringUtils.hasText(requiredChannel)) { BeanMetadataElement matcher = hasMatcherRef ? new RuntimeBeanReference(matcherRef) - : matcherType.createMatcher(pc, path, method); + : this.matcherType.createMatcher(this.pc, path, method); RootBeanDefinition channelAttributes = new RootBeanDefinition(ChannelAttributeFactory.class); channelAttributes.getConstructorArgumentValues().addGenericArgumentValue(requiredChannel); @@ -663,23 +664,23 @@ class HttpConfigurationBuilder { } private void createRequestCacheFilter() { - Element requestCacheElt = DomUtils.getChildElementByTagName(httpElt, Elements.REQUEST_CACHE); + Element requestCacheElt = DomUtils.getChildElementByTagName(this.httpElt, Elements.REQUEST_CACHE); if (requestCacheElt != null) { - requestCache = new RuntimeBeanReference(requestCacheElt.getAttribute(ATT_REF)); + this.requestCache = new RuntimeBeanReference(requestCacheElt.getAttribute(ATT_REF)); } else { BeanDefinitionBuilder requestCacheBldr; - if (sessionPolicy == SessionCreationPolicy.STATELESS) { + if (this.sessionPolicy == SessionCreationPolicy.STATELESS) { requestCacheBldr = BeanDefinitionBuilder.rootBeanDefinition(NullRequestCache.class); } else { requestCacheBldr = BeanDefinitionBuilder.rootBeanDefinition(HttpSessionRequestCache.class); requestCacheBldr.addPropertyValue("createSessionAllowed", - sessionPolicy == SessionCreationPolicy.IF_REQUIRED); - requestCacheBldr.addPropertyValue("portResolver", portResolver); - if (csrfFilter != null) { + this.sessionPolicy == SessionCreationPolicy.IF_REQUIRED); + requestCacheBldr.addPropertyValue("portResolver", this.portResolver); + if (this.csrfFilter != null) { BeanDefinitionBuilder requestCacheMatcherBldr = BeanDefinitionBuilder .rootBeanDefinition(AntPathRequestMatcher.class); requestCacheMatcherBldr.addConstructorArgValue("/**"); @@ -689,20 +690,20 @@ class HttpConfigurationBuilder { } BeanDefinition bean = requestCacheBldr.getBeanDefinition(); - String id = pc.getReaderContext().generateBeanName(bean); - pc.registerBeanComponent(new BeanComponentDefinition(bean, id)); + String id = this.pc.getReaderContext().generateBeanName(bean); + this.pc.registerBeanComponent(new BeanComponentDefinition(bean, id)); this.requestCache = new RuntimeBeanReference(id); } - requestCacheAwareFilter = new RootBeanDefinition(RequestCacheAwareFilter.class); - requestCacheAwareFilter.getConstructorArgumentValues().addGenericArgumentValue(requestCache); + this.requestCacheAwareFilter = new RootBeanDefinition(RequestCacheAwareFilter.class); + this.requestCacheAwareFilter.getConstructorArgumentValues().addGenericArgumentValue(this.requestCache); } private void createFilterSecurityInterceptor(BeanReference authManager) { - boolean useExpressions = FilterInvocationSecurityMetadataSourceParser.isUseExpressions(httpElt); + boolean useExpressions = FilterInvocationSecurityMetadataSourceParser.isUseExpressions(this.httpElt); RootBeanDefinition securityMds = FilterInvocationSecurityMetadataSourceParser - .createSecurityMetadataSource(interceptUrls, addAllAuth, httpElt, pc); + .createSecurityMetadataSource(this.interceptUrls, this.addAllAuth, this.httpElt, this.pc); RootBeanDefinition accessDecisionMgr; ManagedList voters = new ManagedList<>(2); @@ -718,20 +719,20 @@ class HttpConfigurationBuilder { voters.add(expressionVoter.getBeanDefinition()); } else { - voters.add( - GrantedAuthorityDefaultsParserUtils.registerWithDefaultRolePrefix(pc, RoleVoterBeanFactory.class)); + voters.add(GrantedAuthorityDefaultsParserUtils.registerWithDefaultRolePrefix(this.pc, + RoleVoterBeanFactory.class)); voters.add(new RootBeanDefinition(AuthenticatedVoter.class)); } accessDecisionMgr = new RootBeanDefinition(AffirmativeBased.class); accessDecisionMgr.getConstructorArgumentValues().addGenericArgumentValue(voters); - accessDecisionMgr.setSource(pc.extractSource(httpElt)); + accessDecisionMgr.setSource(this.pc.extractSource(this.httpElt)); // Set up the access manager reference for http - String accessManagerId = httpElt.getAttribute(ATT_ACCESS_MGR); + String accessManagerId = this.httpElt.getAttribute(ATT_ACCESS_MGR); if (!StringUtils.hasText(accessManagerId)) { - accessManagerId = pc.getReaderContext().generateBeanName(accessDecisionMgr); - pc.registerBeanComponent(new BeanComponentDefinition(accessDecisionMgr, accessManagerId)); + accessManagerId = this.pc.getReaderContext().generateBeanName(accessDecisionMgr); + this.pc.registerBeanComponent(new BeanComponentDefinition(accessDecisionMgr, accessManagerId)); } BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(FilterSecurityInterceptor.class); @@ -739,28 +740,29 @@ class HttpConfigurationBuilder { builder.addPropertyReference("accessDecisionManager", accessManagerId); builder.addPropertyValue("authenticationManager", authManager); - if ("false".equals(httpElt.getAttribute(ATT_ONCE_PER_REQUEST))) { + if ("false".equals(this.httpElt.getAttribute(ATT_ONCE_PER_REQUEST))) { builder.addPropertyValue("observeOncePerRequest", Boolean.FALSE); } builder.addPropertyValue("securityMetadataSource", securityMds); BeanDefinition fsiBean = builder.getBeanDefinition(); - String fsiId = pc.getReaderContext().generateBeanName(fsiBean); - pc.registerBeanComponent(new BeanComponentDefinition(fsiBean, fsiId)); + String fsiId = this.pc.getReaderContext().generateBeanName(fsiBean); + this.pc.registerBeanComponent(new BeanComponentDefinition(fsiBean, fsiId)); // Create and register a DefaultWebInvocationPrivilegeEvaluator for use with // taglibs etc. BeanDefinition wipe = new RootBeanDefinition(DefaultWebInvocationPrivilegeEvaluator.class); wipe.getConstructorArgumentValues().addGenericArgumentValue(new RuntimeBeanReference(fsiId)); - pc.registerBeanComponent(new BeanComponentDefinition(wipe, pc.getReaderContext().generateBeanName(wipe))); + this.pc.registerBeanComponent( + new BeanComponentDefinition(wipe, this.pc.getReaderContext().generateBeanName(wipe))); this.fsi = new RuntimeBeanReference(fsiId); } private void createAddHeadersFilter() { - Element elmt = DomUtils.getChildElementByTagName(httpElt, Elements.HEADERS); - this.addHeadersFilter = new HeadersBeanDefinitionParser().parse(elmt, pc); + Element elmt = DomUtils.getChildElementByTagName(this.httpElt, Elements.HEADERS); + this.addHeadersFilter = new HeadersBeanDefinitionParser().parse(elmt, this.pc); } private void createCorsFilter() { @@ -770,17 +772,17 @@ class HttpConfigurationBuilder { } private void createCsrfFilter() { - Element elmt = DomUtils.getChildElementByTagName(httpElt, Elements.CSRF); - csrfParser = new CsrfBeanDefinitionParser(); - csrfFilter = csrfParser.parse(elmt, pc); + Element elmt = DomUtils.getChildElementByTagName(this.httpElt, Elements.CSRF); + this.csrfParser = new CsrfBeanDefinitionParser(); + this.csrfFilter = this.csrfParser.parse(elmt, this.pc); - if (csrfFilter == null) { - csrfParser = null; + if (this.csrfFilter == null) { + this.csrfParser = null; return; } - this.csrfAuthStrategy = csrfParser.getCsrfAuthenticationStrategy(); - this.csrfLogoutHandler = csrfParser.getCsrfLogoutHandler(); + this.csrfAuthStrategy = this.csrfParser.getCsrfAuthenticationStrategy(); + this.csrfLogoutHandler = this.csrfParser.getCsrfLogoutHandler(); } BeanMetadataElement getCsrfLogoutHandler() { @@ -788,62 +790,62 @@ class HttpConfigurationBuilder { } BeanReference getSessionStrategy() { - return sessionStrategyRef; + return this.sessionStrategyRef; } SessionCreationPolicy getSessionCreationPolicy() { - return sessionPolicy; + return this.sessionPolicy; } BeanReference getRequestCache() { - return requestCache; + return this.requestCache; } List getFilters() { List filters = new ArrayList<>(); - if (cpf != null) { - filters.add(new OrderDecorator(cpf, CHANNEL_FILTER)); + if (this.cpf != null) { + filters.add(new OrderDecorator(this.cpf, CHANNEL_FILTER)); } - if (concurrentSessionFilter != null) { - filters.add(new OrderDecorator(concurrentSessionFilter, CONCURRENT_SESSION_FILTER)); + if (this.concurrentSessionFilter != null) { + filters.add(new OrderDecorator(this.concurrentSessionFilter, CONCURRENT_SESSION_FILTER)); } - if (webAsyncManagerFilter != null) { - filters.add(new OrderDecorator(webAsyncManagerFilter, WEB_ASYNC_MANAGER_FILTER)); + if (this.webAsyncManagerFilter != null) { + filters.add(new OrderDecorator(this.webAsyncManagerFilter, WEB_ASYNC_MANAGER_FILTER)); } - filters.add(new OrderDecorator(securityContextPersistenceFilter, SECURITY_CONTEXT_FILTER)); + filters.add(new OrderDecorator(this.securityContextPersistenceFilter, SECURITY_CONTEXT_FILTER)); - if (servApiFilter != null) { - filters.add(new OrderDecorator(servApiFilter, SERVLET_API_SUPPORT_FILTER)); + if (this.servApiFilter != null) { + filters.add(new OrderDecorator(this.servApiFilter, SERVLET_API_SUPPORT_FILTER)); } - if (jaasApiFilter != null) { - filters.add(new OrderDecorator(jaasApiFilter, JAAS_API_SUPPORT_FILTER)); + if (this.jaasApiFilter != null) { + filters.add(new OrderDecorator(this.jaasApiFilter, JAAS_API_SUPPORT_FILTER)); } - if (sfpf != null) { - filters.add(new OrderDecorator(sfpf, SESSION_MANAGEMENT_FILTER)); + if (this.sfpf != null) { + filters.add(new OrderDecorator(this.sfpf, SESSION_MANAGEMENT_FILTER)); } - filters.add(new OrderDecorator(fsi, FILTER_SECURITY_INTERCEPTOR)); + filters.add(new OrderDecorator(this.fsi, FILTER_SECURITY_INTERCEPTOR)); - if (sessionPolicy != SessionCreationPolicy.STATELESS) { - filters.add(new OrderDecorator(requestCacheAwareFilter, REQUEST_CACHE_FILTER)); + if (this.sessionPolicy != SessionCreationPolicy.STATELESS) { + filters.add(new OrderDecorator(this.requestCacheAwareFilter, REQUEST_CACHE_FILTER)); } if (this.corsFilter != null) { filters.add(new OrderDecorator(this.corsFilter, CORS_FILTER)); } - if (addHeadersFilter != null) { - filters.add(new OrderDecorator(addHeadersFilter, HEADERS_FILTER)); + if (this.addHeadersFilter != null) { + filters.add(new OrderDecorator(this.addHeadersFilter, HEADERS_FILTER)); } - if (csrfFilter != null) { - filters.add(new OrderDecorator(csrfFilter, CSRF_FILTER)); + if (this.csrfFilter != null) { + filters.add(new OrderDecorator(this.csrfFilter, CSRF_FILTER)); } return filters; @@ -854,8 +856,8 @@ class HttpConfigurationBuilder { private RoleVoter voter = new RoleVoter(); public RoleVoter getBean() { - voter.setRolePrefix(this.rolePrefix); - return voter; + this.voter.setRolePrefix(this.rolePrefix); + return this.voter; } } @@ -866,8 +868,8 @@ class HttpConfigurationBuilder { private SecurityContextHolderAwareRequestFilter filter = new SecurityContextHolderAwareRequestFilter(); public SecurityContextHolderAwareRequestFilter getBean() { - filter.setRolePrefix(this.rolePrefix); - return filter; + this.filter.setRolePrefix(this.rolePrefix); + return this.filter; } } diff --git a/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java index acaa187f45..9ffa600d88 100644 --- a/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java @@ -448,12 +448,12 @@ class OrderDecorator implements Ordered { @Override public int getOrder() { - return order; + return this.order; } @Override public String toString() { - return bean + ", order = " + order; + return this.bean + ", order = " + this.order; } } diff --git a/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java index 36b7662e5a..55ec0df211 100644 --- a/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java @@ -60,7 +60,7 @@ class LogoutBeanDefinitionParser implements BeanDefinitionParser { this.rememberMeServices = rememberMeServices; this.csrfEnabled = csrfLogoutHandler != null; if (this.csrfEnabled) { - logoutHandlers.add(csrfLogoutHandler); + this.logoutHandlers.add(csrfLogoutHandler); } } @@ -102,29 +102,29 @@ class LogoutBeanDefinitionParser implements BeanDefinitionParser { else { // Use the logout URL if no handler set if (!StringUtils.hasText(logoutSuccessUrl)) { - logoutSuccessUrl = defaultLogoutUrl; + logoutSuccessUrl = this.defaultLogoutUrl; } builder.addConstructorArgValue(logoutSuccessUrl); } BeanDefinition sclh = new RootBeanDefinition(SecurityContextLogoutHandler.class); sclh.getPropertyValues().addPropertyValue("invalidateHttpSession", !"false".equals(invalidateSession)); - logoutHandlers.add(sclh); + this.logoutHandlers.add(sclh); - if (rememberMeServices != null) { - logoutHandlers.add(new RuntimeBeanReference(rememberMeServices)); + if (this.rememberMeServices != null) { + this.logoutHandlers.add(new RuntimeBeanReference(this.rememberMeServices)); } if (StringUtils.hasText(deleteCookies)) { BeanDefinition cookieDeleter = new RootBeanDefinition(CookieClearingLogoutHandler.class); String[] names = StringUtils.tokenizeToStringArray(deleteCookies, ","); cookieDeleter.getConstructorArgumentValues().addGenericArgumentValue(names); - logoutHandlers.add(cookieDeleter); + this.logoutHandlers.add(cookieDeleter); } - logoutHandlers.add(new RootBeanDefinition(LogoutSuccessEventPublishingLogoutHandler.class)); + this.logoutHandlers.add(new RootBeanDefinition(LogoutSuccessEventPublishingLogoutHandler.class)); - builder.addConstructorArgValue(logoutHandlers); + builder.addConstructorArgValue(this.logoutHandlers); return builder.getBeanDefinition(); } @@ -141,7 +141,7 @@ class LogoutBeanDefinitionParser implements BeanDefinitionParser { } ManagedList getLogoutHandlers() { - return logoutHandlers; + return this.logoutHandlers; } } diff --git a/config/src/main/java/org/springframework/security/config/http/MatcherType.java b/config/src/main/java/org/springframework/security/config/http/MatcherType.java index 2858ef0414..a3444624a8 100644 --- a/config/src/main/java/org/springframework/security/config/http/MatcherType.java +++ b/config/src/main/java/org/springframework/security/config/http/MatcherType.java @@ -58,7 +58,7 @@ public enum MatcherType { return new RootBeanDefinition(AnyRequestMatcher.class); } - BeanDefinitionBuilder matcherBldr = BeanDefinitionBuilder.rootBeanDefinition(type); + BeanDefinitionBuilder matcherBldr = BeanDefinitionBuilder.rootBeanDefinition(this.type); if (this == mvc) { matcherBldr.addConstructorArgValue(new RootBeanDefinition(HandlerMappingIntrospectorFactoryBean.class)); diff --git a/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java index 7ae4e76a72..c99d48c0a1 100644 --- a/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java @@ -167,8 +167,9 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser { .addConstructorArgValue(clientRegistrationRepository).addConstructorArgValue(authorizedClientRepository) .addPropertyValue("authorizationRequestRepository", authorizationRequestRepository); - if (sessionStrategy != null) { - oauth2LoginAuthenticationFilterBuilder.addPropertyValue("sessionAuthenticationStrategy", sessionStrategy); + if (this.sessionStrategy != null) { + oauth2LoginAuthenticationFilterBuilder.addPropertyValue("sessionAuthenticationStrategy", + this.sessionStrategy); } Object source = parserContext.extractSource(element); @@ -192,9 +193,9 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser { userAuthoritiesMapperRef); } - oauth2LoginAuthenticationProvider = oauth2LoginAuthenticationProviderBuilder.getBeanDefinition(); + this.oauth2LoginAuthenticationProvider = oauth2LoginAuthenticationProviderBuilder.getBeanDefinition(); - oauth2LoginOidcAuthenticationProvider = getOidcAuthProvider(element, accessTokenResponseClient, + this.oauth2LoginOidcAuthenticationProvider = getOidcAuthProvider(element, accessTokenResponseClient, userAuthoritiesMapperRef); BeanDefinitionBuilder oauth2AuthorizationRequestRedirectFilterBuilder = BeanDefinitionBuilder @@ -210,8 +211,9 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser { oauth2AuthorizationRequestRedirectFilterBuilder .addPropertyValue("authorizationRequestRepository", authorizationRequestRepository) - .addPropertyValue("requestCache", requestCache); - oauth2AuthorizationRequestRedirectFilter = oauth2AuthorizationRequestRedirectFilterBuilder.getBeanDefinition(); + .addPropertyValue("requestCache", this.requestCache); + this.oauth2AuthorizationRequestRedirectFilter = oauth2AuthorizationRequestRedirectFilterBuilder + .getBeanDefinition(); String authenticationSuccessHandlerRef = element.getAttribute(ATT_AUTHENTICATION_SUCCESS_HANDLER_REF); if (!StringUtils.isEmpty(authenticationSuccessHandlerRef)) { @@ -221,7 +223,7 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser { else { BeanDefinitionBuilder successHandlerBuilder = BeanDefinitionBuilder.rootBeanDefinition( "org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler") - .addPropertyValue("requestCache", requestCache); + .addPropertyValue("requestCache", this.requestCache); oauth2LoginAuthenticationFilterBuilder.addPropertyValue("authenticationSuccessHandler", successHandlerBuilder.getBeanDefinition()); } @@ -229,15 +231,15 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser { String loginPage = element.getAttribute(ATT_LOGIN_PAGE); if (!StringUtils.isEmpty(loginPage)) { WebConfigUtils.validateHttpRedirect(loginPage, parserContext, source); - oauth2LoginAuthenticationEntryPoint = BeanDefinitionBuilder + this.oauth2LoginAuthenticationEntryPoint = BeanDefinitionBuilder .rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class).addConstructorArgValue(loginPage) - .addPropertyValue("portMapper", portMapper).addPropertyValue("portResolver", portResolver) + .addPropertyValue("portMapper", this.portMapper).addPropertyValue("portResolver", this.portResolver) .getBeanDefinition(); } else { Map entryPoint = getLoginEntryPoint(element); if (entryPoint != null) { - oauth2LoginAuthenticationEntryPoint = BeanDefinitionBuilder + this.oauth2LoginAuthenticationEntryPoint = BeanDefinitionBuilder .rootBeanDefinition(DelegatingAuthenticationEntryPoint.class).addConstructorArgValue(entryPoint) .addPropertyValue("defaultEntryPoint", new LoginUrlAuthenticationEntryPoint(DEFAULT_LOGIN_URI)) .getBeanDefinition(); @@ -254,13 +256,13 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser { "org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler"); failureHandlerBuilder.addConstructorArgValue( DEFAULT_LOGIN_URI + "?" + DefaultLoginPageGeneratingFilter.ERROR_PARAMETER_NAME); - failureHandlerBuilder.addPropertyValue("allowSessionCreation", allowSessionCreation); + failureHandlerBuilder.addPropertyValue("allowSessionCreation", this.allowSessionCreation); oauth2LoginAuthenticationFilterBuilder.addPropertyValue("authenticationFailureHandler", failureHandlerBuilder.getBeanDefinition()); } // prepare loginlinks - oauth2LoginLinks = BeanDefinitionBuilder.rootBeanDefinition(Map.class) + this.oauth2LoginLinks = BeanDefinitionBuilder.rootBeanDefinition(Map.class) .setFactoryMethodOnBean("getLoginLinks", oauth2LoginBeanConfigId).getBeanDefinition(); return oauth2LoginAuthenticationFilterBuilder.getBeanDefinition(); @@ -354,23 +356,23 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser { } BeanDefinition getOAuth2AuthorizationRequestRedirectFilter() { - return oauth2AuthorizationRequestRedirectFilter; + return this.oauth2AuthorizationRequestRedirectFilter; } BeanDefinition getOAuth2LoginAuthenticationEntryPoint() { - return oauth2LoginAuthenticationEntryPoint; + return this.oauth2LoginAuthenticationEntryPoint; } BeanDefinition getOAuth2LoginAuthenticationProvider() { - return oauth2LoginAuthenticationProvider; + return this.oauth2LoginAuthenticationProvider; } BeanDefinition getOAuth2LoginOidcAuthenticationProvider() { - return oauth2LoginOidcAuthenticationProvider; + return this.oauth2LoginOidcAuthenticationProvider; } BeanDefinition getOAuth2LoginLinks() { - return oauth2LoginLinks; + return this.oauth2LoginLinks; } private Map getLoginEntryPoint(Element element) { @@ -456,7 +458,7 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser { @SuppressWarnings({ "unchecked", "unused" }) public Map getLoginLinks() { Iterable clientRegistrations = null; - ClientRegistrationRepository clientRegistrationRepository = context + ClientRegistrationRepository clientRegistrationRepository = this.context .getBean(ClientRegistrationRepository.class); ResolvableType type = ResolvableType.forInstance(clientRegistrationRepository).as(Iterable.class); if (type != ResolvableType.NONE && ClientRegistration.class.isAssignableFrom(type.resolveGenerics()[0])) { diff --git a/config/src/main/java/org/springframework/security/config/http/RememberMeBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/RememberMeBeanDefinitionParser.java index d753f36bfd..82ae2cf36e 100644 --- a/config/src/main/java/org/springframework/security/config/http/RememberMeBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/RememberMeBeanDefinitionParser.java @@ -136,7 +136,7 @@ class RememberMeBeanDefinitionParser implements BeanDefinitionParser { uds.setFactoryMethodName("cachingUserDetailsService"); uds.getConstructorArgumentValues().addGenericArgumentValue(userServiceRef); - services.getConstructorArgumentValues().addGenericArgumentValue(key); + services.getConstructorArgumentValues().addGenericArgumentValue(this.key); services.getConstructorArgumentValues().addGenericArgumentValue(uds); // tokenRepo is already added if it is a // PersistentTokenBasedRememberMeServices @@ -183,7 +183,7 @@ class RememberMeBeanDefinitionParser implements BeanDefinitionParser { filter.addPropertyReference("authenticationSuccessHandler", successHandlerRef); } - filter.addConstructorArgValue(authenticationManager); + filter.addConstructorArgValue(this.authenticationManager); filter.addConstructorArgReference(servicesName); pc.popAndRegisterContainingComponent(); diff --git a/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java b/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java index 50c7fbfd6b..c39b7ba054 100644 --- a/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java +++ b/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java @@ -46,7 +46,7 @@ public class UserDetailsServiceFactoryBean implements ApplicationContextAware { return getUserDetailsService(); } - return (UserDetailsService) beanFactory.getBean(id); + return (UserDetailsService) this.beanFactory.getBean(id); } UserDetailsService cachingUserDetailsService(String id) { @@ -56,11 +56,11 @@ public class UserDetailsServiceFactoryBean implements ApplicationContextAware { // Overwrite with the caching version if available String cachingId = id + AbstractUserDetailsServiceBeanDefinitionParser.CACHING_SUFFIX; - if (beanFactory.containsBeanDefinition(cachingId)) { - return (UserDetailsService) beanFactory.getBean(cachingId); + if (this.beanFactory.containsBeanDefinition(cachingId)) { + return (UserDetailsService) this.beanFactory.getBean(cachingId); } - return (UserDetailsService) beanFactory.getBean(id); + return (UserDetailsService) this.beanFactory.getBean(id); } @SuppressWarnings("unchecked") @@ -81,7 +81,7 @@ public class UserDetailsServiceFactoryBean implements ApplicationContextAware { uds = getUserDetailsService(); } else { - Object bean = beanFactory.getBean(name); + Object bean = this.beanFactory.getBean(name); if (bean instanceof AuthenticationUserDetailsService) { return (AuthenticationUserDetailsService) bean; @@ -131,11 +131,11 @@ public class UserDetailsServiceFactoryBean implements ApplicationContextAware { } private Map getBeansOfType(Class type) { - Map beans = beanFactory.getBeansOfType(type); + Map beans = this.beanFactory.getBeansOfType(type); // Check ancestor bean factories if they exist and the current one has none of the // required type - BeanFactory parent = beanFactory.getParentBeanFactory(); + BeanFactory parent = this.beanFactory.getParentBeanFactory(); while (parent != null && beans.size() == 0) { if (parent instanceof ListableBeanFactory) { beans = ((ListableBeanFactory) parent).getBeansOfType(type); diff --git a/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java b/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java index 9216cbd9d8..06566efae8 100644 --- a/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java @@ -65,7 +65,7 @@ class ContextSourceSettingPostProcessor implements BeanFactoryPostProcessor, Ord + "declared an explicit bean, do not use lazy-init"); } - if (!bf.containsBean(BeanIds.CONTEXT_SOURCE) && defaultNameRequired) { + if (!bf.containsBean(BeanIds.CONTEXT_SOURCE) && this.defaultNameRequired) { if (sources.length > 1) { throw new ApplicationContextException("More than one BaseLdapPathContextSource instance found. " + "Please specify a specific server id using the 'server-ref' attribute when configuring your <" diff --git a/config/src/main/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParser.java index 0246f1333f..cce4c06c39 100644 --- a/config/src/main/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParser.java @@ -65,7 +65,7 @@ public class LdapProviderBeanDefinitionParser implements BeanDefinitionParser { // TODO: Validate the pattern and make sure it is a valid DN. } else if (searchBean == null) { - logger.info("No search information or DN pattern specified. Using default search filter '" + this.logger.info("No search information or DN pattern specified. Using default search filter '" + DEF_USER_SEARCH_FILTER + "'"); BeanDefinitionBuilder searchBeanBuilder = BeanDefinitionBuilder .rootBeanDefinition(LdapUserServiceBeanDefinitionParser.LDAP_SEARCH_CLASS); diff --git a/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java index 050550c0e2..3fe5515568 100644 --- a/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java @@ -186,7 +186,8 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP : expressionHandlerElt.getAttribute("ref"); if (StringUtils.hasText(expressionHandlerRef)) { - logger.info("Using bean '" + expressionHandlerRef + "' as method ExpressionHandler implementation"); + this.logger.info( + "Using bean '" + expressionHandlerRef + "' as method ExpressionHandler implementation"); RootBeanDefinition lazyInitPP = new RootBeanDefinition( LazyInitBeanDefinitionRegistryPostProcessor.class); lazyInitPP.getConstructorArgumentValues().addGenericArgumentValue(expressionHandlerRef); @@ -215,7 +216,7 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP expressionHandlerRef = pc.getReaderContext().generateBeanName(expressionHandler); pc.registerBeanComponent(new BeanComponentDefinition(expressionHandler, expressionHandlerRef)); - logger.info( + this.logger.info( "Expressions were enabled for method security but no SecurityExpressionHandler was configured. " + "All hasPermission() expressions will evaluate to false."); } @@ -485,11 +486,12 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP } public Authentication authenticate(Authentication authentication) throws AuthenticationException { - synchronized (delegateMonitor) { - if (delegate == null) { - Assert.state(beanFactory != null, () -> "BeanFactory must be set to resolve " + authMgrBean); + synchronized (this.delegateMonitor) { + if (this.delegate == null) { + Assert.state(this.beanFactory != null, + () -> "BeanFactory must be set to resolve " + this.authMgrBean); try { - delegate = beanFactory.getBean(authMgrBean, AuthenticationManager.class); + this.delegate = this.beanFactory.getBean(this.authMgrBean, AuthenticationManager.class); } catch (NoSuchBeanDefinitionException e) { if (BeanIds.AUTHENTICATION_MANAGER.equals(e.getBeanName())) { @@ -501,7 +503,7 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP } } - return delegate.authenticate(authentication); + return this.delegate.authenticate(authentication); } public void setBeanFactory(BeanFactory beanFactory) throws BeansException { @@ -515,8 +517,8 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP private Jsr250MethodSecurityMetadataSource source = new Jsr250MethodSecurityMetadataSource(); public Jsr250MethodSecurityMetadataSource getBean() { - source.setDefaultRolePrefix(this.rolePrefix); - return source; + this.source.setDefaultRolePrefix(this.rolePrefix); + return this.source; } } @@ -526,8 +528,8 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP private DefaultMethodSecurityExpressionHandler handler = new DefaultMethodSecurityExpressionHandler(); public DefaultMethodSecurityExpressionHandler getBean() { - handler.setDefaultRolePrefix(this.rolePrefix); - return handler; + this.handler.setDefaultRolePrefix(this.rolePrefix); + return this.handler; } } @@ -566,10 +568,10 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP } public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException { - if (!registry.containsBeanDefinition(beanName)) { + if (!registry.containsBeanDefinition(this.beanName)) { return; } - BeanDefinition beanDefinition = registry.getBeanDefinition(beanName); + BeanDefinition beanDefinition = registry.getBeanDefinition(this.beanName); beanDefinition.setLazyInit(true); } diff --git a/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java index 171e01fed2..77eade5729 100644 --- a/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java +++ b/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java @@ -50,7 +50,7 @@ public class InterceptMethodsBeanDefinitionDecorator implements BeanDefinitionDe public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) { MethodConfigUtils.registerDefaultMethodAccessManagerIfNecessary(parserContext); - return delegate.decorate(node, definition, parserContext); + return this.delegate.decorate(node, definition, parserContext); } } diff --git a/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java b/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java index 23b75e2817..59cb2d951b 100644 --- a/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java @@ -94,8 +94,9 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { // supportedPrimitives.add(PointcutPrimitive.AT_WITHIN); // supportedPrimitives.add(PointcutPrimitive.AT_ARGS); // supportedPrimitives.add(PointcutPrimitive.AT_TARGET); - parser = PointcutParser.getPointcutParserSupportingSpecifiedPrimitivesAndUsingContextClassloaderForResolution( - supportedPrimitives); + this.parser = PointcutParser + .getPointcutParserSupportingSpecifiedPrimitivesAndUsingContextClassloaderForResolution( + supportedPrimitives); } public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { @@ -103,14 +104,14 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { } public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { - if (processedBeans.contains(beanName)) { + if (this.processedBeans.contains(beanName)) { // We already have the metadata for this bean return bean; } - synchronized (processedBeans) { + synchronized (this.processedBeans) { // check again synchronized this time - if (processedBeans.contains(beanName)) { + if (this.processedBeans.contains(beanName)) { return bean; } @@ -126,7 +127,7 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { // Check to see if any of those methods are compatible with our pointcut // expressions for (Method method : methods) { - for (PointcutExpression expression : pointCutExpressions) { + for (PointcutExpression expression : this.pointCutExpressions) { // Try for the bean class directly if (attemptMatch(bean.getClass(), method, expression, beanName)) { // We've found the first expression that matches this method, so @@ -136,7 +137,7 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { } } - processedBeans.add(beanName); + this.processedBeans.add(beanName); } return bean; @@ -148,7 +149,7 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { // Handle accordingly if (matches) { - List attr = pointcutMap.get(expression.getPointcutExpression()); + List attr = this.pointcutMap.get(expression.getPointcutExpression()); if (logger.isDebugEnabled()) { logger.debug("AspectJ pointcut expression '" + expression.getPointcutExpression() @@ -157,7 +158,7 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { + "'"); } - mapBasedMethodSecurityMetadataSource.addSecureMethod(targetClass, method, attr); + this.mapBasedMethodSecurityMetadataSource.addSecureMethod(targetClass, method, attr); } return matches; @@ -175,9 +176,9 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { Assert.hasText(pointcutExpression, "An AspectJ pointcut expression is required"); Assert.notNull(definition, "A List of ConfigAttributes is required"); pointcutExpression = replaceBooleanOperators(pointcutExpression); - pointcutMap.put(pointcutExpression, definition); + this.pointcutMap.put(pointcutExpression, definition); // Parse the presented AspectJ pointcut expression and add it to the cache - pointCutExpressions.add(parser.parsePointcutExpression(pointcutExpression)); + this.pointCutExpressions.add(this.parser.parsePointcutExpression(pointcutExpression)); if (logger.isDebugEnabled()) { logger.debug("AspectJ pointcut expression '" + pointcutExpression diff --git a/config/src/main/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBean.java b/config/src/main/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBean.java index 705ebe122f..a8c45f04d3 100644 --- a/config/src/main/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBean.java +++ b/config/src/main/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBean.java @@ -42,7 +42,7 @@ public class UserDetailsManagerResourceFactoryBean @Override public InMemoryUserDetailsManager getObject() throws Exception { - Collection users = userDetails.getObject(); + Collection users = this.userDetails.getObject(); return new InMemoryUserDetailsManager(users); } @@ -53,7 +53,7 @@ public class UserDetailsManagerResourceFactoryBean @Override public void setResourceLoader(ResourceLoader resourceLoader) { - userDetails.setResourceLoader(resourceLoader); + this.userDetails.setResourceLoader(resourceLoader); } /** diff --git a/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java index 0ce21afb08..17b839be34 100644 --- a/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java @@ -276,10 +276,10 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements } ManagedList interceptors = new ManagedList(); interceptors.add(new RootBeanDefinition(SecurityContextChannelInterceptor.class)); - if (!sameOriginDisabled) { + if (!this.sameOriginDisabled) { interceptors.add(new RootBeanDefinition(CsrfChannelInterceptor.class)); } - interceptors.add(registry.getBeanDefinition(inboundSecurityInterceptorId)); + interceptors.add(registry.getBeanDefinition(this.inboundSecurityInterceptorId)); BeanDefinition inboundChannel = registry.getBeanDefinition(CLIENT_INBOUND_CHANNEL_BEAN_ID); PropertyValue currentInterceptorsPv = inboundChannel.getPropertyValues() @@ -297,7 +297,7 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements } private void addCsrfTokenHandshakeInterceptor(BeanDefinition bd) { - if (sameOriginDisabled) { + if (this.sameOriginDisabled) { return; } String interceptorPropertyName = "handshakeInterceptors"; @@ -318,31 +318,31 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements private PathMatcher delegate = new AntPathMatcher(); public boolean isPattern(String path) { - return delegate.isPattern(path); + return this.delegate.isPattern(path); } public boolean match(String pattern, String path) { - return delegate.match(pattern, path); + return this.delegate.match(pattern, path); } public boolean matchStart(String pattern, String path) { - return delegate.matchStart(pattern, path); + return this.delegate.matchStart(pattern, path); } public String extractPathWithinPattern(String pattern, String path) { - return delegate.extractPathWithinPattern(pattern, path); + return this.delegate.extractPathWithinPattern(pattern, path); } public Map extractUriTemplateVariables(String pattern, String path) { - return delegate.extractUriTemplateVariables(pattern, path); + return this.delegate.extractUriTemplateVariables(pattern, path); } public Comparator getPatternComparator(String path) { - return delegate.getPatternComparator(path); + return this.delegate.getPatternComparator(path); } public String combine(String pattern1, String pattern2) { - return delegate.combine(pattern1, pattern2); + return this.delegate.combine(pattern1, pattern2); } void setPathMatcher(PathMatcher pathMatcher) { diff --git a/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java b/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java index 58a232135f..e3d2d5a466 100644 --- a/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java +++ b/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java @@ -32,24 +32,24 @@ public class BeanNameCollectingPostProcessor implements BeanPostProcessor { public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (beanName != null) { - beforeInitPostProcessedBeans.add(beanName); + this.beforeInitPostProcessedBeans.add(beanName); } return bean; } public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { if (beanName != null) { - afterInitPostProcessedBeans.add(beanName); + this.afterInitPostProcessedBeans.add(beanName); } return bean; } public Set getBeforeInitPostProcessedBeans() { - return beforeInitPostProcessedBeans; + return this.beforeInitPostProcessedBeans; } public Set getAfterInitPostProcessedBeans() { - return afterInitPostProcessedBeans; + return this.afterInitPostProcessedBeans; } } diff --git a/config/src/test/java/org/springframework/security/CollectingAppListener.java b/config/src/test/java/org/springframework/security/CollectingAppListener.java index 09d61fc169..0a8140af25 100644 --- a/config/src/test/java/org/springframework/security/CollectingAppListener.java +++ b/config/src/test/java/org/springframework/security/CollectingAppListener.java @@ -42,33 +42,33 @@ public class CollectingAppListener implements ApplicationListener { public void onApplicationEvent(ApplicationEvent event) { if (event instanceof AbstractAuthenticationEvent) { - events.add(event); - authenticationEvents.add((AbstractAuthenticationEvent) event); + this.events.add(event); + this.authenticationEvents.add((AbstractAuthenticationEvent) event); } if (event instanceof AbstractAuthenticationFailureEvent) { - events.add(event); - authenticationFailureEvents.add((AbstractAuthenticationFailureEvent) event); + this.events.add(event); + this.authenticationFailureEvents.add((AbstractAuthenticationFailureEvent) event); } if (event instanceof AbstractAuthorizationEvent) { - events.add(event); - authorizationEvents.add((AbstractAuthorizationEvent) event); + this.events.add(event); + this.authorizationEvents.add((AbstractAuthorizationEvent) event); } } public Set getEvents() { - return events; + return this.events; } public Set getAuthenticationEvents() { - return authenticationEvents; + return this.authenticationEvents; } public Set getAuthenticationFailureEvents() { - return authenticationFailureEvents; + return this.authenticationFailureEvents; } public Set getAuthorizationEvents() { - return authorizationEvents; + return this.authorizationEvents; } } diff --git a/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java b/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java index 911f8f0738..b14c1c37ad 100644 --- a/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java +++ b/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java @@ -31,13 +31,13 @@ public class DataSourcePopulator implements InitializingBean { JdbcTemplate template; public void afterPropertiesSet() { - Assert.notNull(template, "dataSource required"); + Assert.notNull(this.template, "dataSource required"); - template.execute( + this.template.execute( "CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);"); - template.execute( + this.template.execute( "CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));"); - template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);"); + this.template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);"); /* * Passwords encoded using MD5, NOT in Base64 format, with null as salt Encoded @@ -46,21 +46,21 @@ public class DataSourcePopulator implements InitializingBean { * is disabled) Encoded password for bill is "wombat" Encoded password for bob is * "wombat" Encoded password for jane is "wombat" */ - template.execute("INSERT INTO USERS VALUES('rod','{noop}koala',TRUE);"); - template.execute("INSERT INTO USERS VALUES('dianne','{MD5}65d15fe9156f9c4bbffd98085992a44e',TRUE);"); - template.execute("INSERT INTO USERS VALUES('scott','{MD5}2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); - template.execute("INSERT INTO USERS VALUES('peter','{MD5}22b5c9accc6e1ba628cedc63a72d57f8',FALSE);"); - template.execute("INSERT INTO USERS VALUES('bill','{MD5}2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); - template.execute("INSERT INTO USERS VALUES('bob','{MD5}2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); - template.execute("INSERT INTO USERS VALUES('jane','{MD5}2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); - template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');"); - template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('bill','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('bob','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');"); + this.template.execute("INSERT INTO USERS VALUES('rod','{noop}koala',TRUE);"); + this.template.execute("INSERT INTO USERS VALUES('dianne','{MD5}65d15fe9156f9c4bbffd98085992a44e',TRUE);"); + this.template.execute("INSERT INTO USERS VALUES('scott','{MD5}2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); + this.template.execute("INSERT INTO USERS VALUES('peter','{MD5}22b5c9accc6e1ba628cedc63a72d57f8',FALSE);"); + this.template.execute("INSERT INTO USERS VALUES('bill','{MD5}2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); + this.template.execute("INSERT INTO USERS VALUES('bob','{MD5}2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); + this.template.execute("INSERT INTO USERS VALUES('jane','{MD5}2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); + this.template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');"); + this.template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');"); + this.template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');"); + this.template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');"); + this.template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');"); + this.template.execute("INSERT INTO AUTHORITIES VALUES('bill','ROLE_USER');"); + this.template.execute("INSERT INTO AUTHORITIES VALUES('bob','ROLE_USER');"); + this.template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');"); } public void setDataSource(DataSource dataSource) { diff --git a/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java b/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java index aafe570bad..0730702b94 100644 --- a/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java @@ -59,25 +59,25 @@ public class FilterChainProxyConfigTests { public void loadContext() { System.setProperty("sec1235.pattern1", "/login"); System.setProperty("sec1235.pattern2", "/logout"); - appCtx = new ClassPathXmlApplicationContext("org/springframework/security/util/filtertest-valid.xml"); + this.appCtx = new ClassPathXmlApplicationContext("org/springframework/security/util/filtertest-valid.xml"); } @After public void closeContext() { - if (appCtx != null) { - appCtx.close(); + if (this.appCtx != null) { + this.appCtx.close(); } } @Test public void normalOperation() throws Exception { - FilterChainProxy filterChainProxy = appCtx.getBean("filterChain", FilterChainProxy.class); + FilterChainProxy filterChainProxy = this.appCtx.getBean("filterChain", FilterChainProxy.class); doNormalOperation(filterChainProxy); } @Test public void normalOperationWithNewConfig() throws Exception { - FilterChainProxy filterChainProxy = appCtx.getBean("newFilterChainProxy", FilterChainProxy.class); + FilterChainProxy filterChainProxy = this.appCtx.getBean("newFilterChainProxy", FilterChainProxy.class); filterChainProxy.setFirewall(new DefaultHttpFirewall()); checkPathAndFilterOrder(filterChainProxy); doNormalOperation(filterChainProxy); @@ -85,7 +85,7 @@ public class FilterChainProxyConfigTests { @Test public void normalOperationWithNewConfigRegex() throws Exception { - FilterChainProxy filterChainProxy = appCtx.getBean("newFilterChainProxyRegex", FilterChainProxy.class); + FilterChainProxy filterChainProxy = this.appCtx.getBean("newFilterChainProxyRegex", FilterChainProxy.class); filterChainProxy.setFirewall(new DefaultHttpFirewall()); checkPathAndFilterOrder(filterChainProxy); doNormalOperation(filterChainProxy); @@ -93,7 +93,8 @@ public class FilterChainProxyConfigTests { @Test public void normalOperationWithNewConfigNonNamespace() throws Exception { - FilterChainProxy filterChainProxy = appCtx.getBean("newFilterChainProxyNonNamespace", FilterChainProxy.class); + FilterChainProxy filterChainProxy = this.appCtx.getBean("newFilterChainProxyNonNamespace", + FilterChainProxy.class); filterChainProxy.setFirewall(new DefaultHttpFirewall()); checkPathAndFilterOrder(filterChainProxy); doNormalOperation(filterChainProxy); @@ -101,14 +102,15 @@ public class FilterChainProxyConfigTests { @Test public void pathWithNoMatchHasNoFilters() { - FilterChainProxy filterChainProxy = appCtx.getBean("newFilterChainProxyNoDefaultPath", FilterChainProxy.class); + FilterChainProxy filterChainProxy = this.appCtx.getBean("newFilterChainProxyNoDefaultPath", + FilterChainProxy.class); assertThat(filterChainProxy.getFilters("/nomatch")).isNull(); } // SEC-1235 @Test public void mixingPatternsAndPlaceholdersDoesntCauseOrderingIssues() { - FilterChainProxy fcp = appCtx.getBean("sec1235FilterChainProxy", FilterChainProxy.class); + FilterChainProxy fcp = this.appCtx.getBean("sec1235FilterChainProxy", FilterChainProxy.class); List chains = fcp.getFilterChains(); assertThat(getPattern(chains.get(0))).isEqualTo("/login*"); diff --git a/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java b/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java index f4ee273515..7870b89cac 100644 --- a/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java @@ -40,8 +40,8 @@ public class InvalidConfigurationTests { @After public void closeAppContext() { - if (appContext != null) { - appContext.close(); + if (this.appContext != null) { + this.appContext.close(); } } @@ -79,7 +79,7 @@ public class InvalidConfigurationTests { } private void setContext(String context) { - appContext = new InMemoryXmlApplicationContext(context); + this.appContext = new InMemoryXmlApplicationContext(context); } } diff --git a/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java b/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java index 7245db7ecf..c2c70116f7 100644 --- a/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java +++ b/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java @@ -27,7 +27,7 @@ public class PostProcessedMockUserDetailsService implements UserDetailsService { } public String getPostProcessorWasHere() { - return postProcessorWasHere; + return this.postProcessorWasHere; } public void setPostProcessorWasHere(String postProcessorWasHere) { diff --git a/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java b/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java index 7831e310fb..3623491195 100644 --- a/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java @@ -106,8 +106,8 @@ public class SecurityNamespaceHandlerTests { @Test public void filterNoClassDefFoundError() throws Exception { String className = "javax.servlet.Filter"; - thrown.expect(BeanDefinitionParsingException.class); - thrown.expectMessage("NoClassDefFoundError: " + className); + this.thrown.expect(BeanDefinitionParsingException.class); + this.thrown.expectMessage("NoClassDefFoundError: " + className); spy(ClassUtils.class); doThrow(new NoClassDefFoundError(className)).when(ClassUtils.class, "forName", eq(FILTER_CHAIN_PROXY_CLASSNAME), any(ClassLoader.class)); @@ -127,8 +127,8 @@ public class SecurityNamespaceHandlerTests { @Test public void filterChainProxyClassNotFoundException() throws Exception { String className = FILTER_CHAIN_PROXY_CLASSNAME; - thrown.expect(BeanDefinitionParsingException.class); - thrown.expectMessage("ClassNotFoundException: " + className); + this.thrown.expect(BeanDefinitionParsingException.class); + this.thrown.expectMessage("ClassNotFoundException: " + className); spy(ClassUtils.class); doThrow(new ClassNotFoundException(className)).when(ClassUtils.class, "forName", eq(FILTER_CHAIN_PROXY_CLASSNAME), any(ClassLoader.class)); diff --git a/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java b/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java index 5075300c77..d1fb0deae6 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java +++ b/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java @@ -28,7 +28,7 @@ class ConcereteSecurityConfigurerAdapter extends SecurityConfigurerAdapter builder) { - list = postProcess(list); + this.list = postProcess(this.list); } public ConcereteSecurityConfigurerAdapter list(List l) { diff --git a/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterTests.java b/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterTests.java index 9e60cd0d74..a75c8ed610 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterTests.java @@ -28,15 +28,15 @@ public class SecurityConfigurerAdapterTests { @Before public void setup() { - adapter = new ConcereteSecurityConfigurerAdapter(); + this.adapter = new ConcereteSecurityConfigurerAdapter(); } @Test public void postProcessObjectPostProcessorsAreSorted() { - adapter.addObjectPostProcessor(new OrderedObjectPostProcessor(Ordered.LOWEST_PRECEDENCE)); - adapter.addObjectPostProcessor(new OrderedObjectPostProcessor(Ordered.HIGHEST_PRECEDENCE)); + this.adapter.addObjectPostProcessor(new OrderedObjectPostProcessor(Ordered.LOWEST_PRECEDENCE)); + this.adapter.addObjectPostProcessor(new OrderedObjectPostProcessor(Ordered.HIGHEST_PRECEDENCE)); - assertThat(adapter.postProcess("hi")) + assertThat(this.adapter.postProcess("hi")) .isEqualTo("hi " + Ordered.HIGHEST_PRECEDENCE + " " + Ordered.LOWEST_PRECEDENCE); } @@ -49,12 +49,12 @@ public class SecurityConfigurerAdapterTests { } public int getOrder() { - return order; + return this.order; } @SuppressWarnings("unchecked") public String postProcess(String object) { - return object + " " + order; + return object + " " + this.order; } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthenticationTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthenticationTests.java index dd6faa94ae..c36a69936c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthenticationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthenticationTests.java @@ -40,7 +40,7 @@ public class EnableGlobalAuthenticationTests { public void authenticationConfigurationWhenGetAuthenticationManagerThenNotNull() throws Exception { this.spring.register(Config.class).autowire(); - AuthenticationConfiguration auth = spring.getContext().getBean(AuthenticationConfiguration.class); + AuthenticationConfiguration auth = this.spring.getContext().getBean(AuthenticationConfiguration.class); assertThat(auth.getAuthenticationManager()).isNotNull(); } @@ -116,7 +116,7 @@ public class EnableGlobalAuthenticationTests { } public Child getChild() { - return child; + return this.child; } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTests.java index 0c786825ff..41dd70e31e 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTests.java @@ -30,15 +30,15 @@ public class LdapAuthenticationProviderConfigurerTests { @Before public void setUp() { - configurer = new LdapAuthenticationProviderConfigurer<>(); + this.configurer = new LdapAuthenticationProviderConfigurer<>(); } // SEC-2557 @Test public void getAuthoritiesMapper() throws Exception { - assertThat(configurer.getAuthoritiesMapper()).isInstanceOf(SimpleAuthorityMapper.class); - configurer.authoritiesMapper(new NullAuthoritiesMapper()); - assertThat(configurer.getAuthoritiesMapper()).isInstanceOf(NullAuthoritiesMapper.class); + assertThat(this.configurer.getAuthoritiesMapper()).isInstanceOf(SimpleAuthorityMapper.class); + this.configurer.authoritiesMapper(new NullAuthoritiesMapper()); + assertThat(this.configurer.getAuthoritiesMapper()).isInstanceOf(NullAuthoritiesMapper.class); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurerTests.java index 03ec10796e..a6e2e698c7 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurerTests.java @@ -38,13 +38,13 @@ public class UserDetailsManagerConfigurerTests { @Before public void setup() { - userDetailsManager = new InMemoryUserDetailsManager(); + this.userDetailsManager = new InMemoryUserDetailsManager(); } @Test public void allAttributesSupported() { UserDetails userDetails = new UserDetailsManagerConfigurer>( - userDetailsManager).withUser("user").password("password").roles("USER").disabled(true) + this.userDetailsManager).withUser("user").password("password").roles("USER").disabled(true) .accountExpired(true).accountLocked(true).credentialsExpired(true).build(); assertThat(userDetails.getUsername()).isEqualTo("user"); @@ -61,7 +61,7 @@ public class UserDetailsManagerConfigurerTests { SimpleGrantedAuthority authority = new SimpleGrantedAuthority("ROLE_USER"); UserDetails userDetails = new UserDetailsManagerConfigurer>( - userDetailsManager).withUser("user").password("password").authorities(authority).build(); + this.userDetailsManager).withUser("user").password("password").authorities(authority).build(); assertThat(userDetails.getAuthorities().stream().findFirst().get()).isEqualTo(authority); } @@ -71,7 +71,7 @@ public class UserDetailsManagerConfigurerTests { String authority = "ROLE_USER"; UserDetails userDetails = new UserDetailsManagerConfigurer>( - userDetailsManager).withUser("user").password("password").authorities(authority).build(); + this.userDetailsManager).withUser("user").password("password").authorities(authority).build(); assertThat(userDetails.getAuthorities().stream().findFirst().get().getAuthority()).isEqualTo(authority); } @@ -81,7 +81,8 @@ public class UserDetailsManagerConfigurerTests { SimpleGrantedAuthority authority = new SimpleGrantedAuthority("ROLE_USER"); UserDetails userDetails = new UserDetailsManagerConfigurer>( - userDetailsManager).withUser("user").password("password").authorities(Arrays.asList(authority)).build(); + this.userDetailsManager).withUser("user").password("password").authorities(Arrays.asList(authority)) + .build(); assertThat(userDetails.getAuthorities().stream().findFirst().get()).isEqualTo(authority); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/issue50/SecurityConfig.java b/config/src/test/java/org/springframework/security/config/annotation/issue50/SecurityConfig.java index 791452636f..10d4e5f8ec 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/issue50/SecurityConfig.java +++ b/config/src/test/java/org/springframework/security/config/annotation/issue50/SecurityConfig.java @@ -71,7 +71,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Bean public AuthenticationProvider authenticationProvider() { - Assert.notNull(myUserRepository); + Assert.notNull(this.myUserRepository); return new AuthenticationProvider() { public boolean supports(Class authentication) { return true; @@ -80,7 +80,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { public Authentication authenticate(Authentication authentication) throws AuthenticationException { Object principal = authentication.getPrincipal(); String username = String.valueOf(principal); - User user = myUserRepository.findByUsername(username); + User user = SecurityConfig.this.myUserRepository.findByUsername(username); if (user == null) { throw new UsernameNotFoundException("No user for principal " + principal); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/issue50/domain/User.java b/config/src/test/java/org/springframework/security/config/annotation/issue50/domain/User.java index 919a378429..9d77f983cf 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/issue50/domain/User.java +++ b/config/src/test/java/org/springframework/security/config/annotation/issue50/domain/User.java @@ -36,7 +36,7 @@ public class User { private String password; public Long getId() { - return id; + return this.id; } public void setId(Long id) { @@ -44,7 +44,7 @@ public class User { } public String getUsername() { - return username; + return this.username; } public void setUsername(String username) { @@ -52,7 +52,7 @@ public class User { } public String getPassword() { - return password; + return this.password; } public void setPassword(String password) { diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/DelegatingReactiveMessageService.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/DelegatingReactiveMessageService.java index c6a8980a0f..41b952f911 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/DelegatingReactiveMessageService.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/DelegatingReactiveMessageService.java @@ -38,89 +38,89 @@ public class DelegatingReactiveMessageService implements ReactiveMessageService @Override public Mono monoFindById(long id) { - return delegate.monoFindById(id); + return this.delegate.monoFindById(id); } @Override @PreAuthorize("hasRole('ADMIN')") public Mono monoPreAuthorizeHasRoleFindById(long id) { - return delegate.monoPreAuthorizeHasRoleFindById(id); + return this.delegate.monoPreAuthorizeHasRoleFindById(id); } @Override @PostAuthorize("returnObject?.contains(authentication?.name)") public Mono monoPostAuthorizeFindById(long id) { - return delegate.monoPostAuthorizeFindById(id); + return this.delegate.monoPostAuthorizeFindById(id); } @Override @PreAuthorize("@authz.check(#id)") public Mono monoPreAuthorizeBeanFindById(long id) { - return delegate.monoPreAuthorizeBeanFindById(id); + return this.delegate.monoPreAuthorizeBeanFindById(id); } @Override @PostAuthorize("@authz.check(authentication, returnObject)") public Mono monoPostAuthorizeBeanFindById(long id) { - return delegate.monoPostAuthorizeBeanFindById(id); + return this.delegate.monoPostAuthorizeBeanFindById(id); } @Override public Flux fluxFindById(long id) { - return delegate.fluxFindById(id); + return this.delegate.fluxFindById(id); } @Override @PreAuthorize("hasRole('ADMIN')") public Flux fluxPreAuthorizeHasRoleFindById(long id) { - return delegate.fluxPreAuthorizeHasRoleFindById(id); + return this.delegate.fluxPreAuthorizeHasRoleFindById(id); } @Override @PostAuthorize("returnObject?.contains(authentication?.name)") public Flux fluxPostAuthorizeFindById(long id) { - return delegate.fluxPostAuthorizeFindById(id); + return this.delegate.fluxPostAuthorizeFindById(id); } @Override @PreAuthorize("@authz.check(#id)") public Flux fluxPreAuthorizeBeanFindById(long id) { - return delegate.fluxPreAuthorizeBeanFindById(id); + return this.delegate.fluxPreAuthorizeBeanFindById(id); } @Override @PostAuthorize("@authz.check(authentication, returnObject)") public Flux fluxPostAuthorizeBeanFindById(long id) { - return delegate.fluxPostAuthorizeBeanFindById(id); + return this.delegate.fluxPostAuthorizeBeanFindById(id); } @Override public Publisher publisherFindById(long id) { - return delegate.publisherFindById(id); + return this.delegate.publisherFindById(id); } @Override @PreAuthorize("hasRole('ADMIN')") public Publisher publisherPreAuthorizeHasRoleFindById(long id) { - return delegate.publisherPreAuthorizeHasRoleFindById(id); + return this.delegate.publisherPreAuthorizeHasRoleFindById(id); } @Override @PostAuthorize("returnObject?.contains(authentication?.name)") public Publisher publisherPostAuthorizeFindById(long id) { - return delegate.publisherPostAuthorizeFindById(id); + return this.delegate.publisherPostAuthorizeFindById(id); } @Override @PreAuthorize("@authz.check(#id)") public Publisher publisherPreAuthorizeBeanFindById(long id) { - return delegate.publisherPreAuthorizeBeanFindById(id); + return this.delegate.publisherPreAuthorizeBeanFindById(id); } @Override @PostAuthorize("@authz.check(authentication, returnObject)") public Publisher publisherPostAuthorizeBeanFindById(long id) { - return delegate.publisherPostAuthorizeBeanFindById(id); + return this.delegate.publisherPostAuthorizeBeanFindById(id); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java index c68be1a0cc..96ec318fb6 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java @@ -63,7 +63,7 @@ public class EnableReactiveMethodSecurityTests { @After public void cleanup() { - reset(delegate); + reset(this.delegate); } @Autowired @@ -80,11 +80,11 @@ public class EnableReactiveMethodSecurityTests { @Test public void monoWhenPermitAllThenAopDoesNotSubscribe() { - when(this.delegate.monoFindById(1L)).thenReturn(Mono.from(result)); + when(this.delegate.monoFindById(1L)).thenReturn(Mono.from(this.result)); this.delegate.monoFindById(1L); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test @@ -98,35 +98,37 @@ public class EnableReactiveMethodSecurityTests { public void monoPreAuthorizeHasRoleWhenGrantedThenSuccess() { when(this.delegate.monoPreAuthorizeHasRoleFindById(1L)).thenReturn(Mono.just("result")); - Mono findById = this.messageService.monoPreAuthorizeHasRoleFindById(1L).subscriberContext(withAdmin); + Mono findById = this.messageService.monoPreAuthorizeHasRoleFindById(1L) + .subscriberContext(this.withAdmin); StepVerifier.create(findById).expectNext("result").verifyComplete(); } @Test public void monoPreAuthorizeHasRoleWhenNoAuthenticationThenDenied() { - when(this.delegate.monoPreAuthorizeHasRoleFindById(1L)).thenReturn(Mono.from(result)); + when(this.delegate.monoPreAuthorizeHasRoleFindById(1L)).thenReturn(Mono.from(this.result)); Mono findById = this.messageService.monoPreAuthorizeHasRoleFindById(1L); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test public void monoPreAuthorizeHasRoleWhenNotAuthorizedThenDenied() { - when(this.delegate.monoPreAuthorizeHasRoleFindById(1L)).thenReturn(Mono.from(result)); + when(this.delegate.monoPreAuthorizeHasRoleFindById(1L)).thenReturn(Mono.from(this.result)); - Mono findById = this.messageService.monoPreAuthorizeHasRoleFindById(1L).subscriberContext(withUser); + Mono findById = this.messageService.monoPreAuthorizeHasRoleFindById(1L) + .subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test public void monoPreAuthorizeBeanWhenGrantedThenSuccess() { when(this.delegate.monoPreAuthorizeBeanFindById(2L)).thenReturn(Mono.just("result")); - Mono findById = this.messageService.monoPreAuthorizeBeanFindById(2L).subscriberContext(withAdmin); + Mono findById = this.messageService.monoPreAuthorizeBeanFindById(2L).subscriberContext(this.withAdmin); StepVerifier.create(findById).expectNext("result").verifyComplete(); } @@ -140,29 +142,29 @@ public class EnableReactiveMethodSecurityTests { @Test public void monoPreAuthorizeBeanWhenNoAuthenticationThenDenied() { - when(this.delegate.monoPreAuthorizeBeanFindById(1L)).thenReturn(Mono.from(result)); + when(this.delegate.monoPreAuthorizeBeanFindById(1L)).thenReturn(Mono.from(this.result)); Mono findById = this.messageService.monoPreAuthorizeBeanFindById(1L); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test public void monoPreAuthorizeBeanWhenNotAuthorizedThenDenied() { - when(this.delegate.monoPreAuthorizeBeanFindById(1L)).thenReturn(Mono.from(result)); + when(this.delegate.monoPreAuthorizeBeanFindById(1L)).thenReturn(Mono.from(this.result)); - Mono findById = this.messageService.monoPreAuthorizeBeanFindById(1L).subscriberContext(withUser); + Mono findById = this.messageService.monoPreAuthorizeBeanFindById(1L).subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test public void monoPostAuthorizeWhenAuthorizedThenSuccess() { when(this.delegate.monoPostAuthorizeFindById(1L)).thenReturn(Mono.just("user")); - Mono findById = this.messageService.monoPostAuthorizeFindById(1L).subscriberContext(withUser); + Mono findById = this.messageService.monoPostAuthorizeFindById(1L).subscriberContext(this.withUser); StepVerifier.create(findById).expectNext("user").verifyComplete(); } @@ -170,7 +172,7 @@ public class EnableReactiveMethodSecurityTests { public void monoPostAuthorizeWhenNotAuthorizedThenDenied() { when(this.delegate.monoPostAuthorizeBeanFindById(1L)).thenReturn(Mono.just("not-authorized")); - Mono findById = this.messageService.monoPostAuthorizeBeanFindById(1L).subscriberContext(withUser); + Mono findById = this.messageService.monoPostAuthorizeBeanFindById(1L).subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); } @@ -178,7 +180,7 @@ public class EnableReactiveMethodSecurityTests { public void monoPostAuthorizeWhenBeanAndAuthorizedThenSuccess() { when(this.delegate.monoPostAuthorizeBeanFindById(2L)).thenReturn(Mono.just("user")); - Mono findById = this.messageService.monoPostAuthorizeBeanFindById(2L).subscriberContext(withUser); + Mono findById = this.messageService.monoPostAuthorizeBeanFindById(2L).subscriberContext(this.withUser); StepVerifier.create(findById).expectNext("user").verifyComplete(); } @@ -194,7 +196,7 @@ public class EnableReactiveMethodSecurityTests { public void monoPostAuthorizeWhenBeanAndNotAuthorizedThenDenied() { when(this.delegate.monoPostAuthorizeBeanFindById(1L)).thenReturn(Mono.just("not-authorized")); - Mono findById = this.messageService.monoPostAuthorizeBeanFindById(1L).subscriberContext(withUser); + Mono findById = this.messageService.monoPostAuthorizeBeanFindById(1L).subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); } @@ -202,11 +204,11 @@ public class EnableReactiveMethodSecurityTests { @Test public void fluxWhenPermitAllThenAopDoesNotSubscribe() { - when(this.delegate.fluxFindById(1L)).thenReturn(Flux.from(result)); + when(this.delegate.fluxFindById(1L)).thenReturn(Flux.from(this.result)); this.delegate.fluxFindById(1L); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test @@ -220,36 +222,38 @@ public class EnableReactiveMethodSecurityTests { public void fluxPreAuthorizeHasRoleWhenGrantedThenSuccess() { when(this.delegate.fluxPreAuthorizeHasRoleFindById(1L)).thenReturn(Flux.just("result")); - Flux findById = this.messageService.fluxPreAuthorizeHasRoleFindById(1L).subscriberContext(withAdmin); + Flux findById = this.messageService.fluxPreAuthorizeHasRoleFindById(1L) + .subscriberContext(this.withAdmin); StepVerifier.create(findById).consumeNextWith(s -> AssertionsForClassTypes.assertThat(s).isEqualTo("result")) .verifyComplete(); } @Test public void fluxPreAuthorizeHasRoleWhenNoAuthenticationThenDenied() { - when(this.delegate.fluxPreAuthorizeHasRoleFindById(1L)).thenReturn(Flux.from(result)); + when(this.delegate.fluxPreAuthorizeHasRoleFindById(1L)).thenReturn(Flux.from(this.result)); Flux findById = this.messageService.fluxPreAuthorizeHasRoleFindById(1L); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test public void fluxPreAuthorizeHasRoleWhenNotAuthorizedThenDenied() { - when(this.delegate.fluxPreAuthorizeHasRoleFindById(1L)).thenReturn(Flux.from(result)); + when(this.delegate.fluxPreAuthorizeHasRoleFindById(1L)).thenReturn(Flux.from(this.result)); - Flux findById = this.messageService.fluxPreAuthorizeHasRoleFindById(1L).subscriberContext(withUser); + Flux findById = this.messageService.fluxPreAuthorizeHasRoleFindById(1L) + .subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test public void fluxPreAuthorizeBeanWhenGrantedThenSuccess() { when(this.delegate.fluxPreAuthorizeBeanFindById(2L)).thenReturn(Flux.just("result")); - Flux findById = this.messageService.fluxPreAuthorizeBeanFindById(2L).subscriberContext(withAdmin); + Flux findById = this.messageService.fluxPreAuthorizeBeanFindById(2L).subscriberContext(this.withAdmin); StepVerifier.create(findById).expectNext("result").verifyComplete(); } @@ -263,29 +267,29 @@ public class EnableReactiveMethodSecurityTests { @Test public void fluxPreAuthorizeBeanWhenNoAuthenticationThenDenied() { - when(this.delegate.fluxPreAuthorizeBeanFindById(1L)).thenReturn(Flux.from(result)); + when(this.delegate.fluxPreAuthorizeBeanFindById(1L)).thenReturn(Flux.from(this.result)); Flux findById = this.messageService.fluxPreAuthorizeBeanFindById(1L); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test public void fluxPreAuthorizeBeanWhenNotAuthorizedThenDenied() { - when(this.delegate.fluxPreAuthorizeBeanFindById(1L)).thenReturn(Flux.from(result)); + when(this.delegate.fluxPreAuthorizeBeanFindById(1L)).thenReturn(Flux.from(this.result)); - Flux findById = this.messageService.fluxPreAuthorizeBeanFindById(1L).subscriberContext(withUser); + Flux findById = this.messageService.fluxPreAuthorizeBeanFindById(1L).subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test public void fluxPostAuthorizeWhenAuthorizedThenSuccess() { when(this.delegate.fluxPostAuthorizeFindById(1L)).thenReturn(Flux.just("user")); - Flux findById = this.messageService.fluxPostAuthorizeFindById(1L).subscriberContext(withUser); + Flux findById = this.messageService.fluxPostAuthorizeFindById(1L).subscriberContext(this.withUser); StepVerifier.create(findById).expectNext("user").verifyComplete(); } @@ -293,7 +297,7 @@ public class EnableReactiveMethodSecurityTests { public void fluxPostAuthorizeWhenNotAuthorizedThenDenied() { when(this.delegate.fluxPostAuthorizeBeanFindById(1L)).thenReturn(Flux.just("not-authorized")); - Flux findById = this.messageService.fluxPostAuthorizeBeanFindById(1L).subscriberContext(withUser); + Flux findById = this.messageService.fluxPostAuthorizeBeanFindById(1L).subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); } @@ -301,7 +305,7 @@ public class EnableReactiveMethodSecurityTests { public void fluxPostAuthorizeWhenBeanAndAuthorizedThenSuccess() { when(this.delegate.fluxPostAuthorizeBeanFindById(2L)).thenReturn(Flux.just("user")); - Flux findById = this.messageService.fluxPostAuthorizeBeanFindById(2L).subscriberContext(withUser); + Flux findById = this.messageService.fluxPostAuthorizeBeanFindById(2L).subscriberContext(this.withUser); StepVerifier.create(findById).expectNext("user").verifyComplete(); } @@ -317,7 +321,7 @@ public class EnableReactiveMethodSecurityTests { public void fluxPostAuthorizeWhenBeanAndNotAuthorizedThenDenied() { when(this.delegate.fluxPostAuthorizeBeanFindById(1L)).thenReturn(Flux.just("not-authorized")); - Flux findById = this.messageService.fluxPostAuthorizeBeanFindById(1L).subscriberContext(withUser); + Flux findById = this.messageService.fluxPostAuthorizeBeanFindById(1L).subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); } @@ -325,11 +329,11 @@ public class EnableReactiveMethodSecurityTests { @Test public void publisherWhenPermitAllThenAopDoesNotSubscribe() { - when(this.delegate.publisherFindById(1L)).thenReturn(result); + when(this.delegate.publisherFindById(1L)).thenReturn(this.result); this.delegate.publisherFindById(1L); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test @@ -344,30 +348,30 @@ public class EnableReactiveMethodSecurityTests { when(this.delegate.publisherPreAuthorizeHasRoleFindById(1L)).thenReturn(publisherJust("result")); Publisher findById = Flux.from(this.messageService.publisherPreAuthorizeHasRoleFindById(1L)) - .subscriberContext(withAdmin); + .subscriberContext(this.withAdmin); StepVerifier.create(findById).consumeNextWith(s -> AssertionsForClassTypes.assertThat(s).isEqualTo("result")) .verifyComplete(); } @Test public void publisherPreAuthorizeHasRoleWhenNoAuthenticationThenDenied() { - when(this.delegate.publisherPreAuthorizeHasRoleFindById(1L)).thenReturn(result); + when(this.delegate.publisherPreAuthorizeHasRoleFindById(1L)).thenReturn(this.result); Publisher findById = this.messageService.publisherPreAuthorizeHasRoleFindById(1L); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test public void publisherPreAuthorizeHasRoleWhenNotAuthorizedThenDenied() { - when(this.delegate.publisherPreAuthorizeHasRoleFindById(1L)).thenReturn(result); + when(this.delegate.publisherPreAuthorizeHasRoleFindById(1L)).thenReturn(this.result); Publisher findById = Flux.from(this.messageService.publisherPreAuthorizeHasRoleFindById(1L)) - .subscriberContext(withUser); + .subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test @@ -375,7 +379,7 @@ public class EnableReactiveMethodSecurityTests { when(this.delegate.publisherPreAuthorizeBeanFindById(2L)).thenReturn(publisherJust("result")); Publisher findById = Flux.from(this.messageService.publisherPreAuthorizeBeanFindById(2L)) - .subscriberContext(withAdmin); + .subscriberContext(this.withAdmin); StepVerifier.create(findById).expectNext("result").verifyComplete(); } @@ -389,23 +393,23 @@ public class EnableReactiveMethodSecurityTests { @Test public void publisherPreAuthorizeBeanWhenNoAuthenticationThenDenied() { - when(this.delegate.publisherPreAuthorizeBeanFindById(1L)).thenReturn(result); + when(this.delegate.publisherPreAuthorizeBeanFindById(1L)).thenReturn(this.result); Publisher findById = this.messageService.publisherPreAuthorizeBeanFindById(1L); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test public void publisherPreAuthorizeBeanWhenNotAuthorizedThenDenied() { - when(this.delegate.publisherPreAuthorizeBeanFindById(1L)).thenReturn(result); + when(this.delegate.publisherPreAuthorizeBeanFindById(1L)).thenReturn(this.result); Publisher findById = Flux.from(this.messageService.publisherPreAuthorizeBeanFindById(1L)) - .subscriberContext(withUser); + .subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); - result.assertNoSubscribers(); + this.result.assertNoSubscribers(); } @Test @@ -413,7 +417,7 @@ public class EnableReactiveMethodSecurityTests { when(this.delegate.publisherPostAuthorizeFindById(1L)).thenReturn(publisherJust("user")); Publisher findById = Flux.from(this.messageService.publisherPostAuthorizeFindById(1L)) - .subscriberContext(withUser); + .subscriberContext(this.withUser); StepVerifier.create(findById).expectNext("user").verifyComplete(); } @@ -422,7 +426,7 @@ public class EnableReactiveMethodSecurityTests { when(this.delegate.publisherPostAuthorizeBeanFindById(1L)).thenReturn(publisherJust("not-authorized")); Publisher findById = Flux.from(this.messageService.publisherPostAuthorizeBeanFindById(1L)) - .subscriberContext(withUser); + .subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); } @@ -431,7 +435,7 @@ public class EnableReactiveMethodSecurityTests { when(this.delegate.publisherPostAuthorizeBeanFindById(2L)).thenReturn(publisherJust("user")); Publisher findById = Flux.from(this.messageService.publisherPostAuthorizeBeanFindById(2L)) - .subscriberContext(withUser); + .subscriberContext(this.withUser); StepVerifier.create(findById).expectNext("user").verifyComplete(); } @@ -448,7 +452,7 @@ public class EnableReactiveMethodSecurityTests { when(this.delegate.publisherPostAuthorizeBeanFindById(1L)).thenReturn(publisherJust("not-authorized")); Publisher findById = Flux.from(this.messageService.publisherPostAuthorizeBeanFindById(1L)) - .subscriberContext(withUser); + .subscriberContext(this.withUser); StepVerifier.create(findById).expectError(AccessDeniedException.class).verify(); } @@ -467,7 +471,7 @@ public class EnableReactiveMethodSecurityTests { @Bean public DelegatingReactiveMessageService defaultMessageService() { - return new DelegatingReactiveMessageService(delegate); + return new DelegatingReactiveMessageService(this.delegate); } @Bean diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.java index 7655f8c422..8ea847e694 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.java @@ -437,7 +437,7 @@ public class NamespaceGlobalMethodSecurityTests { public void methodSecurityWhenCustomRunAsManagerThenRunAsWrapsAuthentication() { this.spring.register(CustomRunAsManagerConfig.class, MethodSecurityServiceConfig.class).autowire(); - assertThat(service.runAs().getAuthorities()) + assertThat(this.service.runAs().getAuthorities()) .anyMatch(authority -> "ROLE_RUN_AS_SUPER".equals(authority.getAuthority())); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/sec2758/Sec2758Tests.java b/config/src/test/java/org/springframework/security/config/annotation/sec2758/Sec2758Tests.java index 208d514d06..9909c8b765 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/sec2758/Sec2758Tests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/sec2758/Sec2758Tests.java @@ -78,9 +78,9 @@ public class Sec2758Tests { this.spring.register(SecurityConfig.class).autowire(); - assertThatCode(() -> service.doJsr250()).doesNotThrowAnyException(); + assertThatCode(() -> this.service.doJsr250()).doesNotThrowAnyException(); - assertThatCode(() -> service.doPreAuthorize()).doesNotThrowAnyException(); + assertThatCode(() -> this.service.doPreAuthorize()).doesNotThrowAnyException(); } @EnableWebSecurity diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/HttpSecurityHeadersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/HttpSecurityHeadersTests.java index 70d0f53ed3..8b994a5fb1 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/HttpSecurityHeadersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/HttpSecurityHeadersTests.java @@ -60,14 +60,14 @@ public class HttpSecurityHeadersTests { @Before public void setup() { - mockMvc = MockMvcBuilders.webAppContextSetup(wac).addFilters(springSecurityFilterChain).build(); + this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).addFilters(this.springSecurityFilterChain).build(); } // gh-2953 // gh-3975 @Test public void headerWhenSpringMvcResourceThenCacheRelatedHeadersReset() throws Exception { - mockMvc.perform(get("/resources/file.js")).andExpect(status().isOk()) + this.mockMvc.perform(get("/resources/file.js")).andExpect(status().isOk()) .andExpect(header().string(HttpHeaders.CACHE_CONTROL, "max-age=12345")) .andExpect(header().doesNotExist(HttpHeaders.PRAGMA)) .andExpect(header().doesNotExist(HttpHeaders.EXPIRES)); @@ -75,7 +75,7 @@ public class HttpSecurityHeadersTests { @Test public void headerWhenNotSpringResourceThenCacheRelatedHeadersSet() throws Exception { - mockMvc.perform(get("/notresource")) + this.mockMvc.perform(get("/notresource")) .andExpect(header().string(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, max-age=0, must-revalidate")) .andExpect(header().string(HttpHeaders.PRAGMA, "no-cache")) .andExpect(header().string(HttpHeaders.EXPIRES, "0")); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java index bcebf665c5..a5cf2d3dd9 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java @@ -72,8 +72,8 @@ public class WebSecurityConfigurerAdapterPowermockTests { @After public void close() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/AuthenticationPrincipalArgumentResolverTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/AuthenticationPrincipalArgumentResolverTests.java index c9857bee0c..38cc3b7b58 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/AuthenticationPrincipalArgumentResolverTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/AuthenticationPrincipalArgumentResolverTests.java @@ -67,7 +67,7 @@ public class AuthenticationPrincipalArgumentResolverTests { new UsernamePasswordAuthenticationToken(user, user.getPassword(), user.getAuthorities())); SecurityContextHolder.setContext(context); - MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(wac).build(); + MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); mockMvc.perform(get("/users/self")).andExpect(status().isOk()).andExpect(content().string("extracted-user")); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurityTests.java index e7b4611028..aaa399372f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurityTests.java @@ -227,7 +227,7 @@ public class EnableWebSecurityTests { } public Child getChild() { - return child; + return this.child; } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java index 034933a5b5..227dbc258c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java @@ -64,10 +64,10 @@ public class WebMvcSecurityConfigurationTests { @Before public void setup() { - mockMvc = MockMvcBuilders.webAppContextSetup(context).build(); - authentication = new TestingAuthenticationToken("user", "password", + this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context).build(); + this.authentication = new TestingAuthenticationToken("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER")); - SecurityContextHolder.getContext().setAuthentication(authentication); + SecurityContextHolder.getContext().setAuthentication(this.authentication); } @After @@ -77,14 +77,15 @@ public class WebMvcSecurityConfigurationTests { @Test public void authenticationPrincipalResolved() throws Exception { - mockMvc.perform(get("/authentication-principal")).andExpect(assertResult(authentication.getPrincipal())) + this.mockMvc.perform(get("/authentication-principal")) + .andExpect(assertResult(this.authentication.getPrincipal())) .andExpect(view().name("authentication-principal-view")); } @Test public void deprecatedAuthenticationPrincipalResolved() throws Exception { - mockMvc.perform(get("/deprecated-authentication-principal")) - .andExpect(assertResult(authentication.getPrincipal())) + this.mockMvc.perform(get("/deprecated-authentication-principal")) + .andExpect(assertResult(this.authentication.getPrincipal())) .andExpect(view().name("deprecated-authentication-principal-view")); } @@ -93,7 +94,7 @@ public class WebMvcSecurityConfigurationTests { CsrfToken csrfToken = new DefaultCsrfToken("headerName", "paramName", "token"); MockHttpServletRequestBuilder request = get("/csrf").requestAttr(CsrfToken.class.getName(), csrfToken); - mockMvc.perform(request).andExpect(assertResult(csrfToken)); + this.mockMvc.perform(request).andExpect(assertResult(csrfToken)); } private ResultMatcher assertResult(Object expected) { diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistryTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistryTests.java index 2795e62c79..3af3031559 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistryTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistryTests.java @@ -35,12 +35,12 @@ public class AbstractConfigAttributeRequestMatcherRegistryTests { @Before public void setup() { - registry = new ConcreteAbstractRequestMatcherMappingConfigurer(); + this.registry = new ConcreteAbstractRequestMatcherMappingConfigurer(); } @Test public void testGetRequestMatcherIsTypeRegexMatcher() { - List requestMatchers = registry.regexMatchers(HttpMethod.GET, "/a.*"); + List requestMatchers = this.registry.regexMatchers(HttpMethod.GET, "/a.*"); for (RequestMatcher requestMatcher : requestMatchers) { assertThat(requestMatcher).isInstanceOf(RegexRequestMatcher.class); @@ -49,7 +49,7 @@ public class AbstractConfigAttributeRequestMatcherRegistryTests { @Test public void testRequestMatcherIsTypeRegexMatcher() { - List requestMatchers = registry.regexMatchers("/a.*"); + List requestMatchers = this.registry.regexMatchers("/a.*"); for (RequestMatcher requestMatcher : requestMatchers) { assertThat(requestMatcher).isInstanceOf(RegexRequestMatcher.class); @@ -58,7 +58,7 @@ public class AbstractConfigAttributeRequestMatcherRegistryTests { @Test public void testGetRequestMatcherIsTypeAntPathRequestMatcher() { - List requestMatchers = registry.antMatchers(HttpMethod.GET, "/a.*"); + List requestMatchers = this.registry.antMatchers(HttpMethod.GET, "/a.*"); for (RequestMatcher requestMatcher : requestMatchers) { assertThat(requestMatcher).isInstanceOf(AntPathRequestMatcher.class); @@ -67,7 +67,7 @@ public class AbstractConfigAttributeRequestMatcherRegistryTests { @Test public void testRequestMatcherIsTypeAntPathRequestMatcher() { - List requestMatchers = registry.antMatchers("/a.*"); + List requestMatchers = this.registry.antMatchers("/a.*"); for (RequestMatcher requestMatcher : requestMatchers) { assertThat(requestMatcher).isInstanceOf(AntPathRequestMatcher.class); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java index 4c0396030c..d448f8e3cd 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java @@ -118,7 +118,7 @@ public class ChannelSecurityConfigurerTests { public void requiresChannelWhenInvokesTwiceThenUsesOriginalRequiresSecure() throws Exception { this.spring.register(DuplicateInvocationsDoesNotOverrideConfig.class).autowire(); - mvc.perform(get("/")).andExpect(redirectedUrl("https://localhost/")); + this.mvc.perform(get("/")).andExpect(redirectedUrl("https://localhost/")); } @EnableWebSecurity @@ -141,7 +141,7 @@ public class ChannelSecurityConfigurerTests { public void requestWhenRequiresChannelConfiguredInLambdaThenRedirectsToHttps() throws Exception { this.spring.register(RequiresChannelInLambdaConfig.class).autowire(); - mvc.perform(get("/")).andExpect(redirectedUrl("https://localhost/")); + this.mvc.perform(get("/")).andExpect(redirectedUrl("https://localhost/")); } @EnableWebSecurity diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java index 2c0107d82e..74e98391d9 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java @@ -41,8 +41,8 @@ public class CsrfConfigurerNoWebMvcTests { @After public void teardown() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } @@ -50,21 +50,21 @@ public class CsrfConfigurerNoWebMvcTests { public void missingDispatcherServletPreventsCsrfRequestDataValueProcessor() { loadContext(EnableWebConfig.class); - assertThat(context.containsBeanDefinition("requestDataValueProcessor")).isTrue(); + assertThat(this.context.containsBeanDefinition("requestDataValueProcessor")).isTrue(); } @Test public void findDispatcherServletPreventsCsrfRequestDataValueProcessor() { loadContext(EnableWebMvcConfig.class); - assertThat(context.containsBeanDefinition("requestDataValueProcessor")).isTrue(); + assertThat(this.context.containsBeanDefinition("requestDataValueProcessor")).isTrue(); } @Test public void overrideCsrfRequestDataValueProcessor() { loadContext(EnableWebOverrideRequestDataConfig.class); - assertThat(context.getBean(RequestDataValueProcessor.class).getClass()) + assertThat(this.context.getBean(RequestDataValueProcessor.class).getClass()) .isNotEqualTo(CsrfRequestDataValueProcessor.class); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java index 0f19e4ebda..9a68ea4a24 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java @@ -55,15 +55,15 @@ public class HttpSecurityAntMatchersTests { @Before public void setup() { - request = new MockHttpServletRequest("GET", ""); - response = new MockHttpServletResponse(); - chain = new MockFilterChain(); + this.request = new MockHttpServletRequest("GET", ""); + this.response = new MockHttpServletResponse(); + this.chain = new MockFilterChain(); } @After public void cleanup() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } @@ -71,11 +71,11 @@ public class HttpSecurityAntMatchersTests { @Test public void antMatchersMethodAndNoPatterns() throws Exception { loadConfig(AntMatchersNoPatternsConfig.class); - request.setMethod("POST"); + this.request.setMethod("POST"); - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(this.request, this.response, this.chain); - assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_FORBIDDEN); + assertThat(this.response.getStatus()).isEqualTo(HttpServletResponse.SC_FORBIDDEN); } @EnableWebSecurity @@ -107,11 +107,11 @@ public class HttpSecurityAntMatchersTests { @Test public void antMatchersMethodAndEmptyPatterns() throws Exception { loadConfig(AntMatchersEmptyPatternsConfig.class); - request.setMethod("POST"); + this.request.setMethod("POST"); - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(this.request, this.response, this.chain); - assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_OK); + assertThat(this.response.getStatus()).isEqualTo(HttpServletResponse.SC_OK); } @EnableWebSecurity @@ -141,11 +141,11 @@ public class HttpSecurityAntMatchersTests { } public void loadConfig(Class... configs) { - context = new AnnotationConfigWebApplicationContext(); - context.register(configs); - context.refresh(); + this.context = new AnnotationConfigWebApplicationContext(); + this.context.register(configs); + this.context.refresh(); - context.getAutowireCapableBeanFactory().autowireBean(this); + this.context.getAutowireCapableBeanFactory().autowireBean(this); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java index 3914fccdf2..6b078b4b95 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java @@ -56,15 +56,15 @@ public class HttpSecurityLogoutTests { @Before public void setup() { - request = new MockHttpServletRequest("GET", ""); - response = new MockHttpServletResponse(); - chain = new MockFilterChain(); + this.request = new MockHttpServletRequest("GET", ""); + this.response = new MockHttpServletResponse(); + this.chain = new MockFilterChain(); } @After public void cleanup() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } @@ -76,12 +76,12 @@ public class HttpSecurityLogoutTests { SecurityContext currentContext = SecurityContextHolder.createEmptyContext(); currentContext.setAuthentication(new TestingAuthenticationToken("user", "password", "ROLE_USER")); - request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, + this.request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, currentContext); - request.setMethod("POST"); - request.setServletPath("/logout"); + this.request.setMethod("POST"); + this.request.setServletPath("/logout"); - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(this.request, this.response, this.chain); assertThat(currentContext.getAuthentication()).isNotNull(); } @@ -110,11 +110,11 @@ public class HttpSecurityLogoutTests { } public void loadConfig(Class... configs) { - context = new AnnotationConfigWebApplicationContext(); - context.register(configs); - context.refresh(); + this.context = new AnnotationConfigWebApplicationContext(); + this.context.register(configs); + this.context.refresh(); - context.getAutowireCapableBeanFactory().autowireBean(this); + this.context.getAutowireCapableBeanFactory().autowireBean(this); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java index c5ea556034..606c164b8e 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java @@ -102,7 +102,7 @@ public class HttpSecurityRequestMatchersTests { public void mvcMatcherGetFiltersNoUnsupportedMethodExceptionFromDummyRequest() { loadConfig(MvcMatcherConfig.class); - assertThat(springSecurityFilterChain.getFilters("/path")).isNotEmpty(); + assertThat(this.springSecurityFilterChain.getFilters("/path")).isNotEmpty(); } @EnableWebSecurity diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java index 086fb317e3..fe4dcebba8 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java @@ -82,7 +82,7 @@ public class RememberMeConfigurerTests { public void postWhenNoUserDetailsServiceThenException() { this.spring.register(NullUserDetailsConfig.class).autowire(); - assertThatThrownBy(() -> mvc.perform(post("/login").param("username", "user").param("password", "password") + assertThatThrownBy(() -> this.mvc.perform(post("/login").param("username", "user").param("password", "password") .param("remember-me", "true").with(csrf()))).hasMessageContaining("UserDetailsService is required"); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java index 78f60d461e..a200d42087 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java @@ -68,15 +68,15 @@ public class SessionManagementConfigurerServlet31Tests { @Before public void setup() { - request = new MockHttpServletRequest("GET", ""); - response = new MockHttpServletResponse(); - chain = new MockFilterChain(); + this.request = new MockHttpServletRequest("GET", ""); + this.response = new MockHttpServletResponse(); + this.chain = new MockFilterChain(); } @After public void teardown() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } @@ -91,13 +91,13 @@ public class SessionManagementConfigurerServlet31Tests { request.setParameter("password", "password"); HttpSessionCsrfTokenRepository repository = new HttpSessionCsrfTokenRepository(); CsrfToken token = repository.generateToken(request); - repository.saveToken(token, request, response); + repository.saveToken(token, request, this.response); request.setParameter(token.getParameterName(), token.getToken()); request.getSession().setAttribute("attribute1", "value1"); loadConfig(SessionManagementDefaultSessionFixationServlet31Config.class); - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(request, this.response, this.chain); assertThat(request.getSession().getId()).isNotEqualTo(id); assertThat(request.getSession().getAttribute("attribute1")).isEqualTo("value1"); @@ -137,7 +137,7 @@ public class SessionManagementConfigurerServlet31Tests { private void login(Authentication auth) { HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository(); - HttpRequestResponseHolder requestResponseHolder = new HttpRequestResponseHolder(request, response); + HttpRequestResponseHolder requestResponseHolder = new HttpRequestResponseHolder(this.request, this.response); repo.loadContext(requestResponseHolder); SecurityContextImpl securityContextImpl = new SecurityContextImpl(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java index ebb58a950a..76fd74d14b 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java @@ -47,8 +47,9 @@ public class MessageSecurityMetadataSourceRegistryTests { @Before public void setup() { - messages = new MessageSecurityMetadataSourceRegistry(); - message = MessageBuilder.withPayload("Hi").setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "location") + this.messages = new MessageSecurityMetadataSourceRegistry(); + this.message = MessageBuilder.withPayload("Hi") + .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "location") .setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE).build(); } @@ -57,85 +58,85 @@ public class MessageSecurityMetadataSourceRegistryTests { // https://jira.spring.io/browse/SPR-11660 @Test public void simpDestMatchersCustom() { - message = MessageBuilder.withPayload("Hi") + this.message = MessageBuilder.withPayload("Hi") .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "price.stock.1.2").build(); - messages.simpDestPathMatcher(new AntPathMatcher(".")).simpDestMatchers("price.stock.*").permitAll(); + this.messages.simpDestPathMatcher(new AntPathMatcher(".")).simpDestMatchers("price.stock.*").permitAll(); assertThat(getAttribute()).isNull(); - message = MessageBuilder.withPayload("Hi") + this.message = MessageBuilder.withPayload("Hi") .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "price.stock.1.2").build(); - messages.simpDestPathMatcher(new AntPathMatcher(".")).simpDestMatchers("price.stock.**").permitAll(); + this.messages.simpDestPathMatcher(new AntPathMatcher(".")).simpDestMatchers("price.stock.**").permitAll(); assertThat(getAttribute()).isEqualTo("permitAll"); } @Test public void simpDestMatchersCustomSetAfterMatchersDoesNotMatter() { - message = MessageBuilder.withPayload("Hi") + this.message = MessageBuilder.withPayload("Hi") .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "price.stock.1.2").build(); - messages.simpDestMatchers("price.stock.*").permitAll().simpDestPathMatcher(new AntPathMatcher(".")); + this.messages.simpDestMatchers("price.stock.*").permitAll().simpDestPathMatcher(new AntPathMatcher(".")); assertThat(getAttribute()).isNull(); - message = MessageBuilder.withPayload("Hi") + this.message = MessageBuilder.withPayload("Hi") .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "price.stock.1.2").build(); - messages.simpDestMatchers("price.stock.**").permitAll().simpDestPathMatcher(new AntPathMatcher(".")); + this.messages.simpDestMatchers("price.stock.**").permitAll().simpDestPathMatcher(new AntPathMatcher(".")); assertThat(getAttribute()).isEqualTo("permitAll"); } @Test(expected = IllegalArgumentException.class) public void pathMatcherNull() { - messages.simpDestPathMatcher(null); + this.messages.simpDestPathMatcher(null); } @Test public void matchersFalse() { - messages.matchers(matcher).permitAll(); + this.messages.matchers(this.matcher).permitAll(); assertThat(getAttribute()).isNull(); } @Test public void matchersTrue() { - when(matcher.matches(message)).thenReturn(true); - messages.matchers(matcher).permitAll(); + when(this.matcher.matches(this.message)).thenReturn(true); + this.messages.matchers(this.matcher).permitAll(); assertThat(getAttribute()).isEqualTo("permitAll"); } @Test public void simpDestMatchersExact() { - messages.simpDestMatchers("location").permitAll(); + this.messages.simpDestMatchers("location").permitAll(); assertThat(getAttribute()).isEqualTo("permitAll"); } @Test public void simpDestMatchersMulti() { - messages.simpDestMatchers("admin/**", "api/**").hasRole("ADMIN").simpDestMatchers("location").permitAll(); + this.messages.simpDestMatchers("admin/**", "api/**").hasRole("ADMIN").simpDestMatchers("location").permitAll(); assertThat(getAttribute()).isEqualTo("permitAll"); } @Test public void simpDestMatchersRole() { - messages.simpDestMatchers("admin/**", "location/**").hasRole("ADMIN").anyMessage().denyAll(); + this.messages.simpDestMatchers("admin/**", "location/**").hasRole("ADMIN").anyMessage().denyAll(); assertThat(getAttribute()).isEqualTo("hasRole('ROLE_ADMIN')"); } @Test public void simpDestMatchersAnyRole() { - messages.simpDestMatchers("admin/**", "location/**").hasAnyRole("ADMIN", "ROOT").anyMessage().denyAll(); + this.messages.simpDestMatchers("admin/**", "location/**").hasAnyRole("ADMIN", "ROOT").anyMessage().denyAll(); assertThat(getAttribute()).isEqualTo("hasAnyRole('ROLE_ADMIN','ROLE_ROOT')"); } @Test public void simpDestMatchersAuthority() { - messages.simpDestMatchers("admin/**", "location/**").hasAuthority("ROLE_ADMIN").anyMessage() + this.messages.simpDestMatchers("admin/**", "location/**").hasAuthority("ROLE_ADMIN").anyMessage() .fullyAuthenticated(); assertThat(getAttribute()).isEqualTo("hasAuthority('ROLE_ADMIN')"); @@ -144,127 +145,128 @@ public class MessageSecurityMetadataSourceRegistryTests { @Test public void simpDestMatchersAccess() { String expected = "hasRole('ROLE_ADMIN') and fullyAuthenticated"; - messages.simpDestMatchers("admin/**", "location/**").access(expected).anyMessage().denyAll(); + this.messages.simpDestMatchers("admin/**", "location/**").access(expected).anyMessage().denyAll(); assertThat(getAttribute()).isEqualTo(expected); } @Test public void simpDestMatchersAnyAuthority() { - messages.simpDestMatchers("admin/**", "location/**").hasAnyAuthority("ROLE_ADMIN", "ROLE_ROOT").anyMessage() - .denyAll(); + this.messages.simpDestMatchers("admin/**", "location/**").hasAnyAuthority("ROLE_ADMIN", "ROLE_ROOT") + .anyMessage().denyAll(); assertThat(getAttribute()).isEqualTo("hasAnyAuthority('ROLE_ADMIN','ROLE_ROOT')"); } @Test public void simpDestMatchersRememberMe() { - messages.simpDestMatchers("admin/**", "location/**").rememberMe().anyMessage().denyAll(); + this.messages.simpDestMatchers("admin/**", "location/**").rememberMe().anyMessage().denyAll(); assertThat(getAttribute()).isEqualTo("rememberMe"); } @Test public void simpDestMatchersAnonymous() { - messages.simpDestMatchers("admin/**", "location/**").anonymous().anyMessage().denyAll(); + this.messages.simpDestMatchers("admin/**", "location/**").anonymous().anyMessage().denyAll(); assertThat(getAttribute()).isEqualTo("anonymous"); } @Test public void simpDestMatchersFullyAuthenticated() { - messages.simpDestMatchers("admin/**", "location/**").fullyAuthenticated().anyMessage().denyAll(); + this.messages.simpDestMatchers("admin/**", "location/**").fullyAuthenticated().anyMessage().denyAll(); assertThat(getAttribute()).isEqualTo("fullyAuthenticated"); } @Test public void simpDestMatchersDenyAll() { - messages.simpDestMatchers("admin/**", "location/**").denyAll().anyMessage().permitAll(); + this.messages.simpDestMatchers("admin/**", "location/**").denyAll().anyMessage().permitAll(); assertThat(getAttribute()).isEqualTo("denyAll"); } @Test public void simpDestMessageMatchersNotMatch() { - messages.simpMessageDestMatchers("admin/**").denyAll().anyMessage().permitAll(); + this.messages.simpMessageDestMatchers("admin/**").denyAll().anyMessage().permitAll(); assertThat(getAttribute()).isEqualTo("permitAll"); } @Test public void simpDestMessageMatchersMatch() { - messages.simpMessageDestMatchers("location/**").denyAll().anyMessage().permitAll(); + this.messages.simpMessageDestMatchers("location/**").denyAll().anyMessage().permitAll(); assertThat(getAttribute()).isEqualTo("denyAll"); } @Test public void simpDestSubscribeMatchersNotMatch() { - messages.simpSubscribeDestMatchers("location/**").denyAll().anyMessage().permitAll(); + this.messages.simpSubscribeDestMatchers("location/**").denyAll().anyMessage().permitAll(); assertThat(getAttribute()).isEqualTo("permitAll"); } @Test public void simpDestSubscribeMatchersMatch() { - message = MessageBuilder.fromMessage(message) + this.message = MessageBuilder.fromMessage(this.message) .setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.SUBSCRIBE).build(); - messages.simpSubscribeDestMatchers("location/**").denyAll().anyMessage().permitAll(); + this.messages.simpSubscribeDestMatchers("location/**").denyAll().anyMessage().permitAll(); assertThat(getAttribute()).isEqualTo("denyAll"); } @Test public void nullDestMatcherNotMatches() { - messages.nullDestMatcher().denyAll().anyMessage().permitAll(); + this.messages.nullDestMatcher().denyAll().anyMessage().permitAll(); assertThat(getAttribute()).isEqualTo("permitAll"); } @Test public void nullDestMatcherMatch() { - message = MessageBuilder.withPayload("Hi") + this.message = MessageBuilder.withPayload("Hi") .setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.CONNECT).build(); - messages.nullDestMatcher().denyAll().anyMessage().permitAll(); + this.messages.nullDestMatcher().denyAll().anyMessage().permitAll(); assertThat(getAttribute()).isEqualTo("denyAll"); } @Test public void simpTypeMatchersMatch() { - messages.simpTypeMatchers(SimpMessageType.MESSAGE).denyAll().anyMessage().permitAll(); + this.messages.simpTypeMatchers(SimpMessageType.MESSAGE).denyAll().anyMessage().permitAll(); assertThat(getAttribute()).isEqualTo("denyAll"); } @Test public void simpTypeMatchersMatchMulti() { - messages.simpTypeMatchers(SimpMessageType.CONNECT, SimpMessageType.MESSAGE).denyAll().anyMessage().permitAll(); + this.messages.simpTypeMatchers(SimpMessageType.CONNECT, SimpMessageType.MESSAGE).denyAll().anyMessage() + .permitAll(); assertThat(getAttribute()).isEqualTo("denyAll"); } @Test public void simpTypeMatchersNotMatch() { - messages.simpTypeMatchers(SimpMessageType.CONNECT).denyAll().anyMessage().permitAll(); + this.messages.simpTypeMatchers(SimpMessageType.CONNECT).denyAll().anyMessage().permitAll(); assertThat(getAttribute()).isEqualTo("permitAll"); } @Test public void simpTypeMatchersNotMatchMulti() { - messages.simpTypeMatchers(SimpMessageType.CONNECT, SimpMessageType.DISCONNECT).denyAll().anyMessage() + this.messages.simpTypeMatchers(SimpMessageType.CONNECT, SimpMessageType.DISCONNECT).denyAll().anyMessage() .permitAll(); assertThat(getAttribute()).isEqualTo("permitAll"); } private String getAttribute() { - MessageSecurityMetadataSource source = messages.createMetadataSource(); - Collection attrs = source.getAttributes(message); + MessageSecurityMetadataSource source = this.messages.createMetadataSource(); + Collection attrs = source.getAttributes(this.message); if (attrs == null) { return null; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java index 46b00019d2..5f01efd285 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java @@ -381,7 +381,7 @@ public class EnableWebFluxSecurityTests { } public Child getChild() { - return child; + return this.child; } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java index 9069f21133..89d07f6259 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java @@ -61,15 +61,15 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerDocTests { @Before public void setup() { - token = new DefaultCsrfToken("header", "param", "token"); - sessionAttr = "sessionAttr"; - messageUser = new TestingAuthenticationToken("user", "pass", "ROLE_USER"); + this.token = new DefaultCsrfToken("header", "param", "token"); + this.sessionAttr = "sessionAttr"; + this.messageUser = new TestingAuthenticationToken("user", "pass", "ROLE_USER"); } @After public void cleanup() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } @@ -89,15 +89,15 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerDocTests { } private void loadConfig(Class... configs) { - context = new AnnotationConfigWebApplicationContext(); - context.register(configs); - context.register(WebSocketConfig.class, SyncExecutorConfig.class); - context.setServletConfig(new MockServletConfig()); - context.refresh(); + this.context = new AnnotationConfigWebApplicationContext(); + this.context.register(configs); + this.context.register(WebSocketConfig.class, SyncExecutorConfig.class); + this.context.setServletConfig(new MockServletConfig()); + this.context.refresh(); } private MessageChannel clientInboundChannel() { - return context.getBean("clientInboundChannel", MessageChannel.class); + return this.context.getBean("clientInboundChannel", MessageChannel.class); } private Message message(String destination, SimpMessageType type) { @@ -111,8 +111,8 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerDocTests { if (destination != null) { headers.setDestination(destination); } - if (messageUser != null) { - headers.setUser(messageUser); + if (this.messageUser != null) { + headers.setUser(this.messageUser); } return new GenericMessage<>("hi", headers.getMessageHeaders()); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java index 73217c0a3b..e9fac39e07 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java @@ -91,15 +91,15 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { @Before public void setup() { - token = new DefaultCsrfToken("header", "param", "token"); - sessionAttr = "sessionAttr"; - messageUser = new TestingAuthenticationToken("user", "pass", "ROLE_USER"); + this.token = new DefaultCsrfToken("header", "param", "token"); + this.sessionAttr = "sessionAttr"; + this.messageUser = new TestingAuthenticationToken("user", "pass", "ROLE_USER"); } @After public void cleanup() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } @@ -122,7 +122,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { public void annonymousSupported() { loadConfig(SockJsSecurityConfig.class); - messageUser = null; + this.messageUser = null; clientInboundChannel().send(message("/permitAll")); } @@ -131,7 +131,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { public void beanResolver() { loadConfig(SockJsSecurityConfig.class); - messageUser = null; + this.messageUser = null; clientInboundChannel().send(message("/beanResolver")); } @@ -143,8 +143,8 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { Message message = message("/permitAll/authentication"); messageChannel.send(message); - assertThat(context.getBean(MyController.class).authenticationPrincipal) - .isEqualTo((String) messageUser.getPrincipal()); + assertThat(this.context.getBean(MyController.class).authenticationPrincipal) + .isEqualTo((String) this.messageUser.getPrincipal()); } @Test @@ -155,8 +155,8 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { Message message = message("/permitAll/authentication"); messageChannel.send(message); - assertThat(context.getBean(MyController.class).authenticationPrincipal) - .isEqualTo((String) messageUser.getPrincipal()); + assertThat(this.context.getBean(MyController.class).authenticationPrincipal) + .isEqualTo((String) this.messageUser.getPrincipal()); } @Test @@ -209,7 +209,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { loadConfig(SockJsProxylessSecurityConfig.class); MessageChannel messageChannel = clientInboundChannel(); - CsrfChannelInterceptor csrfChannelInterceptor = context.getBean(CsrfChannelInterceptor.class); + CsrfChannelInterceptor csrfChannelInterceptor = this.context.getBean(CsrfChannelInterceptor.class); assertThat(((AbstractMessageChannel) messageChannel).getInterceptors()).contains(csrfChannelInterceptor); } @@ -432,8 +432,8 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { loadConfig(SockJsProxylessSecurityConfig.class); - ChannelSecurityInterceptor channelSecurityInterceptor = context.getBean(ChannelSecurityInterceptor.class); - MessageSecurityMetadataSource messageSecurityMetadataSource = context + ChannelSecurityInterceptor channelSecurityInterceptor = this.context.getBean(ChannelSecurityInterceptor.class); + MessageSecurityMetadataSource messageSecurityMetadataSource = this.context .getBean(MessageSecurityMetadataSource.class); assertThat(channelSecurityInterceptor.obtainSecurityMetadataSource()).isSameAs(messageSecurityMetadataSource); @@ -444,7 +444,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { loadConfig(SockJsProxylessSecurityConfig.class); MessageChannel messageChannel = clientInboundChannel(); - SecurityContextChannelInterceptor securityContextChannelInterceptor = context + SecurityContextChannelInterceptor securityContextChannelInterceptor = this.context .getBean(SecurityContextChannelInterceptor.class); assertThat(((AbstractMessageChannel) messageChannel).getInterceptors()) @@ -456,7 +456,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { loadConfig(SockJsProxylessSecurityConfig.class); MessageChannel messageChannel = clientInboundChannel(); - ChannelSecurityInterceptor inboundChannelSecurity = context.getBean(ChannelSecurityInterceptor.class); + ChannelSecurityInterceptor inboundChannelSecurity = this.context.getBean(ChannelSecurityInterceptor.class); assertThat(((AbstractMessageChannel) messageChannel).getInterceptors()).contains(inboundChannelSecurity); } @@ -512,14 +512,14 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { } private void assertHandshake(HttpServletRequest request) { - TestHandshakeHandler handshakeHandler = context.getBean(TestHandshakeHandler.class); - assertThat(handshakeHandler.attributes.get(CsrfToken.class.getName())).isSameAs(token); - assertThat(handshakeHandler.attributes.get(sessionAttr)) - .isEqualTo(request.getSession().getAttribute(sessionAttr)); + TestHandshakeHandler handshakeHandler = this.context.getBean(TestHandshakeHandler.class); + assertThat(handshakeHandler.attributes.get(CsrfToken.class.getName())).isSameAs(this.token); + assertThat(handshakeHandler.attributes.get(this.sessionAttr)) + .isEqualTo(request.getSession().getAttribute(this.sessionAttr)); } private HttpRequestHandler handler(HttpServletRequest request) throws Exception { - HandlerMapping handlerMapping = context.getBean(HandlerMapping.class); + HandlerMapping handlerMapping = this.context.getBean(HandlerMapping.class); return (HttpRequestHandler) handlerMapping.getHandler(request).getHandler(); } @@ -534,9 +534,9 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { request.setMethod("GET"); request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/289/tpyx6mde/websocket"); request.setRequestURI(mapping + "/289/tpyx6mde/websocket"); - request.getSession().setAttribute(sessionAttr, "sessionValue"); + request.getSession().setAttribute(this.sessionAttr, "sessionValue"); - request.setAttribute(CsrfToken.class.getName(), token); + request.setAttribute(CsrfToken.class.getName(), this.token); return request; } @@ -551,21 +551,21 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { if (destination != null) { headers.setDestination(destination); } - if (messageUser != null) { - headers.setUser(messageUser); + if (this.messageUser != null) { + headers.setUser(this.messageUser); } return new GenericMessage<>("hi", headers.getMessageHeaders()); } private MessageChannel clientInboundChannel() { - return context.getBean("clientInboundChannel", MessageChannel.class); + return this.context.getBean("clientInboundChannel", MessageChannel.class); } private void loadConfig(Class... configs) { - context = new AnnotationConfigWebApplicationContext(); - context.register(configs); - context.setServletConfig(new MockServletConfig()); - context.refresh(); + this.context = new AnnotationConfigWebApplicationContext(); + this.context.register(configs); + this.context.setServletConfig(new MockServletConfig()); + this.context.refresh(); } @Controller @@ -674,8 +674,8 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { private boolean check; public boolean check() { - check = !check; - return check; + this.check = !this.check; + return this.check; } } @@ -755,8 +755,8 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { private ApplicationContext context; public void registerStompEndpoints(StompEndpointRegistry registry) { - registry.addEndpoint("/chat").setHandshakeHandler(context.getBean(TestHandshakeHandler.class)).withSockJS() - .setInterceptors(new HttpSessionHandshakeInterceptor()); + registry.addEndpoint("/chat").setHandshakeHandler(this.context.getBean(TestHandshakeHandler.class)) + .withSockJS().setInterceptors(new HttpSessionHandshakeInterceptor()); } @Autowired diff --git a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java index b90ce679d7..7fc1d471b1 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java @@ -43,8 +43,8 @@ public class AuthenticationProviderBeanDefinitionParserTests { @After public void closeAppContext() { - if (appContext != null) { - appContext.close(); + if (this.appContext != null) { + this.appContext.close(); } } @@ -53,17 +53,17 @@ public class AuthenticationProviderBeanDefinitionParserTests { setContext(" " + " " + " " + " " + " "); - getProvider().authenticate(bob); + getProvider().authenticate(this.bob); } @Test public void externalUserServiceRefWorks() { - appContext = new InMemoryXmlApplicationContext( + this.appContext = new InMemoryXmlApplicationContext( " " + " " + " " + " " + " " + " "); - getProvider().authenticate(bob); + getProvider().authenticate(this.bob); } @Test @@ -72,35 +72,35 @@ public class AuthenticationProviderBeanDefinitionParserTests { + " " + " " + " "); - getProvider().authenticate(bob); + getProvider().authenticate(this.bob); } @Test public void providerWithMd5PasswordEncoderWorks() { - appContext = new InMemoryXmlApplicationContext(" " + " " + this.appContext = new InMemoryXmlApplicationContext(" " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " "); - getProvider().authenticate(bob); + getProvider().authenticate(this.bob); } @Test public void providerWithShaPasswordEncoderWorks() { - appContext = new InMemoryXmlApplicationContext(" " + " " + this.appContext = new InMemoryXmlApplicationContext(" " + " " + " " + " " + " " + " " + " " + " " + " "); - getProvider().authenticate(bob); + getProvider().authenticate(this.bob); } @Test public void passwordIsBase64EncodedWhenBase64IsEnabled() { - appContext = new InMemoryXmlApplicationContext(" " + " " + this.appContext = new InMemoryXmlApplicationContext(" " + " " + " " + " " + " " + " " + " " + " " @@ -108,13 +108,13 @@ public class AuthenticationProviderBeanDefinitionParserTests { + " " + " " + " "); - getProvider().authenticate(bob); + getProvider().authenticate(this.bob); } // SEC-1466 @Test(expected = BeanDefinitionParsingException.class) public void exernalProviderDoesNotSupportChildElements() { - appContext = new InMemoryXmlApplicationContext(" " + this.appContext = new InMemoryXmlApplicationContext(" " + " " + " " + " " + " " @@ -124,14 +124,14 @@ public class AuthenticationProviderBeanDefinitionParserTests { } private AuthenticationProvider getProvider() { - List providers = ((ProviderManager) appContext.getBean(BeanIds.AUTHENTICATION_MANAGER)) - .getProviders(); + List providers = ((ProviderManager) this.appContext + .getBean(BeanIds.AUTHENTICATION_MANAGER)).getProviders(); return providers.get(0); } private void setContext(String context) { - appContext = new InMemoryXmlApplicationContext( + this.appContext = new InMemoryXmlApplicationContext( "" + context + ""); } diff --git a/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java index 5248bd9f32..66835a6e4a 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java @@ -53,8 +53,8 @@ public class JdbcUserServiceBeanDefinitionParserTests { @After public void closeAppContext() { - if (appContext != null) { - appContext.close(); + if (this.appContext != null) { + this.appContext.close(); } } @@ -67,14 +67,14 @@ public class JdbcUserServiceBeanDefinitionParserTests { @Test public void validUsernameIsFound() { setContext("" + DATA_SOURCE); - JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext.getBean(BeanIds.USER_DETAILS_SERVICE); + JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) this.appContext.getBean(BeanIds.USER_DETAILS_SERVICE); assertThat(mgr.loadUserByUsername("rod")).isNotNull(); } @Test public void beanIdIsParsedCorrectly() { setContext("" + DATA_SOURCE); - assertThat(appContext.getBean("myUserService") instanceof JdbcUserDetailsManager).isTrue(); + assertThat(this.appContext.getBean("myUserService") instanceof JdbcUserDetailsManager).isTrue(); } @Test @@ -84,7 +84,7 @@ public class JdbcUserServiceBeanDefinitionParserTests { setContext("" + DATA_SOURCE); - JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext.getBean("myUserService"); + JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) this.appContext.getBean("myUserService"); assertThat(FieldUtils.getFieldValue(mgr, "usersByUsernameQuery")).isEqualTo(userQuery); assertThat(FieldUtils.getFieldValue(mgr, "authoritiesByUsernameQuery")).isEqualTo(authoritiesQuery); assertThat(mgr.loadUserByUsername("rod") != null).isTrue(); @@ -94,7 +94,7 @@ public class JdbcUserServiceBeanDefinitionParserTests { public void groupQueryIsParsedCorrectly() throws Exception { setContext("" + DATA_SOURCE); - JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext.getBean("myUserService"); + JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) this.appContext.getBean("myUserService"); assertThat(FieldUtils.getFieldValue(mgr, "groupAuthoritiesByUsernameQuery")).isEqualTo("blah blah"); assertThat((Boolean) FieldUtils.getFieldValue(mgr, "enableGroups")).isTrue(); } @@ -103,9 +103,9 @@ public class JdbcUserServiceBeanDefinitionParserTests { public void cacheRefIsparsedCorrectly() { setContext("" + DATA_SOURCE + USER_CACHE_XML); - CachingUserDetailsService cachingUserService = (CachingUserDetailsService) appContext + CachingUserDetailsService cachingUserService = (CachingUserDetailsService) this.appContext .getBean("myUserService" + AbstractUserDetailsServiceBeanDefinitionParser.CACHING_SUFFIX); - assertThat(appContext.getBean("userCache")).isSameAs(cachingUserService.getUserCache()); + assertThat(this.appContext.getBean("userCache")).isSameAs(cachingUserService.getUserCache()); assertThat(cachingUserService.loadUserByUsername("rod")).isNotNull(); assertThat(cachingUserService.loadUserByUsername("rod")).isNotNull(); } @@ -115,7 +115,7 @@ public class JdbcUserServiceBeanDefinitionParserTests { setContext("" + " " + " " + " " + "" + DATA_SOURCE); - AuthenticationManager mgr = (AuthenticationManager) appContext.getBean(BeanIds.AUTHENTICATION_MANAGER); + AuthenticationManager mgr = (AuthenticationManager) this.appContext.getBean(BeanIds.AUTHENTICATION_MANAGER); mgr.authenticate(new UsernamePasswordAuthenticationToken("rod", "koala")); } @@ -124,9 +124,9 @@ public class JdbcUserServiceBeanDefinitionParserTests { setContext("" + " " + " " + " " + "" + DATA_SOURCE + USER_CACHE_XML); - ProviderManager mgr = (ProviderManager) appContext.getBean(BeanIds.AUTHENTICATION_MANAGER); + ProviderManager mgr = (ProviderManager) this.appContext.getBean(BeanIds.AUTHENTICATION_MANAGER); DaoAuthenticationProvider provider = (DaoAuthenticationProvider) mgr.getProviders().get(0); - assertThat(appContext.getBean("userCache")).isSameAs(provider.getUserCache()); + assertThat(this.appContext.getBean("userCache")).isSameAs(provider.getUserCache()); provider.authenticate(new UsernamePasswordAuthenticationToken("rod", "koala")); assertThat(provider.getUserCache().getUserFromCache("rod")).isNotNull() .withFailMessage("Cache should contain user after authentication"); @@ -136,13 +136,13 @@ public class JdbcUserServiceBeanDefinitionParserTests { public void rolePrefixIsUsedWhenSet() { setContext("" + DATA_SOURCE); - JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext.getBean("myUserService"); + JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) this.appContext.getBean("myUserService"); UserDetails rod = mgr.loadUserByUsername("rod"); assertThat(AuthorityUtils.authorityListToSet(rod.getAuthorities())).contains("PREFIX_ROLE_SUPERVISOR"); } private void setContext(String context) { - appContext = new InMemoryXmlApplicationContext(context); + this.appContext = new InMemoryXmlApplicationContext(context); } } diff --git a/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java index f4fa4a70a9..772c21b290 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java @@ -35,8 +35,8 @@ public class UserServiceBeanDefinitionParserTests { @After public void closeAppContext() { - if (appContext != null) { - appContext.close(); + if (this.appContext != null) { + this.appContext.close(); } } @@ -44,7 +44,7 @@ public class UserServiceBeanDefinitionParserTests { public void userServiceWithValidPropertiesFileWorksSuccessfully() { setContext(""); - UserDetailsService userService = (UserDetailsService) appContext.getBean("service"); + UserDetailsService userService = (UserDetailsService) this.appContext.getBean("service"); userService.loadUserByUsername("bob"); userService.loadUserByUsername("joe"); } @@ -53,7 +53,7 @@ public class UserServiceBeanDefinitionParserTests { public void userServiceWithEmbeddedUsersWorksSuccessfully() { setContext("" + " " + ""); - UserDetailsService userService = (UserDetailsService) appContext.getBean("service"); + UserDetailsService userService = (UserDetailsService) this.appContext.getBean("service"); userService.loadUserByUsername("joe"); } @@ -66,7 +66,7 @@ public class UserServiceBeanDefinitionParserTests { + "" + " " + ""); - UserDetailsService userService = (UserDetailsService) appContext.getBean("service"); + UserDetailsService userService = (UserDetailsService) this.appContext.getBean("service"); UserDetails joe = userService.loadUserByUsername("joe"); assertThat(joe.getPassword()).isEqualTo("joespassword"); assertThat(joe.getAuthorities()).hasSize(2); @@ -75,7 +75,7 @@ public class UserServiceBeanDefinitionParserTests { @Test public void embeddedUsersWithNoPasswordIsGivenGeneratedValue() { setContext("" + " " + ""); - UserDetailsService userService = (UserDetailsService) appContext.getBean("service"); + UserDetailsService userService = (UserDetailsService) this.appContext.getBean("service"); UserDetails joe = userService.loadUserByUsername("joe"); assertThat(joe.getPassword().length() > 0).isTrue(); Long.parseLong(joe.getPassword()); @@ -86,7 +86,7 @@ public class UserServiceBeanDefinitionParserTests { setContext("" + " " + " " + ""); - UserDetailsService userService = (UserDetailsService) appContext.getBean("service"); + UserDetailsService userService = (UserDetailsService) this.appContext.getBean("service"); assertThat(userService.loadUserByUsername("https://joe.myopenid.com/").getUsername()) .isEqualTo("https://joe.myopenid.com/"); assertThat(userService.loadUserByUsername("https://www.google.com/accounts/o8/id?id=MPtOaenBIk5yzW9n7n9") @@ -99,7 +99,7 @@ public class UserServiceBeanDefinitionParserTests { + " " + " " + ""); - UserDetailsService userService = (UserDetailsService) appContext.getBean("service"); + UserDetailsService userService = (UserDetailsService) this.appContext.getBean("service"); UserDetails joe = userService.loadUserByUsername("joe"); assertThat(joe.isAccountNonLocked()).isFalse(); // Check case-sensitive lookup SEC-1432 @@ -111,7 +111,7 @@ public class UserServiceBeanDefinitionParserTests { public void userWithBothPropertiesAndEmbeddedUsersThrowsException() { setContext("" + " " + ""); - UserDetailsService userService = (UserDetailsService) appContext.getBean("service"); + UserDetailsService userService = (UserDetailsService) this.appContext.getBean("service"); userService.loadUserByUsername("Joe"); } @@ -128,7 +128,7 @@ public class UserServiceBeanDefinitionParserTests { } private void setContext(String context) { - appContext = new InMemoryXmlApplicationContext(context); + this.appContext = new InMemoryXmlApplicationContext(context); } } diff --git a/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsJcTests.java b/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsJcTests.java index e7cbe00575..e0f7bc36dc 100644 --- a/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsJcTests.java +++ b/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsJcTests.java @@ -70,10 +70,10 @@ public class GrantedAuthorityDefaultsJcTests { public void setup() { setup("USER"); - request = new MockHttpServletRequest("GET", ""); - request.setMethod("GET"); - response = new MockHttpServletResponse(); - chain = new MockFilterChain(); + this.request = new MockHttpServletRequest("GET", ""); + this.request.setMethod("GET"); + this.response = new MockHttpServletResponse(); + this.chain = new MockFilterChain(); } @After @@ -84,11 +84,12 @@ public class GrantedAuthorityDefaultsJcTests { @Test public void doFilter() throws Exception { SecurityContext context = SecurityContextHolder.getContext(); - request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context); + this.request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, + context); - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(this.request, this.response, this.chain); - assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_OK); + assertThat(this.response.getStatus()).isEqualTo(HttpServletResponse.SC_OK); } @Test @@ -96,44 +97,46 @@ public class GrantedAuthorityDefaultsJcTests { setup("DENIED"); SecurityContext context = SecurityContextHolder.getContext(); - request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context); + this.request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, + context); - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(this.request, this.response, this.chain); - assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_FORBIDDEN); + assertThat(this.response.getStatus()).isEqualTo(HttpServletResponse.SC_FORBIDDEN); } @Test public void message() { - messageService.getMessage(); + this.messageService.getMessage(); } @Test public void jsrMessage() { - messageService.getJsrMessage(); + this.messageService.getJsrMessage(); } @Test(expected = AccessDeniedException.class) public void messageDenied() { setup("DENIED"); - messageService.getMessage(); + this.messageService.getMessage(); } @Test(expected = AccessDeniedException.class) public void jsrMessageDenied() { setup("DENIED"); - messageService.getJsrMessage(); + this.messageService.getJsrMessage(); } // SEC-2926 @Test public void doFilterIsUserInRole() throws Exception { SecurityContext context = SecurityContextHolder.getContext(); - request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context); + this.request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, + context); - chain = new MockFilterChain() { + this.chain = new MockFilterChain() { @Override public void doFilter(ServletRequest request, ServletResponse response) @@ -146,9 +149,9 @@ public class GrantedAuthorityDefaultsJcTests { }; - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(this.request, this.response, this.chain); - assertThat(chain.getRequest()).isNotNull(); + assertThat(this.chain.getRequest()).isNotNull(); } private void setup(String role) { diff --git a/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsXmlTests.java b/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsXmlTests.java index ace553d52d..8325261560 100644 --- a/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsXmlTests.java +++ b/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsXmlTests.java @@ -63,10 +63,10 @@ public class GrantedAuthorityDefaultsXmlTests { public void setup() { setup("USER"); - request = new MockHttpServletRequest("GET", ""); - request.setMethod("GET"); - response = new MockHttpServletResponse(); - chain = new MockFilterChain(); + this.request = new MockHttpServletRequest("GET", ""); + this.request.setMethod("GET"); + this.response = new MockHttpServletResponse(); + this.chain = new MockFilterChain(); } @After @@ -77,11 +77,12 @@ public class GrantedAuthorityDefaultsXmlTests { @Test public void doFilter() throws Exception { SecurityContext context = SecurityContextHolder.getContext(); - request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context); + this.request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, + context); - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(this.request, this.response, this.chain); - assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_OK); + assertThat(this.response.getStatus()).isEqualTo(HttpServletResponse.SC_OK); } @Test @@ -89,44 +90,46 @@ public class GrantedAuthorityDefaultsXmlTests { setup("DENIED"); SecurityContext context = SecurityContextHolder.getContext(); - request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context); + this.request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, + context); - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(this.request, this.response, this.chain); - assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_FORBIDDEN); + assertThat(this.response.getStatus()).isEqualTo(HttpServletResponse.SC_FORBIDDEN); } @Test public void message() { - messageService.getMessage(); + this.messageService.getMessage(); } @Test public void jsrMessage() { - messageService.getJsrMessage(); + this.messageService.getJsrMessage(); } @Test(expected = AccessDeniedException.class) public void messageDenied() { setup("DENIED"); - messageService.getMessage(); + this.messageService.getMessage(); } @Test(expected = AccessDeniedException.class) public void jsrMessageDenied() { setup("DENIED"); - messageService.getJsrMessage(); + this.messageService.getJsrMessage(); } // SEC-2926 @Test public void doFilterIsUserInRole() throws Exception { SecurityContext context = SecurityContextHolder.getContext(); - request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context); + this.request.getSession().setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, + context); - chain = new MockFilterChain() { + this.chain = new MockFilterChain() { @Override public void doFilter(ServletRequest request, ServletResponse response) @@ -139,9 +142,9 @@ public class GrantedAuthorityDefaultsXmlTests { }; - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(this.request, this.response, this.chain); - assertThat(chain.getRequest()).isNotNull(); + assertThat(this.chain.getRequest()).isNotNull(); } private void setup(String role) { diff --git a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITests.java b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITests.java index a400358fd6..58c4e09397 100644 --- a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITests.java +++ b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITests.java @@ -40,7 +40,7 @@ public class ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITes @Test public void loadUserByUsernameWhenUserFoundThenNotNull() { - assertThat(users.findByUsername("user").block()).isNotNull(); + assertThat(this.users.findByUsername("user").block()).isNotNull(); } @Configuration diff --git a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLocationITests.java b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLocationITests.java index 01e2975e09..28908297f8 100644 --- a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLocationITests.java +++ b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLocationITests.java @@ -39,7 +39,7 @@ public class ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLoca @Test public void loadUserByUsernameWhenUserFoundThenNotNull() { - assertThat(users.findByUsername("user").block()).isNotNull(); + assertThat(this.users.findByUsername("user").block()).isNotNull(); } @Configuration diff --git a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanStringITests.java b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanStringITests.java index d81b5bdea3..ff4eac53f2 100644 --- a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanStringITests.java +++ b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanStringITests.java @@ -39,7 +39,7 @@ public class ReactiveUserDetailsServiceResourceFactoryBeanStringITests { @Test public void findByUsernameWhenUserFoundThenNotNull() { - assertThat(users.findByUsername("user").block()).isNotNull(); + assertThat(this.users.findByUsername("user").block()).isNotNull(); } @Configuration diff --git a/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTests.java b/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTests.java index 5e76b25291..6a366f7fcc 100644 --- a/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTests.java +++ b/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTests.java @@ -45,39 +45,39 @@ public class UserDetailsResourceFactoryBeanTests { @Test public void setResourceLoaderWhenNullThenThrowsException() { - assertThatThrownBy(() -> factory.setResourceLoader(null)).isInstanceOf(IllegalArgumentException.class) + assertThatThrownBy(() -> this.factory.setResourceLoader(null)).isInstanceOf(IllegalArgumentException.class) .hasStackTraceContaining("resourceLoader cannot be null"); } @Test public void getObjectWhenPropertiesResourceLocationNullThenThrowsIllegalStateException() { - factory.setResourceLoader(resourceLoader); + this.factory.setResourceLoader(this.resourceLoader); - assertThatThrownBy(() -> factory.getObject()).isInstanceOf(IllegalArgumentException.class) + assertThatThrownBy(() -> this.factory.getObject()).isInstanceOf(IllegalArgumentException.class) .hasStackTraceContaining("resource cannot be null if resourceLocation is null"); } @Test public void getObjectWhenPropertiesResourceLocationSingleUserThenThrowsGetsSingleUser() throws Exception { - factory.setResourceLocation("classpath:users.properties"); + this.factory.setResourceLocation("classpath:users.properties"); - Collection users = factory.getObject(); + Collection users = this.factory.getObject(); assertLoaded(); } @Test public void getObjectWhenPropertiesResourceSingleUserThenThrowsGetsSingleUser() throws Exception { - factory.setResource(new InMemoryResource("user=password,ROLE_USER")); + this.factory.setResource(new InMemoryResource("user=password,ROLE_USER")); assertLoaded(); } @Test public void getObjectWhenInvalidUserThenThrowsMeaningfulException() { - factory.setResource(new InMemoryResource("user=invalidFormatHere")); + this.factory.setResource(new InMemoryResource("user=invalidFormatHere")); - assertThatThrownBy(() -> factory.getObject()).isInstanceOf(IllegalStateException.class) + assertThatThrownBy(() -> this.factory.getObject()).isInstanceOf(IllegalStateException.class) .hasStackTraceContaining("user").hasStackTraceContaining("invalidFormatHere"); } @@ -89,7 +89,7 @@ public class UserDetailsResourceFactoryBeanTests { } private void assertLoaded() throws Exception { - Collection users = factory.getObject(); + Collection users = this.factory.getObject(); // @formatter:off UserDetails expectedUser = User.withUsername("user") .password("password") diff --git a/config/src/test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java b/config/src/test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java index a2887488bf..c2795425e7 100644 --- a/config/src/test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java +++ b/config/src/test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java @@ -68,17 +68,17 @@ public class DefaultFilterChainValidatorTests { @Before public void setUp() { AnonymousAuthenticationFilter aaf = new AnonymousAuthenticationFilter("anonymous"); - fsi = new FilterSecurityInterceptor(); - fsi.setAccessDecisionManager(accessDecisionManager); - fsi.setSecurityMetadataSource(metadataSource); + this.fsi = new FilterSecurityInterceptor(); + this.fsi.setAccessDecisionManager(this.accessDecisionManager); + this.fsi.setSecurityMetadataSource(this.metadataSource); AuthenticationEntryPoint authenticationEntryPoint = new LoginUrlAuthenticationEntryPoint("/login"); ExceptionTranslationFilter etf = new ExceptionTranslationFilter(authenticationEntryPoint); DefaultSecurityFilterChain securityChain = new DefaultSecurityFilterChain(AnyRequestMatcher.INSTANCE, aaf, etf, - fsi); - fcp = new FilterChainProxy(securityChain); - validator = new DefaultFilterChainValidator(); + this.fsi); + this.fcp = new FilterChainProxy(securityChain); + this.validator = new DefaultFilterChainValidator(); - ReflectionTestUtils.setField(validator, "logger", logger); + ReflectionTestUtils.setField(this.validator, "logger", this.logger); } // SEC-1878 @@ -86,10 +86,10 @@ public class DefaultFilterChainValidatorTests { @Test public void validateCheckLoginPageIsntProtectedThrowsIllegalArgumentException() { IllegalArgumentException toBeThrown = new IllegalArgumentException("failed to eval expression"); - doThrow(toBeThrown).when(accessDecisionManager).decide(any(Authentication.class), anyObject(), + doThrow(toBeThrown).when(this.accessDecisionManager).decide(any(Authentication.class), anyObject(), any(Collection.class)); - validator.validate(fcp); - verify(logger).info( + this.validator.validate(this.fcp); + verify(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.", toBeThrown); } @@ -99,9 +99,9 @@ public class DefaultFilterChainValidatorTests { public void validateCustomMetadataSource() { FilterInvocationSecurityMetadataSource customMetaDataSource = mock( FilterInvocationSecurityMetadataSource.class); - fsi.setSecurityMetadataSource(customMetaDataSource); + this.fsi.setSecurityMetadataSource(customMetaDataSource); - validator.validate(fcp); + this.validator.validate(this.fcp); verify(customMetaDataSource).getAttributes(any()); } diff --git a/config/src/test/java/org/springframework/security/config/http/HttpInterceptUrlTests.java b/config/src/test/java/org/springframework/security/config/http/HttpInterceptUrlTests.java index 0c0dac1e0b..86bb8e9707 100644 --- a/config/src/test/java/org/springframework/security/config/http/HttpInterceptUrlTests.java +++ b/config/src/test/java/org/springframework/security/config/http/HttpInterceptUrlTests.java @@ -39,8 +39,8 @@ public class HttpInterceptUrlTests { @After public void close() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } @@ -48,11 +48,11 @@ public class HttpInterceptUrlTests { public void interceptUrlWhenRequestMatcherRefThenWorks() throws Exception { loadConfig("interceptUrlWhenRequestMatcherRefThenWorks.xml"); - mockMvc.perform(get("/foo")).andExpect(status().isUnauthorized()); + this.mockMvc.perform(get("/foo")).andExpect(status().isUnauthorized()); - mockMvc.perform(get("/FOO")).andExpect(status().isUnauthorized()); + this.mockMvc.perform(get("/FOO")).andExpect(status().isUnauthorized()); - mockMvc.perform(get("/other")).andExpect(status().isOk()); + this.mockMvc.perform(get("/other")).andExpect(status().isOk()); } private void loadConfig(String... configLocations) { @@ -68,7 +68,8 @@ public class HttpInterceptUrlTests { context.getAutowireCapableBeanFactory().autowireBean(this); Filter springSecurityFilterChain = context.getBean("springSecurityFilterChain", Filter.class); - mockMvc = MockMvcBuilders.standaloneSetup(new FooController()).addFilters(springSecurityFilterChain).build(); + this.mockMvc = MockMvcBuilders.standaloneSetup(new FooController()).addFilters(springSecurityFilterChain) + .build(); } @RestController diff --git a/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java index 7d23a7d0ea..5d29fc8360 100644 --- a/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java @@ -161,7 +161,7 @@ public class OAuth2LoginBeanDefinitionParserTests { this.mvc.perform(get("/")).andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("http://localhost/oauth2/authorization/google-login")); - verify(requestCache).saveRequest(any(), any()); + verify(this.requestCache).saveRequest(any(), any()); } // gh-5347 @@ -196,7 +196,7 @@ public class OAuth2LoginBeanDefinitionParserTests { ArgumentCaptor exceptionCaptor = ArgumentCaptor .forClass(AuthenticationException.class); - verify(authenticationFailureHandler).onAuthenticationFailure(any(), any(), exceptionCaptor.capture()); + verify(this.authenticationFailureHandler).onAuthenticationFailure(any(), any(), exceptionCaptor.capture()); AuthenticationException exception = exceptionCaptor.getValue(); assertThat(exception).isInstanceOf(OAuth2AuthenticationException.class); assertThat(((OAuth2AuthenticationException) exception).getError().getErrorCode()) @@ -226,7 +226,7 @@ public class OAuth2LoginBeanDefinitionParserTests { this.mvc.perform(get("/login/oauth2/code/github-login").params(params)).andExpect(status().is2xxSuccessful()); ArgumentCaptor authenticationCaptor = ArgumentCaptor.forClass(Authentication.class); - verify(authenticationSuccessHandler).onAuthenticationSuccess(any(), any(), authenticationCaptor.capture()); + verify(this.authenticationSuccessHandler).onAuthenticationSuccess(any(), any(), authenticationCaptor.capture()); Authentication authentication = authenticationCaptor.getValue(); assertThat(authentication.getPrincipal()).isInstanceOf(OAuth2User.class); } @@ -254,7 +254,7 @@ public class OAuth2LoginBeanDefinitionParserTests { params.add("state", authorizationRequest.getState()); this.mvc.perform(get("/login/oauth2/code/github-login").params(params)); - verify(authenticationSuccessListener).onApplicationEvent(any(AuthenticationSuccessEvent.class)); + verify(this.authenticationSuccessListener).onApplicationEvent(any(AuthenticationSuccessEvent.class)); } @Test @@ -312,7 +312,7 @@ public class OAuth2LoginBeanDefinitionParserTests { this.mvc.perform(get("/login/oauth2/code/github-login").params(params)).andExpect(status().is2xxSuccessful()); ArgumentCaptor authenticationCaptor = ArgumentCaptor.forClass(Authentication.class); - verify(authenticationSuccessHandler).onAuthenticationSuccess(any(), any(), authenticationCaptor.capture()); + verify(this.authenticationSuccessHandler).onAuthenticationSuccess(any(), any(), authenticationCaptor.capture()); Authentication authentication = authenticationCaptor.getValue(); assertThat(authentication.getPrincipal()).isInstanceOf(OAuth2User.class); assertThat(authentication.getAuthorities()).hasSize(1); @@ -338,7 +338,7 @@ public class OAuth2LoginBeanDefinitionParserTests { this.mvc.perform(get("/login/oauth2/code/google-login").params(params)).andExpect(status().is2xxSuccessful()); authenticationCaptor = ArgumentCaptor.forClass(Authentication.class); - verify(authenticationSuccessHandler, times(2)).onAuthenticationSuccess(any(), any(), + verify(this.authenticationSuccessHandler, times(2)).onAuthenticationSuccess(any(), any(), authenticationCaptor.capture()); authentication = authenticationCaptor.getValue(); assertThat(authentication.getPrincipal()).isInstanceOf(OidcUser.class); @@ -371,7 +371,7 @@ public class OAuth2LoginBeanDefinitionParserTests { this.mvc.perform(get("/login/oauth2/github-login").params(params)).andExpect(status().is2xxSuccessful()); ArgumentCaptor authenticationCaptor = ArgumentCaptor.forClass(Authentication.class); - verify(authenticationSuccessHandler).onAuthenticationSuccess(any(), any(), authenticationCaptor.capture()); + verify(this.authenticationSuccessHandler).onAuthenticationSuccess(any(), any(), authenticationCaptor.capture()); Authentication authentication = authenticationCaptor.getValue(); assertThat(authentication.getPrincipal()).isInstanceOf(OAuth2User.class); } @@ -384,7 +384,7 @@ public class OAuth2LoginBeanDefinitionParserTests { this.mvc.perform(get("/oauth2/authorization/google-login")).andExpect(status().is3xxRedirection()); - verify(authorizationRequestResolver).resolve(any()); + verify(this.authorizationRequestResolver).resolve(any()); } // gh-5347 @@ -439,7 +439,7 @@ public class OAuth2LoginBeanDefinitionParserTests { params.add("state", authorizationRequest.getState()); this.mvc.perform(get("/login/oauth2/code/" + clientRegistration.getRegistrationId()).params(params)); - verify(clientRegistrationRepository).findByRegistrationId(clientRegistration.getRegistrationId()); + verify(this.clientRegistrationRepository).findByRegistrationId(clientRegistration.getRegistrationId()); } @Test @@ -467,7 +467,7 @@ public class OAuth2LoginBeanDefinitionParserTests { params.add("state", authorizationRequest.getState()); this.mvc.perform(get("/login/oauth2/code/" + clientRegistration.getRegistrationId()).params(params)); - verify(authorizedClientRepository).saveAuthorizedClient(any(), any(), any(), any()); + verify(this.authorizedClientRepository).saveAuthorizedClient(any(), any(), any(), any()); } @Test @@ -495,7 +495,7 @@ public class OAuth2LoginBeanDefinitionParserTests { params.add("state", authorizationRequest.getState()); this.mvc.perform(get("/login/oauth2/code/" + clientRegistration.getRegistrationId()).params(params)); - verify(authorizedClientService).saveAuthorizedClient(any(), any()); + verify(this.authorizedClientService).saveAuthorizedClient(any(), any()); } @WithMockUser diff --git a/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigServlet31Tests.java b/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigServlet31Tests.java index c7fbebe5b6..6fe90928bb 100644 --- a/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigServlet31Tests.java +++ b/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigServlet31Tests.java @@ -69,15 +69,15 @@ public class SessionManagementConfigServlet31Tests { @Before public void setup() { - request = new MockHttpServletRequest("GET", ""); - response = new MockHttpServletResponse(); - chain = new MockFilterChain(); + this.request = new MockHttpServletRequest("GET", ""); + this.response = new MockHttpServletResponse(); + this.chain = new MockFilterChain(); } @After public void teardown() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } @@ -97,7 +97,7 @@ public class SessionManagementConfigServlet31Tests { loadContext("\n" + " \n" + " \n" + " \n" + " " + XML_AUTHENTICATION_MANAGER); - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(request, this.response, this.chain); assertThat(request.getSession().getId()).isNotEqualTo(id); assertThat(request.getSession().getAttribute("attribute1")).isEqualTo("value1"); @@ -119,7 +119,7 @@ public class SessionManagementConfigServlet31Tests { + " \n" + " \n" + " " + XML_AUTHENTICATION_MANAGER); - springSecurityFilterChain.doFilter(request, response, chain); + this.springSecurityFilterChain.doFilter(request, this.response, this.chain); assertThat(request.getSession().getId()).isNotEqualTo(id); @@ -132,7 +132,7 @@ public class SessionManagementConfigServlet31Tests { private void login(Authentication auth) { HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository(); - HttpRequestResponseHolder requestResponseHolder = new HttpRequestResponseHolder(request, response); + HttpRequestResponseHolder requestResponseHolder = new HttpRequestResponseHolder(this.request, this.response); repo.loadContext(requestResponseHolder); SecurityContextImpl securityContextImpl = new SecurityContextImpl(); diff --git a/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java b/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java index cb74d3d1b2..0db59ee857 100644 --- a/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java +++ b/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java @@ -38,8 +38,8 @@ public class WebConfigUtilsTests { @Test public void validateHttpRedirectSpELNoParserWarning() { WebConfigUtils.validateHttpRedirect("#{T(org.springframework.security.config.http.WebConfigUtilsTest).URL}", - parserContext, "fakeSource"); - verifyZeroInteractions(parserContext); + this.parserContext, "fakeSource"); + verifyZeroInteractions(this.parserContext); } } \ No newline at end of file diff --git a/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java b/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java index c3ee15d29f..730e35620a 100644 --- a/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java +++ b/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java @@ -49,7 +49,7 @@ public class CustomConfigurer extends SecurityConfigurerAdapter clazz) { diff --git a/config/src/test/java/org/springframework/security/config/method/Contact.java b/config/src/test/java/org/springframework/security/config/method/Contact.java index 56f149ec2f..e79739ef90 100644 --- a/config/src/test/java/org/springframework/security/config/method/Contact.java +++ b/config/src/test/java/org/springframework/security/config/method/Contact.java @@ -34,7 +34,7 @@ public class Contact { * @return the name */ public String getName() { - return name; + return this.name; } } diff --git a/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java index 2bcd096cde..3f5a56f46e 100644 --- a/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java @@ -80,24 +80,24 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { + " " + " " + "" + ConfigTestUtils.AUTH_PROVIDER_XML); - target = (BusinessService) appContext.getBean("target"); + this.target = (BusinessService) this.appContext.getBean("target"); } @After public void closeAppContext() { - if (appContext != null) { - appContext.close(); - appContext = null; + if (this.appContext != null) { + this.appContext.close(); + this.appContext = null; } SecurityContextHolder.clearContext(); - target = null; + this.target = null; } @Test(expected = AuthenticationCredentialsNotFoundException.class) public void targetShouldPreventProtectedMethodInvocationWithNoContext() { loadContext(); - target.someUserMethod1(); + this.target.someUserMethod1(); } @Test @@ -106,10 +106,10 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("user", "password"); SecurityContextHolder.getContext().setAuthentication(token); - target.someUserMethod1(); + this.target.someUserMethod1(); // SEC-1213. Check the order - Advisor[] advisors = ((Advised) target).getAdvisors(); + Advisor[] advisors = ((Advised) this.target).getAdvisors(); assertThat(advisors).hasSize(1); assertThat(((MethodSecurityMetadataSourceAdvisor) advisors[0]).getOrder()).isEqualTo(1001); } @@ -122,7 +122,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { SecurityContextHolder.getContext().setAuthentication(token); - target.someAdminMethod(); + this.target.someAdminMethod(); } @Test @@ -133,7 +133,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { + " " + "" + ""); - PostProcessedMockUserDetailsService service = (PostProcessedMockUserDetailsService) appContext + PostProcessedMockUserDetailsService service = (PostProcessedMockUserDetailsService) this.appContext .getBean("myUserService"); assertThat(service.getPostProcessorWasHere()).isEqualTo("Hello from the post processor!"); @@ -148,7 +148,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { + "" + "" + " " + ""); - UserDetailsService service = (UserDetailsService) appContext.getBean("myUserService"); + UserDetailsService service = (UserDetailsService) this.appContext.getBean("myUserService"); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password", AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE")); SecurityContextHolder.getContext().setAuthentication(token); @@ -165,14 +165,14 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { + "" + ConfigTestUtils.AUTH_PROVIDER_XML); SecurityContextHolder.getContext() .setAuthentication(new UsernamePasswordAuthenticationToken("user", "password")); - target = (BusinessService) appContext.getBean("target"); + this.target = (BusinessService) this.appContext.getBean("target"); // someOther(int) should not be matched by someOther(String), but should require // ROLE_USER - target.someOther(0); + this.target.someOther(0); try { // String version should required admin role - target.someOther("somestring"); + this.target.someOther("somestring"); fail("Expected AccessDeniedException"); } catch (AccessDeniedException expected) { @@ -186,13 +186,13 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { + " 'execution(* org.springframework.security.access.annotation.BusinessService.*(..)) " + " and not execution(* org.springframework.security.access.annotation.BusinessService.someOther(String)))' " + " access='ROLE_USER'/>" + "" + AUTH_PROVIDER_XML); - target = (BusinessService) appContext.getBean("target"); + this.target = (BusinessService) this.appContext.getBean("target"); // String method should not be protected - target.someOther("somestring"); + this.target.someOther("somestring"); // All others should require ROLE_USER try { - target.someOther(0); + this.target.someOther(0); fail("Expected AuthenticationCredentialsNotFoundException"); } catch (AuthenticationCredentialsNotFoundException expected) { @@ -200,7 +200,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { SecurityContextHolder.getContext() .setAuthentication(new UsernamePasswordAuthenticationToken("user", "password")); - target.someOther(0); + this.target.someOther(0); } @Test(expected = BeanDefinitionParsingException.class) @@ -220,8 +220,8 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password", AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE")); SecurityContextHolder.getContext().setAuthentication(token); - target = (BusinessService) appContext.getBean("businessService"); - target.someUserMethod1(); + this.target = (BusinessService) this.appContext.getBean("businessService"); + this.target.someUserMethod1(); } // Expression configuration tests @@ -230,11 +230,11 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { @Test public void expressionVoterAndAfterInvocationProviderUseSameExpressionHandlerInstance() throws Exception { setContext("" + AUTH_PROVIDER_XML); - AffirmativeBased adm = (AffirmativeBased) appContext.getBeansOfType(AffirmativeBased.class).values() + AffirmativeBased adm = (AffirmativeBased) this.appContext.getBeansOfType(AffirmativeBased.class).values() .toArray()[0]; List voters = (List) FieldUtils.getFieldValue(adm, "decisionVoters"); PreInvocationAuthorizationAdviceVoter mev = (PreInvocationAuthorizationAdviceVoter) voters.get(0); - MethodSecurityMetadataSourceAdvisor msi = (MethodSecurityMetadataSourceAdvisor) appContext + MethodSecurityMetadataSourceAdvisor msi = (MethodSecurityMetadataSourceAdvisor) this.appContext .getBeansOfType(MethodSecurityMetadataSourceAdvisor.class).values().toArray()[0]; AfterInvocationProviderManager pm = (AfterInvocationProviderManager) ((MethodSecurityInterceptor) msi .getAdvice()).getAfterInvocationManager(); @@ -248,9 +248,9 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { setContext("" + "" + AUTH_PROVIDER_XML); - SecurityContextHolder.getContext().setAuthentication(bob); - target = (BusinessService) appContext.getBean("target"); - target.someAdminMethod(); + SecurityContextHolder.getContext().setAuthentication(this.bob); + this.target = (BusinessService) this.appContext.getBean("target"); + this.target.someAdminMethod(); } @Test @@ -260,8 +260,8 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { + "" + "" + AUTH_PROVIDER_XML); - SecurityContextHolder.getContext().setAuthentication(bob); - ExpressionProtectedBusinessServiceImpl target = (ExpressionProtectedBusinessServiceImpl) appContext + SecurityContextHolder.getContext().setAuthentication(this.bob); + ExpressionProtectedBusinessServiceImpl target = (ExpressionProtectedBusinessServiceImpl) this.appContext .getBean("target"); target.methodWithBeanNamePropertyAccessExpression("x"); } @@ -271,13 +271,13 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { setContext("" + "" + AUTH_PROVIDER_XML); - SecurityContextHolder.getContext().setAuthentication(bob); - target = (BusinessService) appContext.getBean("target"); + SecurityContextHolder.getContext().setAuthentication(this.bob); + this.target = (BusinessService) this.appContext.getBean("target"); List arg = new ArrayList<>(); arg.add("joe"); arg.add("bob"); arg.add("sam"); - List result = target.methodReturningAList(arg); + List result = this.target.methodReturningAList(arg); // Expression is (filterObject == name or filterObject == 'sam'), so "joe" should // be gone after pre-filter // PostFilter should remove sam from the return object @@ -290,10 +290,10 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { setContext("" + "" + AUTH_PROVIDER_XML); - SecurityContextHolder.getContext().setAuthentication(bob); - target = (BusinessService) appContext.getBean("target"); + SecurityContextHolder.getContext().setAuthentication(this.bob); + this.target = (BusinessService) this.appContext.getBean("target"); Object[] arg = new String[] { "joe", "bob", "sam" }; - Object[] result = target.methodReturningAnArray(arg); + Object[] result = this.target.methodReturningAnArray(arg); assertThat(result).hasSize(1); assertThat(result[0]).isEqualTo("bob"); } @@ -318,7 +318,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { + "" + " " + "" + AUTH_PROVIDER_XML); - Foo foo = (Foo) appContext.getBean("target"); + Foo foo = (Foo) this.appContext.getBean("target"); foo.foo(new SecurityConfig("A")); } @@ -328,8 +328,8 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { public void genericsMethodArgumentNamesAreResolved() { setContext("" + "" + AUTH_PROVIDER_XML); - SecurityContextHolder.getContext().setAuthentication(bob); - Foo foo = (Foo) appContext.getBean("target"); + SecurityContextHolder.getContext().setAuthentication(this.bob); + Foo foo = (Foo) this.appContext.getBean("target"); foo.foo(new SecurityConfig("A")); } @@ -342,8 +342,8 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { parent.refresh(); setContext("" + AUTH_PROVIDER_XML, parent); - RunAsManagerImpl ram = (RunAsManagerImpl) appContext.getBean("runAsMgr"); - MethodSecurityMetadataSourceAdvisor msi = (MethodSecurityMetadataSourceAdvisor) appContext + RunAsManagerImpl ram = (RunAsManagerImpl) this.appContext.getBean("runAsMgr"); + MethodSecurityMetadataSourceAdvisor msi = (MethodSecurityMetadataSourceAdvisor) this.appContext .getBeansOfType(MethodSecurityMetadataSourceAdvisor.class).values().toArray()[0]; assertThat(ram).isSameAs(FieldUtils.getFieldValue(msi.getAdvice(), "runAsManager")); } @@ -357,8 +357,8 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { + "" + AUTH_PROVIDER_XML); // External MDS should take precedence over PreAuthorize - SecurityContextHolder.getContext().setAuthentication(bob); - Foo foo = (Foo) appContext.getBean("target"); + SecurityContextHolder.getContext().setAuthentication(this.bob); + Foo foo = (Foo) this.appContext.getBean("target"); try { foo.foo(new SecurityConfig("A")); fail("Bob can't invoke admin methods"); @@ -378,8 +378,8 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { + "" + "" + " " + "" + AUTH_PROVIDER_XML); - SecurityContextHolder.getContext().setAuthentication(bob); - Foo foo = (Foo) appContext.getBean("target"); + SecurityContextHolder.getContext().setAuthentication(this.bob); + Foo foo = (Foo) this.appContext.getBean("target"); try { foo.foo(new SecurityConfig("A")); fail("Bob can't invoke admin methods"); @@ -402,7 +402,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { } public Authentication authenticate(Authentication authentication) throws AuthenticationException { - return authenticationManager.authenticate(authentication); + return this.authenticationManager.authenticate(authentication); } /* @@ -413,17 +413,17 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { * .springframework.context.ApplicationContext) */ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - this.authenticationManager = applicationContext.getBean(beanName, AuthenticationManager.class); + this.authenticationManager = applicationContext.getBean(this.beanName, AuthenticationManager.class); } } private void setContext(String context) { - appContext = new InMemoryXmlApplicationContext(context); + this.appContext = new InMemoryXmlApplicationContext(context); } private void setContext(String context, ApplicationContext parent) { - appContext = new InMemoryXmlApplicationContext(context, parent); + this.appContext = new InMemoryXmlApplicationContext(context, parent); } interface Foo { diff --git a/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java b/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java index c49964bfc5..62eca788ef 100644 --- a/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java +++ b/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java @@ -70,21 +70,21 @@ public class InterceptMethodsBeanDefinitionDecoratorTests implements Application @Test public void targetDoesntLoseApplicationListenerInterface() { - assertThat(appContext.getBeansOfType(ApplicationListener.class)).hasSize(1); - assertThat(appContext.getBeanNamesForType(ApplicationListener.class)).hasSize(1); - appContext.publishEvent(new AuthenticationSuccessEvent(new TestingAuthenticationToken("user", ""))); + assertThat(this.appContext.getBeansOfType(ApplicationListener.class)).hasSize(1); + assertThat(this.appContext.getBeanNamesForType(ApplicationListener.class)).hasSize(1); + this.appContext.publishEvent(new AuthenticationSuccessEvent(new TestingAuthenticationToken("user", ""))); - assertThat(target).isInstanceOf(ApplicationListener.class); + assertThat(this.target).isInstanceOf(ApplicationListener.class); } @Test public void targetShouldAllowUnprotectedMethodInvocationWithNoContext() { - target.unprotected(); + this.target.unprotected(); } @Test(expected = AuthenticationCredentialsNotFoundException.class) public void targetShouldPreventProtectedMethodInvocationWithNoContext() { - target.doSomething(); + this.target.doSomething(); } @Test @@ -93,7 +93,7 @@ public class InterceptMethodsBeanDefinitionDecoratorTests implements Application AuthorityUtils.createAuthorityList("ROLE_USER")); SecurityContextHolder.getContext().setAuthentication(token); - target.doSomething(); + this.target.doSomething(); } @Test(expected = AccessDeniedException.class) @@ -102,12 +102,12 @@ public class InterceptMethodsBeanDefinitionDecoratorTests implements Application AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE")); SecurityContextHolder.getContext().setAuthentication(token); - target.doSomething(); + this.target.doSomething(); } @Test(expected = AuthenticationException.class) public void transactionalMethodsShouldBeSecured() { - transactionalTarget.doSomething(); + this.transactionalTarget.doSomething(); } public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { diff --git a/config/src/test/java/org/springframework/security/config/method/Jsr250AnnotationDrivenBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/method/Jsr250AnnotationDrivenBeanDefinitionParserTests.java index 194ac1fe62..e1e48925a7 100644 --- a/config/src/test/java/org/springframework/security/config/method/Jsr250AnnotationDrivenBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/method/Jsr250AnnotationDrivenBeanDefinitionParserTests.java @@ -39,23 +39,23 @@ public class Jsr250AnnotationDrivenBeanDefinitionParserTests { @Before public void loadContext() { - appContext = new InMemoryXmlApplicationContext( + this.appContext = new InMemoryXmlApplicationContext( "" + "" + ConfigTestUtils.AUTH_PROVIDER_XML); - target = (BusinessService) appContext.getBean("target"); + this.target = (BusinessService) this.appContext.getBean("target"); } @After public void closeAppContext() { - if (appContext != null) { - appContext.close(); + if (this.appContext != null) { + this.appContext.close(); } SecurityContextHolder.clearContext(); } @Test(expected = AuthenticationCredentialsNotFoundException.class) public void targetShouldPreventProtectedMethodInvocationWithNoContext() { - target.someUserMethod1(); + this.target.someUserMethod1(); } @Test @@ -64,7 +64,7 @@ public class Jsr250AnnotationDrivenBeanDefinitionParserTests { AuthorityUtils.createAuthorityList("ROLE_USER")); SecurityContextHolder.getContext().setAuthentication(token); - target.someOther(0); + this.target.someOther(0); } @Test @@ -73,7 +73,7 @@ public class Jsr250AnnotationDrivenBeanDefinitionParserTests { AuthorityUtils.createAuthorityList("ROLE_USER")); SecurityContextHolder.getContext().setAuthentication(token); - target.someUserMethod1(); + this.target.someUserMethod1(); } @Test(expected = AccessDeniedException.class) @@ -82,7 +82,7 @@ public class Jsr250AnnotationDrivenBeanDefinitionParserTests { AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE")); SecurityContextHolder.getContext().setAuthentication(token); - target.someAdminMethod(); + this.target.someAdminMethod(); } @Test @@ -91,7 +91,7 @@ public class Jsr250AnnotationDrivenBeanDefinitionParserTests { AuthorityUtils.createAuthorityList("ROLE_USER")); SecurityContextHolder.getContext().setAuthentication(token); - target.rolesAllowedUser(); + this.target.rolesAllowedUser(); } } diff --git a/config/src/test/java/org/springframework/security/config/method/PreAuthorizeTests.java b/config/src/test/java/org/springframework/security/config/method/PreAuthorizeTests.java index db9fddee30..459c2a89ec 100644 --- a/config/src/test/java/org/springframework/security/config/method/PreAuthorizeTests.java +++ b/config/src/test/java/org/springframework/security/config/method/PreAuthorizeTests.java @@ -46,28 +46,28 @@ public class PreAuthorizeTests { public void preAuthorizeAdminRoleDenied() { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("user", "pass", "ROLE_USER")); - service.preAuthorizeAdminRole(); + this.service.preAuthorizeAdminRole(); } @Test public void preAuthorizeAdminRoleGranted() { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("user", "pass", "ROLE_ADMIN")); - service.preAuthorizeAdminRole(); + this.service.preAuthorizeAdminRole(); } @Test public void preAuthorizeContactPermissionGranted() { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("user", "pass", "ROLE_ADMIN")); - service.contactPermission(new Contact("user")); + this.service.contactPermission(new Contact("user")); } @Test(expected = AccessDeniedException.class) public void preAuthorizeContactPermissionDenied() { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("user", "pass", "ROLE_ADMIN")); - service.contactPermission(new Contact("admin")); + this.service.contactPermission(new Contact("admin")); } } \ No newline at end of file diff --git a/config/src/test/java/org/springframework/security/config/method/Sec2196Tests.java b/config/src/test/java/org/springframework/security/config/method/Sec2196Tests.java index e521cd18ed..1b255256ee 100644 --- a/config/src/test/java/org/springframework/security/config/method/Sec2196Tests.java +++ b/config/src/test/java/org/springframework/security/config/method/Sec2196Tests.java @@ -40,7 +40,7 @@ public class Sec2196Tests { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("test", "pass", "ROLE_USER")); - Service service = context.getBean(Service.class); + Service service = this.context.getBean(Service.class); service.save(new User()); } @@ -51,7 +51,7 @@ public class Sec2196Tests { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("test", "pass", "saveUsers")); - Service service = context.getBean(Service.class); + Service service = this.context.getBean(Service.class); service.save(new User()); } @@ -61,9 +61,9 @@ public class Sec2196Tests { @After public void closeAppContext() { - if (context != null) { - context.close(); - context = null; + if (this.context != null) { + this.context.close(); + this.context = null; } SecurityContextHolder.clearContext(); } diff --git a/config/src/test/java/org/springframework/security/config/method/SecuredAnnotationDrivenBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/method/SecuredAnnotationDrivenBeanDefinitionParserTests.java index 10b57e0ec1..7c69b15459 100644 --- a/config/src/test/java/org/springframework/security/config/method/SecuredAnnotationDrivenBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/method/SecuredAnnotationDrivenBeanDefinitionParserTests.java @@ -47,24 +47,24 @@ public class SecuredAnnotationDrivenBeanDefinitionParserTests { @Before public void loadContext() { SecurityContextHolder.clearContext(); - appContext = new InMemoryXmlApplicationContext( + this.appContext = new InMemoryXmlApplicationContext( "" + "" + ConfigTestUtils.AUTH_PROVIDER_XML); - target = (BusinessService) appContext.getBean("target"); + this.target = (BusinessService) this.appContext.getBean("target"); } @After public void closeAppContext() { - if (appContext != null) { - appContext.close(); + if (this.appContext != null) { + this.appContext.close(); } SecurityContextHolder.clearContext(); } @Test(expected = AuthenticationCredentialsNotFoundException.class) public void targetShouldPreventProtectedMethodInvocationWithNoContext() { - target.someUserMethod1(); + this.target.someUserMethod1(); } @Test @@ -73,7 +73,7 @@ public class SecuredAnnotationDrivenBeanDefinitionParserTests { AuthorityUtils.createAuthorityList("ROLE_USER")); SecurityContextHolder.getContext().setAuthentication(token); - target.someUserMethod1(); + this.target.someUserMethod1(); } @Test(expected = AccessDeniedException.class) @@ -82,26 +82,26 @@ public class SecuredAnnotationDrivenBeanDefinitionParserTests { AuthorityUtils.createAuthorityList("ROLE_SOMEOTHER")); SecurityContextHolder.getContext().setAuthentication(token); - target.someAdminMethod(); + this.target.someAdminMethod(); } // SEC-1387 @Test(expected = AuthenticationCredentialsNotFoundException.class) public void targetIsSerializableBeforeUse() throws Exception { - BusinessService chompedTarget = (BusinessService) serializeAndDeserialize(target); + BusinessService chompedTarget = (BusinessService) serializeAndDeserialize(this.target); chompedTarget.someAdminMethod(); } @Test(expected = AccessDeniedException.class) public void targetIsSerializableAfterUse() throws Exception { try { - target.someAdminMethod(); + this.target.someAdminMethod(); } catch (AuthenticationCredentialsNotFoundException expected) { } SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("u", "p", "ROLE_A")); - BusinessService chompedTarget = (BusinessService) serializeAndDeserialize(target); + BusinessService chompedTarget = (BusinessService) serializeAndDeserialize(this.target); chompedTarget.someAdminMethod(); } diff --git a/config/src/test/java/org/springframework/security/config/method/SecuredTests.java b/config/src/test/java/org/springframework/security/config/method/SecuredTests.java index 488104d024..9c3690a2b4 100644 --- a/config/src/test/java/org/springframework/security/config/method/SecuredTests.java +++ b/config/src/test/java/org/springframework/security/config/method/SecuredTests.java @@ -46,14 +46,14 @@ public class SecuredTests { public void securedAdminRoleDenied() { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("user", "pass", "ROLE_USER")); - service.securedAdminRole(); + this.service.securedAdminRole(); } @Test public void securedAdminRoleGranted() { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("user", "pass", "ROLE_ADMIN")); - service.securedAdminRole(); + this.service.securedAdminRole(); } } \ No newline at end of file diff --git a/config/src/test/java/org/springframework/security/config/method/sec2499/Sec2499Tests.java b/config/src/test/java/org/springframework/security/config/method/sec2499/Sec2499Tests.java index 8c4e755cca..20a13f9ec0 100644 --- a/config/src/test/java/org/springframework/security/config/method/sec2499/Sec2499Tests.java +++ b/config/src/test/java/org/springframework/security/config/method/sec2499/Sec2499Tests.java @@ -32,21 +32,21 @@ public class Sec2499Tests { @After public void cleanup() { - if (parent != null) { - parent.close(); + if (this.parent != null) { + this.parent.close(); } - if (child != null) { - child.close(); + if (this.child != null) { + this.child.close(); } } @Test public void methodExpressionHandlerInParentContextLoads() { - parent = new GenericXmlApplicationContext("org/springframework/security/config/method/sec2499/parent.xml"); - child = new GenericXmlApplicationContext(); - child.load("org/springframework/security/config/method/sec2499/child.xml"); - child.setParent(parent); - child.refresh(); + this.parent = new GenericXmlApplicationContext("org/springframework/security/config/method/sec2499/parent.xml"); + this.child = new GenericXmlApplicationContext(); + this.child.load("org/springframework/security/config/method/sec2499/child.xml"); + this.child.setParent(this.parent); + this.child.refresh(); } } \ No newline at end of file diff --git a/config/src/test/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParserTests.java index cbabcc193d..193d8c4a4e 100644 --- a/config/src/test/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParserTests.java @@ -106,9 +106,9 @@ public class ClientRegistrationsBeanDefinitionParserTests { String contextConfig = ISSUER_URI_XML_CONFIG.replace("${issuer-uri}", serverUrl); this.spring.context(contextConfig).autowire(); - assertThat(clientRegistrationRepository).isInstanceOf(InMemoryClientRegistrationRepository.class); + assertThat(this.clientRegistrationRepository).isInstanceOf(InMemoryClientRegistrationRepository.class); - ClientRegistration googleRegistration = clientRegistrationRepository.findByRegistrationId("google-login"); + ClientRegistration googleRegistration = this.clientRegistrationRepository.findByRegistrationId("google-login"); assertThat(googleRegistration).isNotNull(); assertThat(googleRegistration.getRegistrationId()).isEqualTo("google-login"); assertThat(googleRegistration.getClientId()).isEqualTo("google-client-id"); @@ -137,9 +137,9 @@ public class ClientRegistrationsBeanDefinitionParserTests { public void parseWhenMultipleClientsConfiguredThenAvailableInRepository() { this.spring.configLocations(this.xml("MultiClientRegistration")).autowire(); - assertThat(clientRegistrationRepository).isInstanceOf(InMemoryClientRegistrationRepository.class); + assertThat(this.clientRegistrationRepository).isInstanceOf(InMemoryClientRegistrationRepository.class); - ClientRegistration googleRegistration = clientRegistrationRepository.findByRegistrationId("google-login"); + ClientRegistration googleRegistration = this.clientRegistrationRepository.findByRegistrationId("google-login"); assertThat(googleRegistration).isNotNull(); assertThat(googleRegistration.getRegistrationId()).isEqualTo("google-login"); assertThat(googleRegistration.getClientId()).isEqualTo("google-client-id"); @@ -164,7 +164,7 @@ public class ClientRegistrationsBeanDefinitionParserTests { assertThat(googleProviderDetails.getJwkSetUri()).isEqualTo("https://www.googleapis.com/oauth2/v3/certs"); assertThat(googleProviderDetails.getIssuerUri()).isEqualTo("https://accounts.google.com"); - ClientRegistration githubRegistration = clientRegistrationRepository.findByRegistrationId("github-login"); + ClientRegistration githubRegistration = this.clientRegistrationRepository.findByRegistrationId("github-login"); assertThat(githubRegistration).isNotNull(); assertThat(githubRegistration.getRegistrationId()).isEqualTo("github-login"); assertThat(githubRegistration.getClientId()).isEqualTo("github-client-id"); diff --git a/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceITests.java b/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceITests.java index 191ffa1132..b873becd89 100644 --- a/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceITests.java +++ b/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceITests.java @@ -40,7 +40,7 @@ public class UserDetailsManagerResourceFactoryBeanPropertiesResourceITests { @Test public void loadUserByUsernameWhenUserFoundThenNotNull() { - assertThat(users.loadUserByUsername("user")).isNotNull(); + assertThat(this.users.loadUserByUsername("user")).isNotNull(); } @Configuration diff --git a/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceLocationITests.java b/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceLocationITests.java index 180ea0b40a..086a067fdf 100644 --- a/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceLocationITests.java +++ b/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceLocationITests.java @@ -39,7 +39,7 @@ public class UserDetailsManagerResourceFactoryBeanPropertiesResourceLocationITes @Test public void loadUserByUsernameWhenUserFoundThenNotNull() { - assertThat(users.loadUserByUsername("user")).isNotNull(); + assertThat(this.users.loadUserByUsername("user")).isNotNull(); } @Configuration diff --git a/config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java b/config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java index bb324e3491..dafad7a02f 100644 --- a/config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java +++ b/config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java @@ -56,7 +56,7 @@ public class InMemoryXmlApplicationContext extends AbstractXmlApplicationContext public InMemoryXmlApplicationContext(String xml, String secVersion, ApplicationContext parent) { String fullXml = BEANS_OPENING + secVersion + ".xsd'>\n" + xml + BEANS_CLOSE; - inMemoryXml = new InMemoryResource(fullXml); + this.inMemoryXml = new InMemoryResource(fullXml); setAllowBeanDefinitionOverriding(true); setParent(parent); refresh(); @@ -73,7 +73,7 @@ public class InMemoryXmlApplicationContext extends AbstractXmlApplicationContext } protected Resource[] getConfigResources() { - return new Resource[] { inMemoryXml }; + return new Resource[] { this.inMemoryXml }; } } diff --git a/config/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java b/config/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java index affe2e9d50..5ffae5ac04 100644 --- a/config/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java +++ b/config/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java @@ -44,7 +44,7 @@ public class InMemoryXmlWebApplicationContext extends AbstractRefreshableWebAppl public InMemoryXmlWebApplicationContext(String xml, String secVersion, ApplicationContext parent) { String fullXml = BEANS_OPENING + secVersion + ".xsd'>\n" + xml + BEANS_CLOSE; - inMemoryXml = new InMemoryResource(fullXml); + this.inMemoryXml = new InMemoryResource(fullXml); setAllowBeanDefinitionOverriding(true); setParent(parent); } @@ -52,7 +52,7 @@ public class InMemoryXmlWebApplicationContext extends AbstractRefreshableWebAppl @Override protected void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) throws BeansException { XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory); - reader.loadBeanDefinitions(new Resource[] { inMemoryXml }); + reader.loadBeanDefinitions(new Resource[] { this.inMemoryXml }); } } diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java index d4a34905af..c6bd79537a 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java @@ -382,12 +382,12 @@ public class OAuth2LoginTests { .anyExchange().authenticated() .and() .oauth2Login() - .authenticationConverter(authenticationConverter) - .authenticationManager(manager) - .authenticationMatcher(matcher) - .authorizationRequestResolver(resolver) - .authenticationSuccessHandler(successHandler) - .authenticationFailureHandler(failureHandler); + .authenticationConverter(this.authenticationConverter) + .authenticationManager(this.manager) + .authenticationMatcher(this.matcher) + .authorizationRequestResolver(this.resolver) + .authenticationSuccessHandler(this.successHandler) + .authenticationFailureHandler(this.failureHandler); // @formatter:on return http.build(); } @@ -463,11 +463,11 @@ public class OAuth2LoginTests { ) .oauth2Login(oauth2Login -> oauth2Login - .authenticationConverter(authenticationConverter) - .authenticationManager(manager) - .authenticationMatcher(matcher) - .authorizationRequestResolver(resolver) - .authenticationSuccessHandler(successHandler) + .authenticationConverter(this.authenticationConverter) + .authenticationManager(this.manager) + .authenticationMatcher(this.matcher) + .authorizationRequestResolver(this.resolver) + .authenticationSuccessHandler(this.successHandler) ); // @formatter:on return http.build(); @@ -607,28 +607,28 @@ public class OAuth2LoginTests { .anyExchange().authenticated() .and() .oauth2Login() - .authenticationConverter(authenticationConverter) + .authenticationConverter(this.authenticationConverter) .authenticationManager(authenticationManager()) - .securityContextRepository(securityContextRepository); + .securityContextRepository(this.securityContextRepository); return http.build(); // @formatter:on } private ReactiveAuthenticationManager authenticationManager() { OidcAuthorizationCodeReactiveAuthenticationManager oidc = new OidcAuthorizationCodeReactiveAuthenticationManager( - tokenResponseClient, userService); + this.tokenResponseClient, this.userService); oidc.setJwtDecoderFactory(jwtDecoderFactory()); return oidc; } @Bean public ReactiveJwtDecoderFactory jwtDecoderFactory() { - return jwtDecoderFactory; + return this.jwtDecoderFactory; } @Bean public ReactiveOAuth2AccessTokenResponseClient accessTokenResponseClient() { - return tokenResponseClient; + return this.tokenResponseClient; } private static class JwtDecoderFactory implements ReactiveJwtDecoderFactory { diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java index 55330713e1..8026f28f4d 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java @@ -390,7 +390,7 @@ public class OAuth2ResourceServerSpecTests { public void introspectWhenValidThenReturnsOk() { this.spring.register(IntrospectionConfig.class, RootController.class).autowire(); this.spring.getContext().getBean(MockWebServer.class) - .setDispatcher(requiresAuth(clientId, clientSecret, active)); + .setDispatcher(requiresAuth(this.clientId, this.clientSecret, this.active)); this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isOk(); @@ -400,7 +400,7 @@ public class OAuth2ResourceServerSpecTests { public void introspectWhenValidAndIntrospectionInLambdaThenReturnsOk() { this.spring.register(IntrospectionInLambdaConfig.class, RootController.class).autowire(); this.spring.getContext().getBean(MockWebServer.class) - .setDispatcher(requiresAuth(clientId, clientSecret, active)); + .setDispatcher(requiresAuth(this.clientId, this.clientSecret, this.active)); this.client.get().headers(headers -> headers.setBearerAuth(this.messageReadToken)).exchange().expectStatus() .isOk(); diff --git a/config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTests.java b/config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTests.java index ca6b1dc65a..7b3a9660a0 100644 --- a/config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTests.java +++ b/config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTests.java @@ -30,7 +30,7 @@ public class MessageSecurityPostProcessorTests { public void handlesBeansWithoutClass() { BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry(); registry.registerBeanDefinition("beanWithoutClass", new GenericBeanDefinition()); - postProcessor.postProcessBeanDefinitionRegistry(registry); + this.postProcessor.postProcessBeanDefinitionRegistry(registry); } } diff --git a/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java b/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java index 1469d5c06a..d8fd4bf34b 100644 --- a/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java +++ b/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java @@ -64,9 +64,9 @@ public class MethodSecurityInterceptorWithAopConfigTests { @After public void closeAppContext() { SecurityContextHolder.clearContext(); - if (appContext != null) { - appContext.close(); - appContext = null; + if (this.appContext != null) { + this.appContext.close(); + this.appContext = null; } } @@ -77,7 +77,7 @@ public class MethodSecurityInterceptorWithAopConfigTests { + " " + "" + TARGET_BEAN_AND_INTERCEPTOR + AUTH_PROVIDER_XML + ACCESS_MANAGER_XML); - ITargetObject target = (ITargetObject) appContext.getBean("target"); + ITargetObject target = (ITargetObject) this.appContext.getBean("target"); // Check both against interface and class try { @@ -101,7 +101,7 @@ public class MethodSecurityInterceptorWithAopConfigTests { + " " + "" + TARGET_BEAN_AND_INTERCEPTOR + AUTH_PROVIDER_XML + ACCESS_MANAGER_XML); - ITargetObject target = (ITargetObject) appContext.getBean("target"); + ITargetObject target = (ITargetObject) this.appContext.getBean("target"); try { target.makeLowerCase("TEST"); @@ -115,7 +115,7 @@ public class MethodSecurityInterceptorWithAopConfigTests { } private void setContext(String context) { - appContext = new InMemoryXmlApplicationContext(context); + this.appContext = new InMemoryXmlApplicationContext(context); } } diff --git a/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java index 71dc67b443..4ccef31e78 100644 --- a/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java @@ -100,13 +100,13 @@ public class Jsr250MethodSecurityMetadataSource extends AbstractFallbackMethodSe if (role == null) { return role; } - if (defaultRolePrefix == null || defaultRolePrefix.length() == 0) { + if (this.defaultRolePrefix == null || this.defaultRolePrefix.length() == 0) { return role; } - if (role.startsWith(defaultRolePrefix)) { + if (role.startsWith(this.defaultRolePrefix)) { return role; } - return defaultRolePrefix + role; + return this.defaultRolePrefix + role; } } diff --git a/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java index 3de23b2117..64a51bb038 100644 --- a/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java @@ -52,19 +52,19 @@ public class SecuredAnnotationSecurityMetadataSource extends AbstractFallbackMet public SecuredAnnotationSecurityMetadataSource(AnnotationMetadataExtractor annotationMetadataExtractor) { Assert.notNull(annotationMetadataExtractor, "annotationMetadataExtractor cannot be null"); - annotationExtractor = annotationMetadataExtractor; - annotationType = (Class) GenericTypeResolver - .resolveTypeArgument(annotationExtractor.getClass(), AnnotationMetadataExtractor.class); - Assert.notNull(annotationType, () -> annotationExtractor.getClass().getName() + this.annotationExtractor = annotationMetadataExtractor; + this.annotationType = (Class) GenericTypeResolver + .resolveTypeArgument(this.annotationExtractor.getClass(), AnnotationMetadataExtractor.class); + Assert.notNull(this.annotationType, () -> this.annotationExtractor.getClass().getName() + " must supply a generic parameter for AnnotationMetadataExtractor"); } protected Collection findAttributes(Class clazz) { - return processAnnotation(AnnotationUtils.findAnnotation(clazz, annotationType)); + return processAnnotation(AnnotationUtils.findAnnotation(clazz, this.annotationType)); } protected Collection findAttributes(Method method, Class targetClass) { - return processAnnotation(AnnotationUtils.findAnnotation(method, annotationType)); + return processAnnotation(AnnotationUtils.findAnnotation(method, this.annotationType)); } public Collection getAllConfigAttributes() { @@ -76,7 +76,7 @@ public class SecuredAnnotationSecurityMetadataSource extends AbstractFallbackMet return null; } - return annotationExtractor.extractAttributes(a); + return this.annotationExtractor.extractAttributes(a); } } diff --git a/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java b/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java index fedad57952..2a380cdb73 100644 --- a/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java +++ b/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java @@ -54,11 +54,11 @@ public class AuthenticationCredentialsNotFoundEvent extends AbstractAuthorizatio } public Collection getConfigAttributes() { - return configAttribs; + return this.configAttribs; } public AuthenticationCredentialsNotFoundException getCredentialsNotFoundException() { - return credentialsNotFoundException; + return this.credentialsNotFoundException; } } diff --git a/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java b/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java index f9672400c5..a3a39198e3 100644 --- a/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java +++ b/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java @@ -65,15 +65,15 @@ public class AuthorizationFailureEvent extends AbstractAuthorizationEvent { } public AccessDeniedException getAccessDeniedException() { - return accessDeniedException; + return this.accessDeniedException; } public Authentication getAuthentication() { - return authentication; + return this.authentication; } public Collection getConfigAttributes() { - return configAttributes; + return this.configAttributes; } } diff --git a/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java b/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java index ea5873bd86..dbe2e8d434 100644 --- a/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java +++ b/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java @@ -54,11 +54,11 @@ public class AuthorizedEvent extends AbstractAuthorizationEvent { } public Authentication getAuthentication() { - return authentication; + return this.authentication; } public Collection getConfigAttributes() { - return configAttributes; + return this.configAttributes; } } diff --git a/core/src/main/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandler.java index 046749155f..aa519605aa 100644 --- a/core/src/main/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandler.java +++ b/core/src/main/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandler.java @@ -48,7 +48,7 @@ public abstract class AbstractSecurityExpressionHandler private PermissionEvaluator permissionEvaluator = new DenyAllPermissionEvaluator(); public final ExpressionParser getExpressionParser() { - return expressionParser; + return this.expressionParser; } public final void setExpressionParser(ExpressionParser expressionParser) { @@ -67,7 +67,7 @@ public abstract class AbstractSecurityExpressionHandler public final EvaluationContext createEvaluationContext(Authentication authentication, T invocation) { SecurityExpressionOperations root = createSecurityExpressionRoot(authentication, invocation); StandardEvaluationContext ctx = createEvaluationContextInternal(authentication, invocation); - ctx.setBeanResolver(br); + ctx.setBeanResolver(this.br); ctx.setRootObject(root); return ctx; @@ -99,7 +99,7 @@ public abstract class AbstractSecurityExpressionHandler T invocation); protected RoleHierarchy getRoleHierarchy() { - return roleHierarchy; + return this.roleHierarchy; } public void setRoleHierarchy(RoleHierarchy roleHierarchy) { @@ -107,7 +107,7 @@ public abstract class AbstractSecurityExpressionHandler } protected PermissionEvaluator getPermissionEvaluator() { - return permissionEvaluator; + return this.permissionEvaluator; } public void setPermissionEvaluator(PermissionEvaluator permissionEvaluator) { @@ -115,7 +115,7 @@ public abstract class AbstractSecurityExpressionHandler } public void setApplicationContext(ApplicationContext applicationContext) { - br = new BeanFactoryResolver(applicationContext); + this.br = new BeanFactoryResolver(applicationContext); } } diff --git a/core/src/main/java/org/springframework/security/access/expression/DenyAllPermissionEvaluator.java b/core/src/main/java/org/springframework/security/access/expression/DenyAllPermissionEvaluator.java index 89ba56b486..e394b37b80 100644 --- a/core/src/main/java/org/springframework/security/access/expression/DenyAllPermissionEvaluator.java +++ b/core/src/main/java/org/springframework/security/access/expression/DenyAllPermissionEvaluator.java @@ -38,7 +38,7 @@ public class DenyAllPermissionEvaluator implements PermissionEvaluator { * @return false always */ public boolean hasPermission(Authentication authentication, Object target, Object permission) { - logger.warn( + this.logger.warn( "Denying user " + authentication.getName() + " permission '" + permission + "' on object " + target); return false; } @@ -48,8 +48,8 @@ public class DenyAllPermissionEvaluator implements PermissionEvaluator { */ public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Object permission) { - logger.warn("Denying user " + authentication.getName() + " permission '" + permission + "' on object with Id '" - + targetId); + this.logger.warn("Denying user " + authentication.getName() + " permission '" + permission + + "' on object with Id '" + targetId); return false; } diff --git a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java index 9e37c514cb..c85eda4c92 100644 --- a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java +++ b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java @@ -86,7 +86,7 @@ public abstract class SecurityExpressionRoot implements SecurityExpressionOperat } public final boolean hasAnyRole(String... roles) { - return hasAnyAuthorityName(defaultRolePrefix, roles); + return hasAnyAuthorityName(this.defaultRolePrefix, roles); } private boolean hasAnyAuthorityName(String prefix, String... roles) { @@ -103,7 +103,7 @@ public abstract class SecurityExpressionRoot implements SecurityExpressionOperat } public final Authentication getAuthentication() { - return authentication; + return this.authentication; } public final boolean permitAll() { @@ -115,7 +115,7 @@ public abstract class SecurityExpressionRoot implements SecurityExpressionOperat } public final boolean isAnonymous() { - return trustResolver.isAnonymous(authentication); + return this.trustResolver.isAnonymous(this.authentication); } public final boolean isAuthenticated() { @@ -123,11 +123,12 @@ public abstract class SecurityExpressionRoot implements SecurityExpressionOperat } public final boolean isRememberMe() { - return trustResolver.isRememberMe(authentication); + return this.trustResolver.isRememberMe(this.authentication); } public final boolean isFullyAuthenticated() { - return !trustResolver.isAnonymous(authentication) && !trustResolver.isRememberMe(authentication); + return !this.trustResolver.isAnonymous(this.authentication) + && !this.trustResolver.isRememberMe(this.authentication); } /** @@ -136,7 +137,7 @@ public abstract class SecurityExpressionRoot implements SecurityExpressionOperat * @return */ public Object getPrincipal() { - return authentication.getPrincipal(); + return this.authentication.getPrincipal(); } public void setTrustResolver(AuthenticationTrustResolver trustResolver) { @@ -165,25 +166,26 @@ public abstract class SecurityExpressionRoot implements SecurityExpressionOperat } private Set getAuthoritySet() { - if (roles == null) { - Collection userAuthorities = authentication.getAuthorities(); + if (this.roles == null) { + Collection userAuthorities = this.authentication.getAuthorities(); - if (roleHierarchy != null) { - userAuthorities = roleHierarchy.getReachableGrantedAuthorities(userAuthorities); + if (this.roleHierarchy != null) { + userAuthorities = this.roleHierarchy.getReachableGrantedAuthorities(userAuthorities); } - roles = AuthorityUtils.authorityListToSet(userAuthorities); + this.roles = AuthorityUtils.authorityListToSet(userAuthorities); } - return roles; + return this.roles; } public boolean hasPermission(Object target, Object permission) { - return permissionEvaluator.hasPermission(authentication, target, permission); + return this.permissionEvaluator.hasPermission(this.authentication, target, permission); } public boolean hasPermission(Object targetId, String targetType, Object permission) { - return permissionEvaluator.hasPermission(authentication, (Serializable) targetId, targetType, permission); + return this.permissionEvaluator.hasPermission(this.authentication, (Serializable) targetId, targetType, + permission); } public void setPermissionEvaluator(PermissionEvaluator permissionEvaluator) { diff --git a/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java index 8a5c8ed2d1..17d156fbe2 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java @@ -59,11 +59,11 @@ abstract class AbstractExpressionBasedMethodConfigAttribute implements ConfigAtt } Expression getFilterExpression() { - return filterExpression; + return this.filterExpression; } Expression getAuthorizeExpression() { - return authorizeExpression; + return this.authorizeExpression; } public String getAttribute() { diff --git a/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java index d734e5c48d..e9a2da23ce 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java @@ -101,11 +101,11 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr public Object filter(Object filterTarget, Expression filterExpression, EvaluationContext ctx) { MethodSecurityExpressionOperations rootObject = (MethodSecurityExpressionOperations) ctx.getRootObject() .getValue(); - final boolean debug = logger.isDebugEnabled(); + final boolean debug = this.logger.isDebugEnabled(); List retainList; if (debug) { - logger.debug("Filtering with expression: " + filterExpression.getExpressionString()); + this.logger.debug("Filtering with expression: " + filterExpression.getExpressionString()); } if (filterTarget instanceof Collection) { @@ -113,11 +113,11 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr retainList = new ArrayList(collection.size()); if (debug) { - logger.debug("Filtering collection with " + collection.size() + " elements"); + this.logger.debug("Filtering collection with " + collection.size() + " elements"); } - if (permissionCacheOptimizer != null) { - permissionCacheOptimizer.cachePermissionsFor(rootObject.getAuthentication(), collection); + if (this.permissionCacheOptimizer != null) { + this.permissionCacheOptimizer.cachePermissionsFor(rootObject.getAuthentication(), collection); } for (Object filterObject : (Collection) filterTarget) { @@ -129,7 +129,7 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr } if (debug) { - logger.debug("Retaining elements: " + retainList); + this.logger.debug("Retaining elements: " + retainList); } collection.clear(); @@ -143,11 +143,11 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr retainList = new ArrayList(array.length); if (debug) { - logger.debug("Filtering array with " + array.length + " elements"); + this.logger.debug("Filtering array with " + array.length + " elements"); } - if (permissionCacheOptimizer != null) { - permissionCacheOptimizer.cachePermissionsFor(rootObject.getAuthentication(), Arrays.asList(array)); + if (this.permissionCacheOptimizer != null) { + this.permissionCacheOptimizer.cachePermissionsFor(rootObject.getAuthentication(), Arrays.asList(array)); } for (Object o : array) { @@ -159,7 +159,7 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr } if (debug) { - logger.debug("Retaining elements: " + retainList); + this.logger.debug("Retaining elements: " + retainList); } Object[] filtered = (Object[]) Array.newInstance(filterTarget.getClass().getComponentType(), @@ -176,7 +176,7 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr final Map retainMap = new LinkedHashMap(map.size()); if (debug) { - logger.debug("Filtering map with " + map.size() + " elements"); + this.logger.debug("Filtering map with " + map.size() + " elements"); } for (Map.Entry filterObject : map.entrySet()) { @@ -188,7 +188,7 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr } if (debug) { - logger.debug("Retaining elements: " + retainMap); + this.logger.debug("Retaining elements: " + retainMap); } map.clear(); @@ -225,7 +225,7 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr * @return The current {@link AuthenticationTrustResolver} */ protected AuthenticationTrustResolver getTrustResolver() { - return trustResolver; + return this.trustResolver; } /** @@ -241,7 +241,7 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr * @return The current {@link ParameterNameDiscoverer} */ protected ParameterNameDiscoverer getParameterNameDiscoverer() { - return parameterNameDiscoverer; + return this.parameterNameDiscoverer; } public void setPermissionCacheOptimizer(PermissionCacheOptimizer permissionCacheOptimizer) { @@ -275,7 +275,7 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr * @return The default role prefix */ protected String getDefaultRolePrefix() { - return defaultRolePrefix; + return this.defaultRolePrefix; } } diff --git a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java index e12ea859da..40e0f0c500 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java @@ -86,8 +86,8 @@ public class ExpressionBasedAnnotationAttributeFactory implements PrePostInvocat if (this.parser != null) { return this.parser; } - synchronized (parserLock) { - this.parser = handler.getExpressionParser(); + synchronized (this.parserLock) { + this.parser = this.handler.getExpressionParser(); this.handler = null; } return this.parser; diff --git a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPostInvocationAdvice.java b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPostInvocationAdvice.java index c05f5622c7..d9f049fcb7 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPostInvocationAdvice.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPostInvocationAdvice.java @@ -44,30 +44,30 @@ public class ExpressionBasedPostInvocationAdvice implements PostInvocationAuthor public Object after(Authentication authentication, MethodInvocation mi, PostInvocationAttribute postAttr, Object returnedObject) throws AccessDeniedException { PostInvocationExpressionAttribute pia = (PostInvocationExpressionAttribute) postAttr; - EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication, mi); + EvaluationContext ctx = this.expressionHandler.createEvaluationContext(authentication, mi); Expression postFilter = pia.getFilterExpression(); Expression postAuthorize = pia.getAuthorizeExpression(); if (postFilter != null) { - if (logger.isDebugEnabled()) { - logger.debug("Applying PostFilter expression " + postFilter); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Applying PostFilter expression " + postFilter); } if (returnedObject != null) { - returnedObject = expressionHandler.filter(returnedObject, postFilter, ctx); + returnedObject = this.expressionHandler.filter(returnedObject, postFilter, ctx); } else { - if (logger.isDebugEnabled()) { - logger.debug("Return object is null, filtering will be skipped"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Return object is null, filtering will be skipped"); } } } - expressionHandler.setReturnObject(returnedObject, ctx); + this.expressionHandler.setReturnObject(returnedObject, ctx); if (postAuthorize != null && !ExpressionUtils.evaluateAsBoolean(postAuthorize, ctx)) { - if (logger.isDebugEnabled()) { - logger.debug("PostAuthorize expression rejected access"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("PostAuthorize expression rejected access"); } throw new AccessDeniedException("Access is denied"); } diff --git a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdvice.java b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdvice.java index 056b042593..9a1de85b5b 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdvice.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdvice.java @@ -41,14 +41,14 @@ public class ExpressionBasedPreInvocationAdvice implements PreInvocationAuthoriz public boolean before(Authentication authentication, MethodInvocation mi, PreInvocationAttribute attr) { PreInvocationExpressionAttribute preAttr = (PreInvocationExpressionAttribute) attr; - EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication, mi); + EvaluationContext ctx = this.expressionHandler.createEvaluationContext(authentication, mi); Expression preFilter = preAttr.getFilterExpression(); Expression preAuthorize = preAttr.getAuthorizeExpression(); if (preFilter != null) { Object filterTarget = findFilterTarget(preAttr.getFilterTarget(), ctx, mi); - expressionHandler.filter(filterTarget, preFilter, ctx); + this.expressionHandler.filter(filterTarget, preFilter, ctx); } if (preAuthorize == null) { diff --git a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRoot.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRoot.java index 7c3f52b881..8e78613699 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRoot.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRoot.java @@ -41,7 +41,7 @@ class MethodSecurityExpressionRoot extends SecurityExpressionRoot implements Met } public Object getFilterObject() { - return filterObject; + return this.filterObject; } public void setReturnObject(Object returnObject) { @@ -49,7 +49,7 @@ class MethodSecurityExpressionRoot extends SecurityExpressionRoot implements Met } public Object getReturnObject() { - return returnObject; + return this.returnObject; } /** @@ -63,7 +63,7 @@ class MethodSecurityExpressionRoot extends SecurityExpressionRoot implements Met } public Object getThis() { - return target; + return this.target; } } diff --git a/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java index 950998a785..978bffd88d 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java @@ -48,7 +48,7 @@ class PreInvocationExpressionAttribute extends AbstractExpressionBasedMethodConf * @return the method parameter name */ String getFilterTarget() { - return filterTarget; + return this.filterTarget; } @Override @@ -58,7 +58,7 @@ class PreInvocationExpressionAttribute extends AbstractExpressionBasedMethodConf Expression filter = getFilterExpression(); sb.append("[authorize: '").append(authorize == null ? "null" : authorize.getExpressionString()); sb.append("', filter: '").append(filter == null ? "null" : filter.getExpressionString()); - sb.append("', filterTarget: '").append(filterTarget).append("']"); + sb.append("', filterTarget: '").append(this.filterTarget).append("']"); return sb.toString(); } diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapper.java index 54edf424e8..f78b286041 100644 --- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapper.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapper.java @@ -32,7 +32,7 @@ public class RoleHierarchyAuthoritiesMapper implements GrantedAuthoritiesMapper } public Collection mapAuthorities(Collection authorities) { - return roleHierarchy.getReachableGrantedAuthorities(authorities); + return this.roleHierarchy.getReachableGrantedAuthorities(authorities); } } diff --git a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java index 693542c831..c5780221d4 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java @@ -150,8 +150,9 @@ public abstract class AbstractSecurityInterceptor Collection attributeDefs = this.obtainSecurityMetadataSource().getAllConfigAttributes(); if (attributeDefs == null) { - logger.warn("Could not validate configuration attributes as the SecurityMetadataSource did not return " - + "any attributes from getAllConfigAttributes()"); + this.logger.warn( + "Could not validate configuration attributes as the SecurityMetadataSource did not return " + + "any attributes from getAllConfigAttributes()"); return; } @@ -168,13 +169,13 @@ public abstract class AbstractSecurityInterceptor throw new IllegalArgumentException("Unsupported configuration attributes: " + unsupportedAttrs); } - logger.debug("Validated configuration attributes"); + this.logger.debug("Validated configuration attributes"); } } protected InterceptorStatusToken beforeInvocation(Object object) { Assert.notNull(object, "Object was null"); - final boolean debug = logger.isDebugEnabled(); + final boolean debug = this.logger.isDebugEnabled(); if (!getSecureObjectClass().isAssignableFrom(object.getClass())) { throw new IllegalArgumentException("Security invocation attempted for object " + object.getClass().getName() @@ -185,7 +186,7 @@ public abstract class AbstractSecurityInterceptor Collection attributes = this.obtainSecurityMetadataSource().getAttributes(object); if (attributes == null || attributes.isEmpty()) { - if (rejectPublicInvocations) { + if (this.rejectPublicInvocations) { throw new IllegalArgumentException("Secure object invocation " + object + " was denied as public invocations are not allowed via this interceptor. " + "This indicates a configuration error because the " @@ -193,7 +194,7 @@ public abstract class AbstractSecurityInterceptor } if (debug) { - logger.debug("Public object - authentication not attempted"); + this.logger.debug("Public object - authentication not attempted"); } publishEvent(new PublicInvocationEvent(object)); @@ -202,11 +203,11 @@ public abstract class AbstractSecurityInterceptor } if (debug) { - logger.debug("Secure object: " + object + "; Attributes: " + attributes); + this.logger.debug("Secure object: " + object + "; Attributes: " + attributes); } if (SecurityContextHolder.getContext().getAuthentication() == null) { - credentialsNotFound(messages.getMessage("AbstractSecurityInterceptor.authenticationNotFound", + credentialsNotFound(this.messages.getMessage("AbstractSecurityInterceptor.authenticationNotFound", "An Authentication object was not found in the SecurityContext"), object, attributes); } @@ -223,10 +224,10 @@ public abstract class AbstractSecurityInterceptor } if (debug) { - logger.debug("Authorization successful"); + this.logger.debug("Authorization successful"); } - if (publishAuthorizationSuccess) { + if (this.publishAuthorizationSuccess) { publishEvent(new AuthorizedEvent(object, attributes, authenticated)); } @@ -235,7 +236,7 @@ public abstract class AbstractSecurityInterceptor if (runAs == null) { if (debug) { - logger.debug("RunAsManager did not change Authentication object"); + this.logger.debug("RunAsManager did not change Authentication object"); } // no further work post-invocation @@ -243,7 +244,7 @@ public abstract class AbstractSecurityInterceptor } else { if (debug) { - logger.debug("Switching to RunAs Authentication: " + runAs); + this.logger.debug("Switching to RunAs Authentication: " + runAs); } SecurityContext origCtx = SecurityContextHolder.getContext(); @@ -264,8 +265,9 @@ public abstract class AbstractSecurityInterceptor */ protected void finallyInvocation(InterceptorStatusToken token) { if (token != null && token.isContextHolderRefreshRequired()) { - if (logger.isDebugEnabled()) { - logger.debug("Reverting to original Authentication: " + token.getSecurityContext().getAuthentication()); + if (this.logger.isDebugEnabled()) { + this.logger.debug( + "Reverting to original Authentication: " + token.getSecurityContext().getAuthentication()); } SecurityContextHolder.setContext(token.getSecurityContext()); @@ -289,10 +291,10 @@ public abstract class AbstractSecurityInterceptor finallyInvocation(token); // continue to clean in this method for passivity - if (afterInvocationManager != null) { + if (this.afterInvocationManager != null) { // Attempt after invocation handling try { - returnedObject = afterInvocationManager.decide(token.getSecurityContext().getAuthentication(), + returnedObject = this.afterInvocationManager.decide(token.getSecurityContext().getAuthentication(), token.getSecureObject(), token.getAttributes(), returnedObject); } catch (AccessDeniedException accessDeniedException) { @@ -316,20 +318,20 @@ public abstract class AbstractSecurityInterceptor private Authentication authenticateIfRequired() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication.isAuthenticated() && !alwaysReauthenticate) { - if (logger.isDebugEnabled()) { - logger.debug("Previously Authenticated: " + authentication); + if (authentication.isAuthenticated() && !this.alwaysReauthenticate) { + if (this.logger.isDebugEnabled()) { + this.logger.debug("Previously Authenticated: " + authentication); } return authentication; } - authentication = authenticationManager.authenticate(authentication); + authentication = this.authenticationManager.authenticate(authentication); // We don't authenticated.setAuthentication(true), because each provider should do // that - if (logger.isDebugEnabled()) { - logger.debug("Successfully Authenticated: " + authentication); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Successfully Authenticated: " + authentication); } SecurityContextHolder.getContext().setAuthentication(authentication); @@ -357,11 +359,11 @@ public abstract class AbstractSecurityInterceptor } public AccessDecisionManager getAccessDecisionManager() { - return accessDecisionManager; + return this.accessDecisionManager; } public AfterInvocationManager getAfterInvocationManager() { - return afterInvocationManager; + return this.afterInvocationManager; } public AuthenticationManager getAuthenticationManager() { @@ -369,7 +371,7 @@ public abstract class AbstractSecurityInterceptor } public RunAsManager getRunAsManager() { - return runAsManager; + return this.runAsManager; } /** @@ -381,15 +383,15 @@ public abstract class AbstractSecurityInterceptor public abstract Class getSecureObjectClass(); public boolean isAlwaysReauthenticate() { - return alwaysReauthenticate; + return this.alwaysReauthenticate; } public boolean isRejectPublicInvocations() { - return rejectPublicInvocations; + return this.rejectPublicInvocations; } public boolean isValidateConfigAttributes() { - return validateConfigAttributes; + return this.validateConfigAttributes; } public abstract SecurityMetadataSource obtainSecurityMetadataSource(); diff --git a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java index 05ac387142..f4311b5ac4 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java @@ -67,7 +67,7 @@ public class AfterInvocationProviderManager implements AfterInvocationManager, I Object result = returnedObject; - for (AfterInvocationProvider provider : providers) { + for (AfterInvocationProvider provider : this.providers) { result = provider.decide(authentication, object, config, result); } @@ -80,17 +80,17 @@ public class AfterInvocationProviderManager implements AfterInvocationManager, I public void setProviders(List newList) { checkIfValidList(newList); - providers = new ArrayList<>(newList.size()); + this.providers = new ArrayList<>(newList.size()); for (Object currentObject : newList) { Assert.isInstanceOf(AfterInvocationProvider.class, currentObject, () -> "AfterInvocationProvider " + currentObject.getClass().getName() + " must implement AfterInvocationProvider"); - providers.add((AfterInvocationProvider) currentObject); + this.providers.add((AfterInvocationProvider) currentObject); } } public boolean supports(ConfigAttribute attribute) { - for (AfterInvocationProvider provider : providers) { + for (AfterInvocationProvider provider : this.providers) { if (logger.isDebugEnabled()) { logger.debug("Evaluating " + attribute + " against " + provider); } @@ -115,7 +115,7 @@ public class AfterInvocationProviderManager implements AfterInvocationManager, I * to support the secure object class */ public boolean supports(Class clazz) { - for (AfterInvocationProvider provider : providers) { + for (AfterInvocationProvider provider : this.providers) { if (!provider.supports(clazz)) { return false; } diff --git a/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java b/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java index 0199ed258e..de97aebf60 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java +++ b/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java @@ -49,19 +49,19 @@ public class InterceptorStatusToken { } public Collection getAttributes() { - return attr; + return this.attr; } public SecurityContext getSecurityContext() { - return securityContext; + return this.securityContext; } public Object getSecureObject() { - return secureObject; + return this.secureObject; } public boolean isContextHolderRefreshRequired() { - return contextHolderRefreshRequired; + return this.contextHolderRefreshRequired; } } diff --git a/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java b/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java index 5a39f695c8..ed897c3604 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java +++ b/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java @@ -50,17 +50,17 @@ public class MethodInvocationPrivilegeEvaluator implements InitializingBean { private AbstractSecurityInterceptor securityInterceptor; public void afterPropertiesSet() { - Assert.notNull(securityInterceptor, "SecurityInterceptor required"); + Assert.notNull(this.securityInterceptor, "SecurityInterceptor required"); } public boolean isAllowed(MethodInvocation mi, Authentication authentication) { Assert.notNull(mi, "MethodInvocation required"); Assert.notNull(mi.getMethod(), "MethodInvocation must provide a non-null getMethod()"); - Collection attrs = securityInterceptor.obtainSecurityMetadataSource().getAttributes(mi); + Collection attrs = this.securityInterceptor.obtainSecurityMetadataSource().getAttributes(mi); if (attrs == null) { - if (securityInterceptor.isRejectPublicInvocations()) { + if (this.securityInterceptor.isRejectPublicInvocations()) { return false; } @@ -72,7 +72,7 @@ public class MethodInvocationPrivilegeEvaluator implements InitializingBean { } try { - securityInterceptor.getAccessDecisionManager().decide(authentication, mi, attrs); + this.securityInterceptor.getAccessDecisionManager().decide(authentication, mi, attrs); } catch (AccessDeniedException unauthorized) { if (logger.isDebugEnabled()) { diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java index 7712242d56..9c571ae280 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java @@ -47,23 +47,23 @@ public class RunAsImplAuthenticationProvider implements InitializingBean, Authen private String key; public void afterPropertiesSet() { - Assert.notNull(key, "A Key is required and should match that configured for the RunAsManagerImpl"); + Assert.notNull(this.key, "A Key is required and should match that configured for the RunAsManagerImpl"); } public Authentication authenticate(Authentication authentication) throws AuthenticationException { RunAsUserToken token = (RunAsUserToken) authentication; - if (token.getKeyHash() == key.hashCode()) { + if (token.getKeyHash() == this.key.hashCode()) { return authentication; } else { - throw new BadCredentialsException(messages.getMessage("RunAsImplAuthenticationProvider.incorrectKey", + throw new BadCredentialsException(this.messages.getMessage("RunAsImplAuthenticationProvider.incorrectKey", "The presented RunAsUserToken does not contain the expected key")); } } public String getKey() { - return key; + return this.key; } public void setKey(String key) { diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java index ddb28f4b1f..22b72fd757 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java @@ -60,7 +60,7 @@ public class RunAsManagerImpl implements RunAsManager, InitializingBean { private String rolePrefix = "ROLE_"; public void afterPropertiesSet() { - Assert.notNull(key, + Assert.notNull(this.key, "A Key is required and should match that configured for the RunAsImplAuthenticationProvider"); } @@ -88,11 +88,11 @@ public class RunAsManagerImpl implements RunAsManager, InitializingBean { } public String getKey() { - return key; + return this.key; } public String getRolePrefix() { - return rolePrefix; + return this.rolePrefix; } public void setKey(String key) { diff --git a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java index c38da9055a..cc0872503a 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java @@ -92,17 +92,17 @@ public class MethodSecurityMetadataSourceAdvisor extends AbstractPointcutAdvisor } public Pointcut getPointcut() { - return pointcut; + return this.pointcut; } public Advice getAdvice() { synchronized (this.adviceMonitor) { - if (interceptor == null) { - Assert.notNull(adviceBeanName, "'adviceBeanName' must be set for use with bean factory lookup."); - Assert.state(beanFactory != null, "BeanFactory must be set to resolve 'adviceBeanName'"); - interceptor = beanFactory.getBean(this.adviceBeanName, MethodInterceptor.class); + if (this.interceptor == null) { + Assert.notNull(this.adviceBeanName, "'adviceBeanName' must be set for use with bean factory lookup."); + Assert.state(this.beanFactory != null, "BeanFactory must be set to resolve 'adviceBeanName'"); + this.interceptor = this.beanFactory.getBean(this.adviceBeanName, MethodInterceptor.class); } - return interceptor; + return this.interceptor; } } @@ -112,15 +112,17 @@ public class MethodSecurityMetadataSourceAdvisor extends AbstractPointcutAdvisor private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException { ois.defaultReadObject(); - adviceMonitor = new Object(); - attributeSource = beanFactory.getBean(metadataSourceBeanName, MethodSecurityMetadataSource.class); + this.adviceMonitor = new Object(); + this.attributeSource = this.beanFactory.getBean(this.metadataSourceBeanName, + MethodSecurityMetadataSource.class); } class MethodSecurityMetadataSourcePointcut extends StaticMethodMatcherPointcut implements Serializable { @SuppressWarnings("unchecked") public boolean matches(Method m, Class targetClass) { - Collection attributes = attributeSource.getAttributes(m, targetClass); + Collection attributes = MethodSecurityMetadataSourceAdvisor.this.attributeSource.getAttributes(m, + targetClass); return attributes != null && !attributes.isEmpty(); } diff --git a/core/src/main/java/org/springframework/security/access/intercept/aspectj/MethodInvocationAdapter.java b/core/src/main/java/org/springframework/security/access/intercept/aspectj/MethodInvocationAdapter.java index 5a19ddffaf..a3a84f48fa 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/aspectj/MethodInvocationAdapter.java +++ b/core/src/main/java/org/springframework/security/access/intercept/aspectj/MethodInvocationAdapter.java @@ -41,19 +41,19 @@ public final class MethodInvocationAdapter implements MethodInvocation { MethodInvocationAdapter(JoinPoint jp) { this.jp = (ProceedingJoinPoint) jp; if (jp.getTarget() != null) { - target = jp.getTarget(); + this.target = jp.getTarget(); } else { // SEC-1295: target may be null if an ITD is in use - target = jp.getSignature().getDeclaringType(); + this.target = jp.getSignature().getDeclaringType(); } String targetMethodName = jp.getStaticPart().getSignature().getName(); Class[] types = ((CodeSignature) jp.getStaticPart().getSignature()).getParameterTypes(); Class declaringType = jp.getStaticPart().getSignature().getDeclaringType(); - method = findMethod(targetMethodName, declaringType, types); + this.method = findMethod(targetMethodName, declaringType, types); - if (method == null) { + if (this.method == null) { throw new IllegalArgumentException("Could not obtain target method from JoinPoint: '" + jp + "'"); } } @@ -79,23 +79,23 @@ public final class MethodInvocationAdapter implements MethodInvocation { } public Method getMethod() { - return method; + return this.method; } public Object[] getArguments() { - return jp.getArgs(); + return this.jp.getArgs(); } public AccessibleObject getStaticPart() { - return method; + return this.method; } public Object getThis() { - return target; + return this.target; } public Object proceed() throws Throwable { - return jp.proceed(); + return this.jp.proceed(); } } diff --git a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java index a0173dd043..11306bd964 100644 --- a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java @@ -51,8 +51,8 @@ public final class DelegatingMethodSecurityMetadataSource extends AbstractMethod public Collection getAttributes(Method method, Class targetClass) { DefaultCacheKey cacheKey = new DefaultCacheKey(method, targetClass); - synchronized (attributeCache) { - Collection cached = attributeCache.get(cacheKey); + synchronized (this.attributeCache) { + Collection cached = this.attributeCache.get(cacheKey); // Check for canonical value indicating there is no config attribute, if (cached != null) { @@ -61,7 +61,7 @@ public final class DelegatingMethodSecurityMetadataSource extends AbstractMethod // No cached value, so query the sources to find a result Collection attributes = null; - for (MethodSecurityMetadataSource s : methodSecurityMetadataSources) { + for (MethodSecurityMetadataSource s : this.methodSecurityMetadataSources) { attributes = s.getAttributes(method, targetClass); if (attributes != null && !attributes.isEmpty()) { break; @@ -74,8 +74,8 @@ public final class DelegatingMethodSecurityMetadataSource extends AbstractMethod return NULL_CONFIG_ATTRIBUTE; } - if (logger.isDebugEnabled()) { - logger.debug("Caching method [" + cacheKey + "] with attributes " + attributes); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Caching method [" + cacheKey + "] with attributes " + attributes); } this.attributeCache.put(cacheKey, attributes); @@ -87,7 +87,7 @@ public final class DelegatingMethodSecurityMetadataSource extends AbstractMethod @Override public Collection getAllConfigAttributes() { Set set = new HashSet<>(); - for (MethodSecurityMetadataSource s : methodSecurityMetadataSources) { + for (MethodSecurityMetadataSource s : this.methodSecurityMetadataSources) { Collection attrs = s.getAllConfigAttributes(); if (attrs != null) { set.addAll(attrs); @@ -97,7 +97,7 @@ public final class DelegatingMethodSecurityMetadataSource extends AbstractMethod } public List getMethodSecurityMetadataSources() { - return methodSecurityMetadataSources; + return this.methodSecurityMetadataSources; } private static class DefaultCacheKey { @@ -125,7 +125,8 @@ public final class DelegatingMethodSecurityMetadataSource extends AbstractMethod @Override public String toString() { - return "CacheKey[" + (targetClass == null ? "-" : targetClass.getName()) + "; " + method + "]"; + return "CacheKey[" + (this.targetClass == null ? "-" : this.targetClass.getName()) + "; " + this.method + + "]"; } } diff --git a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java index a501544ed6..5b6c45bd69 100644 --- a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java @@ -89,8 +89,8 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod private List findAttributesSpecifiedAgainst(Method method, Class clazz) { RegisteredMethod registeredMethod = new RegisteredMethod(method, clazz); - if (methodMap.containsKey(registeredMethod)) { - return methodMap.get(registeredMethod); + if (this.methodMap.containsKey(registeredMethod)) { + return this.methodMap.get(registeredMethod); } // Search superclass if (clazz.getSuperclass() != null) { @@ -132,8 +132,8 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod public void addSecureMethod(Class javaType, String mappedName, List attr) { String name = javaType.getName() + '.' + mappedName; - if (logger.isDebugEnabled()) { - logger.debug("Request to add secure method [" + name + "] with attributes [" + attr + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Request to add secure method [" + name + "] with attributes [" + attr + "]"); } Method[] methods = javaType.getMethods(); @@ -158,7 +158,7 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod // no already registered method name, or more specific // method name specification now -> (re-)register method if (regMethodName != null) { - logger.debug("Replacing attributes for secure method [" + method + "]: current name [" + name + this.logger.debug("Replacing attributes for secure method [" + method + "]: current name [" + name + "] is more specific than [" + regMethodName + "]"); } @@ -166,7 +166,7 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod addSecureMethod(registeredMethod, attr); } else { - logger.debug("Keeping attributes for secure method [" + method + "]: current name [" + name + this.logger.debug("Keeping attributes for secure method [" + method + "]: current name [" + name + "] is not more specific than [" + regMethodName + "]"); } } @@ -184,12 +184,13 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod public void addSecureMethod(Class javaType, Method method, List attr) { RegisteredMethod key = new RegisteredMethod(method, javaType); - if (methodMap.containsKey(key)) { - logger.debug("Method [" + method + "] is already registered with attributes [" + methodMap.get(key) + "]"); + if (this.methodMap.containsKey(key)) { + this.logger.debug( + "Method [" + method + "] is already registered with attributes [" + this.methodMap.get(key) + "]"); return; } - methodMap.put(key, attr); + this.methodMap.put(key, attr); } /** @@ -200,8 +201,8 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod private void addSecureMethod(RegisteredMethod method, List attr) { Assert.notNull(method, "RegisteredMethod required"); Assert.notNull(attr, "Configuration attribute required"); - if (logger.isInfoEnabled()) { - logger.info("Adding secure method [" + method + "] with attributes [" + attr + "]"); + if (this.logger.isInfoEnabled()) { + this.logger.info("Adding secure method [" + method + "] with attributes [" + attr + "]"); } this.methodMap.put(method, attr); } @@ -214,7 +215,7 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod public Collection getAllConfigAttributes() { Set allAttributes = new HashSet<>(); - for (List attributeList : methodMap.values()) { + for (List attributeList : this.methodMap.values()) { allAttributes.addAll(attributeList); } @@ -243,7 +244,7 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod * @return map size (for unit tests and diagnostics) */ public int getMethodMapSize() { - return methodMap.size(); + return this.methodMap.size(); } /** @@ -275,19 +276,19 @@ public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethod } if (obj != null && obj instanceof RegisteredMethod) { RegisteredMethod rhs = (RegisteredMethod) obj; - return method.equals(rhs.method) && registeredJavaType.equals(rhs.registeredJavaType); + return this.method.equals(rhs.method) && this.registeredJavaType.equals(rhs.registeredJavaType); } return false; } @Override public int hashCode() { - return method.hashCode() * registeredJavaType.hashCode(); + return this.method.hashCode() * this.registeredJavaType.hashCode(); } @Override public String toString() { - return "RegisteredMethod[" + registeredJavaType.getName() + "; " + method + "]"; + return "RegisteredMethod[" + this.registeredJavaType.getName() + "; " + this.method + "]"; } } diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java b/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java index 3b2f04d843..00a143dd34 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java +++ b/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java @@ -54,7 +54,7 @@ public class PostInvocationAdviceProvider implements AfterInvocationProvider { return returnedObject; } - return postAdvice.after(authentication, (MethodInvocation) object, pia, returnedObject); + return this.postAdvice.after(authentication, (MethodInvocation) object, pia, returnedObject); } private PostInvocationAttribute findPostInvocationAttribute(Collection config) { diff --git a/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoter.java b/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoter.java index b77cfb6e6f..cf5d41dee9 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoter.java +++ b/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoter.java @@ -69,7 +69,7 @@ public class PreInvocationAuthorizationAdviceVoter implements AccessDecisionVote return ACCESS_ABSTAIN; } - boolean allowed = preAdvice.before(authentication, method, preAttr); + boolean allowed = this.preAdvice.before(authentication, method, preAttr); return allowed ? ACCESS_GRANTED : ACCESS_DENIED; } diff --git a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java index d591a7aa73..4aafaaeac6 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java +++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java @@ -64,7 +64,7 @@ public abstract class AbstractAccessDecisionManager protected final void checkAllowIfAllAbstainDecisions() { if (!this.isAllowIfAllAbstainDecisions()) { throw new AccessDeniedException( - messages.getMessage("AbstractAccessDecisionManager.accessDenied", "Access is denied")); + this.messages.getMessage("AbstractAccessDecisionManager.accessDenied", "Access is denied")); } } @@ -73,7 +73,7 @@ public abstract class AbstractAccessDecisionManager } public boolean isAllowIfAllAbstainDecisions() { - return allowIfAllAbstainDecisions; + return this.allowIfAllAbstainDecisions; } public void setAllowIfAllAbstainDecisions(boolean allowIfAllAbstainDecisions) { diff --git a/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java index 480b8dc205..b5ed99bc61 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java @@ -39,17 +39,17 @@ public abstract class AbstractAclVoter implements AccessDecisionVoter getProcessDomainObjectClass() { - return processDomainObjectClass; + return this.processDomainObjectClass; } public void setProcessDomainObjectClass(Class processDomainObjectClass) { diff --git a/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java index 5e58261bae..7031d4c995 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java @@ -58,8 +58,8 @@ public class AffirmativeBased extends AbstractAccessDecisionManager { for (AccessDecisionVoter voter : getDecisionVoters()) { int result = voter.vote(authentication, object, configAttributes); - if (logger.isDebugEnabled()) { - logger.debug("Voter: " + voter + ", returned: " + result); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Voter: " + voter + ", returned: " + result); } switch (result) { @@ -78,7 +78,7 @@ public class AffirmativeBased extends AbstractAccessDecisionManager { if (deny > 0) { throw new AccessDeniedException( - messages.getMessage("AbstractAccessDecisionManager.accessDenied", "Access is denied")); + this.messages.getMessage("AbstractAccessDecisionManager.accessDenied", "Access is denied")); } // To get this far, every AccessDecisionVoter abstained diff --git a/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java b/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java index 7307254fb7..ea30cdc8c6 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java @@ -57,8 +57,8 @@ public class AuthenticatedVoter implements AccessDecisionVoter { private AuthenticationTrustResolver authenticationTrustResolver = new AuthenticationTrustResolverImpl(); private boolean isFullyAuthenticated(Authentication authentication) { - return (!authenticationTrustResolver.isAnonymous(authentication) - && !authenticationTrustResolver.isRememberMe(authentication)); + return (!this.authenticationTrustResolver.isAnonymous(authentication) + && !this.authenticationTrustResolver.isRememberMe(authentication)); } public void setAuthenticationTrustResolver(AuthenticationTrustResolver authenticationTrustResolver) { @@ -101,15 +101,16 @@ public class AuthenticatedVoter implements AccessDecisionVoter { } if (IS_AUTHENTICATED_REMEMBERED.equals(attribute.getAttribute())) { - if (authenticationTrustResolver.isRememberMe(authentication) + if (this.authenticationTrustResolver.isRememberMe(authentication) || isFullyAuthenticated(authentication)) { return ACCESS_GRANTED; } } if (IS_AUTHENTICATED_ANONYMOUSLY.equals(attribute.getAttribute())) { - if (authenticationTrustResolver.isAnonymous(authentication) || isFullyAuthenticated(authentication) - || authenticationTrustResolver.isRememberMe(authentication)) { + if (this.authenticationTrustResolver.isAnonymous(authentication) + || isFullyAuthenticated(authentication) + || this.authenticationTrustResolver.isRememberMe(authentication)) { return ACCESS_GRANTED; } } diff --git a/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java index a060200f70..80c0098f25 100644 --- a/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java @@ -66,8 +66,8 @@ public class ConsensusBased extends AbstractAccessDecisionManager { for (AccessDecisionVoter voter : getDecisionVoters()) { int result = voter.vote(authentication, object, configAttributes); - if (logger.isDebugEnabled()) { - logger.debug("Voter: " + voter + ", returned: " + result); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Voter: " + voter + ", returned: " + result); } switch (result) { @@ -92,7 +92,7 @@ public class ConsensusBased extends AbstractAccessDecisionManager { if (deny > grant) { throw new AccessDeniedException( - messages.getMessage("AbstractAccessDecisionManager.accessDenied", "Access is denied")); + this.messages.getMessage("AbstractAccessDecisionManager.accessDenied", "Access is denied")); } if ((grant == deny) && (grant != 0)) { @@ -101,7 +101,7 @@ public class ConsensusBased extends AbstractAccessDecisionManager { } else { throw new AccessDeniedException( - messages.getMessage("AbstractAccessDecisionManager.accessDenied", "Access is denied")); + this.messages.getMessage("AbstractAccessDecisionManager.accessDenied", "Access is denied")); } } @@ -110,7 +110,7 @@ public class ConsensusBased extends AbstractAccessDecisionManager { } public boolean isAllowIfEqualGrantedDeniedDecisions() { - return allowIfEqualGrantedDeniedDecisions; + return this.allowIfEqualGrantedDeniedDecisions; } public void setAllowIfEqualGrantedDeniedDecisions(boolean allowIfEqualGrantedDeniedDecisions) { diff --git a/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java b/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java index 88da1dc1bd..9da2fff2d5 100644 --- a/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java @@ -43,7 +43,7 @@ public class RoleHierarchyVoter extends RoleVoter { */ @Override Collection extractAuthorities(Authentication authentication) { - return roleHierarchy.getReachableGrantedAuthorities(authentication.getAuthorities()); + return this.roleHierarchy.getReachableGrantedAuthorities(authentication.getAuthorities()); } } diff --git a/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java index 4f2d4a6ae0..b087c5784a 100644 --- a/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java +++ b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java @@ -54,7 +54,7 @@ public class RoleVoter implements AccessDecisionVoter { private String rolePrefix = "ROLE_"; public String getRolePrefix() { - return rolePrefix; + return this.rolePrefix; } /** diff --git a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java index ad6c9a6e6a..ae5a1b0b4a 100644 --- a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java @@ -69,8 +69,8 @@ public class UnanimousBased extends AbstractAccessDecisionManager { for (AccessDecisionVoter voter : getDecisionVoters()) { int result = voter.vote(authentication, object, singleAttributeList); - if (logger.isDebugEnabled()) { - logger.debug("Voter: " + voter + ", returned: " + result); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Voter: " + voter + ", returned: " + result); } switch (result) { @@ -81,7 +81,7 @@ public class UnanimousBased extends AbstractAccessDecisionManager { case AccessDecisionVoter.ACCESS_DENIED: throw new AccessDeniedException( - messages.getMessage("AbstractAccessDecisionManager.accessDenied", "Access is denied")); + this.messages.getMessage("AbstractAccessDecisionManager.accessDenied", "Access is denied")); default: break; diff --git a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java index 8df8fc9fd2..80146f6b27 100644 --- a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java @@ -66,7 +66,7 @@ public abstract class AbstractAuthenticationToken implements Authentication, Cre } public Collection getAuthorities() { - return authorities; + return this.authorities; } public String getName() { @@ -84,7 +84,7 @@ public abstract class AbstractAuthenticationToken implements Authentication, Cre } public boolean isAuthenticated() { - return authenticated; + return this.authenticated; } public void setAuthenticated(boolean authenticated) { @@ -92,7 +92,7 @@ public abstract class AbstractAuthenticationToken implements Authentication, Cre } public Object getDetails() { - return details; + return this.details; } public void setDetails(Object details) { @@ -107,7 +107,7 @@ public abstract class AbstractAuthenticationToken implements Authentication, Cre public void eraseCredentials() { eraseSecret(getCredentials()); eraseSecret(getPrincipal()); - eraseSecret(details); + eraseSecret(this.details); } private void eraseSecret(Object secret) { @@ -124,7 +124,7 @@ public abstract class AbstractAuthenticationToken implements Authentication, Cre AbstractAuthenticationToken test = (AbstractAuthenticationToken) obj; - if (!authorities.equals(test.authorities)) { + if (!this.authorities.equals(test.authorities)) { return false; } @@ -163,7 +163,7 @@ public abstract class AbstractAuthenticationToken implements Authentication, Cre public int hashCode() { int code = 31; - for (GrantedAuthority authority : authorities) { + for (GrantedAuthority authority : this.authorities) { code ^= authority.hashCode(); } @@ -195,11 +195,11 @@ public abstract class AbstractAuthenticationToken implements Authentication, Cre sb.append("Authenticated: ").append(this.isAuthenticated()).append("; "); sb.append("Details: ").append(this.getDetails()).append("; "); - if (!authorities.isEmpty()) { + if (!this.authorities.isEmpty()) { sb.append("Granted Authorities: "); int i = 0; - for (GrantedAuthority authority : authorities) { + for (GrantedAuthority authority : this.authorities) { if (i++ > 0) { sb.append(", "); } diff --git a/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java index 7351278502..b936c38b28 100644 --- a/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java @@ -59,21 +59,21 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement private UserDetailsChecker preAuthenticationChecks = user -> { if (!user.isAccountNonLocked()) { - logger.debug("User account is locked"); + this.logger.debug("User account is locked"); throw new LockedException(this.messages.getMessage("AbstractUserDetailsAuthenticationProvider.locked", "User account is locked")); } if (!user.isEnabled()) { - logger.debug("User account is disabled"); + this.logger.debug("User account is disabled"); throw new DisabledException( this.messages.getMessage("AbstractUserDetailsAuthenticationProvider.disabled", "User is disabled")); } if (!user.isAccountNonExpired()) { - logger.debug("User account is expired"); + this.logger.debug("User account is expired"); throw new AccountExpiredException(this.messages .getMessage("AbstractUserDetailsAuthenticationProvider.expired", "User account has expired")); @@ -82,7 +82,7 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement private UserDetailsChecker postAuthenticationChecks = user -> { if (!user.isCredentialsNonExpired()) { - logger.debug("User account credentials have expired"); + this.logger.debug("User account credentials have expired"); throw new CredentialsExpiredException(this.messages.getMessage( "AbstractUserDetailsAuthenticationProvider.credentialsExpired", "User credentials have expired")); diff --git a/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java b/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java index f8b0015531..1acd873244 100644 --- a/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java +++ b/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java @@ -33,21 +33,21 @@ public class AccountStatusUserDetailsChecker implements UserDetailsChecker, Mess public void check(UserDetails user) { if (!user.isAccountNonLocked()) { throw new LockedException( - messages.getMessage("AccountStatusUserDetailsChecker.locked", "User account is locked")); + this.messages.getMessage("AccountStatusUserDetailsChecker.locked", "User account is locked")); } if (!user.isEnabled()) { throw new DisabledException( - messages.getMessage("AccountStatusUserDetailsChecker.disabled", "User is disabled")); + this.messages.getMessage("AccountStatusUserDetailsChecker.disabled", "User is disabled")); } if (!user.isAccountNonExpired()) { throw new AccountExpiredException( - messages.getMessage("AccountStatusUserDetailsChecker.expired", "User account has expired")); + this.messages.getMessage("AccountStatusUserDetailsChecker.expired", "User account has expired")); } if (!user.isCredentialsNonExpired()) { - throw new CredentialsExpiredException(messages + throw new CredentialsExpiredException(this.messages .getMessage("AccountStatusUserDetailsChecker.credentialsExpired", "User credentials have expired")); } } diff --git a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java index 6643dc6695..098e061f95 100644 --- a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java @@ -50,7 +50,7 @@ public class AnonymousAuthenticationProvider implements AuthenticationProvider, } if (this.key.hashCode() != ((AnonymousAuthenticationToken) authentication).getKeyHash()) { - throw new BadCredentialsException(messages.getMessage("AnonymousAuthenticationProvider.incorrectKey", + throw new BadCredentialsException(this.messages.getMessage("AnonymousAuthenticationProvider.incorrectKey", "The presented AnonymousAuthenticationToken does not contain the expected key")); } @@ -58,7 +58,7 @@ public class AnonymousAuthenticationProvider implements AuthenticationProvider, } public String getKey() { - return key; + return this.key; } public void setMessageSource(MessageSource messageSource) { diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java index ae20478bb3..019207b4a5 100644 --- a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java +++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java @@ -36,27 +36,27 @@ public class AuthenticationTrustResolverImpl implements AuthenticationTrustResol private Class rememberMeClass = RememberMeAuthenticationToken.class; Class getAnonymousClass() { - return anonymousClass; + return this.anonymousClass; } Class getRememberMeClass() { - return rememberMeClass; + return this.rememberMeClass; } public boolean isAnonymous(Authentication authentication) { - if ((anonymousClass == null) || (authentication == null)) { + if ((this.anonymousClass == null) || (authentication == null)) { return false; } - return anonymousClass.isAssignableFrom(authentication.getClass()); + return this.anonymousClass.isAssignableFrom(authentication.getClass()); } public boolean isRememberMe(Authentication authentication) { - if ((rememberMeClass == null) || (authentication == null)) { + if ((this.rememberMeClass == null) || (authentication == null)) { return false; } - return rememberMeClass.isAssignableFrom(authentication.getClass()); + return this.rememberMeClass.isAssignableFrom(authentication.getClass()); } public void setAnonymousClass(Class anonymousClass) { diff --git a/core/src/main/java/org/springframework/security/authentication/CachingUserDetailsService.java b/core/src/main/java/org/springframework/security/authentication/CachingUserDetailsService.java index aaefaa570f..c87424f900 100644 --- a/core/src/main/java/org/springframework/security/authentication/CachingUserDetailsService.java +++ b/core/src/main/java/org/springframework/security/authentication/CachingUserDetailsService.java @@ -36,7 +36,7 @@ public class CachingUserDetailsService implements UserDetailsService { } public UserCache getUserCache() { - return userCache; + return this.userCache; } public void setUserCache(UserCache userCache) { @@ -44,16 +44,16 @@ public class CachingUserDetailsService implements UserDetailsService { } public UserDetails loadUserByUsername(String username) { - UserDetails user = userCache.getUserFromCache(username); + UserDetails user = this.userCache.getUserFromCache(username); if (user == null) { - user = delegate.loadUserByUsername(username); + user = this.delegate.loadUserByUsername(username); } - Assert.notNull(user, () -> "UserDetailsService " + delegate + " returned null for username " + username + ". " - + "This is an interface contract violation"); + Assert.notNull(user, () -> "UserDetailsService " + this.delegate + " returned null for username " + username + + ". " + "This is an interface contract violation"); - userCache.putUserInCache(user); + this.userCache.putUserInCache(user); return user; } diff --git a/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java b/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java index 10619ceebb..8871f82af2 100644 --- a/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java +++ b/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java @@ -94,8 +94,8 @@ public class DefaultAuthenticationEventPublisher } public void publishAuthenticationSuccess(Authentication authentication) { - if (applicationEventPublisher != null) { - applicationEventPublisher.publishEvent(new AuthenticationSuccessEvent(authentication)); + if (this.applicationEventPublisher != null) { + this.applicationEventPublisher.publishEvent(new AuthenticationSuccessEvent(authentication)); } } @@ -112,13 +112,13 @@ public class DefaultAuthenticationEventPublisher } if (event != null) { - if (applicationEventPublisher != null) { - applicationEventPublisher.publishEvent(event); + if (this.applicationEventPublisher != null) { + this.applicationEventPublisher.publishEvent(event); } } else { - if (logger.isDebugEnabled()) { - logger.debug("No event was found for the exception " + exception.getClass().getName()); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No event was found for the exception " + exception.getClass().getName()); } } } @@ -201,7 +201,7 @@ public class DefaultAuthenticationEventPublisher try { Constructor constructor = eventClass .getConstructor(Authentication.class, AuthenticationException.class); - exceptionMappings.put(exceptionClass, constructor); + this.exceptionMappings.put(exceptionClass, constructor); } catch (NoSuchMethodException e) { throw new RuntimeException( diff --git a/core/src/main/java/org/springframework/security/authentication/ProviderManager.java b/core/src/main/java/org/springframework/security/authentication/ProviderManager.java index 5a84c15b0a..bb0c7192a6 100644 --- a/core/src/main/java/org/springframework/security/authentication/ProviderManager.java +++ b/core/src/main/java/org/springframework/security/authentication/ProviderManager.java @@ -132,11 +132,11 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar } private void checkState() { - if (parent == null && providers.isEmpty()) { + if (this.parent == null && this.providers.isEmpty()) { throw new IllegalArgumentException( "A parent AuthenticationManager or a list " + "of AuthenticationProviders is required"); } - else if (CollectionUtils.contains(providers.iterator(), null)) { + else if (CollectionUtils.contains(this.providers.iterator(), null)) { throw new IllegalArgumentException("providers list cannot contain null values"); } } @@ -197,10 +197,10 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar } } - if (result == null && parent != null) { + if (result == null && this.parent != null) { // Allow the parent to try. try { - result = parentResult = parent.authenticate(authentication); + result = parentResult = this.parent.authenticate(authentication); } catch (ProviderNotFoundException e) { // ignore as we will throw below if no other exception occurred prior to @@ -214,7 +214,7 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar } if (result != null) { - if (eraseCredentialsAfterAuthentication && (result instanceof CredentialsContainer)) { + if (this.eraseCredentialsAfterAuthentication && (result instanceof CredentialsContainer)) { // Authentication is complete. Remove credentials and other secret data // from authentication ((CredentialsContainer) result).eraseCredentials(); @@ -225,7 +225,7 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar // This check prevents a duplicate AuthenticationSuccessEvent if the parent // AuthenticationManager already published it if (parentResult == null) { - eventPublisher.publishAuthenticationSuccess(result); + this.eventPublisher.publishAuthenticationSuccess(result); } return result; } @@ -233,7 +233,7 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar // Parent was null, or didn't authenticate (or throw an exception). if (lastException == null) { - lastException = new ProviderNotFoundException(messages.getMessage("ProviderManager.providerNotFound", + lastException = new ProviderNotFoundException(this.messages.getMessage("ProviderManager.providerNotFound", new Object[] { toTest.getName() }, "No AuthenticationProvider found for {0}")); } @@ -250,7 +250,7 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar @SuppressWarnings("deprecation") private void prepareException(AuthenticationException ex, Authentication auth) { - eventPublisher.publishAuthenticationFailure(ex, auth); + this.eventPublisher.publishAuthenticationFailure(ex, auth); } /** @@ -268,7 +268,7 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar } public List getProviders() { - return providers; + return this.providers; } public void setMessageSource(MessageSource messageSource) { @@ -293,7 +293,7 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar } public boolean isEraseCredentialsAfterAuthentication() { - return eraseCredentialsAfterAuthentication; + return this.eraseCredentialsAfterAuthentication; } private static final class NullEventPublisher implements AuthenticationEventPublisher { diff --git a/core/src/main/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapter.java b/core/src/main/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapter.java index 88bec60958..ddbe07a111 100644 --- a/core/src/main/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapter.java +++ b/core/src/main/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapter.java @@ -48,7 +48,7 @@ public class ReactiveAuthenticationManagerAdapter implements ReactiveAuthenticat public Mono authenticate(Authentication token) { return Mono.just(token).publishOn(this.scheduler).flatMap(t -> { try { - return Mono.just(authenticationManager.authenticate(t)); + return Mono.just(this.authenticationManager.authenticate(t)); } catch (Throwable error) { return Mono.error(error); diff --git a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java index 552232bddb..5c792ccafd 100644 --- a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java @@ -53,7 +53,7 @@ public class RememberMeAuthenticationProvider implements AuthenticationProvider, } if (this.key.hashCode() != ((RememberMeAuthenticationToken) authentication).getKeyHash()) { - throw new BadCredentialsException(messages.getMessage("RememberMeAuthenticationProvider.incorrectKey", + throw new BadCredentialsException(this.messages.getMessage("RememberMeAuthenticationProvider.incorrectKey", "The presented RememberMeAuthenticationToken does not contain the expected key")); } @@ -61,7 +61,7 @@ public class RememberMeAuthenticationProvider implements AuthenticationProvider, } public String getKey() { - return key; + return this.key; } public void setMessageSource(MessageSource messageSource) { diff --git a/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java index 4dbb5778fe..e293aa67cd 100644 --- a/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java @@ -90,7 +90,7 @@ public class UsernamePasswordAuthenticationToken extends AbstractAuthenticationT @Override public void eraseCredentials() { super.eraseCredentials(); - credentials = null; + this.credentials = null; } } diff --git a/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java index 36ed0cd429..9bbe5a32ef 100644 --- a/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java @@ -120,7 +120,7 @@ public abstract class AbstractUserDetailsAuthenticationProvider public Authentication authenticate(Authentication authentication) throws AuthenticationException { Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication, - () -> messages.getMessage("AbstractUserDetailsAuthenticationProvider.onlySupports", + () -> this.messages.getMessage("AbstractUserDetailsAuthenticationProvider.onlySupports", "Only UsernamePasswordAuthenticationToken is supported")); // Determine username @@ -136,10 +136,10 @@ public abstract class AbstractUserDetailsAuthenticationProvider user = retrieveUser(username, (UsernamePasswordAuthenticationToken) authentication); } catch (UsernameNotFoundException notFound) { - logger.debug("User '" + username + "' not found"); + this.logger.debug("User '" + username + "' not found"); - if (hideUserNotFoundExceptions) { - throw new BadCredentialsException(messages + if (this.hideUserNotFoundExceptions) { + throw new BadCredentialsException(this.messages .getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials")); } else { @@ -151,7 +151,7 @@ public abstract class AbstractUserDetailsAuthenticationProvider } try { - preAuthenticationChecks.check(user); + this.preAuthenticationChecks.check(user); additionalAuthenticationChecks(user, (UsernamePasswordAuthenticationToken) authentication); } catch (AuthenticationException exception) { @@ -160,7 +160,7 @@ public abstract class AbstractUserDetailsAuthenticationProvider // we're using latest data (i.e. not from the cache) cacheWasUsed = false; user = retrieveUser(username, (UsernamePasswordAuthenticationToken) authentication); - preAuthenticationChecks.check(user); + this.preAuthenticationChecks.check(user); additionalAuthenticationChecks(user, (UsernamePasswordAuthenticationToken) authentication); } else { @@ -168,7 +168,7 @@ public abstract class AbstractUserDetailsAuthenticationProvider } } - postAuthenticationChecks.check(user); + this.postAuthenticationChecks.check(user); if (!cacheWasUsed) { this.userCache.putUserInCache(user); @@ -176,7 +176,7 @@ public abstract class AbstractUserDetailsAuthenticationProvider Object principalToReturn = user; - if (forcePrincipalAsString) { + if (this.forcePrincipalAsString) { principalToReturn = user.getUsername(); } @@ -205,7 +205,7 @@ public abstract class AbstractUserDetailsAuthenticationProvider // Also ensure we return the original getDetails(), so that future // authentication events after cache expiry contain the details UsernamePasswordAuthenticationToken result = new UsernamePasswordAuthenticationToken(principal, - authentication.getCredentials(), authoritiesMapper.mapAuthorities(user.getAuthorities())); + authentication.getCredentials(), this.authoritiesMapper.mapAuthorities(user.getAuthorities())); result.setDetails(authentication.getDetails()); return result; @@ -215,15 +215,15 @@ public abstract class AbstractUserDetailsAuthenticationProvider } public UserCache getUserCache() { - return userCache; + return this.userCache; } public boolean isForcePrincipalAsString() { - return forcePrincipalAsString; + return this.forcePrincipalAsString; } public boolean isHideUserNotFoundExceptions() { - return hideUserNotFoundExceptions; + return this.hideUserNotFoundExceptions; } /** @@ -299,7 +299,7 @@ public abstract class AbstractUserDetailsAuthenticationProvider } protected UserDetailsChecker getPreAuthenticationChecks() { - return preAuthenticationChecks; + return this.preAuthenticationChecks; } /** @@ -312,7 +312,7 @@ public abstract class AbstractUserDetailsAuthenticationProvider } protected UserDetailsChecker getPostAuthenticationChecks() { - return postAuthenticationChecks; + return this.postAuthenticationChecks; } public void setPostAuthenticationChecks(UserDetailsChecker postAuthenticationChecks) { @@ -327,23 +327,23 @@ public abstract class AbstractUserDetailsAuthenticationProvider public void check(UserDetails user) { if (!user.isAccountNonLocked()) { - logger.debug("User account is locked"); + AbstractUserDetailsAuthenticationProvider.this.logger.debug("User account is locked"); - throw new LockedException(messages.getMessage("AbstractUserDetailsAuthenticationProvider.locked", - "User account is locked")); + throw new LockedException(AbstractUserDetailsAuthenticationProvider.this.messages + .getMessage("AbstractUserDetailsAuthenticationProvider.locked", "User account is locked")); } if (!user.isEnabled()) { - logger.debug("User account is disabled"); + AbstractUserDetailsAuthenticationProvider.this.logger.debug("User account is disabled"); - throw new DisabledException( - messages.getMessage("AbstractUserDetailsAuthenticationProvider.disabled", "User is disabled")); + throw new DisabledException(AbstractUserDetailsAuthenticationProvider.this.messages + .getMessage("AbstractUserDetailsAuthenticationProvider.disabled", "User is disabled")); } if (!user.isAccountNonExpired()) { - logger.debug("User account is expired"); + AbstractUserDetailsAuthenticationProvider.this.logger.debug("User account is expired"); - throw new AccountExpiredException(messages + throw new AccountExpiredException(AbstractUserDetailsAuthenticationProvider.this.messages .getMessage("AbstractUserDetailsAuthenticationProvider.expired", "User account has expired")); } } @@ -354,10 +354,10 @@ public abstract class AbstractUserDetailsAuthenticationProvider public void check(UserDetails user) { if (!user.isCredentialsNonExpired()) { - logger.debug("User account credentials have expired"); + AbstractUserDetailsAuthenticationProvider.this.logger.debug("User account credentials have expired"); - throw new CredentialsExpiredException( - messages.getMessage("AbstractUserDetailsAuthenticationProvider.credentialsExpired", + throw new CredentialsExpiredException(AbstractUserDetailsAuthenticationProvider.this.messages + .getMessage("AbstractUserDetailsAuthenticationProvider.credentialsExpired", "User credentials have expired")); } } diff --git a/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java index 4fc4a67168..691050d60f 100644 --- a/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java @@ -67,19 +67,19 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException { if (authentication.getCredentials() == null) { - logger.debug("Authentication failed: no credentials provided"); + this.logger.debug("Authentication failed: no credentials provided"); - throw new BadCredentialsException( - messages.getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials")); + throw new BadCredentialsException(this.messages + .getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials")); } String presentedPassword = authentication.getCredentials().toString(); - if (!passwordEncoder.matches(presentedPassword, userDetails.getPassword())) { - logger.debug("Authentication failed: password does not match stored value"); + if (!this.passwordEncoder.matches(presentedPassword, userDetails.getPassword())) { + this.logger.debug("Authentication failed: password does not match stored value"); - throw new BadCredentialsException( - messages.getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials")); + throw new BadCredentialsException(this.messages + .getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials")); } } @@ -150,7 +150,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication } protected PasswordEncoder getPasswordEncoder() { - return passwordEncoder; + return this.passwordEncoder; } public void setUserDetailsService(UserDetailsService userDetailsService) { @@ -158,7 +158,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication } protected UserDetailsService getUserDetailsService() { - return userDetailsService; + return this.userDetailsService; } public void setUserDetailsPasswordService(UserDetailsPasswordService userDetailsPasswordService) { diff --git a/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java index b1cb398631..0f06d0b94c 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java @@ -36,7 +36,7 @@ public abstract class AbstractAuthenticationFailureEvent extends AbstractAuthent } public AuthenticationException getException() { - return exception; + return this.exception; } } diff --git a/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java index 6388b4b752..c93d2a9165 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java @@ -48,7 +48,7 @@ public class InteractiveAuthenticationSuccessEvent extends AbstractAuthenticatio * @return the class */ public Class getGeneratedBy() { - return generatedBy; + return this.generatedBy; } } diff --git a/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java b/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java index 16ef4430f4..57c69c66fb 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java +++ b/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java @@ -40,7 +40,7 @@ public class LoggerListener implements ApplicationListener authorities = remoteAuthenticationManager.attemptAuthentication(username, - password); + Collection authorities = this.remoteAuthenticationManager + .attemptAuthentication(username, password); return new UsernamePasswordAuthenticationToken(username, password, authorities); } public RemoteAuthenticationManager getRemoteAuthenticationManager() { - return remoteAuthenticationManager; + return this.remoteAuthenticationManager; } public void setRemoteAuthenticationManager(RemoteAuthenticationManager remoteAuthenticationManager) { diff --git a/core/src/main/java/org/springframework/security/authorization/AuthorizationDecision.java b/core/src/main/java/org/springframework/security/authorization/AuthorizationDecision.java index 2ad6b7cf33..026d5afdbc 100644 --- a/core/src/main/java/org/springframework/security/authorization/AuthorizationDecision.java +++ b/core/src/main/java/org/springframework/security/authorization/AuthorizationDecision.java @@ -29,7 +29,7 @@ public class AuthorizationDecision { } public boolean isGranted() { - return granted; + return this.granted; } } diff --git a/core/src/main/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextSupport.java b/core/src/main/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextSupport.java index ea3d40857c..995d5a3789 100644 --- a/core/src/main/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextSupport.java +++ b/core/src/main/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextSupport.java @@ -44,11 +44,11 @@ abstract class AbstractDelegatingSecurityContextSupport { } protected final Runnable wrap(Runnable delegate) { - return DelegatingSecurityContextRunnable.create(delegate, securityContext); + return DelegatingSecurityContextRunnable.create(delegate, this.securityContext); } protected final Callable wrap(Callable delegate) { - return DelegatingSecurityContextCallable.create(delegate, securityContext); + return DelegatingSecurityContextCallable.create(delegate, this.securityContext); } } diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java index 9b4934feb6..f545c99a51 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java @@ -80,16 +80,16 @@ public final class DelegatingSecurityContextCallable implements Callable { this.originalSecurityContext = SecurityContextHolder.getContext(); try { - SecurityContextHolder.setContext(delegateSecurityContext); - return delegate.call(); + SecurityContextHolder.setContext(this.delegateSecurityContext); + return this.delegate.call(); } finally { SecurityContext emptyContext = SecurityContextHolder.createEmptyContext(); - if (emptyContext.equals(originalSecurityContext)) { + if (emptyContext.equals(this.originalSecurityContext)) { SecurityContextHolder.clearContext(); } else { - SecurityContextHolder.setContext(originalSecurityContext); + SecurityContextHolder.setContext(this.originalSecurityContext); } this.originalSecurityContext = null; } @@ -97,7 +97,7 @@ public final class DelegatingSecurityContextCallable implements Callable { @Override public String toString() { - return delegate.toString(); + return this.delegate.toString(); } /** diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutor.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutor.java index 9e55733767..967edc6281 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutor.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutor.java @@ -58,11 +58,11 @@ public class DelegatingSecurityContextExecutor extends AbstractDelegatingSecurit public final void execute(Runnable task) { task = wrap(task); - delegate.execute(task); + this.delegate.execute(task); } protected final Executor getDelegateExecutor() { - return delegate; + return this.delegate; } } \ No newline at end of file diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java index e4cbd752f6..6dcf5874c5 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java @@ -78,16 +78,16 @@ public final class DelegatingSecurityContextRunnable implements Runnable { this.originalSecurityContext = SecurityContextHolder.getContext(); try { - SecurityContextHolder.setContext(delegateSecurityContext); - delegate.run(); + SecurityContextHolder.setContext(this.delegateSecurityContext); + this.delegate.run(); } finally { SecurityContext emptyContext = SecurityContextHolder.createEmptyContext(); - if (emptyContext.equals(originalSecurityContext)) { + if (emptyContext.equals(this.originalSecurityContext)) { SecurityContextHolder.clearContext(); } else { - SecurityContextHolder.setContext(originalSecurityContext); + SecurityContextHolder.setContext(this.originalSecurityContext); } this.originalSecurityContext = null; } @@ -95,7 +95,7 @@ public final class DelegatingSecurityContextRunnable implements Runnable { @Override public String toString() { - return delegate.toString(); + return this.delegate.toString(); } /** diff --git a/core/src/main/java/org/springframework/security/context/DelegatingApplicationListener.java b/core/src/main/java/org/springframework/security/context/DelegatingApplicationListener.java index ddf216a9bb..89dd8982bd 100644 --- a/core/src/main/java/org/springframework/security/context/DelegatingApplicationListener.java +++ b/core/src/main/java/org/springframework/security/context/DelegatingApplicationListener.java @@ -38,7 +38,7 @@ public final class DelegatingApplicationListener implements ApplicationListener< if (event == null) { return; } - for (SmartApplicationListener listener : listeners) { + for (SmartApplicationListener listener : this.listeners) { Object source = event.getSource(); if (source != null && listener.supportsEventType(event.getClass()) && listener.supportsSourceType(source.getClass())) { @@ -54,7 +54,7 @@ public final class DelegatingApplicationListener implements ApplicationListener< */ public void addListener(SmartApplicationListener smartApplicationListener) { Assert.notNull(smartApplicationListener, "smartApplicationListener cannot be null"); - listeners.add(smartApplicationListener); + this.listeners.add(smartApplicationListener); } } diff --git a/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java b/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java index e2081c0af4..e57784c75c 100644 --- a/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java +++ b/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java @@ -41,7 +41,7 @@ public final class SimpleGrantedAuthority implements GrantedAuthority { @Override public String getAuthority() { - return role; + return this.role; } @Override @@ -51,7 +51,7 @@ public final class SimpleGrantedAuthority implements GrantedAuthority { } if (obj instanceof SimpleGrantedAuthority) { - return role.equals(((SimpleGrantedAuthority) obj).role); + return this.role.equals(((SimpleGrantedAuthority) obj).role); } return false; diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java index 22641c5618..1d02d0ad9c 100755 --- a/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java +++ b/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java @@ -48,7 +48,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper private Set mappableAttributes = null; public void afterPropertiesSet() { - Assert.notNull(attributes2grantedAuthoritiesMap, "attributes2grantedAuthoritiesMap must be set"); + Assert.notNull(this.attributes2grantedAuthoritiesMap, "attributes2grantedAuthoritiesMap must be set"); } /** @@ -57,7 +57,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper public List getGrantedAuthorities(Collection attributes) { ArrayList gaList = new ArrayList<>(); for (String attribute : attributes) { - Collection c = attributes2grantedAuthoritiesMap.get(attribute); + Collection c = this.attributes2grantedAuthoritiesMap.get(attribute); if (c != null) { gaList.addAll(c); } @@ -71,7 +71,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper * @return Returns the attributes2grantedAuthoritiesMap. */ public Map> getAttributes2grantedAuthoritiesMap() { - return attributes2grantedAuthoritiesMap; + return this.attributes2grantedAuthoritiesMap; } /** @@ -83,7 +83,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper "A non-empty attributes2grantedAuthoritiesMap must be supplied"); this.attributes2grantedAuthoritiesMap = preProcessMap(attributes2grantedAuthoritiesMap); - mappableAttributes = Collections.unmodifiableSet(this.attributes2grantedAuthoritiesMap.keySet()); + this.mappableAttributes = Collections.unmodifiableSet(this.attributes2grantedAuthoritiesMap.keySet()); } /** @@ -153,7 +153,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper } private void addGrantedAuthorityCollection(Collection result, String value) { - StringTokenizer st = new StringTokenizer(value, stringSeparator, false); + StringTokenizer st = new StringTokenizer(value, this.stringSeparator, false); while (st.hasMoreTokens()) { String nextToken = st.nextToken(); if (StringUtils.hasText(nextToken)) { @@ -167,14 +167,14 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper * @see org.springframework.security.core.authority.mapping.MappableAttributesRetriever#getMappableAttributes() */ public Set getMappableAttributes() { - return mappableAttributes; + return this.mappableAttributes; } /** * @return Returns the stringSeparator. */ public String getStringSeparator() { - return stringSeparator; + return this.stringSeparator; } /** diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java index 76f94a433d..41f9fe7fd7 100755 --- a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java +++ b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java @@ -90,35 +90,35 @@ public class SimpleAttributes2GrantedAuthoritiesMapper } private boolean isConvertAttributeToLowerCase() { - return convertAttributeToLowerCase; + return this.convertAttributeToLowerCase; } public void setConvertAttributeToLowerCase(boolean b) { - convertAttributeToLowerCase = b; + this.convertAttributeToLowerCase = b; } private boolean isConvertAttributeToUpperCase() { - return convertAttributeToUpperCase; + return this.convertAttributeToUpperCase; } public void setConvertAttributeToUpperCase(boolean b) { - convertAttributeToUpperCase = b; + this.convertAttributeToUpperCase = b; } private String getAttributePrefix() { - return attributePrefix == null ? "" : attributePrefix; + return this.attributePrefix == null ? "" : this.attributePrefix; } public void setAttributePrefix(String string) { - attributePrefix = string; + this.attributePrefix = string; } private boolean isAddPrefixIfAlreadyExisting() { - return addPrefixIfAlreadyExisting; + return this.addPrefixIfAlreadyExisting; } public void setAddPrefixIfAlreadyExisting(boolean b) { - addPrefixIfAlreadyExisting = b; + this.addPrefixIfAlreadyExisting = b; } } diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java index 5daa983b21..0a061772c3 100644 --- a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java +++ b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java @@ -43,7 +43,7 @@ public final class SimpleAuthorityMapper implements GrantedAuthoritiesMapper, In private boolean convertToLowerCase = false; public void afterPropertiesSet() { - Assert.isTrue(!(convertToUpperCase && convertToLowerCase), + Assert.isTrue(!(this.convertToUpperCase && this.convertToLowerCase), "Either convertToUpperCase or convertToLowerCase can be set to true, but not both"); } @@ -61,23 +61,23 @@ public final class SimpleAuthorityMapper implements GrantedAuthoritiesMapper, In mapped.add(mapAuthority(authority.getAuthority())); } - if (defaultAuthority != null) { - mapped.add(defaultAuthority); + if (this.defaultAuthority != null) { + mapped.add(this.defaultAuthority); } return mapped; } private GrantedAuthority mapAuthority(String name) { - if (convertToUpperCase) { + if (this.convertToUpperCase) { name = name.toUpperCase(); } - else if (convertToLowerCase) { + else if (this.convertToLowerCase) { name = name.toLowerCase(); } - if (prefix.length() > 0 && !name.startsWith(prefix)) { - name = prefix + name; + if (this.prefix.length() > 0 && !name.startsWith(this.prefix)) { + name = this.prefix + name; } return new SimpleGrantedAuthority(name); diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java index 4cef1edce8..e38de5e3e2 100644 --- a/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java +++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java @@ -59,7 +59,7 @@ public class SecurityContextImpl implements SecurityContext { @Override public Authentication getAuthentication() { - return authentication; + return this.authentication; } @Override diff --git a/core/src/main/java/org/springframework/security/core/session/SessionInformation.java b/core/src/main/java/org/springframework/security/core/session/SessionInformation.java index 3f774d8c66..54b05bbbb0 100644 --- a/core/src/main/java/org/springframework/security/core/session/SessionInformation.java +++ b/core/src/main/java/org/springframework/security/core/session/SessionInformation.java @@ -63,19 +63,19 @@ public class SessionInformation implements Serializable { } public Date getLastRequest() { - return lastRequest; + return this.lastRequest; } public Object getPrincipal() { - return principal; + return this.principal; } public String getSessionId() { - return sessionId; + return this.sessionId; } public boolean isExpired() { - return expired; + return this.expired; } /** diff --git a/core/src/main/java/org/springframework/security/core/token/DefaultToken.java b/core/src/main/java/org/springframework/security/core/token/DefaultToken.java index 77fc1a3622..9fbf405bd2 100644 --- a/core/src/main/java/org/springframework/security/core/token/DefaultToken.java +++ b/core/src/main/java/org/springframework/security/core/token/DefaultToken.java @@ -43,17 +43,17 @@ public class DefaultToken implements Token { @Override public String getKey() { - return key; + return this.key; } @Override public long getKeyCreationTime() { - return keyCreationTime; + return this.keyCreationTime; } @Override public String getExtendedInformation() { - return extendedInformation; + return this.extendedInformation; } @Override @@ -69,16 +69,16 @@ public class DefaultToken implements Token { @Override public int hashCode() { int code = 979; - code = code * key.hashCode(); - code = code * new Long(keyCreationTime).hashCode(); - code = code * extendedInformation.hashCode(); + code = code * this.key.hashCode(); + code = code * new Long(this.keyCreationTime).hashCode(); + code = code * this.extendedInformation.hashCode(); return code; } @Override public String toString() { - return "DefaultToken[key=" + key + "; creation=" + new Date(keyCreationTime) + "; extended=" - + extendedInformation + "]"; + return "DefaultToken[key=" + this.key + "; creation=" + new Date(this.keyCreationTime) + "; extended=" + + this.extendedInformation + "]"; } } diff --git a/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java index d4114cb19f..f4a0effa70 100644 --- a/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java +++ b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java @@ -138,13 +138,13 @@ public class KeyBasedPersistenceTokenService implements TokenService, Initializi * @return a pseduo random number (hex encoded) */ private String generatePseudoRandomNumber() { - byte[] randomBytes = new byte[pseudoRandomNumberBytes]; - secureRandom.nextBytes(randomBytes); + byte[] randomBytes = new byte[this.pseudoRandomNumberBytes]; + this.secureRandom.nextBytes(randomBytes); return new String(Hex.encode(randomBytes)); } private String computeServerSecretApplicableAt(long time) { - return serverSecret + ":" + new Long(time % serverInteger).intValue(); + return this.serverSecret + ":" + new Long(time % this.serverInteger).intValue(); } /** @@ -173,9 +173,9 @@ public class KeyBasedPersistenceTokenService implements TokenService, Initializi } public void afterPropertiesSet() { - Assert.hasText(serverSecret, "Server secret required"); - Assert.notNull(serverInteger, "Server integer required"); - Assert.notNull(secureRandom, "SecureRandom instance required"); + Assert.hasText(this.serverSecret, "Server secret required"); + Assert.notNull(this.serverInteger, "Server integer required"); + Assert.notNull(this.secureRandom, "SecureRandom instance required"); } } diff --git a/core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java b/core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java index fed76cf109..bf2cbaee39 100644 --- a/core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java +++ b/core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java @@ -36,15 +36,15 @@ public class SecureRandomFactoryBean implements FactoryBean { private Resource seed; public SecureRandom getObject() throws Exception { - SecureRandom rnd = SecureRandom.getInstance(algorithm); + SecureRandom rnd = SecureRandom.getInstance(this.algorithm); // Request the next bytes, thus eagerly incurring the expense of default // seeding and to prevent the see from replacing the entire state rnd.nextBytes(new byte[1]); - if (seed != null) { + if (this.seed != null) { // Seed specified, so use it - byte[] seedBytes = FileCopyUtils.copyToByteArray(seed.getInputStream()); + byte[] seedBytes = FileCopyUtils.copyToByteArray(this.seed.getInputStream()); rnd.setSeed(seedBytes); } diff --git a/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java b/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java index 7574b1d128..bab768315a 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java @@ -66,7 +66,7 @@ public class MapReactiveUserDetailsService implements ReactiveUserDetailsService @Override public Mono findByUsername(String username) { String key = getKey(username); - UserDetails result = users.get(key); + UserDetails result = this.users.get(key); return result == null ? Mono.empty() : Mono.just(User.withUserDetails(result).build()); } diff --git a/core/src/main/java/org/springframework/security/core/userdetails/User.java b/core/src/main/java/org/springframework/security/core/userdetails/User.java index 31d0892520..408cff8a7a 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/User.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/User.java @@ -122,35 +122,35 @@ public class User implements UserDetails, CredentialsContainer { } public Collection getAuthorities() { - return authorities; + return this.authorities; } public String getPassword() { - return password; + return this.password; } public String getUsername() { - return username; + return this.username; } public boolean isEnabled() { - return enabled; + return this.enabled; } public boolean isAccountNonExpired() { - return accountNonExpired; + return this.accountNonExpired; } public boolean isAccountNonLocked() { - return accountNonLocked; + return this.accountNonLocked; } public boolean isCredentialsNonExpired() { - return credentialsNonExpired; + return this.credentialsNonExpired; } public void eraseCredentials() { - password = null; + this.password = null; } private static SortedSet sortAuthorities(Collection authorities) { @@ -199,7 +199,7 @@ public class User implements UserDetails, CredentialsContainer { @Override public boolean equals(Object rhs) { if (rhs instanceof User) { - return username.equals(((User) rhs).username); + return this.username.equals(((User) rhs).username); } return false; } @@ -209,7 +209,7 @@ public class User implements UserDetails, CredentialsContainer { */ @Override public int hashCode() { - return username.hashCode(); + return this.username.hashCode(); } @Override @@ -223,11 +223,11 @@ public class User implements UserDetails, CredentialsContainer { sb.append("credentialsNonExpired: ").append(this.credentialsNonExpired).append("; "); sb.append("AccountNonLocked: ").append(this.accountNonLocked).append("; "); - if (!authorities.isEmpty()) { + if (!this.authorities.isEmpty()) { sb.append("Granted Authorities: "); boolean first = true; - for (GrantedAuthority auth : authorities) { + for (GrantedAuthority auth : this.authorities) { if (!first) { sb.append(","); } @@ -511,9 +511,9 @@ public class User implements UserDetails, CredentialsContainer { } public UserDetails build() { - String encodedPassword = this.passwordEncoder.apply(password); - return new User(username, encodedPassword, !disabled, !accountExpired, !credentialsExpired, !accountLocked, - authorities); + String encodedPassword = this.passwordEncoder.apply(this.password); + return new User(this.username, encodedPassword, !this.disabled, !this.accountExpired, + !this.credentialsExpired, !this.accountLocked, this.authorities); } } diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java index cc968cbe4e..e133cda228 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java @@ -39,15 +39,15 @@ public class EhCacheBasedUserCache implements UserCache, InitializingBean { private Ehcache cache; public void afterPropertiesSet() { - Assert.notNull(cache, "cache mandatory"); + Assert.notNull(this.cache, "cache mandatory"); } public Ehcache getCache() { - return cache; + return this.cache; } public UserDetails getUserFromCache(String username) { - Element element = cache.get(username); + Element element = this.cache.get(username); if (logger.isDebugEnabled()) { logger.debug("Cache hit: " + (element != null) + "; username: " + username); @@ -68,7 +68,7 @@ public class EhCacheBasedUserCache implements UserCache, InitializingBean { logger.debug("Cache put: " + element.getKey()); } - cache.put(element); + this.cache.put(element); } public void removeUserFromCache(UserDetails user) { @@ -80,7 +80,7 @@ public class EhCacheBasedUserCache implements UserCache, InitializingBean { } public void removeUserFromCache(String username) { - cache.remove(username); + this.cache.remove(username); } public void setCache(Ehcache cache) { diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java index f728f4bd7f..9cde0fb887 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java @@ -41,7 +41,7 @@ public class SpringCacheBasedUserCache implements UserCache { } public UserDetails getUserFromCache(String username) { - Cache.ValueWrapper element = username != null ? cache.get(username) : null; + Cache.ValueWrapper element = username != null ? this.cache.get(username) : null; if (logger.isDebugEnabled()) { logger.debug("Cache hit: " + (element != null) + "; username: " + username); @@ -59,7 +59,7 @@ public class SpringCacheBasedUserCache implements UserCache { if (logger.isDebugEnabled()) { logger.debug("Cache put: " + user.getUsername()); } - cache.put(user.getUsername(), user); + this.cache.put(user.getUsername(), user); } public void removeUserFromCache(UserDetails user) { @@ -71,7 +71,7 @@ public class SpringCacheBasedUserCache implements UserCache { } public void removeUserFromCache(String username) { - cache.evict(username); + this.cache.evict(username); } } diff --git a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java index 64f8ab9179..309b16e72d 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java @@ -68,15 +68,15 @@ public class UserAttribute { } public String getPassword() { - return password; + return this.password; } public boolean isEnabled() { - return enabled; + return this.enabled; } public boolean isValid() { - if ((this.password != null) && (authorities.size() > 0)) { + if ((this.password != null) && (this.authorities.size() > 0)) { return true; } else { diff --git a/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java b/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java index efa24feee1..a4b4c9cf3c 100644 --- a/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java +++ b/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java @@ -208,28 +208,28 @@ public final class SecurityJackson2Modules { @Override public void init(JavaType baseType) { - delegate.init(baseType); + this.delegate.init(baseType); } @Override public String idFromValue(Object value) { - return delegate.idFromValue(value); + return this.delegate.idFromValue(value); } @Override public String idFromValueAndType(Object value, Class suggestedType) { - return delegate.idFromValueAndType(value, suggestedType); + return this.delegate.idFromValueAndType(value, suggestedType); } @Override public String idFromBaseType() { - return delegate.idFromBaseType(); + return this.delegate.idFromBaseType(); } @Override public JavaType typeFromId(DatabindContext context, String id) throws IOException { DeserializationConfig config = (DeserializationConfig) context.getConfig(); - JavaType result = delegate.typeFromId(context, id); + JavaType result = this.delegate.typeFromId(context, id); String className = result.getRawClass().getName(); if (isInAllowlist(className)) { return result; @@ -256,12 +256,12 @@ public final class SecurityJackson2Modules { @Override public String getDescForKnownTypeIds() { - return delegate.getDescForKnownTypeIds(); + return this.delegate.getDescForKnownTypeIds(); } @Override public JsonTypeInfo.Id getMechanism() { - return delegate.getMechanism(); + return this.delegate.getMechanism(); } } diff --git a/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java index c5370692ec..256155d9c5 100644 --- a/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java +++ b/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java @@ -87,21 +87,21 @@ public class InMemoryUserDetailsManager implements UserDetailsManager, UserDetai public void createUser(UserDetails user) { Assert.isTrue(!userExists(user.getUsername()), "user should not exist"); - users.put(user.getUsername().toLowerCase(), new MutableUser(user)); + this.users.put(user.getUsername().toLowerCase(), new MutableUser(user)); } public void deleteUser(String username) { - users.remove(username.toLowerCase()); + this.users.remove(username.toLowerCase()); } public void updateUser(UserDetails user) { Assert.isTrue(userExists(user.getUsername()), "user should exist"); - users.put(user.getUsername().toLowerCase(), new MutableUser(user)); + this.users.put(user.getUsername().toLowerCase(), new MutableUser(user)); } public boolean userExists(String username) { - return users.containsKey(username.toLowerCase()); + return this.users.containsKey(username.toLowerCase()); } public void changePassword(String oldPassword, String newPassword) { @@ -115,20 +115,20 @@ public class InMemoryUserDetailsManager implements UserDetailsManager, UserDetai String username = currentUser.getName(); - logger.debug("Changing password for user '" + username + "'"); + this.logger.debug("Changing password for user '" + username + "'"); // If an authentication manager has been set, re-authenticate the user with the // supplied password. - if (authenticationManager != null) { - logger.debug("Reauthenticating user '" + username + "' for password change request."); + if (this.authenticationManager != null) { + this.logger.debug("Reauthenticating user '" + username + "' for password change request."); - authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, oldPassword)); + this.authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, oldPassword)); } else { - logger.debug("No authentication manager set. Password won't be re-checked."); + this.logger.debug("No authentication manager set. Password won't be re-checked."); } - MutableUserDetails user = users.get(username); + MutableUserDetails user = this.users.get(username); if (user == null) { throw new IllegalStateException("Current user doesn't exist in database."); @@ -146,7 +146,7 @@ public class InMemoryUserDetailsManager implements UserDetailsManager, UserDetai } public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - UserDetails user = users.get(username.toLowerCase()); + UserDetails user = this.users.get(username.toLowerCase()); if (user == null) { throw new UsernameNotFoundException(username); diff --git a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java index 4264068d9d..a0ff27fe75 100644 --- a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java +++ b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java @@ -157,8 +157,8 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa } protected void initDao() throws ApplicationContextException { - if (authenticationManager == null) { - logger.info("No authentication manager set. Reauthentication of users when changing passwords will " + if (this.authenticationManager == null) { + this.logger.info("No authentication manager set. Reauthentication of users when changing passwords will " + "not be performed."); } @@ -194,7 +194,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public void createUser(final UserDetails user) { validateUserDetails(user); - getJdbcTemplate().update(createUserSql, ps -> { + getJdbcTemplate().update(this.createUserSql, ps -> { ps.setString(1, user.getUsername()); ps.setString(2, user.getPassword()); ps.setBoolean(3, user.isEnabled()); @@ -216,7 +216,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public void updateUser(final UserDetails user) { validateUserDetails(user); - getJdbcTemplate().update(updateUserSql, ps -> { + getJdbcTemplate().update(this.updateUserSql, ps -> { ps.setString(1, user.getPassword()); ps.setBoolean(2, user.isEnabled()); @@ -240,12 +240,12 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa insertUserAuthorities(user); } - userCache.removeUserFromCache(user.getUsername()); + this.userCache.removeUserFromCache(user.getUsername()); } private void insertUserAuthorities(UserDetails user) { for (GrantedAuthority auth : user.getAuthorities()) { - getJdbcTemplate().update(createAuthoritySql, user.getUsername(), auth.getAuthority()); + getJdbcTemplate().update(this.createAuthoritySql, user.getUsername(), auth.getAuthority()); } } @@ -253,12 +253,12 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa if (getEnableAuthorities()) { deleteUserAuthorities(username); } - getJdbcTemplate().update(deleteUserSql, username); - userCache.removeUserFromCache(username); + getJdbcTemplate().update(this.deleteUserSql, username); + this.userCache.removeUserFromCache(username); } private void deleteUserAuthorities(String username) { - getJdbcTemplate().update(deleteUserAuthoritiesSql, username); + getJdbcTemplate().update(this.deleteUserAuthoritiesSql, username); } public void changePassword(String oldPassword, String newPassword) throws AuthenticationException { @@ -274,22 +274,22 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa // If an authentication manager has been set, re-authenticate the user with the // supplied password. - if (authenticationManager != null) { - logger.debug("Reauthenticating user '" + username + "' for password change request."); + if (this.authenticationManager != null) { + this.logger.debug("Reauthenticating user '" + username + "' for password change request."); - authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, oldPassword)); + this.authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, oldPassword)); } else { - logger.debug("No authentication manager set. Password won't be re-checked."); + this.logger.debug("No authentication manager set. Password won't be re-checked."); } - logger.debug("Changing password for user '" + username + "'"); + this.logger.debug("Changing password for user '" + username + "'"); - getJdbcTemplate().update(changePasswordSql, newPassword, username); + getJdbcTemplate().update(this.changePasswordSql, newPassword, username); SecurityContextHolder.getContext().setAuthentication(createNewAuthentication(currentUser, newPassword)); - userCache.removeUserFromCache(username); + this.userCache.removeUserFromCache(username); } protected Authentication createNewAuthentication(Authentication currentAuth, String newPassword) { @@ -303,7 +303,8 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa } public boolean userExists(String username) { - List users = getJdbcTemplate().queryForList(userExistsSql, new String[] { username }, String.class); + List users = getJdbcTemplate().queryForList(this.userExistsSql, new String[] { username }, + String.class); if (users.size() > 1) { throw new IncorrectResultSizeDataAccessException("More than one user found with name '" + username + "'", @@ -314,28 +315,28 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa } public List findAllGroups() { - return getJdbcTemplate().queryForList(findAllGroupsSql, String.class); + return getJdbcTemplate().queryForList(this.findAllGroupsSql, String.class); } public List findUsersInGroup(String groupName) { Assert.hasText(groupName, "groupName should have text"); - return getJdbcTemplate().queryForList(findUsersInGroupSql, new String[] { groupName }, String.class); + return getJdbcTemplate().queryForList(this.findUsersInGroupSql, new String[] { groupName }, String.class); } public void createGroup(final String groupName, final List authorities) { Assert.hasText(groupName, "groupName should have text"); Assert.notNull(authorities, "authorities cannot be null"); - logger.debug("Creating new group '" + groupName + "' with authorities " + this.logger.debug("Creating new group '" + groupName + "' with authorities " + AuthorityUtils.authorityListToSet(authorities)); - getJdbcTemplate().update(insertGroupSql, groupName); + getJdbcTemplate().update(this.insertGroupSql, groupName); final int groupId = findGroupId(groupName); for (GrantedAuthority a : authorities) { final String authority = a.getAuthority(); - getJdbcTemplate().update(insertGroupAuthoritySql, ps -> { + getJdbcTemplate().update(this.insertGroupAuthoritySql, ps -> { ps.setInt(1, groupId); ps.setString(2, authority); }); @@ -343,58 +344,58 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa } public void deleteGroup(String groupName) { - logger.debug("Deleting group '" + groupName + "'"); + this.logger.debug("Deleting group '" + groupName + "'"); Assert.hasText(groupName, "groupName should have text"); final int id = findGroupId(groupName); PreparedStatementSetter groupIdPSS = ps -> ps.setInt(1, id); - getJdbcTemplate().update(deleteGroupMembersSql, groupIdPSS); - getJdbcTemplate().update(deleteGroupAuthoritiesSql, groupIdPSS); - getJdbcTemplate().update(deleteGroupSql, groupIdPSS); + getJdbcTemplate().update(this.deleteGroupMembersSql, groupIdPSS); + getJdbcTemplate().update(this.deleteGroupAuthoritiesSql, groupIdPSS); + getJdbcTemplate().update(this.deleteGroupSql, groupIdPSS); } public void renameGroup(String oldName, String newName) { - logger.debug("Changing group name from '" + oldName + "' to '" + newName + "'"); + this.logger.debug("Changing group name from '" + oldName + "' to '" + newName + "'"); Assert.hasText(oldName, "oldName should have text"); Assert.hasText(newName, "newName should have text"); - getJdbcTemplate().update(renameGroupSql, newName, oldName); + getJdbcTemplate().update(this.renameGroupSql, newName, oldName); } public void addUserToGroup(final String username, final String groupName) { - logger.debug("Adding user '" + username + "' to group '" + groupName + "'"); + this.logger.debug("Adding user '" + username + "' to group '" + groupName + "'"); Assert.hasText(username, "username should have text"); Assert.hasText(groupName, "groupName should have text"); final int id = findGroupId(groupName); - getJdbcTemplate().update(insertGroupMemberSql, ps -> { + getJdbcTemplate().update(this.insertGroupMemberSql, ps -> { ps.setInt(1, id); ps.setString(2, username); }); - userCache.removeUserFromCache(username); + this.userCache.removeUserFromCache(username); } public void removeUserFromGroup(final String username, final String groupName) { - logger.debug("Removing user '" + username + "' to group '" + groupName + "'"); + this.logger.debug("Removing user '" + username + "' to group '" + groupName + "'"); Assert.hasText(username, "username should have text"); Assert.hasText(groupName, "groupName should have text"); final int id = findGroupId(groupName); - getJdbcTemplate().update(deleteGroupMemberSql, ps -> { + getJdbcTemplate().update(this.deleteGroupMemberSql, ps -> { ps.setInt(1, id); ps.setString(2, username); }); - userCache.removeUserFromCache(username); + this.userCache.removeUserFromCache(username); } public List findGroupAuthorities(String groupName) { - logger.debug("Loading authorities for group '" + groupName + "'"); + this.logger.debug("Loading authorities for group '" + groupName + "'"); Assert.hasText(groupName, "groupName should have text"); - return getJdbcTemplate().query(groupAuthoritiesSql, new String[] { groupName }, (rs, rowNum) -> { + return getJdbcTemplate().query(this.groupAuthoritiesSql, new String[] { groupName }, (rs, rowNum) -> { String roleName = getRolePrefix() + rs.getString(3); return new SimpleGrantedAuthority(roleName); @@ -402,32 +403,32 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa } public void removeGroupAuthority(String groupName, final GrantedAuthority authority) { - logger.debug("Removing authority '" + authority + "' from group '" + groupName + "'"); + this.logger.debug("Removing authority '" + authority + "' from group '" + groupName + "'"); Assert.hasText(groupName, "groupName should have text"); Assert.notNull(authority, "authority cannot be null"); final int id = findGroupId(groupName); - getJdbcTemplate().update(deleteGroupAuthoritySql, ps -> { + getJdbcTemplate().update(this.deleteGroupAuthoritySql, ps -> { ps.setInt(1, id); ps.setString(2, authority.getAuthority()); }); } public void addGroupAuthority(final String groupName, final GrantedAuthority authority) { - logger.debug("Adding authority '" + authority + "' to group '" + groupName + "'"); + this.logger.debug("Adding authority '" + authority + "' to group '" + groupName + "'"); Assert.hasText(groupName, "groupName should have text"); Assert.notNull(authority, "authority cannot be null"); final int id = findGroupId(groupName); - getJdbcTemplate().update(insertGroupAuthoritySql, ps -> { + getJdbcTemplate().update(this.insertGroupAuthoritySql, ps -> { ps.setInt(1, id); ps.setString(2, authority.getAuthority()); }); } private int findGroupId(String group) { - return getJdbcTemplate().queryForObject(findGroupIdSql, Integer.class, group); + return getJdbcTemplate().queryForObject(this.findGroupIdSql, Integer.class, group); } public void setAuthenticationManager(AuthenticationManager authenticationManager) { diff --git a/core/src/main/java/org/springframework/security/provisioning/MutableUser.java b/core/src/main/java/org/springframework/security/provisioning/MutableUser.java index b5df07122e..09af62611b 100644 --- a/core/src/main/java/org/springframework/security/provisioning/MutableUser.java +++ b/core/src/main/java/org/springframework/security/provisioning/MutableUser.java @@ -39,7 +39,7 @@ class MutableUser implements MutableUserDetails { } public String getPassword() { - return password; + return this.password; } public void setPassword(String password) { @@ -47,27 +47,27 @@ class MutableUser implements MutableUserDetails { } public Collection getAuthorities() { - return delegate.getAuthorities(); + return this.delegate.getAuthorities(); } public String getUsername() { - return delegate.getUsername(); + return this.delegate.getUsername(); } public boolean isAccountNonExpired() { - return delegate.isAccountNonExpired(); + return this.delegate.isAccountNonExpired(); } public boolean isAccountNonLocked() { - return delegate.isAccountNonLocked(); + return this.delegate.isAccountNonLocked(); } public boolean isCredentialsNonExpired() { - return delegate.isCredentialsNonExpired(); + return this.delegate.isCredentialsNonExpired(); } public boolean isEnabled() { - return delegate.isEnabled(); + return this.delegate.isEnabled(); } } diff --git a/core/src/main/java/org/springframework/security/scheduling/DelegatingSecurityContextTaskScheduler.java b/core/src/main/java/org/springframework/security/scheduling/DelegatingSecurityContextTaskScheduler.java index 1180c486f8..d1a3642228 100644 --- a/core/src/main/java/org/springframework/security/scheduling/DelegatingSecurityContextTaskScheduler.java +++ b/core/src/main/java/org/springframework/security/scheduling/DelegatingSecurityContextTaskScheduler.java @@ -44,32 +44,32 @@ public class DelegatingSecurityContextTaskScheduler implements TaskScheduler { @Override public ScheduledFuture schedule(Runnable task, Trigger trigger) { - return taskScheduler.schedule(task, trigger); + return this.taskScheduler.schedule(task, trigger); } @Override public ScheduledFuture schedule(Runnable task, Date startTime) { - return taskScheduler.schedule(task, startTime); + return this.taskScheduler.schedule(task, startTime); } @Override public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) { - return taskScheduler.scheduleAtFixedRate(task, startTime, period); + return this.taskScheduler.scheduleAtFixedRate(task, startTime, period); } @Override public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) { - return taskScheduler.scheduleAtFixedRate(task, period); + return this.taskScheduler.scheduleAtFixedRate(task, period); } @Override public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) { - return taskScheduler.scheduleWithFixedDelay(task, startTime, delay); + return this.taskScheduler.scheduleWithFixedDelay(task, startTime, delay); } @Override public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) { - return taskScheduler.scheduleWithFixedDelay(task, delay); + return this.taskScheduler.scheduleWithFixedDelay(task, delay); } } diff --git a/core/src/main/java/org/springframework/security/util/InMemoryResource.java b/core/src/main/java/org/springframework/security/util/InMemoryResource.java index b0bdf23fca..c027324f90 100644 --- a/core/src/main/java/org/springframework/security/util/InMemoryResource.java +++ b/core/src/main/java/org/springframework/security/util/InMemoryResource.java @@ -54,12 +54,12 @@ public class InMemoryResource extends AbstractResource { @Override public String getDescription() { - return description; + return this.description; } @Override public InputStream getInputStream() { - return new ByteArrayInputStream(source); + return new ByteArrayInputStream(this.source); } @Override @@ -73,7 +73,7 @@ public class InMemoryResource extends AbstractResource { return false; } - return Arrays.equals(source, ((InMemoryResource) res).source); + return Arrays.equals(this.source, ((InMemoryResource) res).source); } } diff --git a/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java b/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java index 199bbe52a7..8f7bf0d803 100644 --- a/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java +++ b/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java @@ -44,11 +44,11 @@ public class SimpleMethodInvocation implements MethodInvocation { } public Object[] getArguments() { - return arguments; + return this.arguments; } public Method getMethod() { - return method; + return this.method; } public AccessibleObject getStaticPart() { @@ -56,7 +56,7 @@ public class SimpleMethodInvocation implements MethodInvocation { } public Object getThis() { - return targetObject; + return this.targetObject; } public Object proceed() { diff --git a/core/src/test/java/org/springframework/security/TestDataSource.java b/core/src/test/java/org/springframework/security/TestDataSource.java index 2f65116039..9d79516ce1 100644 --- a/core/src/test/java/org/springframework/security/TestDataSource.java +++ b/core/src/test/java/org/springframework/security/TestDataSource.java @@ -30,8 +30,8 @@ public class TestDataSource extends DriverManagerDataSource implements Disposabl String name; public TestDataSource(String databaseName) { - name = databaseName; - System.out.println("Creating database: " + name); + this.name = databaseName; + System.out.println("Creating database: " + this.name); setDriverClassName("org.hsqldb.jdbcDriver"); setUrl("jdbc:hsqldb:mem:" + databaseName); setUsername("sa"); @@ -39,7 +39,7 @@ public class TestDataSource extends DriverManagerDataSource implements Disposabl } public void destroy() { - System.out.println("Shutting down database: " + name); + System.out.println("Shutting down database: " + this.name); new JdbcTemplate(this).execute("SHUTDOWN"); } diff --git a/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java b/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java index a363ae4c38..b6f5766cfe 100644 --- a/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java +++ b/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java @@ -41,30 +41,31 @@ public class AuthorizationFailureEventTests { @Test(expected = IllegalArgumentException.class) public void rejectsNullSecureObject() { - new AuthorizationFailureEvent(null, attributes, foo, exception); + new AuthorizationFailureEvent(null, this.attributes, this.foo, this.exception); } @Test(expected = IllegalArgumentException.class) public void rejectsNullAttributesList() { - new AuthorizationFailureEvent(new SimpleMethodInvocation(), null, foo, exception); + new AuthorizationFailureEvent(new SimpleMethodInvocation(), null, this.foo, this.exception); } @Test(expected = IllegalArgumentException.class) public void rejectsNullAuthentication() { - new AuthorizationFailureEvent(new SimpleMethodInvocation(), attributes, null, exception); + new AuthorizationFailureEvent(new SimpleMethodInvocation(), this.attributes, null, this.exception); } @Test(expected = IllegalArgumentException.class) public void rejectsNullException() { - new AuthorizationFailureEvent(new SimpleMethodInvocation(), attributes, foo, null); + new AuthorizationFailureEvent(new SimpleMethodInvocation(), this.attributes, this.foo, null); } @Test public void gettersReturnCtorSuppliedData() { - AuthorizationFailureEvent event = new AuthorizationFailureEvent(new Object(), attributes, foo, exception); - assertThat(event.getConfigAttributes()).isSameAs(attributes); - assertThat(event.getAccessDeniedException()).isSameAs(exception); - assertThat(event.getAuthentication()).isSameAs(foo); + AuthorizationFailureEvent event = new AuthorizationFailureEvent(new Object(), this.attributes, this.foo, + this.exception); + assertThat(event.getConfigAttributes()).isSameAs(this.attributes); + assertThat(event.getAccessDeniedException()).isSameAs(this.exception); + assertThat(event.getAuthentication()).isSameAs(this.foo); } } diff --git a/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java index 47fa1e0c6b..6f306a7cd3 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java @@ -62,7 +62,7 @@ public class SecuredAnnotationSecurityMetadataSourceTests { fail("Should be a superMethod called 'someUserMethod3' on class!"); } - Collection attrs = mds.findAttributes(method, DepartmentServiceImpl.class); + Collection attrs = this.mds.findAttributes(method, DepartmentServiceImpl.class); assertThat(attrs).isNotNull(); @@ -160,7 +160,7 @@ public class SecuredAnnotationSecurityMetadataSourceTests { MockMethodInvocation annotatedAtClassLevel = new MockMethodInvocation(new AnnotatedAnnotationAtClassLevel(), ReturnVoid.class, "doSomething", List.class); - ConfigAttribute[] attrs = mds.getAttributes(annotatedAtClassLevel).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(annotatedAtClassLevel).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); assertThat(attrs).extracting("attribute").containsOnly("CUSTOM"); @@ -171,7 +171,7 @@ public class SecuredAnnotationSecurityMetadataSourceTests { MockMethodInvocation annotatedAtInterfaceLevel = new MockMethodInvocation( new AnnotatedAnnotationAtInterfaceLevel(), ReturnVoid2.class, "doSomething", List.class); - ConfigAttribute[] attrs = mds.getAttributes(annotatedAtInterfaceLevel).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(annotatedAtInterfaceLevel).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); assertThat(attrs).extracting("attribute").containsOnly("CUSTOM"); @@ -181,7 +181,7 @@ public class SecuredAnnotationSecurityMetadataSourceTests { public void annotatedAnnotationAtMethodLevelIsDetected() throws Exception { MockMethodInvocation annotatedAtMethodLevel = new MockMethodInvocation(new AnnotatedAnnotationAtMethodLevel(), ReturnVoid.class, "doSomething", List.class); - ConfigAttribute[] attrs = mds.getAttributes(annotatedAtMethodLevel).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(annotatedAtMethodLevel).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); assertThat(attrs).extracting("attribute").containsOnly("CUSTOM"); @@ -190,7 +190,7 @@ public class SecuredAnnotationSecurityMetadataSourceTests { @Test public void proxyFactoryInterfaceAttributesFound() throws Exception { MockMethodInvocation mi = MethodInvocationFactory.createSec2150MethodInvocation(); - Collection attributes = mds.getAttributes(mi); + Collection attributes = this.mds.getAttributes(mi); assertThat(attributes).hasSize(1); assertThat(attributes).extracting("attribute").containsOnly("ROLE_PERSON"); } diff --git a/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java b/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java index 1ca4760866..259474e668 100644 --- a/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java @@ -37,7 +37,7 @@ public class AbstractSecurityExpressionHandlerTests { @Before public void setUp() { - handler = new AbstractSecurityExpressionHandler() { + this.handler = new AbstractSecurityExpressionHandler() { @Override protected SecurityExpressionOperations createSecurityExpressionRoot(Authentication authentication, Object o) { @@ -49,23 +49,24 @@ public class AbstractSecurityExpressionHandlerTests { @Test public void beanNamesAreCorrectlyResolved() { - handler.setApplicationContext(new AnnotationConfigApplicationContext(TestConfiguration.class)); + this.handler.setApplicationContext(new AnnotationConfigApplicationContext(TestConfiguration.class)); - Expression expression = handler.getExpressionParser().parseExpression("@number10.compareTo(@number20) < 0"); - assertThat(expression.getValue(handler.createEvaluationContext(mock(Authentication.class), new Object()))) + Expression expression = this.handler.getExpressionParser() + .parseExpression("@number10.compareTo(@number20) < 0"); + assertThat(expression.getValue(this.handler.createEvaluationContext(mock(Authentication.class), new Object()))) .isEqualTo(true); } @Test(expected = IllegalArgumentException.class) public void setExpressionParserNull() { - handler.setExpressionParser(null); + this.handler.setExpressionParser(null); } @Test public void setExpressionParser() { SpelExpressionParser parser = new SpelExpressionParser(); - handler.setExpressionParser(parser); - assertThat(parser == handler.getExpressionParser()).isTrue(); + this.handler.setExpressionParser(parser); + assertThat(parser == this.handler.getExpressionParser()).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java b/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java index 29c1e8d144..140ac517e3 100644 --- a/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java @@ -39,58 +39,58 @@ public class SecurityExpressionRootTests { @Before public void setup() { - root = new SecurityExpressionRoot(JOE) { + this.root = new SecurityExpressionRoot(JOE) { }; } @Test public void denyAllIsFalsePermitAllTrue() { - assertThat(root.denyAll()).isFalse(); - assertThat(root.denyAll).isFalse(); - assertThat(root.permitAll()).isTrue(); - assertThat(root.permitAll).isTrue(); + assertThat(this.root.denyAll()).isFalse(); + assertThat(this.root.denyAll).isFalse(); + assertThat(this.root.permitAll()).isTrue(); + assertThat(this.root.permitAll).isTrue(); } @Test public void rememberMeIsCorrectlyDetected() { AuthenticationTrustResolver atr = mock(AuthenticationTrustResolver.class); - root.setTrustResolver(atr); + this.root.setTrustResolver(atr); when(atr.isRememberMe(JOE)).thenReturn(true); - assertThat(root.isRememberMe()).isTrue(); - assertThat(root.isFullyAuthenticated()).isFalse(); + assertThat(this.root.isRememberMe()).isTrue(); + assertThat(this.root.isFullyAuthenticated()).isFalse(); } @Test public void roleHierarchySupportIsCorrectlyUsedInEvaluatingRoles() { - root.setRoleHierarchy(authorities -> AuthorityUtils.createAuthorityList("ROLE_C")); + this.root.setRoleHierarchy(authorities -> AuthorityUtils.createAuthorityList("ROLE_C")); - assertThat(root.hasRole("C")).isTrue(); - assertThat(root.hasAuthority("ROLE_C")).isTrue(); - assertThat(root.hasRole("A")).isFalse(); - assertThat(root.hasRole("B")).isFalse(); - assertThat(root.hasAnyRole("C", "A", "B")).isTrue(); - assertThat(root.hasAnyAuthority("ROLE_C", "ROLE_A", "ROLE_B")).isTrue(); - assertThat(root.hasAnyRole("A", "B")).isFalse(); + assertThat(this.root.hasRole("C")).isTrue(); + assertThat(this.root.hasAuthority("ROLE_C")).isTrue(); + assertThat(this.root.hasRole("A")).isFalse(); + assertThat(this.root.hasRole("B")).isFalse(); + assertThat(this.root.hasAnyRole("C", "A", "B")).isTrue(); + assertThat(this.root.hasAnyAuthority("ROLE_C", "ROLE_A", "ROLE_B")).isTrue(); + assertThat(this.root.hasAnyRole("A", "B")).isFalse(); } @Test public void hasRoleAddsDefaultPrefix() { - assertThat(root.hasRole("A")).isTrue(); - assertThat(root.hasRole("NO")).isFalse(); + assertThat(this.root.hasRole("A")).isTrue(); + assertThat(this.root.hasRole("NO")).isFalse(); } @Test public void hasRoleEmptyPrefixDoesNotAddsDefaultPrefix() { - root.setDefaultRolePrefix(""); - assertThat(root.hasRole("A")).isFalse(); - assertThat(root.hasRole("ROLE_A")).isTrue(); + this.root.setDefaultRolePrefix(""); + assertThat(this.root.hasRole("A")).isFalse(); + assertThat(this.root.hasRole("ROLE_A")).isTrue(); } @Test public void hasRoleNullPrefixDoesNotAddsDefaultPrefix() { - root.setDefaultRolePrefix(null); - assertThat(root.hasRole("A")).isFalse(); - assertThat(root.hasRole("ROLE_A")).isTrue(); + this.root.setDefaultRolePrefix(null); + assertThat(this.root.hasRole("A")).isFalse(); + assertThat(this.root.hasRole("ROLE_A")).isTrue(); } @Test @@ -104,35 +104,35 @@ public class SecurityExpressionRootTests { @Test public void hasAnyRoleAddsDefaultPrefix() { - assertThat(root.hasAnyRole("NO", "A")).isTrue(); - assertThat(root.hasAnyRole("NO", "NOT")).isFalse(); + assertThat(this.root.hasAnyRole("NO", "A")).isTrue(); + assertThat(this.root.hasAnyRole("NO", "NOT")).isFalse(); } @Test public void hasAnyRoleDoesNotAddDefaultPrefixForAlreadyPrefixedRoles() { - assertThat(root.hasAnyRole("ROLE_NO", "ROLE_A")).isTrue(); - assertThat(root.hasAnyRole("ROLE_NO", "ROLE_NOT")).isFalse(); + assertThat(this.root.hasAnyRole("ROLE_NO", "ROLE_A")).isTrue(); + assertThat(this.root.hasAnyRole("ROLE_NO", "ROLE_NOT")).isFalse(); } @Test public void hasAnyRoleEmptyPrefixDoesNotAddsDefaultPrefix() { - root.setDefaultRolePrefix(""); - assertThat(root.hasRole("A")).isFalse(); - assertThat(root.hasRole("ROLE_A")).isTrue(); + this.root.setDefaultRolePrefix(""); + assertThat(this.root.hasRole("A")).isFalse(); + assertThat(this.root.hasRole("ROLE_A")).isTrue(); } @Test public void hasAnyRoleNullPrefixDoesNotAddsDefaultPrefix() { - root.setDefaultRolePrefix(null); - assertThat(root.hasAnyRole("A")).isFalse(); - assertThat(root.hasAnyRole("ROLE_A")).isTrue(); + this.root.setDefaultRolePrefix(null); + assertThat(this.root.hasAnyRole("A")).isFalse(); + assertThat(this.root.hasAnyRole("ROLE_A")).isTrue(); } @Test public void hasAuthorityDoesNotAddDefaultPrefix() { - assertThat(root.hasAuthority("A")).isFalse(); - assertThat(root.hasAnyAuthority("NO", "A")).isFalse(); - assertThat(root.hasAnyAuthority("ROLE_A", "NOT")).isTrue(); + assertThat(this.root.hasAuthority("A")).isFalse(); + assertThat(this.root.hasAnyAuthority("NO", "A")).isFalse(); + assertThat(this.root.hasAnyAuthority("ROLE_A", "NOT")).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java b/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java index 8a814ef0ef..443a3c4ed7 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java @@ -58,9 +58,9 @@ public class DefaultMethodSecurityExpressionHandlerTests { @Before public void setup() { - handler = new DefaultMethodSecurityExpressionHandler(); - when(methodInvocation.getThis()).thenReturn(new Foo()); - when(methodInvocation.getMethod()).thenReturn(Foo.class.getMethods()[0]); + this.handler = new DefaultMethodSecurityExpressionHandler(); + when(this.methodInvocation.getThis()).thenReturn(new Foo()); + when(this.methodInvocation.getMethod()).thenReturn(Foo.class.getMethods()[0]); } @After @@ -70,18 +70,18 @@ public class DefaultMethodSecurityExpressionHandlerTests { @Test(expected = IllegalArgumentException.class) public void setTrustResolverNull() { - handler.setTrustResolver(null); + this.handler.setTrustResolver(null); } @Test public void createEvaluationContextCustomTrustResolver() { - handler.setTrustResolver(trustResolver); + this.handler.setTrustResolver(this.trustResolver); - Expression expression = handler.getExpressionParser().parseExpression("anonymous"); - EvaluationContext context = handler.createEvaluationContext(authentication, methodInvocation); + Expression expression = this.handler.getExpressionParser().parseExpression("anonymous"); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.methodInvocation); expression.getValue(context, Boolean.class); - verify(trustResolver).isAnonymous(authentication); + verify(this.trustResolver).isAnonymous(this.authentication); } @Test @@ -92,11 +92,11 @@ public class DefaultMethodSecurityExpressionHandlerTests { map.put("key2", "value2"); map.put("key3", "value3"); - Expression expression = handler.getExpressionParser().parseExpression("filterObject.key eq 'key2'"); + Expression expression = this.handler.getExpressionParser().parseExpression("filterObject.key eq 'key2'"); - EvaluationContext context = handler.createEvaluationContext(authentication, methodInvocation); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.methodInvocation); - Object filtered = handler.filter(map, expression, context); + Object filtered = this.handler.filter(map, expression, context); assertThat(filtered == map); Map result = ((Map) filtered); @@ -113,11 +113,11 @@ public class DefaultMethodSecurityExpressionHandlerTests { map.put("key2", "value2"); map.put("key3", "value3"); - Expression expression = handler.getExpressionParser().parseExpression("filterObject.value eq 'value3'"); + Expression expression = this.handler.getExpressionParser().parseExpression("filterObject.value eq 'value3'"); - EvaluationContext context = handler.createEvaluationContext(authentication, methodInvocation); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.methodInvocation); - Object filtered = handler.filter(map, expression, context); + Object filtered = this.handler.filter(map, expression, context); assertThat(filtered == map); Map result = ((Map) filtered); @@ -134,12 +134,12 @@ public class DefaultMethodSecurityExpressionHandlerTests { map.put("key2", "value2"); map.put("key3", "value3"); - Expression expression = handler.getExpressionParser() + Expression expression = this.handler.getExpressionParser() .parseExpression("(filterObject.key eq 'key1') or (filterObject.value eq 'value2')"); - EvaluationContext context = handler.createEvaluationContext(authentication, methodInvocation); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.methodInvocation); - Object filtered = handler.filter(map, expression, context); + Object filtered = this.handler.filter(map, expression, context); assertThat(filtered == map); Map result = ((Map) filtered); @@ -153,11 +153,11 @@ public class DefaultMethodSecurityExpressionHandlerTests { public void filterWhenUsingStreamThenFiltersStream() { final Stream stream = Stream.of("1", "2", "3"); - Expression expression = handler.getExpressionParser().parseExpression("filterObject ne '2'"); + Expression expression = this.handler.getExpressionParser().parseExpression("filterObject ne '2'"); - EvaluationContext context = handler.createEvaluationContext(authentication, methodInvocation); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.methodInvocation); - Object filtered = handler.filter(stream, expression, context); + Object filtered = this.handler.filter(stream, expression, context); assertThat(filtered).isInstanceOf(Stream.class); List list = ((Stream) filtered).collect(Collectors.toList()); @@ -169,11 +169,11 @@ public class DefaultMethodSecurityExpressionHandlerTests { final Stream upstream = mock(Stream.class); doReturn(Stream.empty()).when(upstream).filter(any()); - Expression expression = handler.getExpressionParser().parseExpression("true"); + Expression expression = this.handler.getExpressionParser().parseExpression("true"); - EvaluationContext context = handler.createEvaluationContext(authentication, methodInvocation); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.methodInvocation); - ((Stream) handler.filter(upstream, expression, context)).close(); + ((Stream) this.handler.filter(upstream, expression, context)).close(); verify(upstream).close(); } diff --git a/core/src/test/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdviceTests.java b/core/src/test/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdviceTests.java index f6cb59ef10..d54ad3faca 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdviceTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdviceTests.java @@ -46,7 +46,7 @@ public class ExpressionBasedPreInvocationAdviceTests { @Before public void setUp() { - expressionBasedPreInvocationAdvice = new ExpressionBasedPreInvocationAdvice(); + this.expressionBasedPreInvocationAdvice = new ExpressionBasedPreInvocationAdvice(); } @Test(expected = IllegalArgumentException.class) @@ -57,7 +57,7 @@ public class ExpressionBasedPreInvocationAdviceTests { MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, "doSomethingCollection", new Class[] { List.class }, new Object[] { new ArrayList<>() }); // when - then - expressionBasedPreInvocationAdvice.before(authentication, methodInvocation, attribute); + this.expressionBasedPreInvocationAdvice.before(this.authentication, methodInvocation, attribute); } @Test(expected = IllegalArgumentException.class) @@ -67,7 +67,7 @@ public class ExpressionBasedPreInvocationAdviceTests { MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, "doSomethingArray", new Class[] { String[].class }, new Object[] { new String[0] }); // when - then - expressionBasedPreInvocationAdvice.before(authentication, methodInvocation, attribute); + this.expressionBasedPreInvocationAdvice.before(this.authentication, methodInvocation, attribute); } @Test @@ -78,7 +78,8 @@ public class ExpressionBasedPreInvocationAdviceTests { "doSomethingCollection", new Class[] { List.class }, new Object[] { new ArrayList<>() }); // when - boolean result = expressionBasedPreInvocationAdvice.before(authentication, methodInvocation, attribute); + boolean result = this.expressionBasedPreInvocationAdvice.before(this.authentication, methodInvocation, + attribute); // then assertThat(result).isTrue(); } @@ -90,7 +91,7 @@ public class ExpressionBasedPreInvocationAdviceTests { MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, "doSomethingArray", new Class[] { String[].class }, new Object[] { new String[0] }); // when - then - expressionBasedPreInvocationAdvice.before(authentication, methodInvocation, attribute); + this.expressionBasedPreInvocationAdvice.before(this.authentication, methodInvocation, attribute); } @Test @@ -100,7 +101,8 @@ public class ExpressionBasedPreInvocationAdviceTests { MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, "doSomethingCollection", new Class[] { List.class }, new Object[] { new ArrayList<>() }); // when - boolean result = expressionBasedPreInvocationAdvice.before(authentication, methodInvocation, attribute); + boolean result = this.expressionBasedPreInvocationAdvice.before(this.authentication, methodInvocation, + attribute); // then assertThat(result).isTrue(); } @@ -112,7 +114,7 @@ public class ExpressionBasedPreInvocationAdviceTests { MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, "doSomethingString", new Class[] { String.class }, new Object[] { "param" }); // when - then - expressionBasedPreInvocationAdvice.before(authentication, methodInvocation, attribute); + this.expressionBasedPreInvocationAdvice.before(this.authentication, methodInvocation, attribute); } @Test(expected = IllegalArgumentException.class) @@ -123,7 +125,7 @@ public class ExpressionBasedPreInvocationAdviceTests { "doSomethingTwoArgs", new Class[] { String.class, List.class }, new Object[] { "param", new ArrayList<>() }); // when - then - expressionBasedPreInvocationAdvice.before(authentication, methodInvocation, attribute); + this.expressionBasedPreInvocationAdvice.before(this.authentication, methodInvocation, attribute); } private class TestClass { diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java index 6c7576b899..79fb22a272 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java @@ -43,8 +43,8 @@ public class MethodExpressionVoterTests { @Test public void hasRoleExpressionAllowsUserWithRole() throws Exception { MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAnArray()); - assertThat( - am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(null, null, "hasRole('blah')")))) + assertThat(this.am.vote(this.joe, mi, + createAttributes(new PreInvocationExpressionAttribute(null, null, "hasRole('blah')")))) .isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); } @@ -53,13 +53,13 @@ public class MethodExpressionVoterTests { List cad = new ArrayList<>(1); cad.add(new PreInvocationExpressionAttribute(null, null, "hasRole('joedoesnt')")); MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAnArray()); - assertThat(am.vote(joe, mi, cad)).isEqualTo(AccessDecisionVoter.ACCESS_DENIED); + assertThat(this.am.vote(this.joe, mi, cad)).isEqualTo(AccessDecisionVoter.ACCESS_DENIED); } @Test public void matchingArgAgainstAuthenticationNameIsSuccessful() throws Exception { MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAString(), "joe"); - assertThat(am.vote(joe, mi, + assertThat(this.am.vote(this.joe, mi, createAttributes(new PreInvocationExpressionAttribute(null, null, "(#argument == principal) and (principal == 'joe')")))) .isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); @@ -69,7 +69,7 @@ public class MethodExpressionVoterTests { public void accessIsGrantedIfNoPreAuthorizeAttributeIsUsed() throws Exception { Collection arg = createCollectionArg("joe", "bob", "sam"); MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingACollection(), arg); - assertThat(am.vote(joe, mi, + assertThat(this.am.vote(this.joe, mi, createAttributes(new PreInvocationExpressionAttribute("(filterObject == 'jim')", "collection", null)))) .isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); // All objects should have been removed, because the expression is always false @@ -80,7 +80,7 @@ public class MethodExpressionVoterTests { public void collectionPreFilteringIsSuccessful() throws Exception { List arg = createCollectionArg("joe", "bob", "sam"); MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingACollection(), arg); - am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute( + this.am.vote(this.joe, mi, createAttributes(new PreInvocationExpressionAttribute( "(filterObject == 'joe' or filterObject == 'sam')", "collection", "permitAll"))); assertThat(arg).containsExactly("joe", "sam"); } @@ -89,7 +89,7 @@ public class MethodExpressionVoterTests { public void arraysCannotBePrefiltered() throws Exception { MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAnArray(), createArrayArg("sam", "joe")); - am.vote(joe, mi, + this.am.vote(this.joe, mi, createAttributes(new PreInvocationExpressionAttribute("(filterObject == 'jim')", "someArray", null))); } @@ -97,7 +97,7 @@ public class MethodExpressionVoterTests { public void incorrectFilterTargetNameIsRejected() throws Exception { MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingACollection(), createCollectionArg("joe", "bob")); - am.vote(joe, mi, + this.am.vote(this.joe, mi, createAttributes(new PreInvocationExpressionAttribute("(filterObject == 'joe')", "collcetion", null))); } @@ -105,7 +105,7 @@ public class MethodExpressionVoterTests { public void nullNamedFilterTargetIsRejected() throws Exception { MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingACollection(), new Object[] { null }); - am.vote(joe, mi, + this.am.vote(this.joe, mi, createAttributes(new PreInvocationExpressionAttribute("(filterObject == 'joe')", "collection", null))); } @@ -114,7 +114,7 @@ public class MethodExpressionVoterTests { MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAString(), "joe"); assertThat( - am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(null, null, + this.am.vote(this.joe, mi, createAttributes(new PreInvocationExpressionAttribute(null, null, "T(org.springframework.security.access.expression.method.SecurityRules).isJoe(#argument)")))) .isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); } diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java index 5d83a6b8e8..7870917a46 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java @@ -50,12 +50,12 @@ public class MethodSecurityEvaluationContextTests { public void lookupVariableWhenParameterNameNullThenNotSet() { Class type = String.class; Method method = ReflectionUtils.findMethod(String.class, "contains", CharSequence.class); - doReturn(new String[] { null }).when(paramNameDiscoverer).getParameterNames(method); - doReturn(new Object[] { null }).when(methodInvocation).getArguments(); - doReturn(type).when(methodInvocation).getThis(); - doReturn(method).when(methodInvocation).getMethod(); + doReturn(new String[] { null }).when(this.paramNameDiscoverer).getParameterNames(method); + doReturn(new Object[] { null }).when(this.methodInvocation).getArguments(); + doReturn(type).when(this.methodInvocation).getThis(); + doReturn(method).when(this.methodInvocation).getMethod(); NotNullVariableMethodSecurityEvaluationContext context = new NotNullVariableMethodSecurityEvaluationContext( - authentication, methodInvocation, paramNameDiscoverer); + this.authentication, this.methodInvocation, this.paramNameDiscoverer); context.lookupVariable("testVariable"); } diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java index a29e12e241..4867824140 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java @@ -51,43 +51,43 @@ public class MethodSecurityExpressionRootTests { @Before public void createContext() { - user = mock(Authentication.class); - root = new MethodSecurityExpressionRoot(user); - ctx = new StandardEvaluationContext(); - ctx.setRootObject(root); - trustResolver = mock(AuthenticationTrustResolver.class); - root.setTrustResolver(trustResolver); + this.user = mock(Authentication.class); + this.root = new MethodSecurityExpressionRoot(this.user); + this.ctx = new StandardEvaluationContext(); + this.ctx.setRootObject(this.root); + this.trustResolver = mock(AuthenticationTrustResolver.class); + this.root.setTrustResolver(this.trustResolver); } @Test public void canCallMethodsOnVariables() { - ctx.setVariable("var", "somestring"); - Expression e = parser.parseExpression("#var.length() == 10"); + this.ctx.setVariable("var", "somestring"); + Expression e = this.parser.parseExpression("#var.length() == 10"); - assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isTrue(); + assertThat(ExpressionUtils.evaluateAsBoolean(e, this.ctx)).isTrue(); } @Test public void isAnonymousReturnsTrueIfTrustResolverReportsAnonymous() { - when(trustResolver.isAnonymous(user)).thenReturn(true); - assertThat(root.isAnonymous()).isTrue(); + when(this.trustResolver.isAnonymous(this.user)).thenReturn(true); + assertThat(this.root.isAnonymous()).isTrue(); } @Test public void isAnonymousReturnsFalseIfTrustResolverReportsNonAnonymous() { - when(trustResolver.isAnonymous(user)).thenReturn(false); - assertThat(root.isAnonymous()).isFalse(); + when(this.trustResolver.isAnonymous(this.user)).thenReturn(false); + assertThat(this.root.isAnonymous()).isFalse(); } @Test public void hasPermissionOnDomainObjectReturnsFalseIfPermissionEvaluatorDoes() { final Object dummyDomainObject = new Object(); final PermissionEvaluator pe = mock(PermissionEvaluator.class); - ctx.setVariable("domainObject", dummyDomainObject); - root.setPermissionEvaluator(pe); - when(pe.hasPermission(user, dummyDomainObject, "ignored")).thenReturn(false); + this.ctx.setVariable("domainObject", dummyDomainObject); + this.root.setPermissionEvaluator(pe); + when(pe.hasPermission(this.user, dummyDomainObject, "ignored")).thenReturn(false); - assertThat(root.hasPermission(dummyDomainObject, "ignored")).isFalse(); + assertThat(this.root.hasPermission(dummyDomainObject, "ignored")).isFalse(); } @@ -95,31 +95,31 @@ public class MethodSecurityExpressionRootTests { public void hasPermissionOnDomainObjectReturnsTrueIfPermissionEvaluatorDoes() { final Object dummyDomainObject = new Object(); final PermissionEvaluator pe = mock(PermissionEvaluator.class); - ctx.setVariable("domainObject", dummyDomainObject); - root.setPermissionEvaluator(pe); - when(pe.hasPermission(user, dummyDomainObject, "ignored")).thenReturn(true); + this.ctx.setVariable("domainObject", dummyDomainObject); + this.root.setPermissionEvaluator(pe); + when(pe.hasPermission(this.user, dummyDomainObject, "ignored")).thenReturn(true); - assertThat(root.hasPermission(dummyDomainObject, "ignored")).isTrue(); + assertThat(this.root.hasPermission(dummyDomainObject, "ignored")).isTrue(); } @Test public void hasPermissionOnDomainObjectWorksWithIntegerExpressions() { final Object dummyDomainObject = new Object(); - ctx.setVariable("domainObject", dummyDomainObject); + this.ctx.setVariable("domainObject", dummyDomainObject); final PermissionEvaluator pe = mock(PermissionEvaluator.class); - root.setPermissionEvaluator(pe); - when(pe.hasPermission(eq(user), eq(dummyDomainObject), any(Integer.class))).thenReturn(true).thenReturn(true) - .thenReturn(false); + this.root.setPermissionEvaluator(pe); + when(pe.hasPermission(eq(this.user), eq(dummyDomainObject), any(Integer.class))).thenReturn(true) + .thenReturn(true).thenReturn(false); - Expression e = parser.parseExpression("hasPermission(#domainObject, 0xA)"); + Expression e = this.parser.parseExpression("hasPermission(#domainObject, 0xA)"); // evaluator returns true - assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isTrue(); - e = parser.parseExpression("hasPermission(#domainObject, 10)"); + assertThat(ExpressionUtils.evaluateAsBoolean(e, this.ctx)).isTrue(); + e = this.parser.parseExpression("hasPermission(#domainObject, 10)"); // evaluator returns true - assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isTrue(); - e = parser.parseExpression("hasPermission(#domainObject, 0xFF)"); + assertThat(ExpressionUtils.evaluateAsBoolean(e, this.ctx)).isTrue(); + e = this.parser.parseExpression("hasPermission(#domainObject, 0xFF)"); // evaluator returns false, make sure return value matches - assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isFalse(); + assertThat(ExpressionUtils.evaluateAsBoolean(e, this.ctx)).isFalse(); } @Test @@ -129,20 +129,20 @@ public class MethodSecurityExpressionRootTests { return "x"; } }; - root.setThis(targetObject); + this.root.setThis(targetObject); Integer i = 2; PermissionEvaluator pe = mock(PermissionEvaluator.class); - root.setPermissionEvaluator(pe); - when(pe.hasPermission(user, targetObject, i)).thenReturn(true).thenReturn(false); - when(pe.hasPermission(user, "x", i)).thenReturn(true); + this.root.setPermissionEvaluator(pe); + when(pe.hasPermission(this.user, targetObject, i)).thenReturn(true).thenReturn(false); + when(pe.hasPermission(this.user, "x", i)).thenReturn(true); - Expression e = parser.parseExpression("hasPermission(this, 2)"); - assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isTrue(); - e = parser.parseExpression("hasPermission(this, 2)"); - assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isFalse(); + Expression e = this.parser.parseExpression("hasPermission(this, 2)"); + assertThat(ExpressionUtils.evaluateAsBoolean(e, this.ctx)).isTrue(); + e = this.parser.parseExpression("hasPermission(this, 2)"); + assertThat(ExpressionUtils.evaluateAsBoolean(e, this.ctx)).isFalse(); - e = parser.parseExpression("hasPermission(this.x, 2)"); - assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isTrue(); + e = this.parser.parseExpression("hasPermission(this.x, 2)"); + assertThat(ExpressionUtils.evaluateAsBoolean(e, this.ctx)).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java index a1ea26bf53..2b6deae285 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java @@ -68,25 +68,25 @@ public class PrePostAnnotationSecurityMetadataSourceTests { @Before public void setUpData() throws Exception { - voidImpl1 = new MockMethodInvocation(new ReturnVoidImpl1(), ReturnVoid.class, "doSomething", List.class); - voidImpl2 = new MockMethodInvocation(new ReturnVoidImpl2(), ReturnVoid.class, "doSomething", List.class); - voidImpl3 = new MockMethodInvocation(new ReturnVoidImpl3(), ReturnVoid.class, "doSomething", List.class); - listImpl1 = new MockMethodInvocation(new ReturnAListImpl1(), ReturnAList.class, "doSomething", List.class); - notherListImpl1 = new MockMethodInvocation(new ReturnAnotherListImpl1(), ReturnAnotherList.class, "doSomething", - List.class); - notherListImpl2 = new MockMethodInvocation(new ReturnAnotherListImpl2(), ReturnAnotherList.class, "doSomething", - List.class); - annotatedAtClassLevel = new MockMethodInvocation(new CustomAnnotationAtClassLevel(), ReturnVoid.class, + this.voidImpl1 = new MockMethodInvocation(new ReturnVoidImpl1(), ReturnVoid.class, "doSomething", List.class); + this.voidImpl2 = new MockMethodInvocation(new ReturnVoidImpl2(), ReturnVoid.class, "doSomething", List.class); + this.voidImpl3 = new MockMethodInvocation(new ReturnVoidImpl3(), ReturnVoid.class, "doSomething", List.class); + this.listImpl1 = new MockMethodInvocation(new ReturnAListImpl1(), ReturnAList.class, "doSomething", List.class); + this.notherListImpl1 = new MockMethodInvocation(new ReturnAnotherListImpl1(), ReturnAnotherList.class, "doSomething", List.class); - annotatedAtInterfaceLevel = new MockMethodInvocation(new CustomAnnotationAtInterfaceLevel(), ReturnVoid2.class, + this.notherListImpl2 = new MockMethodInvocation(new ReturnAnotherListImpl2(), ReturnAnotherList.class, "doSomething", List.class); - annotatedAtMethodLevel = new MockMethodInvocation(new CustomAnnotationAtMethodLevel(), ReturnVoid.class, + this.annotatedAtClassLevel = new MockMethodInvocation(new CustomAnnotationAtClassLevel(), ReturnVoid.class, + "doSomething", List.class); + this.annotatedAtInterfaceLevel = new MockMethodInvocation(new CustomAnnotationAtInterfaceLevel(), + ReturnVoid2.class, "doSomething", List.class); + this.annotatedAtMethodLevel = new MockMethodInvocation(new CustomAnnotationAtMethodLevel(), ReturnVoid.class, "doSomething", List.class); } @Test public void classLevelPreAnnotationIsPickedUpWhenNoMethodLevelExists() { - ConfigAttribute[] attrs = mds.getAttributes(voidImpl1).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(this.voidImpl1).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); @@ -98,7 +98,7 @@ public class PrePostAnnotationSecurityMetadataSourceTests { @Test public void mixedClassAndMethodPreAnnotationsAreBothIncluded() { - ConfigAttribute[] attrs = mds.getAttributes(voidImpl2).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(this.voidImpl2).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); @@ -110,7 +110,7 @@ public class PrePostAnnotationSecurityMetadataSourceTests { @Test public void methodWithPreFilterOnlyIsAllowed() { - ConfigAttribute[] attrs = mds.getAttributes(voidImpl3).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(this.voidImpl3).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); @@ -122,7 +122,7 @@ public class PrePostAnnotationSecurityMetadataSourceTests { @Test public void methodWithPostFilterOnlyIsAllowed() { - ConfigAttribute[] attrs = mds.getAttributes(listImpl1).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(this.listImpl1).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(2); assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); @@ -136,7 +136,7 @@ public class PrePostAnnotationSecurityMetadataSourceTests { @Test public void interfaceAttributesAreIncluded() { - ConfigAttribute[] attrs = mds.getAttributes(notherListImpl1).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(this.notherListImpl1).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); @@ -149,7 +149,7 @@ public class PrePostAnnotationSecurityMetadataSourceTests { @Test public void classAttributesTakesPrecedeceOverInterfaceAttributes() { - ConfigAttribute[] attrs = mds.getAttributes(notherListImpl2).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(this.notherListImpl2).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); @@ -162,21 +162,22 @@ public class PrePostAnnotationSecurityMetadataSourceTests { @Test public void customAnnotationAtClassLevelIsDetected() { - ConfigAttribute[] attrs = mds.getAttributes(annotatedAtClassLevel).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(this.annotatedAtClassLevel).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); } @Test public void customAnnotationAtInterfaceLevelIsDetected() { - ConfigAttribute[] attrs = mds.getAttributes(annotatedAtInterfaceLevel).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(this.annotatedAtInterfaceLevel) + .toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); } @Test public void customAnnotationAtMethodLevelIsDetected() { - ConfigAttribute[] attrs = mds.getAttributes(annotatedAtMethodLevel).toArray(new ConfigAttribute[0]); + ConfigAttribute[] attrs = this.mds.getAttributes(this.annotatedAtMethodLevel).toArray(new ConfigAttribute[0]); assertThat(attrs).hasSize(1); } @@ -184,7 +185,7 @@ public class PrePostAnnotationSecurityMetadataSourceTests { @Test public void proxyFactoryInterfaceAttributesFound() throws Exception { MockMethodInvocation mi = MethodInvocationFactory.createSec2150MethodInvocation(); - Collection attributes = mds.getAttributes(mi); + Collection attributes = this.mds.getAttributes(mi); assertThat(attributes).hasSize(1); Expression expression = (Expression) ReflectionTestUtils.getField(attributes.iterator().next(), "authorizeExpression"); diff --git a/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java index 15ba3a6911..0f97da499c 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java @@ -65,7 +65,7 @@ public class AbstractSecurityInterceptorTests { } public SecurityMetadataSource obtainSecurityMetadataSource() { - return securityMetadataSource; + return this.securityMetadataSource; } public void setSecurityMetadataSource(SecurityMetadataSource securityMetadataSource) { @@ -83,7 +83,7 @@ public class AbstractSecurityInterceptorTests { } public SecurityMetadataSource obtainSecurityMetadataSource() { - return securityMetadataSource; + return this.securityMetadataSource; } public void setSecurityMetadataSource(SecurityMetadataSource securityMetadataSource) { diff --git a/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java index eb219a0907..95c72aee73 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java @@ -167,19 +167,19 @@ public class AfterInvocationProviderManagerTests { public Object decide(Authentication authentication, Object object, Collection config, Object returnedObject) throws AccessDeniedException { - if (config.contains(configAttribute)) { - return forceReturnObject; + if (config.contains(this.configAttribute)) { + return this.forceReturnObject; } return returnedObject; } public boolean supports(Class clazz) { - return secureObject.isAssignableFrom(clazz); + return this.secureObject.isAssignableFrom(clazz); } public boolean supports(ConfigAttribute attribute) { - return attribute.equals(configAttribute); + return attribute.equals(this.configAttribute); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java index 556e6212cb..87293e45be 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java @@ -86,16 +86,16 @@ public class MethodSecurityInterceptorTests { @Before public final void setUp() { SecurityContextHolder.clearContext(); - token = new TestingAuthenticationToken("Test", "Password"); - interceptor = new MethodSecurityInterceptor(); - adm = mock(AccessDecisionManager.class); - authman = mock(AuthenticationManager.class); - mds = mock(MethodSecurityMetadataSource.class); - eventPublisher = mock(ApplicationEventPublisher.class); - interceptor.setAccessDecisionManager(adm); - interceptor.setAuthenticationManager(authman); - interceptor.setSecurityMetadataSource(mds); - interceptor.setApplicationEventPublisher(eventPublisher); + this.token = new TestingAuthenticationToken("Test", "Password"); + this.interceptor = new MethodSecurityInterceptor(); + this.adm = mock(AccessDecisionManager.class); + this.authman = mock(AuthenticationManager.class); + this.mds = mock(MethodSecurityMetadataSource.class); + this.eventPublisher = mock(ApplicationEventPublisher.class); + this.interceptor.setAccessDecisionManager(this.adm); + this.interceptor.setAuthenticationManager(this.authman); + this.interceptor.setSecurityMetadataSource(this.mds); + this.interceptor.setApplicationEventPublisher(this.eventPublisher); createTarget(false); } @@ -105,119 +105,119 @@ public class MethodSecurityInterceptorTests { } private void createTarget(boolean useMock) { - realTarget = useMock ? mock(ITargetObject.class) : new TargetObject(); - ProxyFactory pf = new ProxyFactory(realTarget); - pf.addAdvice(interceptor); - advisedTarget = (ITargetObject) pf.getProxy(); + this.realTarget = useMock ? mock(ITargetObject.class) : new TargetObject(); + ProxyFactory pf = new ProxyFactory(this.realTarget); + pf.addAdvice(this.interceptor); + this.advisedTarget = (ITargetObject) pf.getProxy(); } @Test public void gettersReturnExpectedData() { RunAsManager runAs = mock(RunAsManager.class); AfterInvocationManager aim = mock(AfterInvocationManager.class); - interceptor.setRunAsManager(runAs); - interceptor.setAfterInvocationManager(aim); - assertThat(interceptor.getAccessDecisionManager()).isEqualTo(adm); - assertThat(interceptor.getRunAsManager()).isEqualTo(runAs); - assertThat(interceptor.getAuthenticationManager()).isEqualTo(authman); - assertThat(interceptor.getSecurityMetadataSource()).isEqualTo(mds); - assertThat(interceptor.getAfterInvocationManager()).isEqualTo(aim); + this.interceptor.setRunAsManager(runAs); + this.interceptor.setAfterInvocationManager(aim); + assertThat(this.interceptor.getAccessDecisionManager()).isEqualTo(this.adm); + assertThat(this.interceptor.getRunAsManager()).isEqualTo(runAs); + assertThat(this.interceptor.getAuthenticationManager()).isEqualTo(this.authman); + assertThat(this.interceptor.getSecurityMetadataSource()).isEqualTo(this.mds); + assertThat(this.interceptor.getAfterInvocationManager()).isEqualTo(aim); } @Test(expected = IllegalArgumentException.class) public void missingAccessDecisionManagerIsDetected() throws Exception { - interceptor.setAccessDecisionManager(null); - interceptor.afterPropertiesSet(); + this.interceptor.setAccessDecisionManager(null); + this.interceptor.afterPropertiesSet(); } @Test(expected = IllegalArgumentException.class) public void missingAuthenticationManagerIsDetected() throws Exception { - interceptor.setAuthenticationManager(null); - interceptor.afterPropertiesSet(); + this.interceptor.setAuthenticationManager(null); + this.interceptor.afterPropertiesSet(); } @Test(expected = IllegalArgumentException.class) public void missingMethodSecurityMetadataSourceIsRejected() throws Exception { - interceptor.setSecurityMetadataSource(null); - interceptor.afterPropertiesSet(); + this.interceptor.setSecurityMetadataSource(null); + this.interceptor.afterPropertiesSet(); } @Test(expected = IllegalArgumentException.class) public void missingRunAsManagerIsRejected() throws Exception { - interceptor.setRunAsManager(null); - interceptor.afterPropertiesSet(); + this.interceptor.setRunAsManager(null); + this.interceptor.afterPropertiesSet(); } @Test(expected = IllegalArgumentException.class) public void initializationRejectsSecurityMetadataSourceThatDoesNotSupportMethodInvocation() throws Throwable { - when(mds.supports(MethodInvocation.class)).thenReturn(false); - interceptor.afterPropertiesSet(); + when(this.mds.supports(MethodInvocation.class)).thenReturn(false); + this.interceptor.afterPropertiesSet(); } @Test(expected = IllegalArgumentException.class) public void initializationRejectsAccessDecisionManagerThatDoesNotSupportMethodInvocation() throws Exception { - when(mds.supports(MethodInvocation.class)).thenReturn(true); - when(adm.supports(MethodInvocation.class)).thenReturn(false); - interceptor.afterPropertiesSet(); + when(this.mds.supports(MethodInvocation.class)).thenReturn(true); + when(this.adm.supports(MethodInvocation.class)).thenReturn(false); + this.interceptor.afterPropertiesSet(); } @Test(expected = IllegalArgumentException.class) public void intitalizationRejectsRunAsManagerThatDoesNotSupportMethodInvocation() throws Exception { final RunAsManager ram = mock(RunAsManager.class); when(ram.supports(MethodInvocation.class)).thenReturn(false); - interceptor.setRunAsManager(ram); - interceptor.afterPropertiesSet(); + this.interceptor.setRunAsManager(ram); + this.interceptor.afterPropertiesSet(); } @Test(expected = IllegalArgumentException.class) public void intitalizationRejectsAfterInvocationManagerThatDoesNotSupportMethodInvocation() throws Exception { final AfterInvocationManager aim = mock(AfterInvocationManager.class); when(aim.supports(MethodInvocation.class)).thenReturn(false); - interceptor.setAfterInvocationManager(aim); - interceptor.afterPropertiesSet(); + this.interceptor.setAfterInvocationManager(aim); + this.interceptor.afterPropertiesSet(); } @Test(expected = IllegalArgumentException.class) public void initializationFailsIfAccessDecisionManagerRejectsConfigAttributes() throws Exception { - when(adm.supports(any(ConfigAttribute.class))).thenReturn(false); - interceptor.afterPropertiesSet(); + when(this.adm.supports(any(ConfigAttribute.class))).thenReturn(false); + this.interceptor.afterPropertiesSet(); } @Test public void validationNotAttemptedIfIsValidateConfigAttributesSetToFalse() throws Exception { - when(adm.supports(MethodInvocation.class)).thenReturn(true); - when(mds.supports(MethodInvocation.class)).thenReturn(true); - interceptor.setValidateConfigAttributes(false); - interceptor.afterPropertiesSet(); - verify(mds, never()).getAllConfigAttributes(); - verify(adm, never()).supports(any(ConfigAttribute.class)); + when(this.adm.supports(MethodInvocation.class)).thenReturn(true); + when(this.mds.supports(MethodInvocation.class)).thenReturn(true); + this.interceptor.setValidateConfigAttributes(false); + this.interceptor.afterPropertiesSet(); + verify(this.mds, never()).getAllConfigAttributes(); + verify(this.adm, never()).supports(any(ConfigAttribute.class)); } @Test public void validationNotAttemptedIfMethodSecurityMetadataSourceReturnsNullForAttributes() throws Exception { - when(adm.supports(MethodInvocation.class)).thenReturn(true); - when(mds.supports(MethodInvocation.class)).thenReturn(true); - when(mds.getAllConfigAttributes()).thenReturn(null); + when(this.adm.supports(MethodInvocation.class)).thenReturn(true); + when(this.mds.supports(MethodInvocation.class)).thenReturn(true); + when(this.mds.getAllConfigAttributes()).thenReturn(null); - interceptor.setValidateConfigAttributes(true); - interceptor.afterPropertiesSet(); - verify(adm, never()).supports(any(ConfigAttribute.class)); + this.interceptor.setValidateConfigAttributes(true); + this.interceptor.afterPropertiesSet(); + verify(this.adm, never()).supports(any(ConfigAttribute.class)); } @Test public void callingAPublicMethodFacadeWillNotRepeatSecurityChecksWhenPassedToTheSecuredMethodItFronts() { mdsReturnsNull(); - String result = advisedTarget.publicMakeLowerCase("HELLO"); + String result = this.advisedTarget.publicMakeLowerCase("HELLO"); assertThat(result).isEqualTo("hello Authentication empty"); } @Test public void callingAPublicMethodWhenPresentingAnAuthenticationObjectDoesntChangeItsAuthenticatedProperty() { mdsReturnsNull(); - SecurityContextHolder.getContext().setAuthentication(token); - assertThat(advisedTarget.publicMakeLowerCase("HELLO")) + SecurityContextHolder.getContext().setAuthentication(this.token); + assertThat(this.advisedTarget.publicMakeLowerCase("HELLO")) .isEqualTo("hello org.springframework.security.authentication.TestingAuthenticationToken false"); - assertThat(!token.isAuthenticated()).isTrue(); + assertThat(!this.token.isAuthenticated()).isTrue(); } @Test(expected = AuthenticationException.class) @@ -226,87 +226,87 @@ public class MethodSecurityInterceptorTests { SecurityContextHolder.getContext().setAuthentication(token); mdsReturnsUserRole(); - when(authman.authenticate(token)).thenThrow(new BadCredentialsException("rejected")); + when(this.authman.authenticate(token)).thenThrow(new BadCredentialsException("rejected")); - advisedTarget.makeLowerCase("HELLO"); + this.advisedTarget.makeLowerCase("HELLO"); } @Test public void callSucceedsIfAccessDecisionManagerGrantsAccess() { - token.setAuthenticated(true); - interceptor.setPublishAuthorizationSuccess(true); - SecurityContextHolder.getContext().setAuthentication(token); + this.token.setAuthenticated(true); + this.interceptor.setPublishAuthorizationSuccess(true); + SecurityContextHolder.getContext().setAuthentication(this.token); mdsReturnsUserRole(); - String result = advisedTarget.makeLowerCase("HELLO"); + String result = this.advisedTarget.makeLowerCase("HELLO"); // Note we check the isAuthenticated remained true in following line assertThat(result) .isEqualTo("hello org.springframework.security.authentication.TestingAuthenticationToken true"); - verify(eventPublisher).publishEvent(any(AuthorizedEvent.class)); + verify(this.eventPublisher).publishEvent(any(AuthorizedEvent.class)); } @Test public void callIsntMadeWhenAccessDecisionManagerRejectsAccess() { - SecurityContextHolder.getContext().setAuthentication(token); + SecurityContextHolder.getContext().setAuthentication(this.token); // Use mocked target to make sure invocation doesn't happen (not in expectations // so test would fail) createTarget(true); mdsReturnsUserRole(); - when(authman.authenticate(token)).thenReturn(token); - doThrow(new AccessDeniedException("rejected")).when(adm).decide(any(Authentication.class), + when(this.authman.authenticate(this.token)).thenReturn(this.token); + doThrow(new AccessDeniedException("rejected")).when(this.adm).decide(any(Authentication.class), any(MethodInvocation.class), any(List.class)); try { - advisedTarget.makeUpperCase("HELLO"); + this.advisedTarget.makeUpperCase("HELLO"); fail("Expected Exception"); } catch (AccessDeniedException expected) { } - verify(eventPublisher).publishEvent(any(AuthorizationFailureEvent.class)); + verify(this.eventPublisher).publishEvent(any(AuthorizationFailureEvent.class)); } @Test(expected = IllegalArgumentException.class) public void rejectsNullSecuredObjects() throws Throwable { - interceptor.invoke(null); + this.interceptor.invoke(null); } @Test public void runAsReplacementIsCorrectlySet() { SecurityContext ctx = SecurityContextHolder.getContext(); - ctx.setAuthentication(token); - token.setAuthenticated(true); + ctx.setAuthentication(this.token); + this.token.setAuthenticated(true); final RunAsManager runAs = mock(RunAsManager.class); - final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds", token.getAuthorities(), + final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds", this.token.getAuthorities(), TestingAuthenticationToken.class); - interceptor.setRunAsManager(runAs); + this.interceptor.setRunAsManager(runAs); mdsReturnsUserRole(); - when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken); + when(runAs.buildRunAs(eq(this.token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken); - String result = advisedTarget.makeUpperCase("hello"); + String result = this.advisedTarget.makeUpperCase("hello"); assertThat(result).isEqualTo("HELLO org.springframework.security.access.intercept.RunAsUserToken true"); // Check we've changed back assertThat(SecurityContextHolder.getContext()).isSameAs(ctx); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(token); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.token); } // SEC-1967 @Test public void runAsReplacementCleansAfterException() { createTarget(true); - when(realTarget.makeUpperCase(anyString())).thenThrow(new RuntimeException()); + when(this.realTarget.makeUpperCase(anyString())).thenThrow(new RuntimeException()); SecurityContext ctx = SecurityContextHolder.getContext(); - ctx.setAuthentication(token); - token.setAuthenticated(true); + ctx.setAuthentication(this.token); + this.token.setAuthenticated(true); final RunAsManager runAs = mock(RunAsManager.class); - final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds", token.getAuthorities(), + final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds", this.token.getAuthorities(), TestingAuthenticationToken.class); - interceptor.setRunAsManager(runAs); + this.interceptor.setRunAsManager(runAs); mdsReturnsUserRole(); - when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken); + when(runAs.buildRunAs(eq(this.token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken); try { - advisedTarget.makeUpperCase("hello"); + this.advisedTarget.makeUpperCase("hello"); fail("Expected Exception"); } catch (RuntimeException success) { @@ -314,29 +314,29 @@ public class MethodSecurityInterceptorTests { // Check we've changed back assertThat(SecurityContextHolder.getContext()).isSameAs(ctx); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(token); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.token); } @Test(expected = AuthenticationCredentialsNotFoundException.class) public void emptySecurityContextIsRejected() { mdsReturnsUserRole(); - advisedTarget.makeUpperCase("hello"); + this.advisedTarget.makeUpperCase("hello"); } @Test public void afterInvocationManagerIsNotInvokedIfExceptionIsRaised() throws Throwable { MethodInvocation mi = mock(MethodInvocation.class); - token.setAuthenticated(true); - SecurityContextHolder.getContext().setAuthentication(token); + this.token.setAuthenticated(true); + SecurityContextHolder.getContext().setAuthentication(this.token); mdsReturnsUserRole(); AfterInvocationManager aim = mock(AfterInvocationManager.class); - interceptor.setAfterInvocationManager(aim); + this.interceptor.setAfterInvocationManager(aim); when(mi.proceed()).thenThrow(new Throwable()); try { - interceptor.invoke(mi); + this.interceptor.invoke(mi); fail("Expected exception"); } catch (Throwable expected) { @@ -346,11 +346,11 @@ public class MethodSecurityInterceptorTests { } void mdsReturnsNull() { - when(mds.getAttributes(any(MethodInvocation.class))).thenReturn(null); + when(this.mds.getAttributes(any(MethodInvocation.class))).thenReturn(null); } void mdsReturnsUserRole() { - when(mds.getAttributes(any(MethodInvocation.class))).thenReturn(SecurityConfig.createList("ROLE_USER")); + when(this.mds.getAttributes(any(MethodInvocation.class))).thenReturn(SecurityConfig.createList("ROLE_USER")); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java index ec0135c570..7eb19045b9 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java @@ -82,26 +82,26 @@ public class AspectJMethodSecurityInterceptorTests { public final void setUp() { MockitoAnnotations.initMocks(this); SecurityContextHolder.clearContext(); - token = new TestingAuthenticationToken("Test", "Password"); - interceptor = new AspectJMethodSecurityInterceptor(); - interceptor.setAccessDecisionManager(adm); - interceptor.setAuthenticationManager(authman); - interceptor.setSecurityMetadataSource(mds); + this.token = new TestingAuthenticationToken("Test", "Password"); + this.interceptor = new AspectJMethodSecurityInterceptor(); + this.interceptor.setAccessDecisionManager(this.adm); + this.interceptor.setAuthenticationManager(this.authman); + this.interceptor.setSecurityMetadataSource(this.mds); // Set up joinpoint information for the countLength method on TargetObject - joinPoint = mock(ProceedingJoinPoint.class); // new MockJoinPoint(new - // TargetObject(), method); + this.joinPoint = mock(ProceedingJoinPoint.class); // new MockJoinPoint(new + // TargetObject(), method); Signature sig = mock(Signature.class); when(sig.getDeclaringType()).thenReturn(TargetObject.class); JoinPoint.StaticPart staticPart = mock(JoinPoint.StaticPart.class); - when(joinPoint.getSignature()).thenReturn(sig); - when(joinPoint.getStaticPart()).thenReturn(staticPart); + when(this.joinPoint.getSignature()).thenReturn(sig); + when(this.joinPoint.getStaticPart()).thenReturn(staticPart); CodeSignature codeSig = mock(CodeSignature.class); when(codeSig.getName()).thenReturn("countLength"); when(codeSig.getDeclaringType()).thenReturn(TargetObject.class); when(codeSig.getParameterTypes()).thenReturn(new Class[] { String.class }); when(staticPart.getSignature()).thenReturn(codeSig); - when(mds.getAttributes(any())).thenReturn(SecurityConfig.createList("ROLE_USER")); - when(authman.authenticate(token)).thenReturn(token); + when(this.mds.getAttributes(any())).thenReturn(SecurityConfig.createList("ROLE_USER")); + when(this.authman.authenticate(this.token)).thenReturn(this.token); } @After @@ -111,27 +111,27 @@ public class AspectJMethodSecurityInterceptorTests { @Test public void callbackIsInvokedWhenPermissionGranted() throws Throwable { - SecurityContextHolder.getContext().setAuthentication(token); - interceptor.invoke(joinPoint, aspectJCallback); - verify(aspectJCallback).proceedWithObject(); + SecurityContextHolder.getContext().setAuthentication(this.token); + this.interceptor.invoke(this.joinPoint, this.aspectJCallback); + verify(this.aspectJCallback).proceedWithObject(); // Just try the other method too - interceptor.invoke(joinPoint); + this.interceptor.invoke(this.joinPoint); } @SuppressWarnings("unchecked") @Test public void callbackIsNotInvokedWhenPermissionDenied() { - doThrow(new AccessDeniedException("denied")).when(adm).decide(any(), any(), any()); + doThrow(new AccessDeniedException("denied")).when(this.adm).decide(any(), any(), any()); - SecurityContextHolder.getContext().setAuthentication(token); + SecurityContextHolder.getContext().setAuthentication(this.token); try { - interceptor.invoke(joinPoint, aspectJCallback); + this.interceptor.invoke(this.joinPoint, this.aspectJCallback); fail("Expected AccessDeniedException"); } catch (AccessDeniedException expected) { } - verify(aspectJCallback, never()).proceedWithObject(); + verify(this.aspectJCallback, never()).proceedWithObject(); } @Test @@ -139,9 +139,9 @@ public class AspectJMethodSecurityInterceptorTests { TargetObject to = new TargetObject(); Method m = ClassUtils.getMethodIfAvailable(TargetObject.class, "countLength", new Class[] { String.class }); - when(joinPoint.getTarget()).thenReturn(to); - when(joinPoint.getArgs()).thenReturn(new Object[] { "Hi" }); - MethodInvocationAdapter mia = new MethodInvocationAdapter(joinPoint); + when(this.joinPoint.getTarget()).thenReturn(to); + when(this.joinPoint.getArgs()).thenReturn(new Object[] { "Hi" }); + MethodInvocationAdapter mia = new MethodInvocationAdapter(this.joinPoint); assertThat(mia.getArguments()[0]).isEqualTo("Hi"); assertThat(mia.getStaticPart()).isEqualTo(m); assertThat(mia.getMethod()).isEqualTo(m); @@ -150,16 +150,16 @@ public class AspectJMethodSecurityInterceptorTests { @Test public void afterInvocationManagerIsNotInvokedIfExceptionIsRaised() { - token.setAuthenticated(true); - SecurityContextHolder.getContext().setAuthentication(token); + this.token.setAuthenticated(true); + SecurityContextHolder.getContext().setAuthentication(this.token); AfterInvocationManager aim = mock(AfterInvocationManager.class); - interceptor.setAfterInvocationManager(aim); + this.interceptor.setAfterInvocationManager(aim); - when(aspectJCallback.proceedWithObject()).thenThrow(new RuntimeException()); + when(this.aspectJCallback.proceedWithObject()).thenThrow(new RuntimeException()); try { - interceptor.invoke(joinPoint, aspectJCallback); + this.interceptor.invoke(this.joinPoint, this.aspectJCallback); fail("Expected exception"); } catch (RuntimeException expected) { @@ -173,17 +173,17 @@ public class AspectJMethodSecurityInterceptorTests { @SuppressWarnings("unchecked") public void invokeWithAspectJCallbackRunAsReplacementCleansAfterException() { SecurityContext ctx = SecurityContextHolder.getContext(); - ctx.setAuthentication(token); - token.setAuthenticated(true); + ctx.setAuthentication(this.token); + this.token.setAuthenticated(true); final RunAsManager runAs = mock(RunAsManager.class); - final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds", token.getAuthorities(), + final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds", this.token.getAuthorities(), TestingAuthenticationToken.class); - interceptor.setRunAsManager(runAs); - when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken); - when(aspectJCallback.proceedWithObject()).thenThrow(new RuntimeException()); + this.interceptor.setRunAsManager(runAs); + when(runAs.buildRunAs(eq(this.token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken); + when(this.aspectJCallback.proceedWithObject()).thenThrow(new RuntimeException()); try { - interceptor.invoke(joinPoint, aspectJCallback); + this.interceptor.invoke(this.joinPoint, this.aspectJCallback); fail("Expected Exception"); } catch (RuntimeException success) { @@ -191,7 +191,7 @@ public class AspectJMethodSecurityInterceptorTests { // Check we've changed back assertThat(SecurityContextHolder.getContext()).isSameAs(ctx); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(token); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.token); } // SEC-1967 @@ -199,17 +199,17 @@ public class AspectJMethodSecurityInterceptorTests { @SuppressWarnings("unchecked") public void invokeRunAsReplacementCleansAfterException() throws Throwable { SecurityContext ctx = SecurityContextHolder.getContext(); - ctx.setAuthentication(token); - token.setAuthenticated(true); + ctx.setAuthentication(this.token); + this.token.setAuthenticated(true); final RunAsManager runAs = mock(RunAsManager.class); - final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds", token.getAuthorities(), + final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds", this.token.getAuthorities(), TestingAuthenticationToken.class); - interceptor.setRunAsManager(runAs); - when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken); - when(joinPoint.proceed()).thenThrow(new RuntimeException()); + this.interceptor.setRunAsManager(runAs); + when(runAs.buildRunAs(eq(this.token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken); + when(this.joinPoint.proceed()).thenThrow(new RuntimeException()); try { - interceptor.invoke(joinPoint); + this.interceptor.invoke(this.joinPoint); fail("Expected Exception"); } catch (RuntimeException success) { @@ -217,7 +217,7 @@ public class AspectJMethodSecurityInterceptorTests { // Check we've changed back assertThat(SecurityContextHolder.getContext()).isSameAs(ctx); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(token); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.token); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java index 2ba54a6dd7..cc977f4176 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java @@ -47,25 +47,25 @@ public class MapBasedMethodSecurityMetadataSourceTests { @Before public void initialize() throws Exception { - mds = new MapBasedMethodSecurityMetadataSource(); - someMethodString = MockService.class.getMethod("someMethod", String.class); - someMethodInteger = MockService.class.getMethod("someMethod", Integer.class); + this.mds = new MapBasedMethodSecurityMetadataSource(); + this.someMethodString = MockService.class.getMethod("someMethod", String.class); + this.someMethodInteger = MockService.class.getMethod("someMethod", Integer.class); } @Test public void wildcardedMatchIsOverwrittenByMoreSpecificMatch() { - mds.addSecureMethod(MockService.class, "some*", ROLE_A); - mds.addSecureMethod(MockService.class, "someMethod*", ROLE_B); - assertThat(mds.getAttributes(someMethodInteger, MockService.class)).isEqualTo(ROLE_B); + this.mds.addSecureMethod(MockService.class, "some*", this.ROLE_A); + this.mds.addSecureMethod(MockService.class, "someMethod*", this.ROLE_B); + assertThat(this.mds.getAttributes(this.someMethodInteger, MockService.class)).isEqualTo(this.ROLE_B); } @Test public void methodsWithDifferentArgumentsAreMatchedCorrectly() { - mds.addSecureMethod(MockService.class, someMethodInteger, ROLE_A); - mds.addSecureMethod(MockService.class, someMethodString, ROLE_B); + this.mds.addSecureMethod(MockService.class, this.someMethodInteger, this.ROLE_A); + this.mds.addSecureMethod(MockService.class, this.someMethodString, this.ROLE_B); - assertThat(mds.getAttributes(someMethodInteger, MockService.class)).isEqualTo(ROLE_A); - assertThat(mds.getAttributes(someMethodString, MockService.class)).isEqualTo(ROLE_B); + assertThat(this.mds.getAttributes(this.someMethodInteger, MockService.class)).isEqualTo(this.ROLE_A); + assertThat(this.mds.getAttributes(this.someMethodString, MockService.class)).isEqualTo(this.ROLE_B); } @SuppressWarnings("unused") diff --git a/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java index 999d8dd7f2..b98b4c3487 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java @@ -64,14 +64,14 @@ public class MethodInvocationPrivilegeEvaluatorTests { @Before public final void setUp() { SecurityContextHolder.clearContext(); - interceptor = new MethodSecurityInterceptor(); - token = new TestingAuthenticationToken("Test", "Password", "ROLE_SOMETHING"); - adm = mock(AccessDecisionManager.class); + this.interceptor = new MethodSecurityInterceptor(); + this.token = new TestingAuthenticationToken("Test", "Password", "ROLE_SOMETHING"); + this.adm = mock(AccessDecisionManager.class); AuthenticationManager authman = mock(AuthenticationManager.class); - mds = mock(MethodSecurityMetadataSource.class); - interceptor.setAccessDecisionManager(adm); - interceptor.setAuthenticationManager(authman); - interceptor.setSecurityMetadataSource(mds); + this.mds = mock(MethodSecurityMetadataSource.class); + this.interceptor.setAccessDecisionManager(this.adm); + this.interceptor.setAuthenticationManager(authman); + this.interceptor.setSecurityMetadataSource(this.mds); } @Test @@ -80,12 +80,12 @@ public class MethodInvocationPrivilegeEvaluatorTests { final MethodInvocation mi = MethodInvocationUtils.create(object, "makeLowerCase", "foobar"); MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator(); - when(mds.getAttributes(mi)).thenReturn(role); + when(this.mds.getAttributes(mi)).thenReturn(this.role); - mipe.setSecurityInterceptor(interceptor); + mipe.setSecurityInterceptor(this.interceptor); mipe.afterPropertiesSet(); - assertThat(mipe.isAllowed(mi, token)).isTrue(); + assertThat(mipe.isAllowed(mi, this.token)).isTrue(); } @Test @@ -93,10 +93,10 @@ public class MethodInvocationPrivilegeEvaluatorTests { final MethodInvocation mi = MethodInvocationUtils.createFromClass(new OtherTargetObject(), ITargetObject.class, "makeLowerCase", new Class[] { String.class }, new Object[] { "Hello world" }); MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator(); - mipe.setSecurityInterceptor(interceptor); - when(mds.getAttributes(mi)).thenReturn(role); + mipe.setSecurityInterceptor(this.interceptor); + when(this.mds.getAttributes(mi)).thenReturn(this.role); - assertThat(mipe.isAllowed(mi, token)).isTrue(); + assertThat(mipe.isAllowed(mi, this.token)).isTrue(); } @Test @@ -104,11 +104,11 @@ public class MethodInvocationPrivilegeEvaluatorTests { Object object = new TargetObject(); final MethodInvocation mi = MethodInvocationUtils.create(object, "makeLowerCase", "foobar"); MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator(); - mipe.setSecurityInterceptor(interceptor); - when(mds.getAttributes(mi)).thenReturn(role); - doThrow(new AccessDeniedException("rejected")).when(adm).decide(token, mi, role); + mipe.setSecurityInterceptor(this.interceptor); + when(this.mds.getAttributes(mi)).thenReturn(this.role); + doThrow(new AccessDeniedException("rejected")).when(this.adm).decide(this.token, mi, this.role); - assertThat(mipe.isAllowed(mi, token)).isFalse(); + assertThat(mipe.isAllowed(mi, this.token)).isFalse(); } @Test @@ -117,11 +117,11 @@ public class MethodInvocationPrivilegeEvaluatorTests { "makeLowerCase", new Class[] { String.class }, new Object[] { "helloWorld" }); MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator(); - mipe.setSecurityInterceptor(interceptor); - when(mds.getAttributes(mi)).thenReturn(role); - doThrow(new AccessDeniedException("rejected")).when(adm).decide(token, mi, role); + mipe.setSecurityInterceptor(this.interceptor); + when(this.mds.getAttributes(mi)).thenReturn(this.role); + doThrow(new AccessDeniedException("rejected")).when(this.adm).decide(this.token, mi, this.role); - assertThat(mipe.isAllowed(mi, token)).isFalse(); + assertThat(mipe.isAllowed(mi, this.token)).isFalse(); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java b/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java index b070aec736..75b6009ba3 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java +++ b/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java @@ -42,11 +42,11 @@ public class MockMethodInvocation implements MethodInvocation { } public Object[] getArguments() { - return arguments; + return this.arguments; } public Method getMethod() { - return method; + return this.method; } public AccessibleObject getStaticPart() { @@ -54,7 +54,7 @@ public class MockMethodInvocation implements MethodInvocation { } public Object getThis() { - return targetObject; + return this.targetObject; } public Object proceed() { diff --git a/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java index c9ea88654d..9cb4449776 100644 --- a/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java @@ -47,13 +47,13 @@ public class DelegatingMethodSecurityMetadataSourceTests { when(delegate.getAttributes(ArgumentMatchers.any(), ArgumentMatchers.any(Class.class))) .thenReturn(null); sources.add(delegate); - mds = new DelegatingMethodSecurityMetadataSource(sources); - assertThat(mds.getMethodSecurityMetadataSources()).isSameAs(sources); - assertThat(mds.getAllConfigAttributes().isEmpty()).isTrue(); + this.mds = new DelegatingMethodSecurityMetadataSource(sources); + assertThat(this.mds.getMethodSecurityMetadataSources()).isSameAs(sources); + assertThat(this.mds.getAllConfigAttributes().isEmpty()).isTrue(); MethodInvocation mi = new SimpleMethodInvocation(null, String.class.getMethod("toString")); - assertThat(mds.getAttributes(mi)).isEqualTo(Collections.emptyList()); + assertThat(this.mds.getAttributes(mi)).isEqualTo(Collections.emptyList()); // Exercise the cached case - assertThat(mds.getAttributes(mi)).isEqualTo(Collections.emptyList()); + assertThat(this.mds.getAttributes(mi)).isEqualTo(Collections.emptyList()); } @Test @@ -65,14 +65,15 @@ public class DelegatingMethodSecurityMetadataSourceTests { Method toString = String.class.getMethod("toString"); when(delegate.getAttributes(toString, String.class)).thenReturn(attributes); sources.add(delegate); - mds = new DelegatingMethodSecurityMetadataSource(sources); - assertThat(mds.getMethodSecurityMetadataSources()).isSameAs(sources); - assertThat(mds.getAllConfigAttributes().isEmpty()).isTrue(); + this.mds = new DelegatingMethodSecurityMetadataSource(sources); + assertThat(this.mds.getMethodSecurityMetadataSources()).isSameAs(sources); + assertThat(this.mds.getAllConfigAttributes().isEmpty()).isTrue(); MethodInvocation mi = new SimpleMethodInvocation("", toString); - assertThat(mds.getAttributes(mi)).isSameAs(attributes); + assertThat(this.mds.getAttributes(mi)).isSameAs(attributes); // Exercise the cached case - assertThat(mds.getAttributes(mi)).isSameAs(attributes); - assertThat(mds.getAttributes(new SimpleMethodInvocation(null, String.class.getMethod("length")))).isEmpty(); + assertThat(this.mds.getAttributes(mi)).isSameAs(attributes); + assertThat(this.mds.getAttributes(new SimpleMethodInvocation(null, String.class.getMethod("length")))) + .isEmpty(); } } diff --git a/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java b/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java index 00807efebb..1dbdc8eb7c 100644 --- a/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java @@ -37,23 +37,23 @@ public class PreInvocationAuthorizationAdviceVoterTests { @Before public void setUp() { - voter = new PreInvocationAuthorizationAdviceVoter(authorizationAdvice); + this.voter = new PreInvocationAuthorizationAdviceVoter(this.authorizationAdvice); } @Test public void supportsMethodInvocation() { - assertThat(voter.supports(MethodInvocation.class)).isTrue(); + assertThat(this.voter.supports(MethodInvocation.class)).isTrue(); } // SEC-2031 @Test public void supportsProxyMethodInvocation() { - assertThat(voter.supports(ProxyMethodInvocation.class)).isTrue(); + assertThat(this.voter.supports(ProxyMethodInvocation.class)).isTrue(); } @Test public void supportsMethodInvocationAdapter() { - assertThat(voter.supports(MethodInvocationAdapter.class)).isTrue(); + assertThat(this.voter.supports(MethodInvocationAdapter.class)).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java index 3b96281ca8..036cf30154 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java @@ -45,23 +45,23 @@ public class AbstractAclVoterTests { @Test public void supportsMethodInvocations() { - assertThat(voter.supports(MethodInvocation.class)).isTrue(); - assertThat(voter.supports(String.class)).isFalse(); + assertThat(this.voter.supports(MethodInvocation.class)).isTrue(); + assertThat(this.voter.supports(String.class)).isFalse(); } @Test public void expectedDomainObjectArgumentIsReturnedFromMethodInvocation() { - voter.setProcessDomainObjectClass(String.class); + this.voter.setProcessDomainObjectClass(String.class); MethodInvocation mi = MethodInvocationUtils.create(new TestClass(), "methodTakingAString", "The Argument"); - assertThat(voter.getDomainObjectInstance(mi)).isEqualTo("The Argument"); + assertThat(this.voter.getDomainObjectInstance(mi)).isEqualTo("The Argument"); } @Test public void correctArgumentIsSelectedFromMultipleArgs() { - voter.setProcessDomainObjectClass(String.class); + this.voter.setProcessDomainObjectClass(String.class); MethodInvocation mi = MethodInvocationUtils.create(new TestClass(), "methodTakingAListAndAString", new ArrayList<>(), "The Argument"); - assertThat(voter.getDomainObjectInstance(mi)).isEqualTo("The Argument"); + assertThat(this.voter.getDomainObjectInstance(mi)).isEqualTo("The Argument"); } @SuppressWarnings("unused") diff --git a/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java index a172eddeea..78cb5f1e62 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java @@ -57,59 +57,65 @@ public class AffirmativeBasedTests { @SuppressWarnings("unchecked") public void setup() { - grant = mock(AccessDecisionVoter.class); - abstain = mock(AccessDecisionVoter.class); - deny = mock(AccessDecisionVoter.class); + this.grant = mock(AccessDecisionVoter.class); + this.abstain = mock(AccessDecisionVoter.class); + this.deny = mock(AccessDecisionVoter.class); - when(grant.vote(any(Authentication.class), any(Object.class), any(List.class))) + when(this.grant.vote(any(Authentication.class), any(Object.class), any(List.class))) .thenReturn(AccessDecisionVoter.ACCESS_GRANTED); - when(abstain.vote(any(Authentication.class), any(Object.class), any(List.class))) + when(this.abstain.vote(any(Authentication.class), any(Object.class), any(List.class))) .thenReturn(AccessDecisionVoter.ACCESS_ABSTAIN); - when(deny.vote(any(Authentication.class), any(Object.class), any(List.class))) + when(this.deny.vote(any(Authentication.class), any(Object.class), any(List.class))) .thenReturn(AccessDecisionVoter.ACCESS_DENIED); } @Test public void oneAffirmativeVoteOneDenyVoteOneAbstainVoteGrantsAccess() throws Exception { - mgr = new AffirmativeBased(Arrays.>asList(grant, deny, abstain)); - mgr.afterPropertiesSet(); - mgr.decide(user, new Object(), attrs); + this.mgr = new AffirmativeBased( + Arrays.>asList(this.grant, this.deny, this.abstain)); + this.mgr.afterPropertiesSet(); + this.mgr.decide(this.user, new Object(), this.attrs); } @Test public void oneDenyVoteOneAbstainVoteOneAffirmativeVoteGrantsAccess() { - mgr = new AffirmativeBased(Arrays.>asList(deny, abstain, grant)); - mgr.decide(user, new Object(), attrs); + this.mgr = new AffirmativeBased( + Arrays.>asList(this.deny, this.abstain, this.grant)); + this.mgr.decide(this.user, new Object(), this.attrs); } @Test public void oneAffirmativeVoteTwoAbstainVotesGrantsAccess() { - mgr = new AffirmativeBased(Arrays.>asList(grant, abstain, abstain)); - mgr.decide(user, new Object(), attrs); + this.mgr = new AffirmativeBased( + Arrays.>asList(this.grant, this.abstain, this.abstain)); + this.mgr.decide(this.user, new Object(), this.attrs); } @Test(expected = AccessDeniedException.class) public void oneDenyVoteTwoAbstainVotesDeniesAccess() { - mgr = new AffirmativeBased(Arrays.>asList(deny, abstain, abstain)); - mgr.decide(user, new Object(), attrs); + this.mgr = new AffirmativeBased( + Arrays.>asList(this.deny, this.abstain, this.abstain)); + this.mgr.decide(this.user, new Object(), this.attrs); } @Test(expected = AccessDeniedException.class) public void onlyAbstainVotesDeniesAccessWithDefault() { - mgr = new AffirmativeBased(Arrays.>asList(abstain, abstain, abstain)); - assertThat(!mgr.isAllowIfAllAbstainDecisions()).isTrue(); // check default + this.mgr = new AffirmativeBased( + Arrays.>asList(this.abstain, this.abstain, this.abstain)); + assertThat(!this.mgr.isAllowIfAllAbstainDecisions()).isTrue(); // check default - mgr.decide(user, new Object(), attrs); + this.mgr.decide(this.user, new Object(), this.attrs); } @Test public void testThreeAbstainVotesGrantsAccessIfAllowIfAllAbstainDecisionsIsSet() { - mgr = new AffirmativeBased(Arrays.>asList(abstain, abstain, abstain)); - mgr.setAllowIfAllAbstainDecisions(true); - assertThat(mgr.isAllowIfAllAbstainDecisions()).isTrue(); // check changed + this.mgr = new AffirmativeBased( + Arrays.>asList(this.abstain, this.abstain, this.abstain)); + this.mgr.setAllowIfAllAbstainDecisions(true); + assertThat(this.mgr.isAllowIfAllAbstainDecisions()).isTrue(); // check changed - mgr.decide(user, new Object(), attrs); + this.mgr.decide(this.user, new Object(), this.attrs); } } diff --git a/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java index d8507a9fc0..93d47219e0 100644 --- a/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java +++ b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java @@ -30,7 +30,7 @@ public class SomeDomainObject { } public String getParent() { - return "parentOf" + identity; + return "parentOf" + this.identity; } } diff --git a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java index 686c209458..e4f324e122 100644 --- a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java @@ -43,21 +43,21 @@ public class AbstractAuthenticationTokenTests { @Before public final void setUp() { - authorities = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"); + this.authorities = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"); } @Test(expected = UnsupportedOperationException.class) public void testAuthoritiesAreImmutable() { - MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities); + MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", this.authorities); List gotAuthorities = (List) token.getAuthorities(); - assertThat(gotAuthorities).isNotSameAs(authorities); + assertThat(gotAuthorities).isNotSameAs(this.authorities); gotAuthorities.set(0, new SimpleGrantedAuthority("ROLE_SUPER_USER")); } @Test public void testGetters() { - MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities); + MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", this.authorities); assertThat(token.getPrincipal()).isEqualTo("Test"); assertThat(token.getCredentials()).isEqualTo("Password"); assertThat(token.getName()).isEqualTo("Test"); @@ -65,8 +65,8 @@ public class AbstractAuthenticationTokenTests { @Test public void testHashCode() { - MockAuthenticationImpl token1 = new MockAuthenticationImpl("Test", "Password", authorities); - MockAuthenticationImpl token2 = new MockAuthenticationImpl("Test", "Password", authorities); + MockAuthenticationImpl token1 = new MockAuthenticationImpl("Test", "Password", this.authorities); + MockAuthenticationImpl token2 = new MockAuthenticationImpl("Test", "Password", this.authorities); MockAuthenticationImpl token3 = new MockAuthenticationImpl(null, null, AuthorityUtils.NO_AUTHORITIES); assertThat(token2.hashCode()).isEqualTo(token1.hashCode()); assertThat(token1.hashCode() != token3.hashCode()).isTrue(); @@ -78,14 +78,14 @@ public class AbstractAuthenticationTokenTests { @Test public void testObjectsEquals() { - MockAuthenticationImpl token1 = new MockAuthenticationImpl("Test", "Password", authorities); - MockAuthenticationImpl token2 = new MockAuthenticationImpl("Test", "Password", authorities); + MockAuthenticationImpl token1 = new MockAuthenticationImpl("Test", "Password", this.authorities); + MockAuthenticationImpl token2 = new MockAuthenticationImpl("Test", "Password", this.authorities); assertThat(token2).isEqualTo(token1); - MockAuthenticationImpl token3 = new MockAuthenticationImpl("Test", "Password_Changed", authorities); + MockAuthenticationImpl token3 = new MockAuthenticationImpl("Test", "Password_Changed", this.authorities); assertThat(!token1.equals(token3)).isTrue(); - MockAuthenticationImpl token4 = new MockAuthenticationImpl("Test_Changed", "Password", authorities); + MockAuthenticationImpl token4 = new MockAuthenticationImpl("Test_Changed", "Password", this.authorities); assertThat(!token1.equals(token4)).isTrue(); MockAuthenticationImpl token5 = new MockAuthenticationImpl("Test", "Password", @@ -105,7 +105,7 @@ public class AbstractAuthenticationTokenTests { @Test public void testSetAuthenticated() { - MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities); + MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", this.authorities); assertThat(!token.isAuthenticated()).isTrue(); token.setAuthenticated(true); assertThat(token.isAuthenticated()).isTrue(); @@ -113,7 +113,7 @@ public class AbstractAuthenticationTokenTests { @Test public void testToStringWithAuthorities() { - MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities); + MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", this.authorities); assertThat(token.toString().lastIndexOf("ROLE_TWO") != -1).isTrue(); } @@ -130,7 +130,7 @@ public class AbstractAuthenticationTokenTests { AuthenticatedPrincipal principal = mock(AuthenticatedPrincipal.class); when(principal.getName()).thenReturn(principalName); - MockAuthenticationImpl token = new MockAuthenticationImpl(principal, "Password", authorities); + MockAuthenticationImpl token = new MockAuthenticationImpl(principal, "Password", this.authorities); assertThat(token.getName()).isEqualTo(principalName); verify(principal, times(1)).getName(); } diff --git a/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java b/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java index c4e4e78993..d3ac44699d 100644 --- a/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java +++ b/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java @@ -52,30 +52,30 @@ public class DefaultAuthenticationEventPublisherTests { @Test public void expectedDefaultMappingsAreSatisfied() { - publisher = new DefaultAuthenticationEventPublisher(); + this.publisher = new DefaultAuthenticationEventPublisher(); ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class); - publisher.setApplicationEventPublisher(appPublisher); + this.publisher.setApplicationEventPublisher(appPublisher); Authentication a = mock(Authentication.class); Exception cause = new Exception(); Object extraInfo = new Object(); - publisher.publishAuthenticationFailure(new BadCredentialsException(""), a); - publisher.publishAuthenticationFailure(new BadCredentialsException("", cause), a); + this.publisher.publishAuthenticationFailure(new BadCredentialsException(""), a); + this.publisher.publishAuthenticationFailure(new BadCredentialsException("", cause), a); verify(appPublisher, times(2)).publishEvent(isA(AuthenticationFailureBadCredentialsEvent.class)); reset(appPublisher); - publisher.publishAuthenticationFailure(new UsernameNotFoundException(""), a); - publisher.publishAuthenticationFailure(new UsernameNotFoundException("", cause), a); - publisher.publishAuthenticationFailure(new AccountExpiredException(""), a); - publisher.publishAuthenticationFailure(new AccountExpiredException("", cause), a); - publisher.publishAuthenticationFailure(new ProviderNotFoundException(""), a); - publisher.publishAuthenticationFailure(new DisabledException(""), a); - publisher.publishAuthenticationFailure(new DisabledException("", cause), a); - publisher.publishAuthenticationFailure(new LockedException(""), a); - publisher.publishAuthenticationFailure(new LockedException("", cause), a); - publisher.publishAuthenticationFailure(new AuthenticationServiceException(""), a); - publisher.publishAuthenticationFailure(new AuthenticationServiceException("", cause), a); - publisher.publishAuthenticationFailure(new CredentialsExpiredException(""), a); - publisher.publishAuthenticationFailure(new CredentialsExpiredException("", cause), a); + this.publisher.publishAuthenticationFailure(new UsernameNotFoundException(""), a); + this.publisher.publishAuthenticationFailure(new UsernameNotFoundException("", cause), a); + this.publisher.publishAuthenticationFailure(new AccountExpiredException(""), a); + this.publisher.publishAuthenticationFailure(new AccountExpiredException("", cause), a); + this.publisher.publishAuthenticationFailure(new ProviderNotFoundException(""), a); + this.publisher.publishAuthenticationFailure(new DisabledException(""), a); + this.publisher.publishAuthenticationFailure(new DisabledException("", cause), a); + this.publisher.publishAuthenticationFailure(new LockedException(""), a); + this.publisher.publishAuthenticationFailure(new LockedException("", cause), a); + this.publisher.publishAuthenticationFailure(new AuthenticationServiceException(""), a); + this.publisher.publishAuthenticationFailure(new AuthenticationServiceException("", cause), a); + this.publisher.publishAuthenticationFailure(new CredentialsExpiredException(""), a); + this.publisher.publishAuthenticationFailure(new CredentialsExpiredException("", cause), a); verify(appPublisher, times(2)).publishEvent(isA(AuthenticationFailureBadCredentialsEvent.class)); verify(appPublisher, times(2)).publishEvent(isA(AuthenticationFailureExpiredEvent.class)); verify(appPublisher).publishEvent(isA(AuthenticationFailureProviderNotFoundEvent.class)); @@ -88,48 +88,49 @@ public class DefaultAuthenticationEventPublisherTests { @Test public void authenticationSuccessIsPublished() { - publisher = new DefaultAuthenticationEventPublisher(); + this.publisher = new DefaultAuthenticationEventPublisher(); ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class); - publisher.setApplicationEventPublisher(appPublisher); - publisher.publishAuthenticationSuccess(mock(Authentication.class)); + this.publisher.setApplicationEventPublisher(appPublisher); + this.publisher.publishAuthenticationSuccess(mock(Authentication.class)); verify(appPublisher).publishEvent(isA(AuthenticationSuccessEvent.class)); - publisher.setApplicationEventPublisher(null); + this.publisher.setApplicationEventPublisher(null); // Should be ignored with null app publisher - publisher.publishAuthenticationSuccess(mock(Authentication.class)); + this.publisher.publishAuthenticationSuccess(mock(Authentication.class)); } @Test public void additionalExceptionMappingsAreSupported() { - publisher = new DefaultAuthenticationEventPublisher(); + this.publisher = new DefaultAuthenticationEventPublisher(); Properties p = new Properties(); p.put(MockAuthenticationException.class.getName(), AuthenticationFailureDisabledEvent.class.getName()); - publisher.setAdditionalExceptionMappings(p); + this.publisher.setAdditionalExceptionMappings(p); ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class); - publisher.setApplicationEventPublisher(appPublisher); - publisher.publishAuthenticationFailure(new MockAuthenticationException("test"), mock(Authentication.class)); + this.publisher.setApplicationEventPublisher(appPublisher); + this.publisher.publishAuthenticationFailure(new MockAuthenticationException("test"), + mock(Authentication.class)); verify(appPublisher).publishEvent(isA(AuthenticationFailureDisabledEvent.class)); } @Test(expected = RuntimeException.class) public void missingEventClassExceptionCausesException() { - publisher = new DefaultAuthenticationEventPublisher(); + this.publisher = new DefaultAuthenticationEventPublisher(); Properties p = new Properties(); p.put(MockAuthenticationException.class.getName(), "NoSuchClass"); - publisher.setAdditionalExceptionMappings(p); + this.publisher.setAdditionalExceptionMappings(p); } @Test public void unknownFailureExceptionIsIgnored() { - publisher = new DefaultAuthenticationEventPublisher(); + this.publisher = new DefaultAuthenticationEventPublisher(); Properties p = new Properties(); p.put(MockAuthenticationException.class.getName(), AuthenticationFailureDisabledEvent.class.getName()); - publisher.setAdditionalExceptionMappings(p); + this.publisher.setAdditionalExceptionMappings(p); ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class); - publisher.setApplicationEventPublisher(appPublisher); - publisher.publishAuthenticationFailure(new AuthenticationException("") { + this.publisher.setApplicationEventPublisher(appPublisher); + this.publisher.publishAuthenticationFailure(new AuthenticationException("") { }, mock(Authentication.class)); verifyZeroInteractions(appPublisher); } @@ -137,61 +138,63 @@ public class DefaultAuthenticationEventPublisherTests { @Test(expected = IllegalArgumentException.class) public void emptyMapCausesException() { Map, Class> mappings = new HashMap<>(); - publisher = new DefaultAuthenticationEventPublisher(); - publisher.setAdditionalExceptionMappings(mappings); + this.publisher = new DefaultAuthenticationEventPublisher(); + this.publisher.setAdditionalExceptionMappings(mappings); } @Test(expected = IllegalArgumentException.class) public void missingExceptionClassCausesException() { Map, Class> mappings = new HashMap<>(); mappings.put(null, AuthenticationFailureLockedEvent.class); - publisher = new DefaultAuthenticationEventPublisher(); - publisher.setAdditionalExceptionMappings(mappings); + this.publisher = new DefaultAuthenticationEventPublisher(); + this.publisher.setAdditionalExceptionMappings(mappings); } @Test(expected = IllegalArgumentException.class) public void missingEventClassAsMapValueCausesException() { Map, Class> mappings = new HashMap<>(); mappings.put(LockedException.class, null); - publisher = new DefaultAuthenticationEventPublisher(); - publisher.setAdditionalExceptionMappings(mappings); + this.publisher = new DefaultAuthenticationEventPublisher(); + this.publisher.setAdditionalExceptionMappings(mappings); } @Test public void additionalExceptionMappingsUsingMapAreSupported() { - publisher = new DefaultAuthenticationEventPublisher(); + this.publisher = new DefaultAuthenticationEventPublisher(); Map, Class> mappings = new HashMap<>(); mappings.put(MockAuthenticationException.class, AuthenticationFailureDisabledEvent.class); - publisher.setAdditionalExceptionMappings(mappings); + this.publisher.setAdditionalExceptionMappings(mappings); ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class); - publisher.setApplicationEventPublisher(appPublisher); - publisher.publishAuthenticationFailure(new MockAuthenticationException("test"), mock(Authentication.class)); + this.publisher.setApplicationEventPublisher(appPublisher); + this.publisher.publishAuthenticationFailure(new MockAuthenticationException("test"), + mock(Authentication.class)); verify(appPublisher).publishEvent(isA(AuthenticationFailureDisabledEvent.class)); } @Test(expected = IllegalArgumentException.class) public void defaultAuthenticationFailureEventClassSetNullThen() { - publisher = new DefaultAuthenticationEventPublisher(); - publisher.setDefaultAuthenticationFailureEvent(null); + this.publisher = new DefaultAuthenticationEventPublisher(); + this.publisher.setDefaultAuthenticationFailureEvent(null); } @Test public void defaultAuthenticationFailureEventIsPublished() { - publisher = new DefaultAuthenticationEventPublisher(); - publisher.setDefaultAuthenticationFailureEvent(AuthenticationFailureBadCredentialsEvent.class); + this.publisher = new DefaultAuthenticationEventPublisher(); + this.publisher.setDefaultAuthenticationFailureEvent(AuthenticationFailureBadCredentialsEvent.class); ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class); - publisher.setApplicationEventPublisher(appPublisher); - publisher.publishAuthenticationFailure(new AuthenticationException("") { + this.publisher.setApplicationEventPublisher(appPublisher); + this.publisher.publishAuthenticationFailure(new AuthenticationException("") { }, mock(Authentication.class)); verify(appPublisher).publishEvent(isA(AuthenticationFailureBadCredentialsEvent.class)); } @Test(expected = RuntimeException.class) public void defaultAuthenticationFailureEventMissingAppropriateConstructorThen() { - publisher = new DefaultAuthenticationEventPublisher(); - publisher.setDefaultAuthenticationFailureEvent(AuthenticationFailureEventWithoutAppropriateConstructor.class); + this.publisher = new DefaultAuthenticationEventPublisher(); + this.publisher + .setDefaultAuthenticationFailureEvent(AuthenticationFailureEventWithoutAppropriateConstructor.class); } private static final class AuthenticationFailureEventWithoutAppropriateConstructor diff --git a/core/src/test/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapterTests.java b/core/src/test/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapterTests.java index d523d7df24..93621f82df 100644 --- a/core/src/test/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapterTests.java +++ b/core/src/test/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapterTests.java @@ -47,7 +47,7 @@ public class ReactiveAuthenticationManagerAdapterTests { @Before public void setup() { - manager = new ReactiveAuthenticationManagerAdapter(delegate); + this.manager = new ReactiveAuthenticationManagerAdapter(this.delegate); } @Test(expected = IllegalArgumentException.class) @@ -62,28 +62,28 @@ public class ReactiveAuthenticationManagerAdapterTests { @Test public void authenticateWhenSuccessThenSuccess() { - when(delegate.authenticate(any())).thenReturn(authentication); - when(authentication.isAuthenticated()).thenReturn(true); + when(this.delegate.authenticate(any())).thenReturn(this.authentication); + when(this.authentication.isAuthenticated()).thenReturn(true); - Authentication result = manager.authenticate(authentication).block(); + Authentication result = this.manager.authenticate(this.authentication).block(); - assertThat(result).isEqualTo(authentication); + assertThat(result).isEqualTo(this.authentication); } @Test public void authenticateWhenReturnNotAuthenticatedThenError() { - when(delegate.authenticate(any())).thenReturn(authentication); + when(this.delegate.authenticate(any())).thenReturn(this.authentication); - Authentication result = manager.authenticate(authentication).block(); + Authentication result = this.manager.authenticate(this.authentication).block(); assertThat(result).isNull(); } @Test public void authenticateWhenBadCredentialsThenError() { - when(delegate.authenticate(any())).thenThrow(new BadCredentialsException("Failed")); + when(this.delegate.authenticate(any())).thenThrow(new BadCredentialsException("Failed")); - Mono result = manager.authenticate(authentication); + Mono result = this.manager.authenticate(this.authentication); StepVerifier.create(result).expectError(BadCredentialsException.class).verify(); } diff --git a/core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java b/core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java index 39fff03071..55c85a7954 100644 --- a/core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java @@ -56,9 +56,9 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests { @Before public void setup() { - manager = new UserDetailsRepositoryReactiveAuthenticationManager(repository); - username = "user"; - password = "pass"; + this.manager = new UserDetailsRepositoryReactiveAuthenticationManager(this.repository); + this.username = "user"; + this.password = "pass"; } @Test(expected = IllegalArgumentException.class) @@ -69,10 +69,11 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests { @Test public void authenticateWhenUserNotFoundThenBadCredentials() { - when(repository.findByUsername(username)).thenReturn(Mono.empty()); + when(this.repository.findByUsername(this.username)).thenReturn(Mono.empty()); - UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, password); - Mono authentication = manager.authenticate(token); + UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(this.username, + this.password); + Mono authentication = this.manager.authenticate(token); StepVerifier.create(authentication).expectError(BadCredentialsException.class).verify(); } @@ -85,11 +86,11 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests { .roles("USER") .build(); // @formatter:on - when(repository.findByUsername(user.getUsername())).thenReturn(Mono.just(user)); + when(this.repository.findByUsername(user.getUsername())).thenReturn(Mono.just(user)); - UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, + UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(this.username, this.password + "INVALID"); - Mono authentication = manager.authenticate(token); + Mono authentication = this.manager.authenticate(token); StepVerifier.create(authentication).expectError(BadCredentialsException.class).verify(); } @@ -102,10 +103,11 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests { .roles("USER") .build(); // @formatter:on - when(repository.findByUsername(user.getUsername())).thenReturn(Mono.just(user)); + when(this.repository.findByUsername(user.getUsername())).thenReturn(Mono.just(user)); - UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, password); - Authentication authentication = manager.authenticate(token).block(); + UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(this.username, + this.password); + Authentication authentication = this.manager.authenticate(token).block(); assertThat(authentication).isEqualTo(authentication); } diff --git a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java index 89a00fe35c..16071648e3 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java @@ -705,7 +705,7 @@ public class DaoAuthenticationProviderTests { public UserDetails loadUserByUsername(String username) { if ("rod".equals(username)) { - return new User("rod", password, true, true, true, true, ROLES_12); + return new User("rod", this.password, true, true, true, true, ROLES_12); } throw new UsernameNotFoundException("Could not find: " + username); } diff --git a/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java b/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java index 68e2c068d8..939e39a98d 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java @@ -29,15 +29,15 @@ public class MockUserCache implements UserCache { private Map cache = new HashMap<>(); public UserDetails getUserFromCache(String username) { - return cache.get(username); + return this.cache.get(username); } public void putUserInCache(UserDetails user) { - cache.put(user.getUsername(), user); + this.cache.put(user.getUsername(), user); } public void removeUserFromCache(String username) { - cache.remove(username); + this.cache.remove(username); } } diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java index 6562d1decc..190e116a80 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java @@ -66,54 +66,54 @@ public class DefaultJaasAuthenticationProviderTests { @Before public void setUp() throws Exception { Configuration configuration = mock(Configuration.class); - publisher = mock(ApplicationEventPublisher.class); - log = mock(Log.class); - provider = new DefaultJaasAuthenticationProvider(); - provider.setConfiguration(configuration); - provider.setApplicationEventPublisher(publisher); - provider.setAuthorityGranters(new AuthorityGranter[] { new TestAuthorityGranter() }); - provider.afterPropertiesSet(); + this.publisher = mock(ApplicationEventPublisher.class); + this.log = mock(Log.class); + this.provider = new DefaultJaasAuthenticationProvider(); + this.provider.setConfiguration(configuration); + this.provider.setApplicationEventPublisher(this.publisher); + this.provider.setAuthorityGranters(new AuthorityGranter[] { new TestAuthorityGranter() }); + this.provider.afterPropertiesSet(); AppConfigurationEntry[] aces = new AppConfigurationEntry[] { new AppConfigurationEntry(TestLoginModule.class.getName(), LoginModuleControlFlag.REQUIRED, Collections.emptyMap()) }; - when(configuration.getAppConfigurationEntry(provider.getLoginContextName())).thenReturn(aces); - token = new UsernamePasswordAuthenticationToken("user", "password"); - ReflectionTestUtils.setField(provider, "log", log); + when(configuration.getAppConfigurationEntry(this.provider.getLoginContextName())).thenReturn(aces); + this.token = new UsernamePasswordAuthenticationToken("user", "password"); + ReflectionTestUtils.setField(this.provider, "log", this.log); } @Test(expected = IllegalArgumentException.class) public void afterPropertiesSetNullConfiguration() throws Exception { - provider.setConfiguration(null); - provider.afterPropertiesSet(); + this.provider.setConfiguration(null); + this.provider.afterPropertiesSet(); } @Test(expected = IllegalArgumentException.class) public void afterPropertiesSetNullAuthorityGranters() throws Exception { - provider.setAuthorityGranters(null); - provider.afterPropertiesSet(); + this.provider.setAuthorityGranters(null); + this.provider.afterPropertiesSet(); } @Test public void authenticateUnsupportedAuthentication() { - assertThat(provider.authenticate(new TestingAuthenticationToken("user", "password"))).isNull(); + assertThat(this.provider.authenticate(new TestingAuthenticationToken("user", "password"))).isNull(); } @Test public void authenticateSuccess() { - Authentication auth = provider.authenticate(token); - assertThat(auth.getPrincipal()).isEqualTo(token.getPrincipal()); - assertThat(auth.getCredentials()).isEqualTo(token.getCredentials()); + Authentication auth = this.provider.authenticate(this.token); + assertThat(auth.getPrincipal()).isEqualTo(this.token.getPrincipal()); + assertThat(auth.getCredentials()).isEqualTo(this.token.getCredentials()); assertThat(auth.isAuthenticated()).isEqualTo(true); assertThat(auth.getAuthorities().isEmpty()).isEqualTo(false); - verify(publisher).publishEvent(isA(JaasAuthenticationSuccessEvent.class)); - verifyNoMoreInteractions(publisher); + verify(this.publisher).publishEvent(isA(JaasAuthenticationSuccessEvent.class)); + verifyNoMoreInteractions(this.publisher); } @Test public void authenticateBadPassword() { try { - provider.authenticate(new UsernamePasswordAuthenticationToken("user", "asdf")); + this.provider.authenticate(new UsernamePasswordAuthenticationToken("user", "asdf")); fail("LoginException should have been thrown for the bad password"); } catch (AuthenticationException success) { @@ -125,7 +125,7 @@ public class DefaultJaasAuthenticationProviderTests { @Test public void authenticateBadUser() { try { - provider.authenticate(new UsernamePasswordAuthenticationToken("asdf", "password")); + this.provider.authenticate(new UsernamePasswordAuthenticationToken("asdf", "password")); fail("LoginException should have been thrown for the bad user"); } catch (AuthenticationException success) { @@ -145,7 +145,7 @@ public class DefaultJaasAuthenticationProviderTests { when(securityContext.getAuthentication()).thenReturn(token); when(token.getLoginContext()).thenReturn(context); - provider.onApplicationEvent(event); + this.provider.onApplicationEvent(event); verify(event).getSecurityContexts(); verify(securityContext).getAuthentication(); @@ -158,10 +158,10 @@ public class DefaultJaasAuthenticationProviderTests { public void logoutNullSession() { SessionDestroyedEvent event = mock(SessionDestroyedEvent.class); - provider.handleLogout(event); + this.provider.handleLogout(event); verify(event).getSecurityContexts(); - verify(log).debug(anyString()); + verify(this.log).debug(anyString()); verifyNoMoreInteractions(event); } @@ -172,7 +172,7 @@ public class DefaultJaasAuthenticationProviderTests { when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext)); - provider.handleLogout(event); + this.provider.handleLogout(event); verify(event).getSecurityContexts(); verify(event).getSecurityContexts(); @@ -186,9 +186,9 @@ public class DefaultJaasAuthenticationProviderTests { SecurityContext securityContext = mock(SecurityContext.class); when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext)); - when(securityContext.getAuthentication()).thenReturn(token); + when(securityContext.getAuthentication()).thenReturn(this.token); - provider.handleLogout(event); + this.provider.handleLogout(event); verify(event).getSecurityContexts(); verify(event).getSecurityContexts(); @@ -205,7 +205,7 @@ public class DefaultJaasAuthenticationProviderTests { when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext)); when(securityContext.getAuthentication()).thenReturn(token); - provider.onApplicationEvent(event); + this.provider.onApplicationEvent(event); verify(event).getSecurityContexts(); verify(securityContext).getAuthentication(); verify(token).getLoginContext(); @@ -226,23 +226,23 @@ public class DefaultJaasAuthenticationProviderTests { when(token.getLoginContext()).thenReturn(context); doThrow(loginException).when(context).logout(); - provider.onApplicationEvent(event); + this.provider.onApplicationEvent(event); verify(event).getSecurityContexts(); verify(securityContext).getAuthentication(); verify(token).getLoginContext(); verify(context).logout(); - verify(log).warn(anyString(), eq(loginException)); + verify(this.log).warn(anyString(), eq(loginException)); verifyNoMoreInteractions(event, securityContext, token, context); } @Test public void publishNullPublisher() { - provider.setApplicationEventPublisher(null); + this.provider.setApplicationEventPublisher(null); AuthenticationException ae = new BadCredentialsException("Failed to login"); - provider.publishFailureEvent(token, ae); - provider.publishSuccessEvent(token); + this.provider.publishFailureEvent(this.token, ae); + this.provider.publishSuccessEvent(this.token); } @Test @@ -251,10 +251,10 @@ public class DefaultJaasAuthenticationProviderTests { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(resName); context.registerShutdownHook(); try { - provider = context.getBean(DefaultJaasAuthenticationProvider.class); - Authentication auth = provider.authenticate(token); + this.provider = context.getBean(DefaultJaasAuthenticationProvider.class); + Authentication auth = this.provider.authenticate(this.token); assertThat(auth.isAuthenticated()).isEqualTo(true); - assertThat(auth.getPrincipal()).isEqualTo(token.getPrincipal()); + assertThat(auth.getPrincipal()).isEqualTo(this.token.getPrincipal()); } finally { context.close(); @@ -264,10 +264,10 @@ public class DefaultJaasAuthenticationProviderTests { private void verifyFailedLogin() { ArgumentCaptor event = ArgumentCaptor .forClass(JaasAuthenticationFailedEvent.class); - verify(publisher).publishEvent(event.capture()); + verify(this.publisher).publishEvent(event.capture()); assertThat(event.getValue()).isInstanceOf(JaasAuthenticationFailedEvent.class); assertThat(event.getValue().getException()).isNotNull(); - verifyNoMoreInteractions(publisher); + verifyNoMoreInteractions(this.publisher); } } diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java index 197c22cd05..08cc0d8e73 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java @@ -66,39 +66,39 @@ public class JaasAuthenticationProviderTests { @Before public void setUp() { String resName = "/" + getClass().getName().replace('.', '/') + ".xml"; - context = new ClassPathXmlApplicationContext(resName); - eventCheck = (JaasEventCheck) context.getBean("eventCheck"); - jaasProvider = (JaasAuthenticationProvider) context.getBean("jaasAuthenticationProvider"); + this.context = new ClassPathXmlApplicationContext(resName); + this.eventCheck = (JaasEventCheck) this.context.getBean("eventCheck"); + this.jaasProvider = (JaasAuthenticationProvider) this.context.getBean("jaasAuthenticationProvider"); } @Test public void testBadPassword() { try { - jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user", "asdf")); + this.jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user", "asdf")); fail("LoginException should have been thrown for the bad password"); } catch (AuthenticationException e) { } - assertThat(eventCheck.failedEvent).as("Failure event not fired").isNotNull(); - assertThat(eventCheck.failedEvent.getException()).withFailMessage("Failure event exception was null") + assertThat(this.eventCheck.failedEvent).as("Failure event not fired").isNotNull(); + assertThat(this.eventCheck.failedEvent.getException()).withFailMessage("Failure event exception was null") .isNotNull(); - assertThat(eventCheck.successEvent).as("Success event was fired").isNull(); + assertThat(this.eventCheck.successEvent).as("Success event was fired").isNull(); } @Test public void testBadUser() { try { - jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("asdf", "password")); + this.jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("asdf", "password")); fail("LoginException should have been thrown for the bad user"); } catch (AuthenticationException e) { } - assertThat(eventCheck.failedEvent).as("Failure event not fired").isNotNull(); - assertThat(eventCheck.failedEvent.getException()).withFailMessage("Failure event exception was null") + assertThat(this.eventCheck.failedEvent).as("Failure event not fired").isNotNull(); + assertThat(this.eventCheck.failedEvent.getException()).withFailMessage("Failure event exception was null") .isNotNull(); - assertThat(eventCheck.successEvent).as("Success event was fired").isNull(); + assertThat(this.eventCheck.successEvent).as("Success event was fired").isNull(); } @Test @@ -115,10 +115,10 @@ public class JaasAuthenticationProviderTests { @Test public void detectsMissingLoginConfig() throws Exception { JaasAuthenticationProvider myJaasProvider = new JaasAuthenticationProvider(); - myJaasProvider.setApplicationEventPublisher(context); - myJaasProvider.setAuthorityGranters(jaasProvider.getAuthorityGranters()); - myJaasProvider.setCallbackHandlers(jaasProvider.getCallbackHandlers()); - myJaasProvider.setLoginContextName(jaasProvider.getLoginContextName()); + myJaasProvider.setApplicationEventPublisher(this.context); + myJaasProvider.setAuthorityGranters(this.jaasProvider.getAuthorityGranters()); + myJaasProvider.setCallbackHandlers(this.jaasProvider.getCallbackHandlers()); + myJaasProvider.setLoginContextName(this.jaasProvider.getLoginContextName()); try { myJaasProvider.afterPropertiesSet(); @@ -151,11 +151,11 @@ public class JaasAuthenticationProviderTests { pw.close(); JaasAuthenticationProvider myJaasProvider = new JaasAuthenticationProvider(); - myJaasProvider.setApplicationEventPublisher(context); + myJaasProvider.setApplicationEventPublisher(this.context); myJaasProvider.setLoginConfig(new FileSystemResource(configFile)); - myJaasProvider.setAuthorityGranters(jaasProvider.getAuthorityGranters()); - myJaasProvider.setCallbackHandlers(jaasProvider.getCallbackHandlers()); - myJaasProvider.setLoginContextName(jaasProvider.getLoginContextName()); + myJaasProvider.setAuthorityGranters(this.jaasProvider.getAuthorityGranters()); + myJaasProvider.setCallbackHandlers(this.jaasProvider.getCallbackHandlers()); + myJaasProvider.setLoginContextName(this.jaasProvider.getLoginContextName()); myJaasProvider.afterPropertiesSet(); } @@ -163,10 +163,10 @@ public class JaasAuthenticationProviderTests { @Test public void detectsMissingLoginContextName() throws Exception { JaasAuthenticationProvider myJaasProvider = new JaasAuthenticationProvider(); - myJaasProvider.setApplicationEventPublisher(context); - myJaasProvider.setAuthorityGranters(jaasProvider.getAuthorityGranters()); - myJaasProvider.setCallbackHandlers(jaasProvider.getCallbackHandlers()); - myJaasProvider.setLoginConfig(jaasProvider.getLoginConfig()); + myJaasProvider.setApplicationEventPublisher(this.context); + myJaasProvider.setAuthorityGranters(this.jaasProvider.getAuthorityGranters()); + myJaasProvider.setCallbackHandlers(this.jaasProvider.getCallbackHandlers()); + myJaasProvider.setLoginConfig(this.jaasProvider.getLoginConfig()); myJaasProvider.setLoginContextName(null); try { @@ -193,14 +193,14 @@ public class JaasAuthenticationProviderTests { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("user", "password", AuthorityUtils.createAuthorityList("ROLE_ONE")); - assertThat(jaasProvider.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); + assertThat(this.jaasProvider.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); - Authentication auth = jaasProvider.authenticate(token); + Authentication auth = this.jaasProvider.authenticate(token); - assertThat(jaasProvider.getAuthorityGranters()).isNotNull(); - assertThat(jaasProvider.getCallbackHandlers()).isNotNull(); - assertThat(jaasProvider.getLoginConfig()).isNotNull(); - assertThat(jaasProvider.getLoginContextName()).isNotNull(); + assertThat(this.jaasProvider.getAuthorityGranters()).isNotNull(); + assertThat(this.jaasProvider.getCallbackHandlers()).isNotNull(); + assertThat(this.jaasProvider.getLoginConfig()).isNotNull(); + assertThat(this.jaasProvider.getLoginContextName()).isNotNull(); Collection list = auth.getAuthorities(); Set set = AuthorityUtils.authorityListToSet(list); @@ -222,24 +222,24 @@ public class JaasAuthenticationProviderTests { assertThat(foundit).as("Could not find a JaasGrantedAuthority").isTrue(); - assertThat(eventCheck.successEvent).as("Success event should be fired").isNotNull(); - assertThat(eventCheck.successEvent.getAuthentication()).withFailMessage("Auth objects should be equal") + assertThat(this.eventCheck.successEvent).as("Success event should be fired").isNotNull(); + assertThat(this.eventCheck.successEvent.getAuthentication()).withFailMessage("Auth objects should be equal") .isEqualTo(auth); - assertThat(eventCheck.failedEvent).as("Failure event should not be fired").isNull(); + assertThat(this.eventCheck.failedEvent).as("Failure event should not be fired").isNull(); } @Test public void testGetApplicationEventPublisher() { - assertThat(jaasProvider.getApplicationEventPublisher()).isNotNull(); + assertThat(this.jaasProvider.getApplicationEventPublisher()).isNotNull(); } @Test public void testLoginExceptionResolver() { - assertThat(jaasProvider.getLoginExceptionResolver()).isNotNull(); - jaasProvider.setLoginExceptionResolver(e -> new LockedException("This is just a test!")); + assertThat(this.jaasProvider.getLoginExceptionResolver()).isNotNull(); + this.jaasProvider.setLoginExceptionResolver(e -> new LockedException("This is just a test!")); try { - jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user", "password")); + this.jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user", "password")); } catch (LockedException e) { } @@ -250,7 +250,7 @@ public class JaasAuthenticationProviderTests { @Test public void testLogout() throws Exception { - MockLoginContext loginContext = new MockLoginContext(jaasProvider.getLoginContextName()); + MockLoginContext loginContext = new MockLoginContext(this.jaasProvider.getLoginContextName()); JaasAuthenticationToken token = new JaasAuthenticationToken(null, null, loginContext); @@ -260,7 +260,7 @@ public class JaasAuthenticationProviderTests { SessionDestroyedEvent event = mock(SessionDestroyedEvent.class); when(event.getSecurityContexts()).thenReturn(Arrays.asList(context)); - jaasProvider.handleLogout(event); + this.jaasProvider.handleLogout(event); assertThat(loginContext.loggedOut).isTrue(); } @@ -269,18 +269,17 @@ public class JaasAuthenticationProviderTests { public void testNullDefaultAuthorities() { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("user", "password"); - assertThat(jaasProvider.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); + assertThat(this.jaasProvider.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); - Authentication auth = jaasProvider.authenticate(token); + Authentication auth = this.jaasProvider.authenticate(token); assertThat(auth.getAuthorities()).withFailMessage("Only ROLE_TEST1 and ROLE_TEST2 should have been returned") .hasSize(2); } @Test public void testUnsupportedAuthenticationObjectReturnsNull() { - assertThat( - jaasProvider.authenticate(new TestingAuthenticationToken("foo", "bar", AuthorityUtils.NO_AUTHORITIES))) - .isNull(); + assertThat(this.jaasProvider + .authenticate(new TestingAuthenticationToken("foo", "bar", AuthorityUtils.NO_AUTHORITIES))).isNull(); } private static class MockLoginContext extends LoginContext { diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java index fb42097d7c..f93bc489ea 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java @@ -32,11 +32,11 @@ public class JaasEventCheck implements ApplicationListener "TEST_PRINCIPAL"); + this.subject.getPrincipals().add(() -> "TEST_PRINCIPAL"); - subject.getPrincipals().add(() -> "NULL_PRINCIPAL"); + this.subject.getPrincipals().add(() -> "NULL_PRINCIPAL"); return true; } diff --git a/core/src/test/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManagerTests.java index 9d85af9d45..fb8f606b39 100644 --- a/core/src/test/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManagerTests.java @@ -45,23 +45,23 @@ public class AuthenticatedReactiveAuthorizationManagerTests { @Test public void checkWhenAuthenticatedThenReturnTrue() { - when(authentication.isAuthenticated()).thenReturn(true); + when(this.authentication.isAuthenticated()).thenReturn(true); - boolean granted = manager.check(Mono.just(authentication), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(this.authentication), null).block().isGranted(); assertThat(granted).isTrue(); } @Test public void checkWhenNotAuthenticatedThenReturnFalse() { - boolean granted = manager.check(Mono.just(authentication), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(this.authentication), null).block().isGranted(); assertThat(granted).isFalse(); } @Test public void checkWhenEmptyThenReturnFalse() { - boolean granted = manager.check(Mono.empty(), null).block().isGranted(); + boolean granted = this.manager.check(Mono.empty(), null).block().isGranted(); assertThat(granted).isFalse(); } @@ -70,14 +70,14 @@ public class AuthenticatedReactiveAuthorizationManagerTests { public void checkWhenAnonymousAuthenticatedThenReturnFalse() { AnonymousAuthenticationToken anonymousAuthenticationToken = mock(AnonymousAuthenticationToken.class); - boolean granted = manager.check(Mono.just(anonymousAuthenticationToken), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(anonymousAuthenticationToken), null).block().isGranted(); assertThat(granted).isFalse(); } @Test public void checkWhenErrorThenError() { - Mono result = manager.check(Mono.error(new RuntimeException("ooops")), null); + Mono result = this.manager.check(Mono.error(new RuntimeException("ooops")), null); StepVerifier.create(result).expectError().verify(); } diff --git a/core/src/test/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManagerTests.java index 40c70c1403..0a97cec9df 100644 --- a/core/src/test/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManagerTests.java @@ -45,89 +45,90 @@ public class AuthorityReactiveAuthorizationManagerTests { @Test public void checkWhenHasAuthorityAndNotAuthenticatedThenReturnFalse() { - boolean granted = manager.check(Mono.just(authentication), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(this.authentication), null).block().isGranted(); assertThat(granted).isFalse(); } @Test public void checkWhenHasAuthorityAndEmptyThenReturnFalse() { - boolean granted = manager.check(Mono.empty(), null).block().isGranted(); + boolean granted = this.manager.check(Mono.empty(), null).block().isGranted(); assertThat(granted).isFalse(); } @Test public void checkWhenHasAuthorityAndErrorThenError() { - Mono result = manager.check(Mono.error(new RuntimeException("ooops")), null); + Mono result = this.manager.check(Mono.error(new RuntimeException("ooops")), null); StepVerifier.create(result).expectError().verify(); } @Test public void checkWhenHasAuthorityAndAuthenticatedAndNoAuthoritiesThenReturnFalse() { - when(authentication.isAuthenticated()).thenReturn(true); - when(authentication.getAuthorities()).thenReturn(Collections.emptyList()); + when(this.authentication.isAuthenticated()).thenReturn(true); + when(this.authentication.getAuthorities()).thenReturn(Collections.emptyList()); - boolean granted = manager.check(Mono.just(authentication), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(this.authentication), null).block().isGranted(); assertThat(granted).isFalse(); } @Test public void checkWhenHasAuthorityAndAuthenticatedAndWrongAuthoritiesThenReturnFalse() { - authentication = new TestingAuthenticationToken("rob", "secret", "ROLE_ADMIN"); + this.authentication = new TestingAuthenticationToken("rob", "secret", "ROLE_ADMIN"); - boolean granted = manager.check(Mono.just(authentication), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(this.authentication), null).block().isGranted(); assertThat(granted).isFalse(); } @Test public void checkWhenHasAuthorityAndAuthorizedThenReturnTrue() { - authentication = new TestingAuthenticationToken("rob", "secret", "ADMIN"); + this.authentication = new TestingAuthenticationToken("rob", "secret", "ADMIN"); - boolean granted = manager.check(Mono.just(authentication), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(this.authentication), null).block().isGranted(); assertThat(granted).isTrue(); } @Test public void checkWhenHasRoleAndAuthorizedThenReturnTrue() { - manager = AuthorityReactiveAuthorizationManager.hasRole("ADMIN"); - authentication = new TestingAuthenticationToken("rob", "secret", "ROLE_ADMIN"); + this.manager = AuthorityReactiveAuthorizationManager.hasRole("ADMIN"); + this.authentication = new TestingAuthenticationToken("rob", "secret", "ROLE_ADMIN"); - boolean granted = manager.check(Mono.just(authentication), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(this.authentication), null).block().isGranted(); assertThat(granted).isTrue(); } @Test public void checkWhenHasRoleAndNotAuthorizedThenReturnFalse() { - manager = AuthorityReactiveAuthorizationManager.hasRole("ADMIN"); - authentication = new TestingAuthenticationToken("rob", "secret", "ADMIN"); + this.manager = AuthorityReactiveAuthorizationManager.hasRole("ADMIN"); + this.authentication = new TestingAuthenticationToken("rob", "secret", "ADMIN"); - boolean granted = manager.check(Mono.just(authentication), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(this.authentication), null).block().isGranted(); assertThat(granted).isFalse(); } @Test public void checkWhenHasAnyRoleAndAuthorizedThenReturnTrue() { - manager = AuthorityReactiveAuthorizationManager.hasAnyRole("GENERAL", "USER", "TEST"); - authentication = new TestingAuthenticationToken("rob", "secret", "ROLE_USER", "ROLE_AUDITING", "ROLE_ADMIN"); + this.manager = AuthorityReactiveAuthorizationManager.hasAnyRole("GENERAL", "USER", "TEST"); + this.authentication = new TestingAuthenticationToken("rob", "secret", "ROLE_USER", "ROLE_AUDITING", + "ROLE_ADMIN"); - boolean granted = manager.check(Mono.just(authentication), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(this.authentication), null).block().isGranted(); assertThat(granted).isTrue(); } @Test public void checkWhenHasAnyRoleAndNotAuthorizedThenReturnFalse() { - manager = AuthorityReactiveAuthorizationManager.hasAnyRole("GENERAL", "USER", "TEST"); - authentication = new TestingAuthenticationToken("rob", "secret", "USER", "AUDITING", "ADMIN"); + this.manager = AuthorityReactiveAuthorizationManager.hasAnyRole("GENERAL", "USER", "TEST"); + this.authentication = new TestingAuthenticationToken("rob", "secret", "USER", "AUDITING", "ADMIN"); - boolean granted = manager.check(Mono.just(authentication), null).block().isGranted(); + boolean granted = this.manager.check(Mono.just(this.authentication), null).block().isGranted(); assertThat(granted).isFalse(); } diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java index a08af9ee13..c9da178681 100644 --- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java @@ -52,7 +52,7 @@ public abstract class AbstractDelegatingSecurityContextExecutorServiceTests @Before public final void setUpExecutorService() { - executor = create(); + this.executor = create(); } @Test(expected = IllegalArgumentException.class) @@ -62,104 +62,104 @@ public abstract class AbstractDelegatingSecurityContextExecutorServiceTests @Test public void shutdown() { - executor.shutdown(); - verify(delegate).shutdown(); + this.executor.shutdown(); + verify(this.delegate).shutdown(); } @Test public void shutdownNow() { - List result = executor.shutdownNow(); - verify(delegate).shutdownNow(); - assertThat(result).isEqualTo(delegate.shutdownNow()).isNotNull(); + List result = this.executor.shutdownNow(); + verify(this.delegate).shutdownNow(); + assertThat(result).isEqualTo(this.delegate.shutdownNow()).isNotNull(); } @Test public void isShutdown() { - boolean result = executor.isShutdown(); - verify(delegate).isShutdown(); - assertThat(result).isEqualTo(delegate.isShutdown()).isNotNull(); + boolean result = this.executor.isShutdown(); + verify(this.delegate).isShutdown(); + assertThat(result).isEqualTo(this.delegate.isShutdown()).isNotNull(); } @Test public void isTerminated() { - boolean result = executor.isTerminated(); - verify(delegate).isTerminated(); - assertThat(result).isEqualTo(delegate.isTerminated()).isNotNull(); + boolean result = this.executor.isTerminated(); + verify(this.delegate).isTerminated(); + assertThat(result).isEqualTo(this.delegate.isTerminated()).isNotNull(); } @Test public void awaitTermination() throws InterruptedException { - boolean result = executor.awaitTermination(1, TimeUnit.SECONDS); - verify(delegate).awaitTermination(1, TimeUnit.SECONDS); - assertThat(result).isEqualTo(delegate.awaitTermination(1, TimeUnit.SECONDS)).isNotNull(); + boolean result = this.executor.awaitTermination(1, TimeUnit.SECONDS); + verify(this.delegate).awaitTermination(1, TimeUnit.SECONDS); + assertThat(result).isEqualTo(this.delegate.awaitTermination(1, TimeUnit.SECONDS)).isNotNull(); } @Test public void submitCallable() { - when(delegate.submit(wrappedCallable)).thenReturn(expectedFutureObject); - Future result = executor.submit(callable); - verify(delegate).submit(wrappedCallable); - assertThat(result).isEqualTo(expectedFutureObject); + when(this.delegate.submit(this.wrappedCallable)).thenReturn(this.expectedFutureObject); + Future result = this.executor.submit(this.callable); + verify(this.delegate).submit(this.wrappedCallable); + assertThat(result).isEqualTo(this.expectedFutureObject); } @Test public void submitRunnableWithResult() { - when(delegate.submit(wrappedRunnable, resultArg)).thenReturn(expectedFutureObject); - Future result = executor.submit(runnable, resultArg); - verify(delegate).submit(wrappedRunnable, resultArg); - assertThat(result).isEqualTo(expectedFutureObject); + when(this.delegate.submit(this.wrappedRunnable, this.resultArg)).thenReturn(this.expectedFutureObject); + Future result = this.executor.submit(this.runnable, this.resultArg); + verify(this.delegate).submit(this.wrappedRunnable, this.resultArg); + assertThat(result).isEqualTo(this.expectedFutureObject); } @Test @SuppressWarnings("unchecked") public void submitRunnable() { - when((Future) delegate.submit(wrappedRunnable)).thenReturn(expectedFutureObject); - Future result = executor.submit(runnable); - verify(delegate).submit(wrappedRunnable); - assertThat(result).isEqualTo(expectedFutureObject); + when((Future) this.delegate.submit(this.wrappedRunnable)).thenReturn(this.expectedFutureObject); + Future result = this.executor.submit(this.runnable); + verify(this.delegate).submit(this.wrappedRunnable); + assertThat(result).isEqualTo(this.expectedFutureObject); } @Test @SuppressWarnings("unchecked") public void invokeAll() throws Exception { - List> exectedResult = Arrays.asList(expectedFutureObject); - List> wrappedCallables = Arrays.asList(wrappedCallable); - when(delegate.invokeAll(wrappedCallables)).thenReturn(exectedResult); - List> result = executor.invokeAll(Arrays.asList(callable)); - verify(delegate).invokeAll(wrappedCallables); + List> exectedResult = Arrays.asList(this.expectedFutureObject); + List> wrappedCallables = Arrays.asList(this.wrappedCallable); + when(this.delegate.invokeAll(wrappedCallables)).thenReturn(exectedResult); + List> result = this.executor.invokeAll(Arrays.asList(this.callable)); + verify(this.delegate).invokeAll(wrappedCallables); assertThat(result).isEqualTo(exectedResult); } @Test @SuppressWarnings("unchecked") public void invokeAllTimeout() throws Exception { - List> exectedResult = Arrays.asList(expectedFutureObject); - List> wrappedCallables = Arrays.asList(wrappedCallable); - when(delegate.invokeAll(wrappedCallables, 1, TimeUnit.SECONDS)).thenReturn(exectedResult); - List> result = executor.invokeAll(Arrays.asList(callable), 1, TimeUnit.SECONDS); - verify(delegate).invokeAll(wrappedCallables, 1, TimeUnit.SECONDS); + List> exectedResult = Arrays.asList(this.expectedFutureObject); + List> wrappedCallables = Arrays.asList(this.wrappedCallable); + when(this.delegate.invokeAll(wrappedCallables, 1, TimeUnit.SECONDS)).thenReturn(exectedResult); + List> result = this.executor.invokeAll(Arrays.asList(this.callable), 1, TimeUnit.SECONDS); + verify(this.delegate).invokeAll(wrappedCallables, 1, TimeUnit.SECONDS); assertThat(result).isEqualTo(exectedResult); } @Test @SuppressWarnings("unchecked") public void invokeAny() throws Exception { - List> exectedResult = Arrays.asList(expectedFutureObject); - List> wrappedCallables = Arrays.asList(wrappedCallable); - when(delegate.invokeAny(wrappedCallables)).thenReturn(exectedResult); - Object result = executor.invokeAny(Arrays.asList(callable)); - verify(delegate).invokeAny(wrappedCallables); + List> exectedResult = Arrays.asList(this.expectedFutureObject); + List> wrappedCallables = Arrays.asList(this.wrappedCallable); + when(this.delegate.invokeAny(wrappedCallables)).thenReturn(exectedResult); + Object result = this.executor.invokeAny(Arrays.asList(this.callable)); + verify(this.delegate).invokeAny(wrappedCallables); assertThat(result).isEqualTo(exectedResult); } @Test @SuppressWarnings("unchecked") public void invokeAnyTimeout() throws Exception { - List> exectedResult = Arrays.asList(expectedFutureObject); - List> wrappedCallables = Arrays.asList(wrappedCallable); - when(delegate.invokeAny(wrappedCallables, 1, TimeUnit.SECONDS)).thenReturn(exectedResult); - Object result = executor.invokeAny(Arrays.asList(callable), 1, TimeUnit.SECONDS); - verify(delegate).invokeAny(wrappedCallables, 1, TimeUnit.SECONDS); + List> exectedResult = Arrays.asList(this.expectedFutureObject); + List> wrappedCallables = Arrays.asList(this.wrappedCallable); + when(this.delegate.invokeAny(wrappedCallables, 1, TimeUnit.SECONDS)).thenReturn(exectedResult); + Object result = this.executor.invokeAny(Arrays.asList(this.callable), 1, TimeUnit.SECONDS); + verify(this.delegate).invokeAny(wrappedCallables, 1, TimeUnit.SECONDS); assertThat(result).isEqualTo(exectedResult); } diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorTests.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorTests.java index ab21514a15..486f9b35c3 100644 --- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorTests.java @@ -52,13 +52,13 @@ public abstract class AbstractDelegatingSecurityContextExecutorTests @Test public void execute() { - executor = create(); - executor.execute(runnable); - verify(getExecutor()).execute(wrappedRunnable); + this.executor = create(); + this.executor.execute(this.runnable); + verify(getExecutor()).execute(this.wrappedRunnable); } protected Executor getExecutor() { - return delegate; + return this.delegate; } protected abstract DelegatingSecurityContextExecutor create(); diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java index 057eeec6a5..d46f018dcf 100644 --- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java @@ -46,45 +46,45 @@ public abstract class AbstractDelegatingSecurityContextScheduledExecutorServiceT @Before public final void setUpExecutor() { - executor = create(); + this.executor = create(); } @Test @SuppressWarnings("unchecked") public void scheduleRunnable() { - when((ScheduledFuture) delegate.schedule(wrappedRunnable, 1, TimeUnit.SECONDS)) - .thenReturn(expectedResult); - ScheduledFuture result = executor.schedule(runnable, 1, TimeUnit.SECONDS); - assertThat(result).isEqualTo(expectedResult); - verify(delegate).schedule(wrappedRunnable, 1, TimeUnit.SECONDS); + when((ScheduledFuture) this.delegate.schedule(this.wrappedRunnable, 1, TimeUnit.SECONDS)) + .thenReturn(this.expectedResult); + ScheduledFuture result = this.executor.schedule(this.runnable, 1, TimeUnit.SECONDS); + assertThat(result).isEqualTo(this.expectedResult); + verify(this.delegate).schedule(this.wrappedRunnable, 1, TimeUnit.SECONDS); } @Test public void scheduleCallable() { - when(delegate.schedule(wrappedCallable, 1, TimeUnit.SECONDS)).thenReturn(expectedResult); - ScheduledFuture result = executor.schedule(callable, 1, TimeUnit.SECONDS); - assertThat(result).isEqualTo(expectedResult); - verify(delegate).schedule(wrappedCallable, 1, TimeUnit.SECONDS); + when(this.delegate.schedule(this.wrappedCallable, 1, TimeUnit.SECONDS)).thenReturn(this.expectedResult); + ScheduledFuture result = this.executor.schedule(this.callable, 1, TimeUnit.SECONDS); + assertThat(result).isEqualTo(this.expectedResult); + verify(this.delegate).schedule(this.wrappedCallable, 1, TimeUnit.SECONDS); } @Test @SuppressWarnings("unchecked") public void scheduleAtFixedRate() { - when((ScheduledFuture) delegate.scheduleAtFixedRate(wrappedRunnable, 1, 2, TimeUnit.SECONDS)) - .thenReturn(expectedResult); - ScheduledFuture result = executor.scheduleAtFixedRate(runnable, 1, 2, TimeUnit.SECONDS); - assertThat(result).isEqualTo(expectedResult); - verify(delegate).scheduleAtFixedRate(wrappedRunnable, 1, 2, TimeUnit.SECONDS); + when((ScheduledFuture) this.delegate.scheduleAtFixedRate(this.wrappedRunnable, 1, 2, TimeUnit.SECONDS)) + .thenReturn(this.expectedResult); + ScheduledFuture result = this.executor.scheduleAtFixedRate(this.runnable, 1, 2, TimeUnit.SECONDS); + assertThat(result).isEqualTo(this.expectedResult); + verify(this.delegate).scheduleAtFixedRate(this.wrappedRunnable, 1, 2, TimeUnit.SECONDS); } @Test @SuppressWarnings("unchecked") public void scheduleWithFixedDelay() { - when((ScheduledFuture) delegate.scheduleWithFixedDelay(wrappedRunnable, 1, 2, TimeUnit.SECONDS)) - .thenReturn(expectedResult); - ScheduledFuture result = executor.scheduleWithFixedDelay(runnable, 1, 2, TimeUnit.SECONDS); - assertThat(result).isEqualTo(expectedResult); - verify(delegate).scheduleWithFixedDelay(wrappedRunnable, 1, 2, TimeUnit.SECONDS); + when((ScheduledFuture) this.delegate.scheduleWithFixedDelay(this.wrappedRunnable, 1, 2, + TimeUnit.SECONDS)).thenReturn(this.expectedResult); + ScheduledFuture result = this.executor.scheduleWithFixedDelay(this.runnable, 1, 2, TimeUnit.SECONDS); + assertThat(result).isEqualTo(this.expectedResult); + verify(this.delegate).scheduleWithFixedDelay(this.wrappedRunnable, 1, 2, TimeUnit.SECONDS); } @Override diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextTestSupport.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextTestSupport.java index e4b7c4b564..c5bf4e56cc 100644 --- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextTestSupport.java +++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextTestSupport.java @@ -68,23 +68,23 @@ public abstract class AbstractDelegatingSecurityContextTestSupport { public final void explicitSecurityContextPowermockSetup() throws Exception { spy(DelegatingSecurityContextCallable.class); - doReturn(wrappedCallable).when(DelegatingSecurityContextCallable.class, "create", eq(callable), - securityContextCaptor.capture()); + doReturn(this.wrappedCallable).when(DelegatingSecurityContextCallable.class, "create", eq(this.callable), + this.securityContextCaptor.capture()); spy(DelegatingSecurityContextRunnable.class); - doReturn(wrappedRunnable).when(DelegatingSecurityContextRunnable.class, "create", eq(runnable), - securityContextCaptor.capture()); + doReturn(this.wrappedRunnable).when(DelegatingSecurityContextRunnable.class, "create", eq(this.runnable), + this.securityContextCaptor.capture()); } public final void currentSecurityContextPowermockSetup() throws Exception { spy(DelegatingSecurityContextCallable.class); - doReturn(wrappedCallable).when(DelegatingSecurityContextCallable.class, "create", callable, null); + doReturn(this.wrappedCallable).when(DelegatingSecurityContextCallable.class, "create", this.callable, null); spy(DelegatingSecurityContextRunnable.class); - doReturn(wrappedRunnable).when(DelegatingSecurityContextRunnable.class, "create", runnable, null); + doReturn(this.wrappedRunnable).when(DelegatingSecurityContextRunnable.class, "create", this.runnable, null); } @Before public final void setContext() { - SecurityContextHolder.setContext(currentSecurityContext); + SecurityContextHolder.setContext(this.currentSecurityContext); } @After diff --git a/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorServiceTests.java index 10a5cd39fa..eb4b404ddd 100644 --- a/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorServiceTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorServiceTests.java @@ -37,7 +37,7 @@ public class CurrentDelegatingSecurityContextExecutorServiceTests @Override protected DelegatingSecurityContextExecutorService create() { - return new DelegatingSecurityContextExecutorService(delegate); + return new DelegatingSecurityContextExecutorService(this.delegate); } } \ No newline at end of file diff --git a/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextScheduledExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextScheduledExecutorServiceTests.java index 6912843fcf..53f20764a0 100644 --- a/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextScheduledExecutorServiceTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextScheduledExecutorServiceTests.java @@ -37,7 +37,7 @@ public class CurrentDelegatingSecurityContextScheduledExecutorServiceTests @Override protected DelegatingSecurityContextScheduledExecutorService create() { - return new DelegatingSecurityContextScheduledExecutorService(delegate); + return new DelegatingSecurityContextScheduledExecutorService(this.delegate); } } diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java index 9c8f281586..dd47ea392b 100644 --- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java @@ -61,15 +61,16 @@ public class DelegatingSecurityContextCallableTests { @Before @SuppressWarnings("serial") public void setUp() throws Exception { - originalSecurityContext = SecurityContextHolder.createEmptyContext(); - when(delegate.call()).thenAnswer(new Returns(callableResult) { + this.originalSecurityContext = SecurityContextHolder.createEmptyContext(); + when(this.delegate.call()).thenAnswer(new Returns(this.callableResult) { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - assertThat(SecurityContextHolder.getContext()).isEqualTo(securityContext); + assertThat(SecurityContextHolder.getContext()) + .isEqualTo(DelegatingSecurityContextCallableTests.this.securityContext); return super.answer(invocation); } }); - executor = Executors.newFixedThreadPool(1); + this.executor = Executors.newFixedThreadPool(1); } @After @@ -86,7 +87,7 @@ public class DelegatingSecurityContextCallableTests { @Test(expected = IllegalArgumentException.class) public void constructorNullDelegateNonNullSecurityContext() { - new DelegatingSecurityContextCallable<>(null, securityContext); + new DelegatingSecurityContextCallable<>(null, this.securityContext); } @Test(expected = IllegalArgumentException.class) @@ -96,40 +97,40 @@ public class DelegatingSecurityContextCallableTests { @Test(expected = IllegalArgumentException.class) public void constructorNullSecurityContext() { - new DelegatingSecurityContextCallable<>(delegate, null); + new DelegatingSecurityContextCallable<>(this.delegate, null); } // --- call --- @Test public void call() throws Exception { - callable = new DelegatingSecurityContextCallable<>(delegate, securityContext); - assertWrapped(callable); + this.callable = new DelegatingSecurityContextCallable<>(this.delegate, this.securityContext); + assertWrapped(this.callable); } @Test public void callDefaultSecurityContext() throws Exception { - SecurityContextHolder.setContext(securityContext); - callable = new DelegatingSecurityContextCallable<>(delegate); + SecurityContextHolder.setContext(this.securityContext); + this.callable = new DelegatingSecurityContextCallable<>(this.delegate); SecurityContextHolder.clearContext(); // ensure callable is what sets up the // SecurityContextHolder - assertWrapped(callable); + assertWrapped(this.callable); } // SEC-3031 @Test public void callOnSameThread() throws Exception { - originalSecurityContext = securityContext; - SecurityContextHolder.setContext(originalSecurityContext); - callable = new DelegatingSecurityContextCallable<>(delegate, securityContext); - assertWrapped(callable.call()); + this.originalSecurityContext = this.securityContext; + SecurityContextHolder.setContext(this.originalSecurityContext); + this.callable = new DelegatingSecurityContextCallable<>(this.delegate, this.securityContext); + assertWrapped(this.callable.call()); } // --- create --- @Test(expected = IllegalArgumentException.class) public void createNullDelegate() { - DelegatingSecurityContextCallable.create(null, securityContext); + DelegatingSecurityContextCallable.create(null, this.securityContext); } @Test(expected = IllegalArgumentException.class) @@ -139,17 +140,17 @@ public class DelegatingSecurityContextCallableTests { @Test public void createNullSecurityContext() throws Exception { - SecurityContextHolder.setContext(securityContext); - callable = DelegatingSecurityContextCallable.create(delegate, null); + SecurityContextHolder.setContext(this.securityContext); + this.callable = DelegatingSecurityContextCallable.create(this.delegate, null); SecurityContextHolder.clearContext(); // ensure callable is what sets up the // SecurityContextHolder - assertWrapped(callable); + assertWrapped(this.callable); } @Test public void create() throws Exception { - callable = DelegatingSecurityContextCallable.create(delegate, securityContext); - assertWrapped(callable); + this.callable = DelegatingSecurityContextCallable.create(this.delegate, this.securityContext); + assertWrapped(this.callable); } // --- toString @@ -157,18 +158,18 @@ public class DelegatingSecurityContextCallableTests { // SEC-2682 @Test public void toStringDelegates() { - callable = new DelegatingSecurityContextCallable<>(delegate, securityContext); - assertThat(callable.toString()).isEqualTo(delegate.toString()); + this.callable = new DelegatingSecurityContextCallable<>(this.delegate, this.securityContext); + assertThat(this.callable.toString()).isEqualTo(this.delegate.toString()); } private void assertWrapped(Callable callable) throws Exception { - Future submit = executor.submit(callable); + Future submit = this.executor.submit(callable); assertWrapped(submit.get()); } private void assertWrapped(Object callableResult) throws Exception { - verify(delegate).call(); - assertThat(SecurityContextHolder.getContext()).isEqualTo(originalSecurityContext); + verify(this.delegate).call(); + assertThat(SecurityContextHolder.getContext()).isEqualTo(this.originalSecurityContext); } } diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java index 4e0ee3ae65..a444ff0dc0 100644 --- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java @@ -60,13 +60,13 @@ public class DelegatingSecurityContextRunnableTests { @Before public void setUp() { - originalSecurityContext = SecurityContextHolder.createEmptyContext(); + this.originalSecurityContext = SecurityContextHolder.createEmptyContext(); doAnswer((Answer) invocation -> { - assertThat(SecurityContextHolder.getContext()).isEqualTo(securityContext); + assertThat(SecurityContextHolder.getContext()).isEqualTo(this.securityContext); return null; - }).when(delegate).run(); + }).when(this.delegate).run(); - executor = Executors.newFixedThreadPool(1); + this.executor = Executors.newFixedThreadPool(1); } @After @@ -83,7 +83,7 @@ public class DelegatingSecurityContextRunnableTests { @Test(expected = IllegalArgumentException.class) public void constructorNullDelegateNonNullSecurityContext() { - new DelegatingSecurityContextRunnable(null, securityContext); + new DelegatingSecurityContextRunnable(null, this.securityContext); } @Test(expected = IllegalArgumentException.class) @@ -93,41 +93,41 @@ public class DelegatingSecurityContextRunnableTests { @Test(expected = IllegalArgumentException.class) public void constructorNullSecurityContext() { - new DelegatingSecurityContextRunnable(delegate, null); + new DelegatingSecurityContextRunnable(this.delegate, null); } // --- run --- @Test public void call() throws Exception { - runnable = new DelegatingSecurityContextRunnable(delegate, securityContext); - assertWrapped(runnable); + this.runnable = new DelegatingSecurityContextRunnable(this.delegate, this.securityContext); + assertWrapped(this.runnable); } @Test public void callDefaultSecurityContext() throws Exception { - SecurityContextHolder.setContext(securityContext); - runnable = new DelegatingSecurityContextRunnable(delegate); + SecurityContextHolder.setContext(this.securityContext); + this.runnable = new DelegatingSecurityContextRunnable(this.delegate); SecurityContextHolder.clearContext(); // ensure runnable is what sets up the // SecurityContextHolder - assertWrapped(runnable); + assertWrapped(this.runnable); } // SEC-3031 @Test public void callOnSameThread() throws Exception { - originalSecurityContext = securityContext; - SecurityContextHolder.setContext(originalSecurityContext); - executor = synchronousExecutor(); - runnable = new DelegatingSecurityContextRunnable(delegate, securityContext); - assertWrapped(runnable); + this.originalSecurityContext = this.securityContext; + SecurityContextHolder.setContext(this.originalSecurityContext); + this.executor = synchronousExecutor(); + this.runnable = new DelegatingSecurityContextRunnable(this.delegate, this.securityContext); + assertWrapped(this.runnable); } // --- create --- @Test(expected = IllegalArgumentException.class) public void createNullDelegate() { - DelegatingSecurityContextRunnable.create(null, securityContext); + DelegatingSecurityContextRunnable.create(null, this.securityContext); } @Test(expected = IllegalArgumentException.class) @@ -137,17 +137,17 @@ public class DelegatingSecurityContextRunnableTests { @Test public void createNullSecurityContext() throws Exception { - SecurityContextHolder.setContext(securityContext); - runnable = DelegatingSecurityContextRunnable.create(delegate, null); + SecurityContextHolder.setContext(this.securityContext); + this.runnable = DelegatingSecurityContextRunnable.create(this.delegate, null); SecurityContextHolder.clearContext(); // ensure runnable is what sets up the // SecurityContextHolder - assertWrapped(runnable); + assertWrapped(this.runnable); } @Test public void create() throws Exception { - runnable = DelegatingSecurityContextRunnable.create(delegate, securityContext); - assertWrapped(runnable); + this.runnable = DelegatingSecurityContextRunnable.create(this.delegate, this.securityContext); + assertWrapped(this.runnable); } // --- toString @@ -155,15 +155,15 @@ public class DelegatingSecurityContextRunnableTests { // SEC-2682 @Test public void toStringDelegates() { - runnable = new DelegatingSecurityContextRunnable(delegate, securityContext); - assertThat(runnable.toString()).isEqualTo(delegate.toString()); + this.runnable = new DelegatingSecurityContextRunnable(this.delegate, this.securityContext); + assertThat(this.runnable.toString()).isEqualTo(this.delegate.toString()); } private void assertWrapped(Runnable runnable) throws Exception { - Future submit = executor.submit(runnable); + Future submit = this.executor.submit(runnable); submit.get(); - verify(delegate).run(); - assertThat(SecurityContextHolder.getContext()).isEqualTo(originalSecurityContext); + verify(this.delegate).run(); + assertThat(SecurityContextHolder.getContext()).isEqualTo(this.originalSecurityContext); } private static ExecutorService synchronousExecutor() { diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java index fb91ba5ade..c2135e3a8a 100644 --- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java @@ -33,31 +33,31 @@ public class DelegatingSecurityContextSupportTests extends AbstractDelegatingSec @Test public void wrapCallable() throws Exception { explicitSecurityContextPowermockSetup(); - support = new ConcreteDelegatingSecurityContextSupport(securityContext); - assertThat(support.wrap(callable)).isSameAs(wrappedCallable); - assertThat(securityContextCaptor.getValue()).isSameAs(securityContext); + this.support = new ConcreteDelegatingSecurityContextSupport(this.securityContext); + assertThat(this.support.wrap(this.callable)).isSameAs(this.wrappedCallable); + assertThat(this.securityContextCaptor.getValue()).isSameAs(this.securityContext); } @Test public void wrapCallableNullSecurityContext() throws Exception { currentSecurityContextPowermockSetup(); - support = new ConcreteDelegatingSecurityContextSupport(null); - assertThat(support.wrap(callable)).isSameAs(wrappedCallable); + this.support = new ConcreteDelegatingSecurityContextSupport(null); + assertThat(this.support.wrap(this.callable)).isSameAs(this.wrappedCallable); } @Test public void wrapRunnable() throws Exception { explicitSecurityContextPowermockSetup(); - support = new ConcreteDelegatingSecurityContextSupport(securityContext); - assertThat(support.wrap(runnable)).isSameAs(wrappedRunnable); - assertThat(securityContextCaptor.getValue()).isSameAs(securityContext); + this.support = new ConcreteDelegatingSecurityContextSupport(this.securityContext); + assertThat(this.support.wrap(this.runnable)).isSameAs(this.wrappedRunnable); + assertThat(this.securityContextCaptor.getValue()).isSameAs(this.securityContext); } @Test public void wrapRunnableNullSecurityContext() throws Exception { currentSecurityContextPowermockSetup(); - support = new ConcreteDelegatingSecurityContextSupport(null); - assertThat(support.wrap(runnable)).isSameAs(wrappedRunnable); + this.support = new ConcreteDelegatingSecurityContextSupport(null); + assertThat(this.support.wrap(this.runnable)).isSameAs(this.wrappedRunnable); } private static class ConcreteDelegatingSecurityContextSupport extends AbstractDelegatingSecurityContextSupport { diff --git a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorServiceTests.java index 459951e3b9..f221ba93f8 100644 --- a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorServiceTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorServiceTests.java @@ -37,7 +37,7 @@ public class ExplicitDelegatingSecurityContextExecutorServiceTests @Override protected DelegatingSecurityContextExecutorService create() { - return new DelegatingSecurityContextExecutorService(delegate, securityContext); + return new DelegatingSecurityContextExecutorService(this.delegate, this.securityContext); } } \ No newline at end of file diff --git a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorTests.java b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorTests.java index 326a4726cc..b54376d27f 100644 --- a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorTests.java @@ -36,7 +36,7 @@ public class ExplicitDelegatingSecurityContextExecutorTests extends AbstractDele @Override protected DelegatingSecurityContextExecutor create() { - return new DelegatingSecurityContextExecutor(getExecutor(), securityContext); + return new DelegatingSecurityContextExecutor(getExecutor(), this.securityContext); } } diff --git a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextScheduledExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextScheduledExecutorServiceTests.java index a6897a83ef..46d59cf36f 100644 --- a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextScheduledExecutorServiceTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextScheduledExecutorServiceTests.java @@ -37,7 +37,7 @@ public class ExplicitDelegatingSecurityContextScheduledExecutorServiceTests @Override protected DelegatingSecurityContextScheduledExecutorService create() { - return new DelegatingSecurityContextScheduledExecutorService(delegate, securityContext); + return new DelegatingSecurityContextScheduledExecutorService(this.delegate, this.securityContext); } } \ No newline at end of file diff --git a/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java b/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java index 66009a9942..3c4a7c50bf 100644 --- a/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java +++ b/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java @@ -41,46 +41,46 @@ public class DelegatingApplicationListenerTests { @Before public void setup() { - event = new ApplicationEvent(this) { + this.event = new ApplicationEvent(this) { }; - listener = new DelegatingApplicationListener(); - listener.addListener(delegate); + this.listener = new DelegatingApplicationListener(); + this.listener.addListener(this.delegate); } @Test public void processEventNull() { - listener.onApplicationEvent(null); + this.listener.onApplicationEvent(null); - verify(delegate, never()).onApplicationEvent(any(ApplicationEvent.class)); + verify(this.delegate, never()).onApplicationEvent(any(ApplicationEvent.class)); } @Test public void processEventSuccess() { - when(delegate.supportsEventType(event.getClass())).thenReturn(true); - when(delegate.supportsSourceType(event.getSource().getClass())).thenReturn(true); - listener.onApplicationEvent(event); + when(this.delegate.supportsEventType(this.event.getClass())).thenReturn(true); + when(this.delegate.supportsSourceType(this.event.getSource().getClass())).thenReturn(true); + this.listener.onApplicationEvent(this.event); - verify(delegate).onApplicationEvent(event); + verify(this.delegate).onApplicationEvent(this.event); } @Test public void processEventEventTypeNotSupported() { - listener.onApplicationEvent(event); + this.listener.onApplicationEvent(this.event); - verify(delegate, never()).onApplicationEvent(any(ApplicationEvent.class)); + verify(this.delegate, never()).onApplicationEvent(any(ApplicationEvent.class)); } @Test public void processEventSourceTypeNotSupported() { - when(delegate.supportsEventType(event.getClass())).thenReturn(true); - listener.onApplicationEvent(event); + when(this.delegate.supportsEventType(this.event.getClass())).thenReturn(true); + this.listener.onApplicationEvent(this.event); - verify(delegate, never()).onApplicationEvent(any(ApplicationEvent.class)); + verify(this.delegate, never()).onApplicationEvent(any(ApplicationEvent.class)); } @Test(expected = IllegalArgumentException.class) public void addNull() { - listener.addListener(null); + this.listener.addListener(null); } } diff --git a/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java b/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java index 450eb7bc43..e743fb1212 100644 --- a/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java +++ b/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java @@ -51,7 +51,7 @@ public class SpringSecurityCoreVersionTests { @Before public void setup() { - Whitebox.setInternalState(SpringSecurityCoreVersion.class, logger); + Whitebox.setInternalState(SpringSecurityCoreVersion.class, this.logger); } @After @@ -90,7 +90,7 @@ public class SpringSecurityCoreVersionTests { performChecks(); - verifyZeroInteractions(logger); + verifyZeroInteractions(this.logger); } @Test @@ -102,7 +102,7 @@ public class SpringSecurityCoreVersionTests { performChecks(); - verifyZeroInteractions(logger); + verifyZeroInteractions(this.logger); } @Test @@ -114,7 +114,7 @@ public class SpringSecurityCoreVersionTests { performChecks(); - verify(logger, times(1)).warn(any()); + verify(this.logger, times(1)).warn(any()); } @Test @@ -126,7 +126,7 @@ public class SpringSecurityCoreVersionTests { performChecks(); - verify(logger, never()).warn(any()); + verify(this.logger, never()).warn(any()); } // SEC-2697 @@ -140,7 +140,7 @@ public class SpringSecurityCoreVersionTests { performChecks(minSpringVersion); - verify(logger, never()).warn(any()); + verify(this.logger, never()).warn(any()); } @Test @@ -153,7 +153,7 @@ public class SpringSecurityCoreVersionTests { performChecks(); - verifyZeroInteractions(logger); + verifyZeroInteractions(this.logger); } private String getDisableChecksProperty() { diff --git a/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java b/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java index f15f56cdee..f71ffb8f6e 100644 --- a/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java +++ b/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java @@ -29,85 +29,88 @@ public class AnnotationParameterNameDiscovererTests { @Before public void setup() { - discoverer = new AnnotationParameterNameDiscoverer(P.class.getName()); + this.discoverer = new AnnotationParameterNameDiscoverer(P.class.getName()); } @Test public void getParameterNamesInterfaceSingleParam() { - assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByTo", String.class))) - .isEqualTo(new String[] { "to" }); + assertThat(this.discoverer + .getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByTo", String.class))) + .isEqualTo(new String[] { "to" }); } @Test public void getParameterNamesInterfaceSingleParamAnnotatedWithMultiParams() { - assertThat(discoverer.getParameterNames( + assertThat(this.discoverer.getParameterNames( ReflectionUtils.findMethod(Dao.class, "findMessageByToAndFrom", String.class, String.class))) .isEqualTo(new String[] { "to", null }); } @Test public void getParameterNamesInterfaceNoAnnotation() { - assertThat(discoverer + assertThat(this.discoverer .getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByIdNoAnnotation", String.class))) .isNull(); } @Test public void getParameterNamesClassSingleParam() { - assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByTo", String.class))) - .isEqualTo(new String[] { "to" }); + assertThat(this.discoverer + .getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByTo", String.class))) + .isEqualTo(new String[] { "to" }); } @Test public void getParameterNamesClassSingleParamAnnotatedWithMultiParams() { - assertThat(discoverer.getParameterNames( + assertThat(this.discoverer.getParameterNames( ReflectionUtils.findMethod(Dao.class, "findMessageByToAndFrom", String.class, String.class))) .isEqualTo(new String[] { "to", null }); } @Test public void getParameterNamesClassNoAnnotation() { - assertThat(discoverer + assertThat(this.discoverer .getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByIdNoAnnotation", String.class))) .isNull(); } @Test public void getParameterNamesConstructor() throws Exception { - assertThat(discoverer.getParameterNames(Impl.class.getDeclaredConstructor(String.class))) + assertThat(this.discoverer.getParameterNames(Impl.class.getDeclaredConstructor(String.class))) .isEqualTo(new String[] { "id" }); } @Test public void getParameterNamesConstructorNoAnnotation() throws Exception { - assertThat(discoverer.getParameterNames(Impl.class.getDeclaredConstructor(Long.class))).isNull(); + assertThat(this.discoverer.getParameterNames(Impl.class.getDeclaredConstructor(Long.class))).isNull(); } @Test public void getParameterNamesClassAnnotationOnInterface() { - assertThat(discoverer + assertThat(this.discoverer .getParameterNames(ReflectionUtils.findMethod(DaoImpl.class, "findMessageByTo", String.class))) .isEqualTo(new String[] { "to" }); - assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByTo", String.class))) - .isEqualTo(new String[] { "to" }); + assertThat(this.discoverer + .getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByTo", String.class))) + .isEqualTo(new String[] { "to" }); } @Test public void getParameterNamesClassAnnotationOnImpl() { - assertThat(discoverer.getParameterNames( + assertThat(this.discoverer.getParameterNames( ReflectionUtils.findMethod(Dao.class, "findMessageByToAndFrom", String.class, String.class))) .isEqualTo(new String[] { "to", null }); - assertThat(discoverer.getParameterNames( + assertThat(this.discoverer.getParameterNames( ReflectionUtils.findMethod(DaoImpl.class, "findMessageByToAndFrom", String.class, String.class))) .isEqualTo(new String[] { "to", "from" }); } @Test public void getParameterNamesClassAnnotationOnBaseClass() { - assertThat(discoverer + assertThat(this.discoverer .getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByIdNoAnnotation", String.class))) .isNull(); - assertThat(discoverer.getParameterNames( + assertThat(this.discoverer.getParameterNames( ReflectionUtils.findMethod(DaoImpl.class, "findMessageByIdNoAnnotation", String.class))) .isEqualTo(new String[] { "id" }); } diff --git a/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java b/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java index f2ab668673..fdea9f25c8 100644 --- a/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java +++ b/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java @@ -40,13 +40,13 @@ public class DefaultSecurityParameterNameDiscovererTests { @Before public void setup() { - discoverer = new DefaultSecurityParameterNameDiscoverer(); + this.discoverer = new DefaultSecurityParameterNameDiscoverer(); } @Test public void constructorDefault() { List discoverers = (List) ReflectionTestUtils - .getField(discoverer, "parameterNameDiscoverers"); + .getField(this.discoverer, "parameterNameDiscoverers"); assertThat(discoverers).hasSize(2); @@ -61,11 +61,11 @@ public class DefaultSecurityParameterNameDiscovererTests { @Test public void constructorDiscoverers() { - discoverer = new DefaultSecurityParameterNameDiscoverer( + this.discoverer = new DefaultSecurityParameterNameDiscoverer( Arrays.asList(new LocalVariableTableParameterNameDiscoverer())); List discoverers = (List) ReflectionTestUtils - .getField(discoverer, "parameterNameDiscoverers"); + .getField(this.discoverer, "parameterNameDiscoverers"); assertThat(discoverers).hasSize(3); assertThat(discoverers.get(0)).isInstanceOf(LocalVariableTableParameterNameDiscoverer.class); diff --git a/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java b/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java index 21de69ed01..404722f8cb 100644 --- a/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java +++ b/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java @@ -37,7 +37,7 @@ public class SessionRegistryImplTests { @Before public void setUp() { - sessionRegistry = new SessionRegistryImpl(); + this.sessionRegistry = new SessionRegistryImpl(); } @Test @@ -46,10 +46,10 @@ public class SessionRegistryImplTests { final String sessionId = "zzzz"; // Register new Session - sessionRegistry.registerNewSession(sessionId, principal); + this.sessionRegistry.registerNewSession(sessionId, principal); // De-register session via an ApplicationEvent - sessionRegistry.onApplicationEvent(new SessionDestroyedEvent("") { + this.sessionRegistry.onApplicationEvent(new SessionDestroyedEvent("") { @Override public String getId() { return sessionId; @@ -62,7 +62,7 @@ public class SessionRegistryImplTests { }); // Check attempts to retrieve cleared session return null - assertThat(sessionRegistry.getSessionInformation(sessionId)).isNull(); + assertThat(this.sessionRegistry.getSessionInformation(sessionId)).isNull(); } @Test @@ -72,10 +72,10 @@ public class SessionRegistryImplTests { final String newSessionId = "123"; // Register new Session - sessionRegistry.registerNewSession(sessionId, principal); + this.sessionRegistry.registerNewSession(sessionId, principal); // De-register session via an ApplicationEvent - sessionRegistry.onApplicationEvent(new SessionIdChangedEvent("") { + this.sessionRegistry.onApplicationEvent(new SessionIdChangedEvent("") { @Override public String getOldSessionId() { return sessionId; @@ -87,9 +87,9 @@ public class SessionRegistryImplTests { } }); - assertThat(sessionRegistry.getSessionInformation(sessionId)).isNull(); - assertThat(sessionRegistry.getSessionInformation(newSessionId)).isNotNull(); - assertThat(sessionRegistry.getSessionInformation(newSessionId).getPrincipal()).isEqualTo(principal); + assertThat(this.sessionRegistry.getSessionInformation(sessionId)).isNull(); + assertThat(this.sessionRegistry.getSessionInformation(newSessionId)).isNotNull(); + assertThat(this.sessionRegistry.getSessionInformation(newSessionId).getPrincipal()).isEqualTo(principal); } @Test @@ -100,13 +100,13 @@ public class SessionRegistryImplTests { String sessionId2 = "9876543210"; String sessionId3 = "5432109876"; - sessionRegistry.registerNewSession(sessionId1, principal1); - sessionRegistry.registerNewSession(sessionId2, principal1); - sessionRegistry.registerNewSession(sessionId3, principal2); + this.sessionRegistry.registerNewSession(sessionId1, principal1); + this.sessionRegistry.registerNewSession(sessionId2, principal1); + this.sessionRegistry.registerNewSession(sessionId3, principal2); - assertThat(sessionRegistry.getAllPrincipals()).hasSize(2); - assertThat(sessionRegistry.getAllPrincipals().contains(principal1)).isTrue(); - assertThat(sessionRegistry.getAllPrincipals().contains(principal2)).isTrue(); + assertThat(this.sessionRegistry.getAllPrincipals()).hasSize(2); + assertThat(this.sessionRegistry.getAllPrincipals().contains(principal1)).isTrue(); + assertThat(this.sessionRegistry.getAllPrincipals().contains(principal2)).isTrue(); } @Test @@ -114,36 +114,36 @@ public class SessionRegistryImplTests { Object principal = "Some principal object"; String sessionId = "1234567890"; // Register new Session - sessionRegistry.registerNewSession(sessionId, principal); + this.sessionRegistry.registerNewSession(sessionId, principal); // Retrieve existing session by session ID - Date currentDateTime = sessionRegistry.getSessionInformation(sessionId).getLastRequest(); - assertThat(sessionRegistry.getSessionInformation(sessionId).getPrincipal()).isEqualTo(principal); - assertThat(sessionRegistry.getSessionInformation(sessionId).getSessionId()).isEqualTo(sessionId); - assertThat(sessionRegistry.getSessionInformation(sessionId).getLastRequest()).isNotNull(); + Date currentDateTime = this.sessionRegistry.getSessionInformation(sessionId).getLastRequest(); + assertThat(this.sessionRegistry.getSessionInformation(sessionId).getPrincipal()).isEqualTo(principal); + assertThat(this.sessionRegistry.getSessionInformation(sessionId).getSessionId()).isEqualTo(sessionId); + assertThat(this.sessionRegistry.getSessionInformation(sessionId).getLastRequest()).isNotNull(); // Retrieve existing session by principal - assertThat(sessionRegistry.getAllSessions(principal, false)).hasSize(1); + assertThat(this.sessionRegistry.getAllSessions(principal, false)).hasSize(1); // Sleep to ensure SessionRegistryImpl will update time Thread.sleep(1000); // Update request date/time - sessionRegistry.refreshLastRequest(sessionId); + this.sessionRegistry.refreshLastRequest(sessionId); - Date retrieved = sessionRegistry.getSessionInformation(sessionId).getLastRequest(); + Date retrieved = this.sessionRegistry.getSessionInformation(sessionId).getLastRequest(); assertThat(retrieved.after(currentDateTime)).isTrue(); // Check it retrieves correctly when looked up via principal - assertThat(sessionRegistry.getAllSessions(principal, false).get(0).getLastRequest()).isCloseTo(retrieved, + assertThat(this.sessionRegistry.getAllSessions(principal, false).get(0).getLastRequest()).isCloseTo(retrieved, 2000L); // Clear session information - sessionRegistry.removeSessionInformation(sessionId); + this.sessionRegistry.removeSessionInformation(sessionId); // Check attempts to retrieve cleared session return null - assertThat(sessionRegistry.getSessionInformation(sessionId)).isNull(); - assertThat(sessionRegistry.getAllSessions(principal, false)).isEmpty(); + assertThat(this.sessionRegistry.getSessionInformation(sessionId)).isNull(); + assertThat(this.sessionRegistry.getAllSessions(principal, false)).isEmpty(); } @Test @@ -152,23 +152,23 @@ public class SessionRegistryImplTests { String sessionId1 = "1234567890"; String sessionId2 = "9876543210"; - sessionRegistry.registerNewSession(sessionId1, principal); - List sessions = sessionRegistry.getAllSessions(principal, false); + this.sessionRegistry.registerNewSession(sessionId1, principal); + List sessions = this.sessionRegistry.getAllSessions(principal, false); assertThat(sessions).hasSize(1); assertThat(contains(sessionId1, principal)).isTrue(); - sessionRegistry.registerNewSession(sessionId2, principal); - sessions = sessionRegistry.getAllSessions(principal, false); + this.sessionRegistry.registerNewSession(sessionId2, principal); + sessions = this.sessionRegistry.getAllSessions(principal, false); assertThat(sessions).hasSize(2); assertThat(contains(sessionId2, principal)).isTrue(); // Expire one session - SessionInformation session = sessionRegistry.getSessionInformation(sessionId2); + SessionInformation session = this.sessionRegistry.getSessionInformation(sessionId2); session.expireNow(); // Check retrieval still correct - assertThat(sessionRegistry.getSessionInformation(sessionId2).isExpired()).isTrue(); - assertThat(sessionRegistry.getSessionInformation(sessionId1).isExpired()).isFalse(); + assertThat(this.sessionRegistry.getSessionInformation(sessionId2).isExpired()).isTrue(); + assertThat(this.sessionRegistry.getSessionInformation(sessionId1).isExpired()).isFalse(); } @Test @@ -177,28 +177,28 @@ public class SessionRegistryImplTests { String sessionId1 = "1234567890"; String sessionId2 = "9876543210"; - sessionRegistry.registerNewSession(sessionId1, principal); - List sessions = sessionRegistry.getAllSessions(principal, false); + this.sessionRegistry.registerNewSession(sessionId1, principal); + List sessions = this.sessionRegistry.getAllSessions(principal, false); assertThat(sessions).hasSize(1); assertThat(contains(sessionId1, principal)).isTrue(); - sessionRegistry.registerNewSession(sessionId2, principal); - sessions = sessionRegistry.getAllSessions(principal, false); + this.sessionRegistry.registerNewSession(sessionId2, principal); + sessions = this.sessionRegistry.getAllSessions(principal, false); assertThat(sessions).hasSize(2); assertThat(contains(sessionId2, principal)).isTrue(); - sessionRegistry.removeSessionInformation(sessionId1); - sessions = sessionRegistry.getAllSessions(principal, false); + this.sessionRegistry.removeSessionInformation(sessionId1); + sessions = this.sessionRegistry.getAllSessions(principal, false); assertThat(sessions).hasSize(1); assertThat(contains(sessionId2, principal)).isTrue(); - sessionRegistry.removeSessionInformation(sessionId2); - assertThat(sessionRegistry.getSessionInformation(sessionId2)).isNull(); - assertThat(sessionRegistry.getAllSessions(principal, false)).isEmpty(); + this.sessionRegistry.removeSessionInformation(sessionId2); + assertThat(this.sessionRegistry.getSessionInformation(sessionId2)).isNull(); + assertThat(this.sessionRegistry.getAllSessions(principal, false)).isEmpty(); } private boolean contains(String sessionId, Object principal) { - List info = sessionRegistry.getAllSessions(principal, false); + List info = this.sessionRegistry.getAllSessions(principal, false); for (SessionInformation sessionInformation : info) { if (sessionId.equals(sessionInformation.getSessionId())) { diff --git a/core/src/test/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsServiceTests.java b/core/src/test/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsServiceTests.java index c58d52a5ab..34d633c551 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsServiceTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsServiceTests.java @@ -56,34 +56,34 @@ public class MapReactiveUserDetailsServiceTests { @Test public void findByUsernameWhenFoundThenReturns() { - assertThat((users.findByUsername(USER_DETAILS.getUsername()).block())).isEqualTo(USER_DETAILS); + assertThat((this.users.findByUsername(USER_DETAILS.getUsername()).block())).isEqualTo(USER_DETAILS); } @Test public void findByUsernameWhenDifferentCaseThenReturns() { - assertThat((users.findByUsername("uSeR").block())).isEqualTo(USER_DETAILS); + assertThat((this.users.findByUsername("uSeR").block())).isEqualTo(USER_DETAILS); } @Test public void findByUsernameWhenClearCredentialsThenFindByUsernameStillHasCredentials() { - User foundUser = users.findByUsername(USER_DETAILS.getUsername()).cast(User.class).block(); + User foundUser = this.users.findByUsername(USER_DETAILS.getUsername()).cast(User.class).block(); assertThat(foundUser.getPassword()).isNotEmpty(); foundUser.eraseCredentials(); assertThat(foundUser.getPassword()).isNull(); - foundUser = users.findByUsername(USER_DETAILS.getUsername()).cast(User.class).block(); + foundUser = this.users.findByUsername(USER_DETAILS.getUsername()).cast(User.class).block(); assertThat(foundUser.getPassword()).isNotEmpty(); } @Test public void findByUsernameWhenNotFoundThenEmpty() { - assertThat((users.findByUsername("notfound"))).isEqualTo(Mono.empty()); + assertThat((this.users.findByUsername("notfound"))).isEqualTo(Mono.empty()); } @Test public void updatePassword() { - users.updatePassword(USER_DETAILS, "new").block(); - assertThat(users.findByUsername(USER_DETAILS.getUsername()).block().getPassword()).isEqualTo("new"); + this.users.updatePassword(USER_DETAILS, "new").block(); + assertThat(this.users.findByUsername(USER_DETAILS.getUsername()).block().getPassword()).isEqualTo("new"); } } diff --git a/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java b/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java index 6a51285265..b342cc6ff3 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java @@ -36,19 +36,19 @@ public class MockUserDetailsService implements UserDetailsService { private List auths = AuthorityUtils.createAuthorityList("ROLE_USER"); public MockUserDetailsService() { - users.put("valid", new User("valid", "", true, true, true, true, auths)); - users.put("locked", new User("locked", "", true, true, true, false, auths)); - users.put("disabled", new User("disabled", "", false, true, true, true, auths)); - users.put("credentialsExpired", new User("credentialsExpired", "", true, true, false, true, auths)); - users.put("expired", new User("expired", "", true, false, true, true, auths)); + this.users.put("valid", new User("valid", "", true, true, true, true, this.auths)); + this.users.put("locked", new User("locked", "", true, true, true, false, this.auths)); + this.users.put("disabled", new User("disabled", "", false, true, true, true, this.auths)); + this.users.put("credentialsExpired", new User("credentialsExpired", "", true, true, false, true, this.auths)); + this.users.put("expired", new User("expired", "", true, false, true, true, this.auths)); } public UserDetails loadUserByUsername(String username) { - if (users.get(username) == null) { + if (this.users.get(username) == null) { throw new UsernameNotFoundException("User not found: " + username); } - return users.get(username); + return this.users.get(username); } } diff --git a/core/src/test/java/org/springframework/security/jackson2/AbstractMixinTests.java b/core/src/test/java/org/springframework/security/jackson2/AbstractMixinTests.java index f89ae7475a..a29801bd5a 100644 --- a/core/src/test/java/org/springframework/security/jackson2/AbstractMixinTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/AbstractMixinTests.java @@ -32,9 +32,9 @@ public abstract class AbstractMixinTests { @Before public void setup() { - mapper = new ObjectMapper(); + this.mapper = new ObjectMapper(); ClassLoader loader = getClass().getClassLoader(); - mapper.registerModules(SecurityJackson2Modules.getModules(loader)); + this.mapper.registerModules(SecurityJackson2Modules.getModules(loader)); } User createDefaultUser() { diff --git a/core/src/test/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixinTests.java b/core/src/test/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixinTests.java index 9eb5b46e26..1efa6f4b62 100644 --- a/core/src/test/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixinTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixinTests.java @@ -53,13 +53,13 @@ public class AnonymousAuthenticationTokenMixinTests extends AbstractMixinTests { public void serializeAnonymousAuthenticationTokenTest() throws JsonProcessingException, JSONException { User user = createDefaultUser(); AnonymousAuthenticationToken token = new AnonymousAuthenticationToken(HASH_KEY, user, user.getAuthorities()); - String actualJson = mapper.writeValueAsString(token); + String actualJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(ANONYMOUS_JSON, actualJson, true); } @Test public void deserializeAnonymousAuthenticationTokenTest() throws IOException { - AnonymousAuthenticationToken token = mapper.readValue(ANONYMOUS_JSON, AnonymousAuthenticationToken.class); + AnonymousAuthenticationToken token = this.mapper.readValue(ANONYMOUS_JSON, AnonymousAuthenticationToken.class); assertThat(token).isNotNull(); assertThat(token.getKeyHash()).isEqualTo(HASH_KEY.hashCode()); assertThat(token.getAuthorities()).isNotNull().hasSize(1).contains(new SimpleGrantedAuthority("ROLE_USER")); @@ -70,7 +70,7 @@ public class AnonymousAuthenticationTokenMixinTests extends AbstractMixinTests { String jsonString = "{\"@class\": \"org.springframework.security.authentication.AnonymousAuthenticationToken\", \"details\": null," + "\"principal\": \"user\", \"authenticated\": true, \"keyHash\": " + HASH_KEY.hashCode() + "," + "\"authorities\": [\"java.util.ArrayList\", []]}"; - mapper.readValue(jsonString, AnonymousAuthenticationToken.class); + this.mapper.readValue(jsonString, AnonymousAuthenticationToken.class); } @Test @@ -79,7 +79,7 @@ public class AnonymousAuthenticationTokenMixinTests extends AbstractMixinTests { User user = createDefaultUser(); AnonymousAuthenticationToken token = new AnonymousAuthenticationToken(HASH_KEY, user, user.getAuthorities()); token.eraseCredentials(); - String actualJson = mapper.writeValueAsString(token); + String actualJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(ANONYMOUS_JSON.replace(UserDeserializerTests.USER_PASSWORD, "null"), actualJson, true); } diff --git a/core/src/test/java/org/springframework/security/jackson2/BadCredentialsExceptionMixinTests.java b/core/src/test/java/org/springframework/security/jackson2/BadCredentialsExceptionMixinTests.java index 8fce534128..6a62775408 100644 --- a/core/src/test/java/org/springframework/security/jackson2/BadCredentialsExceptionMixinTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/BadCredentialsExceptionMixinTests.java @@ -44,13 +44,13 @@ public class BadCredentialsExceptionMixinTests extends AbstractMixinTests { @Test public void serializeBadCredentialsExceptionMixinTest() throws JsonProcessingException, JSONException { BadCredentialsException exception = new BadCredentialsException("message"); - String serializedJson = mapper.writeValueAsString(exception); + String serializedJson = this.mapper.writeValueAsString(exception); JSONAssert.assertEquals(EXCEPTION_JSON, serializedJson, true); } @Test public void deserializeBadCredentialsExceptionMixinTest() throws IOException { - BadCredentialsException exception = mapper.readValue(EXCEPTION_JSON, BadCredentialsException.class); + BadCredentialsException exception = this.mapper.readValue(EXCEPTION_JSON, BadCredentialsException.class); assertThat(exception).isNotNull(); assertThat(exception.getCause()).isNull(); assertThat(exception.getMessage()).isEqualTo("message"); diff --git a/core/src/test/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixinTests.java b/core/src/test/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixinTests.java index 1fae8cbded..9500354e97 100644 --- a/core/src/test/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixinTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixinTests.java @@ -74,7 +74,7 @@ public class RememberMeAuthenticationTokenMixinTests extends AbstractMixinTests public void serializeRememberMeAuthenticationToken() throws JsonProcessingException, JSONException { RememberMeAuthenticationToken token = new RememberMeAuthenticationToken(REMEMBERME_KEY, "admin", Collections.singleton(new SimpleGrantedAuthority("ROLE_USER"))); - String actualJson = mapper.writeValueAsString(token); + String actualJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(REMEMBERME_AUTH_STRINGPRINCIPAL_JSON, actualJson, true); } @@ -83,7 +83,7 @@ public class RememberMeAuthenticationTokenMixinTests extends AbstractMixinTests User user = createDefaultUser(); RememberMeAuthenticationToken token = new RememberMeAuthenticationToken(REMEMBERME_KEY, user, user.getAuthorities()); - String actualJson = mapper.writeValueAsString(token); + String actualJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(String.format(REMEMBERME_AUTH_JSON, "\"password\""), actualJson, true); } @@ -94,14 +94,14 @@ public class RememberMeAuthenticationTokenMixinTests extends AbstractMixinTests RememberMeAuthenticationToken token = new RememberMeAuthenticationToken(REMEMBERME_KEY, user, user.getAuthorities()); token.eraseCredentials(); - String actualJson = mapper.writeValueAsString(token); + String actualJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(REMEMBERME_AUTH_JSON.replace(UserDeserializerTests.USER_PASSWORD, "null"), actualJson, true); } @Test public void deserializeRememberMeAuthenticationToken() throws IOException { - RememberMeAuthenticationToken token = mapper.readValue(REMEMBERME_AUTH_STRINGPRINCIPAL_JSON, + RememberMeAuthenticationToken token = this.mapper.readValue(REMEMBERME_AUTH_STRINGPRINCIPAL_JSON, RememberMeAuthenticationToken.class); assertThat(token).isNotNull(); assertThat(token.getPrincipal()).isNotNull().isEqualTo("admin").isEqualTo(token.getName()); @@ -110,7 +110,7 @@ public class RememberMeAuthenticationTokenMixinTests extends AbstractMixinTests @Test public void deserializeRememberMeAuthenticationTokenWithUserTest() throws IOException { - RememberMeAuthenticationToken token = mapper.readValue(String.format(REMEMBERME_AUTH_JSON, "\"password\""), + RememberMeAuthenticationToken token = this.mapper.readValue(String.format(REMEMBERME_AUTH_JSON, "\"password\""), RememberMeAuthenticationToken.class); assertThat(token).isNotNull(); assertThat(token.getPrincipal()).isNotNull().isInstanceOf(User.class); diff --git a/core/src/test/java/org/springframework/security/jackson2/SecurityContextMixinTests.java b/core/src/test/java/org/springframework/security/jackson2/SecurityContextMixinTests.java index 64427cb9f4..ab9405c986 100644 --- a/core/src/test/java/org/springframework/security/jackson2/SecurityContextMixinTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/SecurityContextMixinTests.java @@ -50,13 +50,13 @@ public class SecurityContextMixinTests extends AbstractMixinTests { SecurityContext context = new SecurityContextImpl(); context.setAuthentication(new UsernamePasswordAuthenticationToken("admin", "1234", Collections.singleton(new SimpleGrantedAuthority("ROLE_USER")))); - String actualJson = mapper.writeValueAsString(context); + String actualJson = this.mapper.writeValueAsString(context); JSONAssert.assertEquals(SECURITY_CONTEXT_JSON, actualJson, true); } @Test public void securityContextDeserializeTest() throws IOException { - SecurityContext context = mapper.readValue(SECURITY_CONTEXT_JSON, SecurityContextImpl.class); + SecurityContext context = this.mapper.readValue(SECURITY_CONTEXT_JSON, SecurityContextImpl.class); assertThat(context).isNotNull(); assertThat(context.getAuthentication()).isNotNull().isInstanceOf(UsernamePasswordAuthenticationToken.class); assertThat(context.getAuthentication().getPrincipal()).isEqualTo("admin"); diff --git a/core/src/test/java/org/springframework/security/jackson2/SecurityJackson2ModulesTests.java b/core/src/test/java/org/springframework/security/jackson2/SecurityJackson2ModulesTests.java index 0e28240fee..79fb7d4fa4 100644 --- a/core/src/test/java/org/springframework/security/jackson2/SecurityJackson2ModulesTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/SecurityJackson2ModulesTests.java @@ -44,57 +44,57 @@ public class SecurityJackson2ModulesTests { @Before public void setup() { - mapper = new ObjectMapper(); - SecurityJackson2Modules.enableDefaultTyping(mapper); + this.mapper = new ObjectMapper(); + SecurityJackson2Modules.enableDefaultTyping(this.mapper); } @Test public void readValueWhenNotAllowedOrMappedThenThrowsException() { String content = "{\"@class\":\"org.springframework.security.jackson2.SecurityJackson2ModulesTests$NotAllowlisted\",\"property\":\"bar\"}"; assertThatThrownBy(() -> { - mapper.readValue(content, Object.class); + this.mapper.readValue(content, Object.class); }).hasStackTraceContaining("allowlist"); } @Test public void readValueWhenExplicitDefaultTypingAfterSecuritySetupThenReadsAsSpecificType() throws Exception { - mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY); + this.mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY); String content = "{\"@class\":\"org.springframework.security.jackson2.SecurityJackson2ModulesTests$NotAllowlisted\",\"property\":\"bar\"}"; - assertThat(mapper.readValue(content, Object.class)).isInstanceOf(NotAllowlisted.class); + assertThat(this.mapper.readValue(content, Object.class)).isInstanceOf(NotAllowlisted.class); } @Test public void readValueWhenExplicitDefaultTypingBeforeSecuritySetupThenReadsAsSpecificType() throws Exception { - mapper = new ObjectMapper(); - mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY); - SecurityJackson2Modules.enableDefaultTyping(mapper); + this.mapper = new ObjectMapper(); + this.mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY); + SecurityJackson2Modules.enableDefaultTyping(this.mapper); String content = "{\"@class\":\"org.springframework.security.jackson2.SecurityJackson2ModulesTests$NotAllowlisted\",\"property\":\"bar\"}"; - assertThat(mapper.readValue(content, Object.class)).isInstanceOf(NotAllowlisted.class); + assertThat(this.mapper.readValue(content, Object.class)).isInstanceOf(NotAllowlisted.class); } @Test public void readValueWhenAnnotatedThenReadsAsSpecificType() throws Exception { String content = "{\"@class\":\"org.springframework.security.jackson2.SecurityJackson2ModulesTests$NotAllowlistedButAnnotated\",\"property\":\"bar\"}"; - assertThat(mapper.readValue(content, Object.class)).isInstanceOf(NotAllowlistedButAnnotated.class); + assertThat(this.mapper.readValue(content, Object.class)).isInstanceOf(NotAllowlistedButAnnotated.class); } @Test public void readValueWhenMixinProvidedThenReadsAsSpecificType() throws Exception { - mapper.addMixIn(NotAllowlisted.class, NotAllowlistedMixin.class); + this.mapper.addMixIn(NotAllowlisted.class, NotAllowlistedMixin.class); String content = "{\"@class\":\"org.springframework.security.jackson2.SecurityJackson2ModulesTests$NotAllowlisted\",\"property\":\"bar\"}"; - assertThat(mapper.readValue(content, Object.class)).isInstanceOf(NotAllowlisted.class); + assertThat(this.mapper.readValue(content, Object.class)).isInstanceOf(NotAllowlisted.class); } @Test public void readValueWhenHashMapThenReadsAsSpecificType() throws Exception { - mapper.addMixIn(NotAllowlisted.class, NotAllowlistedMixin.class); + this.mapper.addMixIn(NotAllowlisted.class, NotAllowlistedMixin.class); String content = "{\"@class\":\"java.util.HashMap\"}"; - assertThat(mapper.readValue(content, Object.class)).isInstanceOf(HashMap.class); + assertThat(this.mapper.readValue(content, Object.class)).isInstanceOf(HashMap.class); } @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE }) @@ -110,7 +110,7 @@ public class SecurityJackson2ModulesTests { private String property = "bar"; public String getProperty() { - return property; + return this.property; } public void setProperty(String property) { @@ -124,7 +124,7 @@ public class SecurityJackson2ModulesTests { private String property = "bar"; public String getProperty() { - return property; + return this.property; } public void setProperty(String property) { diff --git a/core/src/test/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixinTests.java b/core/src/test/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixinTests.java index 73bb8f3d31..2786cd2b24 100644 --- a/core/src/test/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixinTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixinTests.java @@ -51,13 +51,13 @@ public class SimpleGrantedAuthorityMixinTests extends AbstractMixinTests { @Test public void serializeSimpleGrantedAuthorityTest() throws JsonProcessingException, JSONException { SimpleGrantedAuthority authority = new SimpleGrantedAuthority("ROLE_USER"); - String serializeJson = mapper.writeValueAsString(authority); + String serializeJson = this.mapper.writeValueAsString(authority); JSONAssert.assertEquals(AUTHORITY_JSON, serializeJson, true); } @Test public void deserializeGrantedAuthorityTest() throws IOException { - SimpleGrantedAuthority authority = mapper.readValue(AUTHORITY_JSON, SimpleGrantedAuthority.class); + SimpleGrantedAuthority authority = this.mapper.readValue(AUTHORITY_JSON, SimpleGrantedAuthority.class); assertThat(authority).isNotNull(); assertThat(authority.getAuthority()).isNotNull().isEqualTo("ROLE_USER"); } @@ -65,7 +65,7 @@ public class SimpleGrantedAuthorityMixinTests extends AbstractMixinTests { @Test(expected = JsonMappingException.class) public void deserializeGrantedAuthorityWithoutRoleTest() throws IOException { String json = "{\"@class\": \"org.springframework.security.core.authority.SimpleGrantedAuthority\"}"; - mapper.readValue(json, SimpleGrantedAuthority.class); + this.mapper.readValue(json, SimpleGrantedAuthority.class); } } diff --git a/core/src/test/java/org/springframework/security/jackson2/UserDeserializerTests.java b/core/src/test/java/org/springframework/security/jackson2/UserDeserializerTests.java index b3aa03f696..5f165c43d3 100644 --- a/core/src/test/java/org/springframework/security/jackson2/UserDeserializerTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/UserDeserializerTests.java @@ -57,14 +57,14 @@ public class UserDeserializerTests extends AbstractMixinTests { @Test public void serializeUserTest() throws JsonProcessingException, JSONException { User user = createDefaultUser(); - String userJson = mapper.writeValueAsString(user); + String userJson = this.mapper.writeValueAsString(user); JSONAssert.assertEquals(userWithPasswordJson(user.getPassword()), userJson, true); } @Test public void serializeUserWithoutAuthority() throws JsonProcessingException, JSONException { User user = new User("admin", "1234", Collections.emptyList()); - String userJson = mapper.writeValueAsString(user); + String userJson = this.mapper.writeValueAsString(user); JSONAssert.assertEquals(userWithNoAuthoritiesJson(), userJson, true); } @@ -73,14 +73,14 @@ public class UserDeserializerTests extends AbstractMixinTests { String userJsonWithoutPasswordString = USER_JSON.replace(SimpleGrantedAuthorityMixinTests.AUTHORITIES_SET_JSON, "[]"); - mapper.readValue(userJsonWithoutPasswordString, User.class); + this.mapper.readValue(userJsonWithoutPasswordString, User.class); } @Test public void deserializeUserWithNullPasswordNoAuthorityTest() throws Exception { - String userJsonWithoutPasswordString = removeNode(userWithNoAuthoritiesJson(), mapper, "password"); + String userJsonWithoutPasswordString = removeNode(userWithNoAuthoritiesJson(), this.mapper, "password"); - User user = mapper.readValue(userJsonWithoutPasswordString, User.class); + User user = this.mapper.readValue(userJsonWithoutPasswordString, User.class); assertThat(user).isNotNull(); assertThat(user.getUsername()).isEqualTo("admin"); assertThat(user.getPassword()).isNull(); @@ -92,12 +92,12 @@ public class UserDeserializerTests extends AbstractMixinTests { public void deserializeUserWithNoClassIdInAuthoritiesTest() throws Exception { String userJson = USER_JSON.replace(SimpleGrantedAuthorityMixinTests.AUTHORITIES_SET_JSON, "[{\"authority\": \"ROLE_USER\"}]"); - mapper.readValue(userJson, User.class); + this.mapper.readValue(userJson, User.class); } @Test public void deserializeUserWithClassIdInAuthoritiesTest() throws IOException { - User user = mapper.readValue(userJson(), User.class); + User user = this.mapper.readValue(userJson(), User.class); assertThat(user).isNotNull(); assertThat(user.getUsername()).isEqualTo("admin"); assertThat(user.getPassword()).isEqualTo("1234"); diff --git a/core/src/test/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixinTests.java b/core/src/test/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixinTests.java index 1b5791ecc9..18905cf639 100644 --- a/core/src/test/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixinTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixinTests.java @@ -86,7 +86,7 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin public void serializeUnauthenticatedUsernamePasswordAuthenticationTokenMixinTest() throws JsonProcessingException, JSONException { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("admin", "1234"); - String serializedJson = mapper.writeValueAsString(token); + String serializedJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(UNAUTHENTICATED_STRINGPRINCIPAL_JSON, serializedJson, true); } @@ -96,13 +96,13 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin User user = createDefaultUser(); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(user.getUsername(), user.getPassword(), user.getAuthorities()); - String serializedJson = mapper.writeValueAsString(token); + String serializedJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(AUTHENTICATED_STRINGPRINCIPAL_JSON, serializedJson, true); } @Test public void deserializeUnauthenticatedUsernamePasswordAuthenticationTokenMixinTest() throws IOException { - UsernamePasswordAuthenticationToken token = mapper.readValue(UNAUTHENTICATED_STRINGPRINCIPAL_JSON, + UsernamePasswordAuthenticationToken token = this.mapper.readValue(UNAUTHENTICATED_STRINGPRINCIPAL_JSON, UsernamePasswordAuthenticationToken.class); assertThat(token).isNotNull(); assertThat(token.isAuthenticated()).isEqualTo(false); @@ -112,7 +112,7 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin @Test public void deserializeAuthenticatedUsernamePasswordAuthenticationTokenMixinTest() throws IOException { UsernamePasswordAuthenticationToken expectedToken = createToken(); - UsernamePasswordAuthenticationToken token = mapper.readValue(AUTHENTICATED_STRINGPRINCIPAL_JSON, + UsernamePasswordAuthenticationToken token = this.mapper.readValue(AUTHENTICATED_STRINGPRINCIPAL_JSON, UsernamePasswordAuthenticationToken.class); assertThat(token).isNotNull(); assertThat(token.isAuthenticated()).isTrue(); @@ -123,13 +123,13 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin public void serializeAuthenticatedUsernamePasswordAuthenticationTokenMixinWithUserTest() throws JsonProcessingException, JSONException { UsernamePasswordAuthenticationToken token = createToken(); - String actualJson = mapper.writeValueAsString(token); + String actualJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(AUTHENTICATED_JSON, actualJson, true); } @Test public void deserializeAuthenticatedUsernamePasswordAuthenticationTokenWithUserTest() throws IOException { - UsernamePasswordAuthenticationToken token = mapper.readValue(AUTHENTICATED_JSON, + UsernamePasswordAuthenticationToken token = this.mapper.readValue(AUTHENTICATED_JSON, UsernamePasswordAuthenticationToken.class); assertThat(token).isNotNull(); assertThat(token.getPrincipal()).isNotNull().isInstanceOf(User.class); @@ -144,7 +144,7 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin throws JsonProcessingException, JSONException { UsernamePasswordAuthenticationToken token = createToken(); token.eraseCredentials(); - String actualJson = mapper.writeValueAsString(token); + String actualJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(AUTHENTICATED_JSON.replaceAll(UserDeserializerTests.USER_PASSWORD, "null"), actualJson, true); } @@ -156,14 +156,14 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin principal.setUsername("admin"); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(principal, null, new ArrayList<>()); - String actualJson = mapper.writeValueAsString(token); + String actualJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(AUTHENTICATED_NON_USER_PRINCIPAL_JSON, actualJson, true); } @Test public void deserializeAuthenticatedUsernamePasswordAuthenticationTokenWithNonUserPrincipalTest() throws IOException { - UsernamePasswordAuthenticationToken token = mapper.readValue(AUTHENTICATED_NON_USER_PRINCIPAL_JSON, + UsernamePasswordAuthenticationToken token = this.mapper.readValue(AUTHENTICATED_NON_USER_PRINCIPAL_JSON, UsernamePasswordAuthenticationToken.class); assertThat(token).isNotNull(); assertThat(token.getPrincipal()).isNotNull().isInstanceOf(NonUserPrincipal.class); @@ -171,7 +171,7 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin @Test public void deserializeAuthenticatedUsernamePasswordAuthenticationTokenWithDetailsTest() throws IOException { - UsernamePasswordAuthenticationToken token = mapper.readValue(AUTHENTICATED_STRINGDETAILS_JSON, + UsernamePasswordAuthenticationToken token = this.mapper.readValue(AUTHENTICATED_STRINGDETAILS_JSON, UsernamePasswordAuthenticationToken.class); assertThat(token).isNotNull(); assertThat(token.getPrincipal()).isNotNull().isInstanceOf(User.class); @@ -224,7 +224,7 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin private String username; public String getUsername() { - return username; + return this.username; } public void setUsername(String username) { diff --git a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java index 14b5941d7c..343b04cb9f 100644 --- a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java +++ b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java @@ -83,56 +83,57 @@ public class JdbcUserDetailsManagerTests { @Before public void initializeManagerAndCreateTables() { - manager = new JdbcUserDetailsManager(); - cache = new MockUserCache(); - manager.setUserCache(cache); - manager.setDataSource(dataSource); - manager.setCreateUserSql(JdbcUserDetailsManager.DEF_CREATE_USER_SQL); - manager.setUpdateUserSql(JdbcUserDetailsManager.DEF_UPDATE_USER_SQL); - manager.setUserExistsSql(JdbcUserDetailsManager.DEF_USER_EXISTS_SQL); - manager.setCreateAuthoritySql(JdbcUserDetailsManager.DEF_INSERT_AUTHORITY_SQL); - manager.setDeleteUserAuthoritiesSql(JdbcUserDetailsManager.DEF_DELETE_USER_AUTHORITIES_SQL); - manager.setDeleteUserSql(JdbcUserDetailsManager.DEF_DELETE_USER_SQL); - manager.setChangePasswordSql(JdbcUserDetailsManager.DEF_CHANGE_PASSWORD_SQL); - manager.initDao(); - template = manager.getJdbcTemplate(); + this.manager = new JdbcUserDetailsManager(); + this.cache = new MockUserCache(); + this.manager.setUserCache(this.cache); + this.manager.setDataSource(dataSource); + this.manager.setCreateUserSql(JdbcUserDetailsManager.DEF_CREATE_USER_SQL); + this.manager.setUpdateUserSql(JdbcUserDetailsManager.DEF_UPDATE_USER_SQL); + this.manager.setUserExistsSql(JdbcUserDetailsManager.DEF_USER_EXISTS_SQL); + this.manager.setCreateAuthoritySql(JdbcUserDetailsManager.DEF_INSERT_AUTHORITY_SQL); + this.manager.setDeleteUserAuthoritiesSql(JdbcUserDetailsManager.DEF_DELETE_USER_AUTHORITIES_SQL); + this.manager.setDeleteUserSql(JdbcUserDetailsManager.DEF_DELETE_USER_SQL); + this.manager.setChangePasswordSql(JdbcUserDetailsManager.DEF_CHANGE_PASSWORD_SQL); + this.manager.initDao(); + this.template = this.manager.getJdbcTemplate(); - template.execute("create table users(username varchar(20) not null primary key," + this.template.execute("create table users(username varchar(20) not null primary key," + "password varchar(20) not null, enabled boolean not null)"); - template.execute("create table authorities (username varchar(20) not null, authority varchar(20) not null, " - + "constraint fk_authorities_users foreign key(username) references users(username))"); - PopulatedDatabase.createGroupTables(template); - PopulatedDatabase.insertGroupData(template); + this.template + .execute("create table authorities (username varchar(20) not null, authority varchar(20) not null, " + + "constraint fk_authorities_users foreign key(username) references users(username))"); + PopulatedDatabase.createGroupTables(this.template); + PopulatedDatabase.insertGroupData(this.template); } @After public void dropTablesAndClearContext() { - template.execute("drop table authorities"); - template.execute("drop table users"); - template.execute("drop table group_authorities"); - template.execute("drop table group_members"); - template.execute("drop table groups"); + this.template.execute("drop table authorities"); + this.template.execute("drop table users"); + this.template.execute("drop table group_authorities"); + this.template.execute("drop table group_members"); + this.template.execute("drop table groups"); SecurityContextHolder.clearContext(); } private void setUpAccLockingColumns() { - template.execute("alter table users add column acc_locked boolean default false not null"); - template.execute("alter table users add column acc_expired boolean default false not null"); - template.execute("alter table users add column creds_expired boolean default false not null"); + this.template.execute("alter table users add column acc_locked boolean default false not null"); + this.template.execute("alter table users add column acc_expired boolean default false not null"); + this.template.execute("alter table users add column creds_expired boolean default false not null"); - manager.setUsersByUsernameQuery( + this.manager.setUsersByUsernameQuery( "select username,password,enabled, acc_locked, acc_expired, creds_expired from users where username = ?"); - manager.setCreateUserSql( + this.manager.setCreateUserSql( "insert into users (username, password, enabled, acc_locked, acc_expired, creds_expired) values (?,?,?,?,?,?)"); - manager.setUpdateUserSql( + this.manager.setUpdateUserSql( "update users set password = ?, enabled = ?, acc_locked=?, acc_expired=?, creds_expired=? where username = ?"); } @Test public void createUserInsertsCorrectData() { - manager.createUser(joe); + this.manager.createUser(joe); - UserDetails joe2 = manager.loadUserByUsername("joe"); + UserDetails joe2 = this.manager.loadUserByUsername("joe"); assertThat(joe2).isEqualTo(joe); } @@ -143,9 +144,9 @@ public class JdbcUserDetailsManagerTests { UserDetails user = new User("joe", "pass", true, false, true, false, AuthorityUtils.createAuthorityList("A", "B")); - manager.createUser(user); + this.manager.createUser(user); - UserDetails user2 = manager.loadUserByUsername(user.getUsername()); + UserDetails user2 = this.manager.loadUserByUsername(user.getUsername()); assertThat(user2).isEqualToComparingFieldByField(user); } @@ -153,11 +154,11 @@ public class JdbcUserDetailsManagerTests { @Test public void deleteUserRemovesUserDataAndAuthoritiesAndClearsCache() { insertJoe(); - manager.deleteUser("joe"); + this.manager.deleteUser("joe"); - assertThat(template.queryForList(SELECT_JOE_SQL)).isEmpty(); - assertThat(template.queryForList(SELECT_JOE_AUTHORITIES_SQL)).isEmpty(); - assertThat(cache.getUserMap().containsKey("joe")).isFalse(); + assertThat(this.template.queryForList(SELECT_JOE_SQL)).isEmpty(); + assertThat(this.template.queryForList(SELECT_JOE_AUTHORITIES_SQL)).isEmpty(); + assertThat(this.cache.getUserMap().containsKey("joe")).isFalse(); } @Test @@ -166,12 +167,12 @@ public class JdbcUserDetailsManagerTests { User newJoe = new User("joe", "newpassword", false, true, true, true, AuthorityUtils.createAuthorityList(new String[] { "D", "F", "E" })); - manager.updateUser(newJoe); + this.manager.updateUser(newJoe); - UserDetails joe = manager.loadUserByUsername("joe"); + UserDetails joe = this.manager.loadUserByUsername("joe"); assertThat(joe).isEqualTo(newJoe); - assertThat(cache.getUserMap().containsKey("joe")).isFalse(); + assertThat(this.cache.getUserMap().containsKey("joe")).isFalse(); } @Test @@ -183,40 +184,40 @@ public class JdbcUserDetailsManagerTests { User newJoe = new User("joe", "newpassword", false, false, false, true, AuthorityUtils.createAuthorityList("D", "F", "E")); - manager.updateUser(newJoe); + this.manager.updateUser(newJoe); - UserDetails joe = manager.loadUserByUsername(newJoe.getUsername()); + UserDetails joe = this.manager.loadUserByUsername(newJoe.getUsername()); assertThat(joe).isEqualToComparingFieldByField(newJoe); - assertThat(cache.getUserMap().containsKey(newJoe.getUsername())).isFalse(); + assertThat(this.cache.getUserMap().containsKey(newJoe.getUsername())).isFalse(); } @Test public void userExistsReturnsFalseForNonExistentUsername() { - assertThat(manager.userExists("joe")).isFalse(); + assertThat(this.manager.userExists("joe")).isFalse(); } @Test public void userExistsReturnsTrueForExistingUsername() { insertJoe(); - assertThat(manager.userExists("joe")).isTrue(); - assertThat(cache.getUserMap().containsKey("joe")).isTrue(); + assertThat(this.manager.userExists("joe")).isTrue(); + assertThat(this.cache.getUserMap().containsKey("joe")).isTrue(); } @Test(expected = AccessDeniedException.class) public void changePasswordFailsForUnauthenticatedUser() { - manager.changePassword("password", "newPassword"); + this.manager.changePassword("password", "newPassword"); } @Test public void changePasswordSucceedsWithAuthenticatedUserAndNoAuthenticationManagerSet() { insertJoe(); authenticateJoe(); - manager.changePassword("wrongpassword", "newPassword"); - UserDetails newJoe = manager.loadUserByUsername("joe"); + this.manager.changePassword("wrongpassword", "newPassword"); + UserDetails newJoe = this.manager.loadUserByUsername("joe"); assertThat(newJoe.getPassword()).isEqualTo("newPassword"); - assertThat(cache.getUserMap().containsKey("joe")).isFalse(); + assertThat(this.cache.getUserMap().containsKey("joe")).isFalse(); } @Test @@ -226,9 +227,9 @@ public class JdbcUserDetailsManagerTests { AuthenticationManager am = mock(AuthenticationManager.class); when(am.authenticate(currentAuth)).thenReturn(currentAuth); - manager.setAuthenticationManager(am); - manager.changePassword("password", "newPassword"); - UserDetails newJoe = manager.loadUserByUsername("joe"); + this.manager.setAuthenticationManager(am); + this.manager.changePassword("password", "newPassword"); + UserDetails newJoe = this.manager.loadUserByUsername("joe"); assertThat(newJoe.getPassword()).isEqualTo("newPassword"); // The password in the context should also be altered @@ -236,7 +237,7 @@ public class JdbcUserDetailsManagerTests { assertThat(newAuth.getName()).isEqualTo("joe"); assertThat(newAuth.getDetails()).isEqualTo(currentAuth.getDetails()); assertThat(newAuth.getCredentials()).isNull(); - assertThat(cache.getUserMap().containsKey("joe")).isFalse(); + assertThat(this.cache.getUserMap().containsKey("joe")).isFalse(); } @Test @@ -246,25 +247,25 @@ public class JdbcUserDetailsManagerTests { AuthenticationManager am = mock(AuthenticationManager.class); when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException("")); - manager.setAuthenticationManager(am); + this.manager.setAuthenticationManager(am); try { - manager.changePassword("password", "newPassword"); + this.manager.changePassword("password", "newPassword"); fail("Expected BadCredentialsException"); } catch (BadCredentialsException expected) { } // Check password hasn't changed. - UserDetails newJoe = manager.loadUserByUsername("joe"); + UserDetails newJoe = this.manager.loadUserByUsername("joe"); assertThat(newJoe.getPassword()).isEqualTo("password"); assertThat(SecurityContextHolder.getContext().getAuthentication().getCredentials()).isEqualTo("password"); - assertThat(cache.getUserMap().containsKey("joe")).isTrue(); + assertThat(this.cache.getUserMap().containsKey("joe")).isTrue(); } @Test public void findAllGroupsReturnsExpectedGroupNames() { - List groups = manager.findAllGroups(); + List groups = this.manager.findAllGroups(); assertThat(groups).hasSize(4); Collections.sort(groups); @@ -276,19 +277,19 @@ public class JdbcUserDetailsManagerTests { @Test public void findGroupMembersReturnsCorrectData() { - List groupMembers = manager.findUsersInGroup("GROUP_0"); + List groupMembers = this.manager.findUsersInGroup("GROUP_0"); assertThat(groupMembers).hasSize(1); assertThat(groupMembers.get(0)).isEqualTo("jerry"); - groupMembers = manager.findUsersInGroup("GROUP_1"); + groupMembers = this.manager.findUsersInGroup("GROUP_1"); assertThat(groupMembers).hasSize(2); } @Test @SuppressWarnings("unchecked") public void createGroupInsertsCorrectData() { - manager.createGroup("TEST_GROUP", AuthorityUtils.createAuthorityList("ROLE_X", "ROLE_Y")); + this.manager.createGroup("TEST_GROUP", AuthorityUtils.createAuthorityList("ROLE_X", "ROLE_Y")); - List roles = template.queryForList("select ga.authority from groups g, group_authorities ga " + List roles = this.template.queryForList("select ga.authority from groups g, group_authorities ga " + "where ga.group_id = g.id " + "and g.group_name = 'TEST_GROUP'"); assertThat(roles).hasSize(2); @@ -296,78 +297,80 @@ public class JdbcUserDetailsManagerTests { @Test public void deleteGroupRemovesData() { - manager.deleteGroup("GROUP_0"); - manager.deleteGroup("GROUP_1"); - manager.deleteGroup("GROUP_2"); - manager.deleteGroup("GROUP_3"); + this.manager.deleteGroup("GROUP_0"); + this.manager.deleteGroup("GROUP_1"); + this.manager.deleteGroup("GROUP_2"); + this.manager.deleteGroup("GROUP_3"); - assertThat(template.queryForList("select * from group_authorities")).isEmpty(); - assertThat(template.queryForList("select * from group_members")).isEmpty(); - assertThat(template.queryForList("select id from groups")).isEmpty(); + assertThat(this.template.queryForList("select * from group_authorities")).isEmpty(); + assertThat(this.template.queryForList("select * from group_members")).isEmpty(); + assertThat(this.template.queryForList("select id from groups")).isEmpty(); } @Test public void renameGroupIsSuccessful() { - manager.renameGroup("GROUP_0", "GROUP_X"); + this.manager.renameGroup("GROUP_0", "GROUP_X"); - assertThat(template.queryForObject("select id from groups where group_name = 'GROUP_X'", Integer.class)) + assertThat(this.template.queryForObject("select id from groups where group_name = 'GROUP_X'", Integer.class)) .isZero(); } @Test public void addingGroupUserSetsCorrectData() { - manager.addUserToGroup("tom", "GROUP_0"); + this.manager.addUserToGroup("tom", "GROUP_0"); - assertThat(template.queryForList("select username from group_members where group_id = 0")).hasSize(2); + assertThat(this.template.queryForList("select username from group_members where group_id = 0")).hasSize(2); } @Test public void removeUserFromGroupDeletesGroupMemberRow() { - manager.removeUserFromGroup("jerry", "GROUP_1"); + this.manager.removeUserFromGroup("jerry", "GROUP_1"); - assertThat(template.queryForList("select group_id from group_members where username = 'jerry'")).hasSize(1); + assertThat(this.template.queryForList("select group_id from group_members where username = 'jerry'")) + .hasSize(1); } @Test public void findGroupAuthoritiesReturnsCorrectAuthorities() { - assertThat(AuthorityUtils.createAuthorityList("ROLE_A")).isEqualTo(manager.findGroupAuthorities("GROUP_0")); + assertThat(AuthorityUtils.createAuthorityList("ROLE_A")) + .isEqualTo(this.manager.findGroupAuthorities("GROUP_0")); } @Test public void addGroupAuthorityInsertsCorrectGroupAuthorityRow() { GrantedAuthority auth = new SimpleGrantedAuthority("ROLE_X"); - manager.addGroupAuthority("GROUP_0", auth); + this.manager.addGroupAuthority("GROUP_0", auth); - template.queryForObject("select authority from group_authorities where authority = 'ROLE_X' and group_id = 0", - String.class); + this.template.queryForObject( + "select authority from group_authorities where authority = 'ROLE_X' and group_id = 0", String.class); } @Test public void deleteGroupAuthorityRemovesCorrectRows() { GrantedAuthority auth = new SimpleGrantedAuthority("ROLE_A"); - manager.removeGroupAuthority("GROUP_0", auth); - assertThat(template.queryForList("select authority from group_authorities where group_id = 0")).isEmpty(); + this.manager.removeGroupAuthority("GROUP_0", auth); + assertThat(this.template.queryForList("select authority from group_authorities where group_id = 0")).isEmpty(); - manager.removeGroupAuthority("GROUP_2", auth); - assertThat(template.queryForList("select authority from group_authorities where group_id = 2")).hasSize(2); + this.manager.removeGroupAuthority("GROUP_2", auth); + assertThat(this.template.queryForList("select authority from group_authorities where group_id = 2")).hasSize(2); } // SEC-1156 @Test public void createUserDoesNotSaveAuthoritiesIfEnableAuthoritiesIsFalse() { - manager.setEnableAuthorities(false); - manager.createUser(joe); - assertThat(template.queryForList(SELECT_JOE_AUTHORITIES_SQL)).isEmpty(); + this.manager.setEnableAuthorities(false); + this.manager.createUser(joe); + assertThat(this.template.queryForList(SELECT_JOE_AUTHORITIES_SQL)).isEmpty(); } // SEC-1156 @Test public void updateUserDoesNotSaveAuthoritiesIfEnableAuthoritiesIsFalse() { - manager.setEnableAuthorities(false); + this.manager.setEnableAuthorities(false); insertJoe(); - template.execute("delete from authorities where username='joe'"); - manager.updateUser(joe); - assertThat(template.queryForList(SELECT_JOE_AUTHORITIES_SQL)).isEmpty(); + this.template.execute("delete from authorities where username='joe'"); + this.manager.updateUser(joe); + assertThat(this.template.queryForList(SELECT_JOE_AUTHORITIES_SQL)).isEmpty(); } // SEC-2166 @@ -376,7 +379,7 @@ public class JdbcUserDetailsManagerTests { insertJoe(); UsernamePasswordAuthenticationToken currentAuth = new UsernamePasswordAuthenticationToken("joe", null, AuthorityUtils.createAuthorityList("ROLE_USER")); - Authentication updatedAuth = manager.createNewAuthentication(currentAuth, "new"); + Authentication updatedAuth = this.manager.createNewAuthentication(currentAuth, "new"); assertThat(updatedAuth.getCredentials()).isNull(); } @@ -389,11 +392,11 @@ public class JdbcUserDetailsManagerTests { } private void insertJoe() { - template.execute("insert into users (username, password, enabled) values ('joe','password','true')"); - template.execute("insert into authorities (username, authority) values ('joe','A')"); - template.execute("insert into authorities (username, authority) values ('joe','B')"); - template.execute("insert into authorities (username, authority) values ('joe','C')"); - cache.putUserInCache(joe); + this.template.execute("insert into users (username, password, enabled) values ('joe','password','true')"); + this.template.execute("insert into authorities (username, authority) values ('joe','A')"); + this.template.execute("insert into authorities (username, authority) values ('joe','B')"); + this.template.execute("insert into authorities (username, authority) values ('joe','C')"); + this.cache.putUserInCache(joe); } private class MockUserCache implements UserCache { @@ -401,19 +404,19 @@ public class JdbcUserDetailsManagerTests { private Map cache = new HashMap<>(); public UserDetails getUserFromCache(String username) { - return cache.get(username); + return this.cache.get(username); } public void putUserInCache(UserDetails user) { - cache.put(user.getUsername(), user); + this.cache.put(user.getUsername(), user); } public void removeUserFromCache(String username) { - cache.remove(username); + this.cache.remove(username); } Map getUserMap() { - return cache; + return this.cache; } } diff --git a/core/src/test/java/org/springframework/security/scheduling/AbstractSecurityContextSchedulingTaskExecutorTests.java b/core/src/test/java/org/springframework/security/scheduling/AbstractSecurityContextSchedulingTaskExecutorTests.java index 09079fc17e..554f805617 100644 --- a/core/src/test/java/org/springframework/security/scheduling/AbstractSecurityContextSchedulingTaskExecutorTests.java +++ b/core/src/test/java/org/springframework/security/scheduling/AbstractSecurityContextSchedulingTaskExecutorTests.java @@ -43,13 +43,13 @@ public abstract class AbstractSecurityContextSchedulingTaskExecutorTests @Test public void prefersShortLivedTasks() { - executor = create(); - executor.prefersShortLivedTasks(); - verify(taskExecutorDelegate).prefersShortLivedTasks(); + this.executor = create(); + this.executor.prefersShortLivedTasks(); + verify(this.taskExecutorDelegate).prefersShortLivedTasks(); } protected SchedulingTaskExecutor getExecutor() { - return taskExecutorDelegate; + return this.taskExecutorDelegate; } protected abstract DelegatingSecurityContextSchedulingTaskExecutor create(); diff --git a/core/src/test/java/org/springframework/security/scheduling/CurrentSecurityContextSchedulingTaskExecutorTests.java b/core/src/test/java/org/springframework/security/scheduling/CurrentSecurityContextSchedulingTaskExecutorTests.java index 700e55bd7b..9da5a21301 100644 --- a/core/src/test/java/org/springframework/security/scheduling/CurrentSecurityContextSchedulingTaskExecutorTests.java +++ b/core/src/test/java/org/springframework/security/scheduling/CurrentSecurityContextSchedulingTaskExecutorTests.java @@ -36,7 +36,7 @@ public class CurrentSecurityContextSchedulingTaskExecutorTests } protected DelegatingSecurityContextSchedulingTaskExecutor create() { - return new DelegatingSecurityContextSchedulingTaskExecutor(taskExecutorDelegate); + return new DelegatingSecurityContextSchedulingTaskExecutor(this.taskExecutorDelegate); } } diff --git a/core/src/test/java/org/springframework/security/scheduling/DelegatingSecurityContextTaskSchedulerTests.java b/core/src/test/java/org/springframework/security/scheduling/DelegatingSecurityContextTaskSchedulerTests.java index fbbb4e5f51..3828bb755d 100644 --- a/core/src/test/java/org/springframework/security/scheduling/DelegatingSecurityContextTaskSchedulerTests.java +++ b/core/src/test/java/org/springframework/security/scheduling/DelegatingSecurityContextTaskSchedulerTests.java @@ -56,44 +56,44 @@ public class DelegatingSecurityContextTaskSchedulerTests { @Before public void setup() { MockitoAnnotations.initMocks(this); - delegatingSecurityContextTaskScheduler = new DelegatingSecurityContextTaskScheduler(scheduler); + this.delegatingSecurityContextTaskScheduler = new DelegatingSecurityContextTaskScheduler(this.scheduler); } @After public void cleanup() { - delegatingSecurityContextTaskScheduler = null; + this.delegatingSecurityContextTaskScheduler = null; } @Test(expected = IllegalArgumentException.class) public void testSchedulerIsNotNull() { - delegatingSecurityContextTaskScheduler = new DelegatingSecurityContextTaskScheduler(null); + this.delegatingSecurityContextTaskScheduler = new DelegatingSecurityContextTaskScheduler(null); } @Test public void testSchedulerWithRunnableAndTrigger() { - delegatingSecurityContextTaskScheduler.schedule(runnable, trigger); - verify(scheduler).schedule(any(Runnable.class), any(Trigger.class)); + this.delegatingSecurityContextTaskScheduler.schedule(this.runnable, this.trigger); + verify(this.scheduler).schedule(any(Runnable.class), any(Trigger.class)); } @Test public void testSchedulerWithRunnableAndInstant() { Instant date = Instant.now(); - delegatingSecurityContextTaskScheduler.schedule(runnable, date); - verify(scheduler).schedule(any(Runnable.class), any(Date.class)); + this.delegatingSecurityContextTaskScheduler.schedule(this.runnable, date); + verify(this.scheduler).schedule(any(Runnable.class), any(Date.class)); } @Test public void testScheduleAtFixedRateWithRunnableAndDate() { Date date = new Date(1544751374L); Duration duration = Duration.ofSeconds(4L); - delegatingSecurityContextTaskScheduler.scheduleAtFixedRate(runnable, date, 1000L); - verify(scheduler).scheduleAtFixedRate(isA(Runnable.class), isA(Date.class), eq(1000L)); + this.delegatingSecurityContextTaskScheduler.scheduleAtFixedRate(this.runnable, date, 1000L); + verify(this.scheduler).scheduleAtFixedRate(isA(Runnable.class), isA(Date.class), eq(1000L)); } @Test public void testScheduleAtFixedRateWithRunnableAndLong() { - delegatingSecurityContextTaskScheduler.scheduleAtFixedRate(runnable, 1000L); - verify(scheduler).scheduleAtFixedRate(isA(Runnable.class), eq(1000L)); + this.delegatingSecurityContextTaskScheduler.scheduleAtFixedRate(this.runnable, 1000L); + verify(this.scheduler).scheduleAtFixedRate(isA(Runnable.class), eq(1000L)); } } diff --git a/core/src/test/java/org/springframework/security/scheduling/ExplicitSecurityContextSchedulingTaskExecutorTests.java b/core/src/test/java/org/springframework/security/scheduling/ExplicitSecurityContextSchedulingTaskExecutorTests.java index e51baf34c2..4cf8cdd943 100644 --- a/core/src/test/java/org/springframework/security/scheduling/ExplicitSecurityContextSchedulingTaskExecutorTests.java +++ b/core/src/test/java/org/springframework/security/scheduling/ExplicitSecurityContextSchedulingTaskExecutorTests.java @@ -36,7 +36,7 @@ public class ExplicitSecurityContextSchedulingTaskExecutorTests } protected DelegatingSecurityContextSchedulingTaskExecutor create() { - return new DelegatingSecurityContextSchedulingTaskExecutor(taskExecutorDelegate, securityContext); + return new DelegatingSecurityContextSchedulingTaskExecutor(this.taskExecutorDelegate, this.securityContext); } } diff --git a/core/src/test/java/org/springframework/security/task/AbstractDelegatingSecurityContextAsyncTaskExecutorTests.java b/core/src/test/java/org/springframework/security/task/AbstractDelegatingSecurityContextAsyncTaskExecutorTests.java index 206a541991..38af77b257 100644 --- a/core/src/test/java/org/springframework/security/task/AbstractDelegatingSecurityContextAsyncTaskExecutorTests.java +++ b/core/src/test/java/org/springframework/security/task/AbstractDelegatingSecurityContextAsyncTaskExecutorTests.java @@ -44,29 +44,29 @@ public abstract class AbstractDelegatingSecurityContextAsyncTaskExecutorTests @Before public final void setUpExecutor() { - executor = create(); + this.executor = create(); } @Test public void executeStartTimeout() { - executor.execute(runnable, 1); - verify(getExecutor()).execute(wrappedRunnable, 1); + this.executor.execute(this.runnable, 1); + verify(getExecutor()).execute(this.wrappedRunnable, 1); } @Test public void submit() { - executor.submit(runnable); - verify(getExecutor()).submit(wrappedRunnable); + this.executor.submit(this.runnable); + verify(getExecutor()).submit(this.wrappedRunnable); } @Test public void submitCallable() { - executor.submit(callable); - verify(getExecutor()).submit(wrappedCallable); + this.executor.submit(this.callable); + verify(getExecutor()).submit(this.wrappedCallable); } protected AsyncTaskExecutor getExecutor() { - return taskExecutorDelegate; + return this.taskExecutorDelegate; } protected abstract DelegatingSecurityContextAsyncTaskExecutor create(); diff --git a/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextAsyncTaskExecutorTests.java b/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextAsyncTaskExecutorTests.java index 814530f82a..53b94f6c16 100644 --- a/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextAsyncTaskExecutorTests.java +++ b/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextAsyncTaskExecutorTests.java @@ -37,7 +37,7 @@ public class CurrentDelegatingSecurityContextAsyncTaskExecutorTests @Override protected DelegatingSecurityContextAsyncTaskExecutor create() { - return new DelegatingSecurityContextAsyncTaskExecutor(taskExecutorDelegate); + return new DelegatingSecurityContextAsyncTaskExecutor(this.taskExecutorDelegate); } } diff --git a/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextTaskExecutorTests.java b/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextTaskExecutorTests.java index b95fbccdb3..5a7aacc4df 100644 --- a/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextTaskExecutorTests.java +++ b/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextTaskExecutorTests.java @@ -44,11 +44,11 @@ public class CurrentDelegatingSecurityContextTaskExecutorTests extends AbstractD } protected Executor getExecutor() { - return taskExecutorDelegate; + return this.taskExecutorDelegate; } protected DelegatingSecurityContextExecutor create() { - return new DelegatingSecurityContextTaskExecutor(taskExecutorDelegate); + return new DelegatingSecurityContextTaskExecutor(this.taskExecutorDelegate); } } diff --git a/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextAsyncTaskExecutorTests.java b/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextAsyncTaskExecutorTests.java index 515dfad44f..89f611a613 100644 --- a/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextAsyncTaskExecutorTests.java +++ b/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextAsyncTaskExecutorTests.java @@ -37,7 +37,7 @@ public class ExplicitDelegatingSecurityContextAsyncTaskExecutorTests @Override protected DelegatingSecurityContextAsyncTaskExecutor create() { - return new DelegatingSecurityContextAsyncTaskExecutor(taskExecutorDelegate, securityContext); + return new DelegatingSecurityContextAsyncTaskExecutor(this.taskExecutorDelegate, this.securityContext); } } diff --git a/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextTaskExecutorTests.java b/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextTaskExecutorTests.java index 788e994259..2d1e5ce8b3 100644 --- a/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextTaskExecutorTests.java +++ b/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextTaskExecutorTests.java @@ -44,11 +44,11 @@ public class ExplicitDelegatingSecurityContextTaskExecutorTests extends Abstract } protected Executor getExecutor() { - return taskExecutorDelegate; + return this.taskExecutorDelegate; } protected DelegatingSecurityContextExecutor create() { - return new DelegatingSecurityContextTaskExecutor(taskExecutorDelegate, securityContext); + return new DelegatingSecurityContextTaskExecutor(this.taskExecutorDelegate, this.securityContext); } } diff --git a/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2EncodingUtils.java b/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2EncodingUtils.java index 51c19da427..0424fef616 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2EncodingUtils.java +++ b/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2EncodingUtils.java @@ -174,7 +174,7 @@ class Argon2EncodingUtils { } public byte[] getHash() { - return Arrays.clone(hash); + return Arrays.clone(this.hash); } public void setHash(byte[] hash) { @@ -182,7 +182,7 @@ class Argon2EncodingUtils { } public Argon2Parameters getParameters() { - return parameters; + return this.parameters; } public void setParameters(Argon2Parameters parameters) { diff --git a/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoder.java index 550da56193..75cf6b3202 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoder.java +++ b/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoder.java @@ -83,11 +83,11 @@ public class Argon2PasswordEncoder implements PasswordEncoder { @Override public String encode(CharSequence rawPassword) { - byte[] salt = saltGenerator.generateKey(); - byte[] hash = new byte[hashLength]; + byte[] salt = this.saltGenerator.generateKey(); + byte[] hash = new byte[this.hashLength]; Argon2Parameters params = new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id).withSalt(salt) - .withParallelism(parallelism).withMemoryAsKB(memory).withIterations(iterations).build(); + .withParallelism(this.parallelism).withMemoryAsKB(this.memory).withIterations(this.iterations).build(); Argon2BytesGenerator generator = new Argon2BytesGenerator(); generator.init(params); generator.generateBytes(rawPassword.toString().toCharArray(), hash); @@ -98,7 +98,7 @@ public class Argon2PasswordEncoder implements PasswordEncoder { @Override public boolean matches(CharSequence rawPassword, String encodedPassword) { if (encodedPassword == null) { - logger.warn("password hash is null"); + this.logger.warn("password hash is null"); return false; } @@ -108,7 +108,7 @@ public class Argon2PasswordEncoder implements PasswordEncoder { decoded = Argon2EncodingUtils.decode(encodedPassword); } catch (IllegalArgumentException e) { - logger.warn("Malformed password hash", e); + this.logger.warn("Malformed password hash", e); return false; } @@ -124,7 +124,7 @@ public class Argon2PasswordEncoder implements PasswordEncoder { @Override public boolean upgradeEncoding(String encodedPassword) { if (encodedPassword == null || encodedPassword.length() == 0) { - logger.warn("password hash is null"); + this.logger.warn("password hash is null"); return false; } diff --git a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java index f3a9f0007b..d3ee504223 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java +++ b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java @@ -321,23 +321,23 @@ public class BCrypt { private void encipher(int lr[], int off) { int i, n, l = lr[off], r = lr[off + 1]; - l ^= P[0]; + l ^= this.P[0]; for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) { // Feistel substitution on left word - n = S[(l >> 24) & 0xff]; - n += S[0x100 | ((l >> 16) & 0xff)]; - n ^= S[0x200 | ((l >> 8) & 0xff)]; - n += S[0x300 | (l & 0xff)]; - r ^= n ^ P[++i]; + n = this.S[(l >> 24) & 0xff]; + n += this.S[0x100 | ((l >> 16) & 0xff)]; + n ^= this.S[0x200 | ((l >> 8) & 0xff)]; + n += this.S[0x300 | (l & 0xff)]; + r ^= n ^ this.P[++i]; // Feistel substitution on right word - n = S[(r >> 24) & 0xff]; - n += S[0x100 | ((r >> 16) & 0xff)]; - n ^= S[0x200 | ((r >> 8) & 0xff)]; - n += S[0x300 | (r & 0xff)]; - l ^= n ^ P[++i]; + n = this.S[(r >> 24) & 0xff]; + n += this.S[0x100 | ((r >> 16) & 0xff)]; + n ^= this.S[0x200 | ((r >> 8) & 0xff)]; + n += this.S[0x300 | (r & 0xff)]; + l ^= n ^ this.P[++i]; } - lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1]; + lr[off] = r ^ this.P[BLOWFISH_NUM_ROUNDS + 1]; lr[off + 1] = l; } @@ -394,8 +394,8 @@ public class BCrypt { * Initialise the Blowfish key schedule */ private void init_key() { - P = P_orig.clone(); - S = S_orig.clone(); + this.P = P_orig.clone(); + this.S = S_orig.clone(); } /** @@ -408,24 +408,24 @@ public class BCrypt { int i; int koffp[] = { 0 }; int lr[] = { 0, 0 }; - int plen = P.length, slen = S.length; + int plen = this.P.length, slen = this.S.length; for (i = 0; i < plen; i++) if (!sign_ext_bug) - P[i] = P[i] ^ streamtoword(key, koffp); + this.P[i] = this.P[i] ^ streamtoword(key, koffp); else - P[i] = P[i] ^ streamtoword_bug(key, koffp); + this.P[i] = this.P[i] ^ streamtoword_bug(key, koffp); for (i = 0; i < plen; i += 2) { encipher(lr, 0); - P[i] = lr[0]; - P[i + 1] = lr[1]; + this.P[i] = lr[0]; + this.P[i + 1] = lr[1]; } for (i = 0; i < slen; i += 2) { encipher(lr, 0); - S[i] = lr[0]; - S[i + 1] = lr[1]; + this.S[i] = lr[0]; + this.S[i + 1] = lr[1]; } } @@ -441,14 +441,14 @@ public class BCrypt { int i; int koffp[] = { 0 }, doffp[] = { 0 }; int lr[] = { 0, 0 }; - int plen = P.length, slen = S.length; + int plen = this.P.length, slen = this.S.length; int signp[] = { 0 }; // non-benign sign-extension flag int diff = 0; // zero iff correct and buggy are same for (i = 0; i < plen; i++) { int words[] = streamtowords(key, koffp, signp); diff |= words[0] ^ words[1]; - P[i] = P[i] ^ words[sign_ext_bug ? 1 : 0]; + this.P[i] = this.P[i] ^ words[sign_ext_bug ? 1 : 0]; } int sign = signp[0]; @@ -479,22 +479,22 @@ public class BCrypt { * that could be directly specified by a password to the buggy algorithm (and to * the fully correct one as well, but that's a side-effect). */ - P[0] ^= sign; + this.P[0] ^= sign; for (i = 0; i < plen; i += 2) { lr[0] ^= streamtoword(data, doffp); lr[1] ^= streamtoword(data, doffp); encipher(lr, 0); - P[i] = lr[0]; - P[i + 1] = lr[1]; + this.P[i] = lr[0]; + this.P[i + 1] = lr[1]; } for (i = 0; i < slen; i += 2) { lr[0] ^= streamtoword(data, doffp); lr[1] ^= streamtoword(data, doffp); encipher(lr, 0); - S[i] = lr[0]; - S[i + 1] = lr[1]; + this.S[i] = lr[0]; + this.S[i + 1] = lr[1]; } } diff --git a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java index 36d07ae755..d93d28a72f 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java +++ b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java @@ -106,11 +106,11 @@ public class BCryptPasswordEncoder implements PasswordEncoder { } String salt; - if (random != null) { - salt = BCrypt.gensalt(version.getVersion(), strength, random); + if (this.random != null) { + salt = BCrypt.gensalt(this.version.getVersion(), this.strength, this.random); } else { - salt = BCrypt.gensalt(version.getVersion(), strength); + salt = BCrypt.gensalt(this.version.getVersion(), this.strength); } return BCrypt.hashpw(rawPassword.toString(), salt); } @@ -121,12 +121,12 @@ public class BCryptPasswordEncoder implements PasswordEncoder { } if (encodedPassword == null || encodedPassword.length() == 0) { - logger.warn("Empty encoded password"); + this.logger.warn("Empty encoded password"); return false; } - if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) { - logger.warn("Encoded password does not look like BCrypt"); + if (!this.BCRYPT_PATTERN.matcher(encodedPassword).matches()) { + this.logger.warn("Encoded password does not look like BCrypt"); return false; } @@ -136,11 +136,11 @@ public class BCryptPasswordEncoder implements PasswordEncoder { @Override public boolean upgradeEncoding(String encodedPassword) { if (encodedPassword == null || encodedPassword.length() == 0) { - logger.warn("Empty encoded password"); + this.logger.warn("Empty encoded password"); return false; } - Matcher matcher = BCRYPT_PATTERN.matcher(encodedPassword); + Matcher matcher = this.BCRYPT_PATTERN.matcher(encodedPassword); if (!matcher.matches()) { throw new IllegalArgumentException("Encoded password does not look like BCrypt: " + encodedPassword); } diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesCbcBytesEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesCbcBytesEncryptor.java index bd60fe5236..4ddcd5684a 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesCbcBytesEncryptor.java +++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesCbcBytesEncryptor.java @@ -53,7 +53,7 @@ public class BouncyCastleAesCbcBytesEncryptor extends BouncyCastleAesBytesEncryp @SuppressWarnings("deprecation") PaddedBufferedBlockCipher blockCipher = new PaddedBufferedBlockCipher( new CBCBlockCipher(new org.bouncycastle.crypto.engines.AESFastEngine()), new PKCS7Padding()); - blockCipher.init(true, new ParametersWithIV(secretKey, iv)); + blockCipher.init(true, new ParametersWithIV(this.secretKey, iv)); byte[] encrypted = process(blockCipher, bytes); return iv != null ? concatenate(iv, encrypted) : encrypted; } @@ -66,7 +66,7 @@ public class BouncyCastleAesCbcBytesEncryptor extends BouncyCastleAesBytesEncryp @SuppressWarnings("deprecation") PaddedBufferedBlockCipher blockCipher = new PaddedBufferedBlockCipher( new CBCBlockCipher(new org.bouncycastle.crypto.engines.AESFastEngine()), new PKCS7Padding()); - blockCipher.init(false, new ParametersWithIV(secretKey, iv)); + blockCipher.init(false, new ParametersWithIV(this.secretKey, iv)); return process(blockCipher, encryptedBytes); } diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesGcmBytesEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesGcmBytesEncryptor.java index bc43375fbc..d017530c0a 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesGcmBytesEncryptor.java +++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesGcmBytesEncryptor.java @@ -50,7 +50,7 @@ public class BouncyCastleAesGcmBytesEncryptor extends BouncyCastleAesBytesEncryp @SuppressWarnings("deprecation") GCMBlockCipher blockCipher = new GCMBlockCipher(new org.bouncycastle.crypto.engines.AESFastEngine()); - blockCipher.init(true, new AEADParameters(secretKey, 128, iv, null)); + blockCipher.init(true, new AEADParameters(this.secretKey, 128, iv, null)); byte[] encrypted = process(blockCipher, bytes); return iv != null ? concatenate(iv, encrypted) : encrypted; @@ -63,7 +63,7 @@ public class BouncyCastleAesGcmBytesEncryptor extends BouncyCastleAesBytesEncryp @SuppressWarnings("deprecation") GCMBlockCipher blockCipher = new GCMBlockCipher(new org.bouncycastle.crypto.engines.AESFastEngine()); - blockCipher.init(false, new AEADParameters(secretKey, 128, iv, null)); + blockCipher.init(false, new AEADParameters(this.secretKey, 128, iv, null)); return process(blockCipher, encryptedBytes); } diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java index 8407dd8704..e8c51d79cd 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java +++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java @@ -34,11 +34,11 @@ final class HexEncodingTextEncryptor implements TextEncryptor { } public String encrypt(String text) { - return new String(Hex.encode(encryptor.encrypt(Utf8.encode(text)))); + return new String(Hex.encode(this.encryptor.encrypt(Utf8.encode(text)))); } public String decrypt(String encryptedText) { - return Utf8.decode(encryptor.decrypt(Hex.decode(encryptedText))); + return Utf8.decode(this.encryptor.decrypt(Hex.decode(encryptedText))); } } diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java index 0ce886425c..fa00b501ce 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java +++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java @@ -32,7 +32,7 @@ final class HexEncodingStringKeyGenerator implements StringKeyGenerator { } public String generateKey() { - return new String(Hex.encode(keyGenerator.generateKey())); + return new String(Hex.encode(this.keyGenerator.generateKey())); } } diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java index f04577802d..e32cf34aae 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java +++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java @@ -47,12 +47,12 @@ final class SecureRandomBytesKeyGenerator implements BytesKeyGenerator { } public int getKeyLength() { - return keyLength; + return this.keyLength; } public byte[] generateKey() { - byte[] bytes = new byte[keyLength]; - random.nextBytes(bytes); + byte[] bytes = new byte[this.keyLength]; + this.random.nextBytes(bytes); return bytes; } diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java index 5b9e7f5638..58b5f53645 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java +++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java @@ -31,11 +31,11 @@ final class SharedKeyGenerator implements BytesKeyGenerator { } public int getKeyLength() { - return sharedKey.length; + return this.sharedKey.length; } public byte[] generateKey() { - return sharedKey; + return this.sharedKey; } } diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java b/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java index b14feb22e3..7e4755512c 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java +++ b/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java @@ -46,8 +46,8 @@ final class Digester { } public byte[] digest(byte[] value) { - MessageDigest messageDigest = createDigest(algorithm); - for (int i = 0; i < iterations; i++) { + MessageDigest messageDigest = createDigest(this.algorithm); + for (int i = 0; i < this.iterations; i++) { value = messageDigest.digest(value); } return value; diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java index 91e5fa6d23..d322d36aec 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java +++ b/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java @@ -116,10 +116,10 @@ public class LdapShaPasswordEncoder implements PasswordEncoder { String prefix; if (salt == null || salt.length == 0) { - prefix = forceLowerCasePrefix ? SHA_PREFIX_LC : SHA_PREFIX; + prefix = this.forceLowerCasePrefix ? SHA_PREFIX_LC : SHA_PREFIX; } else { - prefix = forceLowerCasePrefix ? SSHA_PREFIX_LC : SSHA_PREFIX; + prefix = this.forceLowerCasePrefix ? SSHA_PREFIX_LC : SSHA_PREFIX; } return prefix + Utf8.decode(Base64.getEncoder().encode(hash)); diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/Md4.java b/crypto/src/main/java/org/springframework/security/crypto/password/Md4.java index ea5101cfb2..20fe205baf 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/password/Md4.java +++ b/crypto/src/main/java/org/springframework/security/crypto/password/Md4.java @@ -42,12 +42,12 @@ class Md4 { } public void reset() { - bufferOffset = 0; - byteCount = 0; - state[0] = 0x67452301; - state[1] = 0xEFCDAB89; - state[2] = 0x98BADCFE; - state[3] = 0x10325476; + this.bufferOffset = 0; + this.byteCount = 0; + this.state[0] = 0x67452301; + this.state[1] = 0xEFCDAB89; + this.state[2] = 0x98BADCFE; + this.state[3] = 0x10325476; } public byte[] digest() { @@ -59,7 +59,7 @@ class Md4 { private void digest(byte[] buffer, int off) { for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { - buffer[off + (i * 4 + j)] = (byte) (state[i] >>> (8 * j)); + buffer[off + (i * 4 + j)] = (byte) (this.state[i] >>> (8 * j)); } } } @@ -80,7 +80,7 @@ class Md4 { this.buffer[this.bufferOffset++] = (byte) 0x00; } - long bitCount = byteCount * 8; + long bitCount = this.byteCount * 8; for (int i = 0; i < 64; i += 8) { this.buffer[this.bufferOffset++] = (byte) (bitCount >>> (i)); } @@ -90,7 +90,7 @@ class Md4 { } public void update(byte[] input, int offset, int length) { - byteCount += length; + this.byteCount += length; int todo; while (length >= (todo = BLOCK_SIZE - this.bufferOffset)) { System.arraycopy(input, offset, this.buffer, this.bufferOffset, todo); @@ -101,75 +101,75 @@ class Md4 { } System.arraycopy(input, offset, this.buffer, this.bufferOffset, length); - bufferOffset += length; + this.bufferOffset += length; } private void update(byte[] block, int offset) { for (int i = 0; i < 16; i++) { - tmp[i] = (block[offset++] & 0xFF) | (block[offset++] & 0xFF) << 8 | (block[offset++] & 0xFF) << 16 + this.tmp[i] = (block[offset++] & 0xFF) | (block[offset++] & 0xFF) << 8 | (block[offset++] & 0xFF) << 16 | (block[offset++] & 0xFF) << 24; } - int A = state[0]; - int B = state[1]; - int C = state[2]; - int D = state[3]; + int A = this.state[0]; + int B = this.state[1]; + int C = this.state[2]; + int D = this.state[3]; - A = FF(A, B, C, D, tmp[0], 3); - D = FF(D, A, B, C, tmp[1], 7); - C = FF(C, D, A, B, tmp[2], 11); - B = FF(B, C, D, A, tmp[3], 19); - A = FF(A, B, C, D, tmp[4], 3); - D = FF(D, A, B, C, tmp[5], 7); - C = FF(C, D, A, B, tmp[6], 11); - B = FF(B, C, D, A, tmp[7], 19); - A = FF(A, B, C, D, tmp[8], 3); - D = FF(D, A, B, C, tmp[9], 7); - C = FF(C, D, A, B, tmp[10], 11); - B = FF(B, C, D, A, tmp[11], 19); - A = FF(A, B, C, D, tmp[12], 3); - D = FF(D, A, B, C, tmp[13], 7); - C = FF(C, D, A, B, tmp[14], 11); - B = FF(B, C, D, A, tmp[15], 19); + A = FF(A, B, C, D, this.tmp[0], 3); + D = FF(D, A, B, C, this.tmp[1], 7); + C = FF(C, D, A, B, this.tmp[2], 11); + B = FF(B, C, D, A, this.tmp[3], 19); + A = FF(A, B, C, D, this.tmp[4], 3); + D = FF(D, A, B, C, this.tmp[5], 7); + C = FF(C, D, A, B, this.tmp[6], 11); + B = FF(B, C, D, A, this.tmp[7], 19); + A = FF(A, B, C, D, this.tmp[8], 3); + D = FF(D, A, B, C, this.tmp[9], 7); + C = FF(C, D, A, B, this.tmp[10], 11); + B = FF(B, C, D, A, this.tmp[11], 19); + A = FF(A, B, C, D, this.tmp[12], 3); + D = FF(D, A, B, C, this.tmp[13], 7); + C = FF(C, D, A, B, this.tmp[14], 11); + B = FF(B, C, D, A, this.tmp[15], 19); - A = GG(A, B, C, D, tmp[0], 3); - D = GG(D, A, B, C, tmp[4], 5); - C = GG(C, D, A, B, tmp[8], 9); - B = GG(B, C, D, A, tmp[12], 13); - A = GG(A, B, C, D, tmp[1], 3); - D = GG(D, A, B, C, tmp[5], 5); - C = GG(C, D, A, B, tmp[9], 9); - B = GG(B, C, D, A, tmp[13], 13); - A = GG(A, B, C, D, tmp[2], 3); - D = GG(D, A, B, C, tmp[6], 5); - C = GG(C, D, A, B, tmp[10], 9); - B = GG(B, C, D, A, tmp[14], 13); - A = GG(A, B, C, D, tmp[3], 3); - D = GG(D, A, B, C, tmp[7], 5); - C = GG(C, D, A, B, tmp[11], 9); - B = GG(B, C, D, A, tmp[15], 13); + A = GG(A, B, C, D, this.tmp[0], 3); + D = GG(D, A, B, C, this.tmp[4], 5); + C = GG(C, D, A, B, this.tmp[8], 9); + B = GG(B, C, D, A, this.tmp[12], 13); + A = GG(A, B, C, D, this.tmp[1], 3); + D = GG(D, A, B, C, this.tmp[5], 5); + C = GG(C, D, A, B, this.tmp[9], 9); + B = GG(B, C, D, A, this.tmp[13], 13); + A = GG(A, B, C, D, this.tmp[2], 3); + D = GG(D, A, B, C, this.tmp[6], 5); + C = GG(C, D, A, B, this.tmp[10], 9); + B = GG(B, C, D, A, this.tmp[14], 13); + A = GG(A, B, C, D, this.tmp[3], 3); + D = GG(D, A, B, C, this.tmp[7], 5); + C = GG(C, D, A, B, this.tmp[11], 9); + B = GG(B, C, D, A, this.tmp[15], 13); - A = HH(A, B, C, D, tmp[0], 3); - D = HH(D, A, B, C, tmp[8], 9); - C = HH(C, D, A, B, tmp[4], 11); - B = HH(B, C, D, A, tmp[12], 15); - A = HH(A, B, C, D, tmp[2], 3); - D = HH(D, A, B, C, tmp[10], 9); - C = HH(C, D, A, B, tmp[6], 11); - B = HH(B, C, D, A, tmp[14], 15); - A = HH(A, B, C, D, tmp[1], 3); - D = HH(D, A, B, C, tmp[9], 9); - C = HH(C, D, A, B, tmp[5], 11); - B = HH(B, C, D, A, tmp[13], 15); - A = HH(A, B, C, D, tmp[3], 3); - D = HH(D, A, B, C, tmp[11], 9); - C = HH(C, D, A, B, tmp[7], 11); - B = HH(B, C, D, A, tmp[15], 15); + A = HH(A, B, C, D, this.tmp[0], 3); + D = HH(D, A, B, C, this.tmp[8], 9); + C = HH(C, D, A, B, this.tmp[4], 11); + B = HH(B, C, D, A, this.tmp[12], 15); + A = HH(A, B, C, D, this.tmp[2], 3); + D = HH(D, A, B, C, this.tmp[10], 9); + C = HH(C, D, A, B, this.tmp[6], 11); + B = HH(B, C, D, A, this.tmp[14], 15); + A = HH(A, B, C, D, this.tmp[1], 3); + D = HH(D, A, B, C, this.tmp[9], 9); + C = HH(C, D, A, B, this.tmp[5], 11); + B = HH(B, C, D, A, this.tmp[13], 15); + A = HH(A, B, C, D, this.tmp[3], 3); + D = HH(D, A, B, C, this.tmp[11], 9); + C = HH(C, D, A, B, this.tmp[7], 11); + B = HH(B, C, D, A, this.tmp[15], 15); - state[0] += A; - state[1] += B; - state[2] += C; - state[3] += D; + this.state[0] += A; + this.state[1] += B; + this.state[2] += C; + this.state[3] += D; } private int FF(int a, int b, int c, int d, int x, int s) { diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java index 2164e1fd88..f9160a4af0 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java +++ b/crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java @@ -74,12 +74,12 @@ public final class StandardPasswordEncoder implements PasswordEncoder { } public String encode(CharSequence rawPassword) { - return encode(rawPassword, saltGenerator.generateKey()); + return encode(rawPassword, this.saltGenerator.generateKey()); } public boolean matches(CharSequence rawPassword, String encodedPassword) { byte[] digested = decode(encodedPassword); - byte[] salt = subArray(digested, 0, saltGenerator.getKeyLength()); + byte[] salt = subArray(digested, 0, this.saltGenerator.getKeyLength()); return MessageDigest.isEqual(digested, digest(rawPassword, salt)); } @@ -97,7 +97,7 @@ public final class StandardPasswordEncoder implements PasswordEncoder { } private byte[] digest(CharSequence rawPassword, byte[] salt) { - byte[] digest = digester.digest(concatenate(salt, secret, Utf8.encode(rawPassword))); + byte[] digest = this.digester.digest(concatenate(salt, this.secret, Utf8.encode(rawPassword))); return concatenate(salt, digest); } diff --git a/crypto/src/main/java/org/springframework/security/crypto/scrypt/SCryptPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/scrypt/SCryptPasswordEncoder.java index ebd5f6d059..c496c6c907 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/scrypt/SCryptPasswordEncoder.java +++ b/crypto/src/main/java/org/springframework/security/crypto/scrypt/SCryptPasswordEncoder.java @@ -117,12 +117,12 @@ public class SCryptPasswordEncoder implements PasswordEncoder { } public String encode(CharSequence rawPassword) { - return digest(rawPassword, saltGenerator.generateKey()); + return digest(rawPassword, this.saltGenerator.generateKey()); } public boolean matches(CharSequence rawPassword, String encodedPassword) { - if (encodedPassword == null || encodedPassword.length() < keyLength) { - logger.warn("Empty encoded password"); + if (encodedPassword == null || encodedPassword.length() < this.keyLength) { + this.logger.warn("Empty encoded password"); return false; } return decodeAndCheckMatches(rawPassword, encodedPassword); @@ -165,17 +165,18 @@ public class SCryptPasswordEncoder implements PasswordEncoder { int parallelization = (int) params & 0xff; byte[] generated = SCrypt.generate(Utf8.encode(rawPassword), salt, cpuCost, memoryCost, parallelization, - keyLength); + this.keyLength); return MessageDigest.isEqual(derived, generated); } private String digest(CharSequence rawPassword, byte[] salt) { - byte[] derived = SCrypt.generate(Utf8.encode(rawPassword), salt, cpuCost, memoryCost, parallelization, - keyLength); + byte[] derived = SCrypt.generate(Utf8.encode(rawPassword), salt, this.cpuCost, this.memoryCost, + this.parallelization, this.keyLength); - String params = Long - .toString(((int) (Math.log(cpuCost) / Math.log(2)) << 16L) | memoryCost << 8 | parallelization, 16); + String params = Long.toString( + ((int) (Math.log(this.cpuCost) / Math.log(2)) << 16L) | this.memoryCost << 8 | this.parallelization, + 16); StringBuilder sb = new StringBuilder((salt.length + derived.length) * 2); sb.append("$").append(params).append('$'); diff --git a/crypto/src/test/java/org/springframework/security/crypto/argon2/Argon2EncodingUtilsTests.java b/crypto/src/test/java/org/springframework/security/crypto/argon2/Argon2EncodingUtilsTests.java index 8a3ca5e371..e3f4391401 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/argon2/Argon2EncodingUtilsTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/argon2/Argon2EncodingUtilsTests.java @@ -31,38 +31,38 @@ public class Argon2EncodingUtilsTests { private TestDataEntry testDataEntry1 = new TestDataEntry( "$argon2i$v=19$m=1024,t=3,p=2$Y1JkRmJDdzIzZ3oyTWx4aw$cGE5Cbd/cx7micVhXVBdH5qTr66JI1iUyuNNVAnErXs", - new Argon2EncodingUtils.Argon2Hash(decoder.decode("cGE5Cbd/cx7micVhXVBdH5qTr66JI1iUyuNNVAnErXs"), + new Argon2EncodingUtils.Argon2Hash(this.decoder.decode("cGE5Cbd/cx7micVhXVBdH5qTr66JI1iUyuNNVAnErXs"), (new Argon2Parameters.Builder(Argon2Parameters.ARGON2_i)).withVersion(19).withMemoryAsKB(1024) .withIterations(3).withParallelism(2).withSalt("cRdFbCw23gz2Mlxk".getBytes()).build())); private TestDataEntry testDataEntry2 = new TestDataEntry( "$argon2id$v=19$m=333,t=5,p=2$JDR8N3k1QWx0$+PrEoHOHsWkU9lnsxqnOFrWTVEuOh7ZRIUIbe2yUG8FgTYNCWJfHQI09JAAFKzr2JAvoejEpTMghUt0WsntQYA", new Argon2EncodingUtils.Argon2Hash( - decoder.decode( + this.decoder.decode( "+PrEoHOHsWkU9lnsxqnOFrWTVEuOh7ZRIUIbe2yUG8FgTYNCWJfHQI09JAAFKzr2JAvoejEpTMghUt0WsntQYA"), (new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id)).withVersion(19).withMemoryAsKB(333) .withIterations(5).withParallelism(2).withSalt("$4|7y5Alt".getBytes()).build())); @Test public void decodeWhenValidEncodedHashWithIThenDecodeCorrectly() { - assertArgon2HashEquals(testDataEntry1.decoded, Argon2EncodingUtils.decode(testDataEntry1.encoded)); + assertArgon2HashEquals(this.testDataEntry1.decoded, Argon2EncodingUtils.decode(this.testDataEntry1.encoded)); } @Test public void decodeWhenValidEncodedHashWithIDThenDecodeCorrectly() { - assertArgon2HashEquals(testDataEntry2.decoded, Argon2EncodingUtils.decode(testDataEntry2.encoded)); + assertArgon2HashEquals(this.testDataEntry2.decoded, Argon2EncodingUtils.decode(this.testDataEntry2.encoded)); } @Test public void encodeWhenValidArgumentsWithIThenEncodeToCorrectHash() { - assertThat(Argon2EncodingUtils.encode(testDataEntry1.decoded.getHash(), testDataEntry1.decoded.getParameters())) - .isEqualTo(testDataEntry1.encoded); + assertThat(Argon2EncodingUtils.encode(this.testDataEntry1.decoded.getHash(), + this.testDataEntry1.decoded.getParameters())).isEqualTo(this.testDataEntry1.encoded); } @Test public void encodeWhenValidArgumentsWithID2ThenEncodeToCorrectHash() { - assertThat(Argon2EncodingUtils.encode(testDataEntry2.decoded.getHash(), testDataEntry2.decoded.getParameters())) - .isEqualTo(testDataEntry2.encoded); + assertThat(Argon2EncodingUtils.encode(this.testDataEntry2.decoded.getHash(), + this.testDataEntry2.decoded.getParameters())).isEqualTo(this.testDataEntry2.encoded); } @Test(expected = IllegalArgumentException.class) diff --git a/crypto/src/test/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoderTests.java index ab7a560399..da18ccbedc 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoderTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoderTests.java @@ -41,47 +41,47 @@ public class Argon2PasswordEncoderTests { @Test public void encodeDoesNotEqualPassword() { - String result = encoder.encode("password"); + String result = this.encoder.encode("password"); assertThat(result).isNotEqualTo("password"); } @Test public void encodeWhenEqualPasswordThenMatches() { - String result = encoder.encode("password"); - assertThat(encoder.matches("password", result)).isTrue(); + String result = this.encoder.encode("password"); + assertThat(this.encoder.matches("password", result)).isTrue(); } @Test public void encodeWhenEqualWithUnicodeThenMatches() { - String result = encoder.encode("passw\u9292rd"); - assertThat(encoder.matches("pass\u9292\u9292rd", result)).isFalse(); - assertThat(encoder.matches("passw\u9292rd", result)).isTrue(); + String result = this.encoder.encode("passw\u9292rd"); + assertThat(this.encoder.matches("pass\u9292\u9292rd", result)).isFalse(); + assertThat(this.encoder.matches("passw\u9292rd", result)).isTrue(); } @Test public void encodeWhenNotEqualThenNotMatches() { - String result = encoder.encode("password"); - assertThat(encoder.matches("bogus", result)).isFalse(); + String result = this.encoder.encode("password"); + assertThat(this.encoder.matches("bogus", result)).isFalse(); } @Test public void encodeWhenEqualPasswordWithCustomParamsThenMatches() { - encoder = new Argon2PasswordEncoder(20, 64, 4, 256, 4); - String result = encoder.encode("password"); - assertThat(encoder.matches("password", result)).isTrue(); + this.encoder = new Argon2PasswordEncoder(20, 64, 4, 256, 4); + String result = this.encoder.encode("password"); + assertThat(this.encoder.matches("password", result)).isTrue(); } @Test public void encodeWhenRanTwiceThenResultsNotEqual() { String password = "secret"; - assertThat(encoder.encode(password)).isNotEqualTo(encoder.encode(password)); + assertThat(this.encoder.encode(password)).isNotEqualTo(this.encoder.encode(password)); } @Test public void encodeWhenRanTwiceWithCustomParamsThenNotEquals() { - encoder = new Argon2PasswordEncoder(20, 64, 4, 256, 4); + this.encoder = new Argon2PasswordEncoder(20, 64, 4, 256, 4); String password = "secret"; - assertThat(encoder.encode(password)).isNotEqualTo(encoder.encode(password)); + assertThat(this.encoder.encode(password)).isNotEqualTo(this.encoder.encode(password)); } @Test @@ -96,24 +96,24 @@ public class Argon2PasswordEncoderTests { @Test public void matchesWhenEncodedPassIsNullThenFalse() { - assertThat(encoder.matches("password", null)).isFalse(); + assertThat(this.encoder.matches("password", null)).isFalse(); } @Test public void matchesWhenEncodedPassIsEmptyThenFalse() { - assertThat(encoder.matches("password", "")).isFalse(); + assertThat(this.encoder.matches("password", "")).isFalse(); } @Test public void matchesWhenEncodedPassIsBogusThenFalse() { - assertThat(encoder.matches("password", "012345678901234567890123456789")).isFalse(); + assertThat(this.encoder.matches("password", "012345678901234567890123456789")).isFalse(); } @Test public void encodeWhenUsingPredictableSaltThenEqualTestHash() throws Exception { injectPredictableSaltGen(); - String hash = encoder.encode("sometestpassword"); + String hash = this.encoder.encode("sometestpassword"); assertThat(hash).isEqualTo( "$argon2id$v=19$m=4096,t=3,p=1$QUFBQUFBQUFBQUFBQUFBQQ$hmmTNyJlwbb6HAvFoHFWF+u03fdb0F2qA+39oPlcAqo"); @@ -121,9 +121,9 @@ public class Argon2PasswordEncoderTests { @Test public void encodeWhenUsingPredictableSaltWithCustomParamsThenEqualTestHash() throws Exception { - encoder = new Argon2PasswordEncoder(16, 32, 4, 512, 5); + this.encoder = new Argon2PasswordEncoder(16, 32, 4, 512, 5); injectPredictableSaltGen(); - String hash = encoder.encode("sometestpassword"); + String hash = this.encoder.encode("sometestpassword"); assertThat(hash).isEqualTo( "$argon2id$v=19$m=512,t=5,p=4$QUFBQUFBQUFBQUFBQUFBQQ$PNv4C3K50bz3rmON+LtFpdisD7ePieLNq+l5iUHgc1k"); @@ -131,16 +131,16 @@ public class Argon2PasswordEncoderTests { @Test public void upgradeEncodingWhenSameEncodingThenFalse() { - String hash = encoder.encode("password"); + String hash = this.encoder.encode("password"); - assertThat(encoder.upgradeEncoding(hash)).isFalse(); + assertThat(this.encoder.upgradeEncoding(hash)).isFalse(); } @Test public void upgradeEncodingWhenSameStandardParamsThenFalse() { Argon2PasswordEncoder newEncoder = new Argon2PasswordEncoder(); - String hash = encoder.encode("password"); + String hash = this.encoder.encode("password"); assertThat(newEncoder.upgradeEncoding(hash)).isFalse(); } @@ -187,30 +187,30 @@ public class Argon2PasswordEncoderTests { @Test public void upgradeEncodingWhenEncodedPassIsNullThenFalse() { - assertThat(encoder.upgradeEncoding(null)).isFalse(); + assertThat(this.encoder.upgradeEncoding(null)).isFalse(); } @Test public void upgradeEncodingWhenEncodedPassIsEmptyThenFalse() { - assertThat(encoder.upgradeEncoding("")).isFalse(); + assertThat(this.encoder.upgradeEncoding("")).isFalse(); } @Test(expected = IllegalArgumentException.class) public void upgradeEncodingWhenEncodedPassIsBogusThenThrowException() { - encoder.upgradeEncoding("thisIsNoValidHash"); + this.encoder.upgradeEncoding("thisIsNoValidHash"); } private void injectPredictableSaltGen() throws Exception { byte[] bytes = new byte[16]; Arrays.fill(bytes, (byte) 0x41); - Mockito.when(keyGeneratorMock.generateKey()).thenReturn(bytes); + Mockito.when(this.keyGeneratorMock.generateKey()).thenReturn(bytes); // we can't use the @InjectMock-annotation because the salt-generator is set in // the constructor // and Mockito will only inject mocks if they are null - Field saltGen = encoder.getClass().getDeclaredField("saltGenerator"); + Field saltGen = this.encoder.getClass().getDeclaredField("saltGenerator"); saltGen.setAccessible(true); - saltGen.set(encoder, keyGeneratorMock); + saltGen.set(this.encoder, this.keyGeneratorMock); saltGen.setAccessible(false); } diff --git a/crypto/src/test/java/org/springframework/security/crypto/codec/HexTests.java b/crypto/src/test/java/org/springframework/security/crypto/codec/HexTests.java index ccfec27b5f..f5d53d3a19 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/codec/HexTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/codec/HexTests.java @@ -54,29 +54,29 @@ public class HexTests { @Test public void decodeNotEven() { - expectedException.expect(IllegalArgumentException.class); - expectedException.expectMessage("Hex-encoded string must have an even number of characters"); + this.expectedException.expect(IllegalArgumentException.class); + this.expectedException.expectMessage("Hex-encoded string must have an even number of characters"); Hex.decode("414243444"); } @Test public void decodeExistNonHexCharAtFirst() { - expectedException.expect(IllegalArgumentException.class); - expectedException.expectMessage("Detected a Non-hex character at 1 or 2 position"); + this.expectedException.expect(IllegalArgumentException.class); + this.expectedException.expectMessage("Detected a Non-hex character at 1 or 2 position"); Hex.decode("G0"); } @Test public void decodeExistNonHexCharAtSecond() { - expectedException.expect(IllegalArgumentException.class); - expectedException.expectMessage("Detected a Non-hex character at 3 or 4 position"); + this.expectedException.expect(IllegalArgumentException.class); + this.expectedException.expectMessage("Detected a Non-hex character at 3 or 4 position"); Hex.decode("410G"); } @Test public void decodeExistNonHexCharAtBoth() { - expectedException.expect(IllegalArgumentException.class); - expectedException.expectMessage("Detected a Non-hex character at 5 or 6 position"); + this.expectedException.expect(IllegalArgumentException.class); + this.expectedException.expectMessage("Detected a Non-hex character at 5 or 6 position"); Hex.decode("4142GG"); } diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java index 71cf37a9f7..199d213d52 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java @@ -41,64 +41,65 @@ public class BouncyCastleAesBytesEncryptorEquivalencyTests { @Before public void setup() { // generate random password, salt, and test data - password = UUID.randomUUID().toString(); + this.password = UUID.randomUUID().toString(); /** insecure salt byte, recommend 64 or larger than 64 */ byte[] saltBytes = new byte[16]; - secureRandom.nextBytes(saltBytes); - salt = new String(Hex.encode(saltBytes)); + this.secureRandom.nextBytes(saltBytes); + this.salt = new String(Hex.encode(saltBytes)); } @Test public void bouncyCastleAesCbcWithPredictableIvEquvalent() throws Exception { CryptoAssumptions.assumeCBCJCE(); - BytesEncryptor bcEncryptor = new BouncyCastleAesCbcBytesEncryptor(password, salt, + BytesEncryptor bcEncryptor = new BouncyCastleAesCbcBytesEncryptor(this.password, this.salt, + new PredictableRandomBytesKeyGenerator(16)); + BytesEncryptor jceEncryptor = new AesBytesEncryptor(this.password, this.salt, new PredictableRandomBytesKeyGenerator(16)); - BytesEncryptor jceEncryptor = new AesBytesEncryptor(password, salt, new PredictableRandomBytesKeyGenerator(16)); testEquivalence(bcEncryptor, jceEncryptor); } @Test public void bouncyCastleAesCbcWithSecureIvCompatible() throws Exception { CryptoAssumptions.assumeCBCJCE(); - BytesEncryptor bcEncryptor = new BouncyCastleAesCbcBytesEncryptor(password, salt, + BytesEncryptor bcEncryptor = new BouncyCastleAesCbcBytesEncryptor(this.password, this.salt, KeyGenerators.secureRandom(16)); - BytesEncryptor jceEncryptor = new AesBytesEncryptor(password, salt, KeyGenerators.secureRandom(16)); + BytesEncryptor jceEncryptor = new AesBytesEncryptor(this.password, this.salt, KeyGenerators.secureRandom(16)); testCompatibility(bcEncryptor, jceEncryptor); } @Test public void bouncyCastleAesGcmWithPredictableIvEquvalent() throws Exception { CryptoAssumptions.assumeGCMJCE(); - BytesEncryptor bcEncryptor = new BouncyCastleAesGcmBytesEncryptor(password, salt, + BytesEncryptor bcEncryptor = new BouncyCastleAesGcmBytesEncryptor(this.password, this.salt, new PredictableRandomBytesKeyGenerator(16)); - BytesEncryptor jceEncryptor = new AesBytesEncryptor(password, salt, new PredictableRandomBytesKeyGenerator(16), - CipherAlgorithm.GCM); + BytesEncryptor jceEncryptor = new AesBytesEncryptor(this.password, this.salt, + new PredictableRandomBytesKeyGenerator(16), CipherAlgorithm.GCM); testEquivalence(bcEncryptor, jceEncryptor); } @Test public void bouncyCastleAesGcmWithSecureIvCompatible() throws Exception { CryptoAssumptions.assumeGCMJCE(); - BytesEncryptor bcEncryptor = new BouncyCastleAesGcmBytesEncryptor(password, salt, + BytesEncryptor bcEncryptor = new BouncyCastleAesGcmBytesEncryptor(this.password, this.salt, KeyGenerators.secureRandom(16)); - BytesEncryptor jceEncryptor = new AesBytesEncryptor(password, salt, KeyGenerators.secureRandom(16), + BytesEncryptor jceEncryptor = new AesBytesEncryptor(this.password, this.salt, KeyGenerators.secureRandom(16), CipherAlgorithm.GCM); testCompatibility(bcEncryptor, jceEncryptor); } private void testEquivalence(BytesEncryptor left, BytesEncryptor right) { for (int size = 1; size < 2048; size++) { - testData = new byte[size]; - secureRandom.nextBytes(testData); + this.testData = new byte[size]; + this.secureRandom.nextBytes(this.testData); // tests that right and left generate the same encrypted bytes // and can decrypt back to the original input - byte[] leftEncrypted = left.encrypt(testData); - byte[] rightEncrypted = right.encrypt(testData); + byte[] leftEncrypted = left.encrypt(this.testData); + byte[] rightEncrypted = right.encrypt(this.testData); Assert.assertArrayEquals(leftEncrypted, rightEncrypted); byte[] leftDecrypted = left.decrypt(leftEncrypted); byte[] rightDecrypted = right.decrypt(rightEncrypted); - Assert.assertArrayEquals(testData, leftDecrypted); - Assert.assertArrayEquals(testData, rightDecrypted); + Assert.assertArrayEquals(this.testData, leftDecrypted); + Assert.assertArrayEquals(this.testData, rightDecrypted); } } @@ -107,14 +108,14 @@ public class BouncyCastleAesBytesEncryptorEquivalencyTests { // tests that right can decrypt what left encrypted and vice versa // and that the decypted data is the same as the original for (int size = 1; size < 2048; size++) { - testData = new byte[size]; - secureRandom.nextBytes(testData); - byte[] leftEncrypted = left.encrypt(testData); - byte[] rightEncrypted = right.encrypt(testData); + this.testData = new byte[size]; + this.secureRandom.nextBytes(this.testData); + byte[] leftEncrypted = left.encrypt(this.testData); + byte[] rightEncrypted = right.encrypt(this.testData); byte[] leftDecrypted = left.decrypt(rightEncrypted); byte[] rightDecrypted = right.decrypt(leftEncrypted); - Assert.assertArrayEquals(testData, leftDecrypted); - Assert.assertArrayEquals(testData, rightDecrypted); + Assert.assertArrayEquals(this.testData, leftDecrypted); + Assert.assertArrayEquals(this.testData, rightDecrypted); } } @@ -133,12 +134,12 @@ public class BouncyCastleAesBytesEncryptorEquivalencyTests { } public int getKeyLength() { - return keyLength; + return this.keyLength; } public byte[] generateKey() { - byte[] bytes = new byte[keyLength]; - random.nextBytes(bytes); + byte[] bytes = new byte[this.keyLength]; + this.random.nextBytes(bytes); return bytes; } diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java index df881313a6..af0030ad23 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java @@ -38,44 +38,44 @@ public class BouncyCastleAesBytesEncryptorTests { public void setup() { // generate random password, salt, and test data SecureRandom secureRandom = new SecureRandom(); - password = UUID.randomUUID().toString(); + this.password = UUID.randomUUID().toString(); byte[] saltBytes = new byte[16]; secureRandom.nextBytes(saltBytes); - salt = new String(Hex.encode(saltBytes)); - testData = new byte[1024 * 1024]; - secureRandom.nextBytes(testData); + this.salt = new String(Hex.encode(saltBytes)); + this.testData = new byte[1024 * 1024]; + secureRandom.nextBytes(this.testData); } @Test public void bcCbcWithSecureIvGeneratesDifferentMessages() { - BytesEncryptor bcEncryptor = new BouncyCastleAesCbcBytesEncryptor(password, salt); + BytesEncryptor bcEncryptor = new BouncyCastleAesCbcBytesEncryptor(this.password, this.salt); generatesDifferentCipherTexts(bcEncryptor); } @Test public void bcGcmWithSecureIvGeneratesDifferentMessages() { - BytesEncryptor bcEncryptor = new BouncyCastleAesGcmBytesEncryptor(password, salt); + BytesEncryptor bcEncryptor = new BouncyCastleAesGcmBytesEncryptor(this.password, this.salt); generatesDifferentCipherTexts(bcEncryptor); } private void generatesDifferentCipherTexts(BytesEncryptor bcEncryptor) { - byte[] encrypted1 = bcEncryptor.encrypt(testData); - byte[] encrypted2 = bcEncryptor.encrypt(testData); + byte[] encrypted1 = bcEncryptor.encrypt(this.testData); + byte[] encrypted2 = bcEncryptor.encrypt(this.testData); Assert.assertFalse(Arrays.areEqual(encrypted1, encrypted2)); byte[] decrypted1 = bcEncryptor.decrypt(encrypted1); byte[] decrypted2 = bcEncryptor.decrypt(encrypted2); - Assert.assertArrayEquals(testData, decrypted1); - Assert.assertArrayEquals(testData, decrypted2); + Assert.assertArrayEquals(this.testData, decrypted1); + Assert.assertArrayEquals(this.testData, decrypted2); } @Test(expected = IllegalArgumentException.class) public void bcCbcWithWrongLengthIv() { - new BouncyCastleAesCbcBytesEncryptor(password, salt, KeyGenerators.secureRandom(8)); + new BouncyCastleAesCbcBytesEncryptor(this.password, this.salt, KeyGenerators.secureRandom(8)); } @Test(expected = IllegalArgumentException.class) public void bcGcmWithWrongLengthIv() { - new BouncyCastleAesGcmBytesEncryptor(password, salt, KeyGenerators.secureRandom(8)); + new BouncyCastleAesGcmBytesEncryptor(this.password, this.salt, KeyGenerators.secureRandom(8)); } } diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java index 4a5499b3ca..b9ab13312c 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java @@ -220,7 +220,7 @@ public class DelegatingPasswordEncoderTests { public void upgradeEncodingWhenSameIdAndEncoderFalseThenEncoderDecidesFalse() { assertThat(this.passwordEncoder.upgradeEncoding(this.bcryptEncodedPassword)).isFalse(); - verify(bcrypt).upgradeEncoding(this.encodedPassword); + verify(this.bcrypt).upgradeEncoding(this.encodedPassword); } @Test @@ -229,14 +229,14 @@ public class DelegatingPasswordEncoderTests { assertThat(this.passwordEncoder.upgradeEncoding(this.bcryptEncodedPassword)).isTrue(); - verify(bcrypt).upgradeEncoding(this.encodedPassword); + verify(this.bcrypt).upgradeEncoding(this.encodedPassword); } @Test public void upgradeEncodingWhenDifferentIdThenTrue() { assertThat(this.passwordEncoder.upgradeEncoding(this.noopEncodedPassword)).isTrue(); - verifyZeroInteractions(bcrypt); + verifyZeroInteractions(this.bcrypt); } } diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java index c6b1a3a44a..f1025f03a1 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java @@ -26,21 +26,21 @@ public class StandardPasswordEncoderTests { @Test public void matches() { - String result = encoder.encode("password"); + String result = this.encoder.encode("password"); assertThat(result).isNotEqualTo("password"); - assertThat(encoder.matches("password", result)).isTrue(); + assertThat(this.encoder.matches("password", result)).isTrue(); } @Test public void matchesLengthChecked() { - String result = encoder.encode("password"); - assertThat(encoder.matches("password", result.substring(0, result.length() - 2))).isFalse(); + String result = this.encoder.encode("password"); + assertThat(this.encoder.matches("password", result.substring(0, result.length() - 2))).isFalse(); } @Test public void notMatches() { - String result = encoder.encode("password"); - assertThat(encoder.matches("bogus", result)).isFalse(); + String result = this.encoder.encode("password"); + assertThat(this.encoder.matches("bogus", result)).isFalse(); } } diff --git a/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java b/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java index 6fc7ebc2d8..a74b296078 100644 --- a/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java +++ b/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java @@ -31,7 +31,7 @@ public class SecurityEvaluationContextExtensionTests { @Before public void setup() { - securityExtension = new SecurityEvaluationContextExtension(); + this.securityExtension = new SecurityEvaluationContextExtension(); } @After @@ -55,7 +55,7 @@ public class SecurityEvaluationContextExtensionTests { @Test public void getRootObjectExplicitAuthenticationOverridesSecurityContextHolder() { TestingAuthenticationToken explicit = new TestingAuthenticationToken("explicit", "password", "ROLE_EXPLICIT"); - securityExtension = new SecurityEvaluationContextExtension(explicit); + this.securityExtension = new SecurityEvaluationContextExtension(explicit); TestingAuthenticationToken authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER"); SecurityContextHolder.getContext().setAuthentication(authentication); @@ -66,13 +66,13 @@ public class SecurityEvaluationContextExtensionTests { @Test public void getRootObjectExplicitAuthentication() { TestingAuthenticationToken explicit = new TestingAuthenticationToken("explicit", "password", "ROLE_EXPLICIT"); - securityExtension = new SecurityEvaluationContextExtension(explicit); + this.securityExtension = new SecurityEvaluationContextExtension(explicit); assertThat(getRoot().getAuthentication()).isSameAs(explicit); } private SecurityExpressionRoot getRoot() { - return (SecurityExpressionRoot) securityExtension.getRootObject(); + return (SecurityExpressionRoot) this.securityExtension.getRootObject(); } } \ No newline at end of file diff --git a/etc/checkstyle/checkstyle-suppressions.xml b/etc/checkstyle/checkstyle-suppressions.xml index ae0b46bcac..fc3a5e9cc4 100644 --- a/etc/checkstyle/checkstyle-suppressions.xml +++ b/etc/checkstyle/checkstyle-suppressions.xml @@ -23,7 +23,6 @@ - diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java index 9d92e8152e..89c3a11289 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java @@ -48,7 +48,7 @@ public class HttpNamespaceWithMultipleInterceptorsTests { request.setServletPath("/somefile.html"); request.setSession(createAuthenticatedSession("ROLE_0", "ROLE_1", "ROLE_2")); MockHttpServletResponse response = new MockHttpServletResponse(); - fcp.doFilter(request, response, new MockFilterChain()); + this.fcp.doFilter(request, response, new MockFilterChain()); assertThat(response.getStatus()).isEqualTo(200); } @@ -60,7 +60,7 @@ public class HttpNamespaceWithMultipleInterceptorsTests { request.setServletPath("/secure/somefile.html"); request.setSession(createAuthenticatedSession("ROLE_0")); MockHttpServletResponse response = new MockHttpServletResponse(); - fcp.doFilter(request, response, new MockFilterChain()); + this.fcp.doFilter(request, response, new MockFilterChain()); assertThat(response.getStatus()).isEqualTo(403); } diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java index b4000951fa..46032d7af2 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java @@ -48,7 +48,7 @@ public class HttpPathParameterStrippingTests { request.setPathInfo("/secured;x=y/admin.html"); request.setSession(createAuthenticatedSession("ROLE_USER")); MockHttpServletResponse response = new MockHttpServletResponse(); - fcp.doFilter(request, response, new MockFilterChain()); + this.fcp.doFilter(request, response, new MockFilterChain()); } @Test(expected = RequestRejectedException.class) @@ -57,7 +57,7 @@ public class HttpPathParameterStrippingTests { request.setServletPath("/secured/admin.html;x=user.html"); request.setSession(createAuthenticatedSession("ROLE_USER")); MockHttpServletResponse response = new MockHttpServletResponse(); - fcp.doFilter(request, response, new MockFilterChain()); + this.fcp.doFilter(request, response, new MockFilterChain()); } @Test(expected = RequestRejectedException.class) @@ -67,7 +67,7 @@ public class HttpPathParameterStrippingTests { request.setPathInfo("/admin.html;x=user.html"); request.setSession(createAuthenticatedSession("ROLE_USER")); MockHttpServletResponse response = new MockHttpServletResponse(); - fcp.doFilter(request, response, new MockFilterChain()); + this.fcp.doFilter(request, response, new MockFilterChain()); assertThat(response.getStatus()).isEqualTo(403); } diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/MultiAnnotationTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/MultiAnnotationTests.java index 8098ea2a1a..f66094a252 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/integration/MultiAnnotationTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/integration/MultiAnnotationTests.java @@ -58,50 +58,50 @@ public class MultiAnnotationTests { @Test(expected = AccessDeniedException.class) public void preAuthorizeDeniedIsDenied() { - SecurityContextHolder.getContext().setAuthentication(joe_a); - service.preAuthorizeDenyAllMethod(); + SecurityContextHolder.getContext().setAuthentication(this.joe_a); + this.service.preAuthorizeDenyAllMethod(); } @Test(expected = AccessDeniedException.class) public void preAuthorizeRoleAIsDeniedIfRoleMissing() { - SecurityContextHolder.getContext().setAuthentication(joe_b); - service.preAuthorizeHasRoleAMethod(); + SecurityContextHolder.getContext().setAuthentication(this.joe_b); + this.service.preAuthorizeHasRoleAMethod(); } @Test public void preAuthorizeRoleAIsAllowedIfRolePresent() { - SecurityContextHolder.getContext().setAuthentication(joe_a); - service.preAuthorizeHasRoleAMethod(); + SecurityContextHolder.getContext().setAuthentication(this.joe_a); + this.service.preAuthorizeHasRoleAMethod(); } @Test public void securedAnonymousIsAllowed() { - SecurityContextHolder.getContext().setAuthentication(joe_a); - service.securedAnonymousMethod(); + SecurityContextHolder.getContext().setAuthentication(this.joe_a); + this.service.securedAnonymousMethod(); } @Test(expected = AccessDeniedException.class) public void securedRoleAIsDeniedIfRoleMissing() { - SecurityContextHolder.getContext().setAuthentication(joe_b); - service.securedRoleAMethod(); + SecurityContextHolder.getContext().setAuthentication(this.joe_b); + this.service.securedRoleAMethod(); } @Test public void securedRoleAIsAllowedIfRolePresent() { - SecurityContextHolder.getContext().setAuthentication(joe_a); - service.securedRoleAMethod(); + SecurityContextHolder.getContext().setAuthentication(this.joe_a); + this.service.securedRoleAMethod(); } @Test(expected = AccessDeniedException.class) public void preAuthorizedOnlyServiceDeniesIfRoleMissing() { - SecurityContextHolder.getContext().setAuthentication(joe_b); - preService.preAuthorizedMethod(); + SecurityContextHolder.getContext().setAuthentication(this.joe_b); + this.preService.preAuthorizedMethod(); } @Test(expected = AccessDeniedException.class) public void securedOnlyRoleAServiceDeniesIfRoleMissing() { - SecurityContextHolder.getContext().setAuthentication(joe_b); - secService.securedMethod(); + SecurityContextHolder.getContext().setAuthentication(this.joe_b); + this.secService.securedMethod(); } } diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java index 212c2a9dd7..d4873d0098 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java @@ -34,7 +34,7 @@ public class SEC933ApplicationContextTests { @Test public void testSimpleApplicationContextBootstrap() { - assertThat(userDetailsService).isNotNull(); + assertThat(this.userDetailsService).isNotNull(); } } diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java index 919c9bf7da..2bc4f511da 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java @@ -44,7 +44,7 @@ public class SEC936ApplicationContextTests { public void securityInterceptorHandlesCallWithNoTargetObject() { SecurityContextHolder.getContext() .setAuthentication(new UsernamePasswordAuthenticationToken("bob", "bobspassword")); - sessionRegistry.getAllPrincipals(); + this.sessionRegistry.getAllPrincipals(); } } diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/python/PythonInterpreterBasedSecurityTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/python/PythonInterpreterBasedSecurityTests.java index 033857235a..22bfaf7020 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/integration/python/PythonInterpreterBasedSecurityTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/integration/python/PythonInterpreterBasedSecurityTests.java @@ -37,7 +37,7 @@ public class PythonInterpreterBasedSecurityTests { .setAuthentication(new UsernamePasswordAuthenticationToken("bob", "bobspassword")); // for (int i=0; i < 1000; i++) { - service.someMethod(); + this.service.someMethod(); // } } diff --git a/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java b/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java index 8ed19818d3..70964bc91b 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java @@ -72,9 +72,9 @@ public class FilterChainPerformanceTests { @Before public void createAuthenticatedSession() { - session = new MockHttpSession(); - SecurityContextHolder.getContext().setAuthentication(user); - session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, + this.session = new MockHttpSession(); + SecurityContextHolder.getContext().setAuthentication(this.user); + this.session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, SecurityContextHolder.getContext()); SecurityContextHolder.clearContext(); } @@ -91,7 +91,7 @@ public class FilterChainPerformanceTests { private MockHttpServletRequest createRequest(String url) { MockHttpServletRequest request = new MockHttpServletRequest(); - request.setSession(session); + request.setSession(this.session); request.setServletPath(url); request.setMethod("GET"); return request; @@ -101,21 +101,21 @@ public class FilterChainPerformanceTests { for (int i = 0; i < N_INVOCATIONS; i++) { MockHttpServletRequest request = createRequest("/somefile.html"); stack.doFilter(request, new MockHttpServletResponse(), new MockFilterChain()); - session = request.getSession(); + this.session = request.getSession(); } } @Test public void minimalStackInvocation() throws Exception { sw.start("Run with Minimal Filter Stack"); - runWithStack(minimalStack); + runWithStack(this.minimalStack); sw.stop(); } @Test public void fullStackInvocation() throws Exception { sw.start("Run with Full Filter Stack"); - runWithStack(fullStack); + runWithStack(this.fullStack); sw.stop(); } @@ -130,11 +130,11 @@ public class FilterChainPerformanceTests { int nAuthorities = user == 0 ? 1 : user * 10; SecurityContextHolder.getContext().setAuthentication( new UsernamePasswordAuthenticationToken("bob", "bobspassword", createRoles(nAuthorities))); - session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, + this.session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, SecurityContextHolder.getContext()); SecurityContextHolder.clearContext(); sw.start(nAuthorities + " authorities"); - runWithStack(minimalStack); + runWithStack(this.minimalStack); System.out.println(sw.shortSummary()); sw.stop(); } diff --git a/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java b/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java index a468fabb6d..3196c019c9 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java @@ -52,7 +52,7 @@ public class ProtectPointcutPerformanceTests implements ApplicationContextAware sw.start(); for (int i = 0; i < 1000; i++) { try { - SessionRegistry reg = (SessionRegistry) ctx.getBean("sessionRegistryPrototype"); + SessionRegistry reg = (SessionRegistry) this.ctx.getBean("sessionRegistryPrototype"); reg.getAllPrincipals(); fail("Expected AuthenticationCredentialsNotFoundException"); } @@ -65,7 +65,7 @@ public class ProtectPointcutPerformanceTests implements ApplicationContextAware } public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - ctx = applicationContext; + this.ctx = applicationContext; } } diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java index 8ff1a27aa3..f510e8a613 100644 --- a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java +++ b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java @@ -68,7 +68,7 @@ public class PythonInterpreterPreInvocationAdvice implements PreInvocationAuthor Object[] args = mi.getArguments(); Object targetObject = mi.getThis(); Method method = ClassUtils.getMostSpecificMethod(mi.getMethod(), targetObject.getClass()); - String[] paramNames = parameterNameDiscoverer.getParameterNames(method); + String[] paramNames = this.parameterNameDiscoverer.getParameterNames(method); Map argMap = new HashMap<>(); for (int i = 0; i < args.length; i++) { diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAttribute.java b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAttribute.java index 960a8475b8..3fb06bd3ef 100644 --- a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAttribute.java +++ b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAttribute.java @@ -30,7 +30,7 @@ public class PythonInterpreterPreInvocationAttribute implements PreInvocationAtt } public String getScript() { - return script; + return this.script; } } diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java index 3dcc4312c6..6a433d0483 100644 --- a/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java +++ b/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java @@ -39,8 +39,8 @@ public abstract class AbstractWebServerIntegrationTests { @After public void close() { - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java index 5a12ec245d..2240396fd3 100644 --- a/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java +++ b/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java @@ -62,7 +62,7 @@ public class ConcurrentSessionManagementTests extends AbstractWebServerIntegrati // Now logout to kill first session mockMvc.perform(post("/logout").with(csrf())).andExpect(status().is3xxRedirection()) - .andDo(result -> context.publishEvent(new SessionDestroyedEvent(session1) { + .andDo(result -> this.context.publishEvent(new SessionDestroyedEvent(session1) { @Override public List getSecurityContexts() { return Collections.emptyList(); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java index 064505ac36..ba1c820021 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java @@ -55,27 +55,27 @@ public class SpringSecurityLdapTemplateITests { @Before public void setUp() { - template = new SpringSecurityLdapTemplate(this.contextSource); + this.template = new SpringSecurityLdapTemplate(this.contextSource); } @Test public void compareOfCorrectValueSucceeds() { - assertThat(template.compare("uid=bob,ou=people", "uid", "bob")).isTrue(); + assertThat(this.template.compare("uid=bob,ou=people", "uid", "bob")).isTrue(); } @Test public void compareOfCorrectByteValueSucceeds() { - assertThat(template.compare("uid=bob,ou=people", "userPassword", Utf8.encode("bobspassword"))).isTrue(); + assertThat(this.template.compare("uid=bob,ou=people", "userPassword", Utf8.encode("bobspassword"))).isTrue(); } @Test public void compareOfWrongByteValueFails() { - assertThat(template.compare("uid=bob,ou=people", "userPassword", Utf8.encode("wrongvalue"))).isFalse(); + assertThat(this.template.compare("uid=bob,ou=people", "userPassword", Utf8.encode("wrongvalue"))).isFalse(); } @Test public void compareOfWrongValueFails() { - assertThat(template.compare("uid=bob,ou=people", "uid", "wrongvalue")).isFalse(); + assertThat(this.template.compare("uid=bob,ou=people", "uid", "wrongvalue")).isFalse(); } // @Test @@ -91,7 +91,7 @@ public class SpringSecurityLdapTemplateITests { @Test public void namingExceptionIsTranslatedCorrectly() { try { - template.executeReadOnly((ContextExecutor) dirContext -> { + this.template.executeReadOnly((ContextExecutor) dirContext -> { throw new NamingException(); }); fail("Expected UncategorizedLdapException on NamingException"); @@ -104,7 +104,7 @@ public class SpringSecurityLdapTemplateITests { public void roleSearchReturnsCorrectNumberOfRoles() { String param = "uid=ben,ou=people,dc=springframework,dc=org"; - Set values = template.searchForSingleAttributeValues("ou=groups", "(member={0})", + Set values = this.template.searchForSingleAttributeValues("ou=groups", "(member={0})", new String[] { param }, "ou"); assertThat(values).as("Expected 3 results from search").hasSize(3); @@ -115,7 +115,7 @@ public class SpringSecurityLdapTemplateITests { @Test public void testMultiAttributeRetrievalWithNullAttributeNames() { - Set>> values = template.searchForMultipleAttributeValues("ou=people", "(uid={0})", + Set>> values = this.template.searchForMultipleAttributeValues("ou=people", "(uid={0})", new String[] { "bob" }, null); assertThat(values).hasSize(1); Map> record = values.iterator().next(); @@ -128,7 +128,7 @@ public class SpringSecurityLdapTemplateITests { @Test public void testMultiAttributeRetrievalWithZeroLengthAttributeNames() { - Set>> values = template.searchForMultipleAttributeValues("ou=people", "(uid={0})", + Set>> values = this.template.searchForMultipleAttributeValues("ou=people", "(uid={0})", new String[] { "bob" }, new String[0]); assertThat(values).hasSize(1); Map> record = values.iterator().next(); @@ -141,7 +141,7 @@ public class SpringSecurityLdapTemplateITests { @Test public void testMultiAttributeRetrievalWithSpecifiedAttributeNames() { - Set>> values = template.searchForMultipleAttributeValues("ou=people", "(uid={0})", + Set>> values = this.template.searchForMultipleAttributeValues("ou=people", "(uid={0})", new String[] { "bob" }, new String[] { "uid", "cn", "sn" }); assertThat(values).hasSize(1); Map> record = values.iterator().next(); @@ -164,7 +164,7 @@ public class SpringSecurityLdapTemplateITests { public void testRoleSearchForMissingAttributeFailsGracefully() { String param = "uid=ben,ou=people,dc=springframework,dc=org"; - Set values = template.searchForSingleAttributeValues("ou=groups", "(member={0})", + Set values = this.template.searchForSingleAttributeValues("ou=groups", "(member={0})", new String[] { param }, "mail"); assertThat(values).isEmpty(); @@ -174,7 +174,7 @@ public class SpringSecurityLdapTemplateITests { public void roleSearchWithEscapedCharacterSucceeds() { String param = "cn=mouse\\, jerry,ou=people,dc=springframework,dc=org"; - Set values = template.searchForSingleAttributeValues("ou=groups", "(member={0})", + Set values = this.template.searchForSingleAttributeValues("ou=groups", "(member={0})", new String[] { param }, "cn"); assertThat(values).hasSize(1); @@ -205,7 +205,7 @@ public class SpringSecurityLdapTemplateITests { public void searchForSingleEntryWithEscapedCharsInDnSucceeds() { String param = "mouse, jerry"; - template.searchForSingleEntry("ou=people", "(cn={0})", new String[] { param }); + this.template.searchForSingleEntry("ou=people", "(cn={0})", new String[] { param }); } } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java index 24fac9f207..54ddd40d8c 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java @@ -59,29 +59,30 @@ public class PasswordComparisonAuthenticatorTests { @Before public void setUp() { - authenticator = new PasswordComparisonAuthenticator(this.contextSource); - authenticator.setPasswordEncoder(NoOpPasswordEncoder.getInstance()); - authenticator.setUserDnPatterns(new String[] { "uid={0},ou=people" }); - bob = new UsernamePasswordAuthenticationToken("bob", "bobspassword"); - ben = new UsernamePasswordAuthenticationToken("ben", "benspassword"); + this.authenticator = new PasswordComparisonAuthenticator(this.contextSource); + this.authenticator.setPasswordEncoder(NoOpPasswordEncoder.getInstance()); + this.authenticator.setUserDnPatterns(new String[] { "uid={0},ou=people" }); + this.bob = new UsernamePasswordAuthenticationToken("bob", "bobspassword"); + this.ben = new UsernamePasswordAuthenticationToken("ben", "benspassword"); } @Test public void testAllAttributesAreRetrievedByDefault() { - DirContextAdapter user = (DirContextAdapter) authenticator.authenticate(bob); + DirContextAdapter user = (DirContextAdapter) this.authenticator.authenticate(this.bob); // System.out.println(user.getAttributes().toString()); assertThat(user.getAttributes().size()).withFailMessage("User should have 5 attributes").isEqualTo(5); } @Test public void testFailedSearchGivesUserNotFoundException() throws Exception { - authenticator = new PasswordComparisonAuthenticator(this.contextSource); - assertThat(authenticator.getUserDns("Bob")).withFailMessage("User DN matches shouldn't be available").isEmpty(); - authenticator.setUserSearch(new MockUserSearch(null)); - authenticator.afterPropertiesSet(); + this.authenticator = new PasswordComparisonAuthenticator(this.contextSource); + assertThat(this.authenticator.getUserDns("Bob")).withFailMessage("User DN matches shouldn't be available") + .isEmpty(); + this.authenticator.setUserSearch(new MockUserSearch(null)); + this.authenticator.afterPropertiesSet(); try { - authenticator.authenticate(new UsernamePasswordAuthenticationToken("Joe", "pass")); + this.authenticator.authenticate(new UsernamePasswordAuthenticationToken("Joe", "pass")); fail("Expected exception on failed user search"); } catch (UsernameNotFoundException expected) { @@ -91,69 +92,70 @@ public class PasswordComparisonAuthenticatorTests { @Test(expected = BadCredentialsException.class) public void testLdapPasswordCompareFailsWithWrongPassword() { // Don't retrieve the password - authenticator.setUserAttributes(new String[] { "uid", "cn", "sn" }); - authenticator.authenticate(new UsernamePasswordAuthenticationToken("bob", "wrongpass")); + this.authenticator.setUserAttributes(new String[] { "uid", "cn", "sn" }); + this.authenticator.authenticate(new UsernamePasswordAuthenticationToken("bob", "wrongpass")); } @Test public void testMultipleDnPatternsWorkOk() { - authenticator.setUserDnPatterns(new String[] { "uid={0},ou=nonexistent", "uid={0},ou=people" }); - authenticator.authenticate(bob); + this.authenticator.setUserDnPatterns(new String[] { "uid={0},ou=nonexistent", "uid={0},ou=people" }); + this.authenticator.authenticate(this.bob); } @Test public void testOnlySpecifiedAttributesAreRetrieved() { - authenticator.setUserAttributes(new String[] { "uid", "userPassword" }); + this.authenticator.setUserAttributes(new String[] { "uid", "userPassword" }); - DirContextAdapter user = (DirContextAdapter) authenticator.authenticate(bob); + DirContextAdapter user = (DirContextAdapter) this.authenticator.authenticate(this.bob); assertThat(user.getAttributes().size()).withFailMessage("Should have retrieved 2 attribute (uid)").isEqualTo(2); } @Test public void testLdapCompareSucceedsWithCorrectPassword() { // Don't retrieve the password - authenticator.setUserAttributes(new String[] { "uid" }); - authenticator.authenticate(bob); + this.authenticator.setUserAttributes(new String[] { "uid" }); + this.authenticator.authenticate(this.bob); } @Test public void testLdapCompareSucceedsWithShaEncodedPassword() { // Don't retrieve the password - authenticator.setUserAttributes(new String[] { "uid" }); - authenticator.setPasswordEncoder(new LdapShaPasswordEncoder(KeyGenerators.shared(0))); - authenticator.setUsePasswordAttrCompare(false); - authenticator.authenticate(ben); + this.authenticator.setUserAttributes(new String[] { "uid" }); + this.authenticator.setPasswordEncoder(new LdapShaPasswordEncoder(KeyGenerators.shared(0))); + this.authenticator.setUsePasswordAttrCompare(false); + this.authenticator.authenticate(this.ben); } @Test(expected = IllegalArgumentException.class) public void testPasswordEncoderCantBeNull() { - authenticator.setPasswordEncoder(null); + this.authenticator.setPasswordEncoder(null); } @Test public void testUseOfDifferentPasswordAttributeSucceeds() { - authenticator.setPasswordAttributeName("uid"); - authenticator.authenticate(new UsernamePasswordAuthenticationToken("bob", "bob")); + this.authenticator.setPasswordAttributeName("uid"); + this.authenticator.authenticate(new UsernamePasswordAuthenticationToken("bob", "bob")); } @Test public void testLdapCompareWithDifferentPasswordAttributeSucceeds() { - authenticator.setUserAttributes(new String[] { "uid" }); - authenticator.setPasswordAttributeName("cn"); - authenticator.authenticate(new UsernamePasswordAuthenticationToken("ben", "Ben Alex")); + this.authenticator.setUserAttributes(new String[] { "uid" }); + this.authenticator.setPasswordAttributeName("cn"); + this.authenticator.authenticate(new UsernamePasswordAuthenticationToken("ben", "Ben Alex")); } @Test public void testWithUserSearch() { - authenticator = new PasswordComparisonAuthenticator(this.contextSource); - authenticator.setPasswordEncoder(NoOpPasswordEncoder.getInstance()); - assertThat(authenticator.getUserDns("Bob")).withFailMessage("User DN matches shouldn't be available").isEmpty(); + this.authenticator = new PasswordComparisonAuthenticator(this.contextSource); + this.authenticator.setPasswordEncoder(NoOpPasswordEncoder.getInstance()); + assertThat(this.authenticator.getUserDns("Bob")).withFailMessage("User DN matches shouldn't be available") + .isEmpty(); DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName("uid=Bob,ou=people")); ctx.setAttributeValue("userPassword", "bobspassword"); - authenticator.setUserSearch(new MockUserSearch(ctx)); - authenticator.authenticate(new UsernamePasswordAuthenticationToken("shouldntbeused", "bobspassword")); + this.authenticator.setUserSearch(new MockUserSearch(ctx)); + this.authenticator.authenticate(new UsernamePasswordAuthenticationToken("shouldntbeused", "bobspassword")); } } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java index 49d647ac47..eebf38e583 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java @@ -125,7 +125,7 @@ public class ApacheDSContainerTests { public void startWithLdapOverSslWithWrongPassword() throws Exception { final ClassPathResource keyStoreResource = new ClassPathResource( "/org/springframework/security/ldap/server/spring.keystore"); - final File temporaryKeyStoreFile = new File(temporaryFolder.getRoot(), "spring.keystore"); + final File temporaryKeyStoreFile = new File(this.temporaryFolder.getRoot(), "spring.keystore"); FileCopyUtils.copy(keyStoreResource.getInputStream(), new FileOutputStream(temporaryKeyStoreFile)); assertThat(temporaryKeyStoreFile).isFile(); @@ -166,7 +166,7 @@ public class ApacheDSContainerTests { final ClassPathResource keyStoreResource = new ClassPathResource( "/org/springframework/security/ldap/server/spring.keystore"); - final File temporaryKeyStoreFile = new File(temporaryFolder.getRoot(), "spring.keystore"); + final File temporaryKeyStoreFile = new File(this.temporaryFolder.getRoot(), "spring.keystore"); FileCopyUtils.copy(keyStoreResource.getInputStream(), new FileOutputStream(temporaryKeyStoreFile)); assertThat(temporaryKeyStoreFile).isFile(); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/server/UnboundIdContainerLdifTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/server/UnboundIdContainerLdifTests.java index 884351baa7..a5fb47cd56 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/server/UnboundIdContainerLdifTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/server/UnboundIdContainerLdifTests.java @@ -41,17 +41,17 @@ public class UnboundIdContainerLdifTests { @After public void closeAppContext() { - if (appCtx != null) { - appCtx.close(); - appCtx = null; + if (this.appCtx != null) { + this.appCtx.close(); + this.appCtx = null; } } @Test public void unboundIdContainerWhenCustomLdifNameThenLdifLoaded() { - appCtx = new AnnotationConfigApplicationContext(CustomLdifConfig.class); + this.appCtx = new AnnotationConfigApplicationContext(CustomLdifConfig.class); - DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx + DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) this.appCtx .getBean(ContextSource.class); SpringSecurityLdapTemplate template = new SpringSecurityLdapTemplate(contextSource); @@ -85,9 +85,9 @@ public class UnboundIdContainerLdifTests { @Test public void unboundIdContainerWhenWildcardLdifNameThenLdifLoaded() { - appCtx = new AnnotationConfigApplicationContext(WildcardLdifConfig.class); + this.appCtx = new AnnotationConfigApplicationContext(WildcardLdifConfig.class); - DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx + DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) this.appCtx .getBean(ContextSource.class); SpringSecurityLdapTemplate template = new SpringSecurityLdapTemplate(contextSource); @@ -122,7 +122,7 @@ public class UnboundIdContainerLdifTests { @Test public void unboundIdContainerWhenMalformedLdifThenException() { try { - appCtx = new AnnotationConfigApplicationContext(MalformedLdifConfig.class); + this.appCtx = new AnnotationConfigApplicationContext(MalformedLdifConfig.class); failBecauseExceptionWasNotThrown(IllegalStateException.class); } catch (Exception e) { @@ -153,7 +153,7 @@ public class UnboundIdContainerLdifTests { @Test public void unboundIdContainerWhenMissingLdifThenException() { try { - appCtx = new AnnotationConfigApplicationContext(MissingLdifConfig.class); + this.appCtx = new AnnotationConfigApplicationContext(MissingLdifConfig.class); failBecauseExceptionWasNotThrown(IllegalStateException.class); } catch (Exception e) { diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java index 5e0ab55d66..b448b9518b 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java @@ -54,28 +54,28 @@ public class DefaultLdapAuthoritiesPopulatorTests { @Before public void setUp() { - populator = new DefaultLdapAuthoritiesPopulator(this.contextSource, "ou=groups"); - populator.setIgnorePartialResultException(false); + this.populator = new DefaultLdapAuthoritiesPopulator(this.contextSource, "ou=groups"); + this.populator.setIgnorePartialResultException(false); } @Test public void defaultRoleIsAssignedWhenSet() { - populator.setDefaultRole("ROLE_USER"); - assertThat(populator.getContextSource()).isSameAs(this.contextSource); + this.populator.setDefaultRole("ROLE_USER"); + assertThat(this.populator.getContextSource()).isSameAs(this.contextSource); DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName("cn=notfound")); - Collection authorities = populator.getGrantedAuthorities(ctx, "notfound"); + Collection authorities = this.populator.getGrantedAuthorities(ctx, "notfound"); assertThat(authorities).hasSize(1); assertThat(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER")).isTrue(); } @Test public void nullSearchBaseIsAccepted() { - populator = new DefaultLdapAuthoritiesPopulator(this.contextSource, null); - populator.setDefaultRole("ROLE_USER"); + this.populator = new DefaultLdapAuthoritiesPopulator(this.contextSource, null); + this.populator.setDefaultRole("ROLE_USER"); - Collection authorities = populator + Collection authorities = this.populator .getGrantedAuthorities(new DirContextAdapter(new DistinguishedName("cn=notused")), "notused"); assertThat(authorities).hasSize(1); assertThat(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER")).isTrue(); @@ -83,17 +83,17 @@ public class DefaultLdapAuthoritiesPopulatorTests { @Test public void groupSearchReturnsExpectedRoles() { - populator.setRolePrefix("ROLE_"); - populator.setGroupRoleAttribute("ou"); - populator.setSearchSubtree(true); - populator.setSearchSubtree(false); - populator.setConvertToUpperCase(true); - populator.setGroupSearchFilter("(member={0})"); + this.populator.setRolePrefix("ROLE_"); + this.populator.setGroupRoleAttribute("ou"); + this.populator.setSearchSubtree(true); + this.populator.setSearchSubtree(false); + this.populator.setConvertToUpperCase(true); + this.populator.setGroupSearchFilter("(member={0})"); DirContextAdapter ctx = new DirContextAdapter( new DistinguishedName("uid=ben,ou=people,dc=springframework,dc=org")); - Set authorities = AuthorityUtils.authorityListToSet(populator.getGrantedAuthorities(ctx, "ben")); + Set authorities = AuthorityUtils.authorityListToSet(this.populator.getGrantedAuthorities(ctx, "ben")); assertThat(authorities).as("Should have 2 roles").hasSize(2); @@ -103,14 +103,15 @@ public class DefaultLdapAuthoritiesPopulatorTests { @Test public void useOfUsernameParameterReturnsExpectedRoles() { - populator.setGroupRoleAttribute("ou"); - populator.setConvertToUpperCase(true); - populator.setGroupSearchFilter("(ou={1})"); + this.populator.setGroupRoleAttribute("ou"); + this.populator.setConvertToUpperCase(true); + this.populator.setGroupSearchFilter("(ou={1})"); DirContextAdapter ctx = new DirContextAdapter( new DistinguishedName("uid=ben,ou=people,dc=springframework,dc=org")); - Set authorities = AuthorityUtils.authorityListToSet(populator.getGrantedAuthorities(ctx, "manager")); + Set authorities = AuthorityUtils + .authorityListToSet(this.populator.getGrantedAuthorities(ctx, "manager")); assertThat(authorities).as("Should have 1 role").hasSize(1); assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); @@ -118,13 +119,14 @@ public class DefaultLdapAuthoritiesPopulatorTests { @Test public void subGroupRolesAreNotFoundByDefault() { - populator.setGroupRoleAttribute("ou"); - populator.setConvertToUpperCase(true); + this.populator.setGroupRoleAttribute("ou"); + this.populator.setConvertToUpperCase(true); DirContextAdapter ctx = new DirContextAdapter( new DistinguishedName("uid=ben,ou=people,dc=springframework,dc=org")); - Set authorities = AuthorityUtils.authorityListToSet(populator.getGrantedAuthorities(ctx, "manager")); + Set authorities = AuthorityUtils + .authorityListToSet(this.populator.getGrantedAuthorities(ctx, "manager")); assertThat(authorities).as("Should have 2 roles").hasSize(2); assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); @@ -133,14 +135,15 @@ public class DefaultLdapAuthoritiesPopulatorTests { @Test public void subGroupRolesAreFoundWhenSubtreeSearchIsEnabled() { - populator.setGroupRoleAttribute("ou"); - populator.setConvertToUpperCase(true); - populator.setSearchSubtree(true); + this.populator.setGroupRoleAttribute("ou"); + this.populator.setConvertToUpperCase(true); + this.populator.setSearchSubtree(true); DirContextAdapter ctx = new DirContextAdapter( new DistinguishedName("uid=ben,ou=people,dc=springframework,dc=org")); - Set authorities = AuthorityUtils.authorityListToSet(populator.getGrantedAuthorities(ctx, "manager")); + Set authorities = AuthorityUtils + .authorityListToSet(this.populator.getGrantedAuthorities(ctx, "manager")); assertThat(authorities).as("Should have 3 roles").hasSize(3); assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); @@ -150,14 +153,14 @@ public class DefaultLdapAuthoritiesPopulatorTests { @Test public void extraRolesAreAdded() { - populator = new DefaultLdapAuthoritiesPopulator(this.contextSource, null) { + this.populator = new DefaultLdapAuthoritiesPopulator(this.contextSource, null) { @Override protected Set getAdditionalRoles(DirContextOperations user, String username) { return new HashSet<>(AuthorityUtils.createAuthorityList("ROLE_EXTRA")); } }; - Collection authorities = populator + Collection authorities = this.populator .getGrantedAuthorities(new DirContextAdapter(new DistinguishedName("cn=notused")), "notused"); assertThat(authorities).hasSize(1); assertThat(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_EXTRA")).isTrue(); @@ -165,14 +168,15 @@ public class DefaultLdapAuthoritiesPopulatorTests { @Test public void userDnWithEscapedCharacterParameterReturnsExpectedRoles() { - populator.setGroupRoleAttribute("ou"); - populator.setConvertToUpperCase(true); - populator.setGroupSearchFilter("(member={0})"); + this.populator.setGroupRoleAttribute("ou"); + this.populator.setConvertToUpperCase(true); + this.populator.setGroupSearchFilter("(member={0})"); DirContextAdapter ctx = new DirContextAdapter( new DistinguishedName("cn=mouse\\, jerry,ou=people,dc=springframework,dc=org")); - Set authorities = AuthorityUtils.authorityListToSet(populator.getGrantedAuthorities(ctx, "notused")); + Set authorities = AuthorityUtils + .authorityListToSet(this.populator.getGrantedAuthorities(ctx, "notused")); assertThat(authorities).as("Should have 1 role").hasSize(1); assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); @@ -180,23 +184,23 @@ public class DefaultLdapAuthoritiesPopulatorTests { @Test public void customAuthoritiesMappingFunction() { - populator.setAuthorityMapper(record -> { + this.populator.setAuthorityMapper(record -> { String dn = record.get(SpringSecurityLdapTemplate.DN_KEY).get(0); - String role = record.get(populator.getGroupRoleAttribute()).get(0); + String role = record.get(this.populator.getGroupRoleAttribute()).get(0); return new LdapAuthority(role, dn); }); DirContextAdapter ctx = new DirContextAdapter( new DistinguishedName("cn=mouse\\, jerry,ou=people,dc=springframework,dc=org")); - Collection authorities = populator.getGrantedAuthorities(ctx, "notused"); + Collection authorities = this.populator.getGrantedAuthorities(ctx, "notused"); assertThat(authorities).allMatch(LdapAuthority.class::isInstance); } @Test(expected = IllegalArgumentException.class) public void customAuthoritiesMappingFunctionThrowsIfNull() { - populator.setAuthorityMapper(null); + this.populator.setAuthorityMapper(null); } } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java index 20bddda27d..c02d3c3564 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java @@ -61,32 +61,32 @@ public class LdapUserDetailsManagerTests { @Before public void setUp() { - mgr = new LdapUserDetailsManager(this.contextSource); - template = new SpringSecurityLdapTemplate(this.contextSource); + this.mgr = new LdapUserDetailsManager(this.contextSource); + this.template = new SpringSecurityLdapTemplate(this.contextSource); DirContextAdapter ctx = new DirContextAdapter(); ctx.setAttributeValue("objectclass", "organizationalUnit"); ctx.setAttributeValue("ou", "test people"); - template.bind("ou=test people", ctx, null); + this.template.bind("ou=test people", ctx, null); ctx.setAttributeValue("ou", "testgroups"); - template.bind("ou=testgroups", ctx, null); + this.template.bind("ou=testgroups", ctx, null); DirContextAdapter group = new DirContextAdapter(); group.setAttributeValue("objectclass", "groupOfNames"); group.setAttributeValue("cn", "clowns"); group.setAttributeValue("member", "cn=nobody,ou=test people,dc=springframework,dc=org"); - template.bind("cn=clowns,ou=testgroups", group, null); + this.template.bind("cn=clowns,ou=testgroups", group, null); group.setAttributeValue("cn", "acrobats"); - template.bind("cn=acrobats,ou=testgroups", group, null); + this.template.bind("cn=acrobats,ou=testgroups", group, null); - mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=test people", "uid")); - mgr.setGroupSearchBase("ou=testgroups"); - mgr.setGroupRoleAttributeName("cn"); - mgr.setGroupMemberAttributeName("member"); - mgr.setUserDetailsMapper(new PersonContextMapper()); + this.mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=test people", "uid")); + this.mgr.setGroupSearchBase("ou=testgroups"); + this.mgr.setGroupRoleAttributeName("cn"); + this.mgr.setGroupMemberAttributeName("member"); + this.mgr.setUserDetailsMapper(new PersonContextMapper()); } @After @@ -100,17 +100,17 @@ public class LdapUserDetailsManagerTests { // template.unbind((String) people.next() + ",ou=testpeople"); // } - template.unbind("ou=test people", true); - template.unbind("ou=testgroups", true); + this.template.unbind("ou=test people", true); + this.template.unbind("ou=testgroups", true); SecurityContextHolder.clearContext(); } @Test public void testLoadUserByUsernameReturnsCorrectData() { - mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=people", "uid")); - mgr.setGroupSearchBase("ou=groups"); - LdapUserDetails bob = (LdapUserDetails) mgr.loadUserByUsername("bob"); + this.mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=people", "uid")); + this.mgr.setGroupSearchBase("ou=groups"); + LdapUserDetails bob = (LdapUserDetails) this.mgr.loadUserByUsername("bob"); assertThat(bob.getUsername()).isEqualTo("bob"); assertThat(bob.getDn()).isEqualTo("uid=bob,ou=people,dc=springframework,dc=org"); assertThat(bob.getPassword()).isEqualTo("bobspassword"); @@ -120,18 +120,18 @@ public class LdapUserDetailsManagerTests { @Test(expected = UsernameNotFoundException.class) public void testLoadingInvalidUsernameThrowsUsernameNotFoundException() { - mgr.loadUserByUsername("jim"); + this.mgr.loadUserByUsername("jim"); } @Test public void testUserExistsReturnsTrueForValidUser() { - mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=people", "uid")); - assertThat(mgr.userExists("bob")).isTrue(); + this.mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=people", "uid")); + assertThat(this.mgr.userExists("bob")).isTrue(); } @Test public void testUserExistsReturnsFalseForInValidUser() { - assertThat(mgr.userExists("jim")).isFalse(); + assertThat(this.mgr.userExists("jim")).isFalse(); } @Test @@ -154,7 +154,7 @@ public class LdapUserDetailsManagerTests { p.setAuthorities(TEST_AUTHORITIES); - mgr.createUser(p.createUserDetails()); + this.mgr.createUser(p.createUserDetails()); } @Test @@ -166,17 +166,17 @@ public class LdapUserDetailsManagerTests { p.setUid("don"); p.setAuthorities(TEST_AUTHORITIES); - mgr.createUser(p.createUserDetails()); - mgr.setUserDetailsMapper(new InetOrgPersonContextMapper()); + this.mgr.createUser(p.createUserDetails()); + this.mgr.setUserDetailsMapper(new InetOrgPersonContextMapper()); - InetOrgPerson don = (InetOrgPerson) mgr.loadUserByUsername("don"); + InetOrgPerson don = (InetOrgPerson) this.mgr.loadUserByUsername("don"); assertThat(don.getAuthorities()).hasSize(2); - mgr.deleteUser("don"); + this.mgr.deleteUser("don"); try { - mgr.loadUserByUsername("don"); + this.mgr.loadUserByUsername("don"); fail("Expected UsernameNotFoundException after deleting user"); } catch (UsernameNotFoundException expected) { @@ -184,7 +184,7 @@ public class LdapUserDetailsManagerTests { } // Check that no authorities are left - assertThat(mgr.getUserAuthorities(mgr.usernameMapper.buildDn("don"), "don")).hasSize(0); + assertThat(this.mgr.getUserAuthorities(this.mgr.usernameMapper.buildDn("don"), "don")).hasSize(0); } @Test @@ -197,14 +197,14 @@ public class LdapUserDetailsManagerTests { p.setPassword("yossarianspassword"); p.setAuthorities(TEST_AUTHORITIES); - mgr.createUser(p.createUserDetails()); + this.mgr.createUser(p.createUserDetails()); SecurityContextHolder.getContext().setAuthentication( new UsernamePasswordAuthenticationToken("johnyossarian", "yossarianspassword", TEST_AUTHORITIES)); - mgr.changePassword("yossarianspassword", "yossariansnewpassword"); + this.mgr.changePassword("yossarianspassword", "yossariansnewpassword"); - assertThat(template.compare("uid=johnyossarian,ou=test people", "userPassword", "yossariansnewpassword")) + assertThat(this.template.compare("uid=johnyossarian,ou=test people", "userPassword", "yossariansnewpassword")) .isTrue(); } @@ -218,12 +218,12 @@ public class LdapUserDetailsManagerTests { p.setPassword("yossarianspassword"); p.setAuthorities(TEST_AUTHORITIES); - mgr.createUser(p.createUserDetails()); + this.mgr.createUser(p.createUserDetails()); SecurityContextHolder.getContext().setAuthentication( new UsernamePasswordAuthenticationToken("johnyossarian", "yossarianspassword", TEST_AUTHORITIES)); - mgr.changePassword("wrongpassword", "yossariansnewpassword"); + this.mgr.changePassword("wrongpassword", "yossariansnewpassword"); } } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java index a1142aebb0..657cf67edc 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java @@ -60,69 +60,69 @@ public class NestedLdapAuthoritiesPopulatorTests { @Before public void setUp() { - populator = new NestedLdapAuthoritiesPopulator(this.contextSource, "ou=jdeveloper"); - populator.setGroupSearchFilter("(member={0})"); - populator.setIgnorePartialResultException(false); - populator.setRolePrefix(""); - populator.setSearchSubtree(true); - populator.setConvertToUpperCase(false); - jDevelopers = new LdapAuthority("j-developers", "cn=j-developers,ou=jdeveloper,dc=springframework,dc=org"); - javaDevelopers = new LdapAuthority("java-developers", + this.populator = new NestedLdapAuthoritiesPopulator(this.contextSource, "ou=jdeveloper"); + this.populator.setGroupSearchFilter("(member={0})"); + this.populator.setIgnorePartialResultException(false); + this.populator.setRolePrefix(""); + this.populator.setSearchSubtree(true); + this.populator.setConvertToUpperCase(false); + this.jDevelopers = new LdapAuthority("j-developers", "cn=j-developers,ou=jdeveloper,dc=springframework,dc=org"); + this.javaDevelopers = new LdapAuthority("java-developers", "cn=java-developers,ou=jdeveloper,dc=springframework,dc=org"); - groovyDevelopers = new LdapAuthority("groovy-developers", + this.groovyDevelopers = new LdapAuthority("groovy-developers", "cn=groovy-developers,ou=jdeveloper,dc=springframework,dc=org"); - scalaDevelopers = new LdapAuthority("scala-developers", + this.scalaDevelopers = new LdapAuthority("scala-developers", "cn=scala-developers,ou=jdeveloper,dc=springframework,dc=org"); - closureDevelopers = new LdapAuthority("closure-developers", + this.closureDevelopers = new LdapAuthority("closure-developers", "cn=closure-developers,ou=jdeveloper,dc=springframework,dc=org"); - circularJavaDevelopers = new LdapAuthority("circular-java-developers", + this.circularJavaDevelopers = new LdapAuthority("circular-java-developers", "cn=circular-java-developers,ou=jdeveloper,dc=springframework,dc=org"); } @Test public void testScalaDudeJDevelopersAuthorities() { DirContextAdapter ctx = new DirContextAdapter("uid=scaladude,ou=people,dc=springframework,dc=org"); - Collection authorities = populator.getGrantedAuthorities(ctx, "scaladude"); + Collection authorities = this.populator.getGrantedAuthorities(ctx, "scaladude"); assertThat(authorities).hasSize(5); - assertThat(authorities).isEqualTo( - Arrays.asList(javaDevelopers, circularJavaDevelopers, scalaDevelopers, groovyDevelopers, jDevelopers)); + assertThat(authorities).isEqualTo(Arrays.asList(this.javaDevelopers, this.circularJavaDevelopers, + this.scalaDevelopers, this.groovyDevelopers, this.jDevelopers)); } @Test public void testJavaDudeJDevelopersAuthorities() { DirContextAdapter ctx = new DirContextAdapter("uid=javadude,ou=people,dc=springframework,dc=org"); - Collection authorities = populator.getGrantedAuthorities(ctx, "javadude"); + Collection authorities = this.populator.getGrantedAuthorities(ctx, "javadude"); assertThat(authorities).hasSize(4); - assertThat(authorities).contains(javaDevelopers); + assertThat(authorities).contains(this.javaDevelopers); } @Test public void testScalaDudeJDevelopersAuthoritiesWithSearchLimit() { - populator.setMaxSearchDepth(1); + this.populator.setMaxSearchDepth(1); DirContextAdapter ctx = new DirContextAdapter("uid=scaladude,ou=people,dc=springframework,dc=org"); - Collection authorities = populator.getGrantedAuthorities(ctx, "scaladude"); + Collection authorities = this.populator.getGrantedAuthorities(ctx, "scaladude"); assertThat(authorities).hasSize(1); - assertThat(authorities).isEqualTo(Arrays.asList(scalaDevelopers)); + assertThat(authorities).isEqualTo(Arrays.asList(this.scalaDevelopers)); } @Test public void testGroovyDudeJDevelopersAuthorities() { DirContextAdapter ctx = new DirContextAdapter("uid=groovydude,ou=people,dc=springframework,dc=org"); - Collection authorities = populator.getGrantedAuthorities(ctx, "groovydude"); + Collection authorities = this.populator.getGrantedAuthorities(ctx, "groovydude"); assertThat(authorities).hasSize(4); - assertThat(authorities) - .isEqualTo(Arrays.asList(javaDevelopers, circularJavaDevelopers, groovyDevelopers, jDevelopers)); + assertThat(authorities).isEqualTo(Arrays.asList(this.javaDevelopers, this.circularJavaDevelopers, + this.groovyDevelopers, this.jDevelopers)); } @Test public void testClosureDudeJDevelopersWithMembershipAsAttributeValues() { - populator.setAttributeNames(new HashSet(Arrays.asList("member"))); + this.populator.setAttributeNames(new HashSet(Arrays.asList("member"))); DirContextAdapter ctx = new DirContextAdapter("uid=closuredude,ou=people,dc=springframework,dc=org"); - Collection authorities = populator.getGrantedAuthorities(ctx, "closuredude"); + Collection authorities = this.populator.getGrantedAuthorities(ctx, "closuredude"); assertThat(authorities).hasSize(5); - assertThat(authorities).isEqualTo(Arrays.asList(javaDevelopers, circularJavaDevelopers, closureDevelopers, - groovyDevelopers, jDevelopers)); + assertThat(authorities).isEqualTo(Arrays.asList(this.javaDevelopers, this.circularJavaDevelopers, + this.closureDevelopers, this.groovyDevelopers, this.jDevelopers)); LdapAuthority[] ldapAuthorities = authorities.toArray(new LdapAuthority[0]); assertThat(ldapAuthorities).hasSize(5); @@ -137,7 +137,7 @@ public class NestedLdapAuthoritiesPopulatorTests { assertThat(ldapAuthorities[1].getAttributes().containsKey("member")).isTrue(); assertThat(ldapAuthorities[1].getAttributes().get("member")).isNotNull(); assertThat(ldapAuthorities[1].getAttributes().get("member")).hasSize(3); - assertThat(groovyDevelopers.getDn()).isEqualTo(ldapAuthorities[1].getFirstAttributeValue("member")); + assertThat(this.groovyDevelopers.getDn()).isEqualTo(ldapAuthorities[1].getFirstAttributeValue("member")); assertThat(ldapAuthorities[2].getAttributes().get("member")) .contains("uid=closuredude,ou=people,dc=springframework,dc=org"); @@ -146,7 +146,7 @@ public class NestedLdapAuthoritiesPopulatorTests { assertThat(ldapAuthorities[2].getAttributeValues("test")).isNotNull(); assertThat(ldapAuthorities[2].getAttributeValues("test")).isEmpty(); // test role name - assertThat(ldapAuthorities[3].getAuthority()).isEqualTo(groovyDevelopers.getAuthority()); + assertThat(ldapAuthorities[3].getAuthority()).isEqualTo(this.groovyDevelopers.getAuthority()); } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/DefaultLdapUsernameToDnMapper.java b/ldap/src/main/java/org/springframework/security/ldap/DefaultLdapUsernameToDnMapper.java index 2b7a68bac0..8d15870ab6 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/DefaultLdapUsernameToDnMapper.java +++ b/ldap/src/main/java/org/springframework/security/ldap/DefaultLdapUsernameToDnMapper.java @@ -44,9 +44,9 @@ public class DefaultLdapUsernameToDnMapper implements LdapUsernameToDnMapper { * Assembles the Distinguished Name that should be used the given username. */ public DistinguishedName buildDn(String username) { - DistinguishedName dn = new DistinguishedName(userDnBase); + DistinguishedName dn = new DistinguishedName(this.userDnBase); - dn.add(usernameAttribute, username); + dn.add(this.usernameAttribute, username); return dn; } diff --git a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java index a363e2a137..8a855cefe8 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java +++ b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java @@ -76,7 +76,7 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { Assert.notNull(contextSource, "ContextSource cannot be null"); setContextSource(contextSource); - searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE); + this.searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE); } /** @@ -211,7 +211,7 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { }; SearchControls ctls = new SearchControls(); - ctls.setSearchScope(searchControls.getSearchScope()); + ctls.setSearchScope(this.searchControls.getSearchScope()); ctls.setReturningAttributes(attributeNames != null && attributeNames.length > 0 ? attributeNames : null); search(base, formattedFilter, ctls, roleMapper); @@ -284,7 +284,7 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { public DirContextOperations searchForSingleEntry(final String base, final String filter, final Object[] params) { return (DirContextOperations) executeReadOnly( - (ContextExecutor) ctx -> searchForSingleEntryInternal(ctx, searchControls, base, filter, params)); + (ContextExecutor) ctx -> searchForSingleEntryInternal(ctx, this.searchControls, base, filter, params)); } /** diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java index db1522e7c5..79890a2022 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java @@ -67,16 +67,16 @@ public abstract class AbstractLdapAuthenticator implements LdapAuthenticator, In } public void afterPropertiesSet() { - Assert.isTrue((userDnFormat != null) || (userSearch != null), + Assert.isTrue((this.userDnFormat != null) || (this.userSearch != null), "Either an LdapUserSearch or DN pattern (or both) must be supplied."); } protected ContextSource getContextSource() { - return contextSource; + return this.contextSource; } public String[] getUserAttributes() { - return userAttributes; + return this.userAttributes; } /** @@ -87,15 +87,15 @@ public abstract class AbstractLdapAuthenticator implements LdapAuthenticator, In * set. */ protected List getUserDns(String username) { - if (userDnFormat == null) { + if (this.userDnFormat == null) { return Collections.emptyList(); } - List userDns = new ArrayList<>(userDnFormat.length); + List userDns = new ArrayList<>(this.userDnFormat.length); String[] args = new String[] { LdapEncoder.nameEncode(username) }; - synchronized (userDnFormat) { - for (MessageFormat formatter : userDnFormat) { + synchronized (this.userDnFormat) { + for (MessageFormat formatter : this.userDnFormat) { userDns.add(formatter.format(args)); } } @@ -104,7 +104,7 @@ public abstract class AbstractLdapAuthenticator implements LdapAuthenticator, In } protected LdapUserSearch getUserSearch() { - return userSearch; + return this.userSearch; } public void setMessageSource(MessageSource messageSource) { @@ -131,10 +131,10 @@ public abstract class AbstractLdapAuthenticator implements LdapAuthenticator, In public void setUserDnPatterns(String[] dnPattern) { Assert.notNull(dnPattern, "The array of DN patterns cannot be set to null"); // this.userDnPattern = dnPattern; - userDnFormat = new MessageFormat[dnPattern.length]; + this.userDnFormat = new MessageFormat[dnPattern.length]; for (int i = 0; i < dnPattern.length; i++) { - userDnFormat[i] = new MessageFormat(dnPattern[i]); + this.userDnFormat[i] = new MessageFormat(dnPattern[i]); } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java index 06a8ce1b1e..a374b5bf6e 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java @@ -67,7 +67,8 @@ public class BindAuthenticator extends AbstractLdapAuthenticator { if (!StringUtils.hasLength(password)) { logger.debug("Rejecting empty password for user " + username); - throw new BadCredentialsException(messages.getMessage("BindAuthenticator.emptyPassword", "Empty Password")); + throw new BadCredentialsException( + this.messages.getMessage("BindAuthenticator.emptyPassword", "Empty Password")); } // If DN patterns are configured, try authenticating with them directly @@ -88,7 +89,7 @@ public class BindAuthenticator extends AbstractLdapAuthenticator { if (user == null) { throw new BadCredentialsException( - messages.getMessage("BindAuthenticator.badCredentials", "Bad credentials")); + this.messages.getMessage("BindAuthenticator.badCredentials", "Bad credentials")); } return user; diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java index db72e51ed7..6a8eda48ce 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java @@ -92,23 +92,23 @@ public final class PasswordComparisonAuthenticator extends AbstractLdapAuthentic } if (logger.isDebugEnabled()) { - logger.debug("Performing LDAP compare of password attribute '" + passwordAttributeName + "' for user '" + logger.debug("Performing LDAP compare of password attribute '" + this.passwordAttributeName + "' for user '" + user.getDn() + "'"); } - if (usePasswordAttrCompare && isPasswordAttrCompare(user, password)) { + if (this.usePasswordAttrCompare && isPasswordAttrCompare(user, password)) { return user; } else if (isLdapPasswordCompare(user, ldapTemplate, password)) { return user; } throw new BadCredentialsException( - messages.getMessage("PasswordComparisonAuthenticator.badCredentials", "Bad credentials")); + this.messages.getMessage("PasswordComparisonAuthenticator.badCredentials", "Bad credentials")); } private boolean isPasswordAttrCompare(DirContextOperations user, String password) { String passwordAttrValue = getPassword(user); - return passwordEncoder.matches(password, passwordAttrValue); + return this.passwordEncoder.matches(password, passwordAttrValue); } private String getPassword(DirContextOperations user) { @@ -124,9 +124,9 @@ public final class PasswordComparisonAuthenticator extends AbstractLdapAuthentic private boolean isLdapPasswordCompare(DirContextOperations user, SpringSecurityLdapTemplate ldapTemplate, String password) { - String encodedPassword = passwordEncoder.encode(password); + String encodedPassword = this.passwordEncoder.encode(password); byte[] passwordBytes = Utf8.encode(encodedPassword); - return ldapTemplate.compare(user.getDn().toString(), passwordAttributeName, passwordBytes); + return ldapTemplate.compare(user.getDn().toString(), this.passwordAttributeName, passwordBytes); } public void setPasswordAttributeName(String passwordAttribute) { diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/UserDetailsServiceLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/UserDetailsServiceLdapAuthoritiesPopulator.java index 80999875b6..fbf4682871 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/UserDetailsServiceLdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/UserDetailsServiceLdapAuthoritiesPopulator.java @@ -41,7 +41,7 @@ public class UserDetailsServiceLdapAuthoritiesPopulator implements LdapAuthoriti public Collection getGrantedAuthorities(DirContextOperations userData, String username) { - return userDetailsService.loadUserByUsername(username).getAuthorities(); + return this.userDetailsService.loadUserByUsername(username).getAuthorities(); } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryAuthenticationException.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryAuthenticationException.java index b6473ceaff..fb6f860a2a 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryAuthenticationException.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryAuthenticationException.java @@ -50,7 +50,7 @@ public final class ActiveDirectoryAuthenticationException extends Authentication } public String getDataCode() { - return dataCode; + return this.dataCode; } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java index 56cd883979..baafbe38fd 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java @@ -152,7 +152,7 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda Assert.isTrue(StringUtils.hasText(url), "Url cannot be empty"); this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null; this.url = url; - rootDn = this.domain == null ? null : rootDnFromDomain(this.domain); + this.rootDn = this.domain == null ? null : rootDnFromDomain(this.domain); } @Override @@ -169,7 +169,7 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda throw badLdapConnection(e); } catch (NamingException e) { - logger.error("Failed to locate directory entry for authenticated user: " + username, e); + this.logger.error("Failed to locate directory entry for authenticated user: " + username, e); throw badCredentials(e); } finally { @@ -187,13 +187,13 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda String[] groups = userData.getStringAttributes("memberOf"); if (groups == null) { - logger.debug("No values for 'memberOf' attribute."); + this.logger.debug("No values for 'memberOf' attribute."); return AuthorityUtils.NO_AUTHORITIES; } - if (logger.isDebugEnabled()) { - logger.debug("'memberOf' attribute values: " + Arrays.asList(groups)); + if (this.logger.isDebugEnabled()) { + this.logger.debug("'memberOf' attribute values: " + Arrays.asList(groups)); } ArrayList authorities = new ArrayList<>(groups.length); @@ -207,7 +207,7 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda private DirContext bindAsUser(String username, String password) { // TODO. add DNS lookup based on domain - final String bindUrl = url; + final String bindUrl = this.url; Hashtable env = new Hashtable<>(); env.put(Context.SECURITY_AUTHENTICATION, "simple"); @@ -220,7 +220,7 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda env.putAll(this.contextEnvironmentProperties); try { - return contextFactory.createContext(env); + return this.contextFactory.createContext(env); } catch (NamingException e) { if ((e instanceof AuthenticationException) || (e instanceof OperationNotSupportedException)) { @@ -234,8 +234,8 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda } private void handleBindException(String bindPrincipal, NamingException exception) { - if (logger.isDebugEnabled()) { - logger.debug("Authentication for " + bindPrincipal + " failed:" + exception); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Authentication for " + bindPrincipal + " failed:" + exception); } handleResolveObj(exception); @@ -243,13 +243,13 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda int subErrorCode = parseSubErrorCode(exception.getMessage()); if (subErrorCode <= 0) { - logger.debug("Failed to locate AD-specific sub-error code in message"); + this.logger.debug("Failed to locate AD-specific sub-error code in message"); return; } - logger.info("Active Directory authentication failed: " + subCodeToLogMessage(subErrorCode)); + this.logger.info("Active Directory authentication failed: " + subCodeToLogMessage(subErrorCode)); - if (convertSubErrorCodesToExceptions) { + if (this.convertSubErrorCodesToExceptions) { raiseExceptionForErrorCode(subErrorCode, exception); } } @@ -277,17 +277,17 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda Throwable cause = new ActiveDirectoryAuthenticationException(hexString, exception.getMessage(), exception); switch (code) { case PASSWORD_EXPIRED: - throw new CredentialsExpiredException(messages.getMessage("LdapAuthenticationProvider.credentialsExpired", - "User credentials have expired"), cause); + throw new CredentialsExpiredException(this.messages.getMessage( + "LdapAuthenticationProvider.credentialsExpired", "User credentials have expired"), cause); case ACCOUNT_DISABLED: - throw new DisabledException(messages.getMessage("LdapAuthenticationProvider.disabled", "User is disabled"), - cause); + throw new DisabledException( + this.messages.getMessage("LdapAuthenticationProvider.disabled", "User is disabled"), cause); case ACCOUNT_EXPIRED: throw new AccountExpiredException( - messages.getMessage("LdapAuthenticationProvider.expired", "User account has expired"), cause); + this.messages.getMessage("LdapAuthenticationProvider.expired", "User account has expired"), cause); case ACCOUNT_LOCKED: throw new LockedException( - messages.getMessage("LdapAuthenticationProvider.locked", "User account is locked"), cause); + this.messages.getMessage("LdapAuthenticationProvider.locked", "User account is locked"), cause); default: throw badCredentials(cause); } @@ -318,7 +318,7 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda private BadCredentialsException badCredentials() { return new BadCredentialsException( - messages.getMessage("LdapAuthenticationProvider.badCredentials", "Bad credentials")); + this.messages.getMessage("LdapAuthenticationProvider.badCredentials", "Bad credentials")); } private BadCredentialsException badCredentials(Throwable cause) { @@ -326,7 +326,7 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda } private InternalAuthenticationServiceException badLdapConnection(Throwable cause) { - return new InternalAuthenticationServiceException(messages.getMessage( + return new InternalAuthenticationServiceException(this.messages.getMessage( "LdapAuthenticationProvider.badLdapConnection", "Connection to LDAP server failed."), cause); } @@ -335,11 +335,11 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE); String bindPrincipal = createBindPrincipal(username); - String searchRoot = rootDn != null ? rootDn : searchRootFromPrincipal(bindPrincipal); + String searchRoot = this.rootDn != null ? this.rootDn : searchRootFromPrincipal(bindPrincipal); try { return SpringSecurityLdapTemplate.searchForSingleEntryInternal(context, searchControls, searchRoot, - searchFilter, new Object[] { bindPrincipal, username }); + this.searchFilter, new Object[] { bindPrincipal, username }); } catch (CommunicationException ldapCommunicationException) { throw badLdapConnection(ldapCommunicationException); @@ -361,7 +361,7 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda int atChar = bindPrincipal.lastIndexOf('@'); if (atChar < 0) { - logger.debug("User principal '" + bindPrincipal + this.logger.debug("User principal '" + bindPrincipal + "' does not contain the domain, and no domain has been configured"); throw badCredentials(); } @@ -384,11 +384,11 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda } String createBindPrincipal(String username) { - if (domain == null || username.toLowerCase().endsWith(domain)) { + if (this.domain == null || username.toLowerCase().endsWith(this.domain)) { return username; } - return username + "@" + domain; + return username + "@" + this.domain; } /** diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java index 173582036d..9615bcba13 100755 --- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java +++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java @@ -45,18 +45,18 @@ public class PasswordPolicyAwareContextSource extends DefaultSpringSecurityConte @Override public DirContext getContext(String principal, String credentials) throws PasswordPolicyException { - if (principal.equals(userDn)) { + if (principal.equals(this.userDn)) { return super.getContext(principal, credentials); } - final boolean debug = logger.isDebugEnabled(); + final boolean debug = this.logger.isDebugEnabled(); if (debug) { - logger.debug("Binding as '" + userDn + "', prior to reconnect as user '" + principal + "'"); + this.logger.debug("Binding as '" + this.userDn + "', prior to reconnect as user '" + principal + "'"); } // First bind as manager user before rebinding as the specific principal. - LdapContext ctx = (LdapContext) super.getContext(userDn, password); + LdapContext ctx = (LdapContext) super.getContext(this.userDn, this.password); Control[] rctls = { new PasswordPolicyControl(false) }; @@ -68,8 +68,8 @@ public class PasswordPolicyAwareContextSource extends DefaultSpringSecurityConte catch (javax.naming.NamingException ne) { PasswordPolicyResponseControl ctrl = PasswordPolicyControlExtractor.extractControl(ctx); if (debug) { - logger.debug("Failed to obtain context", ne); - logger.debug("Password policy response: " + ctrl); + this.logger.debug("Failed to obtain context", ne); + this.logger.debug("Password policy response: " + ctrl); } LdapUtils.closeContext(ctx); @@ -84,7 +84,7 @@ public class PasswordPolicyAwareContextSource extends DefaultSpringSecurityConte } if (debug) { - logger.debug("PPolicy control returned: " + PasswordPolicyControlExtractor.extractControl(ctx)); + this.logger.debug("PPolicy control returned: " + PasswordPolicyControlExtractor.extractControl(ctx)); } return ctx; diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java index a905c68c7b..73a865446e 100755 --- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java +++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java @@ -72,7 +72,7 @@ public class PasswordPolicyControl implements Control { * Returns whether the control is critical for the client. */ public boolean isCritical() { - return critical; + return this.critical; } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java index a9e52267a6..9aae7e4824 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java +++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java @@ -65,11 +65,11 @@ public enum PasswordPolicyErrorStatus { } public String getErrorCode() { - return errorCode; + return this.errorCode; } public String getDefaultMessage() { - return defaultMessage; + return this.defaultMessage; } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java index 62d4106d1b..b09b158d5a 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java +++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java @@ -34,7 +34,7 @@ public class PasswordPolicyException extends RuntimeException { } public PasswordPolicyErrorStatus getStatus() { - return status; + return this.status; } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java b/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java index 7eecc6de77..22bb16229d 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java +++ b/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java @@ -99,13 +99,13 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch { logger.debug("Searching for user '" + username + "', with user search " + this); } - SpringSecurityLdapTemplate template = new SpringSecurityLdapTemplate(contextSource); + SpringSecurityLdapTemplate template = new SpringSecurityLdapTemplate(this.contextSource); - template.setSearchControls(searchControls); + template.setSearchControls(this.searchControls); try { - return template.searchForSingleEntry(searchBase, searchFilter, new String[] { username }); + return template.searchForSingleEntry(this.searchBase, this.searchFilter, new String[] { username }); } catch (IncorrectResultSizeDataAccessException notFound) { @@ -124,7 +124,7 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch { * @param deref the derefLinkFlag value as defined in SearchControls.. */ public void setDerefLinkFlag(boolean deref) { - searchControls.setDerefLinkFlag(deref); + this.searchControls.setDerefLinkFlag(deref); } /** @@ -134,7 +134,8 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch { * SearchControls.SUBTREE_SCOPE rather than SearchControls.ONELEVEL_SCOPE. */ public void setSearchSubtree(boolean searchSubtree) { - searchControls.setSearchScope(searchSubtree ? SearchControls.SUBTREE_SCOPE : SearchControls.ONELEVEL_SCOPE); + this.searchControls + .setSearchScope(searchSubtree ? SearchControls.SUBTREE_SCOPE : SearchControls.ONELEVEL_SCOPE); } /** @@ -142,7 +143,7 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch { * @param searchTimeLimit the time limit for the search (in milliseconds). */ public void setSearchTimeLimit(int searchTimeLimit) { - searchControls.setTimeLimit(searchTimeLimit); + this.searchControls.setTimeLimit(searchTimeLimit); } /** @@ -154,19 +155,19 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch { * returned. Can be null. */ public void setReturningAttributes(String[] attrs) { - searchControls.setReturningAttributes(attrs); + this.searchControls.setReturningAttributes(attrs); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("[ searchFilter: '").append(searchFilter).append("', "); - sb.append("searchBase: '").append(searchBase).append("'"); - sb.append(", scope: ") - .append(searchControls.getSearchScope() == SearchControls.SUBTREE_SCOPE ? "subtree" : "single-level, "); - sb.append(", searchTimeLimit: ").append(searchControls.getTimeLimit()); - sb.append(", derefLinkFlag: ").append(searchControls.getDerefLinkFlag()).append(" ]"); + sb.append("[ searchFilter: '").append(this.searchFilter).append("', "); + sb.append("searchBase: '").append(this.searchBase).append("'"); + sb.append(", scope: ").append( + this.searchControls.getSearchScope() == SearchControls.SUBTREE_SCOPE ? "subtree" : "single-level, "); + sb.append(", searchTimeLimit: ").append(this.searchControls.getTimeLimit()); + sb.append(", derefLinkFlag: ").append(this.searchControls.getDerefLinkFlag()).append(" ]"); return sb.toString(); } diff --git a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java index 2424e98d51..d4a0bb628e 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java +++ b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java @@ -110,7 +110,7 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life public ApacheDSContainer(String root, String ldifs) throws Exception { this.ldifResources = ldifs; - service = new DefaultDirectoryService(); + this.service = new DefaultDirectoryService(); List list = new ArrayList<>(); list.add(new NormalizationInterceptor()); @@ -128,20 +128,20 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life // list.add( new TriggerInterceptor() ); // list.add( new JournalInterceptor() ); - service.setInterceptors(list); - partition = new JdbmPartition(); - partition.setId("rootPartition"); - partition.setSuffix(root); + this.service.setInterceptors(list); + this.partition = new JdbmPartition(); + this.partition.setId("rootPartition"); + this.partition.setSuffix(root); this.root = root; - service.addPartition(partition); - service.setExitVmOnShutdown(false); - service.setShutdownHookEnabled(false); - service.getChangeLog().setEnabled(false); - service.setDenormalizeOpAttrsEnabled(true); + this.service.addPartition(this.partition); + this.service.setExitVmOnShutdown(false); + this.service.setShutdownHookEnabled(false); + this.service.getChangeLog().setEnabled(false); + this.service.setDenormalizeOpAttrsEnabled(true); } public void afterPropertiesSet() throws Exception { - if (workingDir == null) { + if (this.workingDir == null) { String apacheWorkDir = System.getProperty("apacheDSWorkDir"); if (apacheWorkDir == null) { @@ -154,17 +154,17 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life throw new IllegalArgumentException("When LdapOverSsl is enabled, the keyStoreFile property must be set."); } - server = new LdapServer(); - server.setDirectoryService(service); + this.server = new LdapServer(); + this.server.setDirectoryService(this.service); // AbstractLdapIntegrationTests assume IPv4, so we specify the same here - this.transport = new TcpTransport(port); - if (ldapOverSslEnabled) { - transport.setEnableSSL(true); - server.setKeystoreFile(this.keyStoreFile.getAbsolutePath()); - server.setCertificatePassword(this.certificatePassord); + this.transport = new TcpTransport(this.port); + if (this.ldapOverSslEnabled) { + this.transport.setEnableSSL(true); + this.server.setKeystoreFile(this.keyStoreFile.getAbsolutePath()); + this.server.setCertificatePassword(this.certificatePassord); } - server.setTransports(transport); + this.server.setTransports(this.transport); start(); } @@ -173,13 +173,13 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life } public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - ctxt = applicationContext; + this.ctxt = applicationContext; } public void setWorkingDirectory(File workingDir) { Assert.notNull(workingDir, "workingDir cannot be null"); - logger.info("Setting working directory for LDAP_PROVIDER: " + workingDir.getAbsolutePath()); + this.logger.info("Setting working directory for LDAP_PROVIDER: " + workingDir.getAbsolutePath()); if (workingDir.exists()) { throw new IllegalArgumentException("The specified working directory '" + workingDir.getAbsolutePath() @@ -190,7 +190,7 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life this.workingDir = workingDir; - service.setWorkingDirectory(workingDir); + this.service.setWorkingDirectory(workingDir); } public void setPort(int port) { @@ -238,7 +238,7 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life } public DefaultDirectoryService getService() { - return service; + return this.service; } public void start() { @@ -246,45 +246,45 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life return; } - if (service.isStarted()) { + if (this.service.isStarted()) { throw new IllegalStateException("DirectoryService is already running."); } - logger.info("Starting directory server..."); + this.logger.info("Starting directory server..."); try { - service.startup(); - server.start(); + this.service.startup(); + this.server.start(); } catch (Exception e) { throw new RuntimeException("Server startup failed", e); } try { - service.getAdminSession().lookup(partition.getSuffixDn()); + this.service.getAdminSession().lookup(this.partition.getSuffixDn()); } catch (LdapNameNotFoundException e) { try { - LdapDN dn = new LdapDN(root); - Assert.isTrue(root.startsWith("dc="), "root must start with dc="); - String dc = root.substring(3, root.indexOf(',')); - ServerEntry entry = service.newEntry(dn); + LdapDN dn = new LdapDN(this.root); + Assert.isTrue(this.root.startsWith("dc="), "root must start with dc="); + String dc = this.root.substring(3, this.root.indexOf(',')); + ServerEntry entry = this.service.newEntry(dn); entry.add("objectClass", "top", "domain", "extensibleObject"); entry.add("dc", dc); - service.getAdminSession().add(entry); + this.service.getAdminSession().add(entry); } catch (Exception e1) { - logger.error("Failed to create dc entry", e1); + this.logger.error("Failed to create dc entry", e1); } } catch (Exception e) { - logger.error("Lookup failed", e); + this.logger.error("Lookup failed", e); } SocketAcceptor socketAcceptor = this.server.getSocketAcceptor(this.transport); InetSocketAddress localAddress = socketAcceptor.getLocalAddress(); this.localPort = localAddress.getPort(); - running = true; + this.running = true; try { importLdifs(); @@ -299,21 +299,21 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life return; } - logger.info("Shutting down directory server ..."); + this.logger.info("Shutting down directory server ..."); try { - server.stop(); - service.shutdown(); + this.server.stop(); + this.service.shutdown(); } catch (Exception e) { - logger.error("Shutdown failed", e); + this.logger.error("Shutdown failed", e); return; } - running = false; + this.running = false; - if (workingDir.exists()) { - logger.info("Deleting working directory " + workingDir.getAbsolutePath()); - deleteDir(workingDir); + if (this.workingDir.exists()) { + this.logger.info("Deleting working directory " + this.workingDir.getAbsolutePath()); + deleteDir(this.workingDir); } } @@ -321,12 +321,12 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life // Import any ldif files Resource[] ldifs; - if (ctxt == null) { + if (this.ctxt == null) { // Not running within an app context - ldifs = new PathMatchingResourcePatternResolver().getResources(ldifResources); + ldifs = new PathMatchingResourcePatternResolver().getResources(this.ldifResources); } else { - ldifs = ctxt.getResources(ldifResources); + ldifs = this.ctxt.getResources(this.ldifResources); } // Note that we can't just import using the ServerContext returned @@ -348,14 +348,14 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life catch (IOException e) { ldifFile = ldifs[0].getURI().toString(); } - logger.info("Loading LDIF file: " + ldifFile); - LdifFileLoader loader = new LdifFileLoader(service.getAdminSession(), new File(ldifFile), null, + this.logger.info("Loading LDIF file: " + ldifFile); + LdifFileLoader loader = new LdifFileLoader(this.service.getAdminSession(), new File(ldifFile), null, getClass().getClassLoader()); loader.execute(); } else { throw new IllegalArgumentException("More than one LDIF resource found with the supplied pattern:" - + ldifResources + " Got " + Arrays.toString(ldifs)); + + this.ldifResources + " Got " + Arrays.toString(ldifs)); } } @@ -391,7 +391,7 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life } public boolean isRunning() { - return running; + return this.running; } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java index f53807f665..6ec5f13606 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java @@ -246,7 +246,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator } for (Map> role : userRoles) { - authorities.add(authorityMapper.apply(role)); + authorities.add(this.authorityMapper.apply(role)); } return authorities; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java index 4f28e05ae5..8aa9e47766 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java @@ -73,96 +73,96 @@ public class InetOrgPerson extends Person { private String uid; public String getUid() { - return uid; + return this.uid; } public String getMail() { - return mail; + return this.mail; } public String getEmployeeNumber() { - return employeeNumber; + return this.employeeNumber; } public String getInitials() { - return initials; + return this.initials; } public String getDestinationIndicator() { - return destinationIndicator; + return this.destinationIndicator; } public String getO() { - return o; + return this.o; } public String getOu() { - return ou; + return this.ou; } public String getTitle() { - return title; + return this.title; } public String getCarLicense() { - return carLicense; + return this.carLicense; } public String getDepartmentNumber() { - return departmentNumber; + return this.departmentNumber; } public String getDisplayName() { - return displayName; + return this.displayName; } public String getHomePhone() { - return homePhone; + return this.homePhone; } public String getRoomNumber() { - return roomNumber; + return this.roomNumber; } public String getHomePostalAddress() { - return homePostalAddress; + return this.homePostalAddress; } public String getMobile() { - return mobile; + return this.mobile; } public String getPostalAddress() { - return postalAddress; + return this.postalAddress; } public String getPostalCode() { - return postalCode; + return this.postalCode; } public String getStreet() { - return street; + return this.street; } protected void populateContext(DirContextAdapter adapter) { super.populateContext(adapter); - adapter.setAttributeValue("carLicense", carLicense); - adapter.setAttributeValue("departmentNumber", departmentNumber); - adapter.setAttributeValue("destinationIndicator", destinationIndicator); - adapter.setAttributeValue("displayName", displayName); - adapter.setAttributeValue("employeeNumber", employeeNumber); - adapter.setAttributeValue("homePhone", homePhone); - adapter.setAttributeValue("homePostalAddress", homePostalAddress); - adapter.setAttributeValue("initials", initials); - adapter.setAttributeValue("mail", mail); - adapter.setAttributeValue("mobile", mobile); - adapter.setAttributeValue("postalAddress", postalAddress); - adapter.setAttributeValue("postalCode", postalCode); - adapter.setAttributeValue("ou", ou); - adapter.setAttributeValue("o", o); - adapter.setAttributeValue("roomNumber", roomNumber); - adapter.setAttributeValue("street", street); - adapter.setAttributeValue("uid", uid); + adapter.setAttributeValue("carLicense", this.carLicense); + adapter.setAttributeValue("departmentNumber", this.departmentNumber); + adapter.setAttributeValue("destinationIndicator", this.destinationIndicator); + adapter.setAttributeValue("displayName", this.displayName); + adapter.setAttributeValue("employeeNumber", this.employeeNumber); + adapter.setAttributeValue("homePhone", this.homePhone); + adapter.setAttributeValue("homePostalAddress", this.homePostalAddress); + adapter.setAttributeValue("initials", this.initials); + adapter.setAttributeValue("mail", this.mail); + adapter.setAttributeValue("mobile", this.mobile); + adapter.setAttributeValue("postalAddress", this.postalAddress); + adapter.setAttributeValue("postalCode", this.postalCode); + adapter.setAttributeValue("ou", this.ou); + adapter.setAttributeValue("o", this.o); + adapter.setAttributeValue("roomNumber", this.roomNumber); + adapter.setAttributeValue("street", this.street); + adapter.setAttributeValue("uid", this.uid); adapter.setAttributeValues("objectclass", new String[] { "top", "person", "organizationalPerson", "inetOrgPerson" }); } @@ -221,79 +221,79 @@ public class InetOrgPerson extends Person { } public void setMail(String email) { - ((InetOrgPerson) instance).mail = email; + ((InetOrgPerson) this.instance).mail = email; } public void setUid(String uid) { - ((InetOrgPerson) instance).uid = uid; + ((InetOrgPerson) this.instance).uid = uid; - if (instance.getUsername() == null) { + if (this.instance.getUsername() == null) { setUsername(uid); } } public void setInitials(String initials) { - ((InetOrgPerson) instance).initials = initials; + ((InetOrgPerson) this.instance).initials = initials; } public void setO(String organization) { - ((InetOrgPerson) instance).o = organization; + ((InetOrgPerson) this.instance).o = organization; } public void setOu(String ou) { - ((InetOrgPerson) instance).ou = ou; + ((InetOrgPerson) this.instance).ou = ou; } public void setRoomNumber(String no) { - ((InetOrgPerson) instance).roomNumber = no; + ((InetOrgPerson) this.instance).roomNumber = no; } public void setTitle(String title) { - ((InetOrgPerson) instance).title = title; + ((InetOrgPerson) this.instance).title = title; } public void setCarLicense(String carLicense) { - ((InetOrgPerson) instance).carLicense = carLicense; + ((InetOrgPerson) this.instance).carLicense = carLicense; } public void setDepartmentNumber(String departmentNumber) { - ((InetOrgPerson) instance).departmentNumber = departmentNumber; + ((InetOrgPerson) this.instance).departmentNumber = departmentNumber; } public void setDisplayName(String displayName) { - ((InetOrgPerson) instance).displayName = displayName; + ((InetOrgPerson) this.instance).displayName = displayName; } public void setEmployeeNumber(String no) { - ((InetOrgPerson) instance).employeeNumber = no; + ((InetOrgPerson) this.instance).employeeNumber = no; } public void setDestinationIndicator(String destination) { - ((InetOrgPerson) instance).destinationIndicator = destination; + ((InetOrgPerson) this.instance).destinationIndicator = destination; } public void setHomePhone(String homePhone) { - ((InetOrgPerson) instance).homePhone = homePhone; + ((InetOrgPerson) this.instance).homePhone = homePhone; } public void setStreet(String street) { - ((InetOrgPerson) instance).street = street; + ((InetOrgPerson) this.instance).street = street; } public void setPostalCode(String postalCode) { - ((InetOrgPerson) instance).postalCode = postalCode; + ((InetOrgPerson) this.instance).postalCode = postalCode; } public void setPostalAddress(String postalAddress) { - ((InetOrgPerson) instance).postalAddress = postalAddress; + ((InetOrgPerson) this.instance).postalAddress = postalAddress; } public void setMobile(String mobile) { - ((InetOrgPerson) instance).mobile = mobile; + ((InetOrgPerson) this.instance).mobile = mobile; } public void setHomePostalAddress(String homePostalAddress) { - ((InetOrgPerson) instance).homePostalAddress = homePostalAddress; + ((InetOrgPerson) this.instance).homePostalAddress = homePostalAddress; } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java index fba5560f2d..98fe382fab 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java @@ -65,7 +65,7 @@ public class LdapAuthority implements GrantedAuthority { * @return the LDAP attributes, map can be null */ public Map> getAttributes() { - return attributes; + return this.attributes; } /** @@ -73,7 +73,7 @@ public class LdapAuthority implements GrantedAuthority { * @return */ public String getDn() { - return dn; + return this.dn; } /** @@ -83,8 +83,8 @@ public class LdapAuthority implements GrantedAuthority { */ public List getAttributeValues(String name) { List result = null; - if (attributes != null) { - result = attributes.get(name); + if (this.attributes != null) { + result = this.attributes.get(name); } if (result == null) { result = Collections.emptyList(); @@ -112,7 +112,7 @@ public class LdapAuthority implements GrantedAuthority { */ @Override public String getAuthority() { - return role; + return this.role; } /** @@ -130,22 +130,22 @@ public class LdapAuthority implements GrantedAuthority { LdapAuthority that = (LdapAuthority) o; - if (!dn.equals(that.dn)) { + if (!this.dn.equals(that.dn)) { return false; } - return role.equals(that.role); + return this.role.equals(that.role); } @Override public int hashCode() { - int result = dn.hashCode(); - result = 31 * result + (role != null ? role.hashCode() : 0); + int result = this.dn.hashCode(); + result = 31 * result + (this.role != null ? this.role.hashCode() : 0); return result; } @Override public String toString() { - return "LdapAuthority{" + "dn='" + dn + '\'' + ", role='" + role + '\'' + '}'; + return "LdapAuthority{" + "dn='" + this.dn + '\'' + ", role='" + this.role + '\'' + '}'; } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java index 812f637d87..8985e401af 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java @@ -77,77 +77,77 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData @Override public Collection getAuthorities() { - return authorities; + return this.authorities; } @Override public String getDn() { - return dn; + return this.dn; } @Override public String getPassword() { - return password; + return this.password; } @Override public String getUsername() { - return username; + return this.username; } @Override public boolean isAccountNonExpired() { - return accountNonExpired; + return this.accountNonExpired; } @Override public boolean isAccountNonLocked() { - return accountNonLocked; + return this.accountNonLocked; } @Override public boolean isCredentialsNonExpired() { - return credentialsNonExpired; + return this.credentialsNonExpired; } @Override public boolean isEnabled() { - return enabled; + return this.enabled; } @Override public void eraseCredentials() { - password = null; + this.password = null; } @Override public int getTimeBeforeExpiration() { - return timeBeforeExpiration; + return this.timeBeforeExpiration; } @Override public int getGraceLoginsRemaining() { - return graceLoginsRemaining; + return this.graceLoginsRemaining; } @Override public boolean equals(Object obj) { if (obj instanceof LdapUserDetailsImpl) { - return dn.equals(((LdapUserDetailsImpl) obj).dn); + return this.dn.equals(((LdapUserDetailsImpl) obj).dn); } return false; } @Override public int hashCode() { - return dn.hashCode(); + return this.dn.hashCode(); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append(super.toString()).append(": "); - sb.append("Dn: ").append(dn).append("; "); + sb.append("Dn: ").append(this.dn).append("; "); sb.append("Username: ").append(this.username).append("; "); sb.append("Password: [PROTECTED]; "); sb.append("Enabled: ").append(this.enabled).append("; "); @@ -214,12 +214,12 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData */ public void addAuthority(GrantedAuthority a) { if (!hasAuthority(a)) { - mutableAuthorities.add(a); + this.mutableAuthorities.add(a); } } private boolean hasAuthority(GrantedAuthority a) { - for (GrantedAuthority authority : mutableAuthorities) { + for (GrantedAuthority authority : this.mutableAuthorities) { if (authority.equals(a)) { return true; } @@ -228,66 +228,66 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData } public LdapUserDetails createUserDetails() { - Assert.notNull(instance, "Essence can only be used to create a single instance"); - Assert.notNull(instance.username, "username must not be null"); - Assert.notNull(instance.getDn(), "Distinguished name must not be null"); + Assert.notNull(this.instance, "Essence can only be used to create a single instance"); + Assert.notNull(this.instance.username, "username must not be null"); + Assert.notNull(this.instance.getDn(), "Distinguished name must not be null"); - instance.authorities = Collections.unmodifiableList(mutableAuthorities); + this.instance.authorities = Collections.unmodifiableList(this.mutableAuthorities); - LdapUserDetails newInstance = instance; + LdapUserDetails newInstance = this.instance; - instance = null; + this.instance = null; return newInstance; } public Collection getGrantedAuthorities() { - return mutableAuthorities; + return this.mutableAuthorities; } public void setAccountNonExpired(boolean accountNonExpired) { - instance.accountNonExpired = accountNonExpired; + this.instance.accountNonExpired = accountNonExpired; } public void setAccountNonLocked(boolean accountNonLocked) { - instance.accountNonLocked = accountNonLocked; + this.instance.accountNonLocked = accountNonLocked; } public void setAuthorities(Collection authorities) { - mutableAuthorities = new ArrayList<>(); - mutableAuthorities.addAll(authorities); + this.mutableAuthorities = new ArrayList<>(); + this.mutableAuthorities.addAll(authorities); } public void setCredentialsNonExpired(boolean credentialsNonExpired) { - instance.credentialsNonExpired = credentialsNonExpired; + this.instance.credentialsNonExpired = credentialsNonExpired; } public void setDn(String dn) { - instance.dn = dn; + this.instance.dn = dn; } public void setDn(Name dn) { - instance.dn = dn.toString(); + this.instance.dn = dn.toString(); } public void setEnabled(boolean enabled) { - instance.enabled = enabled; + this.instance.enabled = enabled; } public void setPassword(String password) { - instance.password = password; + this.instance.password = password; } public void setUsername(String username) { - instance.username = username; + this.instance.username = username; } public void setTimeBeforeExpiration(int timeBeforeExpiration) { - instance.timeBeforeExpiration = timeBeforeExpiration; + this.instance.timeBeforeExpiration = timeBeforeExpiration; } public void setGraceLoginsRemaining(int graceLoginsRemaining) { - instance.graceLoginsRemaining = graceLoginsRemaining; + this.instance.graceLoginsRemaining = graceLoginsRemaining; } } diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java index 45a25cbe9d..e44d8df42d 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java @@ -114,14 +114,14 @@ public class LdapUserDetailsManager implements UserDetailsManager { /** Default context mapper used to create a set of roles from a list of attributes */ private AttributesMapper roleMapper = attributes -> { - Attribute roleAttr = attributes.get(groupRoleAttributeName); + Attribute roleAttr = attributes.get(this.groupRoleAttributeName); NamingEnumeration ne = roleAttr.getAll(); // assert ne.hasMore(); Object group = ne.next(); String role = group.toString(); - return new SimpleGrantedAuthority(rolePrefix + role.toUpperCase()); + return new SimpleGrantedAuthority(this.rolePrefix + role.toUpperCase()); }; private String[] attributesToRetrieve; @@ -129,24 +129,24 @@ public class LdapUserDetailsManager implements UserDetailsManager { private boolean usePasswordModifyExtensionOperation = false; public LdapUserDetailsManager(ContextSource contextSource) { - template = new LdapTemplate(contextSource); + this.template = new LdapTemplate(contextSource); } public UserDetails loadUserByUsername(String username) { - DistinguishedName dn = usernameMapper.buildDn(username); + DistinguishedName dn = this.usernameMapper.buildDn(username); List authorities = getUserAuthorities(dn, username); - logger.debug("Loading user '" + username + "' with DN '" + dn + "'"); + this.logger.debug("Loading user '" + username + "' with DN '" + dn + "'"); DirContextAdapter userCtx = loadUserAsContext(dn, username); - return userDetailsMapper.mapUserFromContext(userCtx, username, authorities); + return this.userDetailsMapper.mapUserFromContext(userCtx, username, authorities); } private DirContextAdapter loadUserAsContext(final DistinguishedName dn, final String username) { - return (DirContextAdapter) template.executeReadOnly((ContextExecutor) ctx -> { + return (DirContextAdapter) this.template.executeReadOnly((ContextExecutor) ctx -> { try { - Attributes attrs = ctx.getAttributes(dn, attributesToRetrieve); + Attributes attrs = ctx.getAttributes(dn, this.attributesToRetrieve); return new DirContextAdapter(attrs, LdapUtils.getFullDn(dn, ctx)); } catch (NameNotFoundException notFound) { @@ -187,11 +187,11 @@ public class LdapUserDetailsManager implements UserDetailsManager { String username = authentication.getName(); - logger.debug("Changing password for user '" + username); + this.logger.debug("Changing password for user '" + username); - DistinguishedName userDn = usernameMapper.buildDn(username); + DistinguishedName userDn = this.usernameMapper.buildDn(username); - if (usePasswordModifyExtensionOperation) { + if (this.usePasswordModifyExtensionOperation) { changePasswordUsingExtensionOperation(userDn, oldPassword, newPassword); } else { @@ -210,25 +210,26 @@ public class LdapUserDetailsManager implements UserDetailsManager { SearchExecutor se = ctx -> { DistinguishedName fullDn = LdapUtils.getFullDn(dn, ctx); SearchControls ctrls = new SearchControls(); - ctrls.setReturningAttributes(new String[] { groupRoleAttributeName }); + ctrls.setReturningAttributes(new String[] { this.groupRoleAttributeName }); - return ctx.search(groupSearchBase, groupSearchFilter, new String[] { fullDn.toUrl(), username }, ctrls); + return ctx.search(this.groupSearchBase, this.groupSearchFilter, new String[] { fullDn.toUrl(), username }, + ctrls); }; - AttributesMapperCallbackHandler roleCollector = new AttributesMapperCallbackHandler(roleMapper); + AttributesMapperCallbackHandler roleCollector = new AttributesMapperCallbackHandler(this.roleMapper); - template.search(se, roleCollector); + this.template.search(se, roleCollector); return roleCollector.getList(); } public void createUser(UserDetails user) { DirContextAdapter ctx = new DirContextAdapter(); copyToContext(user, ctx); - DistinguishedName dn = usernameMapper.buildDn(user.getUsername()); + DistinguishedName dn = this.usernameMapper.buildDn(user.getUsername()); - logger.debug("Creating new user '" + user.getUsername() + "' with DN '" + dn + "'"); + this.logger.debug("Creating new user '" + user.getUsername() + "' with DN '" + dn + "'"); - template.bind(dn, ctx, null); + this.template.bind(dn, ctx, null); // Check for any existing authorities which might be set for this DN and remove // them @@ -242,9 +243,9 @@ public class LdapUserDetailsManager implements UserDetailsManager { } public void updateUser(UserDetails user) { - DistinguishedName dn = usernameMapper.buildDn(user.getUsername()); + DistinguishedName dn = this.usernameMapper.buildDn(user.getUsername()); - logger.debug("Updating user '" + user.getUsername() + "' with DN '" + dn + "'"); + this.logger.debug("Updating user '" + user.getUsername() + "' with DN '" + dn + "'"); List authorities = getUserAuthorities(dn, user.getUsername()); @@ -264,7 +265,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { } } - template.modifyAttributes(dn, mods.toArray(new ModificationItem[0])); + this.template.modifyAttributes(dn, mods.toArray(new ModificationItem[0])); // template.rebind(dn, ctx, null); // Remove the old authorities and replace them with the new one @@ -273,16 +274,16 @@ public class LdapUserDetailsManager implements UserDetailsManager { } public void deleteUser(String username) { - DistinguishedName dn = usernameMapper.buildDn(username); + DistinguishedName dn = this.usernameMapper.buildDn(username); removeAuthorities(dn, getUserAuthorities(dn, username)); - template.unbind(dn); + this.template.unbind(dn); } public boolean userExists(String username) { - DistinguishedName dn = usernameMapper.buildDn(username); + DistinguishedName dn = this.usernameMapper.buildDn(username); try { - Object obj = template.lookup(dn); + Object obj = this.template.lookup(dn); if (obj instanceof Context) { LdapUtils.closeContext((Context) obj); } @@ -299,14 +300,14 @@ public class LdapUserDetailsManager implements UserDetailsManager { * @return the DN of the corresponding group, including the groupSearchBase */ protected DistinguishedName buildGroupDn(String group) { - DistinguishedName dn = new DistinguishedName(groupSearchBase); - dn.add(groupRoleAttributeName, group.toLowerCase()); + DistinguishedName dn = new DistinguishedName(this.groupSearchBase); + dn.add(this.groupRoleAttributeName, group.toLowerCase()); return dn; } protected void copyToContext(UserDetails user, DirContextAdapter ctx) { - userDetailsMapper.mapUserToContext(user, ctx); + this.userDetailsMapper.mapUserToContext(user, ctx); } protected void addAuthorities(DistinguishedName userDn, Collection authorities) { @@ -319,12 +320,12 @@ public class LdapUserDetailsManager implements UserDetailsManager { private void modifyAuthorities(final DistinguishedName userDn, final Collection authorities, final int modType) { - template.executeReadWrite((ContextExecutor) ctx -> { + this.template.executeReadWrite((ContextExecutor) ctx -> { for (GrantedAuthority authority : authorities) { String group = convertAuthorityToGroup(authority); DistinguishedName fullDn = LdapUtils.getFullDn(userDn, ctx); ModificationItem addGroup = new ModificationItem(modType, - new BasicAttribute(groupMemberAttributeName, fullDn.toUrl())); + new BasicAttribute(this.groupMemberAttributeName, fullDn.toUrl())); ctx.modifyAttributes(buildGroupDn(group), new ModificationItem[] { addGroup }); } @@ -335,8 +336,8 @@ public class LdapUserDetailsManager implements UserDetailsManager { private String convertAuthorityToGroup(GrantedAuthority authority) { String group = authority.getAuthority(); - if (group.startsWith(rolePrefix)) { - group = group.substring(rolePrefix.length()); + if (group.startsWith(this.rolePrefix)) { + group = group.substring(this.rolePrefix.length()); } return group; @@ -413,14 +414,14 @@ public class LdapUserDetailsManager implements UserDetailsManager { String newPassword) { final ModificationItem[] passwordChange = new ModificationItem[] { new ModificationItem( - DirContext.REPLACE_ATTRIBUTE, new BasicAttribute(passwordAttributeName, newPassword)) }; + DirContext.REPLACE_ATTRIBUTE, new BasicAttribute(this.passwordAttributeName, newPassword)) }; if (oldPassword == null) { - template.modifyAttributes(userDn, passwordChange); + this.template.modifyAttributes(userDn, passwordChange); return; } - template.executeReadWrite(dirCtx -> { + this.template.executeReadWrite(dirCtx -> { LdapContext ctx = (LdapContext) dirCtx; ctx.removeFromEnvironment("com.sun.jndi.ldap.connect.pool"); ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, LdapUtils.getFullDn(userDn, ctx).toString()); @@ -443,7 +444,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { private void changePasswordUsingExtensionOperation(DistinguishedName userDn, String oldPassword, String newPassword) { - template.executeReadWrite(dirCtx -> { + this.template.executeReadWrite(dirCtx -> { LdapContext ctx = (LdapContext) dirCtx; String userIdentity = LdapUtils.getFullDn(userDn, ctx).encode(); diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java index a02f714b94..d40111cbf9 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java @@ -54,10 +54,10 @@ public class LdapUserDetailsService implements UserDetailsService { } public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - DirContextOperations userData = userSearch.searchForUser(username); + DirContextOperations userData = this.userSearch.searchForUser(username); - return userDetailsMapper.mapUserFromContext(userData, username, - authoritiesPopulator.getGrantedAuthorities(userData, username)); + return this.userDetailsMapper.mapUserFromContext(userData, username, + this.authoritiesPopulator.getGrantedAuthorities(userData, username)); } public void setUserDetailsMapper(UserDetailsContextMapper userDetailsMapper) { diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java index 36b5d6fef2..4237757c60 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java @@ -50,28 +50,28 @@ public class Person extends LdapUserDetailsImpl { } public String getGivenName() { - return givenName; + return this.givenName; } public String getSn() { - return sn; + return this.sn; } public String[] getCn() { - return cn.toArray(new String[0]); + return this.cn.toArray(new String[0]); } public String getDescription() { - return description; + return this.description; } public String getTelephoneNumber() { - return telephoneNumber; + return this.telephoneNumber; } protected void populateContext(DirContextAdapter adapter) { - adapter.setAttributeValue("givenName", givenName); - adapter.setAttributeValue("sn", sn); + adapter.setAttributeValue("givenName", this.givenName); + adapter.setAttributeValue("sn", this.sn); adapter.setAttributeValues("cn", getCn()); adapter.setAttributeValue("description", getDescription()); adapter.setAttributeValue("telephoneNumber", getTelephoneNumber()); @@ -108,7 +108,7 @@ public class Person extends LdapUserDetailsImpl { setSn(copyMe.sn); setDescription(copyMe.getDescription()); setTelephoneNumber(copyMe.getTelephoneNumber()); - ((Person) instance).cn = new ArrayList<>(copyMe.cn); + ((Person) this.instance).cn = new ArrayList<>(copyMe.cn); } protected LdapUserDetailsImpl createTarget() { @@ -116,27 +116,27 @@ public class Person extends LdapUserDetailsImpl { } public void setGivenName(String givenName) { - ((Person) instance).givenName = givenName; + ((Person) this.instance).givenName = givenName; } public void setSn(String sn) { - ((Person) instance).sn = sn; + ((Person) this.instance).sn = sn; } public void setCn(String[] cn) { - ((Person) instance).cn = Arrays.asList(cn); + ((Person) this.instance).cn = Arrays.asList(cn); } public void addCn(String value) { - ((Person) instance).cn.add(value); + ((Person) this.instance).cn.add(value); } public void setTelephoneNumber(String tel) { - ((Person) instance).telephoneNumber = tel; + ((Person) this.instance).telephoneNumber = tel; } public void setDescription(String desc) { - ((Person) instance).description = desc; + ((Person) this.instance).description = desc; } public LdapUserDetails createUserDetails() { diff --git a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java index 06f9bd79e7..069a4561db 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java @@ -60,15 +60,16 @@ public class SpringSecurityLdapTemplateTests { Object[] params = new Object[] {}; DirContextAdapter searchResultObject = mock(DirContextAdapter.class); - when(ctx.search(any(DistinguishedName.class), eq(filter), eq(params), searchControls.capture())) - .thenReturn(resultsEnum); - when(resultsEnum.hasMore()).thenReturn(true, false); - when(resultsEnum.next()).thenReturn(searchResult); - when(searchResult.getObject()).thenReturn(searchResultObject); + when(this.ctx.search(any(DistinguishedName.class), eq(filter), eq(params), this.searchControls.capture())) + .thenReturn(this.resultsEnum); + when(this.resultsEnum.hasMore()).thenReturn(true, false); + when(this.resultsEnum.next()).thenReturn(this.searchResult); + when(this.searchResult.getObject()).thenReturn(searchResultObject); - SpringSecurityLdapTemplate.searchForSingleEntryInternal(ctx, mock(SearchControls.class), base, filter, params); + SpringSecurityLdapTemplate.searchForSingleEntryInternal(this.ctx, mock(SearchControls.class), base, filter, + params); - assertThat(searchControls.getValue().getReturningObjFlag()).isTrue(); + assertThat(this.searchControls.getValue().getReturningObjFlag()).isTrue(); } } diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java index 0518c1ba00..7bf18ee4e2 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java @@ -212,7 +212,7 @@ public class LdapAuthenticationProviderTests { } String getRequestedUsername() { - return username; + return this.username; } } diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java index 8a147d39de..3e4cd05135 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java @@ -34,7 +34,7 @@ public class MockUserSearch implements LdapUserSearch { } public DirContextOperations searchForUser(String username) { - return user; + return this.user; } } diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java index 539256359b..de9defc321 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java @@ -79,18 +79,18 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { @Before public void setUp() { - provider = new ActiveDirectoryLdapAuthenticationProvider("mydomain.eu", "ldap://192.168.1.200/"); + this.provider = new ActiveDirectoryLdapAuthenticationProvider("mydomain.eu", "ldap://192.168.1.200/"); } @Test public void bindPrincipalIsCreatedCorrectly() { - assertThat(provider.createBindPrincipal("joe")).isEqualTo("joe@mydomain.eu"); - assertThat(provider.createBindPrincipal("joe@mydomain.eu")).isEqualTo("joe@mydomain.eu"); + assertThat(this.provider.createBindPrincipal("joe")).isEqualTo("joe@mydomain.eu"); + assertThat(this.provider.createBindPrincipal("joe@mydomain.eu")).isEqualTo("joe@mydomain.eu"); } @Test public void successfulAuthenticationProducesExpectedAuthorities() throws Exception { - checkAuthentication("dc=mydomain,dc=eu", provider); + checkAuthentication("dc=mydomain,dc=eu", this.provider); } // SEC-1915 @@ -113,7 +113,7 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { // when customProvider.setSearchFilter(customSearchFilter); - Authentication result = customProvider.authenticate(joe); + Authentication result = customProvider.authenticate(this.joe); // then assertThat(result.isAuthenticated()).isTrue(); @@ -137,7 +137,7 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { customProvider.contextFactory = createContextFactoryReturning(ctx); // when - Authentication result = customProvider.authenticate(joe); + Authentication result = customProvider.authenticate(this.joe); // then assertThat(result.isAuthenticated()).isTrue(); @@ -165,7 +165,7 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { customProvider.contextFactory = createContextFactoryReturning(ctx); // when - Authentication result = customProvider.authenticate(joe); + Authentication result = customProvider.authenticate(this.joe); // then assertThat(captor.getValue()).containsExactly("joe@mydomain.eu", "joe"); @@ -174,17 +174,17 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { @Test(expected = IllegalArgumentException.class) public void setSearchFilterNull() { - provider.setSearchFilter(null); + this.provider.setSearchFilter(null); } @Test(expected = IllegalArgumentException.class) public void setSearchFilterEmpty() { - provider.setSearchFilter(" "); + this.provider.setSearchFilter(" "); } @Test public void nullDomainIsSupportedIfAuthenticatingWithFullUserPrincipal() throws Exception { - provider = new ActiveDirectoryLdapAuthenticationProvider(null, "ldap://192.168.1.200/"); + this.provider = new ActiveDirectoryLdapAuthenticationProvider(null, "ldap://192.168.1.200/"); DirContext ctx = mock(DirContext.class); when(ctx.getNameInNamespace()).thenReturn(""); @@ -192,16 +192,16 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes()); when(ctx.search(eq(new DistinguishedName("DC=mydomain,DC=eu")), any(String.class), any(Object[].class), any(SearchControls.class))).thenReturn(new MockNamingEnumeration(sr)); - provider.contextFactory = createContextFactoryReturning(ctx); + this.provider.contextFactory = createContextFactoryReturning(ctx); try { - provider.authenticate(joe); + this.provider.authenticate(this.joe); fail("Expected BadCredentialsException for user with no domain information"); } catch (BadCredentialsException expected) { } - provider.authenticate(new UsernamePasswordAuthenticationToken("joe@mydomain.eu", "password")); + this.provider.authenticate(new UsernamePasswordAuthenticationToken("joe@mydomain.eu", "password")); } @Test(expected = BadCredentialsException.class) @@ -211,9 +211,9 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { when(ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class))) .thenThrow(new NameNotFoundException()); - provider.contextFactory = createContextFactoryReturning(ctx); + this.provider.contextFactory = createContextFactoryReturning(ctx); - provider.authenticate(joe); + this.provider.authenticate(this.joe); } // SEC-2017 @@ -224,15 +224,15 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { when(ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class))) .thenReturn(new EmptyEnumeration<>()); - provider.contextFactory = createContextFactoryReturning(ctx); + this.provider.contextFactory = createContextFactoryReturning(ctx); - provider.authenticate(joe); + this.provider.authenticate(this.joe); } // SEC-2500 @Test(expected = BadCredentialsException.class) public void sec2500PreventAnonymousBind() { - provider.authenticate(new UsernamePasswordAuthenticationToken("rwinch", "")); + this.provider.authenticate(new UsernamePasswordAuthenticationToken("rwinch", "")); } @SuppressWarnings("unchecked") @@ -248,42 +248,43 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { when(ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class))) .thenReturn(searchResults); - provider.contextFactory = createContextFactoryReturning(ctx); + this.provider.contextFactory = createContextFactoryReturning(ctx); - provider.authenticate(joe); + this.provider.authenticate(this.joe); } static final String msg = "[LDAP: error code 49 - 80858585: LdapErr: DSID-DECAFF0, comment: AcceptSecurityContext error, data "; @Test(expected = BadCredentialsException.class) public void userNotFoundIsCorrectlyMapped() { - provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "525, xxxx]")); - provider.setConvertSubErrorCodesToExceptions(true); - provider.authenticate(joe); + this.provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "525, xxxx]")); + this.provider.setConvertSubErrorCodesToExceptions(true); + this.provider.authenticate(this.joe); } @Test(expected = BadCredentialsException.class) public void incorrectPasswordIsCorrectlyMapped() { - provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "52e, xxxx]")); - provider.setConvertSubErrorCodesToExceptions(true); - provider.authenticate(joe); + this.provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "52e, xxxx]")); + this.provider.setConvertSubErrorCodesToExceptions(true); + this.provider.authenticate(this.joe); } @Test(expected = BadCredentialsException.class) public void notPermittedIsCorrectlyMapped() { - provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "530, xxxx]")); - provider.setConvertSubErrorCodesToExceptions(true); - provider.authenticate(joe); + this.provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "530, xxxx]")); + this.provider.setConvertSubErrorCodesToExceptions(true); + this.provider.authenticate(this.joe); } @Test public void passwordNeedsResetIsCorrectlyMapped() { final String dataCode = "773"; - provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + dataCode + ", xxxx]")); - provider.setConvertSubErrorCodesToExceptions(true); + this.provider.contextFactory = createContextFactoryThrowing( + new AuthenticationException(msg + dataCode + ", xxxx]")); + this.provider.setConvertSubErrorCodesToExceptions(true); - thrown.expect(BadCredentialsException.class); - thrown.expect(new BaseMatcher() { + this.thrown.expect(BadCredentialsException.class); + this.thrown.expect(new BaseMatcher() { private Matcher causeInstance = CoreMatchers .instanceOf(ActiveDirectoryAuthenticationException.class); @@ -292,75 +293,75 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { public boolean matches(Object that) { Throwable t = (Throwable) that; ActiveDirectoryAuthenticationException cause = (ActiveDirectoryAuthenticationException) t.getCause(); - return causeInstance.matches(cause) && causeDataCode.matches(cause.getDataCode()); + return this.causeInstance.matches(cause) && this.causeDataCode.matches(cause.getDataCode()); } public void describeTo(Description desc) { desc.appendText("getCause() "); - causeInstance.describeTo(desc); + this.causeInstance.describeTo(desc); desc.appendText("getCause().getDataCode() "); - causeDataCode.describeTo(desc); + this.causeDataCode.describeTo(desc); } }); - provider.authenticate(joe); + this.provider.authenticate(this.joe); } @Test(expected = CredentialsExpiredException.class) public void expiredPasswordIsCorrectlyMapped() { - provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "532, xxxx]")); + this.provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "532, xxxx]")); try { - provider.authenticate(joe); + this.provider.authenticate(this.joe); fail("BadCredentialsException should had been thrown"); } catch (BadCredentialsException expected) { } - provider.setConvertSubErrorCodesToExceptions(true); - provider.authenticate(joe); + this.provider.setConvertSubErrorCodesToExceptions(true); + this.provider.authenticate(this.joe); } @Test(expected = DisabledException.class) public void accountDisabledIsCorrectlyMapped() { - provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "533, xxxx]")); - provider.setConvertSubErrorCodesToExceptions(true); - provider.authenticate(joe); + this.provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "533, xxxx]")); + this.provider.setConvertSubErrorCodesToExceptions(true); + this.provider.authenticate(this.joe); } @Test(expected = AccountExpiredException.class) public void accountExpiredIsCorrectlyMapped() { - provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "701, xxxx]")); - provider.setConvertSubErrorCodesToExceptions(true); - provider.authenticate(joe); + this.provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "701, xxxx]")); + this.provider.setConvertSubErrorCodesToExceptions(true); + this.provider.authenticate(this.joe); } @Test(expected = LockedException.class) public void accountLockedIsCorrectlyMapped() { - provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "775, xxxx]")); - provider.setConvertSubErrorCodesToExceptions(true); - provider.authenticate(joe); + this.provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "775, xxxx]")); + this.provider.setConvertSubErrorCodesToExceptions(true); + this.provider.authenticate(this.joe); } @Test(expected = BadCredentialsException.class) public void unknownErrorCodeIsCorrectlyMapped() { - provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "999, xxxx]")); - provider.setConvertSubErrorCodesToExceptions(true); - provider.authenticate(joe); + this.provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "999, xxxx]")); + this.provider.setConvertSubErrorCodesToExceptions(true); + this.provider.authenticate(this.joe); } @Test(expected = BadCredentialsException.class) public void errorWithNoSubcodeIsHandledCleanly() { - provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg)); - provider.setConvertSubErrorCodesToExceptions(true); - provider.authenticate(joe); + this.provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg)); + this.provider.setConvertSubErrorCodesToExceptions(true); + this.provider.authenticate(this.joe); } @Test(expected = org.springframework.ldap.CommunicationException.class) public void nonAuthenticationExceptionIsConvertedToSpringLdapException() throws Throwable { try { - provider.contextFactory = createContextFactoryThrowing(new CommunicationException(msg)); - provider.authenticate(joe); + this.provider.contextFactory = createContextFactoryThrowing(new CommunicationException(msg)); + this.provider.authenticate(this.joe); } catch (InternalAuthenticationServiceException e) { // Since GH-8418 ldap communication exception is wrapped into @@ -376,7 +377,7 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { "mydomain.eu", NON_EXISTING_LDAP_PROVIDER, "dc=ad,dc=eu,dc=mydomain"); noneReachableProvider .setContextEnvironmentProperties(Collections.singletonMap("com.sun.jndi.ldap.connect.timeout", "5")); - noneReachableProvider.doAuthentication(joe); + noneReachableProvider.doAuthentication(this.joe); } @Test @@ -389,12 +390,12 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { @Test(expected = IllegalArgumentException.class) public void setContextEnvironmentPropertiesNull() { - provider.setContextEnvironmentProperties(null); + this.provider.setContextEnvironmentProperties(null); } @Test(expected = IllegalArgumentException.class) public void setContextEnvironmentPropertiesEmpty() { - provider.setContextEnvironmentProperties(new Hashtable<>()); + this.provider.setContextEnvironmentProperties(new Hashtable<>()); } @Test @@ -402,10 +403,10 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { Hashtable env = new Hashtable<>(); env.put("java.naming.ldap.factory.socket", "unknown.package.NonExistingSocketFactory"); - provider.setContextEnvironmentProperties(env); + this.provider.setContextEnvironmentProperties(env); try { - provider.authenticate(joe); + this.provider.authenticate(this.joe); fail("CommunicationException was expected with a root cause of ClassNotFoundException"); } catch (InternalAuthenticationServiceException expected) { @@ -448,13 +449,13 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { provider.contextFactory = createContextFactoryReturning(ctx); - Authentication result = provider.authenticate(joe); + Authentication result = provider.authenticate(this.joe); assertThat(result.getAuthorities()).isEmpty(); dca.addAttributeValue("memberOf", "CN=Admin,CN=Users,DC=mydomain,DC=eu"); - result = provider.authenticate(joe); + result = provider.authenticate(this.joe); assertThat(result.getAuthorities()).hasSize(1); } @@ -468,13 +469,13 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { } public SearchResult next() { - SearchResult result = sr; - sr = null; + SearchResult result = this.sr; + this.sr = null; return result; } public boolean hasMore() { - return sr != null; + return this.sr != null; } public void close() { diff --git a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java index f9e2f8ab3e..d215282ad5 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java @@ -46,42 +46,42 @@ public class PasswordPolicyAwareContextSourceTests { @Before public void setUp() { - reset(ctx); - ctxSource = new PasswordPolicyAwareContextSource("ldap://blah:789/dc=springframework,dc=org") { + reset(this.ctx); + this.ctxSource = new PasswordPolicyAwareContextSource("ldap://blah:789/dc=springframework,dc=org") { @Override protected DirContext createContext(Hashtable env) { if ("manager".equals(env.get(Context.SECURITY_PRINCIPAL))) { - return ctx; + return PasswordPolicyAwareContextSourceTests.this.ctx; } return null; } }; - ctxSource.setUserDn("manager"); - ctxSource.setPassword("password"); - ctxSource.afterPropertiesSet(); + this.ctxSource.setUserDn("manager"); + this.ctxSource.setPassword("password"); + this.ctxSource.afterPropertiesSet(); } @Test public void contextIsReturnedWhenNoControlsAreSetAndReconnectIsSuccessful() { - assertThat(ctxSource.getContext("user", "ignored")).isNotNull(); + assertThat(this.ctxSource.getContext("user", "ignored")).isNotNull(); } @Test(expected = UncategorizedLdapException.class) public void standardExceptionIsPropagatedWhenExceptionRaisedAndNoControlsAreSet() throws Exception { - doThrow(new NamingException("some LDAP exception")).when(ctx).reconnect(any(Control[].class)); + doThrow(new NamingException("some LDAP exception")).when(this.ctx).reconnect(any(Control[].class)); - ctxSource.getContext("user", "ignored"); + this.ctxSource.getContext("user", "ignored"); } @Test(expected = PasswordPolicyException.class) public void lockedPasswordPolicyControlRaisesPasswordPolicyException() throws Exception { - when(ctx.getResponseControls()).thenReturn(new Control[] { + when(this.ctx.getResponseControls()).thenReturn(new Control[] { new PasswordPolicyResponseControl(PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL) }); - doThrow(new NamingException("locked message")).when(ctx).reconnect(any(Control[].class)); + doThrow(new NamingException("locked message")).when(this.ctx).reconnect(any(Control[].class)); - ctxSource.getContext("user", "ignored"); + this.ctxSource.getContext("user", "ignored"); } } diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java index b8a597ddbc..60a6779fba 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java @@ -41,31 +41,31 @@ public class LdapAuthorityTests { Map> attributes = new HashMap<>(); attributes.put(SpringSecurityLdapTemplate.DN_KEY, Arrays.asList(DN)); attributes.put("mail", Arrays.asList("filip@ldap.test.org", "filip@ldap.test2.org")); - authority = new LdapAuthority("testRole", DN, attributes); + this.authority = new LdapAuthority("testRole", DN, attributes); } @Test public void testGetDn() { - assertThat(authority.getDn()).isEqualTo(DN); - assertThat(authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY)).isNotNull(); - assertThat(authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY)).hasSize(1); - assertThat(authority.getFirstAttributeValue(SpringSecurityLdapTemplate.DN_KEY)).isEqualTo(DN); + assertThat(this.authority.getDn()).isEqualTo(DN); + assertThat(this.authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY)).isNotNull(); + assertThat(this.authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY)).hasSize(1); + assertThat(this.authority.getFirstAttributeValue(SpringSecurityLdapTemplate.DN_KEY)).isEqualTo(DN); } @Test public void testGetAttributes() { - assertThat(authority.getAttributes()).isNotNull(); - assertThat(authority.getAttributeValues("mail")).isNotNull(); - assertThat(authority.getAttributeValues("mail")).hasSize(2); - assertThat(authority.getFirstAttributeValue("mail")).isEqualTo("filip@ldap.test.org"); - assertThat(authority.getAttributeValues("mail").get(0)).isEqualTo("filip@ldap.test.org"); - assertThat(authority.getAttributeValues("mail").get(1)).isEqualTo("filip@ldap.test2.org"); + assertThat(this.authority.getAttributes()).isNotNull(); + assertThat(this.authority.getAttributeValues("mail")).isNotNull(); + assertThat(this.authority.getAttributeValues("mail")).hasSize(2); + assertThat(this.authority.getFirstAttributeValue("mail")).isEqualTo("filip@ldap.test.org"); + assertThat(this.authority.getAttributeValues("mail").get(0)).isEqualTo("filip@ldap.test.org"); + assertThat(this.authority.getAttributeValues("mail").get(1)).isEqualTo("filip@ldap.test2.org"); } @Test public void testGetAuthority() { - assertThat(authority.getAuthority()).isNotNull(); - assertThat(authority.getAuthority()).isEqualTo("testRole"); + assertThat(this.authority.getAuthority()).isNotNull(); + assertThat(this.authority.getAuthority()).isEqualTo("testRole"); } } diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandler.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandler.java index fd01c9d3f1..c896eb3955 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandler.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandler.java @@ -41,7 +41,7 @@ public class DefaultMessageSecurityExpressionHandler extends AbstractSecurity Message invocation) { MessageSecurityExpressionRoot root = new MessageSecurityExpressionRoot(authentication, invocation); root.setPermissionEvaluator(getPermissionEvaluator()); - root.setTrustResolver(trustResolver); + root.setTrustResolver(this.trustResolver); root.setRoleHierarchy(getRoleHierarchy()); return root; } diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java index 17aac56cf4..66bbd3e237 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java @@ -52,7 +52,7 @@ class MessageExpressionConfigAttribute implements ConfigAttribute, EvaluationCon } Expression getAuthorizeExpression() { - return authorizeExpression; + return this.authorizeExpression; } public String getAttribute() { @@ -61,13 +61,13 @@ class MessageExpressionConfigAttribute implements ConfigAttribute, EvaluationCon @Override public String toString() { - return authorizeExpression.getExpressionString(); + return this.authorizeExpression.getExpressionString(); } @Override public EvaluationContext postProcess(EvaluationContext ctx, Message message) { - if (matcher instanceof SimpDestinationMessageMatcher) { - final Map variables = ((SimpDestinationMessageMatcher) matcher) + if (this.matcher instanceof SimpDestinationMessageMatcher) { + final Map variables = ((SimpDestinationMessageMatcher) this.matcher) .extractPathVariables(message); for (Map.Entry entry : variables.entrySet()) { ctx.setVariable(entry.getKey(), entry.getValue()); diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java index f859e4a7da..dc517a42bb 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java @@ -52,7 +52,7 @@ public class MessageExpressionVoter implements AccessDecisionVoter return ACCESS_ABSTAIN; } - EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication, message); + EvaluationContext ctx = this.expressionHandler.createEvaluationContext(authentication, message); ctx = attr.postProcess(ctx, message); return ExpressionUtils.evaluateAsBoolean(attr.getAuthorizeExpression(), ctx) ? ACCESS_GRANTED : ACCESS_DENIED; diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java index 5f52ff39c1..6f3c9871a9 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java @@ -61,7 +61,7 @@ public final class ChannelSecurityInterceptor extends AbstractSecurityIntercepto @Override public SecurityMetadataSource obtainSecurityMetadataSource() { - return metadataSource; + return this.metadataSource; } public Message preSend(Message message, MessageChannel channel) { diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java index 96fbaefa71..98228e56e9 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java @@ -52,7 +52,7 @@ public final class DefaultMessageSecurityMetadataSource implements MessageSecuri @SuppressWarnings({ "rawtypes", "unchecked" }) public Collection getAttributes(Object object) throws IllegalArgumentException { final Message message = (Message) object; - for (Map.Entry, Collection> entry : messageMap.entrySet()) { + for (Map.Entry, Collection> entry : this.messageMap.entrySet()) { if (entry.getKey().matches(message)) { return entry.getValue(); } @@ -63,7 +63,7 @@ public final class DefaultMessageSecurityMetadataSource implements MessageSecuri public Collection getAllConfigAttributes() { Set allAttributes = new HashSet<>(); - for (Collection entry : messageMap.values()) { + for (Collection entry : this.messageMap.values()) { allAttributes.addAll(entry); } diff --git a/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java index 5549189cfd..ab9ea4c9eb 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java +++ b/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java @@ -115,7 +115,7 @@ public final class SecurityContextChannelInterceptor extends ChannelInterceptorA } contextStack.push(currentContext); - Object user = message.getHeaders().get(authenticationHeaderName); + Object user = message.getHeaders().get(this.authenticationHeaderName); Authentication authentication; if ((user instanceof Authentication)) { @@ -141,7 +141,7 @@ public final class SecurityContextChannelInterceptor extends ChannelInterceptorA SecurityContext originalContext = contextStack.pop(); try { - if (EMPTY_CONTEXT.equals(originalContext)) { + if (this.EMPTY_CONTEXT.equals(originalContext)) { SecurityContextHolder.clearContext(); ORIGINAL_CONTEXT.remove(); } diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java index 0a8b7b3aa6..6bb2b627e8 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java @@ -57,12 +57,12 @@ abstract class AbstractMessageMatcherComposite implements MessageMatcher { } public List> getMessageMatchers() { - return messageMatchers; + return this.messageMatchers; } @Override public String toString() { - return getClass().getSimpleName() + "[messageMatchers=" + messageMatchers + "]"; + return getClass().getSimpleName() + "[messageMatchers=" + this.messageMatchers + "]"; } } diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java index 9210f59347..164d799ecf 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java @@ -47,15 +47,15 @@ public final class AndMessageMatcher extends AbstractMessageMatcherComposite< public boolean matches(Message message) { for (MessageMatcher matcher : getMessageMatchers()) { - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Trying to match using " + matcher); + if (this.LOGGER.isDebugEnabled()) { + this.LOGGER.debug("Trying to match using " + matcher); } if (!matcher.matches(message)) { - LOGGER.debug("Did not match"); + this.LOGGER.debug("Did not match"); return false; } } - LOGGER.debug("All messageMatchers returned true"); + this.LOGGER.debug("All messageMatchers returned true"); return true; } diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java index 90db0be394..b7f2a6ace9 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java @@ -47,15 +47,15 @@ public final class OrMessageMatcher extends AbstractMessageMatcherComposite message) { for (MessageMatcher matcher : getMessageMatchers()) { - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Trying to match using " + matcher); + if (this.LOGGER.isDebugEnabled()) { + this.LOGGER.debug("Trying to match using " + matcher); } if (matcher.matches(message)) { - LOGGER.debug("matched"); + this.LOGGER.debug("matched"); return true; } } - LOGGER.debug("No matches found"); + this.LOGGER.debug("No matches found"); return false; } diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java index c9b2513bbc..fe24d4a766 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java @@ -117,27 +117,28 @@ public final class SimpDestinationMessageMatcher implements MessageMatcher message) { - if (!messageTypeMatcher.matches(message)) { + if (!this.messageTypeMatcher.matches(message)) { return false; } String destination = SimpMessageHeaderAccessor.getDestination(message.getHeaders()); - return destination != null && matcher.match(pattern, destination); + return destination != null && this.matcher.match(this.pattern, destination); } public Map extractPathVariables(Message message) { final String destination = SimpMessageHeaderAccessor.getDestination(message.getHeaders()); - return destination != null ? matcher.extractUriTemplateVariables(pattern, destination) : Collections.emptyMap(); + return destination != null ? this.matcher.extractUriTemplateVariables(this.pattern, destination) + : Collections.emptyMap(); } public MessageMatcher getMessageTypeMatcher() { - return messageTypeMatcher; + return this.messageTypeMatcher; } @Override public String toString() { - return "SimpDestinationMessageMatcher [matcher=" + matcher + ", messageTypeMatcher=" + messageTypeMatcher - + ", pattern=" + pattern + "]"; + return "SimpDestinationMessageMatcher [matcher=" + this.matcher + ", messageTypeMatcher=" + + this.messageTypeMatcher + ", pattern=" + this.pattern + "]"; } private boolean isTypeWithDestination(SimpMessageType type) { diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java index b441723ddc..b70e91395f 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java @@ -49,7 +49,7 @@ public class SimpMessageTypeMatcher implements MessageMatcher { MessageHeaders headers = message.getHeaders(); SimpMessageType messageType = SimpMessageHeaderAccessor.getMessageType(headers); - return typeToMatch == messageType; + return this.typeToMatch == messageType; } @Override @@ -73,7 +73,7 @@ public class SimpMessageTypeMatcher implements MessageMatcher { @Override public String toString() { - return "SimpMessageTypeMatcher [typeToMatch=" + typeToMatch + "]"; + return "SimpMessageTypeMatcher [typeToMatch=" + this.typeToMatch + "]"; } } diff --git a/messaging/src/main/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptor.java index 0e1a4623b2..ead278e4d7 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptor.java +++ b/messaging/src/main/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptor.java @@ -42,7 +42,7 @@ public final class CsrfChannelInterceptor extends ChannelInterceptorAdapter { @Override public Message preSend(Message message, MessageChannel channel) { - if (!matcher.matches(message)) { + if (!this.matcher.matches(message)) { return message; } diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java index 9b63807aa4..6501d44e9a 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java @@ -54,55 +54,55 @@ public class DefaultMessageSecurityExpressionHandlerTests { @Before public void setup() { - handler = new DefaultMessageSecurityExpressionHandler<>(); + this.handler = new DefaultMessageSecurityExpressionHandler<>(); - message = new GenericMessage<>(""); - authentication = new AnonymousAuthenticationToken("key", "anonymous", + this.message = new GenericMessage<>(""); + this.authentication = new AnonymousAuthenticationToken("key", "anonymous", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS")); } // SEC-2705 @Test public void trustResolverPopulated() { - EvaluationContext context = handler.createEvaluationContext(authentication, message); - Expression expression = handler.getExpressionParser().parseExpression("authenticated"); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.message); + Expression expression = this.handler.getExpressionParser().parseExpression("authenticated"); assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isFalse(); } @Test(expected = IllegalArgumentException.class) public void trustResolverNull() { - handler.setTrustResolver(null); + this.handler.setTrustResolver(null); } @Test public void trustResolverCustom() { - handler.setTrustResolver(trustResolver); - EvaluationContext context = handler.createEvaluationContext(authentication, message); - Expression expression = handler.getExpressionParser().parseExpression("authenticated"); - when(trustResolver.isAnonymous(authentication)).thenReturn(false); + this.handler.setTrustResolver(this.trustResolver); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.message); + Expression expression = this.handler.getExpressionParser().parseExpression("authenticated"); + when(this.trustResolver.isAnonymous(this.authentication)).thenReturn(false); assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue(); } @Test public void roleHierarchy() { - authentication = new TestingAuthenticationToken("admin", "pass", "ROLE_ADMIN"); + this.authentication = new TestingAuthenticationToken("admin", "pass", "ROLE_ADMIN"); RoleHierarchyImpl roleHierarchy = new RoleHierarchyImpl(); roleHierarchy.setHierarchy("ROLE_ADMIN > ROLE_USER"); - handler.setRoleHierarchy(roleHierarchy); - EvaluationContext context = handler.createEvaluationContext(authentication, message); - Expression expression = handler.getExpressionParser().parseExpression("hasRole('ROLE_USER')"); + this.handler.setRoleHierarchy(roleHierarchy); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.message); + Expression expression = this.handler.getExpressionParser().parseExpression("hasRole('ROLE_USER')"); assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue(); } @Test public void permissionEvaluator() { - handler.setPermissionEvaluator(permissionEvaluator); - EvaluationContext context = handler.createEvaluationContext(authentication, message); - Expression expression = handler.getExpressionParser().parseExpression("hasPermission(message, 'read')"); - when(permissionEvaluator.hasPermission(authentication, message, "read")).thenReturn(true); + this.handler.setPermissionEvaluator(this.permissionEvaluator); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.message); + Expression expression = this.handler.getExpressionParser().parseExpression("hasPermission(message, 'read')"); + when(this.permissionEvaluator.hasPermission(this.authentication, this.message, "read")).thenReturn(true); assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue(); } diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java index 0b8c1a7fd9..12b93ce5e3 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java @@ -61,47 +61,47 @@ public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests { @Before public void setup() { - expression1 = "permitAll"; - expression2 = "denyAll"; - matcherToExpression = new LinkedHashMap<>(); - matcherToExpression.put(matcher1, expression1); - matcherToExpression.put(matcher2, expression2); + this.expression1 = "permitAll"; + this.expression2 = "denyAll"; + this.matcherToExpression = new LinkedHashMap<>(); + this.matcherToExpression.put(this.matcher1, this.expression1); + this.matcherToExpression.put(this.matcher2, this.expression2); - source = createExpressionMessageMetadataSource(matcherToExpression); - rootObject = new MessageSecurityExpressionRoot(authentication, message); + this.source = createExpressionMessageMetadataSource(this.matcherToExpression); + this.rootObject = new MessageSecurityExpressionRoot(this.authentication, this.message); } @Test public void createExpressionMessageMetadataSourceNoMatch() { - Collection attrs = source.getAttributes(message); + Collection attrs = this.source.getAttributes(this.message); assertThat(attrs).isNull(); } @Test public void createExpressionMessageMetadataSourceMatchFirst() { - when(matcher1.matches(message)).thenReturn(true); + when(this.matcher1.matches(this.message)).thenReturn(true); - Collection attrs = source.getAttributes(message); + Collection attrs = this.source.getAttributes(this.message); assertThat(attrs).hasSize(1); ConfigAttribute attr = attrs.iterator().next(); assertThat(attr).isInstanceOf(MessageExpressionConfigAttribute.class); - assertThat(((MessageExpressionConfigAttribute) attr).getAuthorizeExpression().getValue(rootObject)) + assertThat(((MessageExpressionConfigAttribute) attr).getAuthorizeExpression().getValue(this.rootObject)) .isEqualTo(true); } @Test public void createExpressionMessageMetadataSourceMatchSecond() { - when(matcher2.matches(message)).thenReturn(true); + when(this.matcher2.matches(this.message)).thenReturn(true); - Collection attrs = source.getAttributes(message); + Collection attrs = this.source.getAttributes(this.message); assertThat(attrs).hasSize(1); ConfigAttribute attr = attrs.iterator().next(); assertThat(attr).isInstanceOf(MessageExpressionConfigAttribute.class); - assertThat(((MessageExpressionConfigAttribute) attr).getAuthorizeExpression().getValue(rootObject)) + assertThat(((MessageExpressionConfigAttribute) attr).getAuthorizeExpression().getValue(this.rootObject)) .isEqualTo(false); } diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java index ecd57ac342..df89b68aef 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java @@ -47,34 +47,34 @@ public class MessageExpressionConfigAttributeTests { @Before public void setup() { - attribute = new MessageExpressionConfigAttribute(expression, matcher); + this.attribute = new MessageExpressionConfigAttribute(this.expression, this.matcher); } @Test(expected = IllegalArgumentException.class) public void constructorNullExpression() { - new MessageExpressionConfigAttribute(null, matcher); + new MessageExpressionConfigAttribute(null, this.matcher); } @Test(expected = IllegalArgumentException.class) public void constructorNullMatcher() { - new MessageExpressionConfigAttribute(expression, null); + new MessageExpressionConfigAttribute(this.expression, null); } @Test public void getAuthorizeExpression() { - assertThat(attribute.getAuthorizeExpression()).isSameAs(expression); + assertThat(this.attribute.getAuthorizeExpression()).isSameAs(this.expression); } @Test public void getAttribute() { - assertThat(attribute.getAttribute()).isNull(); + assertThat(this.attribute.getAttribute()).isNull(); } @Test public void toStringUsesExpressionString() { - when(expression.getExpressionString()).thenReturn("toString"); + when(this.expression.getExpressionString()).thenReturn("toString"); - assertThat(attribute.toString()).isEqualTo(expression.getExpressionString()); + assertThat(this.attribute.toString()).isEqualTo(this.expression.getExpressionString()); } @Test @@ -84,8 +84,8 @@ public class MessageExpressionConfigAttributeTests { .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/topics/someTopic/sub1").build(); EvaluationContext context = mock(EvaluationContext.class); - attribute = new MessageExpressionConfigAttribute(expression, matcher); - attribute.postProcess(context, message); + this.attribute = new MessageExpressionConfigAttribute(this.expression, matcher); + this.attribute.postProcess(context, message); verify(context).setVariable("topic", "someTopic"); } diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java index 97c73f9d58..e30e730fee 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java @@ -70,77 +70,80 @@ public class MessageExpressionVoterTests { @Before public void setup() { - attributes = Arrays.asList(new MessageExpressionConfigAttribute(expression, matcher)); + this.attributes = Arrays + .asList(new MessageExpressionConfigAttribute(this.expression, this.matcher)); - voter = new MessageExpressionVoter(); + this.voter = new MessageExpressionVoter(); } @Test public void voteGranted() { - when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).thenReturn(true); - assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_GRANTED); + when(this.expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).thenReturn(true); + assertThat(this.voter.vote(this.authentication, this.message, this.attributes)).isEqualTo(ACCESS_GRANTED); } @Test public void voteDenied() { - when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).thenReturn(false); - assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_DENIED); + when(this.expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).thenReturn(false); + assertThat(this.voter.vote(this.authentication, this.message, this.attributes)).isEqualTo(ACCESS_DENIED); } @Test public void voteAbstain() { - attributes = Arrays.asList(new SecurityConfig("ROLE_USER")); - assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_ABSTAIN); + this.attributes = Arrays.asList(new SecurityConfig("ROLE_USER")); + assertThat(this.voter.vote(this.authentication, this.message, this.attributes)).isEqualTo(ACCESS_ABSTAIN); } @Test public void supportsObjectClassFalse() { - assertThat(voter.supports(Object.class)).isFalse(); + assertThat(this.voter.supports(Object.class)).isFalse(); } @Test public void supportsMessageClassTrue() { - assertThat(voter.supports(Message.class)).isTrue(); + assertThat(this.voter.supports(Message.class)).isTrue(); } @Test public void supportsSecurityConfigFalse() { - assertThat(voter.supports(new SecurityConfig("ROLE_USER"))).isFalse(); + assertThat(this.voter.supports(new SecurityConfig("ROLE_USER"))).isFalse(); } @Test public void supportsMessageExpressionConfigAttributeTrue() { - assertThat(voter.supports(new MessageExpressionConfigAttribute(expression, matcher))).isTrue(); + assertThat(this.voter.supports(new MessageExpressionConfigAttribute(this.expression, this.matcher))).isTrue(); } @Test(expected = IllegalArgumentException.class) public void setExpressionHandlerNull() { - voter.setExpressionHandler(null); + this.voter.setExpressionHandler(null); } @Test public void customExpressionHandler() { - voter.setExpressionHandler(expressionHandler); - when(expressionHandler.createEvaluationContext(authentication, message)).thenReturn(evaluationContext); - when(expression.getValue(evaluationContext, Boolean.class)).thenReturn(true); + this.voter.setExpressionHandler(this.expressionHandler); + when(this.expressionHandler.createEvaluationContext(this.authentication, this.message)) + .thenReturn(this.evaluationContext); + when(this.expression.getValue(this.evaluationContext, Boolean.class)).thenReturn(true); - assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_GRANTED); + assertThat(this.voter.vote(this.authentication, this.message, this.attributes)).isEqualTo(ACCESS_GRANTED); - verify(expressionHandler).createEvaluationContext(authentication, message); + verify(this.expressionHandler).createEvaluationContext(this.authentication, this.message); } @Test public void postProcessEvaluationContext() { final MessageExpressionConfigAttribute configAttribute = mock(MessageExpressionConfigAttribute.class); - voter.setExpressionHandler(expressionHandler); - when(expressionHandler.createEvaluationContext(authentication, message)).thenReturn(evaluationContext); - when(configAttribute.getAuthorizeExpression()).thenReturn(expression); - attributes = Arrays.asList(configAttribute); - when(configAttribute.postProcess(evaluationContext, message)).thenReturn(evaluationContext); - when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).thenReturn(true); + this.voter.setExpressionHandler(this.expressionHandler); + when(this.expressionHandler.createEvaluationContext(this.authentication, this.message)) + .thenReturn(this.evaluationContext); + when(configAttribute.getAuthorizeExpression()).thenReturn(this.expression); + this.attributes = Arrays.asList(configAttribute); + when(configAttribute.postProcess(this.evaluationContext, this.message)).thenReturn(this.evaluationContext); + when(this.expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).thenReturn(true); - assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_GRANTED); - verify(configAttribute).postProcess(evaluationContext, message); + assertThat(this.voter.vote(this.authentication, this.message, this.attributes)).isEqualTo(ACCESS_GRANTED); + verify(configAttribute).postProcess(this.evaluationContext, this.message); } } diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java index e5afacf92f..6743902f11 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java @@ -72,13 +72,13 @@ public class ChannelSecurityInterceptorTests { @Before public void setup() { - attrs = Arrays.asList(new SecurityConfig("ROLE_USER")); - interceptor = new ChannelSecurityInterceptor(source); - interceptor.setAccessDecisionManager(accessDecisionManager); - interceptor.setRunAsManager(runAsManager); + this.attrs = Arrays.asList(new SecurityConfig("ROLE_USER")); + this.interceptor = new ChannelSecurityInterceptor(this.source); + this.interceptor.setAccessDecisionManager(this.accessDecisionManager); + this.interceptor.setRunAsManager(this.runAsManager); - originalAuth = new TestingAuthenticationToken("user", "pass", "ROLE_USER"); - SecurityContextHolder.getContext().setAuthentication(originalAuth); + this.originalAuth = new TestingAuthenticationToken("user", "pass", "ROLE_USER"); + SecurityContextHolder.getContext().setAuthentication(this.originalAuth); } @After @@ -93,85 +93,87 @@ public class ChannelSecurityInterceptorTests { @Test public void getSecureObjectClass() { - assertThat(interceptor.getSecureObjectClass()).isEqualTo(Message.class); + assertThat(this.interceptor.getSecureObjectClass()).isEqualTo(Message.class); } @Test public void obtainSecurityMetadataSource() { - assertThat(interceptor.obtainSecurityMetadataSource()).isEqualTo(source); + assertThat(this.interceptor.obtainSecurityMetadataSource()).isEqualTo(this.source); } @Test public void preSendNullAttributes() { - assertThat(interceptor.preSend(message, channel)).isSameAs(message); + assertThat(this.interceptor.preSend(this.message, this.channel)).isSameAs(this.message); } @Test public void preSendGrant() { - when(source.getAttributes(message)).thenReturn(attrs); + when(this.source.getAttributes(this.message)).thenReturn(this.attrs); - Message result = interceptor.preSend(message, channel); + Message result = this.interceptor.preSend(this.message, this.channel); - assertThat(result).isSameAs(message); + assertThat(result).isSameAs(this.message); } @Test(expected = AccessDeniedException.class) public void preSendDeny() { - when(source.getAttributes(message)).thenReturn(attrs); - doThrow(new AccessDeniedException("")).when(accessDecisionManager).decide(any(Authentication.class), - eq(message), eq(attrs)); + when(this.source.getAttributes(this.message)).thenReturn(this.attrs); + doThrow(new AccessDeniedException("")).when(this.accessDecisionManager).decide(any(Authentication.class), + eq(this.message), eq(this.attrs)); - interceptor.preSend(message, channel); + this.interceptor.preSend(this.message, this.channel); } @SuppressWarnings("unchecked") @Test public void preSendPostSendRunAs() { - when(source.getAttributes(message)).thenReturn(attrs); - when(runAsManager.buildRunAs(any(Authentication.class), any(), any(Collection.class))).thenReturn(runAs); + when(this.source.getAttributes(this.message)).thenReturn(this.attrs); + when(this.runAsManager.buildRunAs(any(Authentication.class), any(), any(Collection.class))) + .thenReturn(this.runAs); - Message preSend = interceptor.preSend(message, channel); + Message preSend = this.interceptor.preSend(this.message, this.channel); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(runAs); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.runAs); - interceptor.postSend(preSend, channel, true); + this.interceptor.postSend(preSend, this.channel, true); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(originalAuth); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.originalAuth); } @Test public void afterSendCompletionNotTokenMessageNoExceptionThrown() { - interceptor.afterSendCompletion(message, channel, true, null); + this.interceptor.afterSendCompletion(this.message, this.channel, true, null); } @SuppressWarnings("unchecked") @Test public void preSendFinallySendRunAs() { - when(source.getAttributes(message)).thenReturn(attrs); - when(runAsManager.buildRunAs(any(Authentication.class), any(), any(Collection.class))).thenReturn(runAs); + when(this.source.getAttributes(this.message)).thenReturn(this.attrs); + when(this.runAsManager.buildRunAs(any(Authentication.class), any(), any(Collection.class))) + .thenReturn(this.runAs); - Message preSend = interceptor.preSend(message, channel); + Message preSend = this.interceptor.preSend(this.message, this.channel); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(runAs); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.runAs); - interceptor.afterSendCompletion(preSend, channel, true, new RuntimeException()); + this.interceptor.afterSendCompletion(preSend, this.channel, true, new RuntimeException()); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(originalAuth); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.originalAuth); } @Test public void preReceive() { - assertThat(interceptor.preReceive(channel)).isTrue(); + assertThat(this.interceptor.preReceive(this.channel)).isTrue(); } @Test public void postReceive() { - assertThat(interceptor.postReceive(message, channel)).isSameAs(message); + assertThat(this.interceptor.postReceive(this.message, this.channel)).isSameAs(this.message); } @Test public void afterReceiveCompletionNullExceptionNoExceptionThrown() { - interceptor.afterReceiveCompletion(message, channel, null); + this.interceptor.afterReceiveCompletion(this.message, this.channel, null); } } diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java index 823e3941d0..3feaa06ec9 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java @@ -59,45 +59,45 @@ public class DefaultMessageSecurityMetadataSourceTests { @Before public void setup() { - messageMap = new LinkedHashMap<>(); - messageMap.put(matcher1, Arrays.asList(config1)); - messageMap.put(matcher2, Arrays.asList(config2)); + this.messageMap = new LinkedHashMap<>(); + this.messageMap.put(this.matcher1, Arrays.asList(this.config1)); + this.messageMap.put(this.matcher2, Arrays.asList(this.config2)); - source = new DefaultMessageSecurityMetadataSource(messageMap); + this.source = new DefaultMessageSecurityMetadataSource(this.messageMap); } @Test public void getAttributesNull() { - assertThat(source.getAttributes(message)).isNull(); + assertThat(this.source.getAttributes(this.message)).isNull(); } @Test public void getAttributesFirst() { - when(matcher1.matches(message)).thenReturn(true); + when(this.matcher1.matches(this.message)).thenReturn(true); - assertThat(source.getAttributes(message)).containsOnly(config1); + assertThat(this.source.getAttributes(this.message)).containsOnly(this.config1); } @Test public void getAttributesSecond() { - when(matcher1.matches(message)).thenReturn(true); + when(this.matcher1.matches(this.message)).thenReturn(true); - assertThat(source.getAttributes(message)).containsOnly(config2); + assertThat(this.source.getAttributes(this.message)).containsOnly(this.config2); } @Test public void getAllConfigAttributes() { - assertThat(source.getAllConfigAttributes()).containsOnly(config1, config2); + assertThat(this.source.getAllConfigAttributes()).containsOnly(this.config1, this.config2); } @Test public void supportsFalse() { - assertThat(source.supports(Object.class)).isFalse(); + assertThat(this.source.supports(Object.class)).isFalse(); } @Test public void supportsTrue() { - assertThat(source.supports(Message.class)).isTrue(); + assertThat(this.source.supports(Message.class)).isTrue(); } } diff --git a/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java b/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java index 7bd32174e1..a483b5a870 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java @@ -48,7 +48,7 @@ public class AuthenticationPrincipalArgumentResolverTests { @Before public void setup() { - resolver = new AuthenticationPrincipalArgumentResolver(); + this.resolver = new AuthenticationPrincipalArgumentResolver(); } @After @@ -58,59 +58,60 @@ public class AuthenticationPrincipalArgumentResolverTests { @Test public void supportsParameterNoAnnotation() { - assertThat(resolver.supportsParameter(showUserNoAnnotation())).isFalse(); + assertThat(this.resolver.supportsParameter(showUserNoAnnotation())).isFalse(); } @Test public void supportsParameterAnnotation() { - assertThat(resolver.supportsParameter(showUserAnnotationObject())).isTrue(); + assertThat(this.resolver.supportsParameter(showUserAnnotationObject())).isTrue(); } @Test public void supportsParameterCustomAnnotation() { - assertThat(resolver.supportsParameter(showUserCustomAnnotation())).isTrue(); + assertThat(this.resolver.supportsParameter(showUserCustomAnnotation())).isTrue(); } @Test public void resolveArgumentNullAuthentication() throws Exception { - assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isNull(); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null)).isNull(); } @Test public void resolveArgumentNullPrincipal() throws Exception { setAuthenticationPrincipal(null); - assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isNull(); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null)).isNull(); } @Test public void resolveArgumentString() throws Exception { setAuthenticationPrincipal("john"); - assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null)).isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentPrincipalStringOnObject() throws Exception { setAuthenticationPrincipal("john"); - assertThat(resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentUserDetails() throws Exception { setAuthenticationPrincipal(new User("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER"))); - assertThat(resolver.resolveArgument(showUserAnnotationUserDetails(), null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationUserDetails(), null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentCustomUserPrincipal() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - assertThat(resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null)) - .isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentCustomAnnotation() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserCustomAnnotation(), null)).isEqualTo(this.expectedPrincipal); } @Test @@ -133,25 +134,25 @@ public class AuthenticationPrincipalArgumentResolverTests { @Test public void resolveArgumentNullOnInvalidType() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isNull(); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null)).isNull(); } @Test(expected = ClassCastException.class) public void resolveArgumentErrorOnInvalidType() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null); + this.resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null); } @Test(expected = ClassCastException.class) public void resolveArgumentCustomserErrorOnInvalidType() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null); + this.resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null); } @Test public void resolveArgumentObject() throws Exception { setAuthenticationPrincipal(new Object()); - assertThat(resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(this.expectedPrincipal); } private MethodParameter showUserNoAnnotation() { @@ -303,7 +304,7 @@ public class AuthenticationPrincipalArgumentResolverTests { private void setAuthenticationPrincipal(Object principal) { this.expectedPrincipal = principal; SecurityContextHolder.getContext() - .setAuthentication(new TestingAuthenticationToken(expectedPrincipal, "password", "ROLE_USER")); + .setAuthentication(new TestingAuthenticationToken(this.expectedPrincipal, "password", "ROLE_USER")); } } diff --git a/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java index edd6fad469..8b19f08fa5 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java @@ -59,12 +59,12 @@ public class SecurityContextChannelInterceptorTests { @Before public void setup() { - authentication = new TestingAuthenticationToken("user", "pass", "ROLE_USER"); - messageBuilder = MessageBuilder.withPayload("payload"); - expectedAnonymous = new AnonymousAuthenticationToken("key", "anonymous", + this.authentication = new TestingAuthenticationToken("user", "pass", "ROLE_USER"); + this.messageBuilder = MessageBuilder.withPayload("payload"); + this.expectedAnonymous = new AnonymousAuthenticationToken("key", "anonymous", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS")); - interceptor = new SecurityContextChannelInterceptor(); + this.interceptor = new SecurityContextChannelInterceptor(); } @After @@ -80,35 +80,35 @@ public class SecurityContextChannelInterceptorTests { @Test public void preSendCustomHeader() { String headerName = "header"; - interceptor = new SecurityContextChannelInterceptor(headerName); - messageBuilder.setHeader(headerName, authentication); + this.interceptor = new SecurityContextChannelInterceptor(headerName); + this.messageBuilder.setHeader(headerName, this.authentication); - interceptor.preSend(messageBuilder.build(), channel); + this.interceptor.preSend(this.messageBuilder.build(), this.channel); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.authentication); } @Test public void preSendUserSet() { - messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, this.authentication); - interceptor.preSend(messageBuilder.build(), channel); + this.interceptor.preSend(this.messageBuilder.build(), this.channel); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.authentication); } @Test(expected = IllegalArgumentException.class) public void setAnonymousAuthenticationNull() { - interceptor.setAnonymousAuthentication(null); + this.interceptor.setAnonymousAuthentication(null); } @Test public void preSendUsesCustomAnonymous() { - expectedAnonymous = new AnonymousAuthenticationToken("customKey", "customAnonymous", + this.expectedAnonymous = new AnonymousAuthenticationToken("customKey", "customAnonymous", AuthorityUtils.createAuthorityList("ROLE_CUSTOM")); - interceptor.setAnonymousAuthentication(expectedAnonymous); + this.interceptor.setAnonymousAuthentication(this.expectedAnonymous); - interceptor.preSend(messageBuilder.build(), channel); + this.interceptor.preSend(this.messageBuilder.build(), this.channel); assertAnonymous(); } @@ -116,9 +116,9 @@ public class SecurityContextChannelInterceptorTests { // SEC-2845 @Test public void preSendUserNotAuthentication() { - messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, principal); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, this.principal); - interceptor.preSend(messageBuilder.build(), channel); + this.interceptor.preSend(this.messageBuilder.build(), this.channel); assertAnonymous(); } @@ -126,7 +126,7 @@ public class SecurityContextChannelInterceptorTests { // SEC-2845 @Test public void preSendUserNotSet() { - interceptor.preSend(messageBuilder.build(), channel); + this.interceptor.preSend(this.messageBuilder.build(), this.channel); assertAnonymous(); } @@ -134,42 +134,42 @@ public class SecurityContextChannelInterceptorTests { // SEC-2845 @Test public void preSendUserNotSetCustomAnonymous() { - interceptor.preSend(messageBuilder.build(), channel); + this.interceptor.preSend(this.messageBuilder.build(), this.channel); assertAnonymous(); } @Test public void afterSendCompletion() { - SecurityContextHolder.getContext().setAuthentication(authentication); + SecurityContextHolder.getContext().setAuthentication(this.authentication); - interceptor.afterSendCompletion(messageBuilder.build(), channel, true, null); + this.interceptor.afterSendCompletion(this.messageBuilder.build(), this.channel, true, null); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test public void afterSendCompletionNullAuthentication() { - interceptor.afterSendCompletion(messageBuilder.build(), channel, true, null); + this.interceptor.afterSendCompletion(this.messageBuilder.build(), this.channel, true, null); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test public void beforeHandleUserSet() { - messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, this.authentication); - interceptor.beforeHandle(messageBuilder.build(), channel, handler); + this.interceptor.beforeHandle(this.messageBuilder.build(), this.channel, this.handler); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.authentication); } // SEC-2845 @Test public void beforeHandleUserNotAuthentication() { - messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, principal); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, this.principal); - interceptor.beforeHandle(messageBuilder.build(), channel, handler); + this.interceptor.beforeHandle(this.messageBuilder.build(), this.channel, this.handler); assertAnonymous(); } @@ -177,23 +177,23 @@ public class SecurityContextChannelInterceptorTests { // SEC-2845 @Test public void beforeHandleUserNotSet() { - interceptor.beforeHandle(messageBuilder.build(), channel, handler); + this.interceptor.beforeHandle(this.messageBuilder.build(), this.channel, this.handler); assertAnonymous(); } @Test public void afterMessageHandledUserNotSet() { - interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null); + this.interceptor.afterMessageHandled(this.messageBuilder.build(), this.channel, this.handler, null); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test public void afterMessageHandled() { - SecurityContextHolder.getContext().setAuthentication(authentication); + SecurityContextHolder.getContext().setAuthentication(this.authentication); - interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null); + this.interceptor.afterMessageHandled(this.messageBuilder.build(), this.channel, this.handler, null); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @@ -204,12 +204,12 @@ public class SecurityContextChannelInterceptorTests { TestingAuthenticationToken original = new TestingAuthenticationToken("original", "original", "ROLE_USER"); SecurityContextHolder.getContext().setAuthentication(original); - messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication); - interceptor.beforeHandle(messageBuilder.build(), channel, handler); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, this.authentication); + this.interceptor.beforeHandle(this.messageBuilder.build(), this.channel, this.handler); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.authentication); - interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null); + this.interceptor.afterMessageHandled(this.messageBuilder.build(), this.channel, this.handler, null); assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(original); } @@ -226,23 +226,23 @@ public class SecurityContextChannelInterceptorTests { TestingAuthenticationToken origional = new TestingAuthenticationToken("original", "origional", "ROLE_USER"); SecurityContextHolder.getContext().setAuthentication(origional); - messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication); - interceptor.beforeHandle(messageBuilder.build(), channel, handler); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, this.authentication); + this.interceptor.beforeHandle(this.messageBuilder.build(), this.channel, this.handler); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.authentication); // start send websocket - messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, null); - interceptor.beforeHandle(messageBuilder.build(), channel, handler); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, null); + this.interceptor.beforeHandle(this.messageBuilder.build(), this.channel, this.handler); assertThat(SecurityContextHolder.getContext().getAuthentication().getName()).isEqualTo(anonymous.getName()); - interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null); + this.interceptor.afterMessageHandled(this.messageBuilder.build(), this.channel, this.handler, null); - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.authentication); // end send websocket - interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null); + this.interceptor.afterMessageHandled(this.messageBuilder.build(), this.channel, this.handler, null); assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(origional); } @@ -252,9 +252,9 @@ public class SecurityContextChannelInterceptorTests { assertThat(currentAuthentication).isInstanceOf(AnonymousAuthenticationToken.class); AnonymousAuthenticationToken anonymous = (AnonymousAuthenticationToken) currentAuthentication; - assertThat(anonymous.getName()).isEqualTo(expectedAnonymous.getName()); - assertThat(anonymous.getAuthorities()).containsOnlyElementsOf(expectedAnonymous.getAuthorities()); - assertThat(anonymous.getKeyHash()).isEqualTo(expectedAnonymous.getKeyHash()); + assertThat(anonymous.getName()).isEqualTo(this.expectedAnonymous.getName()); + assertThat(anonymous.getAuthorities()).containsOnlyElementsOf(this.expectedAnonymous.getAuthorities()); + assertThat(anonymous.getKeyHash()).isEqualTo(this.expectedAnonymous.getKeyHash()); } } diff --git a/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java b/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java index 999589a8ce..78e0e1fcbd 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java +++ b/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java @@ -308,8 +308,8 @@ public final class ResolvableMethod { @SafeVarargs public final Builder annotPresent(Class... annotationTypes) { String message = "annotationPresent=" + Arrays.toString(annotationTypes); - addFilter(message, method -> Arrays.stream(annotationTypes) - .allMatch(annotType -> AnnotatedElementUtils.findMergedAnnotation(method, annotType) != null)); + addFilter(message, candidate -> Arrays.stream(annotationTypes) + .allMatch(annotType -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null)); return this; } @@ -319,13 +319,13 @@ public final class ResolvableMethod { @SafeVarargs public final Builder annotNotPresent(Class... annotationTypes) { String message = "annotationNotPresent=" + Arrays.toString(annotationTypes); - addFilter(message, method -> { + addFilter(message, candidate -> { if (annotationTypes.length != 0) { return Arrays.stream(annotationTypes).noneMatch( - annotType -> AnnotatedElementUtils.findMergedAnnotation(method, annotType) != null); + annotType -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null); } else { - return method.getAnnotations().length == 0; + return candidate.getAnnotations().length == 0; } }); return this; diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTests.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTests.java index 8f749ec73d..9b98cd63ef 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTests.java @@ -76,44 +76,44 @@ public class AndMessageMatcherTests { @Test public void matchesSingleTrue() { - when(delegate.matches(message)).thenReturn(true); - matcher = new AndMessageMatcher<>(delegate); + when(this.delegate.matches(this.message)).thenReturn(true); + this.matcher = new AndMessageMatcher<>(this.delegate); - assertThat(matcher.matches(message)).isTrue(); + assertThat(this.matcher.matches(this.message)).isTrue(); } @Test public void matchesMultiTrue() { - when(delegate.matches(message)).thenReturn(true); - when(delegate2.matches(message)).thenReturn(true); - matcher = new AndMessageMatcher<>(delegate, delegate2); + when(this.delegate.matches(this.message)).thenReturn(true); + when(this.delegate2.matches(this.message)).thenReturn(true); + this.matcher = new AndMessageMatcher<>(this.delegate, this.delegate2); - assertThat(matcher.matches(message)).isTrue(); + assertThat(this.matcher.matches(this.message)).isTrue(); } @Test public void matchesSingleFalse() { - when(delegate.matches(message)).thenReturn(false); - matcher = new AndMessageMatcher<>(delegate); + when(this.delegate.matches(this.message)).thenReturn(false); + this.matcher = new AndMessageMatcher<>(this.delegate); - assertThat(matcher.matches(message)).isFalse(); + assertThat(this.matcher.matches(this.message)).isFalse(); } @Test public void matchesMultiBothFalse() { - when(delegate.matches(message)).thenReturn(false); - matcher = new AndMessageMatcher<>(delegate, delegate2); + when(this.delegate.matches(this.message)).thenReturn(false); + this.matcher = new AndMessageMatcher<>(this.delegate, this.delegate2); - assertThat(matcher.matches(message)).isFalse(); + assertThat(this.matcher.matches(this.message)).isFalse(); } @Test public void matchesMultiSingleFalse() { - when(delegate.matches(message)).thenReturn(true); - when(delegate2.matches(message)).thenReturn(false); - matcher = new AndMessageMatcher<>(delegate, delegate2); + when(this.delegate.matches(this.message)).thenReturn(true); + when(this.delegate2.matches(this.message)).thenReturn(false); + this.matcher = new AndMessageMatcher<>(this.delegate, this.delegate2); - assertThat(matcher.matches(message)).isFalse(); + assertThat(this.matcher.matches(this.message)).isFalse(); } } diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTests.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTests.java index 14ed456a44..fb35b0cebf 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTests.java @@ -76,43 +76,43 @@ public class OrMessageMatcherTests { @Test public void matchesSingleTrue() { - when(delegate.matches(message)).thenReturn(true); - matcher = new OrMessageMatcher<>(delegate); + when(this.delegate.matches(this.message)).thenReturn(true); + this.matcher = new OrMessageMatcher<>(this.delegate); - assertThat(matcher.matches(message)).isTrue(); + assertThat(this.matcher.matches(this.message)).isTrue(); } @Test public void matchesMultiTrue() { - when(delegate.matches(message)).thenReturn(true); - matcher = new OrMessageMatcher<>(delegate, delegate2); + when(this.delegate.matches(this.message)).thenReturn(true); + this.matcher = new OrMessageMatcher<>(this.delegate, this.delegate2); - assertThat(matcher.matches(message)).isTrue(); + assertThat(this.matcher.matches(this.message)).isTrue(); } @Test public void matchesSingleFalse() { - when(delegate.matches(message)).thenReturn(false); - matcher = new OrMessageMatcher<>(delegate); + when(this.delegate.matches(this.message)).thenReturn(false); + this.matcher = new OrMessageMatcher<>(this.delegate); - assertThat(matcher.matches(message)).isFalse(); + assertThat(this.matcher.matches(this.message)).isFalse(); } @Test public void matchesMultiBothFalse() { - when(delegate.matches(message)).thenReturn(false); - when(delegate2.matches(message)).thenReturn(false); - matcher = new OrMessageMatcher<>(delegate, delegate2); + when(this.delegate.matches(this.message)).thenReturn(false); + when(this.delegate2.matches(this.message)).thenReturn(false); + this.matcher = new OrMessageMatcher<>(this.delegate, this.delegate2); - assertThat(matcher.matches(message)).isFalse(); + assertThat(this.matcher.matches(this.message)).isFalse(); } @Test public void matchesMultiSingleFalse() { - when(delegate.matches(message)).thenReturn(true); - matcher = new OrMessageMatcher<>(delegate, delegate2); + when(this.delegate.matches(this.message)).thenReturn(true); + this.matcher = new OrMessageMatcher<>(this.delegate, this.delegate2); - assertThat(matcher.matches(message)).isTrue(); + assertThat(this.matcher.matches(this.message)).isTrue(); } } diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java index 536f7b569a..ac04428c53 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java @@ -36,9 +36,9 @@ public class SimpDestinationMessageMatcherTests { @Before public void setup() { - messageBuilder = MessageBuilder.withPayload("M"); - matcher = new SimpDestinationMessageMatcher("/**"); - pathMatcher = new AntPathMatcher(); + this.messageBuilder = MessageBuilder.withPayload("M"); + this.matcher = new SimpDestinationMessageMatcher("/**"); + this.pathMatcher = new AntPathMatcher(); } @Test(expected = IllegalArgumentException.class) @@ -52,96 +52,96 @@ public class SimpDestinationMessageMatcherTests { @Test public void matchesDoesNotMatchNullDestination() { - assertThat(matcher.matches(messageBuilder.build())).isFalse(); + assertThat(this.matcher.matches(this.messageBuilder.build())).isFalse(); } @Test public void matchesAllWithDestination() { - messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/destination/1"); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/destination/1"); - assertThat(matcher.matches(messageBuilder.build())).isTrue(); + assertThat(this.matcher.matches(this.messageBuilder.build())).isTrue(); } @Test public void matchesSpecificWithDestination() { - matcher = new SimpDestinationMessageMatcher("/destination/1"); + this.matcher = new SimpDestinationMessageMatcher("/destination/1"); - messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/destination/1"); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/destination/1"); - assertThat(matcher.matches(messageBuilder.build())).isTrue(); + assertThat(this.matcher.matches(this.messageBuilder.build())).isTrue(); } @Test public void matchesFalseWithDestination() { - matcher = new SimpDestinationMessageMatcher("/nomatch"); + this.matcher = new SimpDestinationMessageMatcher("/nomatch"); - messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/destination/1"); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/destination/1"); - assertThat(matcher.matches(messageBuilder.build())).isFalse(); + assertThat(this.matcher.matches(this.messageBuilder.build())).isFalse(); } @Test public void matchesFalseMessageTypeNotDisconnectType() { - matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", pathMatcher); + this.matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", this.pathMatcher); - messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.DISCONNECT); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.DISCONNECT); - assertThat(matcher.matches(messageBuilder.build())).isFalse(); + assertThat(this.matcher.matches(this.messageBuilder.build())).isFalse(); } @Test public void matchesTrueMessageType() { - matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", pathMatcher); + this.matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", this.pathMatcher); - messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match"); - messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match"); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE); - assertThat(matcher.matches(messageBuilder.build())).isTrue(); + assertThat(this.matcher.matches(this.messageBuilder.build())).isTrue(); } @Test public void matchesTrueSubscribeType() { - matcher = SimpDestinationMessageMatcher.createSubscribeMatcher("/match", pathMatcher); + this.matcher = SimpDestinationMessageMatcher.createSubscribeMatcher("/match", this.pathMatcher); - messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match"); - messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.SUBSCRIBE); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match"); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.SUBSCRIBE); - assertThat(matcher.matches(messageBuilder.build())).isTrue(); + assertThat(this.matcher.matches(this.messageBuilder.build())).isTrue(); } @Test public void matchesNullMessageType() { - matcher = new SimpDestinationMessageMatcher("/match"); + this.matcher = new SimpDestinationMessageMatcher("/match"); - messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match"); - messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match"); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE); - assertThat(matcher.matches(messageBuilder.build())).isTrue(); + assertThat(this.matcher.matches(this.messageBuilder.build())).isTrue(); } @Test public void extractPathVariablesFromDestination() { - matcher = new SimpDestinationMessageMatcher("/topics/{topic}/**"); + this.matcher = new SimpDestinationMessageMatcher("/topics/{topic}/**"); - messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/topics/someTopic/sub1"); - messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/topics/someTopic/sub1"); + this.messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE); - assertThat(matcher.extractPathVariables(messageBuilder.build()).get("topic")).isEqualTo("someTopic"); + assertThat(this.matcher.extractPathVariables(this.messageBuilder.build()).get("topic")).isEqualTo("someTopic"); } @Test public void extractedVariablesAreEmptyInNullDestination() { - matcher = new SimpDestinationMessageMatcher("/topics/{topic}/**"); - assertThat(matcher.extractPathVariables(messageBuilder.build())).isEmpty(); + this.matcher = new SimpDestinationMessageMatcher("/topics/{topic}/**"); + assertThat(this.matcher.extractPathVariables(this.messageBuilder.build())).isEmpty(); } @Test public void typeConstructorParameterIsTransmitted() { - matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", pathMatcher); + this.matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", this.pathMatcher); MessageMatcher expectedTypeMatcher = new SimpMessageTypeMatcher(SimpMessageType.MESSAGE); - assertThat(matcher.getMessageTypeMatcher()).isEqualTo(expectedTypeMatcher); + assertThat(this.matcher.getMessageTypeMatcher()).isEqualTo(expectedTypeMatcher); } diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java index 92a4626549..82fdd79c12 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java @@ -31,7 +31,7 @@ public class SimpMessageTypeMatcherTests { @Before public void setup() { - matcher = new SimpMessageTypeMatcher(SimpMessageType.MESSAGE); + this.matcher = new SimpMessageTypeMatcher(SimpMessageType.MESSAGE); } @Test(expected = IllegalArgumentException.class) @@ -44,7 +44,7 @@ public class SimpMessageTypeMatcherTests { Message message = MessageBuilder.withPayload("Hi") .setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE).build(); - assertThat(matcher.matches(message)).isTrue(); + assertThat(this.matcher.matches(message)).isTrue(); } @Test @@ -52,14 +52,14 @@ public class SimpMessageTypeMatcherTests { Message message = MessageBuilder.withPayload("Hi") .setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.CONNECT).build(); - assertThat(matcher.matches(message)).isFalse(); + assertThat(this.matcher.matches(message)).isFalse(); } @Test public void matchesMessageNullFalse() { Message message = MessageBuilder.withPayload("Hi").build(); - assertThat(matcher.matches(message)).isFalse(); + assertThat(this.matcher.matches(message)).isFalse(); } } diff --git a/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java index 64281e1f59..85ab628039 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java @@ -48,106 +48,106 @@ public class CsrfChannelInterceptorTests { @Before public void setup() { - token = new DefaultCsrfToken("header", "param", "token"); - interceptor = new CsrfChannelInterceptor(); + this.token = new DefaultCsrfToken("header", "param", "token"); + this.interceptor = new CsrfChannelInterceptor(); - messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT); - messageHeaders.setNativeHeader(token.getHeaderName(), token.getToken()); - messageHeaders.setSessionAttributes(new HashMap<>()); - messageHeaders.getSessionAttributes().put(CsrfToken.class.getName(), token); + this.messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT); + this.messageHeaders.setNativeHeader(this.token.getHeaderName(), this.token.getToken()); + this.messageHeaders.setSessionAttributes(new HashMap<>()); + this.messageHeaders.getSessionAttributes().put(CsrfToken.class.getName(), this.token); } @Test public void preSendValidToken() { - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test public void preSendIgnoresConnectAck() { - messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT_ACK); + this.messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT_ACK); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test public void preSendIgnoresDisconnect() { - messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.DISCONNECT); + this.messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.DISCONNECT); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test public void preSendIgnoresDisconnectAck() { - messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.DISCONNECT_ACK); + this.messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.DISCONNECT_ACK); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test public void preSendIgnoresHeartbeat() { - messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.HEARTBEAT); + this.messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.HEARTBEAT); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test public void preSendIgnoresMessage() { - messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.MESSAGE); + this.messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.MESSAGE); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test public void preSendIgnoresOther() { - messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.OTHER); + this.messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.OTHER); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test public void preSendIgnoresSubscribe() { - messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.SUBSCRIBE); + this.messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.SUBSCRIBE); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test public void preSendIgnoresUnsubscribe() { - messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.UNSUBSCRIBE); + this.messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.UNSUBSCRIBE); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test(expected = InvalidCsrfTokenException.class) public void preSendNoToken() { - messageHeaders.removeNativeHeader(token.getHeaderName()); + this.messageHeaders.removeNativeHeader(this.token.getHeaderName()); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test(expected = InvalidCsrfTokenException.class) public void preSendInvalidToken() { - messageHeaders.setNativeHeader(token.getHeaderName(), token.getToken() + "invalid"); + this.messageHeaders.setNativeHeader(this.token.getHeaderName(), this.token.getToken() + "invalid"); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test(expected = MissingCsrfTokenException.class) public void preSendMissingToken() { - messageHeaders.getSessionAttributes().clear(); + this.messageHeaders.getSessionAttributes().clear(); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } @Test(expected = MissingCsrfTokenException.class) public void preSendMissingTokenNullSessionAttributes() { - messageHeaders.setSessionAttributes(null); + this.messageHeaders.setSessionAttributes(null); - interceptor.preSend(message(), channel); + this.interceptor.preSend(message(), this.channel); } private Message message() { - Map headersToCopy = messageHeaders.toMap(); + Map headersToCopy = this.messageHeaders.toMap(); return MessageBuilder.withPayload("hi").copyHeaders(headersToCopy).build(); } diff --git a/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java index eff918868a..cad9a23c4d 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java @@ -56,29 +56,29 @@ public class CsrfTokenHandshakeInterceptorTests { @Before public void setup() { - httpRequest = new MockHttpServletRequest(); - attributes = new HashMap<>(); - request = new ServletServerHttpRequest(httpRequest); + this.httpRequest = new MockHttpServletRequest(); + this.attributes = new HashMap<>(); + this.request = new ServletServerHttpRequest(this.httpRequest); - interceptor = new CsrfTokenHandshakeInterceptor(); + this.interceptor = new CsrfTokenHandshakeInterceptor(); } @Test public void beforeHandshakeNoAttribute() throws Exception { - interceptor.beforeHandshake(request, response, wsHandler, attributes); + this.interceptor.beforeHandshake(this.request, this.response, this.wsHandler, this.attributes); - assertThat(attributes).isEmpty(); + assertThat(this.attributes).isEmpty(); } @Test public void beforeHandshake() throws Exception { CsrfToken token = new DefaultCsrfToken("header", "param", "token"); - httpRequest.setAttribute(CsrfToken.class.getName(), token); + this.httpRequest.setAttribute(CsrfToken.class.getName(), token); - interceptor.beforeHandshake(request, response, wsHandler, attributes); + this.interceptor.beforeHandshake(this.request, this.response, this.wsHandler, this.attributes); - assertThat(attributes.keySet()).containsOnly(CsrfToken.class.getName()); - assertThat(attributes.values()).containsOnly(token); + assertThat(this.attributes.keySet()).containsOnly(CsrfToken.class.getName()); + assertThat(this.attributes.values()).containsOnly(token); } } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager.java index bab13821fc..ef69a07419 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager.java @@ -241,7 +241,7 @@ public final class AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager @Override public Mono> apply(OAuth2AuthorizeRequest authorizeRequest) { - return Mono.fromCallable(() -> mapper.apply(authorizeRequest)); + return Mono.fromCallable(() -> this.mapper.apply(authorizeRequest)); } } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/DelegatingOAuth2AuthorizedClientProvider.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/DelegatingOAuth2AuthorizedClientProvider.java index 9e7965337d..0592ffe416 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/DelegatingOAuth2AuthorizedClientProvider.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/DelegatingOAuth2AuthorizedClientProvider.java @@ -66,7 +66,7 @@ public final class DelegatingOAuth2AuthorizedClientProvider implements OAuth2Aut @Nullable public OAuth2AuthorizedClient authorize(OAuth2AuthorizationContext context) { Assert.notNull(context, "context cannot be null"); - for (OAuth2AuthorizedClientProvider authorizedClientProvider : authorizedClientProviders) { + for (OAuth2AuthorizedClientProvider authorizedClientProvider : this.authorizedClientProviders) { OAuth2AuthorizedClient oauth2AuthorizedClient = authorizedClientProvider.authorize(context); if (oauth2AuthorizedClient != null) { return oauth2AuthorizedClient; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationRequestRedirectFilter.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationRequestRedirectFilter.java index 7e256f177c..2688f65c9d 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationRequestRedirectFilter.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationRequestRedirectFilter.java @@ -226,8 +226,8 @@ public class OAuth2AuthorizationRequestRedirectFilter extends OncePerRequestFilt private void unsuccessfulRedirectForAuthorization(HttpServletRequest request, HttpServletResponse response, Exception failed) throws IOException { - if (logger.isErrorEnabled()) { - logger.error("Authorization Request failed: " + failed.toString(), failed); + if (this.logger.isErrorEnabled()) { + this.logger.error("Authorization Request failed: " + failed.toString(), failed); } response.sendError(HttpStatus.INTERNAL_SERVER_ERROR.value(), HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase()); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/AuthorizedClientServiceOAuth2AuthorizedClientManagerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/AuthorizedClientServiceOAuth2AuthorizedClientManagerTests.java index b2aa1f7d77..dd11f065b4 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/AuthorizedClientServiceOAuth2AuthorizedClientManagerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/AuthorizedClientServiceOAuth2AuthorizedClientManagerTests.java @@ -85,7 +85,8 @@ public class AuthorizedClientServiceOAuth2AuthorizedClientManagerTests { @Override public void onAuthorizationSuccess(OAuth2AuthorizedClient authorizedClient, Authentication principal, Map attributes) { - authorizedClientService.saveAuthorizedClient(authorizedClient, principal); + AuthorizedClientServiceOAuth2AuthorizedClientManagerTests.this.authorizedClientService + .saveAuthorizedClient(authorizedClient, principal); } }); this.authorizationFailureHandler = spy(new RemoveAuthorizedClientOAuth2AuthorizationFailureHandler( diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManagerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManagerTests.java index c923751fc2..3d308eef94 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManagerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/AuthorizedClientServiceReactiveOAuth2AuthorizedClientManagerTests.java @@ -164,7 +164,7 @@ public class AuthorizedClientServiceReactiveOAuth2AuthorizedClientManagerTests { .thenReturn(Mono.just(this.clientRegistration)); when(this.authorizedClientService.loadAuthorizedClient(any(), any())).thenReturn(Mono.empty()); - when(authorizedClientProvider.authorize(any())).thenReturn(Mono.empty()); + when(this.authorizedClientProvider.authorize(any())).thenReturn(Mono.empty()); OAuth2AuthorizeRequest authorizeRequest = OAuth2AuthorizeRequest .withClientRegistrationId(this.clientRegistration.getRegistrationId()).principal(this.principal) .build(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManagerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManagerTests.java index 82e3c52831..45ef576d48 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManagerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManagerTests.java @@ -198,7 +198,7 @@ public class OAuth2LoginReactiveAuthenticationManagerTests { GrantedAuthoritiesMapper authoritiesMapper = mock(GrantedAuthoritiesMapper.class); when(authoritiesMapper.mapAuthorities(anyCollection())) .thenAnswer((Answer>) invocation -> mappedAuthorities); - manager.setAuthoritiesMapper(authoritiesMapper); + this.manager.setAuthoritiesMapper(authoritiesMapper); OAuth2LoginAuthenticationToken result = (OAuth2LoginAuthenticationToken) this.manager.authenticate(loginToken()) .block(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/OAuth2AuthorizationCodeGrantRequestEntityConverterTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/OAuth2AuthorizationCodeGrantRequestEntityConverterTests.java index a108d44ad0..6060fc316e 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/OAuth2AuthorizationCodeGrantRequestEntityConverterTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/OAuth2AuthorizationCodeGrantRequestEntityConverterTests.java @@ -67,9 +67,9 @@ public class OAuth2AuthorizationCodeGrantRequestEntityConverterTests { @SuppressWarnings("unchecked") @Test public void convertWhenGrantRequestValidThenConverts() { - ClientRegistration clientRegistration = clientRegistrationBuilder.build(); - OAuth2AuthorizationRequest authorizationRequest = authorizationRequestBuilder.build(); - OAuth2AuthorizationResponse authorizationResponse = authorizationResponseBuilder.build(); + ClientRegistration clientRegistration = this.clientRegistrationBuilder.build(); + OAuth2AuthorizationRequest authorizationRequest = this.authorizationRequestBuilder.build(); + OAuth2AuthorizationResponse authorizationResponse = this.authorizationResponseBuilder.build(); OAuth2AuthorizationExchange authorizationExchange = new OAuth2AuthorizationExchange(authorizationRequest, authorizationResponse); OAuth2AuthorizationCodeGrantRequest authorizationCodeGrantRequest = new OAuth2AuthorizationCodeGrantRequest( @@ -99,7 +99,7 @@ public class OAuth2AuthorizationCodeGrantRequestEntityConverterTests { @SuppressWarnings("unchecked") @Test public void convertWhenPkceGrantRequestValidThenConverts() { - ClientRegistration clientRegistration = clientRegistrationBuilder.clientAuthenticationMethod(null) + ClientRegistration clientRegistration = this.clientRegistrationBuilder.clientAuthenticationMethod(null) .clientSecret(null).build(); Map attributes = new HashMap<>(); @@ -109,10 +109,10 @@ public class OAuth2AuthorizationCodeGrantRequestEntityConverterTests { additionalParameters.put(PkceParameterNames.CODE_CHALLENGE, "code-challenge-1234"); additionalParameters.put(PkceParameterNames.CODE_CHALLENGE_METHOD, "S256"); - OAuth2AuthorizationRequest authorizationRequest = authorizationRequestBuilder.attributes(attributes) + OAuth2AuthorizationRequest authorizationRequest = this.authorizationRequestBuilder.attributes(attributes) .additionalParameters(additionalParameters).build(); - OAuth2AuthorizationResponse authorizationResponse = authorizationResponseBuilder.build(); + OAuth2AuthorizationResponse authorizationResponse = this.authorizationResponseBuilder.build(); OAuth2AuthorizationExchange authorizationExchange = new OAuth2AuthorizationExchange(authorizationRequest, authorizationResponse); OAuth2AuthorizationCodeGrantRequest authorizationCodeGrantRequest = new OAuth2AuthorizationCodeGrantRequest( diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java index 78e4fb711d..d95f458da6 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java @@ -265,7 +265,7 @@ public class WebClientReactiveAuthorizationCodeTokenResponseClientTests { @Test(expected = IllegalArgumentException.class) public void setWebClientNullThenIllegalArgumentException() { - tokenResponseClient.setWebClient(null); + this.tokenResponseClient.setWebClient(null); } @Test @@ -273,7 +273,7 @@ public class WebClientReactiveAuthorizationCodeTokenResponseClientTests { WebClient customClient = mock(WebClient.class); when(customClient.post()).thenReturn(WebClient.builder().build().post()); - tokenResponseClient.setWebClient(customClient); + this.tokenResponseClient.setWebClient(customClient); String accessTokenSuccessResponse = "{\n" + " \"access_token\": \"access-token-1234\",\n" + " \"token_type\": \"bearer\",\n" + " \"expires_in\": \"3600\",\n" diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java index 00984777dc..5a38145e56 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java @@ -120,7 +120,7 @@ public class WebClientReactiveClientCredentialsTokenResponseClientTests { @Test(expected = IllegalArgumentException.class) public void setWebClientNullThenIllegalArgumentException() { - client.setWebClient(null); + this.client.setWebClient(null); } @Test diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java index 40484897c0..0be3918606 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java @@ -312,7 +312,7 @@ public class OidcUserServiceTests { this.server.enqueue(new MockResponse().setResponseCode(500)); - String userInfoUri = server.url("/user").toString(); + String userInfoUri = this.server.url("/user").toString(); ClientRegistration clientRegistration = this.clientRegistrationBuilder.userInfoUri(userInfoUri).build(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/logout/OidcClientInitiatedLogoutSuccessHandlerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/logout/OidcClientInitiatedLogoutSuccessHandlerTests.java index 220790a3c7..c55d019efe 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/logout/OidcClientInitiatedLogoutSuccessHandlerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/logout/OidcClientInitiatedLogoutSuccessHandlerTests.java @@ -53,7 +53,7 @@ public class OidcClientInitiatedLogoutSuccessHandlerTests { .providerConfigurationMetadata(Collections.singletonMap("end_session_endpoint", "https://endpoint")) .build(); - ClientRegistrationRepository repository = new InMemoryClientRegistrationRepository(registration); + ClientRegistrationRepository repository = new InMemoryClientRegistrationRepository(this.registration); MockHttpServletRequest request; diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java index eeb74e5f3e..f78af6725e 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java @@ -55,7 +55,8 @@ public class OidcClientInitiatedServerLogoutSuccessHandlerTests { .providerConfigurationMetadata(Collections.singletonMap("end_session_endpoint", "https://endpoint")) .build(); - ReactiveClientRegistrationRepository repository = new InMemoryReactiveClientRegistrationRepository(registration); + ReactiveClientRegistrationRepository repository = new InMemoryReactiveClientRegistrationRepository( + this.registration); ServerWebExchange exchange; @@ -78,7 +79,7 @@ public class OidcClientInitiatedServerLogoutSuccessHandlerTests { AuthorityUtils.NO_AUTHORITIES, this.registration.getRegistrationId()); when(this.exchange.getPrincipal()).thenReturn(Mono.just(token)); - WebFilterExchange f = new WebFilterExchange(exchange, this.chain); + WebFilterExchange f = new WebFilterExchange(this.exchange, this.chain); this.handler.onLogoutSuccess(f, token).block(); assertThat(redirectedUrl(this.exchange)).isEqualTo("https://endpoint?id_token_hint=id-token"); @@ -89,7 +90,7 @@ public class OidcClientInitiatedServerLogoutSuccessHandlerTests { Authentication token = mock(Authentication.class); when(this.exchange.getPrincipal()).thenReturn(Mono.just(token)); - WebFilterExchange f = new WebFilterExchange(exchange, this.chain); + WebFilterExchange f = new WebFilterExchange(this.exchange, this.chain); this.handler.setLogoutSuccessUrl(URI.create("https://default")); this.handler.onLogoutSuccess(f, token).block(); @@ -103,7 +104,7 @@ public class OidcClientInitiatedServerLogoutSuccessHandlerTests { AuthorityUtils.NO_AUTHORITIES, this.registration.getRegistrationId()); when(this.exchange.getPrincipal()).thenReturn(Mono.just(token)); - WebFilterExchange f = new WebFilterExchange(exchange, this.chain); + WebFilterExchange f = new WebFilterExchange(this.exchange, this.chain); this.handler.setLogoutSuccessUrl(URI.create("https://default")); this.handler.onLogoutSuccess(f, token).block(); @@ -124,7 +125,7 @@ public class OidcClientInitiatedServerLogoutSuccessHandlerTests { AuthorityUtils.NO_AUTHORITIES, registration.getRegistrationId()); when(this.exchange.getPrincipal()).thenReturn(Mono.just(token)); - WebFilterExchange f = new WebFilterExchange(exchange, this.chain); + WebFilterExchange f = new WebFilterExchange(this.exchange, this.chain); handler.setLogoutSuccessUrl(URI.create("https://default")); handler.onLogoutSuccess(f, token).block(); @@ -139,7 +140,7 @@ public class OidcClientInitiatedServerLogoutSuccessHandlerTests { AuthorityUtils.NO_AUTHORITIES, this.registration.getRegistrationId()); when(this.exchange.getPrincipal()).thenReturn(Mono.just(token)); - WebFilterExchange f = new WebFilterExchange(exchange, this.chain); + WebFilterExchange f = new WebFilterExchange(this.exchange, this.chain); this.handler.setPostLogoutRedirectUri(URI.create("https://postlogout?encodedparam=value")); this.handler.onLogoutSuccess(f, token).block(); @@ -157,7 +158,7 @@ public class OidcClientInitiatedServerLogoutSuccessHandlerTests { when(this.exchange.getPrincipal()).thenReturn(Mono.just(token)); MockServerHttpRequest request = MockServerHttpRequest.get("https://rp.example.org/").build(); when(this.exchange.getRequest()).thenReturn(request); - WebFilterExchange f = new WebFilterExchange(exchange, this.chain); + WebFilterExchange f = new WebFilterExchange(this.exchange, this.chain); this.handler.setPostLogoutRedirectUri("{baseUrl}"); this.handler.onLogoutSuccess(f, token).block(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManagerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManagerTests.java index ca352ed8f8..9595ff01fc 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManagerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/DefaultOAuth2AuthorizedClientManagerTests.java @@ -104,14 +104,15 @@ public class DefaultOAuth2AuthorizedClientManagerTests { @Override public void onAuthorizationSuccess(OAuth2AuthorizedClient authorizedClient, Authentication principal, Map attributes) { - authorizedClientRepository.saveAuthorizedClient(authorizedClient, principal, + DefaultOAuth2AuthorizedClientManagerTests.this.authorizedClientRepository.saveAuthorizedClient( + authorizedClient, principal, (HttpServletRequest) attributes.get(HttpServletRequest.class.getName()), (HttpServletResponse) attributes.get(HttpServletResponse.class.getName())); } }); this.authorizationFailureHandler = spy( new RemoveAuthorizedClientOAuth2AuthorizationFailureHandler((clientRegistrationId, principal, - attributes) -> authorizedClientRepository.removeAuthorizedClient(clientRegistrationId, + attributes) -> this.authorizedClientRepository.removeAuthorizedClient(clientRegistrationId, principal, (HttpServletRequest) attributes.get(HttpServletRequest.class.getName()), (HttpServletResponse) attributes.get(HttpServletResponse.class.getName())))); this.authorizedClientManager = new DefaultOAuth2AuthorizedClientManager(this.clientRegistrationRepository, diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/OAuth2LoginAuthenticationFilterTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/OAuth2LoginAuthenticationFilterTests.java index 7bda9447a7..25e3b6171d 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/OAuth2LoginAuthenticationFilterTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/OAuth2LoginAuthenticationFilterTests.java @@ -446,7 +446,7 @@ public class OAuth2LoginAuthenticationFilterTests { request.addParameter(OAuth2ParameterNames.STATE, state); WebAuthenticationDetails webAuthenticationDetails = mock(WebAuthenticationDetails.class); - when(authenticationDetailsSource.buildDetails(any())).thenReturn(webAuthenticationDetails); + when(this.authenticationDetailsSource.buildDetails(any())).thenReturn(webAuthenticationDetails); MockHttpServletResponse response = new MockHttpServletResponse(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java index 797ee45727..110026c1f2 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunctionTests.java @@ -171,7 +171,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { this.authorizedClientManager = new DefaultReactiveOAuth2AuthorizedClientManager( this.clientRegistrationRepository, this.authorizedClientRepository); this.authorizedClientManager.setAuthorizedClientProvider(authorizedClientProvider); - this.function = new ServerOAuth2AuthorizedClientExchangeFilterFunction(authorizedClientManager); + this.function = new ServerOAuth2AuthorizedClientExchangeFilterFunction(this.authorizedClientManager); when(this.authorizedClientRepository.saveAuthorizedClient(any(), any(), any())).thenReturn(Mono.empty()); when(this.exchange.getResponse().headers()).thenReturn(mock(ClientResponse.Headers.class)); } @@ -329,7 +329,7 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { verify(this.authorizedClientRepository).saveAuthorizedClient(this.authorizedClientCaptor.capture(), eq(authentication), any()); - OAuth2AuthorizedClient newAuthorizedClient = authorizedClientCaptor.getValue(); + OAuth2AuthorizedClient newAuthorizedClient = this.authorizedClientCaptor.getValue(); assertThat(newAuthorizedClient.getAccessToken()).isEqualTo(response.getAccessToken()); assertThat(newAuthorizedClient.getRefreshToken()).isEqualTo(response.getRefreshToken()); @@ -416,10 +416,11 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { @Test public void filterWhenUnauthorizedThenInvokeFailureHandler() { - function.setAuthorizationFailureHandler(authorizationFailureHandler); + this.function.setAuthorizationFailureHandler(this.authorizationFailureHandler); PublisherProbe publisherProbe = PublisherProbe.empty(); - when(authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())).thenReturn(publisherProbe.mono()); + when(this.authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())) + .thenReturn(publisherProbe.mono()); OAuth2RefreshToken refreshToken = new OAuth2RefreshToken("refresh-token", this.accessToken.getIssuedAt()); OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient(this.registration, "principalName", @@ -427,33 +428,34 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { ClientRequest request = ClientRequest.create(GET, URI.create("https://example.com")) .attributes(oauth2AuthorizedClient(authorizedClient)).build(); - when(exchange.getResponse().rawStatusCode()).thenReturn(HttpStatus.UNAUTHORIZED.value()); + when(this.exchange.getResponse().rawStatusCode()).thenReturn(HttpStatus.UNAUTHORIZED.value()); this.function.filter(request, this.exchange).subscriberContext(serverWebExchange()).block(); assertThat(publisherProbe.wasSubscribed()).isTrue(); - verify(authorizationFailureHandler).onAuthorizationFailure(authorizationExceptionCaptor.capture(), - authenticationCaptor.capture(), attributesCaptor.capture()); + verify(this.authorizationFailureHandler).onAuthorizationFailure(this.authorizationExceptionCaptor.capture(), + this.authenticationCaptor.capture(), this.attributesCaptor.capture()); - assertThat(authorizationExceptionCaptor.getValue()).isInstanceOfSatisfying(ClientAuthorizationException.class, - e -> { - assertThat(e.getClientRegistrationId()).isEqualTo(registration.getRegistrationId()); + assertThat(this.authorizationExceptionCaptor.getValue()) + .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token"); assertThat(e).hasNoCause(); assertThat(e).hasMessageContaining("[invalid_token]"); }); - assertThat(authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); - assertThat(attributesCaptor.getValue()) + assertThat(this.authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); + assertThat(this.attributesCaptor.getValue()) .containsExactly(entry(ServerWebExchange.class.getName(), this.serverWebExchange)); } @Test public void filterWhenUnauthorizedWithWebClientExceptionThenInvokeFailureHandler() { - function.setAuthorizationFailureHandler(authorizationFailureHandler); + this.function.setAuthorizationFailureHandler(this.authorizationFailureHandler); PublisherProbe publisherProbe = PublisherProbe.empty(); - when(authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())).thenReturn(publisherProbe.mono()); + when(this.authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())) + .thenReturn(publisherProbe.mono()); OAuth2RefreshToken refreshToken = new OAuth2RefreshToken("refresh-token", this.accessToken.getIssuedAt()); OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient(this.registration, "principalName", @@ -471,27 +473,28 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { assertThat(publisherProbe.wasSubscribed()).isTrue(); - verify(authorizationFailureHandler).onAuthorizationFailure(authorizationExceptionCaptor.capture(), - authenticationCaptor.capture(), attributesCaptor.capture()); + verify(this.authorizationFailureHandler).onAuthorizationFailure(this.authorizationExceptionCaptor.capture(), + this.authenticationCaptor.capture(), this.attributesCaptor.capture()); - assertThat(authorizationExceptionCaptor.getValue()).isInstanceOfSatisfying(ClientAuthorizationException.class, - e -> { - assertThat(e.getClientRegistrationId()).isEqualTo(registration.getRegistrationId()); + assertThat(this.authorizationExceptionCaptor.getValue()) + .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo("invalid_token"); assertThat(e).hasCause(exception); assertThat(e).hasMessageContaining("[invalid_token]"); }); - assertThat(authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); - assertThat(attributesCaptor.getValue()) + assertThat(this.authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); + assertThat(this.attributesCaptor.getValue()) .containsExactly(entry(ServerWebExchange.class.getName(), this.serverWebExchange)); } @Test public void filterWhenForbiddenThenInvokeFailureHandler() { - function.setAuthorizationFailureHandler(authorizationFailureHandler); + this.function.setAuthorizationFailureHandler(this.authorizationFailureHandler); PublisherProbe publisherProbe = PublisherProbe.empty(); - when(authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())).thenReturn(publisherProbe.mono()); + when(this.authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())) + .thenReturn(publisherProbe.mono()); OAuth2RefreshToken refreshToken = new OAuth2RefreshToken("refresh-token", this.accessToken.getIssuedAt()); OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient(this.registration, "principalName", @@ -499,33 +502,34 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { ClientRequest request = ClientRequest.create(GET, URI.create("https://example.com")) .attributes(oauth2AuthorizedClient(authorizedClient)).build(); - when(exchange.getResponse().rawStatusCode()).thenReturn(HttpStatus.FORBIDDEN.value()); + when(this.exchange.getResponse().rawStatusCode()).thenReturn(HttpStatus.FORBIDDEN.value()); this.function.filter(request, this.exchange).subscriberContext(serverWebExchange()).block(); assertThat(publisherProbe.wasSubscribed()).isTrue(); - verify(authorizationFailureHandler).onAuthorizationFailure(authorizationExceptionCaptor.capture(), - authenticationCaptor.capture(), attributesCaptor.capture()); + verify(this.authorizationFailureHandler).onAuthorizationFailure(this.authorizationExceptionCaptor.capture(), + this.authenticationCaptor.capture(), this.attributesCaptor.capture()); - assertThat(authorizationExceptionCaptor.getValue()).isInstanceOfSatisfying(ClientAuthorizationException.class, - e -> { - assertThat(e.getClientRegistrationId()).isEqualTo(registration.getRegistrationId()); + assertThat(this.authorizationExceptionCaptor.getValue()) + .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo("insufficient_scope"); assertThat(e).hasNoCause(); assertThat(e).hasMessageContaining("[insufficient_scope]"); }); - assertThat(authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); - assertThat(attributesCaptor.getValue()) + assertThat(this.authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); + assertThat(this.attributesCaptor.getValue()) .containsExactly(entry(ServerWebExchange.class.getName(), this.serverWebExchange)); } @Test public void filterWhenForbiddenWithWebClientExceptionThenInvokeFailureHandler() { - function.setAuthorizationFailureHandler(authorizationFailureHandler); + this.function.setAuthorizationFailureHandler(this.authorizationFailureHandler); PublisherProbe publisherProbe = PublisherProbe.empty(); - when(authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())).thenReturn(publisherProbe.mono()); + when(this.authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())) + .thenReturn(publisherProbe.mono()); OAuth2RefreshToken refreshToken = new OAuth2RefreshToken("refresh-token", this.accessToken.getIssuedAt()); OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient(this.registration, "principalName", @@ -543,27 +547,28 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { assertThat(publisherProbe.wasSubscribed()).isTrue(); - verify(authorizationFailureHandler).onAuthorizationFailure(authorizationExceptionCaptor.capture(), - authenticationCaptor.capture(), attributesCaptor.capture()); + verify(this.authorizationFailureHandler).onAuthorizationFailure(this.authorizationExceptionCaptor.capture(), + this.authenticationCaptor.capture(), this.attributesCaptor.capture()); - assertThat(authorizationExceptionCaptor.getValue()).isInstanceOfSatisfying(ClientAuthorizationException.class, - e -> { - assertThat(e.getClientRegistrationId()).isEqualTo(registration.getRegistrationId()); + assertThat(this.authorizationExceptionCaptor.getValue()) + .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo("insufficient_scope"); assertThat(e).hasCause(exception); assertThat(e).hasMessageContaining("[insufficient_scope]"); }); - assertThat(authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); - assertThat(attributesCaptor.getValue()) + assertThat(this.authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); + assertThat(this.attributesCaptor.getValue()) .containsExactly(entry(ServerWebExchange.class.getName(), this.serverWebExchange)); } @Test public void filterWhenWWWAuthenticateHeaderIncludesErrorThenInvokeFailureHandler() { - function.setAuthorizationFailureHandler(authorizationFailureHandler); + this.function.setAuthorizationFailureHandler(this.authorizationFailureHandler); PublisherProbe publisherProbe = PublisherProbe.empty(); - when(authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())).thenReturn(publisherProbe.mono()); + when(this.authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())) + .thenReturn(publisherProbe.mono()); OAuth2RefreshToken refreshToken = new OAuth2RefreshToken("refresh-token", this.accessToken.getIssuedAt()); OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient(this.registration, "principalName", @@ -583,12 +588,12 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { assertThat(publisherProbe.wasSubscribed()).isTrue(); - verify(authorizationFailureHandler).onAuthorizationFailure(authorizationExceptionCaptor.capture(), - authenticationCaptor.capture(), attributesCaptor.capture()); + verify(this.authorizationFailureHandler).onAuthorizationFailure(this.authorizationExceptionCaptor.capture(), + this.authenticationCaptor.capture(), this.attributesCaptor.capture()); - assertThat(authorizationExceptionCaptor.getValue()).isInstanceOfSatisfying(ClientAuthorizationException.class, - e -> { - assertThat(e.getClientRegistrationId()).isEqualTo(registration.getRegistrationId()); + assertThat(this.authorizationExceptionCaptor.getValue()) + .isInstanceOfSatisfying(ClientAuthorizationException.class, e -> { + assertThat(e.getClientRegistrationId()).isEqualTo(this.registration.getRegistrationId()); assertThat(e.getError().getErrorCode()).isEqualTo(OAuth2ErrorCodes.INSUFFICIENT_SCOPE); assertThat(e.getError().getDescription()) .isEqualTo("The request requires higher privileges than provided by the access token."); @@ -596,17 +601,18 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { assertThat(e).hasNoCause(); assertThat(e).hasMessageContaining(OAuth2ErrorCodes.INSUFFICIENT_SCOPE); }); - assertThat(authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); - assertThat(attributesCaptor.getValue()) + assertThat(this.authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); + assertThat(this.attributesCaptor.getValue()) .containsExactly(entry(ServerWebExchange.class.getName(), this.serverWebExchange)); } @Test public void filterWhenAuthorizationExceptionThenInvokeFailureHandler() { - function.setAuthorizationFailureHandler(authorizationFailureHandler); + this.function.setAuthorizationFailureHandler(this.authorizationFailureHandler); PublisherProbe publisherProbe = PublisherProbe.empty(); - when(authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())).thenReturn(publisherProbe.mono()); + when(this.authorizationFailureHandler.onAuthorizationFailure(any(), any(), any())) + .thenReturn(publisherProbe.mono()); OAuth2RefreshToken refreshToken = new OAuth2RefreshToken("refresh-token", this.accessToken.getIssuedAt()); OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient(this.registration, "principalName", @@ -624,18 +630,18 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { assertThat(publisherProbe.wasSubscribed()).isTrue(); - verify(authorizationFailureHandler).onAuthorizationFailure(authorizationExceptionCaptor.capture(), - authenticationCaptor.capture(), attributesCaptor.capture()); + verify(this.authorizationFailureHandler).onAuthorizationFailure(this.authorizationExceptionCaptor.capture(), + this.authenticationCaptor.capture(), this.attributesCaptor.capture()); - assertThat(authorizationExceptionCaptor.getValue()).isSameAs(exception); - assertThat(authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); - assertThat(attributesCaptor.getValue()) + assertThat(this.authorizationExceptionCaptor.getValue()).isSameAs(exception); + assertThat(this.authenticationCaptor.getValue()).isInstanceOf(AnonymousAuthenticationToken.class); + assertThat(this.attributesCaptor.getValue()) .containsExactly(entry(ServerWebExchange.class.getName(), this.serverWebExchange)); } @Test public void filterWhenOtherHttpStatusShouldNotInvokeFailureHandler() { - function.setAuthorizationFailureHandler(authorizationFailureHandler); + this.function.setAuthorizationFailureHandler(this.authorizationFailureHandler); OAuth2RefreshToken refreshToken = new OAuth2RefreshToken("refresh-token", this.accessToken.getIssuedAt()); OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient(this.registration, "principalName", @@ -643,11 +649,11 @@ public class ServerOAuth2AuthorizedClientExchangeFilterFunctionTests { ClientRequest request = ClientRequest.create(GET, URI.create("https://example.com")) .attributes(oauth2AuthorizedClient(authorizedClient)).build(); - when(exchange.getResponse().rawStatusCode()).thenReturn(HttpStatus.BAD_REQUEST.value()); + when(this.exchange.getResponse().rawStatusCode()).thenReturn(HttpStatus.BAD_REQUEST.value()); this.function.filter(request, this.exchange).subscriberContext(serverWebExchange()).block(); - verify(authorizationFailureHandler, never()).onAuthorizationFailure(any(), any(), any()); + verify(this.authorizationFailureHandler, never()).onAuthorizationFailure(any(), any(), any()); } @Test diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionTests.java index 8cf9fd05f4..2728dce197 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionTests.java @@ -343,7 +343,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { verify(this.authorizedClientRepository).saveAuthorizedClient(this.authorizedClientCaptor.capture(), eq(this.authentication), any(), any()); - OAuth2AuthorizedClient newAuthorizedClient = authorizedClientCaptor.getValue(); + OAuth2AuthorizedClient newAuthorizedClient = this.authorizedClientCaptor.getValue(); assertThat(newAuthorizedClient.getAccessToken()).isEqualTo(response.getAccessToken()); assertThat(newAuthorizedClient.getRefreshToken()).isEqualTo(response.getRefreshToken()); @@ -396,7 +396,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { verify(this.authorizedClientRepository).saveAuthorizedClient(this.authorizedClientCaptor.capture(), eq(this.authentication), any(), any()); - OAuth2AuthorizedClient newAuthorizedClient = authorizedClientCaptor.getValue(); + OAuth2AuthorizedClient newAuthorizedClient = this.authorizedClientCaptor.getValue(); assertThat(newAuthorizedClient.getAccessToken()).isEqualTo(response.getAccessToken()); assertThat(newAuthorizedClient.getRefreshToken().getTokenValue()).isEqualTo(refreshToken.getTokenValue()); @@ -426,7 +426,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { verify(this.authorizedClientRepository, never()).saveAuthorizedClient(any(), eq(this.authentication), any(), any()); - verify(clientCredentialsTokenResponseClient, never()).getTokenResponse(any()); + verify(this.clientCredentialsTokenResponseClient, never()).getTokenResponse(any()); List requests = this.exchange.getRequests(); assertThat(requests).hasSize(1); @@ -510,7 +510,7 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionTests { this.function.filter(request, this.exchange).block(); verify(this.passwordTokenResponseClient).getTokenResponse(any()); - verify(this.authorizedClientRepository).saveAuthorizedClient(any(), eq(authentication), any(), any()); + verify(this.authorizedClientRepository).saveAuthorizedClient(any(), eq(this.authentication), any(), any()); List requests = this.exchange.getRequests(); assertThat(requests).hasSize(1); diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTests.java index e1bd4d0247..a7c052fb91 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTests.java @@ -51,7 +51,7 @@ public class MapOAuth2AccessTokenResponseConverterTests { map.put("refresh_token", "refresh-token-1234"); map.put("custom_parameter_1", "custom-value-1"); map.put("custom_parameter_2", "custom-value-2"); - OAuth2AccessTokenResponse converted = messageConverter.convert(map); + OAuth2AccessTokenResponse converted = this.messageConverter.convert(map); OAuth2AccessToken accessToken = converted.getAccessToken(); Assert.assertNotNull(accessToken); Assert.assertEquals("access-token-1234", accessToken.getTokenValue()); @@ -79,7 +79,7 @@ public class MapOAuth2AccessTokenResponseConverterTests { Map map = new HashMap<>(); map.put("access_token", "access-token-1234"); map.put("token_type", "bearer"); - OAuth2AccessTokenResponse converted = messageConverter.convert(map); + OAuth2AccessTokenResponse converted = this.messageConverter.convert(map); OAuth2AccessToken accessToken = converted.getAccessToken(); Assert.assertNotNull(accessToken); Assert.assertEquals("access-token-1234", accessToken.getTokenValue()); @@ -104,7 +104,7 @@ public class MapOAuth2AccessTokenResponseConverterTests { map.put("access_token", "access-token-1234"); map.put("token_type", "bearer"); map.put("expires_in", "2100-01-01-abc"); - OAuth2AccessTokenResponse converted = messageConverter.convert(map); + OAuth2AccessTokenResponse converted = this.messageConverter.convert(map); OAuth2AccessToken accessToken = converted.getAccessToken(); Assert.assertNotNull(accessToken); Assert.assertEquals("access-token-1234", accessToken.getTokenValue()); diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTests.java index 0b6abc2dee..2e7edf479f 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTests.java @@ -53,7 +53,7 @@ public class OAuth2AccessTokenResponseMapConverterTests { OAuth2AccessTokenResponse build = OAuth2AccessTokenResponse.withToken("access-token-value-1234").expiresIn(3699) .additionalParameters(additionalParameters).refreshToken("refresh-token-value-1234").scopes(scopes) .tokenType(OAuth2AccessToken.TokenType.BEARER).build(); - Map result = messageConverter.convert(build); + Map result = this.messageConverter.convert(build); Assert.assertEquals(7, result.size()); Assert.assertEquals("access-token-value-1234", result.get("access_token")); @@ -69,7 +69,7 @@ public class OAuth2AccessTokenResponseMapConverterTests { public void convertMinimal() { OAuth2AccessTokenResponse build = OAuth2AccessTokenResponse.withToken("access-token-value-1234") .tokenType(OAuth2AccessToken.TokenType.BEARER).build(); - Map result = messageConverter.convert(build); + Map result = this.messageConverter.convert(build); Assert.assertEquals(3, result.size()); Assert.assertEquals("access-token-value-1234", result.get("access_token")); diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtTimestampValidator.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtTimestampValidator.java index 21ddb58aab..6659244242 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtTimestampValidator.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtTimestampValidator.java @@ -77,7 +77,7 @@ public final class JwtTimestampValidator implements OAuth2TokenValidator { Instant expiry = jwt.getExpiresAt(); if (expiry != null) { - if (Instant.now(this.clock).minus(clockSkew).isAfter(expiry)) { + if (Instant.now(this.clock).minus(this.clockSkew).isAfter(expiry)) { OAuth2Error oAuth2Error = createOAuth2Error(String.format("Jwt expired at %s", jwt.getExpiresAt())); return OAuth2TokenValidatorResult.failure(oAuth2Error); } @@ -86,7 +86,7 @@ public final class JwtTimestampValidator implements OAuth2TokenValidator { Instant notBefore = jwt.getNotBefore(); if (notBefore != null) { - if (Instant.now(this.clock).plus(clockSkew).isBefore(notBefore)) { + if (Instant.now(this.clock).plus(this.clockSkew).isBefore(notBefore)) { OAuth2Error oAuth2Error = createOAuth2Error(String.format("Jwt used before %s", jwt.getNotBefore())); return OAuth2TokenValidatorResult.failure(oAuth2Error); } @@ -96,7 +96,7 @@ public final class JwtTimestampValidator implements OAuth2TokenValidator { } private OAuth2Error createOAuth2Error(String reason) { - logger.debug(reason); + this.logger.debug(reason); return new OAuth2Error(OAuth2ErrorCodes.INVALID_REQUEST, reason, "https://tools.ietf.org/html/rfc6750#section-3.1"); } diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverter.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverter.java index c6acdd92cc..796689af8f 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverter.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverter.java @@ -178,7 +178,7 @@ public final class MappedJwtClaimSetConverter implements Converter addClaims(Map claims) { Map result = new HashMap<>(claims); - for (Map.Entry> entry : claimTypeConverters.entrySet()) { + for (Map.Entry> entry : this.claimTypeConverters.entrySet()) { if (!claims.containsKey(entry.getKey()) && entry.getValue().convert(null) != null) { result.put(entry.getKey(), entry.getValue().convert(null)); } diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java index 32f47e1887..57d1d28c04 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java @@ -40,13 +40,13 @@ public class JwtClaimValidatorTests { @Test public void validateWhenClaimPassesTheTestThenReturnsSuccess() { Jwt jwt = jwt().claim(ISS, "http://test").build(); - assertThat(validator.validate(jwt)).isEqualTo(OAuth2TokenValidatorResult.success()); + assertThat(this.validator.validate(jwt)).isEqualTo(OAuth2TokenValidatorResult.success()); } @Test public void validateWhenClaimFailsTheTestThenReturnsFailure() { Jwt jwt = jwt().claim(ISS, "http://abc").build(); - assertThat(validator.validate(jwt).getErrors().isEmpty()).isFalse(); + assertThat(this.validator.validate(jwt).getErrors().isEmpty()).isFalse(); } @Test @@ -62,7 +62,7 @@ public class JwtClaimValidatorTests { @Test public void validateWhenJwtIsNullThenThrowsIllegalArgumentException() { - assertThatThrownBy(() -> validator.validate(null)).isInstanceOf(IllegalArgumentException.class); + assertThatThrownBy(() -> this.validator.validate(null)).isInstanceOf(IllegalArgumentException.class); } } diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupportTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupportTests.java index 937d0bdd41..acf9a911ac 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupportTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupportTests.java @@ -230,7 +230,7 @@ public class NimbusJwtDecoderJwkSupportTests { @Test public void setClaimSetConverterWhenIsNullThenThrowsIllegalArgumentException() { - assertThatCode(() -> jwtDecoder.setClaimSetConverter(null)).isInstanceOf(IllegalArgumentException.class); + assertThatCode(() -> this.jwtDecoder.setClaimSetConverter(null)).isInstanceOf(IllegalArgumentException.class); } private static RestOperations mockJwkSetResponse(String response) { diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java index 30422bbdcc..28839446b8 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java @@ -118,7 +118,7 @@ public class NimbusReactiveJwtDecoderTests { public void setup() throws Exception { this.server = new MockWebServer(); this.server.start(); - this.server.enqueue(new MockResponse().setBody(jwkSet)); + this.server.enqueue(new MockResponse().setBody(this.jwkSet)); this.decoder = new NimbusReactiveJwtDecoder(this.server.url("/certs").toString()); } @@ -282,7 +282,7 @@ public class NimbusReactiveJwtDecoderTests { @Test public void withJwkSetUriWhenJwtProcessorCustomizerNullThenThrowsIllegalArgumentException() { - assertThatCode(() -> withJwkSetUri(jwkSetUri).jwtProcessorCustomizer(null).build()) + assertThatCode(() -> withJwkSetUri(this.jwkSetUri).jwtProcessorCustomizer(null).build()) .isInstanceOf(IllegalArgumentException.class).hasMessage("jwtProcessorCustomizer cannot be null"); } @@ -297,7 +297,7 @@ public class NimbusReactiveJwtDecoderTests { public void decodeWhenSignedThenOk() { WebClient webClient = mockJwkSetResponse(this.jwkSet); NimbusReactiveJwtDecoder decoder = withJwkSetUri(this.jwkSetUri).webClient(webClient).build(); - assertThat(decoder.decode(messageReadToken).block()).extracting(Jwt::getExpiresAt).isNotNull(); + assertThat(decoder.decode(this.messageReadToken).block()).extracting(Jwt::getExpiresAt).isNotNull(); verify(webClient).get(); } @@ -309,7 +309,7 @@ public class NimbusReactiveJwtDecoderTests { .jwtProcessorCustomizer( p -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) .build(); - assertThatCode(() -> decoder.decode(messageReadToken).block()).isInstanceOf(BadJwtException.class) + assertThatCode(() -> decoder.decode(this.messageReadToken).block()).isInstanceOf(BadJwtException.class) .hasRootCauseMessage("Required JOSE header \"typ\" (type) parameter is missing"); } @@ -433,7 +433,7 @@ public class NimbusReactiveJwtDecoderTests { .jwtProcessorCustomizer( p -> p.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(new JOSEObjectType("JWS")))) .build(); - assertThatCode(() -> decoder.decode(messageReadToken).block()).isInstanceOf(BadJwtException.class) + assertThatCode(() -> decoder.decode(this.messageReadToken).block()).isInstanceOf(BadJwtException.class) .hasRootCauseMessage("Required JOSE header \"typ\" (type) parameter is missing"); } diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/BearerTokenAuthenticationFilter.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/BearerTokenAuthenticationFilter.java index 034913e7e9..d294fb9d48 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/BearerTokenAuthenticationFilter.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/BearerTokenAuthenticationFilter.java @@ -66,7 +66,7 @@ public final class BearerTokenAuthenticationFilter extends OncePerRequestFilter private AuthenticationEntryPoint authenticationEntryPoint = new BearerTokenAuthenticationEntryPoint(); private AuthenticationFailureHandler authenticationFailureHandler = (request, response, - exception) -> authenticationEntryPoint.commence(request, response, exception); + exception) -> this.authenticationEntryPoint.commence(request, response, exception); /** * Construct a {@code BearerTokenAuthenticationFilter} using the provided parameter(s) diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationProviderTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationProviderTests.java index fe8c173d54..3fa0a85ff9 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationProviderTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationProviderTests.java @@ -58,7 +58,7 @@ public class JwtAuthenticationProviderTests { @Before public void setup() { this.provider = new JwtAuthenticationProvider(this.jwtDecoder); - this.provider.setJwtAuthenticationConverter(jwtAuthenticationConverter); + this.provider.setJwtAuthenticationConverter(this.jwtAuthenticationConverter); } @Test diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverterAdapterTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverterAdapterTests.java index f9bfc8bc7d..d15161fd07 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverterAdapterTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/ReactiveJwtAuthenticationConverterAdapterTests.java @@ -40,7 +40,7 @@ public class ReactiveJwtAuthenticationConverterAdapterTests { Converter converter = new JwtAuthenticationConverter(); ReactiveJwtAuthenticationConverterAdapter jwtAuthenticationConverter = new ReactiveJwtAuthenticationConverterAdapter( - converter); + this.converter); @Test public void convertWhenTokenHasScopeAttributeThenTranslatedToAuthorities() { diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServerBearerExchangeFilterFunctionTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServerBearerExchangeFilterFunctionTests.java index 52517b788d..9d85454580 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServerBearerExchangeFilterFunctionTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServerBearerExchangeFilterFunctionTests.java @@ -50,7 +50,8 @@ public class ServerBearerExchangeFilterFunctionTests { private OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "token-0", Instant.now(), Instant.now().plus(Duration.ofDays(1))); - private Authentication authentication = new AbstractOAuth2TokenAuthenticationToken(accessToken) { + private Authentication authentication = new AbstractOAuth2TokenAuthenticationToken( + this.accessToken) { @Override public Map getTokenAttributes() { return Collections.emptyMap(); diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServletBearerExchangeFilterFunctionTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServletBearerExchangeFilterFunctionTests.java index c4999fb545..9868ebfc2c 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServletBearerExchangeFilterFunctionTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/reactive/function/client/ServletBearerExchangeFilterFunctionTests.java @@ -55,7 +55,8 @@ public class ServletBearerExchangeFilterFunctionTests { private OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "token-0", Instant.now(), Instant.now().plus(Duration.ofDays(1))); - private Authentication authentication = new AbstractOAuth2TokenAuthenticationToken(accessToken) { + private Authentication authentication = new AbstractOAuth2TokenAuthenticationToken( + this.accessToken) { @Override public Map getTokenAttributes() { return Collections.emptyMap(); diff --git a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java index d5783de5c4..741b81af09 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java @@ -80,30 +80,30 @@ public class OpenID4JavaConsumer implements OpenIDConsumer { List discoveries; try { - discoveries = consumerManager.discover(identityUrl); + discoveries = this.consumerManager.discover(identityUrl); } catch (DiscoveryException e) { throw new OpenIDConsumerException("Error during discovery", e); } - DiscoveryInformation information = consumerManager.associate(discoveries); + DiscoveryInformation information = this.consumerManager.associate(discoveries); req.getSession().setAttribute(DISCOVERY_INFO_KEY, information); AuthRequest authReq; try { - authReq = consumerManager.authenticate(information, returnToUrl, realm); + authReq = this.consumerManager.authenticate(information, returnToUrl, realm); - logger.debug("Looking up attribute fetch list for identifier: " + identityUrl); + this.logger.debug("Looking up attribute fetch list for identifier: " + identityUrl); - List attributesToFetch = attributesToFetchFactory.createAttributeList(identityUrl); + List attributesToFetch = this.attributesToFetchFactory.createAttributeList(identityUrl); if (!attributesToFetch.isEmpty()) { req.getSession().setAttribute(ATTRIBUTE_LIST_KEY, attributesToFetch); FetchRequest fetchRequest = FetchRequest.createFetchRequest(); for (OpenIDAttribute attr : attributesToFetch) { - if (logger.isDebugEnabled()) { - logger.debug("Adding attribute " + attr.getType() + " to fetch request"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Adding attribute " + attr.getType() + " to fetch request"); } fetchRequest.addAttribute(attr.getName(), attr.getType(), attr.isRequired(), attr.getCount()); } @@ -148,7 +148,7 @@ public class OpenID4JavaConsumer implements OpenIDConsumer { VerificationResult verification; try { - verification = consumerManager.verify(receivingURL.toString(), openidResp, discovered); + verification = this.consumerManager.verify(receivingURL.toString(), openidResp, discovered); } catch (MessageException | AssociationException | DiscoveryException e) { throw new OpenIDConsumerException("Error verifying openid response", e); @@ -178,7 +178,7 @@ public class OpenID4JavaConsumer implements OpenIDConsumer { return Collections.emptyList(); } - logger.debug("Extracting attributes retrieved by attribute exchange"); + this.logger.debug("Extracting attributes retrieved by attribute exchange"); List attributes = Collections.emptyList(); @@ -202,8 +202,8 @@ public class OpenID4JavaConsumer implements OpenIDConsumer { throw new OpenIDConsumerException("Attribute retrieval failed", e); } - if (logger.isDebugEnabled()) { - logger.debug("Retrieved attributes" + attributes); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Retrieved attributes" + attributes); } return attributes; diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java index ff7a63ecc4..c60cb995e6 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java @@ -63,14 +63,14 @@ public class OpenIDAttribute implements Serializable { * The attribute name */ public String getName() { - return name; + return this.name; } /** * The attribute type Identifier (a URI). */ public String getType() { - return typeIdentifier; + return this.typeIdentifier; } /** @@ -78,7 +78,7 @@ public class OpenIDAttribute implements Serializable { * Defaults to "false". */ public boolean isRequired() { - return required; + return this.required; } public void setRequired(boolean required) { @@ -90,7 +90,7 @@ public class OpenIDAttribute implements Serializable { * request. Defaults to 1. */ public int getCount() { - return count; + return this.count; } public void setCount(int count) { @@ -101,17 +101,17 @@ public class OpenIDAttribute implements Serializable { * The values obtained from an attribute exchange. */ public List getValues() { - Assert.notNull(values, "Cannot read values from an authentication request attribute"); - return values; + Assert.notNull(this.values, "Cannot read values from an authentication request attribute"); + return this.values; } @Override public String toString() { StringBuilder result = new StringBuilder("["); - result.append(name); - if (values != null) { + result.append(this.name); + if (this.values != null) { result.append(":"); - result.append(values.toString()); + result.append(this.values.toString()); } result.append("]"); return result.toString(); diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java index fe00a93c13..97c51d27db 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java @@ -95,18 +95,18 @@ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessing public void afterPropertiesSet() { super.afterPropertiesSet(); - if (consumer == null) { + if (this.consumer == null) { try { - consumer = new OpenID4JavaConsumer(); + this.consumer = new OpenID4JavaConsumer(); } catch (ConsumerException e) { throw new IllegalArgumentException("Failed to initialize OpenID", e); } } - if (returnToUrlParameters.isEmpty() && getRememberMeServices() instanceof AbstractRememberMeServices) { - returnToUrlParameters = new HashSet<>(); - returnToUrlParameters.add(((AbstractRememberMeServices) getRememberMeServices()).getParameter()); + if (this.returnToUrlParameters.isEmpty() && getRememberMeServices() instanceof AbstractRememberMeServices) { + this.returnToUrlParameters = new HashSet<>(); + this.returnToUrlParameters.add(((AbstractRememberMeServices) getRememberMeServices()).getParameter()); } } @@ -132,10 +132,10 @@ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessing try { String returnToUrl = buildReturnToUrl(request); String realm = lookupRealm(returnToUrl); - String openIdUrl = consumer.beginConsumption(request, claimedIdentity, returnToUrl, realm); - if (logger.isDebugEnabled()) { - logger.debug("return_to is '" + returnToUrl + "', realm is '" + realm + "'"); - logger.debug("Redirecting to " + openIdUrl); + String openIdUrl = this.consumer.beginConsumption(request, claimedIdentity, returnToUrl, realm); + if (this.logger.isDebugEnabled()) { + this.logger.debug("return_to is '" + returnToUrl + "', realm is '" + realm + "'"); + this.logger.debug("Redirecting to " + openIdUrl); } response.sendRedirect(openIdUrl); @@ -143,24 +143,24 @@ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessing return null; } catch (OpenIDConsumerException e) { - logger.debug("Failed to consume claimedIdentity: " + claimedIdentity, e); + this.logger.debug("Failed to consume claimedIdentity: " + claimedIdentity, e); throw new AuthenticationServiceException( "Unable to process claimed identity '" + claimedIdentity + "'"); } } - if (logger.isDebugEnabled()) { - logger.debug("Supplied OpenID identity is " + identity); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Supplied OpenID identity is " + identity); } try { - token = consumer.endConsumption(request); + token = this.consumer.endConsumption(request); } catch (OpenIDConsumerException oice) { throw new AuthenticationServiceException("Consumer error", oice); } - token.setDetails(authenticationDetailsSource.buildDetails(request)); + token.setDetails(this.authenticationDetailsSource.buildDetails(request)); // delegate to the authentication provider Authentication authentication = this.getAuthenticationManager().authenticate(token); @@ -169,7 +169,7 @@ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessing } protected String lookupRealm(String returnToUrl) { - String mapping = realmMapping.get(returnToUrl); + String mapping = this.realmMapping.get(returnToUrl); if (mapping == null) { try { @@ -185,7 +185,7 @@ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessing mapping = realmBuffer.toString(); } catch (MalformedURLException e) { - logger.warn("returnToUrl was not a valid URL: [" + returnToUrl + "]", e); + this.logger.warn("returnToUrl was not a valid URL: [" + returnToUrl + "]", e); } } @@ -201,7 +201,7 @@ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessing protected String buildReturnToUrl(HttpServletRequest request) { StringBuffer sb = request.getRequestURL(); - Iterator iterator = returnToUrlParameters.iterator(); + Iterator iterator = this.returnToUrlParameters.iterator(); boolean isFirst = true; while (iterator.hasNext()) { @@ -230,10 +230,10 @@ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessing * Reads the claimedIdentityFieldName from the submitted request. */ protected String obtainUsername(HttpServletRequest req) { - String claimedIdentity = req.getParameter(claimedIdentityFieldName); + String claimedIdentity = req.getParameter(this.claimedIdentityFieldName); if (!StringUtils.hasText(claimedIdentity)) { - logger.error("No claimed identity supplied in authentication request"); + this.logger.error("No claimed identity supplied in authentication request"); return ""; } diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java index a95c579104..b46d8ffb47 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java @@ -53,7 +53,7 @@ public enum OpenIDAuthenticationStatus { @Override public String toString() { - return name; + return this.name; } } diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java index f854080877..f8ba9eb443 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java @@ -84,11 +84,11 @@ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken { } public String getIdentityUrl() { - return identityUrl; + return this.identityUrl; } public String getMessage() { - return message; + return this.message; } /** @@ -97,20 +97,20 @@ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken { * @see org.springframework.security.core.Authentication#getPrincipal() */ public Object getPrincipal() { - return principal; + return this.principal; } public OpenIDAuthenticationStatus getStatus() { - return status; + return this.status; } public List getAttributes() { - return attributes; + return this.attributes; } @Override public String toString() { - return "[" + super.toString() + ", attributes : " + attributes + "]"; + return "[" + super.toString() + ", attributes : " + this.attributes + "]"; } } diff --git a/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java b/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java index 39a0018530..dd86fd276d 100644 --- a/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java +++ b/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java @@ -38,9 +38,9 @@ public class RegexBasedAxFetchListFactory implements AxFetchListFactory { * which should be fetched for that pattern. */ public RegexBasedAxFetchListFactory(Map> regexMap) { - idToAttributes = new LinkedHashMap<>(); + this.idToAttributes = new LinkedHashMap<>(); for (Map.Entry> entry : regexMap.entrySet()) { - idToAttributes.put(Pattern.compile(entry.getKey()), entry.getValue()); + this.idToAttributes.put(Pattern.compile(entry.getKey()), entry.getValue()); } } @@ -49,7 +49,7 @@ public class RegexBasedAxFetchListFactory implements AxFetchListFactory { * defined for the first match. If no match is found, returns an empty list. */ public List createAttributeList(String identifier) { - for (Map.Entry> entry : idToAttributes.entrySet()) { + for (Map.Entry> entry : this.idToAttributes.entrySet()) { if (entry.getKey().matcher(identifier).matches()) { return entry.getValue(); } diff --git a/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java b/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java index 9228c022c6..1b33455e2c 100644 --- a/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java +++ b/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java @@ -47,11 +47,11 @@ public class MockOpenIDConsumer implements OpenIDConsumer { } public String beginConsumption(HttpServletRequest req, String claimedIdentity, String returnToUrl, String realm) { - return redirectUrl; + return this.redirectUrl; } public OpenIDAuthenticationToken endConsumption(HttpServletRequest req) { - return token; + return this.token; } /** diff --git a/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java b/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java index 09142e1e17..e22514236a 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java @@ -70,7 +70,7 @@ public class OpenID4JavaConsumerTests { consumer.beginConsumption(request, "", "", ""); assertThat(request.getSession().getAttribute("SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST")) - .isEqualTo(attributes); + .isEqualTo(this.attributes); assertThat(request.getSession().getAttribute(DiscoveryInformation.class.getName())).isEqualTo(di); // Check with empty attribute fetch list @@ -180,7 +180,7 @@ public class OpenID4JavaConsumerTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.getSession().setAttribute(DiscoveryInformation.class.getName(), di); - request.getSession().setAttribute("SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST", attributes); + request.getSession().setAttribute("SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST", this.attributes); OpenIDAuthenticationToken auth = consumer.endConsumption(request); @@ -196,7 +196,7 @@ public class OpenID4JavaConsumerTests { when(msg.getExtension(AxMessage.OPENID_NS_AX)).thenReturn(fr); when(fr.getAttributeValues("a")).thenReturn(Arrays.asList("x", "y")); - List fetched = consumer.fetchAxAttributes(msg, attributes); + List fetched = consumer.fetchAxAttributes(msg, this.attributes); assertThat(fetched).hasSize(1); assertThat(fetched.get(0).getValues()).hasSize(2); @@ -211,7 +211,7 @@ public class OpenID4JavaConsumerTests { when(msg.getExtension(AxMessage.OPENID_NS_AX)).thenThrow(new MessageException("")); when(fr.getAttributeValues("a")).thenReturn(Arrays.asList("x", "y")); - consumer.fetchAxAttributes(msg, attributes); + consumer.fetchAxAttributes(msg, this.attributes); } @Test(expected = OpenIDConsumerException.class) @@ -229,7 +229,7 @@ public class OpenID4JavaConsumerTests { private class MockAttributesFactory implements AxFetchListFactory { public List createAttributeList(String identifier) { - return attributes; + return OpenID4JavaConsumerTests.this.attributes; } } diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java index d5253fde1c..e2883a94a0 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java @@ -57,13 +57,13 @@ public class OpenIDAuthenticationFilterTests { @Before public void setUp() { - filter = new OpenIDAuthenticationFilter(); - filter.setConsumer(new MockOpenIDConsumer(REDIRECT_URL)); + this.filter = new OpenIDAuthenticationFilter(); + this.filter.setConsumer(new MockOpenIDConsumer(REDIRECT_URL)); SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); - filter.setAuthenticationSuccessHandler(new SavedRequestAwareAuthenticationSuccessHandler()); + this.filter.setAuthenticationSuccessHandler(new SavedRequestAwareAuthenticationSuccessHandler()); successHandler.setDefaultTargetUrl(DEFAULT_TARGET_URL); - filter.setAuthenticationManager(a -> a); - filter.afterPropertiesSet(); + this.filter.setAuthenticationManager(a -> a); + this.filter.afterPropertiesSet(); } @Test @@ -77,7 +77,7 @@ public class OpenIDAuthenticationFilterTests { req.setParameter("openid_identifier", " " + CLAIMED_IDENTITY_URL); req.setRemoteHost("www.example.com"); - filter.setConsumer(new MockOpenIDConsumer() { + this.filter.setConsumer(new MockOpenIDConsumer() { public String beginConsumption(HttpServletRequest req, String claimedIdentity, String returnToUrl, String realm) { assertThat(claimedIdentity).isEqualTo(CLAIMED_IDENTITY_URL); @@ -88,7 +88,7 @@ public class OpenIDAuthenticationFilterTests { }); FilterChain fc = mock(FilterChain.class); - filter.doFilter(req, response, fc); + this.filter.doFilter(req, response, fc); assertThat(response.getRedirectedUrl()).isEqualTo(REDIRECT_URL); // Filter chain shouldn't proceed verify(fc, never()).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); @@ -104,9 +104,9 @@ public class OpenIDAuthenticationFilterTests { String paramValue = "https://example.com/path?a=b&c=d"; MockHttpServletRequest req = new MockHttpServletRequest("GET", REQUEST_PATH); req.addParameter(paramName, paramValue); - filter.setReturnToUrlParameters(Collections.singleton(paramName)); + this.filter.setReturnToUrlParameters(Collections.singleton(paramName)); - URI returnTo = new URI(filter.buildReturnToUrl(req)); + URI returnTo = new URI(this.filter.buildReturnToUrl(req)); String query = returnTo.getRawQuery(); assertThat(count(query, '=')).isEqualTo(1); assertThat(count(query, '&')).isZero(); diff --git a/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java b/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java index 3768be9186..789e77ceb4 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java +++ b/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java @@ -72,7 +72,7 @@ public class AuthenticationSimpleHttpInvokerRequestExecutor extends SimpleHttpIn Authentication auth = SecurityContextHolder.getContext().getAuthentication(); if ((auth != null) && (auth.getName() != null) && (auth.getCredentials() != null) - && !trustResolver.isAnonymous(auth)) { + && !this.trustResolver.isAnonymous(auth)) { String base64 = auth.getName() + ":" + auth.getCredentials().toString(); con.setRequestProperty("Authorization", "Basic " + new String(Base64.getEncoder().encode(base64.getBytes()))); diff --git a/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java b/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java index 09bbd95c2a..6967ee7ff2 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java +++ b/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java @@ -63,17 +63,17 @@ public class ContextPropagatingRemoteInvocation extends RemoteInvocation { Authentication currentUser = SecurityContextHolder.getContext().getAuthentication(); if (currentUser != null) { - principal = currentUser.getName(); + this.principal = currentUser.getName(); Object userCredentials = currentUser.getCredentials(); - credentials = userCredentials == null ? null : userCredentials.toString(); + this.credentials = userCredentials == null ? null : userCredentials.toString(); } else { - principal = credentials = null; + this.principal = this.credentials = null; } if (logger.isDebugEnabled()) { - logger.debug("RemoteInvocation now has principal: " + principal); - if (credentials == null) { + logger.debug("RemoteInvocation now has principal: " + this.principal); + if (this.credentials == null) { logger.debug("RemoteInvocation now has null credentials."); } } @@ -94,8 +94,8 @@ public class ContextPropagatingRemoteInvocation extends RemoteInvocation { public Object invoke(Object targetObject) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { - if (principal != null) { - Authentication request = createAuthenticationRequest(principal, credentials); + if (this.principal != null) { + Authentication request = createAuthenticationRequest(this.principal, this.credentials); request.setAuthenticated(false); SecurityContextHolder.getContext().setAuthentication(request); diff --git a/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java b/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java index 67c48447b6..38659f0f57 100644 --- a/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java +++ b/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java @@ -45,64 +45,65 @@ public class JndiDnsResolverTests { @Before public void setup() { - contextFactory = mock(InitialContextFactory.class); - context = mock(DirContext.class); - dnsResolver = new JndiDnsResolver(); - dnsResolver.setCtxFactory(contextFactory); - when(contextFactory.getCtx()).thenReturn(context); + this.contextFactory = mock(InitialContextFactory.class); + this.context = mock(DirContext.class); + this.dnsResolver = new JndiDnsResolver(); + this.dnsResolver.setCtxFactory(this.contextFactory); + when(this.contextFactory.getCtx()).thenReturn(this.context); } @Test public void testResolveIpAddress() throws Exception { Attributes records = new BasicAttributes("A", "63.246.7.80"); - when(context.getAttributes("www.springsource.com", new String[] { "A" })).thenReturn(records); + when(this.context.getAttributes("www.springsource.com", new String[] { "A" })).thenReturn(records); - String ipAddress = dnsResolver.resolveIpAddress("www.springsource.com"); + String ipAddress = this.dnsResolver.resolveIpAddress("www.springsource.com"); assertThat(ipAddress).isEqualTo("63.246.7.80"); } @Test(expected = DnsEntryNotFoundException.class) public void testResolveIpAddressNotExisting() throws Exception { - when(context.getAttributes(any(String.class), any(String[].class))) + when(this.context.getAttributes(any(String.class), any(String[].class))) .thenThrow(new NameNotFoundException("not found")); - dnsResolver.resolveIpAddress("notexisting.ansdansdugiuzgguzgioansdiandwq.foo"); + this.dnsResolver.resolveIpAddress("notexisting.ansdansdugiuzgguzgioansdiandwq.foo"); } @Test public void testResolveServiceEntry() throws Exception { BasicAttributes records = createSrvRecords(); - when(context.getAttributes("_ldap._tcp.springsource.com", new String[] { "SRV" })).thenReturn(records); + when(this.context.getAttributes("_ldap._tcp.springsource.com", new String[] { "SRV" })).thenReturn(records); - String hostname = dnsResolver.resolveServiceEntry("ldap", "springsource.com"); + String hostname = this.dnsResolver.resolveServiceEntry("ldap", "springsource.com"); assertThat(hostname).isEqualTo("kdc.springsource.com"); } @Test(expected = DnsEntryNotFoundException.class) public void testResolveServiceEntryNotExisting() throws Exception { - when(context.getAttributes(any(String.class), any(String[].class))) + when(this.context.getAttributes(any(String.class), any(String[].class))) .thenThrow(new NameNotFoundException("not found")); - dnsResolver.resolveServiceEntry("wrong", "secpod.de"); + this.dnsResolver.resolveServiceEntry("wrong", "secpod.de"); } @Test public void testResolveServiceIpAddress() throws Exception { BasicAttributes srvRecords = createSrvRecords(); BasicAttributes aRecords = new BasicAttributes("A", "63.246.7.80"); - when(context.getAttributes("_ldap._tcp.springsource.com", new String[] { "SRV" })).thenReturn(srvRecords); - when(context.getAttributes("kdc.springsource.com", new String[] { "A" })).thenReturn(aRecords); + when(this.context.getAttributes("_ldap._tcp.springsource.com", new String[] { "SRV" })).thenReturn(srvRecords); + when(this.context.getAttributes("kdc.springsource.com", new String[] { "A" })).thenReturn(aRecords); - String ipAddress = dnsResolver.resolveServiceIpAddress("ldap", "springsource.com"); + String ipAddress = this.dnsResolver.resolveServiceIpAddress("ldap", "springsource.com"); assertThat(ipAddress).isEqualTo("63.246.7.80"); } @Test(expected = DnsLookupException.class) public void testUnknowError() throws Exception { - when(context.getAttributes(any(String.class), any(String[].class))).thenThrow(new NamingException("error")); - dnsResolver.resolveIpAddress(""); + when(this.context.getAttributes(any(String.class), any(String[].class))) + .thenThrow(new NamingException("error")); + this.dnsResolver.resolveIpAddress(""); } private BasicAttributes createSrvRecords() { diff --git a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java index 449b23532e..e6d1ad584a 100644 --- a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java +++ b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java @@ -111,11 +111,11 @@ public class AuthenticationSimpleHttpInvokerRequestExecutorTests { } public String getRequestProperty(String key) { - return requestProperties.get(key); + return this.requestProperties.get(key); } public void setRequestProperty(String key, String value) { - requestProperties.put(key, value); + this.requestProperties.put(key, value); } public boolean usingProxy() { diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcher.java b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcher.java index c50665eca2..275208c6a6 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcher.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcher.java @@ -53,7 +53,7 @@ public interface PayloadExchangeMatcher { } public boolean isMatch() { - return match; + return this.match; } /** @@ -61,7 +61,7 @@ public interface PayloadExchangeMatcher { * @return */ public Map getVariables() { - return variables; + return this.variables; } /** diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocketTests.java b/rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocketTests.java index 6cf687eced..95ae4f08f7 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocketTests.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocketTests.java @@ -95,22 +95,22 @@ public class PayloadInterceptorRSocketTests { this.delegate = null; List interceptors = Arrays.asList(this.interceptor); assertThatCode(() -> { - new PayloadInterceptorRSocket(this.delegate, interceptors, metadataMimeType, dataMimeType); + new PayloadInterceptorRSocket(this.delegate, interceptors, this.metadataMimeType, this.dataMimeType); }).isInstanceOf(IllegalArgumentException.class); } @Test public void constructorWhenNullInterceptorsThenException() { List interceptors = null; - assertThatCode(() -> new PayloadInterceptorRSocket(this.delegate, interceptors, metadataMimeType, dataMimeType)) - .isInstanceOf(IllegalArgumentException.class); + assertThatCode(() -> new PayloadInterceptorRSocket(this.delegate, interceptors, this.metadataMimeType, + this.dataMimeType)).isInstanceOf(IllegalArgumentException.class); } @Test public void constructorWhenEmptyInterceptorsThenException() { List interceptors = Collections.emptyList(); - assertThatCode(() -> new PayloadInterceptorRSocket(this.delegate, interceptors, metadataMimeType, dataMimeType)) - .isInstanceOf(IllegalArgumentException.class); + assertThatCode(() -> new PayloadInterceptorRSocket(this.delegate, interceptors, this.metadataMimeType, + this.dataMimeType)).isInstanceOf(IllegalArgumentException.class); } // single interceptor @@ -121,7 +121,7 @@ public class PayloadInterceptorRSocketTests { when(this.delegate.fireAndForget(any())).thenReturn(this.voidResult.mono()); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.fireAndForget(this.payload)).then(() -> this.voidResult.assertWasSubscribed()) .verifyComplete(); @@ -136,7 +136,7 @@ public class PayloadInterceptorRSocketTests { when(this.interceptor.intercept(any(), any())).thenReturn(Mono.error(expected)); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.fireAndForget(this.payload)) .then(() -> this.voidResult.assertWasNotSubscribed()) @@ -159,7 +159,7 @@ public class PayloadInterceptorRSocketTests { } }; PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(assertAuthentication, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); interceptor.fireAndForget(this.payload).block(); @@ -174,7 +174,7 @@ public class PayloadInterceptorRSocketTests { when(this.delegate.requestResponse(any())).thenReturn(this.payloadResult.mono()); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.requestResponse(this.payload)) .then(() -> this.payloadResult.assertSubscribers()).then(() -> this.payloadResult.emit(this.payload)) @@ -191,7 +191,7 @@ public class PayloadInterceptorRSocketTests { when(this.interceptor.intercept(any(), any())).thenReturn(Mono.error(expected)); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); assertThatCode(() -> interceptor.requestResponse(this.payload).block()).isEqualTo(expected); @@ -213,7 +213,7 @@ public class PayloadInterceptorRSocketTests { } }; PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(assertAuthentication, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.requestResponse(this.payload)) .then(() -> this.payloadResult.assertSubscribers()).then(() -> this.payloadResult.emit(this.payload)) @@ -230,7 +230,7 @@ public class PayloadInterceptorRSocketTests { when(this.delegate.requestStream(any())).thenReturn(this.payloadResult.flux()); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.requestStream(this.payload)).then(() -> this.payloadResult.assertSubscribers()) .then(() -> this.payloadResult.emit(this.payload)).expectNext(this.payload).verifyComplete(); @@ -245,7 +245,7 @@ public class PayloadInterceptorRSocketTests { when(this.interceptor.intercept(any(), any())).thenReturn(Mono.error(expected)); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.requestStream(this.payload)) .then(() -> this.payloadResult.assertNoSubscribers()) @@ -268,7 +268,7 @@ public class PayloadInterceptorRSocketTests { } }; PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(assertAuthentication, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.requestStream(this.payload)).then(() -> this.payloadResult.assertSubscribers()) .then(() -> this.payloadResult.emit(this.payload)).expectNext(this.payload).verifyComplete(); @@ -284,7 +284,7 @@ public class PayloadInterceptorRSocketTests { when(this.delegate.requestChannel(any())).thenReturn(this.payloadResult.flux()); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.requestChannel(Flux.just(this.payload))) .then(() -> this.payloadResult.assertSubscribers()).then(() -> this.payloadResult.emit(this.payload)) @@ -325,7 +325,7 @@ public class PayloadInterceptorRSocketTests { } }; PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(assertAuthentication, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.requestChannel(payload)).then(() -> this.payloadResult.assertSubscribers()) .then(() -> this.payloadResult.emit(this.payload)).expectNext(this.payload).verifyComplete(); @@ -341,7 +341,7 @@ public class PayloadInterceptorRSocketTests { when(this.delegate.metadataPush(any())).thenReturn(this.voidResult.mono()); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.metadataPush(this.payload)).then(() -> this.voidResult.assertWasSubscribed()) .verifyComplete(); @@ -356,7 +356,7 @@ public class PayloadInterceptorRSocketTests { when(this.interceptor.intercept(any(), any())).thenReturn(Mono.error(expected)); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.metadataPush(this.payload)).then(() -> this.voidResult.assertWasNotSubscribed()) .verifyErrorSatisfies(e -> assertThat(e).isEqualTo(expected)); @@ -378,7 +378,7 @@ public class PayloadInterceptorRSocketTests { } }; PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(assertAuthentication, - Arrays.asList(this.interceptor), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor), this.metadataMimeType, this.dataMimeType); StepVerifier.create(interceptor.metadataPush(this.payload)).verifyComplete(); @@ -397,7 +397,7 @@ public class PayloadInterceptorRSocketTests { when(this.delegate.fireAndForget(any())).thenReturn(this.voidResult.mono()); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor, this.interceptor2), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor, this.interceptor2), this.metadataMimeType, this.dataMimeType); interceptor.fireAndForget(this.payload).block(); @@ -413,7 +413,7 @@ public class PayloadInterceptorRSocketTests { when(this.delegate.fireAndForget(any())).thenReturn(this.voidResult.mono()); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor, this.interceptor2), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor, this.interceptor2), this.metadataMimeType, this.dataMimeType); interceptor.fireAndForget(this.payload).block(); @@ -430,7 +430,7 @@ public class PayloadInterceptorRSocketTests { when(this.interceptor.intercept(any(), any())).thenReturn(Mono.error(expected)); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor, this.interceptor2), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor, this.interceptor2), this.metadataMimeType, this.dataMimeType); assertThatCode(() -> interceptor.fireAndForget(this.payload).block()).isEqualTo(expected); @@ -447,7 +447,7 @@ public class PayloadInterceptorRSocketTests { when(this.interceptor2.intercept(any(), any())).thenReturn(Mono.error(expected)); PayloadInterceptorRSocket interceptor = new PayloadInterceptorRSocket(this.delegate, - Arrays.asList(this.interceptor, this.interceptor2), metadataMimeType, dataMimeType); + Arrays.asList(this.interceptor, this.interceptor2), this.metadataMimeType, this.dataMimeType); assertThatCode(() -> interceptor.fireAndForget(this.payload).block()).isEqualTo(expected); diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationException.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationException.java index b462b18ccf..a2d5b7deea 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationException.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationException.java @@ -174,7 +174,7 @@ public class Saml2AuthenticationException extends AuthenticationException { @Override public String toString() { final StringBuffer sb = new StringBuffer("Saml2AuthenticationException{"); - sb.append("error=").append(error); + sb.append("error=").append(this.error); sb.append('}'); return sb.toString(); } diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequest.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequest.java index 7f428f7a3e..495709919b 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequest.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequest.java @@ -87,7 +87,7 @@ public final class Saml2AuthenticationRequest { * @return the AssertionConsumerServiceURL value */ public String getAssertionConsumerServiceUrl() { - return assertionConsumerServiceUrl; + return this.assertionConsumerServiceUrl; } /** diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestContext.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestContext.java index 53c87b0560..a8bf6aeb51 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestContext.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestContext.java @@ -76,7 +76,7 @@ public class Saml2AuthenticationRequestContext { * @return the AssertionConsumerServiceURL value */ public String getAssertionConsumerServiceUrl() { - return assertionConsumerServiceUrl; + return this.assertionConsumerServiceUrl; } /** diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/Saml2MessageBinding.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/Saml2MessageBinding.java index f8d43315d0..958f608e7e 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/Saml2MessageBinding.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/Saml2MessageBinding.java @@ -40,7 +40,7 @@ public enum Saml2MessageBinding { * @return URN value representing this binding */ public String getUrn() { - return urn; + return this.urn; } } diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/core/Saml2X509CredentialTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/core/Saml2X509CredentialTests.java index 600f2a4260..feb48316bc 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/core/Saml2X509CredentialTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/core/Saml2X509CredentialTests.java @@ -60,7 +60,7 @@ public class Saml2X509CredentialTests { + "YX/sDTE2AdVBVGaMj1Cb51bPHnNC6Q5kXKQnj/YrLqRQND09Q7ParX0CQQC5NxZr\n" + "9jKqhHj8yQD6PlXTsY4Occ7DH6/IoDenfdEVD5qlet0zmd50HatN2Jiqm5ubN7CM\n" + "INrtuLp4YHbgk1mi\n" + "-----END PRIVATE KEY-----"; - key = RsaKeyConverters.pkcs8().convert(new ByteArrayInputStream(keyData.getBytes(UTF_8))); + this.key = RsaKeyConverters.pkcs8().convert(new ByteArrayInputStream(keyData.getBytes(UTF_8))); final CertificateFactory factory = CertificateFactory.getInstance("X.509"); String certificateData = "-----BEGIN CERTIFICATE-----\n" + "MIICgTCCAeoCCQCuVzyqFgMSyDANBgkqhkiG9w0BAQsFADCBhDELMAkGA1UEBhMC\n" @@ -77,121 +77,121 @@ public class Saml2X509CredentialTests { + "XOfI2Z9eukwrSknDwq/zscR0YxwwqDBMt/QdAODfSwAfnciiYLkmEjlozWRtOeN+\n" + "qK7UFgP1bRl5qksrYX5S0z2iGJh0GvonLUt3e20Ssfl5tTEDDnAEUMLfBkyaxEHD\n" + "RZ/nbTJ7VTeZOSyRoVn5XHhpuJ0B\n" + "-----END CERTIFICATE-----"; - certificate = (X509Certificate) factory + this.certificate = (X509Certificate) factory .generateCertificate(new ByteArrayInputStream(certificateData.getBytes(UTF_8))); } @Test public void constructorWhenRelyingPartyWithCredentialsThenItSucceeds() { - new Saml2X509Credential(key, certificate, SIGNING); - new Saml2X509Credential(key, certificate, SIGNING, DECRYPTION); - new Saml2X509Credential(key, certificate, DECRYPTION); - Saml2X509Credential.signing(key, certificate); - Saml2X509Credential.decryption(key, certificate); + new Saml2X509Credential(this.key, this.certificate, SIGNING); + new Saml2X509Credential(this.key, this.certificate, SIGNING, DECRYPTION); + new Saml2X509Credential(this.key, this.certificate, DECRYPTION); + Saml2X509Credential.signing(this.key, this.certificate); + Saml2X509Credential.decryption(this.key, this.certificate); } @Test public void constructorWhenAssertingPartyWithCredentialsThenItSucceeds() { - new Saml2X509Credential(certificate, VERIFICATION); - new Saml2X509Credential(certificate, VERIFICATION, ENCRYPTION); - new Saml2X509Credential(certificate, ENCRYPTION); - Saml2X509Credential.verification(certificate); - Saml2X509Credential.encryption(certificate); + new Saml2X509Credential(this.certificate, VERIFICATION); + new Saml2X509Credential(this.certificate, VERIFICATION, ENCRYPTION); + new Saml2X509Credential(this.certificate, ENCRYPTION); + Saml2X509Credential.verification(this.certificate); + Saml2X509Credential.encryption(this.certificate); } @Test public void constructorWhenRelyingPartyWithoutCredentialsThenItFails() { - exception.expect(IllegalArgumentException.class); + this.exception.expect(IllegalArgumentException.class); new Saml2X509Credential(null, (X509Certificate) null, SIGNING); } @Test public void constructorWhenRelyingPartyWithoutPrivateKeyThenItFails() { - exception.expect(IllegalArgumentException.class); - new Saml2X509Credential(null, certificate, SIGNING); + this.exception.expect(IllegalArgumentException.class); + new Saml2X509Credential(null, this.certificate, SIGNING); } @Test public void constructorWhenRelyingPartyWithoutCertificateThenItFails() { - exception.expect(IllegalArgumentException.class); - new Saml2X509Credential(key, null, SIGNING); + this.exception.expect(IllegalArgumentException.class); + new Saml2X509Credential(this.key, null, SIGNING); } @Test public void constructorWhenAssertingPartyWithoutCertificateThenItFails() { - exception.expect(IllegalArgumentException.class); + this.exception.expect(IllegalArgumentException.class); new Saml2X509Credential(null, SIGNING); } @Test public void constructorWhenRelyingPartyWithEncryptionUsageThenItFails() { - exception.expect(IllegalStateException.class); - new Saml2X509Credential(key, certificate, ENCRYPTION); + this.exception.expect(IllegalStateException.class); + new Saml2X509Credential(this.key, this.certificate, ENCRYPTION); } @Test public void constructorWhenRelyingPartyWithVerificationUsageThenItFails() { - exception.expect(IllegalStateException.class); - new Saml2X509Credential(key, certificate, VERIFICATION); + this.exception.expect(IllegalStateException.class); + new Saml2X509Credential(this.key, this.certificate, VERIFICATION); } @Test public void constructorWhenAssertingPartyWithSigningUsageThenItFails() { - exception.expect(IllegalStateException.class); - new Saml2X509Credential(certificate, SIGNING); + this.exception.expect(IllegalStateException.class); + new Saml2X509Credential(this.certificate, SIGNING); } @Test public void constructorWhenAssertingPartyWithDecryptionUsageThenItFails() { - exception.expect(IllegalStateException.class); - new Saml2X509Credential(certificate, DECRYPTION); + this.exception.expect(IllegalStateException.class); + new Saml2X509Credential(this.certificate, DECRYPTION); } @Test public void factoryWhenRelyingPartyForSigningWithoutCredentialsThenItFails() { - exception.expect(IllegalArgumentException.class); + this.exception.expect(IllegalArgumentException.class); Saml2X509Credential.signing(null, null); } @Test public void factoryWhenRelyingPartyForSigningWithoutPrivateKeyThenItFails() { - exception.expect(IllegalArgumentException.class); - Saml2X509Credential.signing(null, certificate); + this.exception.expect(IllegalArgumentException.class); + Saml2X509Credential.signing(null, this.certificate); } @Test public void factoryWhenRelyingPartyForSigningWithoutCertificateThenItFails() { - exception.expect(IllegalArgumentException.class); - Saml2X509Credential.signing(key, null); + this.exception.expect(IllegalArgumentException.class); + Saml2X509Credential.signing(this.key, null); } @Test public void factoryWhenRelyingPartyForDecryptionWithoutCredentialsThenItFails() { - exception.expect(IllegalArgumentException.class); + this.exception.expect(IllegalArgumentException.class); Saml2X509Credential.decryption(null, null); } @Test public void factoryWhenRelyingPartyForDecryptionWithoutPrivateKeyThenItFails() { - exception.expect(IllegalArgumentException.class); - Saml2X509Credential.decryption(null, certificate); + this.exception.expect(IllegalArgumentException.class); + Saml2X509Credential.decryption(null, this.certificate); } @Test public void factoryWhenRelyingPartyForDecryptionWithoutCertificateThenItFails() { - exception.expect(IllegalArgumentException.class); - Saml2X509Credential.decryption(key, null); + this.exception.expect(IllegalArgumentException.class); + Saml2X509Credential.decryption(this.key, null); } @Test public void factoryWhenAssertingPartyForVerificationWithoutCertificateThenItFails() { - exception.expect(IllegalArgumentException.class); + this.exception.expect(IllegalArgumentException.class); Saml2X509Credential.verification(null); } @Test public void factoryWhenAssertingPartyForEncryptionWithoutCertificateThenItFails() { - exception.expect(IllegalArgumentException.class); + this.exception.expect(IllegalArgumentException.class); Saml2X509Credential.encryption(null); } diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/credentials/Saml2X509CredentialTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/credentials/Saml2X509CredentialTests.java index ec29a21fc5..7742ae3f40 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/credentials/Saml2X509CredentialTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/credentials/Saml2X509CredentialTests.java @@ -62,7 +62,7 @@ public class Saml2X509CredentialTests { + "YX/sDTE2AdVBVGaMj1Cb51bPHnNC6Q5kXKQnj/YrLqRQND09Q7ParX0CQQC5NxZr\n" + "9jKqhHj8yQD6PlXTsY4Occ7DH6/IoDenfdEVD5qlet0zmd50HatN2Jiqm5ubN7CM\n" + "INrtuLp4YHbgk1mi\n" + "-----END PRIVATE KEY-----"; - key = RsaKeyConverters.pkcs8().convert(new ByteArrayInputStream(keyData.getBytes(UTF_8))); + this.key = RsaKeyConverters.pkcs8().convert(new ByteArrayInputStream(keyData.getBytes(UTF_8))); final CertificateFactory factory = CertificateFactory.getInstance("X.509"); String certificateData = "-----BEGIN CERTIFICATE-----\n" + "MIICgTCCAeoCCQCuVzyqFgMSyDANBgkqhkiG9w0BAQsFADCBhDELMAkGA1UEBhMC\n" @@ -79,70 +79,70 @@ public class Saml2X509CredentialTests { + "XOfI2Z9eukwrSknDwq/zscR0YxwwqDBMt/QdAODfSwAfnciiYLkmEjlozWRtOeN+\n" + "qK7UFgP1bRl5qksrYX5S0z2iGJh0GvonLUt3e20Ssfl5tTEDDnAEUMLfBkyaxEHD\n" + "RZ/nbTJ7VTeZOSyRoVn5XHhpuJ0B\n" + "-----END CERTIFICATE-----"; - certificate = (X509Certificate) factory + this.certificate = (X509Certificate) factory .generateCertificate(new ByteArrayInputStream(certificateData.getBytes(UTF_8))); } @Test public void constructorWhenRelyingPartyWithCredentialsThenItSucceeds() { - new Saml2X509Credential(key, certificate, SIGNING); - new Saml2X509Credential(key, certificate, SIGNING, DECRYPTION); - new Saml2X509Credential(key, certificate, DECRYPTION); + new Saml2X509Credential(this.key, this.certificate, SIGNING); + new Saml2X509Credential(this.key, this.certificate, SIGNING, DECRYPTION); + new Saml2X509Credential(this.key, this.certificate, DECRYPTION); } @Test public void constructorWhenAssertingPartyWithCredentialsThenItSucceeds() { - new Saml2X509Credential(certificate, VERIFICATION); - new Saml2X509Credential(certificate, VERIFICATION, ENCRYPTION); - new Saml2X509Credential(certificate, ENCRYPTION); + new Saml2X509Credential(this.certificate, VERIFICATION); + new Saml2X509Credential(this.certificate, VERIFICATION, ENCRYPTION); + new Saml2X509Credential(this.certificate, ENCRYPTION); } @Test public void constructorWhenRelyingPartyWithoutCredentialsThenItFails() { - exception.expect(IllegalArgumentException.class); + this.exception.expect(IllegalArgumentException.class); new Saml2X509Credential(null, (X509Certificate) null, SIGNING); } @Test public void constructorWhenRelyingPartyWithoutPrivateKeyThenItFails() { - exception.expect(IllegalArgumentException.class); - new Saml2X509Credential(null, certificate, SIGNING); + this.exception.expect(IllegalArgumentException.class); + new Saml2X509Credential(null, this.certificate, SIGNING); } @Test public void constructorWhenRelyingPartyWithoutCertificateThenItFails() { - exception.expect(IllegalArgumentException.class); - new Saml2X509Credential(key, null, SIGNING); + this.exception.expect(IllegalArgumentException.class); + new Saml2X509Credential(this.key, null, SIGNING); } @Test public void constructorWhenAssertingPartyWithoutCertificateThenItFails() { - exception.expect(IllegalArgumentException.class); + this.exception.expect(IllegalArgumentException.class); new Saml2X509Credential(null, SIGNING); } @Test public void constructorWhenRelyingPartyWithEncryptionUsageThenItFails() { - exception.expect(IllegalStateException.class); - new Saml2X509Credential(key, certificate, ENCRYPTION); + this.exception.expect(IllegalStateException.class); + new Saml2X509Credential(this.key, this.certificate, ENCRYPTION); } @Test public void constructorWhenRelyingPartyWithVerificationUsageThenItFails() { - exception.expect(IllegalStateException.class); - new Saml2X509Credential(key, certificate, VERIFICATION); + this.exception.expect(IllegalStateException.class); + new Saml2X509Credential(this.key, this.certificate, VERIFICATION); } @Test public void constructorWhenAssertingPartyWithSigningUsageThenItFails() { - exception.expect(IllegalStateException.class); - new Saml2X509Credential(certificate, SIGNING); + this.exception.expect(IllegalStateException.class); + new Saml2X509Credential(this.certificate, SIGNING); } @Test public void constructorWhenAssertingPartyWithDecryptionUsageThenItFails() { - exception.expect(IllegalStateException.class); - new Saml2X509Credential(certificate, DECRYPTION); + this.exception.expect(IllegalStateException.class); + new Saml2X509Credential(this.certificate, DECRYPTION); } } diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactoryTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactoryTests.java index 31bd0db6f2..a3962b07ee 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactoryTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactoryTests.java @@ -80,25 +80,26 @@ public class OpenSamlAuthenticationRequestFactoryTests { .providerDetails(c -> c.entityId("remote-entity-id")).localEntityIdTemplate("local-entity-id") .credentials(c -> c.add(relyingPartySigningCredential())); this.relyingPartyRegistration = this.relyingPartyRegistrationBuilder.build(); - contextBuilder = Saml2AuthenticationRequestContext.builder().issuer("https://issuer") - .relyingPartyRegistration(relyingPartyRegistration).assertionConsumerServiceUrl("https://issuer/sso"); - context = contextBuilder.build(); - factory = new OpenSamlAuthenticationRequestFactory(); + this.contextBuilder = Saml2AuthenticationRequestContext.builder().issuer("https://issuer") + .relyingPartyRegistration(this.relyingPartyRegistration) + .assertionConsumerServiceUrl("https://issuer/sso"); + this.context = this.contextBuilder.build(); + this.factory = new OpenSamlAuthenticationRequestFactory(); } @Test public void createAuthenticationRequestWhenInvokingDeprecatedMethodThenReturnsXML() { - Saml2AuthenticationRequest request = Saml2AuthenticationRequest.withAuthenticationRequestContext(context) + Saml2AuthenticationRequest request = Saml2AuthenticationRequest.withAuthenticationRequestContext(this.context) .build(); - String result = factory.createAuthenticationRequest(request); + String result = this.factory.createAuthenticationRequest(request); assertThat(result.replace("\n", "")) .startsWith(" c.signAuthNRequest(false)).build()) .build(); - Saml2RedirectAuthenticationRequest result = factory.createRedirectAuthenticationRequest(context); + Saml2RedirectAuthenticationRequest result = this.factory.createRedirectAuthenticationRequest(this.context); assertThat(result.getSamlRequest()).isNotEmpty(); assertThat(result.getRelayState()).isEqualTo("Relay State Value"); assertThat(result.getSigAlg()).isNull(); @@ -123,11 +124,11 @@ public class OpenSamlAuthenticationRequestFactoryTests { @Test public void createPostAuthenticationRequestWhenNotSignRequestThenNoSignatureIsPresent() { - context = contextBuilder.relayState("Relay State Value") - .relyingPartyRegistration(withRelyingPartyRegistration(relyingPartyRegistration) + this.context = this.contextBuilder.relayState("Relay State Value") + .relyingPartyRegistration(withRelyingPartyRegistration(this.relyingPartyRegistration) .providerDetails(c -> c.signAuthNRequest(false)).build()) .build(); - Saml2PostAuthenticationRequest result = factory.createPostAuthenticationRequest(context); + Saml2PostAuthenticationRequest result = this.factory.createPostAuthenticationRequest(this.context); assertThat(result.getSamlRequest()).isNotEmpty(); assertThat(result.getRelayState()).isEqualTo("Relay State Value"); assertThat(result.getBinding()).isEqualTo(POST); @@ -136,9 +137,9 @@ public class OpenSamlAuthenticationRequestFactoryTests { @Test public void createPostAuthenticationRequestWhenSignRequestThenSignatureIsPresent() { - context = contextBuilder.relayState("Relay State Value") - .relyingPartyRegistration(withRelyingPartyRegistration(relyingPartyRegistration).build()).build(); - Saml2PostAuthenticationRequest result = factory.createPostAuthenticationRequest(context); + this.context = this.contextBuilder.relayState("Relay State Value") + .relyingPartyRegistration(withRelyingPartyRegistration(this.relyingPartyRegistration).build()).build(); + Saml2PostAuthenticationRequest result = this.factory.createPostAuthenticationRequest(this.context); assertThat(result.getSamlRequest()).isNotEmpty(); assertThat(result.getRelayState()).isEqualTo("Relay State Value"); assertThat(result.getBinding()).isEqualTo(POST); @@ -153,16 +154,16 @@ public class OpenSamlAuthenticationRequestFactoryTests { @Test public void createAuthenticationRequestWhenSetUriThenReturnsCorrectBinding() { - factory.setProtocolBinding(SAMLConstants.SAML2_REDIRECT_BINDING_URI); + this.factory.setProtocolBinding(SAMLConstants.SAML2_REDIRECT_BINDING_URI); AuthnRequest authn = getAuthNRequest(POST); Assert.assertEquals(SAMLConstants.SAML2_REDIRECT_BINDING_URI, authn.getProtocolBinding()); } @Test public void createAuthenticationRequestWhenSetUnsupportredUriThenThrowsIllegalArgumentException() { - exception.expect(IllegalArgumentException.class); - exception.expectMessage(containsString("my-invalid-binding")); - factory.setProtocolBinding("my-invalid-binding"); + this.exception.expect(IllegalArgumentException.class); + this.exception.expectMessage(containsString("my-invalid-binding")); + this.factory.setProtocolBinding("my-invalid-binding"); } @Test @@ -209,8 +210,8 @@ public class OpenSamlAuthenticationRequestFactoryTests { private AuthnRequest getAuthNRequest(Saml2MessageBinding binding) { AbstractSaml2AuthenticationRequest result = (binding == REDIRECT) - ? factory.createRedirectAuthenticationRequest(context) - : factory.createPostAuthenticationRequest(context); + ? this.factory.createRedirectAuthenticationRequest(this.context) + : this.factory.createPostAuthenticationRequest(this.context); String samlRequest = result.getSamlRequest(); assertThat(samlRequest).isNotEmpty(); if (result.getBinding() == REDIRECT) { diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestFactoryTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestFactoryTests.java index d204d8e361..2a13ed2220 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestFactoryTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticationRequestFactoryTests.java @@ -43,7 +43,7 @@ public class Saml2AuthenticationRequestFactoryTests { final String value = "Test String: " + UUID.randomUUID().toString(); Saml2AuthenticationRequestFactory factory = request -> value; Saml2AuthenticationRequestContext request = Saml2AuthenticationRequestContext.builder() - .relyingPartyRegistration(registration).issuer("https://example.com/issuer") + .relyingPartyRegistration(this.registration).issuer("https://example.com/issuer") .assertionConsumerServiceUrl("https://example.com/acs-url").build(); Saml2RedirectAuthenticationRequest response = factory.createRedirectAuthenticationRequest(request); String resultValue = response.getSamlRequest(); @@ -57,7 +57,7 @@ public class Saml2AuthenticationRequestFactoryTests { final String value = "Test String: " + UUID.randomUUID().toString(); Saml2AuthenticationRequestFactory factory = request -> value; Saml2AuthenticationRequestContext request = Saml2AuthenticationRequestContext.builder() - .relyingPartyRegistration(registration).issuer("https://example.com/issuer") + .relyingPartyRegistration(this.registration).issuer("https://example.com/issuer") .assertionConsumerServiceUrl("https://example.com/acs-url").build(); Saml2PostAuthenticationRequest response = factory.createPostAuthenticationRequest(request); String resultValue = response.getSamlRequest(); diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilterTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilterTests.java index 6e7a086016..2127ca11a4 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilterTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationFilterTests.java @@ -49,47 +49,47 @@ public class Saml2WebSsoAuthenticationFilterTests { @Before public void setup() { - filter = new Saml2WebSsoAuthenticationFilter(repository); - request.setPathInfo("/login/saml2/sso/idp-registration-id"); - request.setParameter("SAMLResponse", "xml-data-goes-here"); + this.filter = new Saml2WebSsoAuthenticationFilter(this.repository); + this.request.setPathInfo("/login/saml2/sso/idp-registration-id"); + this.request.setParameter("SAMLResponse", "xml-data-goes-here"); } @Test public void constructingFilterWithMissingRegistrationIdVariableThenThrowsException() { - exception.expect(IllegalArgumentException.class); - exception.expectMessage("filterProcessesUrl must contain a {registrationId} match variable"); - filter = new Saml2WebSsoAuthenticationFilter(repository, "/url/missing/variable"); + this.exception.expect(IllegalArgumentException.class); + this.exception.expectMessage("filterProcessesUrl must contain a {registrationId} match variable"); + this.filter = new Saml2WebSsoAuthenticationFilter(this.repository, "/url/missing/variable"); } @Test public void constructingFilterWithValidRegistrationIdVariableThenSucceeds() { - filter = new Saml2WebSsoAuthenticationFilter(repository, "/url/variable/is/present/{registrationId}"); + this.filter = new Saml2WebSsoAuthenticationFilter(this.repository, "/url/variable/is/present/{registrationId}"); } @Test public void requiresAuthenticationWhenHappyPathThenReturnsTrue() { - Assert.assertTrue(filter.requiresAuthentication(request, response)); + Assert.assertTrue(this.filter.requiresAuthentication(this.request, this.response)); } @Test public void requiresAuthenticationWhenCustomProcessingUrlThenReturnsTrue() { - filter = new Saml2WebSsoAuthenticationFilter(repository, "/some/other/path/{registrationId}"); - request.setPathInfo("/some/other/path/idp-registration-id"); - request.setParameter("SAMLResponse", "xml-data-goes-here"); - Assert.assertTrue(filter.requiresAuthentication(request, response)); + this.filter = new Saml2WebSsoAuthenticationFilter(this.repository, "/some/other/path/{registrationId}"); + this.request.setPathInfo("/some/other/path/idp-registration-id"); + this.request.setParameter("SAMLResponse", "xml-data-goes-here"); + Assert.assertTrue(this.filter.requiresAuthentication(this.request, this.response)); } @Test public void attemptAuthenticationWhenRegistrationIdDoesNotExistThenThrowsException() { - when(repository.findByRegistrationId("non-existent-id")).thenReturn(null); + when(this.repository.findByRegistrationId("non-existent-id")).thenReturn(null); - filter = new Saml2WebSsoAuthenticationFilter(repository, "/some/other/path/{registrationId}"); + this.filter = new Saml2WebSsoAuthenticationFilter(this.repository, "/some/other/path/{registrationId}"); - request.setPathInfo("/some/other/path/non-existent-id"); - request.setParameter("SAMLResponse", "response"); + this.request.setPathInfo("/some/other/path/non-existent-id"); + this.request.setParameter("SAMLResponse", "response"); try { - filter.attemptAuthentication(request, response); + this.filter.attemptAuthentication(this.request, this.response); failBecauseExceptionWasNotThrown(Saml2AuthenticationException.class); } catch (Exception e) { diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java index 7cd21c6c40..6526829196 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java @@ -68,14 +68,14 @@ public class Saml2WebSsoAuthenticationRequestFilterTests { @Before public void setup() { - filter = new Saml2WebSsoAuthenticationRequestFilter(repository); - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); - request.setPathInfo("/saml2/authenticate/registration-id"); + this.filter = new Saml2WebSsoAuthenticationRequestFilter(this.repository); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); + this.request.setPathInfo("/saml2/authenticate/registration-id"); - filterChain = new MockFilterChain(); + this.filterChain = new MockFilterChain(); - rpBuilder = RelyingPartyRegistration.withRegistrationId("registration-id") + this.rpBuilder = RelyingPartyRegistration.withRegistrationId("registration-id") .providerDetails(c -> c.entityId("idp-entity-id")).providerDetails(c -> c.webSsoUrl(IDP_SSO_URL)) .assertionConsumerServiceUrlTemplate("template") .credentials(c -> c.add(assertingPartyPrivateCredential())); @@ -83,62 +83,63 @@ public class Saml2WebSsoAuthenticationRequestFilterTests { @Test public void doFilterWhenNoRelayStateThenRedirectDoesNotContainParameter() throws ServletException, IOException { - when(repository.findByRegistrationId("registration-id")).thenReturn(rpBuilder.build()); - filter.doFilterInternal(request, response, filterChain); - assertThat(response.getHeader("Location")).doesNotContain("RelayState=").startsWith(IDP_SSO_URL); + when(this.repository.findByRegistrationId("registration-id")).thenReturn(this.rpBuilder.build()); + this.filter.doFilterInternal(this.request, this.response, this.filterChain); + assertThat(this.response.getHeader("Location")).doesNotContain("RelayState=").startsWith(IDP_SSO_URL); } @Test public void doFilterWhenRelayStateThenRedirectDoesContainParameter() throws ServletException, IOException { - when(repository.findByRegistrationId("registration-id")).thenReturn(rpBuilder.build()); - request.setParameter("RelayState", "my-relay-state"); - filter.doFilterInternal(request, response, filterChain); - assertThat(response.getHeader("Location")).contains("RelayState=my-relay-state").startsWith(IDP_SSO_URL); + when(this.repository.findByRegistrationId("registration-id")).thenReturn(this.rpBuilder.build()); + this.request.setParameter("RelayState", "my-relay-state"); + this.filter.doFilterInternal(this.request, this.response, this.filterChain); + assertThat(this.response.getHeader("Location")).contains("RelayState=my-relay-state").startsWith(IDP_SSO_URL); } @Test public void doFilterWhenRelayStateThatRequiresEncodingThenRedirectDoesContainsEncodedParameter() throws Exception { - when(repository.findByRegistrationId("registration-id")).thenReturn(rpBuilder.build()); + when(this.repository.findByRegistrationId("registration-id")).thenReturn(this.rpBuilder.build()); final String relayStateValue = "https://my-relay-state.example.com?with=param&other=param"; final String relayStateEncoded = UriUtils.encode(relayStateValue, StandardCharsets.ISO_8859_1); - request.setParameter("RelayState", relayStateValue); - filter.doFilterInternal(request, response, filterChain); - assertThat(response.getHeader("Location")).contains("RelayState=" + relayStateEncoded).startsWith(IDP_SSO_URL); + this.request.setParameter("RelayState", relayStateValue); + this.filter.doFilterInternal(this.request, this.response, this.filterChain); + assertThat(this.response.getHeader("Location")).contains("RelayState=" + relayStateEncoded) + .startsWith(IDP_SSO_URL); } @Test public void doFilterWhenSimpleSignatureSpecifiedThenSignatureParametersAreInTheRedirectURL() throws Exception { - when(repository.findByRegistrationId("registration-id")).thenReturn(rpBuilder.build()); + when(this.repository.findByRegistrationId("registration-id")).thenReturn(this.rpBuilder.build()); final String relayStateValue = "https://my-relay-state.example.com?with=param&other=param"; final String relayStateEncoded = UriUtils.encode(relayStateValue, StandardCharsets.ISO_8859_1); - request.setParameter("RelayState", relayStateValue); - filter.doFilterInternal(request, response, filterChain); - assertThat(response.getHeader("Location")).contains("RelayState=" + relayStateEncoded).contains("SigAlg=") + this.request.setParameter("RelayState", relayStateValue); + this.filter.doFilterInternal(this.request, this.response, this.filterChain); + assertThat(this.response.getHeader("Location")).contains("RelayState=" + relayStateEncoded).contains("SigAlg=") .contains("Signature=").startsWith(IDP_SSO_URL); } @Test public void doFilterWhenSignatureIsDisabledThenSignatureParametersAreNotInTheRedirectURL() throws Exception { - when(repository.findByRegistrationId("registration-id")) - .thenReturn(rpBuilder.providerDetails(c -> c.signAuthNRequest(false)).build()); + when(this.repository.findByRegistrationId("registration-id")) + .thenReturn(this.rpBuilder.providerDetails(c -> c.signAuthNRequest(false)).build()); final String relayStateValue = "https://my-relay-state.example.com?with=param&other=param"; final String relayStateEncoded = UriUtils.encode(relayStateValue, StandardCharsets.ISO_8859_1); - request.setParameter("RelayState", relayStateValue); - filter.doFilterInternal(request, response, filterChain); - assertThat(response.getHeader("Location")).contains("RelayState=" + relayStateEncoded).doesNotContain("SigAlg=") - .doesNotContain("Signature=").startsWith(IDP_SSO_URL); + this.request.setParameter("RelayState", relayStateValue); + this.filter.doFilterInternal(this.request, this.response, this.filterChain); + assertThat(this.response.getHeader("Location")).contains("RelayState=" + relayStateEncoded) + .doesNotContain("SigAlg=").doesNotContain("Signature=").startsWith(IDP_SSO_URL); } @Test public void doFilterWhenPostFormDataIsPresent() throws Exception { - when(repository.findByRegistrationId("registration-id")) - .thenReturn(rpBuilder.providerDetails(c -> c.binding(POST)).build()); + when(this.repository.findByRegistrationId("registration-id")) + .thenReturn(this.rpBuilder.providerDetails(c -> c.binding(POST)).build()); final String relayStateValue = "https://my-relay-state.example.com?with=param&other=param&javascript{alert('1');}"; final String relayStateEncoded = HtmlUtils.htmlEscape(relayStateValue); - request.setParameter("RelayState", relayStateValue); - filter.doFilterInternal(request, response, filterChain); - assertThat(response.getHeader("Location")).isNull(); - assertThat(response.getContentAsString()) + this.request.setParameter("RelayState", relayStateValue); + this.filter.doFilterInternal(this.request, this.response, this.filterChain); + assertThat(this.response.getHeader("Location")).isNull(); + assertThat(this.response.getContentAsString()) .contains("
") .contains(" relyingPartyBuilder.build())); + new DefaultRelyingPartyRegistrationResolver(id -> this.relyingPartyBuilder.build())); @Before public void setup() { diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverterTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverterTests.java index dcfc97e310..1de923bed4 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverterTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverterTests.java @@ -61,7 +61,7 @@ public class Saml2AuthenticationTokenConverterTests { Saml2AuthenticationToken token = converter.convert(request); assertThat(token.getSaml2Response()).isEqualTo("response"); assertThat(token.getRelyingPartyRegistration().getRegistrationId()) - .isEqualTo(relyingPartyRegistration.getRegistrationId()); + .isEqualTo(this.relyingPartyRegistration.getRegistrationId()); } @Test @@ -97,7 +97,7 @@ public class Saml2AuthenticationTokenConverterTests { Saml2AuthenticationToken token = converter.convert(request); assertThat(token.getSaml2Response()).isEqualTo("response"); assertThat(token.getRelyingPartyRegistration().getRegistrationId()) - .isEqualTo(relyingPartyRegistration.getRegistrationId()); + .isEqualTo(this.relyingPartyRegistration.getRegistrationId()); } @Test diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java index fff580bc65..b848fe63bf 100644 --- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java +++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java @@ -162,7 +162,7 @@ public abstract class AbstractAuthorizeTag { } public String getAccess() { - return access; + return this.access; } public void setAccess(String access) { @@ -170,7 +170,7 @@ public abstract class AbstractAuthorizeTag { } public String getUrl() { - return url; + return this.url; } public void setUrl(String url) { @@ -178,7 +178,7 @@ public abstract class AbstractAuthorizeTag { } public String getMethod() { - return method; + return this.method; } public void setMethod(String method) { diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java index 967adb5e47..9da1c52e56 100644 --- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java +++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java @@ -67,13 +67,13 @@ public class AccessControlListTag extends TagSupport { private String var; public int doStartTag() throws JspException { - if ((null == hasPermission) || "".equals(hasPermission)) { + if ((null == this.hasPermission) || "".equals(this.hasPermission)) { return skipBody(); } initializeIfRequired(); - if (domainObject == null) { + if (this.domainObject == null) { if (logger.isDebugEnabled()) { logger.debug("domainObject resolved to null, so including tag body"); } @@ -92,9 +92,9 @@ public class AccessControlListTag extends TagSupport { return skipBody(); } - List requiredPermissions = parseHasPermission(hasPermission); + List requiredPermissions = parseHasPermission(this.hasPermission); for (Object requiredPermission : requiredPermissions) { - if (!permissionEvaluator.hasPermission(authentication, domainObject, requiredPermission)) { + if (!this.permissionEvaluator.hasPermission(authentication, this.domainObject, requiredPermission)) { return skipBody(); } } @@ -118,15 +118,15 @@ public class AccessControlListTag extends TagSupport { } private int skipBody() { - if (var != null) { - pageContext.setAttribute(var, Boolean.FALSE, PageContext.PAGE_SCOPE); + if (this.var != null) { + this.pageContext.setAttribute(this.var, Boolean.FALSE, PageContext.PAGE_SCOPE); } return TagLibConfig.evalOrSkip(false); } private int evalBody() { - if (var != null) { - pageContext.setAttribute(var, Boolean.TRUE, PageContext.PAGE_SCOPE); + if (this.var != null) { + this.pageContext.setAttribute(this.var, Boolean.TRUE, PageContext.PAGE_SCOPE); } return TagLibConfig.evalOrSkip(true); } @@ -144,27 +144,27 @@ public class AccessControlListTag extends TagSupport { } public Object getDomainObject() { - return domainObject; + return this.domainObject; } public String getHasPermission() { - return hasPermission; + return this.hasPermission; } private void initializeIfRequired() throws JspException { - if (applicationContext != null) { + if (this.applicationContext != null) { return; } - this.applicationContext = getContext(pageContext); + this.applicationContext = getContext(this.pageContext); - permissionEvaluator = getBeanOfType(PermissionEvaluator.class); + this.permissionEvaluator = getBeanOfType(PermissionEvaluator.class); } private T getBeanOfType(Class type) throws JspException { - Map map = applicationContext.getBeansOfType(type); + Map map = this.applicationContext.getBeansOfType(type); - for (ApplicationContext context = applicationContext.getParent(); context != null; context = context + for (ApplicationContext context = this.applicationContext.getParent(); context != null; context = context .getParent()) { map.putAll(context.getBeansOfType(type)); } diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java index 84932cbf95..25eb513c6f 100644 --- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java +++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java @@ -58,9 +58,9 @@ public class AuthenticationTag extends TagSupport { // resets local state private void init() { - var = null; - scopeSpecified = false; - scope = PageContext.PAGE_SCOPE; + this.var = null; + this.scopeSpecified = false; + this.scope = PageContext.PAGE_SCOPE; } public void setVar(String var) { @@ -83,7 +83,7 @@ public class AuthenticationTag extends TagSupport { public int doEndTag() throws JspException { Object result = null; // determine the value by... - if (property != null) { + if (this.property != null) { if ((SecurityContextHolder.getContext() == null) || !(SecurityContextHolder.getContext() instanceof SecurityContext) || (SecurityContextHolder.getContext().getAuthentication() == null)) { @@ -98,33 +98,33 @@ public class AuthenticationTag extends TagSupport { try { BeanWrapperImpl wrapper = new BeanWrapperImpl(auth); - result = wrapper.getPropertyValue(property); + result = wrapper.getPropertyValue(this.property); } catch (BeansException e) { throw new JspException(e); } } - if (var != null) { + if (this.var != null) { /* * Store the result, letting an IllegalArgumentException propagate back if the * scope is invalid (e.g., if an attempt is made to store something in the * session without any HttpSession existing). */ if (result != null) { - pageContext.setAttribute(var, result, scope); + this.pageContext.setAttribute(this.var, result, this.scope); } else { - if (scopeSpecified) { - pageContext.removeAttribute(var, scope); + if (this.scopeSpecified) { + this.pageContext.removeAttribute(this.var, this.scope); } else { - pageContext.removeAttribute(var); + this.pageContext.removeAttribute(this.var); } } } else { - if (htmlEscape) { + if (this.htmlEscape) { writeMessage(TextEscapeUtils.escapeEntities(String.valueOf(result))); } else { @@ -136,7 +136,7 @@ public class AuthenticationTag extends TagSupport { protected void writeMessage(String msg) throws JspException { try { - pageContext.getOut().write(String.valueOf(msg)); + this.pageContext.getOut().write(String.valueOf(msg)); } catch (IOException ioe) { throw new JspException(ioe); @@ -155,7 +155,7 @@ public class AuthenticationTag extends TagSupport { * overridden. */ protected boolean isHtmlEscape() { - return htmlEscape; + return this.htmlEscape; } } diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/JspAuthorizeTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/JspAuthorizeTag.java index 5ec2dfc7d5..74f3669c49 100644 --- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/JspAuthorizeTag.java +++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/JspAuthorizeTag.java @@ -65,17 +65,17 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag { */ public int doStartTag() throws JspException { try { - authorized = super.authorize(); + this.authorized = super.authorize(); - if (!authorized && TagLibConfig.isUiSecurityDisabled()) { - pageContext.getOut().write(TagLibConfig.getSecuredUiPrefix()); + if (!this.authorized && TagLibConfig.isUiSecurityDisabled()) { + this.pageContext.getOut().write(TagLibConfig.getSecuredUiPrefix()); } - if (var != null) { - pageContext.setAttribute(var, authorized, PageContext.PAGE_SCOPE); + if (this.var != null) { + this.pageContext.setAttribute(this.var, this.authorized, PageContext.PAGE_SCOPE); } - return TagLibConfig.evalOrSkip(authorized); + return TagLibConfig.evalOrSkip(this.authorized); } catch (IOException e) { @@ -95,8 +95,8 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag { */ public int doEndTag() throws JspException { try { - if (!authorized && TagLibConfig.isUiSecurityDisabled()) { - pageContext.getOut().write(TagLibConfig.getSecuredUiSuffix()); + if (!this.authorized && TagLibConfig.isUiSecurityDisabled()) { + this.pageContext.getOut().write(TagLibConfig.getSecuredUiSuffix()); } } catch (IOException e) { @@ -107,7 +107,7 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag { } public String getId() { - return id; + return this.id; } public void setId(String id) { @@ -115,7 +115,7 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag { } public Tag getParent() { - return parent; + return this.parent; } public void setParent(Tag parent) { @@ -123,7 +123,7 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag { } public String getVar() { - return var; + return this.var; } public void setVar(String var) { @@ -131,8 +131,8 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag { } public void release() { - parent = null; - id = null; + this.parent = null; + this.id = null; } public void setPageContext(PageContext pageContext) { @@ -141,17 +141,17 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag { @Override protected ServletRequest getRequest() { - return pageContext.getRequest(); + return this.pageContext.getRequest(); } @Override protected ServletResponse getResponse() { - return pageContext.getResponse(); + return this.pageContext.getResponse(); } @Override protected ServletContext getServletContext() { - return pageContext.getServletContext(); + return this.pageContext.getServletContext(); } private final class PageContextVariableLookupEvaluationContext implements EvaluationContext { @@ -163,50 +163,50 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag { } public TypedValue getRootObject() { - return delegate.getRootObject(); + return this.delegate.getRootObject(); } public List getConstructorResolvers() { - return delegate.getConstructorResolvers(); + return this.delegate.getConstructorResolvers(); } public List getMethodResolvers() { - return delegate.getMethodResolvers(); + return this.delegate.getMethodResolvers(); } public List getPropertyAccessors() { - return delegate.getPropertyAccessors(); + return this.delegate.getPropertyAccessors(); } public TypeLocator getTypeLocator() { - return delegate.getTypeLocator(); + return this.delegate.getTypeLocator(); } public TypeConverter getTypeConverter() { - return delegate.getTypeConverter(); + return this.delegate.getTypeConverter(); } public TypeComparator getTypeComparator() { - return delegate.getTypeComparator(); + return this.delegate.getTypeComparator(); } public OperatorOverloader getOperatorOverloader() { - return delegate.getOperatorOverloader(); + return this.delegate.getOperatorOverloader(); } public BeanResolver getBeanResolver() { - return delegate.getBeanResolver(); + return this.delegate.getBeanResolver(); } public void setVariable(String name, Object value) { - delegate.setVariable(name, value); + this.delegate.setVariable(name, value); } public Object lookupVariable(String name) { - Object result = delegate.lookupVariable(name); + Object result = this.delegate.lookupVariable(name); if (result == null) { - result = pageContext.findAttribute(name); + result = JspAuthorizeTag.this.pageContext.findAttribute(name); } return result; } diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java index e8060964b4..5d009dde41 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java @@ -60,10 +60,10 @@ public class AbstractAuthorizeTagTests { @Before public void setup() { - tag = new AuthzTag(); - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); - servletContext = new MockServletContext(); + this.tag = new AuthzTag(); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); + this.servletContext = new MockServletContext(); } @After @@ -75,10 +75,10 @@ public class AbstractAuthorizeTagTests { public void privilegeEvaluatorFromRequest() throws IOException { String uri = "/something"; WebInvocationPrivilegeEvaluator expected = mock(WebInvocationPrivilegeEvaluator.class); - tag.setUrl(uri); - request.setAttribute(WebAttributes.WEB_INVOCATION_PRIVILEGE_EVALUATOR_ATTRIBUTE, expected); + this.tag.setUrl(uri); + this.request.setAttribute(WebAttributes.WEB_INVOCATION_PRIVILEGE_EVALUATOR_ATTRIBUTE, expected); - tag.authorizeUsingUrlCheck(); + this.tag.authorizeUsingUrlCheck(); verify(expected).isAllowed(eq(""), eq(uri), eq("GET"), any()); } @@ -87,13 +87,13 @@ public class AbstractAuthorizeTagTests { public void privilegeEvaluatorFromChildContext() throws IOException { String uri = "/something"; WebInvocationPrivilegeEvaluator expected = mock(WebInvocationPrivilegeEvaluator.class); - tag.setUrl(uri); + this.tag.setUrl(uri); WebApplicationContext wac = mock(WebApplicationContext.class); when(wac.getBeansOfType(WebInvocationPrivilegeEvaluator.class)) .thenReturn(Collections.singletonMap("wipe", expected)); - servletContext.setAttribute("org.springframework.web.servlet.FrameworkServlet.CONTEXT.dispatcher", wac); + this.servletContext.setAttribute("org.springframework.web.servlet.FrameworkServlet.CONTEXT.dispatcher", wac); - tag.authorizeUsingUrlCheck(); + this.tag.authorizeUsingUrlCheck(); verify(expected).isAllowed(eq(""), eq(uri), eq("GET"), any()); } @@ -103,30 +103,30 @@ public class AbstractAuthorizeTagTests { public void expressionFromChildContext() throws IOException { SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("user", "pass", "USER")); DefaultWebSecurityExpressionHandler expected = new DefaultWebSecurityExpressionHandler(); - tag.setAccess("permitAll"); + this.tag.setAccess("permitAll"); WebApplicationContext wac = mock(WebApplicationContext.class); when(wac.getBeansOfType(SecurityExpressionHandler.class)) .thenReturn(Collections.singletonMap("wipe", expected)); - servletContext.setAttribute("org.springframework.web.servlet.FrameworkServlet.CONTEXT.dispatcher", wac); + this.servletContext.setAttribute("org.springframework.web.servlet.FrameworkServlet.CONTEXT.dispatcher", wac); - assertThat(tag.authorize()).isTrue(); + assertThat(this.tag.authorize()).isTrue(); } private class AuthzTag extends AbstractAuthorizeTag { @Override protected ServletRequest getRequest() { - return request; + return AbstractAuthorizeTagTests.this.request; } @Override protected ServletResponse getResponse() { - return response; + return AbstractAuthorizeTagTests.this.response; } @Override protected ServletContext getServletContext() { - return servletContext; + return AbstractAuthorizeTagTests.this.servletContext; } } diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java index 93df9244bd..05f54a0ae8 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java @@ -60,20 +60,20 @@ public class AccessControlListTagTests { @Before @SuppressWarnings("rawtypes") public void setup() { - SecurityContextHolder.getContext().setAuthentication(bob); - tag = new AccessControlListTag(); + SecurityContextHolder.getContext().setAuthentication(this.bob); + this.tag = new AccessControlListTag(); WebApplicationContext ctx = mock(WebApplicationContext.class); - pe = mock(PermissionEvaluator.class); + this.pe = mock(PermissionEvaluator.class); Map beanMap = new HashMap(); - beanMap.put("pe", pe); + beanMap.put("pe", this.pe); when(ctx.getBeansOfType(PermissionEvaluator.class)).thenReturn(beanMap); MockServletContext servletCtx = new MockServletContext(); servletCtx.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ctx); - pageContext = new MockPageContext(servletCtx, new MockHttpServletRequest(), new MockHttpServletResponse()); - tag.setPageContext(pageContext); + this.pageContext = new MockPageContext(servletCtx, new MockHttpServletRequest(), new MockHttpServletResponse()); + this.tag.setPageContext(this.pageContext); } @After @@ -84,109 +84,109 @@ public class AccessControlListTagTests { @Test public void bodyIsEvaluatedIfAclGrantsAccess() throws Exception { Object domainObject = new Object(); - when(pe.hasPermission(bob, domainObject, "READ")).thenReturn(true); + when(this.pe.hasPermission(this.bob, domainObject, "READ")).thenReturn(true); - tag.setDomainObject(domainObject); - tag.setHasPermission("READ"); - tag.setVar("allowed"); - assertThat(tag.getDomainObject()).isSameAs(domainObject); - assertThat(tag.getHasPermission()).isEqualTo("READ"); + this.tag.setDomainObject(domainObject); + this.tag.setHasPermission("READ"); + this.tag.setVar("allowed"); + assertThat(this.tag.getDomainObject()).isSameAs(domainObject); + assertThat(this.tag.getHasPermission()).isEqualTo("READ"); - assertThat(tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); - assertThat((Boolean) pageContext.getAttribute("allowed")).isTrue(); + assertThat(this.tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat((Boolean) this.pageContext.getAttribute("allowed")).isTrue(); } @Test public void childContext() throws Exception { - ServletContext servletContext = pageContext.getServletContext(); + ServletContext servletContext = this.pageContext.getServletContext(); WebApplicationContext wac = (WebApplicationContext) servletContext .getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE); servletContext.removeAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE); servletContext.setAttribute("org.springframework.web.servlet.FrameworkServlet.CONTEXT.dispatcher", wac); Object domainObject = new Object(); - when(pe.hasPermission(bob, domainObject, "READ")).thenReturn(true); + when(this.pe.hasPermission(this.bob, domainObject, "READ")).thenReturn(true); - tag.setDomainObject(domainObject); - tag.setHasPermission("READ"); - tag.setVar("allowed"); - assertThat(tag.getDomainObject()).isSameAs(domainObject); - assertThat(tag.getHasPermission()).isEqualTo("READ"); + this.tag.setDomainObject(domainObject); + this.tag.setHasPermission("READ"); + this.tag.setVar("allowed"); + assertThat(this.tag.getDomainObject()).isSameAs(domainObject); + assertThat(this.tag.getHasPermission()).isEqualTo("READ"); - assertThat(tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); - assertThat((Boolean) pageContext.getAttribute("allowed")).isTrue(); + assertThat(this.tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat((Boolean) this.pageContext.getAttribute("allowed")).isTrue(); } // SEC-2022 @Test public void multiHasPermissionsAreSplit() throws Exception { Object domainObject = new Object(); - when(pe.hasPermission(bob, domainObject, "READ")).thenReturn(true); - when(pe.hasPermission(bob, domainObject, "WRITE")).thenReturn(true); + when(this.pe.hasPermission(this.bob, domainObject, "READ")).thenReturn(true); + when(this.pe.hasPermission(this.bob, domainObject, "WRITE")).thenReturn(true); - tag.setDomainObject(domainObject); - tag.setHasPermission("READ,WRITE"); - tag.setVar("allowed"); - assertThat(tag.getDomainObject()).isSameAs(domainObject); - assertThat(tag.getHasPermission()).isEqualTo("READ,WRITE"); + this.tag.setDomainObject(domainObject); + this.tag.setHasPermission("READ,WRITE"); + this.tag.setVar("allowed"); + assertThat(this.tag.getDomainObject()).isSameAs(domainObject); + assertThat(this.tag.getHasPermission()).isEqualTo("READ,WRITE"); - assertThat(tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); - assertThat((Boolean) pageContext.getAttribute("allowed")).isTrue(); - verify(pe).hasPermission(bob, domainObject, "READ"); - verify(pe).hasPermission(bob, domainObject, "WRITE"); - verifyNoMoreInteractions(pe); + assertThat(this.tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat((Boolean) this.pageContext.getAttribute("allowed")).isTrue(); + verify(this.pe).hasPermission(this.bob, domainObject, "READ"); + verify(this.pe).hasPermission(this.bob, domainObject, "WRITE"); + verifyNoMoreInteractions(this.pe); } // SEC-2023 @Test public void hasPermissionsBitMaskSupported() throws Exception { Object domainObject = new Object(); - when(pe.hasPermission(bob, domainObject, 1)).thenReturn(true); - when(pe.hasPermission(bob, domainObject, 2)).thenReturn(true); + when(this.pe.hasPermission(this.bob, domainObject, 1)).thenReturn(true); + when(this.pe.hasPermission(this.bob, domainObject, 2)).thenReturn(true); - tag.setDomainObject(domainObject); - tag.setHasPermission("1,2"); - tag.setVar("allowed"); - assertThat(tag.getDomainObject()).isSameAs(domainObject); - assertThat(tag.getHasPermission()).isEqualTo("1,2"); + this.tag.setDomainObject(domainObject); + this.tag.setHasPermission("1,2"); + this.tag.setVar("allowed"); + assertThat(this.tag.getDomainObject()).isSameAs(domainObject); + assertThat(this.tag.getHasPermission()).isEqualTo("1,2"); - assertThat(tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); - assertThat((Boolean) pageContext.getAttribute("allowed")).isTrue(); - verify(pe).hasPermission(bob, domainObject, 1); - verify(pe).hasPermission(bob, domainObject, 2); - verifyNoMoreInteractions(pe); + assertThat(this.tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat((Boolean) this.pageContext.getAttribute("allowed")).isTrue(); + verify(this.pe).hasPermission(this.bob, domainObject, 1); + verify(this.pe).hasPermission(this.bob, domainObject, 2); + verifyNoMoreInteractions(this.pe); } @Test public void hasPermissionsMixedBitMaskSupported() throws Exception { Object domainObject = new Object(); - when(pe.hasPermission(bob, domainObject, 1)).thenReturn(true); - when(pe.hasPermission(bob, domainObject, "WRITE")).thenReturn(true); + when(this.pe.hasPermission(this.bob, domainObject, 1)).thenReturn(true); + when(this.pe.hasPermission(this.bob, domainObject, "WRITE")).thenReturn(true); - tag.setDomainObject(domainObject); - tag.setHasPermission("1,WRITE"); - tag.setVar("allowed"); - assertThat(tag.getDomainObject()).isSameAs(domainObject); - assertThat(tag.getHasPermission()).isEqualTo("1,WRITE"); + this.tag.setDomainObject(domainObject); + this.tag.setHasPermission("1,WRITE"); + this.tag.setVar("allowed"); + assertThat(this.tag.getDomainObject()).isSameAs(domainObject); + assertThat(this.tag.getHasPermission()).isEqualTo("1,WRITE"); - assertThat(tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); - assertThat((Boolean) pageContext.getAttribute("allowed")).isTrue(); - verify(pe).hasPermission(bob, domainObject, 1); - verify(pe).hasPermission(bob, domainObject, "WRITE"); - verifyNoMoreInteractions(pe); + assertThat(this.tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat((Boolean) this.pageContext.getAttribute("allowed")).isTrue(); + verify(this.pe).hasPermission(this.bob, domainObject, 1); + verify(this.pe).hasPermission(this.bob, domainObject, "WRITE"); + verifyNoMoreInteractions(this.pe); } @Test public void bodyIsSkippedIfAclDeniesAccess() throws Exception { Object domainObject = new Object(); - when(pe.hasPermission(bob, domainObject, "READ")).thenReturn(false); + when(this.pe.hasPermission(this.bob, domainObject, "READ")).thenReturn(false); - tag.setDomainObject(domainObject); - tag.setHasPermission("READ"); - tag.setVar("allowed"); + this.tag.setDomainObject(domainObject); + this.tag.setHasPermission("READ"); + this.tag.setVar("allowed"); - assertThat(tag.doStartTag()).isEqualTo(Tag.SKIP_BODY); - assertThat((Boolean) pageContext.getAttribute("allowed")).isFalse(); + assertThat(this.tag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat((Boolean) this.pageContext.getAttribute("allowed")).isFalse(); } } diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java index 5dac768bf5..f91977a420 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java @@ -51,12 +51,12 @@ public class AuthenticationTagTests { @Test public void testOperationWhenPrincipalIsAUserDetailsInstance() throws JspException { - SecurityContextHolder.getContext().setAuthentication(auth); + SecurityContextHolder.getContext().setAuthentication(this.auth); - authenticationTag.setProperty("name"); - assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); - assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); - assertThat(authenticationTag.getLastMessage()).isEqualTo("rodUserDetails"); + this.authenticationTag.setProperty("name"); + assertThat(this.authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(this.authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); + assertThat(this.authenticationTag.getLastMessage()).isEqualTo("rodUserDetails"); } @Test @@ -64,20 +64,20 @@ public class AuthenticationTagTests { SecurityContextHolder.getContext().setAuthentication( new TestingAuthenticationToken("rodAsString", "koala", AuthorityUtils.NO_AUTHORITIES)); - authenticationTag.setProperty("principal"); - assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); - assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); - assertThat(authenticationTag.getLastMessage()).isEqualTo("rodAsString"); + this.authenticationTag.setProperty("principal"); + assertThat(this.authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(this.authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); + assertThat(this.authenticationTag.getLastMessage()).isEqualTo("rodAsString"); } @Test public void testNestedPropertyIsReadCorrectly() throws JspException { - SecurityContextHolder.getContext().setAuthentication(auth); + SecurityContextHolder.getContext().setAuthentication(this.auth); - authenticationTag.setProperty("principal.username"); - assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); - assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); - assertThat(authenticationTag.getLastMessage()).isEqualTo("rodUserDetails"); + this.authenticationTag.setProperty("principal.username"); + assertThat(this.authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(this.authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); + assertThat(this.authenticationTag.getLastMessage()).isEqualTo("rodUserDetails"); } @Test @@ -85,36 +85,36 @@ public class AuthenticationTagTests { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken(null, "koala", AuthorityUtils.NO_AUTHORITIES)); - authenticationTag.setProperty("principal"); - assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); - assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); + this.authenticationTag.setProperty("principal"); + assertThat(this.authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(this.authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); } @Test public void testOperationWhenSecurityContextIsNull() throws Exception { SecurityContextHolder.getContext().setAuthentication(null); - authenticationTag.setProperty("principal"); - assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); - assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); - assertThat(authenticationTag.getLastMessage()).isNull(); + this.authenticationTag.setProperty("principal"); + assertThat(this.authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(this.authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); + assertThat(this.authenticationTag.getLastMessage()).isNull(); } @Test public void testSkipsBodyIfNullOrEmptyOperation() throws Exception { - authenticationTag.setProperty(""); - assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); - assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); + this.authenticationTag.setProperty(""); + assertThat(this.authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(this.authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); } @Test public void testThrowsExceptionForUnrecognisedProperty() { - SecurityContextHolder.getContext().setAuthentication(auth); - authenticationTag.setProperty("qsq"); + SecurityContextHolder.getContext().setAuthentication(this.auth); + this.authenticationTag.setProperty("qsq"); try { - authenticationTag.doStartTag(); - authenticationTag.doEndTag(); + this.authenticationTag.doStartTag(); + this.authenticationTag.doEndTag(); fail("Should have throwns JspException"); } catch (JspException expected) { @@ -124,20 +124,20 @@ public class AuthenticationTagTests { @Test public void htmlEscapingIsUsedByDefault() throws Exception { SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("<>& ", "")); - authenticationTag.setProperty("name"); - authenticationTag.doStartTag(); - authenticationTag.doEndTag(); - assertThat(authenticationTag.getLastMessage()).isEqualTo("<>& "); + this.authenticationTag.setProperty("name"); + this.authenticationTag.doStartTag(); + this.authenticationTag.doEndTag(); + assertThat(this.authenticationTag.getLastMessage()).isEqualTo("<>& "); } @Test public void settingHtmlEscapeToFalsePreventsEscaping() throws Exception { SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("<>& ", "")); - authenticationTag.setProperty("name"); - authenticationTag.setHtmlEscape("false"); - authenticationTag.doStartTag(); - authenticationTag.doEndTag(); - assertThat(authenticationTag.getLastMessage()).isEqualTo("<>& "); + this.authenticationTag.setProperty("name"); + this.authenticationTag.setHtmlEscape("false"); + this.authenticationTag.doStartTag(); + this.authenticationTag.doEndTag(); + assertThat(this.authenticationTag.getLastMessage()).isEqualTo("<>& "); } private class MyAuthenticationTag extends AuthenticationTag { @@ -145,11 +145,11 @@ public class AuthenticationTagTests { String lastMessage = null; public String getLastMessage() { - return lastMessage; + return this.lastMessage; } protected void writeMessage(String msg) { - lastMessage = msg; + this.lastMessage = msg; } } diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java index b5ba3b9ae7..5e78631b89 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java @@ -64,19 +64,19 @@ public class AuthorizeTagTests { @Before public void setUp() { - SecurityContextHolder.getContext().setAuthentication(currentUser); + SecurityContextHolder.getContext().setAuthentication(this.currentUser); StaticWebApplicationContext ctx = new StaticWebApplicationContext(); BeanDefinitionBuilder webExpressionHandler = BeanDefinitionBuilder .rootBeanDefinition(DefaultWebSecurityExpressionHandler.class); - webExpressionHandler.addPropertyValue("permissionEvaluator", permissionEvaluator); + webExpressionHandler.addPropertyValue("permissionEvaluator", this.permissionEvaluator); ctx.registerBeanDefinition("expressionHandler", webExpressionHandler.getBeanDefinition()); ctx.registerSingleton("wipe", MockWebInvocationPrivilegeEvaluator.class); MockServletContext servletCtx = new MockServletContext(); servletCtx.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ctx); - authorizeTag = new JspAuthorizeTag(); - authorizeTag.setPageContext(new MockPageContext(servletCtx, request, new MockHttpServletResponse())); + this.authorizeTag = new JspAuthorizeTag(); + this.authorizeTag.setPageContext(new MockPageContext(servletCtx, this.request, new MockHttpServletResponse())); } @After @@ -89,65 +89,65 @@ public class AuthorizeTagTests { @Test public void taglibsDocumentationHasPermissionOr() throws Exception { Object domain = new Object(); - request.setAttribute("domain", domain); - authorizeTag.setAccess("hasPermission(#domain,'read') or hasPermission(#domain,'write')"); - when(permissionEvaluator.hasPermission(eq(currentUser), eq(domain), anyString())).thenReturn(true); + this.request.setAttribute("domain", domain); + this.authorizeTag.setAccess("hasPermission(#domain,'read') or hasPermission(#domain,'write')"); + when(this.permissionEvaluator.hasPermission(eq(this.currentUser), eq(domain), anyString())).thenReturn(true); - assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat(this.authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); } @Test public void skipsBodyIfNoAuthenticationPresent() throws Exception { SecurityContextHolder.clearContext(); - authorizeTag.setAccess("permitAll"); - assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + this.authorizeTag.setAccess("permitAll"); + assertThat(this.authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); } @Test public void skipsBodyIfAccessExpressionDeniesAccess() throws Exception { - authorizeTag.setAccess("denyAll"); - assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + this.authorizeTag.setAccess("denyAll"); + assertThat(this.authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); } @Test public void showsBodyIfAccessExpressionAllowsAccess() throws Exception { - authorizeTag.setAccess("permitAll"); - assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + this.authorizeTag.setAccess("permitAll"); + assertThat(this.authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); } @Test public void requestAttributeIsResolvedAsElVariable() throws JspException { - request.setAttribute("blah", "blah"); - authorizeTag.setAccess("#blah == 'blah'"); - assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + this.request.setAttribute("blah", "blah"); + this.authorizeTag.setAccess("#blah == 'blah'"); + assertThat(this.authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); } // url attribute tests @Test public void skipsBodyWithUrlSetIfNoAuthenticationPresent() throws Exception { SecurityContextHolder.clearContext(); - authorizeTag.setUrl("/something"); - assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + this.authorizeTag.setUrl("/something"); + assertThat(this.authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); } @Test public void skipsBodyIfUrlIsNotAllowed() throws Exception { - authorizeTag.setUrl("/notallowed"); - assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + this.authorizeTag.setUrl("/notallowed"); + assertThat(this.authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); } @Test public void evaluatesBodyIfUrlIsAllowed() throws Exception { - authorizeTag.setUrl("/allowed"); - authorizeTag.setMethod("GET"); - assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + this.authorizeTag.setUrl("/allowed"); + this.authorizeTag.setMethod("GET"); + assertThat(this.authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); } @Test public void skipsBodyIfMethodIsNotAllowed() throws Exception { - authorizeTag.setUrl("/allowed"); - authorizeTag.setMethod("POST"); - assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + this.authorizeTag.setUrl("/allowed"); + this.authorizeTag.setMethod("POST"); + assertThat(this.authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); } public static class MockWebInvocationPrivilegeEvaluator implements WebInvocationPrivilegeEvaluator { diff --git a/test/src/main/java/org/springframework/security/test/context/support/DelegatingTestExecutionListener.java b/test/src/main/java/org/springframework/security/test/context/support/DelegatingTestExecutionListener.java index 170d5f0e5a..a26db38020 100644 --- a/test/src/main/java/org/springframework/security/test/context/support/DelegatingTestExecutionListener.java +++ b/test/src/main/java/org/springframework/security/test/context/support/DelegatingTestExecutionListener.java @@ -36,37 +36,37 @@ class DelegatingTestExecutionListener extends AbstractTestExecutionListener { @Override public void beforeTestClass(TestContext testContext) throws Exception { - delegate.beforeTestClass(testContext); + this.delegate.beforeTestClass(testContext); } @Override public void prepareTestInstance(TestContext testContext) throws Exception { - delegate.prepareTestInstance(testContext); + this.delegate.prepareTestInstance(testContext); } @Override public void beforeTestMethod(TestContext testContext) throws Exception { - delegate.beforeTestMethod(testContext); + this.delegate.beforeTestMethod(testContext); } @Override public void beforeTestExecution(TestContext testContext) throws Exception { - delegate.beforeTestExecution(testContext); + this.delegate.beforeTestExecution(testContext); } @Override public void afterTestExecution(TestContext testContext) throws Exception { - delegate.afterTestExecution(testContext); + this.delegate.afterTestExecution(testContext); } @Override public void afterTestMethod(TestContext testContext) throws Exception { - delegate.afterTestMethod(testContext); + this.delegate.afterTestMethod(testContext); } @Override public void afterTestClass(TestContext testContext) throws Exception { - delegate.afterTestClass(testContext); + this.delegate.afterTestClass(testContext); } } diff --git a/test/src/main/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListener.java b/test/src/main/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListener.java index f35b37e705..3c14d2ce20 100644 --- a/test/src/main/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListener.java +++ b/test/src/main/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListener.java @@ -87,12 +87,12 @@ public class ReactorContextTestExecutionListener extends DelegatingTestExecution @Override public Context currentContext() { - Context context = delegate.currentContext(); + Context context = this.delegate.currentContext(); if (context.hasKey(CONTEXT_DEFAULTED_ATTR_NAME)) { return context; } context = context.put(CONTEXT_DEFAULTED_ATTR_NAME, Boolean.TRUE); - Authentication authentication = securityContext.getAuthentication(); + Authentication authentication = this.securityContext.getAuthentication(); if (authentication == null) { return context; } @@ -102,22 +102,22 @@ public class ReactorContextTestExecutionListener extends DelegatingTestExecution @Override public void onSubscribe(Subscription s) { - delegate.onSubscribe(s); + this.delegate.onSubscribe(s); } @Override public void onNext(T t) { - delegate.onNext(t); + this.delegate.onNext(t); } @Override public void onError(Throwable t) { - delegate.onError(t); + this.delegate.onError(t); } @Override public void onComplete() { - delegate.onComplete(); + this.delegate.onComplete(); } } diff --git a/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java b/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java index b1f3585a82..9d60a0e54a 100644 --- a/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java +++ b/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java @@ -32,7 +32,7 @@ public class TestSecurityContextHolderTests { @Before public void setup() { - context = SecurityContextHolder.createEmptyContext(); + this.context = SecurityContextHolder.createEmptyContext(); } @After @@ -42,13 +42,13 @@ public class TestSecurityContextHolderTests { @Test public void clearContextClearsBoth() { - SecurityContextHolder.setContext(context); - TestSecurityContextHolder.setContext(context); + SecurityContextHolder.setContext(this.context); + TestSecurityContextHolder.setContext(this.context); TestSecurityContextHolder.clearContext(); - assertThat(SecurityContextHolder.getContext()).isNotSameAs(context); - assertThat(TestSecurityContextHolder.getContext()).isNotSameAs(context); + assertThat(SecurityContextHolder.getContext()).isNotSameAs(this.context); + assertThat(TestSecurityContextHolder.getContext()).isNotSameAs(this.context); } @Test @@ -59,10 +59,10 @@ public class TestSecurityContextHolderTests { @Test public void setContextSetsBoth() { - TestSecurityContextHolder.setContext(context); + TestSecurityContextHolder.setContext(this.context); - assertThat(TestSecurityContextHolder.getContext()).isSameAs(context); - assertThat(SecurityContextHolder.getContext()).isSameAs(context); + assertThat(TestSecurityContextHolder.getContext()).isSameAs(this.context); + assertThat(SecurityContextHolder.getContext()).isSameAs(this.context); } @Test diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java b/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java index e039d46bcb..5256b9f112 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java @@ -39,7 +39,7 @@ public class CustomUserDetails implements UserDetails { } public Collection getAuthorities() { - return authorities; + return this.authorities; } public String getPassword() { @@ -47,7 +47,7 @@ public class CustomUserDetails implements UserDetails { } public String getUsername() { - return username; + return this.username; } public boolean isAccountNonExpired() { @@ -68,7 +68,7 @@ public class CustomUserDetails implements UserDetails { @Override public String toString() { - return "CustomUserDetails{" + "username='" + username + '\'' + '}'; + return "CustomUserDetails{" + "username='" + this.username + '\'' + '}'; } } \ No newline at end of file diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserParentTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserParentTests.java index 7586d93046..173829d3b9 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserParentTests.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserParentTests.java @@ -41,7 +41,7 @@ public class WithMockUserParentTests extends WithMockUserParent { @Test public void getMessageWithMockUser() { - String message = messageService.getMessage(); + String message = this.messageService.getMessage(); assertThat(message).contains("user"); } diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java index e81f698062..3efd86fcbf 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java @@ -44,34 +44,34 @@ public class WithMockUserTests { @Test(expected = AuthenticationCredentialsNotFoundException.class) public void getMessageUnauthenticated() { - messageService.getMessage(); + this.messageService.getMessage(); } @Test @WithMockUser public void getMessageWithMockUser() { - String message = messageService.getMessage(); + String message = this.messageService.getMessage(); assertThat(message).contains("user"); } @Test @WithMockUser("customUsername") public void getMessageWithMockUserCustomUsername() { - String message = messageService.getMessage(); + String message = this.messageService.getMessage(); assertThat(message).contains("customUsername"); } @Test @WithMockUser(username = "admin", roles = { "USER", "ADMIN" }) public void getMessageWithMockUserCustomUser() { - String message = messageService.getMessage(); + String message = this.messageService.getMessage(); assertThat(message).contains("admin").contains("ROLE_USER").contains("ROLE_ADMIN"); } @Test @WithMockUser(username = "admin", authorities = { "ADMIN", "USER" }) public void getMessageWithMockUserCustomAuthorities() { - String message = messageService.getMessage(); + String message = this.messageService.getMessage(); assertThat(message).contains("admin").contains("ADMIN").contains("USER").doesNotContain("ROLE_"); } diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java index 1df06646fb..19e6a1b5e0 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java @@ -49,13 +49,13 @@ public class WithUserDetailsTests { @Test(expected = AuthenticationCredentialsNotFoundException.class) public void getMessageUnauthenticated() { - messageService.getMessage(); + this.messageService.getMessage(); } @Test @WithUserDetails public void getMessageWithUserDetails() { - String message = messageService.getMessage(); + String message = this.messageService.getMessage(); assertThat(message).contains("user"); assertThat(getPrincipal()).isInstanceOf(CustomUserDetails.class); } @@ -63,7 +63,7 @@ public class WithUserDetailsTests { @Test @WithUserDetails("customUsername") public void getMessageWithUserDetailsCustomUsername() { - String message = messageService.getMessage(); + String message = this.messageService.getMessage(); assertThat(message).contains("customUsername"); assertThat(getPrincipal()).isInstanceOf(CustomUserDetails.class); } @@ -71,7 +71,7 @@ public class WithUserDetailsTests { @Test @WithUserDetails(value = "customUsername", userDetailsServiceBeanName = "myUserDetailsService") public void getMessageWithUserDetailsServiceBeanName() { - String message = messageService.getMessage(); + String message = this.messageService.getMessage(); assertThat(message).contains("customUsername"); assertThat(getPrincipal()).isInstanceOf(CustomUserDetails.class); } diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java index 5b3b87e1e8..1edb96de79 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java @@ -34,73 +34,74 @@ public class WithMockUserSecurityContextFactoryTests { @Before public void setup() { - factory = new WithMockUserSecurityContextFactory(); + this.factory = new WithMockUserSecurityContextFactory(); } @Test(expected = IllegalArgumentException.class) public void usernameNull() { - factory.createSecurityContext(withUser); + this.factory.createSecurityContext(this.withUser); } @Test public void valueDefaultsUsername() { - when(withUser.value()).thenReturn("valueUser"); - when(withUser.password()).thenReturn("password"); - when(withUser.roles()).thenReturn(new String[] { "USER" }); - when(withUser.authorities()).thenReturn(new String[] {}); + when(this.withUser.value()).thenReturn("valueUser"); + when(this.withUser.password()).thenReturn("password"); + when(this.withUser.roles()).thenReturn(new String[] { "USER" }); + when(this.withUser.authorities()).thenReturn(new String[] {}); - assertThat(factory.createSecurityContext(withUser).getAuthentication().getName()).isEqualTo(withUser.value()); + assertThat(this.factory.createSecurityContext(this.withUser).getAuthentication().getName()) + .isEqualTo(this.withUser.value()); } @Test public void usernamePrioritizedOverValue() { - when(withUser.username()).thenReturn("customUser"); - when(withUser.password()).thenReturn("password"); - when(withUser.roles()).thenReturn(new String[] { "USER" }); - when(withUser.authorities()).thenReturn(new String[] {}); + when(this.withUser.username()).thenReturn("customUser"); + when(this.withUser.password()).thenReturn("password"); + when(this.withUser.roles()).thenReturn(new String[] { "USER" }); + when(this.withUser.authorities()).thenReturn(new String[] {}); - assertThat(factory.createSecurityContext(withUser).getAuthentication().getName()) - .isEqualTo(withUser.username()); + assertThat(this.factory.createSecurityContext(this.withUser).getAuthentication().getName()) + .isEqualTo(this.withUser.username()); } @Test public void rolesWorks() { - when(withUser.value()).thenReturn("valueUser"); - when(withUser.password()).thenReturn("password"); - when(withUser.roles()).thenReturn(new String[] { "USER", "CUSTOM" }); - when(withUser.authorities()).thenReturn(new String[] {}); + when(this.withUser.value()).thenReturn("valueUser"); + when(this.withUser.password()).thenReturn("password"); + when(this.withUser.roles()).thenReturn(new String[] { "USER", "CUSTOM" }); + when(this.withUser.authorities()).thenReturn(new String[] {}); - assertThat(factory.createSecurityContext(withUser).getAuthentication().getAuthorities()).extracting("authority") - .containsOnly("ROLE_USER", "ROLE_CUSTOM"); + assertThat(this.factory.createSecurityContext(this.withUser).getAuthentication().getAuthorities()) + .extracting("authority").containsOnly("ROLE_USER", "ROLE_CUSTOM"); } @Test public void authoritiesWorks() { - when(withUser.value()).thenReturn("valueUser"); - when(withUser.password()).thenReturn("password"); - when(withUser.roles()).thenReturn(new String[] { "USER" }); - when(withUser.authorities()).thenReturn(new String[] { "USER", "CUSTOM" }); + when(this.withUser.value()).thenReturn("valueUser"); + when(this.withUser.password()).thenReturn("password"); + when(this.withUser.roles()).thenReturn(new String[] { "USER" }); + when(this.withUser.authorities()).thenReturn(new String[] { "USER", "CUSTOM" }); - assertThat(factory.createSecurityContext(withUser).getAuthentication().getAuthorities()).extracting("authority") - .containsOnly("USER", "CUSTOM"); + assertThat(this.factory.createSecurityContext(this.withUser).getAuthentication().getAuthorities()) + .extracting("authority").containsOnly("USER", "CUSTOM"); } @Test(expected = IllegalStateException.class) public void authoritiesAndRolesInvalid() { - when(withUser.value()).thenReturn("valueUser"); - when(withUser.roles()).thenReturn(new String[] { "CUSTOM" }); - when(withUser.authorities()).thenReturn(new String[] { "USER", "CUSTOM" }); + when(this.withUser.value()).thenReturn("valueUser"); + when(this.withUser.roles()).thenReturn(new String[] { "CUSTOM" }); + when(this.withUser.authorities()).thenReturn(new String[] { "USER", "CUSTOM" }); - factory.createSecurityContext(withUser); + this.factory.createSecurityContext(this.withUser); } @Test(expected = IllegalArgumentException.class) public void rolesWithRolePrefixFails() { - when(withUser.value()).thenReturn("valueUser"); - when(withUser.roles()).thenReturn(new String[] { "ROLE_FAIL" }); - when(withUser.authorities()).thenReturn(new String[] {}); + when(this.withUser.value()).thenReturn("valueUser"); + when(this.withUser.roles()).thenReturn(new String[] { "ROLE_FAIL" }); + when(this.withUser.authorities()).thenReturn(new String[] {}); - factory.createSecurityContext(withUser); + this.factory.createSecurityContext(this.withUser); } } diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java index da8b1884f1..dec5e7b65e 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java @@ -60,15 +60,15 @@ public class WithSecurityContextTestExcecutionListenerTests { @Before public void setup() { - listener = new WithSecurityContextTestExecutionListener(); - context = new AnnotationConfigApplicationContext(Config.class); + this.listener = new WithSecurityContextTestExecutionListener(); + this.context = new AnnotationConfigApplicationContext(Config.class); } @After public void cleanup() { TestSecurityContextHolder.clearContext(); - if (context != null) { - context.close(); + if (this.context != null) { + this.context.close(); } } @@ -76,20 +76,20 @@ public class WithSecurityContextTestExcecutionListenerTests { @SuppressWarnings({ "rawtypes", "unchecked" }) public void beforeTestMethodNullSecurityContextNoError() throws Exception { Class testClass = FakeTest.class; - when(testContext.getTestClass()).thenReturn(testClass); - when(testContext.getTestMethod()).thenReturn(ReflectionUtils.findMethod(testClass, "testNoAnnotation")); + when(this.testContext.getTestClass()).thenReturn(testClass); + when(this.testContext.getTestMethod()).thenReturn(ReflectionUtils.findMethod(testClass, "testNoAnnotation")); - listener.beforeTestMethod(testContext); + this.listener.beforeTestMethod(this.testContext); } @Test @SuppressWarnings({ "rawtypes", "unchecked" }) public void beforeTestMethodNoApplicationContext() throws Exception { Class testClass = FakeTest.class; - when(testContext.getApplicationContext()).thenThrow(new IllegalStateException()); - when(testContext.getTestMethod()).thenReturn(ReflectionUtils.findMethod(testClass, "testWithMockUser")); + when(this.testContext.getApplicationContext()).thenThrow(new IllegalStateException()); + when(this.testContext.getTestMethod()).thenReturn(ReflectionUtils.findMethod(testClass, "testWithMockUser")); - listener.beforeTestMethod(testContext); + this.listener.beforeTestMethod(this.testContext); assertThat(TestSecurityContextHolder.getContext().getAuthentication().getName()).isEqualTo("user"); } diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java index 5db8eff4f9..873ce590e2 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java @@ -57,33 +57,33 @@ public class WithUserDetailsSecurityContextFactoryTests { @Before public void setup() { - factory = new WithUserDetailsSecurityContextFactory(beans); + this.factory = new WithUserDetailsSecurityContextFactory(this.beans); } @Test(expected = IllegalArgumentException.class) public void createSecurityContextNullValue() { - factory.createSecurityContext(withUserDetails); + this.factory.createSecurityContext(this.withUserDetails); } @Test(expected = IllegalArgumentException.class) public void createSecurityContextEmptyValue() { - when(withUserDetails.value()).thenReturn(""); - factory.createSecurityContext(withUserDetails); + when(this.withUserDetails.value()).thenReturn(""); + this.factory.createSecurityContext(this.withUserDetails); } @Test public void createSecurityContextWithExistingUser() { String username = "user"; when(this.beans.getBean(ReactiveUserDetailsService.class)).thenThrow(new NoSuchBeanDefinitionException("")); - when(beans.getBean(UserDetailsService.class)).thenReturn(userDetailsService); - when(withUserDetails.value()).thenReturn(username); - when(userDetailsService.loadUserByUsername(username)).thenReturn(userDetails); + when(this.beans.getBean(UserDetailsService.class)).thenReturn(this.userDetailsService); + when(this.withUserDetails.value()).thenReturn(username); + when(this.userDetailsService.loadUserByUsername(username)).thenReturn(this.userDetails); - SecurityContext context = factory.createSecurityContext(withUserDetails); + SecurityContext context = this.factory.createSecurityContext(this.withUserDetails); assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class); - assertThat(context.getAuthentication().getPrincipal()).isEqualTo(userDetails); - verify(beans).getBean(UserDetailsService.class); + assertThat(context.getAuthentication().getPrincipal()).isEqualTo(this.userDetails); + verify(this.beans).getBean(UserDetailsService.class); } // gh-3346 @@ -93,27 +93,27 @@ public class WithUserDetailsSecurityContextFactoryTests { String username = "user"; when(this.beans.getBean(beanName, ReactiveUserDetailsService.class)).thenThrow( new BeanNotOfRequiredTypeException("", ReactiveUserDetailsService.class, UserDetailsService.class)); - when(withUserDetails.value()).thenReturn(username); - when(withUserDetails.userDetailsServiceBeanName()).thenReturn(beanName); - when(userDetailsService.loadUserByUsername(username)).thenReturn(userDetails); - when(beans.getBean(beanName, UserDetailsService.class)).thenReturn(userDetailsService); + when(this.withUserDetails.value()).thenReturn(username); + when(this.withUserDetails.userDetailsServiceBeanName()).thenReturn(beanName); + when(this.userDetailsService.loadUserByUsername(username)).thenReturn(this.userDetails); + when(this.beans.getBean(beanName, UserDetailsService.class)).thenReturn(this.userDetailsService); - SecurityContext context = factory.createSecurityContext(withUserDetails); + SecurityContext context = this.factory.createSecurityContext(this.withUserDetails); assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class); - assertThat(context.getAuthentication().getPrincipal()).isEqualTo(userDetails); - verify(beans).getBean(beanName, UserDetailsService.class); + assertThat(context.getAuthentication().getPrincipal()).isEqualTo(this.userDetails); + verify(this.beans).getBean(beanName, UserDetailsService.class); } @Test public void createSecurityContextWithReactiveUserDetailsService() { String username = "user"; - when(withUserDetails.value()).thenReturn(username); + when(this.withUserDetails.value()).thenReturn(username); when(this.beans.getBean(ReactiveUserDetailsService.class)).thenReturn(this.reactiveUserDetailsService); - when(this.reactiveUserDetailsService.findByUsername(username)).thenReturn(Mono.just(userDetails)); + when(this.reactiveUserDetailsService.findByUsername(username)).thenReturn(Mono.just(this.userDetails)); - SecurityContext context = factory.createSecurityContext(withUserDetails); + SecurityContext context = this.factory.createSecurityContext(this.withUserDetails); assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class); - assertThat(context.getAuthentication().getPrincipal()).isEqualTo(userDetails); + assertThat(context.getAuthentication().getPrincipal()).isEqualTo(this.userDetails); verify(this.beans).getBean(ReactiveUserDetailsService.class); } @@ -121,15 +121,15 @@ public class WithUserDetailsSecurityContextFactoryTests { public void createSecurityContextWithReactiveUserDetailsServiceAndBeanName() { String beanName = "secondUserDetailsServiceBean"; String username = "user"; - when(withUserDetails.value()).thenReturn(username); - when(withUserDetails.userDetailsServiceBeanName()).thenReturn(beanName); + when(this.withUserDetails.value()).thenReturn(username); + when(this.withUserDetails.userDetailsServiceBeanName()).thenReturn(beanName); when(this.beans.getBean(beanName, ReactiveUserDetailsService.class)) .thenReturn(this.reactiveUserDetailsService); - when(this.reactiveUserDetailsService.findByUsername(username)).thenReturn(Mono.just(userDetails)); + when(this.reactiveUserDetailsService.findByUsername(username)).thenReturn(Mono.just(this.userDetails)); - SecurityContext context = factory.createSecurityContext(withUserDetails); + SecurityContext context = this.factory.createSecurityContext(this.withUserDetails); assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class); - assertThat(context.getAuthentication().getPrincipal()).isEqualTo(userDetails); + assertThat(context.getAuthentication().getPrincipal()).isEqualTo(this.userDetails); verify(this.beans).getBean(beanName, ReactiveUserDetailsService.class); } diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java index 1a19e6d064..a976d14356 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java @@ -50,7 +50,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe private GrantedAuthority authority2 = new SimpleGrantedAuthority("two"); - private WebTestClient client = WebTestClient.bindToController(securityContextController) + private WebTestClient client = WebTestClient.bindToController(this.securityContextController) .webFilter(new SecurityContextServerWebExchangeWebFilter()) .argumentResolvers(resolvers -> resolvers .addCustomResolver(new CurrentSecurityContextArgumentResolver(new ReactiveAdapterRegistry()))) @@ -61,7 +61,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe public void mockOpaqueTokenWhenUsingDefaultsThenBearerTokenAuthentication() { this.client.mutateWith(mockOpaqueToken()).get().exchange().expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat(context.getAuthentication()).isInstanceOf(BearerTokenAuthentication.class); BearerTokenAuthentication token = (BearerTokenAuthentication) context.getAuthentication(); assertThat(token.getAuthorities()).isNotEmpty(); @@ -74,7 +74,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe this.client.mutateWith(mockOpaqueToken().authorities(this.authority1, this.authority2)).get().exchange() .expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat((List) context.getAuthentication().getAuthorities()).containsOnly(this.authority1, this.authority2); } @@ -85,7 +85,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe this.client.mutateWith(mockOpaqueToken().attributes(attributes -> attributes.put(SUBJECT, sub))).get() .exchange().expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat(context.getAuthentication()).isInstanceOf(BearerTokenAuthentication.class); BearerTokenAuthentication token = (BearerTokenAuthentication) context.getAuthentication(); assertThat(token.getTokenAttributes().get(SUBJECT)).isSameAs(sub); @@ -96,7 +96,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe OAuth2AuthenticatedPrincipal principal = active(); this.client.mutateWith(mockOpaqueToken().principal(principal)).get().exchange().expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat(context.getAuthentication()).isInstanceOf(BearerTokenAuthentication.class); BearerTokenAuthentication token = (BearerTokenAuthentication) context.getAuthentication(); assertThat(token.getPrincipal()).isSameAs(principal); @@ -109,7 +109,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe this.client.mutateWith(mockOpaqueToken().attributes(a -> a.put(SUBJECT, "foo")).principal(principal)).get() .exchange().expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat(context.getAuthentication()).isInstanceOf(BearerTokenAuthentication.class); BearerTokenAuthentication token = (BearerTokenAuthentication) context.getAuthentication(); assertThat((String) ((OAuth2AuthenticatedPrincipal) token.getPrincipal()).getAttribute(SUBJECT)) @@ -118,7 +118,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe this.client.mutateWith(mockOpaqueToken().principal(principal).attributes(a -> a.put(SUBJECT, "bar"))).get() .exchange().expectStatus().isOk(); - context = securityContextController.removeSecurityContext(); + context = this.securityContextController.removeSecurityContext(); assertThat(context.getAuthentication()).isInstanceOf(BearerTokenAuthentication.class); token = (BearerTokenAuthentication) context.getAuthentication(); assertThat((String) ((OAuth2AuthenticatedPrincipal) token.getPrincipal()).getAttribute(SUBJECT)) diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersAnnotatedTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersAnnotatedTests.java index 4289e4cfe0..480cf1ed63 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersAnnotatedTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersAnnotatedTests.java @@ -43,17 +43,17 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock @SecurityTestExecutionListeners public class SecurityMockServerConfigurersAnnotatedTests extends AbstractMockServerConfigurersTests { - WebTestClient client = WebTestClient.bindToController(controller) + WebTestClient client = WebTestClient.bindToController(this.controller) .webFilter(new SecurityContextServerWebExchangeWebFilter()).apply(springSecurity()).configureClient() .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).build(); @Test @WithMockUser public void withMockUserWhenOnMethodThenSuccess() { - client.get().exchange().expectStatus().isOk(); + this.client.get().exchange().expectStatus().isOk(); Authentication authentication = TestSecurityContextHolder.getContext().getAuthentication(); - controller.assertPrincipalIsEqualTo(authentication); + this.controller.assertPrincipalIsEqualTo(authentication); } @Test @@ -61,13 +61,14 @@ public class SecurityMockServerConfigurersAnnotatedTests extends AbstractMockSer public void withMockUserWhenGlobalMockPrincipalThenOverridesAnnotation() { TestingAuthenticationToken authentication = new TestingAuthenticationToken("authentication", "secret", "ROLE_USER"); - client = WebTestClient.bindToController(controller).webFilter(new SecurityContextServerWebExchangeWebFilter()) - .apply(springSecurity()).apply(mockAuthentication(authentication)).configureClient() + this.client = WebTestClient.bindToController(this.controller) + .webFilter(new SecurityContextServerWebExchangeWebFilter()).apply(springSecurity()) + .apply(mockAuthentication(authentication)).configureClient() .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).build(); - client.get().exchange().expectStatus().isOk(); + this.client.get().exchange().expectStatus().isOk(); - controller.assertPrincipalIsEqualTo(authentication); + this.controller.assertPrincipalIsEqualTo(authentication); } @Test @@ -75,9 +76,9 @@ public class SecurityMockServerConfigurersAnnotatedTests extends AbstractMockSer public void withMockUserWhenMutateWithMockPrincipalThenOverridesAnnotation() { TestingAuthenticationToken authentication = new TestingAuthenticationToken("authentication", "secret", "ROLE_USER"); - client.mutateWith(mockAuthentication(authentication)).get().exchange().expectStatus().isOk(); + this.client.mutateWith(mockAuthentication(authentication)).get().exchange().expectStatus().isOk(); - controller.assertPrincipalIsEqualTo(authentication); + this.controller.assertPrincipalIsEqualTo(authentication); } @Test @@ -85,22 +86,22 @@ public class SecurityMockServerConfigurersAnnotatedTests extends AbstractMockSer public void withMockUserWhenMutateWithMockPrincipalAndNoMutateThenOverridesAnnotationAndUsesAnnotation() { TestingAuthenticationToken authentication = new TestingAuthenticationToken("authentication", "secret", "ROLE_USER"); - client.mutateWith(mockAuthentication(authentication)).get().exchange().expectStatus().isOk(); + this.client.mutateWith(mockAuthentication(authentication)).get().exchange().expectStatus().isOk(); - controller.assertPrincipalIsEqualTo(authentication); + this.controller.assertPrincipalIsEqualTo(authentication); - client.get().exchange().expectStatus().isOk(); + this.client.get().exchange().expectStatus().isOk(); - assertPrincipalCreatedFromUserDetails(controller.removePrincipal(), userBuilder.build()); + assertPrincipalCreatedFromUserDetails(this.controller.removePrincipal(), this.userBuilder.build()); } @Test @WithMockUser public void withMockUserWhenOnMethodAndRequestIsExecutedOnDifferentThreadThenSuccess() { Authentication authentication = TestSecurityContextHolder.getContext().getAuthentication(); - ForkJoinPool.commonPool().submit(() -> client.get().exchange().expectStatus().isOk()).join(); + ForkJoinPool.commonPool().submit(() -> this.client.get().exchange().expectStatus().isOk()).join(); - controller.assertPrincipalIsEqualTo(authentication); + this.controller.assertPrincipalIsEqualTo(authentication); } @Test @@ -110,14 +111,14 @@ public class SecurityMockServerConfigurersAnnotatedTests extends AbstractMockSer "ROLE_USER"); ForkJoinPool.commonPool().submit( - () -> client.mutateWith(mockAuthentication(authentication)).get().exchange().expectStatus().isOk()) + () -> this.client.mutateWith(mockAuthentication(authentication)).get().exchange().expectStatus().isOk()) .join(); - controller.assertPrincipalIsEqualTo(authentication); + this.controller.assertPrincipalIsEqualTo(authentication); - ForkJoinPool.commonPool().submit(() -> client.get().exchange().expectStatus().isOk()).join(); + ForkJoinPool.commonPool().submit(() -> this.client.get().exchange().expectStatus().isOk()).join(); - assertPrincipalCreatedFromUserDetails(controller.removePrincipal(), userBuilder.build()); + assertPrincipalCreatedFromUserDetails(this.controller.removePrincipal(), this.userBuilder.build()); } } diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersClassAnnotatedTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersClassAnnotatedTests.java index a0fcc549df..68857affa6 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersClassAnnotatedTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersClassAnnotatedTests.java @@ -44,37 +44,37 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock @SecurityTestExecutionListeners public class SecurityMockServerConfigurersClassAnnotatedTests extends AbstractMockServerConfigurersTests { - WebTestClient client = WebTestClient.bindToController(controller) + WebTestClient client = WebTestClient.bindToController(this.controller) .webFilter(new SecurityContextServerWebExchangeWebFilter()).apply(springSecurity()).configureClient() .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).build(); @Test public void wheMockUserWhenClassAnnotatedThenSuccess() { - client.get().exchange().expectStatus().isOk().expectBody(String.class) + this.client.get().exchange().expectStatus().isOk().expectBody(String.class) .consumeWith(response -> assertThat(response.getResponseBody()).contains("\"username\":\"user\"")); Authentication authentication = TestSecurityContextHolder.getContext().getAuthentication(); - controller.assertPrincipalIsEqualTo(authentication); + this.controller.assertPrincipalIsEqualTo(authentication); } @Test @WithMockUser("method-user") public void withMockUserWhenClassAndMethodAnnotationThenMethodOverrides() { - client.get().exchange().expectStatus().isOk().expectBody(String.class).consumeWith( + this.client.get().exchange().expectStatus().isOk().expectBody(String.class).consumeWith( response -> assertThat(response.getResponseBody()).contains("\"username\":\"method-user\"")); Authentication authentication = TestSecurityContextHolder.getContext().getAuthentication(); - controller.assertPrincipalIsEqualTo(authentication); + this.controller.assertPrincipalIsEqualTo(authentication); } @Test public void withMockUserWhenMutateWithThenMustateWithOverrides() { - client.mutateWith(mockUser("mutateWith-mockUser")).get().exchange().expectStatus().isOk() + this.client.mutateWith(mockUser("mutateWith-mockUser")).get().exchange().expectStatus().isOk() .expectBody(String.class).consumeWith(response -> assertThat(response.getResponseBody()) .contains("\"username\":\"mutateWith-mockUser\"")); - Principal principal = controller.removePrincipal(); - assertPrincipalCreatedFromUserDetails(principal, userBuilder.username("mutateWith-mockUser").build()); + Principal principal = this.controller.removePrincipal(); + assertPrincipalCreatedFromUserDetails(principal, this.userBuilder.username("mutateWith-mockUser").build()); } } diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java index 02a01cc8e3..7c64ffeda4 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java @@ -54,7 +54,7 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon @Mock GrantedAuthority authority2; - WebTestClient client = WebTestClient.bindToController(securityContextController) + WebTestClient client = WebTestClient.bindToController(this.securityContextController) .webFilter(new SecurityContextServerWebExchangeWebFilter()) .argumentResolvers(resolvers -> resolvers .addCustomResolver(new CurrentSecurityContextArgumentResolver(new ReactiveAdapterRegistry()))) @@ -63,9 +63,9 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon @Test public void mockJwtWhenUsingDefaultsTheCreatesJwtAuthentication() { - client.mutateWith(mockJwt()).get().exchange().expectStatus().isOk(); + this.client.mutateWith(mockJwt()).get().exchange().expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat(context.getAuthentication()).isInstanceOf(JwtAuthenticationToken.class); JwtAuthenticationToken token = (JwtAuthenticationToken) context.getAuthentication(); assertThat(token.getAuthorities()).isNotEmpty(); @@ -77,9 +77,9 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon @Test public void mockJwtWhenProvidingBuilderConsumerThenProducesJwtAuthentication() { String name = new String("user"); - client.mutateWith(mockJwt().jwt(jwt -> jwt.subject(name))).get().exchange().expectStatus().isOk(); + this.client.mutateWith(mockJwt().jwt(jwt -> jwt.subject(name))).get().exchange().expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat(context.getAuthentication()).isInstanceOf(JwtAuthenticationToken.class); JwtAuthenticationToken token = (JwtAuthenticationToken) context.getAuthentication(); assertThat(token.getToken().getSubject()).isSameAs(name); @@ -87,30 +87,30 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon @Test public void mockJwtWhenProvidingCustomAuthoritiesThenProducesJwtAuthentication() { - client.mutateWith(mockJwt().jwt(jwt -> jwt.claim("scope", "ignored authorities")).authorities(this.authority1, - this.authority2)).get().exchange().expectStatus().isOk(); + this.client.mutateWith(mockJwt().jwt(jwt -> jwt.claim("scope", "ignored authorities")) + .authorities(this.authority1, this.authority2)).get().exchange().expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat((List) context.getAuthentication().getAuthorities()).containsOnly(this.authority1, this.authority2); } @Test public void mockJwtWhenProvidingScopedAuthoritiesThenProducesJwtAuthentication() { - client.mutateWith(mockJwt().jwt(jwt -> jwt.claim("scope", "scoped authorities"))).get().exchange() + this.client.mutateWith(mockJwt().jwt(jwt -> jwt.claim("scope", "scoped authorities"))).get().exchange() .expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat((List) context.getAuthentication().getAuthorities()).containsOnly( new SimpleGrantedAuthority("SCOPE_scoped"), new SimpleGrantedAuthority("SCOPE_authorities")); } @Test public void mockJwtWhenProvidingGrantedAuthoritiesThenProducesJwtAuthentication() { - client.mutateWith(mockJwt().jwt(jwt -> jwt.claim("scope", "ignored authorities")) + this.client.mutateWith(mockJwt().jwt(jwt -> jwt.claim("scope", "ignored authorities")) .authorities(jwt -> Arrays.asList(this.authority1))).get().exchange().expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat((List) context.getAuthentication().getAuthorities()).containsOnly(this.authority1); } @@ -119,7 +119,7 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon Jwt originalToken = TestJwts.jwt().header("header1", "value1").subject("some_user").build(); this.client.mutateWith(mockJwt().jwt(originalToken)).get().exchange().expectStatus().isOk(); - SecurityContext context = securityContextController.removeSecurityContext(); + SecurityContext context = this.securityContextController.removeSecurityContext(); assertThat(context.getAuthentication()).isInstanceOf(JwtAuthenticationToken.class); JwtAuthenticationToken retrievedToken = (JwtAuthenticationToken) context.getAuthentication(); assertThat(retrievedToken.getToken().getSubject()).isEqualTo("some_user"); diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersTests.java index 62135103a7..68354f6021 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersTests.java @@ -42,7 +42,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock */ public class SecurityMockServerConfigurersTests extends AbstractMockServerConfigurersTests { - WebTestClient client = WebTestClient.bindToController(controller) + WebTestClient client = WebTestClient.bindToController(this.controller) .webFilter(new CsrfWebFilter(), new SecurityContextServerWebExchangeWebFilter()).apply(springSecurity()) .configureClient().defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).build(); @@ -50,70 +50,71 @@ public class SecurityMockServerConfigurersTests extends AbstractMockServerConfig public void mockAuthenticationWhenLocalThenSuccess() { TestingAuthenticationToken authentication = new TestingAuthenticationToken("authentication", "secret", "ROLE_USER"); - client.mutateWith(mockAuthentication(authentication)).get().exchange().expectStatus().isOk(); - controller.assertPrincipalIsEqualTo(authentication); + this.client.mutateWith(mockAuthentication(authentication)).get().exchange().expectStatus().isOk(); + this.controller.assertPrincipalIsEqualTo(authentication); } @Test public void mockAuthenticationWhenGlobalThenSuccess() { TestingAuthenticationToken authentication = new TestingAuthenticationToken("authentication", "secret", "ROLE_USER"); - client = WebTestClient.bindToController(controller).webFilter(new SecurityContextServerWebExchangeWebFilter()) - .apply(springSecurity()).apply(mockAuthentication(authentication)).configureClient() + this.client = WebTestClient.bindToController(this.controller) + .webFilter(new SecurityContextServerWebExchangeWebFilter()).apply(springSecurity()) + .apply(mockAuthentication(authentication)).configureClient() .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).build(); - client.get().exchange().expectStatus().isOk(); - controller.assertPrincipalIsEqualTo(authentication); + this.client.get().exchange().expectStatus().isOk(); + this.controller.assertPrincipalIsEqualTo(authentication); } @Test public void mockUserWhenDefaultsThenSuccess() { - client.mutateWith(mockUser()).get().exchange().expectStatus().isOk(); + this.client.mutateWith(mockUser()).get().exchange().expectStatus().isOk(); - Principal actual = controller.removePrincipal(); + Principal actual = this.controller.removePrincipal(); - assertPrincipalCreatedFromUserDetails(actual, userBuilder.build()); + assertPrincipalCreatedFromUserDetails(actual, this.userBuilder.build()); } @Test public void mockUserWhenGlobalThenSuccess() { - client = WebTestClient.bindToController(controller).webFilter(new SecurityContextServerWebExchangeWebFilter()) - .apply(springSecurity()).apply(mockUser()).configureClient() - .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).build(); - client.get().exchange().expectStatus().isOk(); + this.client = WebTestClient.bindToController(this.controller) + .webFilter(new SecurityContextServerWebExchangeWebFilter()).apply(springSecurity()).apply(mockUser()) + .configureClient().defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).build(); + this.client.get().exchange().expectStatus().isOk(); - Principal actual = controller.removePrincipal(); + Principal actual = this.controller.removePrincipal(); - assertPrincipalCreatedFromUserDetails(actual, userBuilder.build()); + assertPrincipalCreatedFromUserDetails(actual, this.userBuilder.build()); } @Test public void mockUserStringWhenLocalThenSuccess() { - client.mutateWith(mockUser(userBuilder.build().getUsername())).get().exchange().expectStatus().isOk(); + this.client.mutateWith(mockUser(this.userBuilder.build().getUsername())).get().exchange().expectStatus().isOk(); - Principal actual = controller.removePrincipal(); + Principal actual = this.controller.removePrincipal(); - assertPrincipalCreatedFromUserDetails(actual, userBuilder.build()); + assertPrincipalCreatedFromUserDetails(actual, this.userBuilder.build()); } @Test public void mockUserStringWhenCustomThenSuccess() { this.userBuilder = User.withUsername("admin").password("secret").roles("USER", "ADMIN"); - client.mutateWith(mockUser("admin").password("secret").roles("USER", "ADMIN")).get().exchange().expectStatus() - .isOk(); + this.client.mutateWith(mockUser("admin").password("secret").roles("USER", "ADMIN")).get().exchange() + .expectStatus().isOk(); - Principal actual = controller.removePrincipal(); + Principal actual = this.controller.removePrincipal(); - assertPrincipalCreatedFromUserDetails(actual, userBuilder.build()); + assertPrincipalCreatedFromUserDetails(actual, this.userBuilder.build()); } @Test public void mockUserUserDetailsLocalThenSuccess() { UserDetails userDetails = this.userBuilder.build(); - client.mutateWith(mockUser(userDetails)).get().exchange().expectStatus().isOk(); + this.client.mutateWith(mockUser(userDetails)).get().exchange().expectStatus().isOk(); - Principal actual = controller.removePrincipal(); + Principal actual = this.controller.removePrincipal(); - assertPrincipalCreatedFromUserDetails(actual, userBuilder.build()); + assertPrincipalCreatedFromUserDetails(actual, this.userBuilder.build()); } @Test diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/Sec2935Tests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/Sec2935Tests.java index 64f306fb7d..f8ccde3430 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/Sec2935Tests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/Sec2935Tests.java @@ -57,47 +57,47 @@ public class Sec2935Tests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()).build(); } // SEC-2935 @Test public void postProcessorUserNoUser() throws Exception { - mvc.perform(get("/admin/abc").with(user("user").roles("ADMIN", "USER"))).andExpect(status().isNotFound()) + this.mvc.perform(get("/admin/abc").with(user("user").roles("ADMIN", "USER"))).andExpect(status().isNotFound()) .andExpect(authenticated().withUsername("user")); - mvc.perform(get("/admin/abc")).andExpect(status().isUnauthorized()).andExpect(unauthenticated()); + this.mvc.perform(get("/admin/abc")).andExpect(status().isUnauthorized()).andExpect(unauthenticated()); } @Test public void postProcessorUserOtherUser() throws Exception { - mvc.perform(get("/admin/abc").with(user("user1").roles("ADMIN", "USER"))).andExpect(status().isNotFound()) + this.mvc.perform(get("/admin/abc").with(user("user1").roles("ADMIN", "USER"))).andExpect(status().isNotFound()) .andExpect(authenticated().withUsername("user1")); - mvc.perform(get("/admin/abc").with(user("user2").roles("USER"))).andExpect(status().isForbidden()) + this.mvc.perform(get("/admin/abc").with(user("user2").roles("USER"))).andExpect(status().isForbidden()) .andExpect(authenticated().withUsername("user2")); } @WithMockUser @Test public void postProcessorUserWithMockUser() throws Exception { - mvc.perform(get("/admin/abc").with(user("user1").roles("ADMIN", "USER"))).andExpect(status().isNotFound()) + this.mvc.perform(get("/admin/abc").with(user("user1").roles("ADMIN", "USER"))).andExpect(status().isNotFound()) .andExpect(authenticated().withUsername("user1")); - mvc.perform(get("/admin/abc")).andExpect(status().isForbidden()) + this.mvc.perform(get("/admin/abc")).andExpect(status().isForbidden()) .andExpect(authenticated().withUsername("user")); } // SEC-2941 @Test public void defaultRequest() throws Exception { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()) + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()) .defaultRequest(get("/").with(user("default"))).build(); - mvc.perform(get("/admin/abc").with(user("user1").roles("ADMIN", "USER"))).andExpect(status().isNotFound()) + this.mvc.perform(get("/admin/abc").with(user("user1").roles("ADMIN", "USER"))).andExpect(status().isNotFound()) .andExpect(authenticated().withUsername("user1")); - mvc.perform(get("/admin/abc")).andExpect(status().isForbidden()) + this.mvc.perform(get("/admin/abc")).andExpect(status().isForbidden()) .andExpect(authenticated().withUsername("default")); } @@ -105,13 +105,13 @@ public class Sec2935Tests { @WithMockUser @Test public void defaultRequestOverridesWithMockUser() throws Exception { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()) + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()) .defaultRequest(get("/").with(user("default"))).build(); - mvc.perform(get("/admin/abc").with(user("user1").roles("ADMIN", "USER"))).andExpect(status().isNotFound()) + this.mvc.perform(get("/admin/abc").with(user("user1").roles("ADMIN", "USER"))).andExpect(status().isNotFound()) .andExpect(authenticated().withUsername("user1")); - mvc.perform(get("/admin/abc")).andExpect(status().isForbidden()) + this.mvc.perform(get("/admin/abc")).andExpect(status().isForbidden()) .andExpect(authenticated().withUsername("default")); } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java index 60ca04c417..5739ef9dc4 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java @@ -45,12 +45,12 @@ public class SecurityMockMvcRequestBuildersFormLogoutTests { @Before public void setup() { - servletContext = new MockServletContext(); + this.servletContext = new MockServletContext(); } @Test public void defaults() { - MockHttpServletRequest request = logout().buildRequest(servletContext); + MockHttpServletRequest request = logout().buildRequest(this.servletContext); CsrfToken token = (CsrfToken) request .getAttribute(CsrfRequestPostProcessor.TestCsrfTokenRepository.TOKEN_ATTR_NAME); @@ -62,7 +62,7 @@ public class SecurityMockMvcRequestBuildersFormLogoutTests { @Test public void custom() { - MockHttpServletRequest request = logout("/admin/logout").buildRequest(servletContext); + MockHttpServletRequest request = logout("/admin/logout").buildRequest(this.servletContext); CsrfToken token = (CsrfToken) request .getAttribute(CsrfRequestPostProcessor.TestCsrfTokenRepository.TOKEN_ATTR_NAME); @@ -75,7 +75,7 @@ public class SecurityMockMvcRequestBuildersFormLogoutTests { @Test public void customWithUriVars() { MockHttpServletRequest request = logout().logoutUrl("/uri-logout/{var1}/{var2}", "val1", "val2") - .buildRequest(servletContext); + .buildRequest(this.servletContext); CsrfToken token = (CsrfToken) request .getAttribute(CsrfRequestPostProcessor.TestCsrfTokenRepository.TOKEN_ATTR_NAME); diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java index 72c2fd2435..61cb427087 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java @@ -53,20 +53,20 @@ public class SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()).build(); } // SEC-2593 @Test public void userRequestPostProcessorWorksWithStateless() throws Exception { - mvc.perform(get("/").with(user("user"))).andExpect(status().is2xxSuccessful()); + this.mvc.perform(get("/").with(user("user"))).andExpect(status().is2xxSuccessful()); } // SEC-2593 @WithMockUser @Test public void withMockUserWorksWithStateless() throws Exception { - mvc.perform(get("/")).andExpect(status().is2xxSuccessful()); + this.mvc.perform(get("/")).andExpect(status().is2xxSuccessful()); } @EnableWebSecurity diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java index d24f9a67ee..73c8dc0544 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java @@ -62,7 +62,7 @@ public class SecurityMockMvcRequestPostProcessorsAuthenticationTests { @Before public void setup() { - request = new MockHttpServletRequest(); + this.request = new MockHttpServletRequest(); mockWebTestUtils(); } @@ -73,16 +73,17 @@ public class SecurityMockMvcRequestPostProcessorsAuthenticationTests { @Test public void userDetails() { - authentication(authentication).postProcessRequest(request); + authentication(this.authentication).postProcessRequest(this.request); - verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class)); - SecurityContext context = contextCaptor.getValue(); - assertThat(context.getAuthentication()).isSameAs(authentication); + verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), + any(HttpServletResponse.class)); + SecurityContext context = this.contextCaptor.getValue(); + assertThat(context.getAuthentication()).isSameAs(this.authentication); } private void mockWebTestUtils() { spy(WebTestUtils.class); - when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository); + when(WebTestUtils.getSecurityContextRepository(this.request)).thenReturn(this.repository); } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java index b7a275d170..d1389af563 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java @@ -38,22 +38,22 @@ public class SecurityMockMvcRequestPostProcessorsCertificateTests { @Before public void setup() { - request = new MockHttpServletRequest(); + this.request = new MockHttpServletRequest(); } @Test public void x509SingleCertificate() { - MockHttpServletRequest postProcessedRequest = x509(certificate).postProcessRequest(request); + MockHttpServletRequest postProcessedRequest = x509(this.certificate).postProcessRequest(this.request); X509Certificate[] certificates = (X509Certificate[]) postProcessedRequest .getAttribute("javax.servlet.request.X509Certificate"); - assertThat(certificates).containsOnly(certificate); + assertThat(certificates).containsOnly(this.certificate); } @Test public void x509ResourceName() throws Exception { - MockHttpServletRequest postProcessedRequest = x509("rod.cer").postProcessRequest(request); + MockHttpServletRequest postProcessedRequest = x509("rod.cer").postProcessRequest(this.request); X509Certificate[] certificates = (X509Certificate[]) postProcessedRequest .getAttribute("javax.servlet.request.X509Certificate"); diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfDebugFilterTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfDebugFilterTests.java index c8e79f0fa5..1771697493 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfDebugFilterTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfDebugFilterTests.java @@ -46,7 +46,7 @@ public class SecurityMockMvcRequestPostProcessorsCsrfDebugFilterTests { // SEC-3836 @Test public void findCookieCsrfTokenRepository() { - MockHttpServletRequest request = post("/").buildRequest(wac.getServletContext()); + MockHttpServletRequest request = post("/").buildRequest(this.wac.getServletContext()); CsrfTokenRepository csrfTokenRepository = WebTestUtils.getCsrfTokenRepository(request); assertThat(csrfTokenRepository).isNotNull(); assertThat(csrfTokenRepository).isEqualTo(Config.cookieCsrfTokenRepository); diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java index c3d65d4d5f..dab46c6b0c 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java @@ -53,16 +53,16 @@ public class SecurityMockMvcRequestPostProcessorsDigestTests { @Before public void setup() { this.password = "password"; - request = new MockHttpServletRequest(); + this.request = new MockHttpServletRequest(); - entryPoint = new DigestAuthenticationEntryPoint(); - entryPoint.setKey("key"); - entryPoint.setRealmName("Spring Security"); - filter = new DigestAuthenticationFilter(); - filter.setUserDetailsService( - username -> new User(username, password, AuthorityUtils.createAuthorityList("ROLE_USER"))); - filter.setAuthenticationEntryPoint(entryPoint); - filter.afterPropertiesSet(); + this.entryPoint = new DigestAuthenticationEntryPoint(); + this.entryPoint.setKey("key"); + this.entryPoint.setRealmName("Spring Security"); + this.filter = new DigestAuthenticationFilter(); + this.filter.setUserDetailsService( + username -> new User(username, this.password, AuthorityUtils.createAuthorityList("ROLE_USER"))); + this.filter.setAuthenticationEntryPoint(this.entryPoint); + this.filter.afterPropertiesSet(); } @After @@ -72,7 +72,7 @@ public class SecurityMockMvcRequestPostProcessorsDigestTests { @Test public void digestWithFilter() throws Exception { - MockHttpServletRequest postProcessedRequest = digest().postProcessRequest(request); + MockHttpServletRequest postProcessedRequest = digest().postProcessRequest(this.request); assertThat(extractUser()).isEqualTo("user"); } @@ -80,7 +80,7 @@ public class SecurityMockMvcRequestPostProcessorsDigestTests { @Test public void digestWithFilterCustomUsername() throws Exception { String username = "admin"; - MockHttpServletRequest postProcessedRequest = digest(username).postProcessRequest(request); + MockHttpServletRequest postProcessedRequest = digest(username).postProcessRequest(this.request); assertThat(extractUser()).isEqualTo(username); } @@ -88,8 +88,9 @@ public class SecurityMockMvcRequestPostProcessorsDigestTests { @Test public void digestWithFilterCustomPassword() throws Exception { String username = "custom"; - password = "secret"; - MockHttpServletRequest postProcessedRequest = digest(username).password(password).postProcessRequest(request); + this.password = "secret"; + MockHttpServletRequest postProcessedRequest = digest(username).password(this.password) + .postProcessRequest(this.request); assertThat(extractUser()).isEqualTo(username); } @@ -97,9 +98,9 @@ public class SecurityMockMvcRequestPostProcessorsDigestTests { @Test public void digestWithFilterCustomRealm() throws Exception { String username = "admin"; - entryPoint.setRealmName("Custom"); - MockHttpServletRequest postProcessedRequest = digest(username).realm(entryPoint.getRealmName()) - .postProcessRequest(request); + this.entryPoint.setRealmName("Custom"); + MockHttpServletRequest postProcessedRequest = digest(username).realm(this.entryPoint.getRealmName()) + .postProcessRequest(this.request); assertThat(extractUser()).isEqualTo(username); } @@ -107,20 +108,22 @@ public class SecurityMockMvcRequestPostProcessorsDigestTests { @Test public void digestWithFilterFails() throws Exception { String username = "admin"; - MockHttpServletRequest postProcessedRequest = digest(username).realm("Invalid").postProcessRequest(request); + MockHttpServletRequest postProcessedRequest = digest(username).realm("Invalid") + .postProcessRequest(this.request); assertThat(extractUser()).isNull(); } private String extractUser() throws IOException, ServletException { - filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain() { + this.filter.doFilter(this.request, new MockHttpServletResponse(), new MockFilterChain() { @Override public void doFilter(ServletRequest request, ServletResponse response) { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - username = authentication == null ? null : authentication.getName(); + SecurityMockMvcRequestPostProcessorsDigestTests.this.username = authentication == null ? null + : authentication.getName(); } }); - return username; + return this.username; } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java index 37c404ae0c..5a71745175 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java @@ -61,7 +61,7 @@ public class SecurityMockMvcRequestPostProcessorsSecurityContextTests { @Before public void setup() { - request = new MockHttpServletRequest(); + this.request = new MockHttpServletRequest(); mockWebTestUtils(); } @@ -72,16 +72,17 @@ public class SecurityMockMvcRequestPostProcessorsSecurityContextTests { @Test public void userDetails() { - securityContext(expectedContext).postProcessRequest(request); + securityContext(this.expectedContext).postProcessRequest(this.request); - verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class)); - SecurityContext context = contextCaptor.getValue(); + verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), + any(HttpServletResponse.class)); + SecurityContext context = this.contextCaptor.getValue(); assertThat(context).isSameAs(this.expectedContext); } private void mockWebTestUtils() { spy(WebTestUtils.class); - when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository); + when(WebTestUtils.getSecurityContextRepository(this.request)).thenReturn(this.repository); } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java index 6d6a86e979..5b7de6735d 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java @@ -57,14 +57,14 @@ public class SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTes @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).addFilters(springSecurityFilterChain) + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).addFilters(this.springSecurityFilterChain) .defaultRequest(get("/").with(testSecurityContext())).build(); } @Test @WithMockUser public void testSecurityContextWithMockUserWorksWithStateless() throws Exception { - mvc.perform(get("/")).andExpect(status().is2xxSuccessful()); + this.mvc.perform(get("/")).andExpect(status().is2xxSuccessful()); } @EnableWebSecurity diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextTests.java index 236743d83a..08f76801c5 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextTests.java @@ -56,7 +56,7 @@ public class SecurityMockMvcRequestPostProcessorsTestSecurityContextTests { @Before public void setup() { - request = new MockHttpServletRequest(); + this.request = new MockHttpServletRequest(); mockWebTestUtils(); } @@ -67,25 +67,25 @@ public class SecurityMockMvcRequestPostProcessorsTestSecurityContextTests { @Test public void testSecurityContextSaves() { - TestSecurityContextHolder.setContext(context); + TestSecurityContextHolder.setContext(this.context); - testSecurityContext().postProcessRequest(request); + testSecurityContext().postProcessRequest(this.request); - verify(repository).saveContext(eq(context), eq(request), any(HttpServletResponse.class)); + verify(this.repository).saveContext(eq(this.context), eq(this.request), any(HttpServletResponse.class)); } // Ensure it does not fail if TestSecurityContextHolder is not initialized @Test public void testSecurityContextNoContext() { - testSecurityContext().postProcessRequest(request); + testSecurityContext().postProcessRequest(this.request); - verify(repository, never()).saveContext(any(SecurityContext.class), eq(request), + verify(this.repository, never()).saveContext(any(SecurityContext.class), eq(this.request), any(HttpServletResponse.class)); } private void mockWebTestUtils() { spy(WebTestUtils.class); - when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository); + when(WebTestUtils.getSecurityContextRepository(this.request)).thenReturn(this.repository); } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java index 51b55c84db..b3e27f1c96 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java @@ -63,7 +63,7 @@ public class SecurityMockMvcRequestPostProcessorsUserDetailsTests { @Before public void setup() { - request = new MockHttpServletRequest(); + this.request = new MockHttpServletRequest(); mockWebTestUtils(); } @@ -74,17 +74,18 @@ public class SecurityMockMvcRequestPostProcessorsUserDetailsTests { @Test public void userDetails() { - user(userDetails).postProcessRequest(request); + user(this.userDetails).postProcessRequest(this.request); - verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class)); - SecurityContext context = contextCaptor.getValue(); + verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), + any(HttpServletResponse.class)); + SecurityContext context = this.contextCaptor.getValue(); assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class); - assertThat(context.getAuthentication().getPrincipal()).isSameAs(userDetails); + assertThat(context.getAuthentication().getPrincipal()).isSameAs(this.userDetails); } private void mockWebTestUtils() { spy(WebTestUtils.class); - when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository); + when(WebTestUtils.getSecurityContextRepository(this.request)).thenReturn(this.repository); } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java index 1ea0c37353..3d3b4266ae 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java @@ -69,7 +69,7 @@ public class SecurityMockMvcRequestPostProcessorsUserTests { @Before public void setup() { - request = new MockHttpServletRequest(); + this.request = new MockHttpServletRequest(); mockWebTestUtils(); } @@ -82,10 +82,11 @@ public class SecurityMockMvcRequestPostProcessorsUserTests { public void userWithDefaults() { String username = "userabc"; - user(username).postProcessRequest(request); + user(username).postProcessRequest(this.request); - verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class)); - SecurityContext context = contextCaptor.getValue(); + verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), + any(HttpServletResponse.class)); + SecurityContext context = this.contextCaptor.getValue(); assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class); assertThat(context.getAuthentication().getName()).isEqualTo(username); assertThat(context.getAuthentication().getCredentials()).isEqualTo("password"); @@ -96,10 +97,11 @@ public class SecurityMockMvcRequestPostProcessorsUserTests { public void userWithCustom() { String username = "customuser"; - user(username).roles("CUSTOM", "ADMIN").password("newpass").postProcessRequest(request); + user(username).roles("CUSTOM", "ADMIN").password("newpass").postProcessRequest(this.request); - verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class)); - SecurityContext context = contextCaptor.getValue(); + verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), + any(HttpServletResponse.class)); + SecurityContext context = this.contextCaptor.getValue(); assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class); assertThat(context.getAuthentication().getName()).isEqualTo(username); assertThat(context.getAuthentication().getCredentials()).isEqualTo("newpass"); @@ -111,34 +113,36 @@ public class SecurityMockMvcRequestPostProcessorsUserTests { public void userCustomAuthoritiesVarargs() { String username = "customuser"; - user(username).authorities(authority1, authority2).postProcessRequest(request); + user(username).authorities(this.authority1, this.authority2).postProcessRequest(this.request); - verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class)); - SecurityContext context = contextCaptor.getValue(); - assertThat((List) context.getAuthentication().getAuthorities()).containsOnly(authority1, - authority2); + verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), + any(HttpServletResponse.class)); + SecurityContext context = this.contextCaptor.getValue(); + assertThat((List) context.getAuthentication().getAuthorities()).containsOnly(this.authority1, + this.authority2); } @Test(expected = IllegalArgumentException.class) public void userRolesWithRolePrefixErrors() { - user("user").roles("ROLE_INVALID").postProcessRequest(request); + user("user").roles("ROLE_INVALID").postProcessRequest(this.request); } @Test public void userCustomAuthoritiesList() { String username = "customuser"; - user(username).authorities(Arrays.asList(authority1, authority2)).postProcessRequest(request); + user(username).authorities(Arrays.asList(this.authority1, this.authority2)).postProcessRequest(this.request); - verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class)); - SecurityContext context = contextCaptor.getValue(); - assertThat((List) context.getAuthentication().getAuthorities()).containsOnly(authority1, - authority2); + verify(this.repository).saveContext(this.contextCaptor.capture(), eq(this.request), + any(HttpServletResponse.class)); + SecurityContext context = this.contextCaptor.getValue(); + assertThat((List) context.getAuthentication().getAuthorities()).containsOnly(this.authority1, + this.authority2); } private void mockWebTestUtils() { spy(WebTestUtils.class); - when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository); + when(WebTestUtils.getSecurityContextRepository(this.request)).thenReturn(this.repository); } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java index fd83a9a39d..799df7f5cb 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java @@ -57,7 +57,7 @@ public class SecurityMockWithAuthoritiesMvcResultMatchersTests { @Before public void setup() { - mockMvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()).build(); } @Test @@ -65,14 +65,14 @@ public class SecurityMockWithAuthoritiesMvcResultMatchersTests { List grantedAuthorities = new ArrayList<>(); grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_ADMIN")); grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_SELLER")); - mockMvc.perform(formLogin()).andExpect(authenticated().withAuthorities(grantedAuthorities)); + this.mockMvc.perform(formLogin()).andExpect(authenticated().withAuthorities(grantedAuthorities)); } @Test(expected = AssertionError.class) public void withAuthoritiesFailsIfNotAllRoles() throws Exception { List grantedAuthorities = new ArrayList<>(); grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_ADMIN")); - mockMvc.perform(formLogin()).andExpect(authenticated().withAuthorities(grantedAuthorities)); + this.mockMvc.perform(formLogin()).andExpect(authenticated().withAuthorities(grantedAuthorities)); } @EnableWebSecurity diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java index 915ce34cbe..f6c42196ef 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java @@ -50,22 +50,22 @@ public class CsrfShowcaseTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()).build(); } @Test public void postWithCsrfWorks() throws Exception { - mvc.perform(post("/").with(csrf())).andExpect(status().isNotFound()); + this.mvc.perform(post("/").with(csrf())).andExpect(status().isNotFound()); } @Test public void postWithCsrfWorksWithPut() throws Exception { - mvc.perform(put("/").with(csrf())).andExpect(status().isNotFound()); + this.mvc.perform(put("/").with(csrf())).andExpect(status().isNotFound()); } @Test public void postWithNoCsrfForbidden() throws Exception { - mvc.perform(post("/")).andExpect(status().isForbidden()); + this.mvc.perform(post("/")).andExpect(status().isForbidden()); } @EnableWebSecurity diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java index 4fcc234014..711458b58f 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java @@ -57,18 +57,18 @@ public class CustomCsrfShowcaseTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).defaultRequest(get("/").with(csrf())).apply(springSecurity()) - .build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).defaultRequest(get("/").with(csrf())) + .apply(springSecurity()).build(); } @Test public void postWithCsrfWorks() throws Exception { - mvc.perform(post("/").with(csrf())).andExpect(status().isNotFound()); + this.mvc.perform(post("/").with(csrf())).andExpect(status().isNotFound()); } @Test public void postWithCsrfWorksWithPut() throws Exception { - mvc.perform(put("/").with(csrf())).andExpect(status().isNotFound()); + this.mvc.perform(put("/").with(csrf())).andExpect(status().isNotFound()); } @EnableWebSecurity diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java index 23dbaac5aa..634016c50c 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java @@ -51,18 +51,18 @@ public class DefaultCsrfShowcaseTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).defaultRequest(get("/").with(csrf())).apply(springSecurity()) - .build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).defaultRequest(get("/").with(csrf())) + .apply(springSecurity()).build(); } @Test public void postWithCsrfWorks() throws Exception { - mvc.perform(post("/")).andExpect(status().isNotFound()); + this.mvc.perform(post("/")).andExpect(status().isNotFound()); } @Test public void postWithCsrfWorksWithPut() throws Exception { - mvc.perform(put("/")).andExpect(status().isNotFound()); + this.mvc.perform(put("/")).andExpect(status().isNotFound()); } @EnableWebSecurity diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java index a243e28125..e76bcc76c9 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java @@ -57,30 +57,30 @@ public class AuthenticationTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()) + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()) .defaultRequest(get("/").accept(MediaType.TEXT_HTML)).build(); } @Test public void requiresAuthentication() throws Exception { - mvc.perform(get("/")).andExpect(status().isFound()); + this.mvc.perform(get("/")).andExpect(status().isFound()); } @Test public void httpBasicAuthenticationSuccess() throws Exception { - mvc.perform(get("/secured/butnotfound").with(httpBasic("user", "password"))).andExpect(status().isNotFound()) - .andExpect(authenticated().withUsername("user")); + this.mvc.perform(get("/secured/butnotfound").with(httpBasic("user", "password"))) + .andExpect(status().isNotFound()).andExpect(authenticated().withUsername("user")); } @Test public void authenticationSuccess() throws Exception { - mvc.perform(formLogin()).andExpect(status().isFound()).andExpect(redirectedUrl("/")) + this.mvc.perform(formLogin()).andExpect(status().isFound()).andExpect(redirectedUrl("/")) .andExpect(authenticated().withUsername("user")); } @Test public void authenticationFailed() throws Exception { - mvc.perform(formLogin().user("user").password("invalid")).andExpect(status().isFound()) + this.mvc.perform(formLogin().user("user").password("invalid")).andExpect(status().isFound()) .andExpect(redirectedUrl("/login?error")).andExpect(unauthenticated()); } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java index b9af354c9f..60c13fb06e 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java @@ -62,25 +62,25 @@ public class CustomConfigAuthenticationTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()).build(); } @Test public void authenticationSuccess() throws Exception { - mvc.perform(formLogin("/authenticate").user("user", "user").password("pass", "password")) + this.mvc.perform(formLogin("/authenticate").user("user", "user").password("pass", "password")) .andExpect(status().isFound()).andExpect(redirectedUrl("/")) .andExpect(authenticated().withUsername("user")); } @Test public void withUserSuccess() throws Exception { - mvc.perform(get("/").with(user("user"))).andExpect(status().isNotFound()) + this.mvc.perform(get("/").with(user("user"))).andExpect(status().isNotFound()) .andExpect(authenticated().withUsername("user")); } @Test public void authenticationFailed() throws Exception { - mvc.perform(formLogin("/authenticate").user("user", "notfound").password("pass", "invalid")) + this.mvc.perform(formLogin("/authenticate").user("user", "notfound").password("pass", "invalid")) .andExpect(status().isFound()).andExpect(redirectedUrl("/authenticate?error")) .andExpect(unauthenticated()); } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java index 4d6f952653..e5a35f2e59 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java @@ -56,18 +56,18 @@ public class CustomLoginRequestBuilderAuthenticationTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()).build(); } @Test public void authenticationSuccess() throws Exception { - mvc.perform(login()).andExpect(status().isFound()).andExpect(redirectedUrl("/")) + this.mvc.perform(login()).andExpect(status().isFound()).andExpect(redirectedUrl("/")) .andExpect(authenticated().withUsername("user")); } @Test public void authenticationFailed() throws Exception { - mvc.perform(login().user("notfound").password("invalid")).andExpect(status().isFound()) + this.mvc.perform(login().user("notfound").password("invalid")).andExpect(status().isFound()) .andExpect(redirectedUrl("/authenticate?error")).andExpect(unauthenticated()); } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java index 1cd16f57a1..4cb445cc87 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java @@ -52,13 +52,13 @@ public class DefaultfSecurityRequestsTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).defaultRequest(get("/").with(user("user").roles("ADMIN"))) - .apply(springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context) + .defaultRequest(get("/").with(user("user").roles("ADMIN"))).apply(springSecurity()).build(); } @Test public void requestProtectedUrlWithUser() throws Exception { - mvc.perform(get("/")) + this.mvc.perform(get("/")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user @@ -67,7 +67,7 @@ public class DefaultfSecurityRequestsTests { @Test public void requestProtectedUrlWithAdmin() throws Exception { - mvc.perform(get("/admin")) + this.mvc.perform(get("/admin")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user @@ -76,7 +76,7 @@ public class DefaultfSecurityRequestsTests { @Test public void requestProtectedUrlWithAnonymous() throws Exception { - mvc.perform(get("/admin").with(anonymous())) + this.mvc.perform(get("/admin").with(anonymous())) // Ensure we got past Security .andExpect(status().isUnauthorized()) // Ensure it appears we are authenticated with user diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java index 89d9fdfb79..50bd8bdaff 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java @@ -59,12 +59,12 @@ public class SecurityRequestsTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()).build(); } @Test public void requestProtectedUrlWithUser() throws Exception { - mvc.perform(get("/").with(user("user"))) + this.mvc.perform(get("/").with(user("user"))) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user @@ -73,7 +73,7 @@ public class SecurityRequestsTests { @Test public void requestProtectedUrlWithAdmin() throws Exception { - mvc.perform(get("/admin").with(user("admin").roles("ADMIN"))) + this.mvc.perform(get("/admin").with(user("admin").roles("ADMIN"))) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with admin @@ -82,8 +82,8 @@ public class SecurityRequestsTests { @Test public void requestProtectedUrlWithUserDetails() throws Exception { - UserDetails user = userDetailsService.loadUserByUsername("user"); - mvc.perform(get("/").with(user(user))) + UserDetails user = this.userDetailsService.loadUserByUsername("user"); + this.mvc.perform(get("/").with(user(user))) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user @@ -93,7 +93,7 @@ public class SecurityRequestsTests { @Test public void requestProtectedUrlWithAuthentication() throws Exception { Authentication authentication = new TestingAuthenticationToken("test", "notused", "ROLE_USER"); - mvc.perform(get("/").with(authentication(authentication))) + this.mvc.perform(get("/").with(authentication(authentication))) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java index 54e85ba39d..528200ca45 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java @@ -50,13 +50,14 @@ public class WithUserAuthenticationTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(SecurityMockMvcConfigurers.springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(SecurityMockMvcConfigurers.springSecurity()) + .build(); } @Test @WithMockUser public void requestProtectedUrlWithUser() throws Exception { - mvc.perform(get("/")) + this.mvc.perform(get("/")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user @@ -66,7 +67,7 @@ public class WithUserAuthenticationTests { @Test @WithAdminRob public void requestProtectedUrlWithAdminRob() throws Exception { - mvc.perform(get("/")) + this.mvc.perform(get("/")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user @@ -76,7 +77,7 @@ public class WithUserAuthenticationTests { @Test @WithMockUser(roles = "ADMIN") public void requestProtectedUrlWithAdmin() throws Exception { - mvc.perform(get("/admin")) + this.mvc.perform(get("/admin")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java index 1c8b3c8ef6..9fd8215748 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java @@ -53,12 +53,12 @@ public class WithUserClassLevelAuthenticationTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()).build(); } @Test public void requestProtectedUrlWithUser() throws Exception { - mvc.perform(get("/")) + this.mvc.perform(get("/")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user @@ -67,7 +67,7 @@ public class WithUserClassLevelAuthenticationTests { @Test public void requestProtectedUrlWithAdmin() throws Exception { - mvc.perform(get("/admin")) + this.mvc.perform(get("/admin")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user @@ -77,7 +77,7 @@ public class WithUserClassLevelAuthenticationTests { @Test @WithAnonymousUser public void requestProtectedUrlWithAnonymous() throws Exception { - mvc.perform(get("/")) + this.mvc.perform(get("/")) // Ensure did not get past security .andExpect(status().isUnauthorized()) // Ensure not authenticated diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java index 2c242fcf7e..d66a60472d 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java @@ -52,13 +52,13 @@ public class WithUserDetailsAuthenticationTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()).build(); } @Test @WithUserDetails public void requestProtectedUrlWithUser() throws Exception { - mvc.perform(get("/")) + this.mvc.perform(get("/")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user @@ -68,7 +68,7 @@ public class WithUserDetailsAuthenticationTests { @Test @WithUserDetails("admin") public void requestProtectedUrlWithAdmin() throws Exception { - mvc.perform(get("/admin")) + this.mvc.perform(get("/admin")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java index 41d52a8529..b52a0b4d0d 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java @@ -53,12 +53,12 @@ public class WithUserDetailsClassLevelAuthenticationTests { @Before public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build(); + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).apply(springSecurity()).build(); } @Test public void requestRootUrlWithAdmin() throws Exception { - mvc.perform(get("/")) + this.mvc.perform(get("/")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user @@ -67,7 +67,7 @@ public class WithUserDetailsClassLevelAuthenticationTests { @Test public void requestProtectedUrlWithAdmin() throws Exception { - mvc.perform(get("/admin")) + this.mvc.perform(get("/admin")) // Ensure we got past Security .andExpect(status().isNotFound()) // Ensure it appears we are authenticated with user diff --git a/web/src/main/java/org/springframework/security/web/DefaultRedirectStrategy.java b/web/src/main/java/org/springframework/security/web/DefaultRedirectStrategy.java index b995357de3..13bab7101d 100644 --- a/web/src/main/java/org/springframework/security/web/DefaultRedirectStrategy.java +++ b/web/src/main/java/org/springframework/security/web/DefaultRedirectStrategy.java @@ -50,8 +50,8 @@ public class DefaultRedirectStrategy implements RedirectStrategy { String redirectUrl = calculateRedirectUrl(request.getContextPath(), url); redirectUrl = response.encodeRedirectURL(redirectUrl); - if (logger.isDebugEnabled()) { - logger.debug("Redirecting to '" + redirectUrl + "'"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Redirecting to '" + redirectUrl + "'"); } response.sendRedirect(redirectUrl); @@ -102,7 +102,7 @@ public class DefaultRedirectStrategy implements RedirectStrategy { * protocol and context path (defaults to false). */ protected boolean isContextRelative() { - return contextRelative; + return this.contextRelative; } } diff --git a/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java b/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java index 8b564650f4..76eeaa1c8b 100644 --- a/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java +++ b/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java @@ -52,20 +52,20 @@ public final class DefaultSecurityFilterChain implements SecurityFilterChain { } public RequestMatcher getRequestMatcher() { - return requestMatcher; + return this.requestMatcher; } public List getFilters() { - return filters; + return this.filters; } public boolean matches(HttpServletRequest request) { - return requestMatcher.matches(request); + return this.requestMatcher.matches(request); } @Override public String toString() { - return "[ " + requestMatcher + ", " + filters + "]"; + return "[ " + this.requestMatcher + ", " + this.filters + "]"; } } diff --git a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java index 54cf8b3778..4758a34a65 100644 --- a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java +++ b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java @@ -166,7 +166,7 @@ public class FilterChainProxy extends GenericFilterBean { @Override public void afterPropertiesSet() { - filterChainValidator.validate(this); + this.filterChainValidator.validate(this); } @Override @@ -194,8 +194,8 @@ public class FilterChainProxy extends GenericFilterBean { private void doFilterInternal(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - FirewalledRequest fwRequest = firewall.getFirewalledRequest((HttpServletRequest) request); - HttpServletResponse fwResponse = firewall.getFirewalledResponse((HttpServletResponse) response); + FirewalledRequest fwRequest = this.firewall.getFirewalledRequest((HttpServletRequest) request); + HttpServletResponse fwResponse = this.firewall.getFirewalledResponse((HttpServletResponse) response); List filters = getFilters(fwRequest); @@ -222,7 +222,7 @@ public class FilterChainProxy extends GenericFilterBean { * @return an ordered array of Filters defining the filter chain */ private List getFilters(HttpServletRequest request) { - for (SecurityFilterChain chain : filterChains) { + for (SecurityFilterChain chain : this.filterChains) { if (chain.matches(request)) { return chain.getFilters(); } @@ -237,7 +237,7 @@ public class FilterChainProxy extends GenericFilterBean { * @return matching filter list */ public List getFilters(String url) { - return getFilters(firewall.getFirewalledRequest((new FilterInvocation(url, "GET").getRequest()))); + return getFilters(this.firewall.getFirewalledRequest((new FilterInvocation(url, "GET").getRequest()))); } /** @@ -245,7 +245,7 @@ public class FilterChainProxy extends GenericFilterBean { * applied to incoming requests. */ public List getFilterChains() { - return Collections.unmodifiableList(filterChains); + return Collections.unmodifiableList(this.filterChains); } /** @@ -284,7 +284,7 @@ public class FilterChainProxy extends GenericFilterBean { StringBuilder sb = new StringBuilder(); sb.append("FilterChainProxy["); sb.append("Filter Chains: "); - sb.append(filterChains); + sb.append(this.filterChains); sb.append("]"); return sb.toString(); @@ -316,26 +316,27 @@ public class FilterChainProxy extends GenericFilterBean { @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { - if (currentPosition == size) { + if (this.currentPosition == this.size) { if (logger.isDebugEnabled()) { - logger.debug(UrlUtils.buildRequestUrl(firewalledRequest) + logger.debug(UrlUtils.buildRequestUrl(this.firewalledRequest) + " reached end of additional filter chain; proceeding with original chain"); } // Deactivate path stripping as we exit the security filter chain this.firewalledRequest.reset(); - originalChain.doFilter(request, response); + this.originalChain.doFilter(request, response); } else { - currentPosition++; + this.currentPosition++; - Filter nextFilter = additionalFilters.get(currentPosition - 1); + Filter nextFilter = this.additionalFilters.get(this.currentPosition - 1); if (logger.isDebugEnabled()) { - logger.debug(UrlUtils.buildRequestUrl(firewalledRequest) + " at position " + currentPosition - + " of " + size + " in additional filter chain; firing Filter: '" - + nextFilter.getClass().getSimpleName() + "'"); + logger.debug( + UrlUtils.buildRequestUrl(this.firewalledRequest) + " at position " + this.currentPosition + + " of " + this.size + " in additional filter chain; firing Filter: '" + + nextFilter.getClass().getSimpleName() + "'"); } nextFilter.doFilter(request, response, this); diff --git a/web/src/main/java/org/springframework/security/web/PortResolverImpl.java b/web/src/main/java/org/springframework/security/web/PortResolverImpl.java index 5ad6ba791c..0f576789bb 100644 --- a/web/src/main/java/org/springframework/security/web/PortResolverImpl.java +++ b/web/src/main/java/org/springframework/security/web/PortResolverImpl.java @@ -39,7 +39,7 @@ public class PortResolverImpl implements PortResolver { private PortMapper portMapper = new PortMapperImpl(); public PortMapper getPortMapper() { - return portMapper; + return this.portMapper; } public int getServerPort(ServletRequest request) { @@ -49,11 +49,11 @@ public class PortResolverImpl implements PortResolver { String scheme = request.getScheme().toLowerCase(); if ("http".equals(scheme)) { - portLookup = portMapper.lookupHttpPort(serverPort); + portLookup = this.portMapper.lookupHttpPort(serverPort); } else if ("https".equals(scheme)) { - portLookup = portMapper.lookupHttpsPort(serverPort); + portLookup = this.portMapper.lookupHttpsPort(serverPort); } if (portLookup != null) { diff --git a/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java b/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java index b5376ea9a4..225debefa8 100644 --- a/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java +++ b/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java @@ -52,7 +52,7 @@ public class AccessDeniedHandlerImpl implements AccessDeniedHandler { public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException { if (!response.isCommitted()) { - if (errorPage != null) { + if (this.errorPage != null) { // Put exception into request scope (perhaps of use to a view) request.setAttribute(WebAttributes.ACCESS_DENIED_403, accessDeniedException); @@ -60,7 +60,7 @@ public class AccessDeniedHandlerImpl implements AccessDeniedHandler { response.setStatus(HttpStatus.FORBIDDEN.value()); // forward to error page. - RequestDispatcher dispatcher = request.getRequestDispatcher(errorPage); + RequestDispatcher dispatcher = request.getRequestDispatcher(this.errorPage); dispatcher.forward(request, response); } else { diff --git a/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java b/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java index 87c81ddf14..15c54568aa 100644 --- a/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java +++ b/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java @@ -82,10 +82,10 @@ public class DefaultWebInvocationPrivilegeEvaluator implements WebInvocationPriv Assert.notNull(uri, "uri parameter is required"); FilterInvocation fi = new FilterInvocation(contextPath, uri, method); - Collection attrs = securityInterceptor.obtainSecurityMetadataSource().getAttributes(fi); + Collection attrs = this.securityInterceptor.obtainSecurityMetadataSource().getAttributes(fi); if (attrs == null) { - if (securityInterceptor.isRejectPublicInvocations()) { + if (this.securityInterceptor.isRejectPublicInvocations()) { return false; } @@ -97,7 +97,7 @@ public class DefaultWebInvocationPrivilegeEvaluator implements WebInvocationPriv } try { - securityInterceptor.getAccessDecisionManager().decide(authentication, fi, attrs); + this.securityInterceptor.getAccessDecisionManager().decide(authentication, fi, attrs); } catch (AccessDeniedException unauthorized) { if (logger.isDebugEnabled()) { diff --git a/web/src/main/java/org/springframework/security/web/access/DelegatingAccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/access/DelegatingAccessDeniedHandler.java index 812edbcd92..438fda55fa 100644 --- a/web/src/main/java/org/springframework/security/web/access/DelegatingAccessDeniedHandler.java +++ b/web/src/main/java/org/springframework/security/web/access/DelegatingAccessDeniedHandler.java @@ -60,7 +60,7 @@ public final class DelegatingAccessDeniedHandler implements AccessDeniedHandler public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException { - for (Entry, AccessDeniedHandler> entry : handlers.entrySet()) { + for (Entry, AccessDeniedHandler> entry : this.handlers.entrySet()) { Class handlerClass = entry.getKey(); if (handlerClass.isAssignableFrom(accessDeniedException.getClass())) { AccessDeniedHandler handler = entry.getValue(); @@ -68,7 +68,7 @@ public final class DelegatingAccessDeniedHandler implements AccessDeniedHandler return; } } - defaultHandler.handle(request, response, accessDeniedException); + this.defaultHandler.handle(request, response, accessDeniedException); } } diff --git a/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java b/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java index a006882889..17460feda6 100644 --- a/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java +++ b/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java @@ -102,7 +102,7 @@ public class ExceptionTranslationFilter extends GenericFilterBean { @Override public void afterPropertiesSet() { - Assert.notNull(authenticationEntryPoint, "authenticationEntryPoint must be specified"); + Assert.notNull(this.authenticationEntryPoint, "authenticationEntryPoint must be specified"); } public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) @@ -113,20 +113,20 @@ public class ExceptionTranslationFilter extends GenericFilterBean { try { chain.doFilter(request, response); - logger.debug("Chain processed normally"); + this.logger.debug("Chain processed normally"); } catch (IOException ex) { throw ex; } catch (Exception ex) { // Try to extract a SpringSecurityException from the stacktrace - Throwable[] causeChain = throwableAnalyzer.determineCauseChain(ex); - RuntimeException ase = (AuthenticationException) throwableAnalyzer + Throwable[] causeChain = this.throwableAnalyzer.determineCauseChain(ex); + RuntimeException ase = (AuthenticationException) this.throwableAnalyzer .getFirstThrowableOfType(AuthenticationException.class, causeChain); if (ase == null) { - ase = (AccessDeniedException) throwableAnalyzer.getFirstThrowableOfType(AccessDeniedException.class, - causeChain); + ase = (AccessDeniedException) this.throwableAnalyzer + .getFirstThrowableOfType(AccessDeniedException.class, causeChain); } if (ase != null) { @@ -154,37 +154,41 @@ public class ExceptionTranslationFilter extends GenericFilterBean { } public AuthenticationEntryPoint getAuthenticationEntryPoint() { - return authenticationEntryPoint; + return this.authenticationEntryPoint; } protected AuthenticationTrustResolver getAuthenticationTrustResolver() { - return authenticationTrustResolver; + return this.authenticationTrustResolver; } private void handleSpringSecurityException(HttpServletRequest request, HttpServletResponse response, FilterChain chain, RuntimeException exception) throws IOException, ServletException { if (exception instanceof AuthenticationException) { - logger.debug("Authentication exception occurred; redirecting to authentication entry point", exception); + this.logger.debug("Authentication exception occurred; redirecting to authentication entry point", + exception); sendStartAuthentication(request, response, chain, (AuthenticationException) exception); } else if (exception instanceof AccessDeniedException) { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authenticationTrustResolver.isAnonymous(authentication) - || authenticationTrustResolver.isRememberMe(authentication)) { - logger.debug("Access is denied (user is " + (authenticationTrustResolver.isAnonymous(authentication) - ? "anonymous" : "not fully authenticated") + "); redirecting to authentication entry point", + if (this.authenticationTrustResolver.isAnonymous(authentication) + || this.authenticationTrustResolver.isRememberMe(authentication)) { + this.logger.debug( + "Access is denied (user is " + (this.authenticationTrustResolver.isAnonymous(authentication) + ? "anonymous" : "not fully authenticated") + + "); redirecting to authentication entry point", exception); sendStartAuthentication(request, response, chain, new InsufficientAuthenticationException( - messages.getMessage("ExceptionTranslationFilter.insufficientAuthentication", + this.messages.getMessage("ExceptionTranslationFilter.insufficientAuthentication", "Full authentication is required to access this resource"))); } else { - logger.debug("Access is denied (user is not anonymous); delegating to AccessDeniedHandler", exception); + this.logger.debug("Access is denied (user is not anonymous); delegating to AccessDeniedHandler", + exception); - accessDeniedHandler.handle(request, response, (AccessDeniedException) exception); + this.accessDeniedHandler.handle(request, response, (AccessDeniedException) exception); } } } @@ -194,9 +198,9 @@ public class ExceptionTranslationFilter extends GenericFilterBean { // SEC-112: Clear the SecurityContextHolder's Authentication, as the // existing Authentication is no longer considered valid SecurityContextHolder.getContext().setAuthentication(null); - requestCache.saveRequest(request, response); - logger.debug("Calling Authentication entry point."); - authenticationEntryPoint.commence(request, response, reason); + this.requestCache.saveRequest(request, response); + this.logger.debug("Calling Authentication entry point."); + this.authenticationEntryPoint.commence(request, response, reason); } public void setAccessDeniedHandler(AccessDeniedHandler accessDeniedHandler) { diff --git a/web/src/main/java/org/springframework/security/web/access/RequestMatcherDelegatingAccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/access/RequestMatcherDelegatingAccessDeniedHandler.java index 06888c3f3a..a79a0c2aea 100644 --- a/web/src/main/java/org/springframework/security/web/access/RequestMatcherDelegatingAccessDeniedHandler.java +++ b/web/src/main/java/org/springframework/security/web/access/RequestMatcherDelegatingAccessDeniedHandler.java @@ -68,7 +68,7 @@ public final class RequestMatcherDelegatingAccessDeniedHandler implements Access return; } } - defaultHandler.handle(request, response, accessDeniedException); + this.defaultHandler.handle(request, response, accessDeniedException); } } diff --git a/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java b/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java index 7c1c111b4e..56a21c98f6 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java @@ -59,26 +59,27 @@ public abstract class AbstractRetryEntryPoint implements ChannelEntryPoint { String queryString = request.getQueryString(); String redirectUrl = request.getRequestURI() + ((queryString == null) ? "" : ("?" + queryString)); - Integer currentPort = portResolver.getServerPort(request); + Integer currentPort = this.portResolver.getServerPort(request); Integer redirectPort = getMappedPort(currentPort); if (redirectPort != null) { - boolean includePort = redirectPort != standardPort; + boolean includePort = redirectPort != this.standardPort; - redirectUrl = scheme + request.getServerName() + ((includePort) ? (":" + redirectPort) : "") + redirectUrl; + redirectUrl = this.scheme + request.getServerName() + ((includePort) ? (":" + redirectPort) : "") + + redirectUrl; } - if (logger.isDebugEnabled()) { - logger.debug("Redirecting to: " + redirectUrl); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Redirecting to: " + redirectUrl); } - redirectStrategy.sendRedirect(request, response, redirectUrl); + this.redirectStrategy.sendRedirect(request, response, redirectUrl); } protected abstract Integer getMappedPort(Integer mapFromPort); protected final PortMapper getPortMapper() { - return portMapper; + return this.portMapper; } public void setPortMapper(PortMapper portMapper) { @@ -92,7 +93,7 @@ public abstract class AbstractRetryEntryPoint implements ChannelEntryPoint { } protected final PortResolver getPortResolver() { - return portResolver; + return this.portResolver; } /** @@ -106,7 +107,7 @@ public abstract class AbstractRetryEntryPoint implements ChannelEntryPoint { } protected final RedirectStrategy getRedirectStrategy() { - return redirectStrategy; + return this.redirectStrategy; } } diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java index a07bee1ef4..18014dfaa9 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java @@ -52,7 +52,7 @@ public class ChannelDecisionManagerImpl implements ChannelDecisionManager, Initi private List channelProcessors; public void afterPropertiesSet() { - Assert.notEmpty(channelProcessors, "A list of ChannelProcessors is required"); + Assert.notEmpty(this.channelProcessors, "A list of ChannelProcessors is required"); } public void decide(FilterInvocation invocation, Collection config) @@ -63,7 +63,7 @@ public class ChannelDecisionManagerImpl implements ChannelDecisionManager, Initi } } - for (ChannelProcessor processor : channelProcessors) { + for (ChannelProcessor processor : this.channelProcessors) { processor.decide(invocation, config); if (invocation.getResponse().isCommitted()) { @@ -79,12 +79,12 @@ public class ChannelDecisionManagerImpl implements ChannelDecisionManager, Initi @SuppressWarnings("cast") public void setChannelProcessors(List newList) { Assert.notEmpty(newList, "A list of ChannelProcessors is required"); - channelProcessors = new ArrayList<>(newList.size()); + this.channelProcessors = new ArrayList<>(newList.size()); for (Object currentObject : newList) { Assert.isInstanceOf(ChannelProcessor.class, currentObject, () -> "ChannelProcessor " + currentObject.getClass().getName() + " must implement ChannelProcessor"); - channelProcessors.add((ChannelProcessor) currentObject); + this.channelProcessors.add((ChannelProcessor) currentObject); } } @@ -93,7 +93,7 @@ public class ChannelDecisionManagerImpl implements ChannelDecisionManager, Initi return true; } - for (ChannelProcessor processor : channelProcessors) { + for (ChannelProcessor processor : this.channelProcessors) { if (processor.supports(attribute)) { return true; } diff --git a/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java b/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java index 7703a96e09..7404b17382 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java @@ -47,8 +47,8 @@ public class InsecureChannelProcessor implements InitializingBean, ChannelProces private String insecureKeyword = "REQUIRES_INSECURE_CHANNEL"; public void afterPropertiesSet() { - Assert.hasLength(insecureKeyword, "insecureKeyword required"); - Assert.notNull(entryPoint, "entryPoint required"); + Assert.hasLength(this.insecureKeyword, "insecureKeyword required"); + Assert.notNull(this.entryPoint, "entryPoint required"); } public void decide(FilterInvocation invocation, Collection config) @@ -60,18 +60,18 @@ public class InsecureChannelProcessor implements InitializingBean, ChannelProces for (ConfigAttribute attribute : config) { if (supports(attribute)) { if (invocation.getHttpRequest().isSecure()) { - entryPoint.commence(invocation.getRequest(), invocation.getResponse()); + this.entryPoint.commence(invocation.getRequest(), invocation.getResponse()); } } } } public ChannelEntryPoint getEntryPoint() { - return entryPoint; + return this.entryPoint; } public String getInsecureKeyword() { - return insecureKeyword; + return this.insecureKeyword; } public void setEntryPoint(ChannelEntryPoint entryPoint) { diff --git a/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java b/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java index 8c95c8fee2..23aac7f8e4 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java @@ -47,8 +47,8 @@ public class SecureChannelProcessor implements InitializingBean, ChannelProcesso private String secureKeyword = "REQUIRES_SECURE_CHANNEL"; public void afterPropertiesSet() { - Assert.hasLength(secureKeyword, "secureKeyword required"); - Assert.notNull(entryPoint, "entryPoint required"); + Assert.hasLength(this.secureKeyword, "secureKeyword required"); + Assert.notNull(this.entryPoint, "entryPoint required"); } public void decide(FilterInvocation invocation, Collection config) @@ -58,18 +58,18 @@ public class SecureChannelProcessor implements InitializingBean, ChannelProcesso for (ConfigAttribute attribute : config) { if (supports(attribute)) { if (!invocation.getHttpRequest().isSecure()) { - entryPoint.commence(invocation.getRequest(), invocation.getResponse()); + this.entryPoint.commence(invocation.getRequest(), invocation.getResponse()); } } } } public ChannelEntryPoint getEntryPoint() { - return entryPoint; + return this.entryPoint; } public String getSecureKeyword() { - return secureKeyword; + return this.secureKeyword; } public void setEntryPoint(ChannelEntryPoint entryPoint) { diff --git a/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java b/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java index d7bc805cd5..1450cd29fa 100644 --- a/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java +++ b/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java @@ -41,7 +41,7 @@ public class DefaultWebSecurityExpressionHandler extends AbstractSecurityExpress FilterInvocation fi) { WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(authentication, fi); root.setPermissionEvaluator(getPermissionEvaluator()); - root.setTrustResolver(trustResolver); + root.setTrustResolver(this.trustResolver); root.setRoleHierarchy(getRoleHierarchy()); root.setDefaultRolePrefix(this.defaultRolePrefix); return root; diff --git a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java index 707355ecf6..601f6b91ba 100644 --- a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java +++ b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java @@ -46,7 +46,7 @@ public class WebExpressionVoter implements AccessDecisionVoter return ACCESS_ABSTAIN; } - EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication, fi); + EvaluationContext ctx = this.expressionHandler.createEvaluationContext(authentication, fi); ctx = weca.postProcess(ctx, fi); return ExpressionUtils.evaluateAsBoolean(weca.getAuthorizeExpression(), ctx) ? ACCESS_GRANTED : ACCESS_DENIED; diff --git a/web/src/main/java/org/springframework/security/web/access/expression/WebSecurityExpressionRoot.java b/web/src/main/java/org/springframework/security/web/access/expression/WebSecurityExpressionRoot.java index 8b90b6d9cc..f1c85dd000 100644 --- a/web/src/main/java/org/springframework/security/web/access/expression/WebSecurityExpressionRoot.java +++ b/web/src/main/java/org/springframework/security/web/access/expression/WebSecurityExpressionRoot.java @@ -46,7 +46,7 @@ public class WebSecurityExpressionRoot extends SecurityExpressionRoot { * @return true if the IP address of the current request is in the required range. */ public boolean hasIpAddress(String ipAddress) { - return (new IpAddressMatcher(ipAddress).matches(request)); + return (new IpAddressMatcher(ipAddress).matches(this.request)); } } diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java index 1cbd1f28d9..79aeb6f727 100644 --- a/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java +++ b/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java @@ -72,7 +72,7 @@ public class DefaultFilterInvocationSecurityMetadataSource implements FilterInvo public Collection getAllConfigAttributes() { Set allAttributes = new HashSet<>(); - for (Map.Entry> entry : requestMap.entrySet()) { + for (Map.Entry> entry : this.requestMap.entrySet()) { allAttributes.addAll(entry.getValue()); } @@ -81,7 +81,7 @@ public class DefaultFilterInvocationSecurityMetadataSource implements FilterInvo public Collection getAttributes(Object object) { final HttpServletRequest request = ((FilterInvocation) object).getRequest(); - for (Map.Entry> entry : requestMap.entrySet()) { + for (Map.Entry> entry : this.requestMap.entrySet()) { if (entry.getKey().matches(request)) { return entry.getValue(); } diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java b/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java index 1ca4f387b1..e282747327 100644 --- a/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java +++ b/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java @@ -97,14 +97,14 @@ public class FilterSecurityInterceptor extends AbstractSecurityInterceptor imple public void invoke(FilterInvocation fi) throws IOException, ServletException { if ((fi.getRequest() != null) && (fi.getRequest().getAttribute(FILTER_APPLIED) != null) - && observeOncePerRequest) { + && this.observeOncePerRequest) { // filter already applied to this request and user wants us to observe // once-per-request handling, so don't re-do security checking fi.getChain().doFilter(fi.getRequest(), fi.getResponse()); } else { // first time this request being called, so perform security checking - if (fi.getRequest() != null && observeOncePerRequest) { + if (fi.getRequest() != null && this.observeOncePerRequest) { fi.getRequest().setAttribute(FILTER_APPLIED, Boolean.TRUE); } @@ -132,7 +132,7 @@ public class FilterSecurityInterceptor extends AbstractSecurityInterceptor imple * authorizations for each and every fragment of the HTTP request. */ public boolean isObserveOncePerRequest() { - return observeOncePerRequest; + return this.observeOncePerRequest; } public void setObserveOncePerRequest(boolean observeOncePerRequest) { diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/RequestKey.java b/web/src/main/java/org/springframework/security/web/access/intercept/RequestKey.java index bc757cad0f..1aa48691e0 100644 --- a/web/src/main/java/org/springframework/security/web/access/intercept/RequestKey.java +++ b/web/src/main/java/org/springframework/security/web/access/intercept/RequestKey.java @@ -38,11 +38,11 @@ public class RequestKey { } String getUrl() { - return url; + return this.url; } String getMethod() { - return method; + return this.method; } @Override @@ -60,25 +60,25 @@ public class RequestKey { RequestKey key = (RequestKey) obj; - if (!url.equals(key.url)) { + if (!this.url.equals(key.url)) { return false; } - if (method == null) { + if (this.method == null) { return key.method == null; } - return method.equals(key.method); + return this.method.equals(key.method); } @Override public String toString() { - StringBuilder sb = new StringBuilder(url.length() + 7); + StringBuilder sb = new StringBuilder(this.url.length() + 7); sb.append("["); - if (method != null) { - sb.append(method).append(","); + if (this.method != null) { + sb.append(this.method).append(","); } - sb.append(url); + sb.append(this.url); sb.append("]"); return sb.toString(); diff --git a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java index 0d98bffd54..ffedf367d7 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java @@ -178,7 +178,7 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt @Override public void afterPropertiesSet() { - Assert.notNull(authenticationManager, "authenticationManager must be specified"); + Assert.notNull(this.authenticationManager, "authenticationManager must be specified"); } /** @@ -217,8 +217,8 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt return; } - if (logger.isDebugEnabled()) { - logger.debug("Request is to process authentication"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Request is to process authentication"); } Authentication authResult; @@ -230,10 +230,10 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt // authentication return; } - sessionStrategy.onAuthentication(authResult, request, response); + this.sessionStrategy.onAuthentication(authResult, request, response); } catch (InternalAuthenticationServiceException failed) { - logger.error("An internal error occurred while trying to authenticate the user.", failed); + this.logger.error("An internal error occurred while trying to authenticate the user.", failed); unsuccessfulAuthentication(request, response, failed); return; @@ -246,7 +246,7 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt } // Authentication success - if (continueChainBeforeSuccessfulAuthentication) { + if (this.continueChainBeforeSuccessfulAuthentication) { chain.doFilter(request, response); } @@ -266,7 +266,7 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt * false otherwise. */ protected boolean requiresAuthentication(HttpServletRequest request, HttpServletResponse response) { - return requiresAuthenticationRequestMatcher.matches(request); + return this.requiresAuthenticationRequestMatcher.matches(request); } /** @@ -316,20 +316,20 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain, Authentication authResult) throws IOException, ServletException { - if (logger.isDebugEnabled()) { - logger.debug("Authentication success. Updating SecurityContextHolder to contain: " + authResult); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Authentication success. Updating SecurityContextHolder to contain: " + authResult); } SecurityContextHolder.getContext().setAuthentication(authResult); - rememberMeServices.loginSuccess(request, response, authResult); + this.rememberMeServices.loginSuccess(request, response, authResult); // Fire event if (this.eventPublisher != null) { - eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass())); + this.eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass())); } - successHandler.onAuthenticationSuccess(request, response, authResult); + this.successHandler.onAuthenticationSuccess(request, response, authResult); } /** @@ -347,19 +347,19 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt AuthenticationException failed) throws IOException, ServletException { SecurityContextHolder.clearContext(); - if (logger.isDebugEnabled()) { - logger.debug("Authentication request failed: " + failed.toString(), failed); - logger.debug("Updated SecurityContextHolder to contain null Authentication"); - logger.debug("Delegating to authentication failure handler " + failureHandler); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Authentication request failed: " + failed.toString(), failed); + this.logger.debug("Updated SecurityContextHolder to contain null Authentication"); + this.logger.debug("Delegating to authentication failure handler " + this.failureHandler); } - rememberMeServices.loginFail(request, response); + this.rememberMeServices.loginFail(request, response); - failureHandler.onAuthenticationFailure(request, response, failed); + this.failureHandler.onAuthenticationFailure(request, response, failed); } protected AuthenticationManager getAuthenticationManager() { - return authenticationManager; + return this.authenticationManager; } public void setAuthenticationManager(AuthenticationManager authenticationManager) { @@ -380,7 +380,7 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt } public RememberMeServices getRememberMeServices() { - return rememberMeServices; + return this.rememberMeServices; } public void setRememberMeServices(RememberMeServices rememberMeServices) { @@ -413,7 +413,7 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt } protected boolean getAllowSessionCreation() { - return allowSessionCreation; + return this.allowSessionCreation; } public void setAllowSessionCreation(boolean allowSessionCreation) { @@ -447,11 +447,11 @@ public abstract class AbstractAuthenticationProcessingFilter extends GenericFilt } protected AuthenticationSuccessHandler getSuccessHandler() { - return successHandler; + return this.successHandler; } protected AuthenticationFailureHandler getFailureHandler() { - return failureHandler; + return this.failureHandler; } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandler.java b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandler.java index 08e88651fb..cf0b795c4f 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandler.java @@ -85,11 +85,11 @@ public abstract class AbstractAuthenticationTargetUrlRequestHandler { String targetUrl = determineTargetUrl(request, response, authentication); if (response.isCommitted()) { - logger.debug("Response has already been committed. Unable to redirect to " + targetUrl); + this.logger.debug("Response has already been committed. Unable to redirect to " + targetUrl); return; } - redirectStrategy.sendRedirect(request, response, targetUrl); + this.redirectStrategy.sendRedirect(request, response, targetUrl); } /** @@ -107,30 +107,30 @@ public abstract class AbstractAuthenticationTargetUrlRequestHandler { */ protected String determineTargetUrl(HttpServletRequest request, HttpServletResponse response) { if (isAlwaysUseDefaultTargetUrl()) { - return defaultTargetUrl; + return this.defaultTargetUrl; } // Check for the parameter and use that if available String targetUrl = null; - if (targetUrlParameter != null) { - targetUrl = request.getParameter(targetUrlParameter); + if (this.targetUrlParameter != null) { + targetUrl = request.getParameter(this.targetUrlParameter); if (StringUtils.hasText(targetUrl)) { - logger.debug("Found targetUrlParameter in request: " + targetUrl); + this.logger.debug("Found targetUrlParameter in request: " + targetUrl); return targetUrl; } } - if (useReferer && !StringUtils.hasLength(targetUrl)) { + if (this.useReferer && !StringUtils.hasLength(targetUrl)) { targetUrl = request.getHeader("Referer"); - logger.debug("Using Referer header: " + targetUrl); + this.logger.debug("Using Referer header: " + targetUrl); } if (!StringUtils.hasText(targetUrl)) { - targetUrl = defaultTargetUrl; - logger.debug("Using default Url: " + targetUrl); + targetUrl = this.defaultTargetUrl; + this.logger.debug("Using default Url: " + targetUrl); } return targetUrl; @@ -143,7 +143,7 @@ public abstract class AbstractAuthenticationTargetUrlRequestHandler { * @return the defaultTargetUrl property */ protected final String getDefaultTargetUrl() { - return defaultTargetUrl; + return this.defaultTargetUrl; } /** @@ -170,7 +170,7 @@ public abstract class AbstractAuthenticationTargetUrlRequestHandler { } protected boolean isAlwaysUseDefaultTargetUrl() { - return alwaysUseDefaultTargetUrl; + return this.alwaysUseDefaultTargetUrl; } /** @@ -187,7 +187,7 @@ public abstract class AbstractAuthenticationTargetUrlRequestHandler { } protected String getTargetUrlParameter() { - return targetUrlParameter; + return this.targetUrlParameter; } /** @@ -198,7 +198,7 @@ public abstract class AbstractAuthenticationTargetUrlRequestHandler { } protected RedirectStrategy getRedirectStrategy() { - return redirectStrategy; + return this.redirectStrategy; } /** diff --git a/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java index c693682301..5a26991247 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java @@ -77,9 +77,9 @@ public class AnonymousAuthenticationFilter extends GenericFilterBean implements @Override public void afterPropertiesSet() { - Assert.hasLength(key, "key must have length"); - Assert.notNull(principal, "Anonymous authentication principal must be set"); - Assert.notNull(authorities, "Anonymous authorities must be set"); + Assert.hasLength(this.key, "key must have length"); + Assert.notNull(this.principal, "Anonymous authentication principal must be set"); + Assert.notNull(this.authorities, "Anonymous authorities must be set"); } public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) @@ -88,14 +88,14 @@ public class AnonymousAuthenticationFilter extends GenericFilterBean implements if (SecurityContextHolder.getContext().getAuthentication() == null) { SecurityContextHolder.getContext().setAuthentication(createAuthentication((HttpServletRequest) req)); - if (logger.isDebugEnabled()) { - logger.debug("Populated SecurityContextHolder with anonymous token: '" + if (this.logger.isDebugEnabled()) { + this.logger.debug("Populated SecurityContextHolder with anonymous token: '" + SecurityContextHolder.getContext().getAuthentication() + "'"); } } else { - if (logger.isDebugEnabled()) { - logger.debug("SecurityContextHolder not populated with anonymous token, as it already contained: '" + if (this.logger.isDebugEnabled()) { + this.logger.debug("SecurityContextHolder not populated with anonymous token, as it already contained: '" + SecurityContextHolder.getContext().getAuthentication() + "'"); } } @@ -104,8 +104,9 @@ public class AnonymousAuthenticationFilter extends GenericFilterBean implements } protected Authentication createAuthentication(HttpServletRequest request) { - AnonymousAuthenticationToken auth = new AnonymousAuthenticationToken(key, principal, authorities); - auth.setDetails(authenticationDetailsSource.buildDetails(request)); + AnonymousAuthenticationToken auth = new AnonymousAuthenticationToken(this.key, this.principal, + this.authorities); + auth.setDetails(this.authenticationDetailsSource.buildDetails(request)); return auth; } @@ -117,11 +118,11 @@ public class AnonymousAuthenticationFilter extends GenericFilterBean implements } public Object getPrincipal() { - return principal; + return this.principal; } public List getAuthorities() { - return authorities; + return this.authorities; } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPoint.java index 3622602ea8..fc04df9aa9 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPoint.java @@ -74,26 +74,26 @@ public class DelegatingAuthenticationEntryPoint implements AuthenticationEntryPo public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { - for (RequestMatcher requestMatcher : entryPoints.keySet()) { - if (logger.isDebugEnabled()) { - logger.debug("Trying to match using " + requestMatcher); + for (RequestMatcher requestMatcher : this.entryPoints.keySet()) { + if (this.logger.isDebugEnabled()) { + this.logger.debug("Trying to match using " + requestMatcher); } if (requestMatcher.matches(request)) { - AuthenticationEntryPoint entryPoint = entryPoints.get(requestMatcher); - if (logger.isDebugEnabled()) { - logger.debug("Match found! Executing " + entryPoint); + AuthenticationEntryPoint entryPoint = this.entryPoints.get(requestMatcher); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Match found! Executing " + entryPoint); } entryPoint.commence(request, response, authException); return; } } - if (logger.isDebugEnabled()) { - logger.debug("No match found. Using default entry point " + defaultEntryPoint); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No match found. Using default entry point " + this.defaultEntryPoint); } // No EntryPoint matched, use defaultEntryPoint - defaultEntryPoint.commence(request, response, authException); + this.defaultEntryPoint.commence(request, response, authException); } /** @@ -104,8 +104,8 @@ public class DelegatingAuthenticationEntryPoint implements AuthenticationEntryPo } public void afterPropertiesSet() { - Assert.notEmpty(entryPoints, "entryPoints must be specified"); - Assert.notNull(defaultEntryPoint, "defaultEntryPoint must be specified"); + Assert.notEmpty(this.entryPoints, "entryPoints must be specified"); + Assert.notNull(this.defaultEntryPoint, "defaultEntryPoint must be specified"); } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandler.java index 9cced72eb7..c96c8272b1 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandler.java @@ -67,7 +67,7 @@ public class DelegatingAuthenticationFailureHandler implements AuthenticationFai @Override public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException { - for (Map.Entry, AuthenticationFailureHandler> entry : handlers + for (Map.Entry, AuthenticationFailureHandler> entry : this.handlers .entrySet()) { Class handlerMappedExceptionClass = entry.getKey(); if (handlerMappedExceptionClass.isAssignableFrom(exception.getClass())) { @@ -76,7 +76,7 @@ public class DelegatingAuthenticationFailureHandler implements AuthenticationFai return; } } - defaultHandler.onAuthenticationFailure(request, response, exception); + this.defaultHandler.onAuthenticationFailure(request, response, exception); } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java index c97946b94d..5b62059654 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java @@ -47,7 +47,7 @@ public class ExceptionMappingAuthenticationFailureHandler extends SimpleUrlAuthe @Override public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException { - String url = failureUrlMap.get(exception.getClass().getName()); + String url = this.failureUrlMap.get(exception.getClass().getName()); if (url != null) { getRedirectStrategy().sendRedirect(request, response, url); diff --git a/web/src/main/java/org/springframework/security/web/authentication/ForwardAuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/ForwardAuthenticationFailureHandler.java index 4a68a13c10..a7d924b174 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/ForwardAuthenticationFailureHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/ForwardAuthenticationFailureHandler.java @@ -49,7 +49,7 @@ public class ForwardAuthenticationFailureHandler implements AuthenticationFailur public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException { request.setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, exception); - request.getRequestDispatcher(forwardUrl).forward(request, response); + request.getRequestDispatcher(this.forwardUrl).forward(request, response); } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/ForwardAuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/ForwardAuthenticationSuccessHandler.java index 54f831c55f..f4c7d30bab 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/ForwardAuthenticationSuccessHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/ForwardAuthenticationSuccessHandler.java @@ -48,7 +48,7 @@ public class ForwardAuthenticationSuccessHandler implements AuthenticationSucces public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { - request.getRequestDispatcher(forwardUrl).forward(request, response); + request.getRequestDispatcher(this.forwardUrl).forward(request, response); } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/HttpStatusEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/HttpStatusEntryPoint.java index 001628d054..44e36b4e4a 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/HttpStatusEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/HttpStatusEntryPoint.java @@ -46,7 +46,7 @@ public final class HttpStatusEntryPoint implements AuthenticationEntryPoint { public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) { - response.setStatus(httpStatus.value()); + response.setStatus(this.httpStatus.value()); } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java index 4aa08635f2..dec3bb4ffe 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java @@ -90,13 +90,13 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin } public void afterPropertiesSet() { - Assert.isTrue(StringUtils.hasText(loginFormUrl) && UrlUtils.isValidRedirectUrl(loginFormUrl), + Assert.isTrue(StringUtils.hasText(this.loginFormUrl) && UrlUtils.isValidRedirectUrl(this.loginFormUrl), "loginFormUrl must be specified and must be a valid redirect URL"); - if (useForward && UrlUtils.isAbsoluteUrl(loginFormUrl)) { + if (this.useForward && UrlUtils.isAbsoluteUrl(this.loginFormUrl)) { throw new IllegalArgumentException("useForward must be false if using an absolute loginFormURL"); } - Assert.notNull(portMapper, "portMapper must be specified"); - Assert.notNull(portResolver, "portResolver must be specified"); + Assert.notNull(this.portMapper, "portMapper must be specified"); + Assert.notNull(this.portResolver, "portResolver must be specified"); } /** @@ -121,9 +121,9 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin String redirectUrl = null; - if (useForward) { + if (this.useForward) { - if (forceHttps && "http".equals(request.getScheme())) { + if (this.forceHttps && "http".equals(request.getScheme())) { // First redirect the current request to HTTPS. // When that request is received, the forward to the login page will be // used. @@ -151,7 +151,7 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin } - redirectStrategy.sendRedirect(request, response, redirectUrl); + this.redirectStrategy.sendRedirect(request, response, redirectUrl); } protected String buildRedirectUrlToLoginPage(HttpServletRequest request, HttpServletResponse response, @@ -163,7 +163,7 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin return loginForm; } - int serverPort = portResolver.getServerPort(request); + int serverPort = this.portResolver.getServerPort(request); String scheme = request.getScheme(); RedirectUrlBuilder urlBuilder = new RedirectUrlBuilder(); @@ -174,8 +174,8 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin urlBuilder.setContextPath(request.getContextPath()); urlBuilder.setPathInfo(loginForm); - if (forceHttps && "http".equals(scheme)) { - Integer httpsPort = portMapper.lookupHttpsPort(serverPort); + if (this.forceHttps && "http".equals(scheme)) { + Integer httpsPort = this.portMapper.lookupHttpsPort(serverPort); if (httpsPort != null) { // Overwrite scheme and port in the redirect URL @@ -196,8 +196,8 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin */ protected String buildHttpsRedirectUrlForRequest(HttpServletRequest request) throws IOException, ServletException { - int serverPort = portResolver.getServerPort(request); - Integer httpsPort = portMapper.lookupHttpsPort(serverPort); + int serverPort = this.portResolver.getServerPort(request); + Integer httpsPort = this.portMapper.lookupHttpsPort(serverPort); if (httpsPort != null) { RedirectUrlBuilder urlBuilder = new RedirectUrlBuilder(); @@ -230,11 +230,11 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin } protected boolean isForceHttps() { - return forceHttps; + return this.forceHttps; } public String getLoginFormUrl() { - return loginFormUrl; + return this.loginFormUrl; } public void setPortMapper(PortMapper portMapper) { @@ -243,7 +243,7 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin } protected PortMapper getPortMapper() { - return portMapper; + return this.portMapper; } public void setPortResolver(PortResolver portResolver) { @@ -252,7 +252,7 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin } protected PortResolver getPortResolver() { - return portResolver; + return this.portResolver; } /** @@ -266,7 +266,7 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin } protected boolean isUseForward() { - return useForward; + return this.useForward; } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java index 68d81e51c0..6f4ff39c82 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java @@ -72,7 +72,7 @@ public class SavedRequestAwareAuthenticationSuccessHandler extends SimpleUrlAuth @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws ServletException, IOException { - SavedRequest savedRequest = requestCache.getRequest(request, response); + SavedRequest savedRequest = this.requestCache.getRequest(request, response); if (savedRequest == null) { super.onAuthenticationSuccess(request, response, authentication); @@ -82,7 +82,7 @@ public class SavedRequestAwareAuthenticationSuccessHandler extends SimpleUrlAuth String targetUrlParameter = getTargetUrlParameter(); if (isAlwaysUseDefaultTargetUrl() || (targetUrlParameter != null && StringUtils.hasText(request.getParameter(targetUrlParameter)))) { - requestCache.removeRequest(request, response); + this.requestCache.removeRequest(request, response); super.onAuthenticationSuccess(request, response, authentication); return; @@ -92,7 +92,7 @@ public class SavedRequestAwareAuthenticationSuccessHandler extends SimpleUrlAuth // Use the DefaultSavedRequest URL String targetUrl = savedRequest.getRedirectUrl(); - logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl); + this.logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl); getRedirectStrategy().sendRedirect(request, response, targetUrl); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java index d17cdd2078..1cd5312384 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java @@ -75,22 +75,22 @@ public class SimpleUrlAuthenticationFailureHandler implements AuthenticationFail public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException { - if (defaultFailureUrl == null) { - logger.debug("No failure URL set, sending 401 Unauthorized error"); + if (this.defaultFailureUrl == null) { + this.logger.debug("No failure URL set, sending 401 Unauthorized error"); response.sendError(HttpStatus.UNAUTHORIZED.value(), HttpStatus.UNAUTHORIZED.getReasonPhrase()); } else { saveException(request, exception); - if (forwardToDestination) { - logger.debug("Forwarding to " + defaultFailureUrl); + if (this.forwardToDestination) { + this.logger.debug("Forwarding to " + this.defaultFailureUrl); - request.getRequestDispatcher(defaultFailureUrl).forward(request, response); + request.getRequestDispatcher(this.defaultFailureUrl).forward(request, response); } else { - logger.debug("Redirecting to " + defaultFailureUrl); - redirectStrategy.sendRedirect(request, response, defaultFailureUrl); + this.logger.debug("Redirecting to " + this.defaultFailureUrl); + this.redirectStrategy.sendRedirect(request, response, this.defaultFailureUrl); } } } @@ -104,13 +104,13 @@ public class SimpleUrlAuthenticationFailureHandler implements AuthenticationFail * Otherwise the exception will not be stored. */ protected final void saveException(HttpServletRequest request, AuthenticationException exception) { - if (forwardToDestination) { + if (this.forwardToDestination) { request.setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, exception); } else { HttpSession session = request.getSession(false); - if (session != null || allowSessionCreation) { + if (session != null || this.allowSessionCreation) { request.getSession().setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, exception); } } @@ -127,7 +127,7 @@ public class SimpleUrlAuthenticationFailureHandler implements AuthenticationFail } protected boolean isUseForward() { - return forwardToDestination; + return this.forwardToDestination; } /** @@ -146,11 +146,11 @@ public class SimpleUrlAuthenticationFailureHandler implements AuthenticationFail } protected RedirectStrategy getRedirectStrategy() { - return redirectStrategy; + return this.redirectStrategy; } protected boolean isAllowSessionCreation() { - return allowSessionCreation; + return this.allowSessionCreation; } public void setAllowSessionCreation(boolean allowSessionCreation) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java index b4a2ca7317..b640597f5d 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java @@ -70,7 +70,7 @@ public class UsernamePasswordAuthenticationFilter extends AbstractAuthentication public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException { - if (postOnly && !request.getMethod().equals("POST")) { + if (this.postOnly && !request.getMethod().equals("POST")) { throw new AuthenticationServiceException("Authentication method not supported: " + request.getMethod()); } @@ -110,7 +110,7 @@ public class UsernamePasswordAuthenticationFilter extends AbstractAuthentication */ @Nullable protected String obtainPassword(HttpServletRequest request) { - return request.getParameter(passwordParameter); + return request.getParameter(this.passwordParameter); } /** @@ -122,7 +122,7 @@ public class UsernamePasswordAuthenticationFilter extends AbstractAuthentication */ @Nullable protected String obtainUsername(HttpServletRequest request) { - return request.getParameter(usernameParameter); + return request.getParameter(this.usernameParameter); } /** @@ -133,7 +133,7 @@ public class UsernamePasswordAuthenticationFilter extends AbstractAuthentication * set */ protected void setDetails(HttpServletRequest request, UsernamePasswordAuthenticationToken authRequest) { - authRequest.setDetails(authenticationDetailsSource.buildDetails(request)); + authRequest.setDetails(this.authenticationDetailsSource.buildDetails(request)); } /** @@ -170,11 +170,11 @@ public class UsernamePasswordAuthenticationFilter extends AbstractAuthentication } public final String getUsernameParameter() { - return usernameParameter; + return this.usernameParameter; } public final String getPasswordParameter() { - return passwordParameter; + return this.passwordParameter; } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java index f4a9a66879..24eef04985 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java @@ -64,30 +64,30 @@ public class WebAuthenticationDetails implements Serializable { if (obj instanceof WebAuthenticationDetails) { WebAuthenticationDetails rhs = (WebAuthenticationDetails) obj; - if ((remoteAddress == null) && (rhs.getRemoteAddress() != null)) { + if ((this.remoteAddress == null) && (rhs.getRemoteAddress() != null)) { return false; } - if ((remoteAddress != null) && (rhs.getRemoteAddress() == null)) { + if ((this.remoteAddress != null) && (rhs.getRemoteAddress() == null)) { return false; } - if (remoteAddress != null) { - if (!remoteAddress.equals(rhs.getRemoteAddress())) { + if (this.remoteAddress != null) { + if (!this.remoteAddress.equals(rhs.getRemoteAddress())) { return false; } } - if ((sessionId == null) && (rhs.getSessionId() != null)) { + if ((this.sessionId == null) && (rhs.getSessionId() != null)) { return false; } - if ((sessionId != null) && (rhs.getSessionId() == null)) { + if ((this.sessionId != null) && (rhs.getSessionId() == null)) { return false; } - if (sessionId != null) { - if (!sessionId.equals(rhs.getSessionId())) { + if (this.sessionId != null) { + if (!this.sessionId.equals(rhs.getSessionId())) { return false; } } @@ -103,7 +103,7 @@ public class WebAuthenticationDetails implements Serializable { * @return the address */ public String getRemoteAddress() { - return remoteAddress; + return this.remoteAddress; } /** @@ -112,7 +112,7 @@ public class WebAuthenticationDetails implements Serializable { * @return the session ID */ public String getSessionId() { - return sessionId; + return this.sessionId; } @Override diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java index 8ca32044c6..5820cb6894 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java @@ -71,7 +71,7 @@ public final class CookieClearingLogoutHandler implements LogoutHandler { } public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) { - cookiesToClear.forEach(f -> response.addCookie(f.apply(request))); + this.cookiesToClear.forEach(f -> response.addCookie(f.apply(request))); } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java index 26c4487e18..110daf321f 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java @@ -78,7 +78,7 @@ public class LogoutFilter extends GenericFilterBean { if (StringUtils.hasText(logoutSuccessUrl)) { urlLogoutSuccessHandler.setDefaultTargetUrl(logoutSuccessUrl); } - logoutSuccessHandler = urlLogoutSuccessHandler; + this.logoutSuccessHandler = urlLogoutSuccessHandler; setFilterProcessesUrl("/logout"); } @@ -90,13 +90,13 @@ public class LogoutFilter extends GenericFilterBean { if (requiresLogout(request, response)) { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (logger.isDebugEnabled()) { - logger.debug("Logging out user '" + auth + "' and transferring to logout destination"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Logging out user '" + auth + "' and transferring to logout destination"); } this.handler.logout(request, response, auth); - logoutSuccessHandler.onLogoutSuccess(request, response, auth); + this.logoutSuccessHandler.onLogoutSuccess(request, response, auth); return; } @@ -111,7 +111,7 @@ public class LogoutFilter extends GenericFilterBean { * @return true if logout should occur, false otherwise */ protected boolean requiresLogout(HttpServletRequest request, HttpServletResponse response) { - return logoutRequestMatcher.matches(request); + return this.logoutRequestMatcher.matches(request); } public void setLogoutRequestMatcher(RequestMatcher logoutRequestMatcher) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutSuccessEventPublishingLogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutSuccessEventPublishingLogoutHandler.java index 8992ebab17..e33e15cfaf 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutSuccessEventPublishingLogoutHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutSuccessEventPublishingLogoutHandler.java @@ -36,13 +36,13 @@ public final class LogoutSuccessEventPublishingLogoutHandler implements LogoutHa @Override public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) { - if (eventPublisher == null) { + if (this.eventPublisher == null) { return; } if (authentication == null) { return; } - eventPublisher.publishEvent(new LogoutSuccessEvent(authentication)); + this.eventPublisher.publishEvent(new LogoutSuccessEvent(authentication)); } @Override diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java index cd0cc7fef0..8b3858f0ad 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java @@ -57,15 +57,15 @@ public class SecurityContextLogoutHandler implements LogoutHandler { */ public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) { Assert.notNull(request, "HttpServletRequest required"); - if (invalidateHttpSession) { + if (this.invalidateHttpSession) { HttpSession session = request.getSession(false); if (session != null) { - logger.debug("Invalidating session: " + session.getId()); + this.logger.debug("Invalidating session: " + session.getId()); session.invalidate(); } } - if (clearAuthentication) { + if (this.clearAuthentication) { SecurityContext context = SecurityContextHolder.getContext(); context.setAuthentication(null); } @@ -74,7 +74,7 @@ public class SecurityContextLogoutHandler implements LogoutHandler { } public boolean isInvalidateHttpSession() { - return invalidateHttpSession; + return this.invalidateHttpSession; } /** diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java index 87d70731f1..867cdf3476 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java @@ -113,7 +113,7 @@ public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFi // convert to RuntimeException for passivity on afterPropertiesSet signature throw new RuntimeException(e); } - Assert.notNull(authenticationManager, "An AuthenticationManager must be set"); + Assert.notNull(this.authenticationManager, "An AuthenticationManager must be set"); } /** @@ -123,11 +123,12 @@ public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFi public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - if (logger.isDebugEnabled()) { - logger.debug("Checking secure context token: " + SecurityContextHolder.getContext().getAuthentication()); + if (this.logger.isDebugEnabled()) { + this.logger + .debug("Checking secure context token: " + SecurityContextHolder.getContext().getAuthentication()); } - if (requiresAuthenticationRequestMatcher.matches((HttpServletRequest) request)) { + if (this.requiresAuthenticationRequestMatcher.matches((HttpServletRequest) request)) { doAuthenticate((HttpServletRequest) request, (HttpServletResponse) response); } @@ -164,8 +165,9 @@ public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFi return false; } - if (logger.isDebugEnabled()) { - logger.debug("Pre-authenticated principal has changed to " + principal + " and will be reauthenticated"); + if (this.logger.isDebugEnabled()) { + this.logger + .debug("Pre-authenticated principal has changed to " + principal + " and will be reauthenticated"); } return true; } @@ -181,28 +183,28 @@ public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFi Object credentials = getPreAuthenticatedCredentials(request); if (principal == null) { - if (logger.isDebugEnabled()) { - logger.debug("No pre-authenticated principal found in request"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No pre-authenticated principal found in request"); } return; } - if (logger.isDebugEnabled()) { - logger.debug("preAuthenticatedPrincipal = " + principal + ", trying to authenticate"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("preAuthenticatedPrincipal = " + principal + ", trying to authenticate"); } try { PreAuthenticatedAuthenticationToken authRequest = new PreAuthenticatedAuthenticationToken(principal, credentials); - authRequest.setDetails(authenticationDetailsSource.buildDetails(request)); - authResult = authenticationManager.authenticate(authRequest); + authRequest.setDetails(this.authenticationDetailsSource.buildDetails(request)); + authResult = this.authenticationManager.authenticate(authRequest); successfulAuthentication(request, response, authResult); } catch (AuthenticationException failed) { unsuccessfulAuthentication(request, response, failed); - if (!continueFilterChainOnUnsuccessfulAuthentication) { + if (!this.continueFilterChainOnUnsuccessfulAuthentication) { throw failed; } } @@ -214,17 +216,17 @@ public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFi */ protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, Authentication authResult) throws IOException, ServletException { - if (logger.isDebugEnabled()) { - logger.debug("Authentication success: " + authResult); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Authentication success: " + authResult); } SecurityContextHolder.getContext().setAuthentication(authResult); // Fire event if (this.eventPublisher != null) { - eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass())); + this.eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass())); } - if (authenticationSuccessHandler != null) { - authenticationSuccessHandler.onAuthenticationSuccess(request, response, authResult); + if (this.authenticationSuccessHandler != null) { + this.authenticationSuccessHandler.onAuthenticationSuccess(request, response, authResult); } } @@ -238,13 +240,13 @@ public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFi AuthenticationException failed) throws IOException, ServletException { SecurityContextHolder.clearContext(); - if (logger.isDebugEnabled()) { - logger.debug("Cleared security context due to exception", failed); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Cleared security context due to exception", failed); } request.setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, failed); - if (authenticationFailureHandler != null) { - authenticationFailureHandler.onAuthenticationFailure(request, response, failed); + if (this.authenticationFailureHandler != null) { + this.authenticationFailureHandler.onAuthenticationFailure(request, response, failed); } } @@ -265,7 +267,7 @@ public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFi } protected AuthenticationDetailsSource getAuthenticationDetailsSource() { - return authenticationDetailsSource; + return this.authenticationDetailsSource; } /** @@ -284,7 +286,7 @@ public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFi * failed authentication. */ public void setContinueFilterChainOnUnsuccessfulAuthentication(boolean shouldContinue) { - continueFilterChainOnUnsuccessfulAuthentication = shouldContinue; + this.continueFilterChainOnUnsuccessfulAuthentication = shouldContinue; } /** @@ -357,7 +359,7 @@ public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFi return true; } - if (!checkForPrincipalChanges) { + if (!AbstractPreAuthenticatedProcessingFilter.this.checkForPrincipalChanges) { return false; } @@ -365,15 +367,16 @@ public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFi return false; } - logger.debug("Pre-authenticated principal has changed and will be reauthenticated"); + AbstractPreAuthenticatedProcessingFilter.this.logger + .debug("Pre-authenticated principal has changed and will be reauthenticated"); - if (invalidateSessionOnPrincipalChange) { + if (AbstractPreAuthenticatedProcessingFilter.this.invalidateSessionOnPrincipalChange) { SecurityContextHolder.clearContext(); HttpSession session = request.getSession(false); if (session != null) { - logger.debug("Invalidating existing session"); + AbstractPreAuthenticatedProcessingFilter.this.logger.debug("Invalidating existing session"); session.invalidate(); request.getSession(); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProvider.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProvider.java index d4e5c8308a..208fb4a164 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProvider.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProvider.java @@ -61,7 +61,7 @@ public class PreAuthenticatedAuthenticationProvider implements AuthenticationPro * Check whether all required properties have been set. */ public void afterPropertiesSet() { - Assert.notNull(preAuthenticatedUserDetailsService, "An AuthenticationUserDetailsService must be set"); + Assert.notNull(this.preAuthenticatedUserDetailsService, "An AuthenticationUserDetailsService must be set"); } /** @@ -82,7 +82,7 @@ public class PreAuthenticatedAuthenticationProvider implements AuthenticationPro if (authentication.getPrincipal() == null) { logger.debug("No pre-authenticated principal found in request."); - if (throwExceptionWhenTokenRejected) { + if (this.throwExceptionWhenTokenRejected) { throw new BadCredentialsException("No pre-authenticated principal found in request."); } return null; @@ -91,16 +91,16 @@ public class PreAuthenticatedAuthenticationProvider implements AuthenticationPro if (authentication.getCredentials() == null) { logger.debug("No pre-authenticated credentials found in request."); - if (throwExceptionWhenTokenRejected) { + if (this.throwExceptionWhenTokenRejected) { throw new BadCredentialsException("No pre-authenticated credentials found in request."); } return null; } - UserDetails ud = preAuthenticatedUserDetailsService + UserDetails ud = this.preAuthenticatedUserDetailsService .loadUserDetails((PreAuthenticatedAuthenticationToken) authentication); - userDetailsChecker.check(ud); + this.userDetailsChecker.check(ud); PreAuthenticatedAuthenticationToken result = new PreAuthenticatedAuthenticationToken(ud, authentication.getCredentials(), ud.getAuthorities()); @@ -147,11 +147,11 @@ public class PreAuthenticatedAuthenticationProvider implements AuthenticationPro } public int getOrder() { - return order; + return this.order; } public void setOrder(int i) { - order = i; + this.order = i; } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java index b2bcc058f2..bb08b1bc3a 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java @@ -53,14 +53,14 @@ public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails extends @Override public List getGrantedAuthorities() { - return authorities; + return this.authorities; } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append(super.toString()).append("; "); - sb.append(authorities); + sb.append(this.authorities); return sb.toString(); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilter.java index 16e82bdfd7..6102b55d2f 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilter.java @@ -56,11 +56,11 @@ public class RequestAttributeAuthenticationFilter extends AbstractPreAuthenticat * missing and {@code exceptionIfVariableMissing} is set to {@code true}. */ protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) { - String principal = (String) request.getAttribute(principalEnvironmentVariable); + String principal = (String) request.getAttribute(this.principalEnvironmentVariable); - if (principal == null && exceptionIfVariableMissing) { + if (principal == null && this.exceptionIfVariableMissing) { throw new PreAuthenticatedCredentialsNotFoundException( - principalEnvironmentVariable + " variable not found in request."); + this.principalEnvironmentVariable + " variable not found in request."); } return principal; @@ -72,8 +72,8 @@ public class RequestAttributeAuthenticationFilter extends AbstractPreAuthenticat * credentials value. Otherwise a dummy value will be used. */ protected Object getPreAuthenticatedCredentials(HttpServletRequest request) { - if (credentialsEnvironmentVariable != null) { - return request.getAttribute(credentialsEnvironmentVariable); + if (this.credentialsEnvironmentVariable != null) { + return request.getAttribute(this.credentialsEnvironmentVariable); } return "N/A"; diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java index 115d9aa6cc..015567f67d 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java @@ -57,11 +57,11 @@ public class RequestHeaderAuthenticationFilter extends AbstractPreAuthenticatedP * {@code exceptionIfHeaderMissing} is set to {@code true}. */ protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) { - String principal = request.getHeader(principalRequestHeader); + String principal = request.getHeader(this.principalRequestHeader); - if (principal == null && exceptionIfHeaderMissing) { + if (principal == null && this.exceptionIfHeaderMissing) { throw new PreAuthenticatedCredentialsNotFoundException( - principalRequestHeader + " header not found in request."); + this.principalRequestHeader + " header not found in request."); } return principal; @@ -73,8 +73,8 @@ public class RequestHeaderAuthenticationFilter extends AbstractPreAuthenticatedP * will be used. */ protected Object getPreAuthenticatedCredentials(HttpServletRequest request) { - if (credentialsRequestHeader != null) { - return request.getHeader(credentialsRequestHeader); + if (this.credentialsRequestHeader != null) { + return request.getHeader(this.credentialsRequestHeader); } return "N/A"; diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java index 00509e906f..e44fd3e8b4 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java @@ -59,8 +59,8 @@ public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource implements * Check that all required properties have been set. */ public void afterPropertiesSet() { - Assert.notNull(j2eeMappableRoles, "No mappable roles available"); - Assert.notNull(j2eeUserRoles2GrantedAuthoritiesMapper, "Roles to granted authorities mapper not set"); + Assert.notNull(this.j2eeMappableRoles, "No mappable roles available"); + Assert.notNull(this.j2eeUserRoles2GrantedAuthoritiesMapper, "Roles to granted authorities mapper not set"); } /** @@ -75,7 +75,7 @@ public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource implements protected Collection getUserRoles(HttpServletRequest request) { ArrayList j2eeUserRolesList = new ArrayList<>(); - for (String role : j2eeMappableRoles) { + for (String role : this.j2eeMappableRoles) { if (request.isUserInRole(role)) { j2eeUserRolesList.add(role); } @@ -92,11 +92,11 @@ public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource implements public PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails buildDetails(HttpServletRequest context) { Collection j2eeUserRoles = getUserRoles(context); - Collection userGas = j2eeUserRoles2GrantedAuthoritiesMapper + Collection userGas = this.j2eeUserRoles2GrantedAuthoritiesMapper .getGrantedAuthorities(j2eeUserRoles); - if (logger.isDebugEnabled()) { - logger.debug("J2EE roles [" + j2eeUserRoles + "] mapped to Granted Authorities: [" + userGas + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("J2EE roles [" + j2eeUserRoles + "] mapped to Granted Authorities: [" + userGas + "]"); } PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails result = new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails( @@ -116,7 +116,7 @@ public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource implements * @param mapper The Attributes2GrantedAuthoritiesMapper to use */ public void setUserRoles2GrantedAuthoritiesMapper(Attributes2GrantedAuthoritiesMapper mapper) { - j2eeUserRoles2GrantedAuthoritiesMapper = mapper; + this.j2eeUserRoles2GrantedAuthoritiesMapper = mapper; } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java index 97e8e7e12e..14f732dcc8 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java @@ -34,8 +34,8 @@ public class J2eePreAuthenticatedProcessingFilter extends AbstractPreAuthenticat */ protected Object getPreAuthenticatedPrincipal(HttpServletRequest httpRequest) { Object principal = httpRequest.getUserPrincipal() == null ? null : httpRequest.getUserPrincipal().getName(); - if (logger.isDebugEnabled()) { - logger.debug("PreAuthenticated J2EE principal: " + principal); + if (this.logger.isDebugEnabled()) { + this.logger.debug("PreAuthenticated J2EE principal: " + principal); } return principal; } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java index e55d006eb3..2e0cd34d4f 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java @@ -66,7 +66,7 @@ public class WebXmlMappableAttributesRetriever } public Set getMappableAttributes() { - return mappableAttributes; + return this.mappableAttributes; } /** @@ -75,7 +75,7 @@ public class WebXmlMappableAttributesRetriever */ public void afterPropertiesSet() throws Exception { - Resource webXml = resourceLoader.getResource("/WEB-INF/web.xml"); + Resource webXml = this.resourceLoader.getResource("/WEB-INF/web.xml"); Document doc = getDocument(webXml.getInputStream()); NodeList webApp = doc.getElementsByTagName("web-app"); if (webApp.getLength() != 1) { @@ -92,14 +92,14 @@ public class WebXmlMappableAttributesRetriever if (roles.getLength() > 0) { String roleName = roles.item(0).getTextContent().trim(); roleNames.add(roleName); - logger.info("Retrieved role-name '" + roleName + "' from web.xml"); + this.logger.info("Retrieved role-name '" + roleName + "' from web.xml"); } else { - logger.info("No security-role elements found in " + webXml); + this.logger.info("No security-role elements found in " + webXml); } } - mappableAttributes = Collections.unmodifiableSet(new HashSet<>(roleNames)); + this.mappableAttributes = Collections.unmodifiableSet(new HashSet<>(roleNames)); } /** @@ -123,7 +123,7 @@ public class WebXmlMappableAttributesRetriever aStream.close(); } catch (IOException e) { - logger.warn("Failed to close input stream for web.xml", e); + this.logger.warn("Failed to close input stream for web.xml", e); } } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java index 423c1aef81..ea7a493d7b 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java @@ -48,9 +48,9 @@ public class WebSpherePreAuthenticatedProcessingFilter extends AbstractPreAuthen * Return the WebSphere user name. */ protected Object getPreAuthenticatedPrincipal(HttpServletRequest httpRequest) { - Object principal = wasHelper.getCurrentUserName(); - if (logger.isDebugEnabled()) { - logger.debug("PreAuthenticated WebSphere principal: " + principal); + Object principal = this.wasHelper.getCurrentUserName(); + if (this.logger.isDebugEnabled()) { + this.logger.debug("PreAuthenticated WebSphere principal: " + principal); } return principal; } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java index 7e5597e69a..84ab9dd7c0 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java @@ -63,11 +63,11 @@ public class WebSpherePreAuthenticatedWebAuthenticationDetailsSource implements * @return authorities mapped from the user's WebSphere groups. */ private Collection getWebSphereGroupsBasedGrantedAuthorities() { - List webSphereGroups = wasHelper.getGroupsForCurrentUser(); - Collection userGas = webSphereGroups2GrantedAuthoritiesMapper + List webSphereGroups = this.wasHelper.getGroupsForCurrentUser(); + Collection userGas = this.webSphereGroups2GrantedAuthoritiesMapper .getGrantedAuthorities(webSphereGroups); - if (logger.isDebugEnabled()) { - logger.debug("WebSphere groups: " + webSphereGroups + " mapped to Granted Authorities: " + userGas); + if (this.logger.isDebugEnabled()) { + this.logger.debug("WebSphere groups: " + webSphereGroups + " mapped to Granted Authorities: " + userGas); } return userGas; } @@ -77,7 +77,7 @@ public class WebSpherePreAuthenticatedWebAuthenticationDetailsSource implements * groups to authorities */ public void setWebSphereGroups2GrantedAuthoritiesMapper(Attributes2GrantedAuthoritiesMapper mapper) { - webSphereGroups2GrantedAuthoritiesMapper = mapper; + this.webSphereGroups2GrantedAuthoritiesMapper = mapper; } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java index 2b212368c0..320db86eed 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java @@ -57,12 +57,12 @@ public class SubjectDnX509PrincipalExtractor implements X509PrincipalExtractor { // String subjectDN = clientCert.getSubjectX500Principal().getName(); String subjectDN = clientCert.getSubjectDN().getName(); - logger.debug("Subject DN is '" + subjectDN + "'"); + this.logger.debug("Subject DN is '" + subjectDN + "'"); - Matcher matcher = subjectDnPattern.matcher(subjectDN); + Matcher matcher = this.subjectDnPattern.matcher(subjectDN); if (!matcher.find()) { - throw new BadCredentialsException(messages.getMessage("SubjectDnX509PrincipalExtractor.noMatching", + throw new BadCredentialsException(this.messages.getMessage("SubjectDnX509PrincipalExtractor.noMatching", new Object[] { subjectDN }, "No matching pattern was found in subject DN: {0}")); } @@ -72,7 +72,7 @@ public class SubjectDnX509PrincipalExtractor implements X509PrincipalExtractor { String username = matcher.group(1); - logger.debug("Extracted Principal name is '" + username + "'"); + this.logger.debug("Extracted Principal name is '" + username + "'"); return username; } @@ -91,7 +91,7 @@ public class SubjectDnX509PrincipalExtractor implements X509PrincipalExtractor { */ public void setSubjectDnRegex(String subjectDnRegex) { Assert.hasText(subjectDnRegex, "Regular expression may not be null or empty"); - subjectDnPattern = Pattern.compile(subjectDnRegex, Pattern.CASE_INSENSITIVE); + this.subjectDnPattern = Pattern.compile(subjectDnRegex, Pattern.CASE_INSENSITIVE); } public void setMessageSource(MessageSource messageSource) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509AuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509AuthenticationFilter.java index 96bc484218..6726a9d1c7 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509AuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509AuthenticationFilter.java @@ -35,7 +35,7 @@ public class X509AuthenticationFilter extends AbstractPreAuthenticatedProcessing return null; } - return principalExtractor.extractPrincipal(cert); + return this.principalExtractor.extractPrincipal(cert); } protected Object getPreAuthenticatedCredentials(HttpServletRequest request) { @@ -46,15 +46,15 @@ public class X509AuthenticationFilter extends AbstractPreAuthenticatedProcessing X509Certificate[] certs = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate"); if (certs != null && certs.length > 0) { - if (logger.isDebugEnabled()) { - logger.debug("X.509 client authentication certificate:" + certs[0]); + if (this.logger.isDebugEnabled()) { + this.logger.debug("X.509 client authentication certificate:" + certs[0]); } return certs[0]; } - if (logger.isDebugEnabled()) { - logger.debug("No client certificate found in request."); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No client certificate found in request."); } return null; diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java index f676a0e0f2..a65e6a4579 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java @@ -102,8 +102,8 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, @Override public void afterPropertiesSet() { - Assert.hasLength(key, "key cannot be empty or null"); - Assert.notNull(userDetailsService, "A UserDetailsService is required"); + Assert.hasLength(this.key, "key cannot be empty or null"); + Assert.notNull(this.userDetailsService, "A UserDetailsService is required"); } /** @@ -122,10 +122,10 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, return null; } - logger.debug("Remember-me cookie detected"); + this.logger.debug("Remember-me cookie detected"); if (rememberMeCookie.length() == 0) { - logger.debug("Cookie was empty"); + this.logger.debug("Cookie was empty"); cancelCookie(request, response); return null; } @@ -135,9 +135,9 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, try { String[] cookieTokens = decodeCookie(rememberMeCookie); user = processAutoLoginCookie(cookieTokens, request, response); - userDetailsChecker.check(user); + this.userDetailsChecker.check(user); - logger.debug("Remember-me cookie accepted"); + this.logger.debug("Remember-me cookie accepted"); return createSuccessfulAuthentication(request, user); } @@ -146,16 +146,16 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, throw cte; } catch (UsernameNotFoundException noUser) { - logger.debug("Remember-me login was valid but corresponding user not found.", noUser); + this.logger.debug("Remember-me login was valid but corresponding user not found.", noUser); } catch (InvalidCookieException invalidCookie) { - logger.debug("Invalid remember-me cookie: " + invalidCookie.getMessage()); + this.logger.debug("Invalid remember-me cookie: " + invalidCookie.getMessage()); } catch (AccountStatusException statusInvalid) { - logger.debug("Invalid UserDetails: " + statusInvalid.getMessage()); + this.logger.debug("Invalid UserDetails: " + statusInvalid.getMessage()); } catch (RememberMeAuthenticationException e) { - logger.debug(e.getMessage()); + this.logger.debug(e.getMessage()); } cancelCookie(request, response); @@ -177,7 +177,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, } for (Cookie cookie : cookies) { - if (cookieName.equals(cookie.getName())) { + if (this.cookieName.equals(cookie.getName())) { return cookie.getValue(); } } @@ -198,9 +198,9 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, * @return the Authentication for the remember-me authenticated user */ protected Authentication createSuccessfulAuthentication(HttpServletRequest request, UserDetails user) { - RememberMeAuthenticationToken auth = new RememberMeAuthenticationToken(key, user, - authoritiesMapper.mapAuthorities(user.getAuthorities())); - auth.setDetails(authenticationDetailsSource.buildDetails(request)); + RememberMeAuthenticationToken auth = new RememberMeAuthenticationToken(this.key, user, + this.authoritiesMapper.mapAuthorities(user.getAuthorities())); + auth.setDetails(this.authenticationDetailsSource.buildDetails(request)); return auth; } @@ -232,7 +232,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, tokens[i] = URLDecoder.decode(tokens[i], StandardCharsets.UTF_8.toString()); } catch (UnsupportedEncodingException e) { - logger.error(e.getMessage(), e); + this.logger.error(e.getMessage(), e); } } @@ -251,7 +251,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, sb.append(URLEncoder.encode(cookieTokens[i], StandardCharsets.UTF_8.toString())); } catch (UnsupportedEncodingException e) { - logger.error(e.getMessage(), e); + this.logger.error(e.getMessage(), e); } if (i < cookieTokens.length - 1) { @@ -272,7 +272,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, @Override public final void loginFail(HttpServletRequest request, HttpServletResponse response) { - logger.debug("Interactive login attempt was unsuccessful."); + this.logger.debug("Interactive login attempt was unsuccessful."); cancelCookie(request, response); onLoginFail(request, response); } @@ -293,8 +293,8 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, public final void loginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) { - if (!rememberMeRequested(request, parameter)) { - logger.debug("Remember-me login not requested."); + if (!rememberMeRequested(request, this.parameter)) { + this.logger.debug("Remember-me login not requested."); return; } @@ -320,7 +320,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, * has been requested. */ protected boolean rememberMeRequested(HttpServletRequest request, String parameter) { - if (alwaysRemember) { + if (this.alwaysRemember) { return true; } @@ -333,8 +333,8 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, } } - if (logger.isDebugEnabled()) { - logger.debug("Did not send remember-me cookie (principal did not set parameter '" + parameter + "')"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Did not send remember-me cookie (principal did not set parameter '" + parameter + "')"); } return false; @@ -362,18 +362,18 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, * logins. */ protected void cancelCookie(HttpServletRequest request, HttpServletResponse response) { - logger.debug("Cancelling cookie"); - Cookie cookie = new Cookie(cookieName, null); + this.logger.debug("Cancelling cookie"); + Cookie cookie = new Cookie(this.cookieName, null); cookie.setMaxAge(0); cookie.setPath(getCookiePath(request)); - if (cookieDomain != null) { - cookie.setDomain(cookieDomain); + if (this.cookieDomain != null) { + cookie.setDomain(this.cookieDomain); } - if (useSecureCookie == null) { + if (this.useSecureCookie == null) { cookie.setSecure(request.isSecure()); } else { - cookie.setSecure(useSecureCookie); + cookie.setSecure(this.useSecureCookie); } response.addCookie(cookie); } @@ -392,21 +392,21 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, */ protected void setCookie(String[] tokens, int maxAge, HttpServletRequest request, HttpServletResponse response) { String cookieValue = encodeCookie(tokens); - Cookie cookie = new Cookie(cookieName, cookieValue); + Cookie cookie = new Cookie(this.cookieName, cookieValue); cookie.setMaxAge(maxAge); cookie.setPath(getCookiePath(request)); - if (cookieDomain != null) { - cookie.setDomain(cookieDomain); + if (this.cookieDomain != null) { + cookie.setDomain(this.cookieDomain); } if (maxAge < 1) { cookie.setVersion(1); } - if (useSecureCookie == null) { + if (this.useSecureCookie == null) { cookie.setSecure(request.isSecure()); } else { - cookie.setSecure(useSecureCookie); + cookie.setSecure(this.useSecureCookie); } cookie.setHttpOnly(true); @@ -425,8 +425,8 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, */ @Override public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) { - if (logger.isDebugEnabled()) { - logger.debug("Logout of user " + (authentication == null ? "Unknown" : authentication.getName())); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Logout of user " + (authentication == null ? "Unknown" : authentication.getName())); } cancelCookie(request, response); } @@ -442,7 +442,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, } protected String getCookieName() { - return cookieName; + return this.cookieName; } public void setAlwaysRemember(boolean alwaysRemember) { @@ -461,15 +461,15 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, } public String getParameter() { - return parameter; + return this.parameter; } protected UserDetailsService getUserDetailsService() { - return userDetailsService; + return this.userDetailsService; } public String getKey() { - return key; + return this.key; } public void setTokenValiditySeconds(int tokenValiditySeconds) { @@ -477,7 +477,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, } protected int getTokenValiditySeconds() { - return tokenValiditySeconds; + return this.tokenValiditySeconds; } /** @@ -496,7 +496,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices, } protected AuthenticationDetailsSource getAuthenticationDetailsSource() { - return authenticationDetailsSource; + return this.authenticationDetailsSource; } public void setAuthenticationDetailsSource( diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java index 62c3641407..2e0572b30d 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java @@ -33,13 +33,13 @@ public class InMemoryTokenRepositoryImpl implements PersistentTokenRepository { private final Map seriesTokens = new HashMap<>(); public synchronized void createNewToken(PersistentRememberMeToken token) { - PersistentRememberMeToken current = seriesTokens.get(token.getSeries()); + PersistentRememberMeToken current = this.seriesTokens.get(token.getSeries()); if (current != null) { throw new DataIntegrityViolationException("Series Id '" + token.getSeries() + "' already exists!"); } - seriesTokens.put(token.getSeries(), token); + this.seriesTokens.put(token.getSeries(), token); } public synchronized void updateToken(String series, String tokenValue, Date lastUsed) { @@ -49,20 +49,20 @@ public class InMemoryTokenRepositoryImpl implements PersistentTokenRepository { new Date()); // Store it, overwriting the existing one. - seriesTokens.put(series, newToken); + this.seriesTokens.put(series, newToken); } public synchronized PersistentRememberMeToken getTokenForSeries(String seriesId) { - return seriesTokens.get(seriesId); + return this.seriesTokens.get(seriesId); } public synchronized void removeUserTokens(String username) { - Iterator series = seriesTokens.keySet().iterator(); + Iterator series = this.seriesTokens.keySet().iterator(); while (series.hasNext()) { String seriesId = series.next(); - PersistentRememberMeToken token = seriesTokens.get(seriesId); + PersistentRememberMeToken token = this.seriesTokens.get(seriesId); if (username.equals(token.getUsername())) { series.remove(); diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java index e1b0094c9e..d7a4d8857f 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java @@ -57,18 +57,18 @@ public class JdbcTokenRepositoryImpl extends JdbcDaoSupport implements Persisten private boolean createTableOnStartup; protected void initDao() { - if (createTableOnStartup) { + if (this.createTableOnStartup) { getJdbcTemplate().execute(CREATE_TABLE_SQL); } } public void createNewToken(PersistentRememberMeToken token) { - getJdbcTemplate().update(insertTokenSql, token.getUsername(), token.getSeries(), token.getTokenValue(), + getJdbcTemplate().update(this.insertTokenSql, token.getUsername(), token.getSeries(), token.getTokenValue(), token.getDate()); } public void updateToken(String series, String tokenValue, Date lastUsed) { - getJdbcTemplate().update(updateTokenSql, tokenValue, lastUsed, series); + getJdbcTemplate().update(this.updateTokenSql, tokenValue, lastUsed, series); } /** @@ -82,29 +82,29 @@ public class JdbcTokenRepositoryImpl extends JdbcDaoSupport implements Persisten */ public PersistentRememberMeToken getTokenForSeries(String seriesId) { try { - return getJdbcTemplate().queryForObject(tokensBySeriesSql, + return getJdbcTemplate().queryForObject(this.tokensBySeriesSql, (rs, rowNum) -> new PersistentRememberMeToken(rs.getString(1), rs.getString(2), rs.getString(3), rs.getTimestamp(4)), seriesId); } catch (EmptyResultDataAccessException zeroResults) { - if (logger.isDebugEnabled()) { - logger.debug("Querying token for series '" + seriesId + "' returned no results.", zeroResults); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Querying token for series '" + seriesId + "' returned no results.", zeroResults); } } catch (IncorrectResultSizeDataAccessException moreThanOne) { - logger.error("Querying token for series '" + seriesId + "' returned more than one value. Series" + this.logger.error("Querying token for series '" + seriesId + "' returned more than one value. Series" + " should be unique"); } catch (DataAccessException e) { - logger.error("Failed to load token for series " + seriesId, e); + this.logger.error("Failed to load token for series " + seriesId, e); } return null; } public void removeUserTokens(String username) { - getJdbcTemplate().update(removeUserTokensSql, username); + getJdbcTemplate().update(this.removeUserTokensSql, username); } /** diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java index 8f1666a92a..2057dad4a1 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java @@ -38,19 +38,19 @@ public class PersistentRememberMeToken { } public String getUsername() { - return username; + return this.username; } public String getSeries() { - return series; + return this.series; } public String getTokenValue() { - return tokenValue; + return this.tokenValue; } public Date getDate() { - return date; + return this.date; } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java index 383071ae32..13bb9f6b73 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java @@ -73,7 +73,7 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe public PersistentTokenBasedRememberMeServices(String key, UserDetailsService userDetailsService, PersistentTokenRepository tokenRepository) { super(key, userDetailsService); - random = new SecureRandom(); + this.random = new SecureRandom(); this.tokenRepository = tokenRepository; } @@ -100,7 +100,7 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe final String presentedSeries = cookieTokens[0]; final String presentedToken = cookieTokens[1]; - PersistentRememberMeToken token = tokenRepository.getTokenForSeries(presentedSeries); + PersistentRememberMeToken token = this.tokenRepository.getTokenForSeries(presentedSeries); if (token == null) { // No series match, so we can't authenticate using this cookie @@ -111,9 +111,10 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe if (!presentedToken.equals(token.getTokenValue())) { // Token doesn't match series value. Delete all logins for this user and throw // an exception to warn them. - tokenRepository.removeUserTokens(token.getUsername()); + this.tokenRepository.removeUserTokens(token.getUsername()); - throw new CookieTheftException(messages.getMessage("PersistentTokenBasedRememberMeServices.cookieStolen", + throw new CookieTheftException(this.messages.getMessage( + "PersistentTokenBasedRememberMeServices.cookieStolen", "Invalid remember-me token (Series/token) mismatch. Implies previous cookie theft attack.")); } @@ -123,8 +124,8 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe // Token also matches, so login is valid. Update the token value, keeping the // *same* series number. - if (logger.isDebugEnabled()) { - logger.debug("Refreshing persistent login token for user '" + token.getUsername() + "', series '" + if (this.logger.isDebugEnabled()) { + this.logger.debug("Refreshing persistent login token for user '" + token.getUsername() + "', series '" + token.getSeries() + "'"); } @@ -132,11 +133,11 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe generateTokenData(), new Date()); try { - tokenRepository.updateToken(newToken.getSeries(), newToken.getTokenValue(), newToken.getDate()); + this.tokenRepository.updateToken(newToken.getSeries(), newToken.getTokenValue(), newToken.getDate()); addCookie(newToken, request, response); } catch (Exception e) { - logger.error("Failed to update token: ", e); + this.logger.error("Failed to update token: ", e); throw new RememberMeAuthenticationException("Autologin failed due to data access problem"); } @@ -152,16 +153,16 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe Authentication successfulAuthentication) { String username = successfulAuthentication.getName(); - logger.debug("Creating new persistent login for user " + username); + this.logger.debug("Creating new persistent login for user " + username); PersistentRememberMeToken persistentToken = new PersistentRememberMeToken(username, generateSeriesData(), generateTokenData(), new Date()); try { - tokenRepository.createNewToken(persistentToken); + this.tokenRepository.createNewToken(persistentToken); addCookie(persistentToken, request, response); } catch (Exception e) { - logger.error("Failed to save persistent token ", e); + this.logger.error("Failed to save persistent token ", e); } } @@ -170,19 +171,19 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe super.logout(request, response, authentication); if (authentication != null) { - tokenRepository.removeUserTokens(authentication.getName()); + this.tokenRepository.removeUserTokens(authentication.getName()); } } protected String generateSeriesData() { - byte[] newSeries = new byte[seriesLength]; - random.nextBytes(newSeries); + byte[] newSeries = new byte[this.seriesLength]; + this.random.nextBytes(newSeries); return new String(Base64.getEncoder().encode(newSeries)); } protected String generateTokenData() { - byte[] newToken = new byte[tokenLength]; - random.nextBytes(newToken); + byte[] newToken = new byte[this.tokenLength]; + this.random.nextBytes(newToken); return new String(Base64.getEncoder().encode(newToken)); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java index cd6ff9f875..be1f7f05e7 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java @@ -81,8 +81,8 @@ public class RememberMeAuthenticationFilter extends GenericFilterBean implements @Override public void afterPropertiesSet() { - Assert.notNull(authenticationManager, "authenticationManager must be specified"); - Assert.notNull(rememberMeServices, "rememberMeServices must be specified"); + Assert.notNull(this.authenticationManager, "authenticationManager must be specified"); + Assert.notNull(this.rememberMeServices, "rememberMeServices must be specified"); } public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) @@ -91,44 +91,44 @@ public class RememberMeAuthenticationFilter extends GenericFilterBean implements HttpServletResponse response = (HttpServletResponse) res; if (SecurityContextHolder.getContext().getAuthentication() == null) { - Authentication rememberMeAuth = rememberMeServices.autoLogin(request, response); + Authentication rememberMeAuth = this.rememberMeServices.autoLogin(request, response); if (rememberMeAuth != null) { // Attempt authenticaton via AuthenticationManager try { - rememberMeAuth = authenticationManager.authenticate(rememberMeAuth); + rememberMeAuth = this.authenticationManager.authenticate(rememberMeAuth); // Store to SecurityContextHolder SecurityContextHolder.getContext().setAuthentication(rememberMeAuth); onSuccessfulAuthentication(request, response, rememberMeAuth); - if (logger.isDebugEnabled()) { - logger.debug("SecurityContextHolder populated with remember-me token: '" + if (this.logger.isDebugEnabled()) { + this.logger.debug("SecurityContextHolder populated with remember-me token: '" + SecurityContextHolder.getContext().getAuthentication() + "'"); } // Fire event if (this.eventPublisher != null) { - eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent( + this.eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent( SecurityContextHolder.getContext().getAuthentication(), this.getClass())); } - if (successHandler != null) { - successHandler.onAuthenticationSuccess(request, response, rememberMeAuth); + if (this.successHandler != null) { + this.successHandler.onAuthenticationSuccess(request, response, rememberMeAuth); return; } } catch (AuthenticationException authenticationException) { - if (logger.isDebugEnabled()) { - logger.debug("SecurityContextHolder not populated with remember-me token, as " + if (this.logger.isDebugEnabled()) { + this.logger.debug("SecurityContextHolder not populated with remember-me token, as " + "AuthenticationManager rejected Authentication returned by RememberMeServices: '" + rememberMeAuth + "'; invalidating remember-me token", authenticationException); } - rememberMeServices.loginFail(request, response); + this.rememberMeServices.loginFail(request, response); onUnsuccessfulAuthentication(request, response, authenticationException); } @@ -137,9 +137,10 @@ public class RememberMeAuthenticationFilter extends GenericFilterBean implements chain.doFilter(request, response); } else { - if (logger.isDebugEnabled()) { - logger.debug("SecurityContextHolder not populated with remember-me token, as it already contained: '" - + SecurityContextHolder.getContext().getAuthentication() + "'"); + if (this.logger.isDebugEnabled()) { + this.logger + .debug("SecurityContextHolder not populated with remember-me token, as it already contained: '" + + SecurityContextHolder.getContext().getAuthentication() + "'"); } chain.doFilter(request, response); @@ -166,7 +167,7 @@ public class RememberMeAuthenticationFilter extends GenericFilterBean implements } public RememberMeServices getRememberMeServices() { - return rememberMeServices; + return this.rememberMeServices; } public void setApplicationEventPublisher(ApplicationEventPublisher eventPublisher) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java index 6085a00f83..0fdf63e8d1 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java @@ -170,7 +170,7 @@ public class TokenBasedRememberMeServices extends AbstractRememberMeServices { // TokenBasedRememberMeServices is // unable to construct a valid token in this case. if (!StringUtils.hasLength(username)) { - logger.debug("Unable to retrieve username"); + this.logger.debug("Unable to retrieve username"); return; } @@ -179,7 +179,7 @@ public class TokenBasedRememberMeServices extends AbstractRememberMeServices { password = user.getPassword(); if (!StringUtils.hasLength(password)) { - logger.debug("Unable to obtain password for user: " + username); + this.logger.debug("Unable to obtain password for user: " + username); return; } } @@ -194,8 +194,8 @@ public class TokenBasedRememberMeServices extends AbstractRememberMeServices { setCookie(new String[] { username, Long.toString(expiryTime), signatureValue }, tokenLifetime, request, response); - if (logger.isDebugEnabled()) { - logger.debug( + if (this.logger.isDebugEnabled()) { + this.logger.debug( "Added remember-me cookie for user '" + username + "', expiry: '" + new Date(expiryTime) + "'"); } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java index 6a75ca247f..69304944f7 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java +++ b/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java @@ -69,7 +69,7 @@ abstract class AbstractSessionFixationProtectionStrategy HttpServletResponse response) { boolean hadSessionAlready = request.getSession(false) != null; - if (!hadSessionAlready && !alwaysCreateSession) { + if (!hadSessionAlready && !this.alwaysCreateSession) { // Session fixation isn't a problem if there's no session return; @@ -92,7 +92,7 @@ abstract class AbstractSessionFixationProtectionStrategy } if (originalSessionId.equals(newSessionId)) { - logger.warn( + this.logger.warn( "Your servlet container did not change the session ID when a new session was created. You will" + " not be adequately protected against session-fixation attacks"); } @@ -124,7 +124,7 @@ abstract class AbstractSessionFixationProtectionStrategy * @param auth the token for the newly authenticated principal */ protected void onSessionChange(String originalSessionId, HttpSession newSession, Authentication auth) { - applicationEventPublisher + this.applicationEventPublisher .publishEvent(new SessionFixationProtectionEvent(auth, originalSessionId, newSession.getId())); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategy.java index 936ff6efcc..0d3e89315c 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategy.java +++ b/web/src/main/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategy.java @@ -93,7 +93,8 @@ public class ConcurrentSessionControlAuthenticationStrategy public void onAuthentication(Authentication authentication, HttpServletRequest request, HttpServletResponse response) { - final List sessions = sessionRegistry.getAllSessions(authentication.getPrincipal(), false); + final List sessions = this.sessionRegistry.getAllSessions(authentication.getPrincipal(), + false); int sessionCount = sessions.size(); int allowedSessions = getMaximumSessionsForThisUser(authentication); @@ -124,7 +125,7 @@ public class ConcurrentSessionControlAuthenticationStrategy // exceeding the allowed number } - allowableSessionsExceeded(sessions, allowedSessions, sessionRegistry); + allowableSessionsExceeded(sessions, allowedSessions, this.sessionRegistry); } /** @@ -135,7 +136,7 @@ public class ConcurrentSessionControlAuthenticationStrategy * @return either -1 meaning unlimited, or a positive integer to limit (never zero) */ protected int getMaximumSessionsForThisUser(Authentication authentication) { - return maximumSessions; + return this.maximumSessions; } /** @@ -149,9 +150,9 @@ public class ConcurrentSessionControlAuthenticationStrategy */ protected void allowableSessionsExceeded(List sessions, int allowableSessions, SessionRegistry registry) throws SessionAuthenticationException { - if (exceptionIfMaximumExceeded || (sessions == null)) { + if (this.exceptionIfMaximumExceeded || (sessions == null)) { throw new SessionAuthenticationException( - messages.getMessage("ConcurrentSessionControlAuthenticationStrategy.exceededAllowed", + this.messages.getMessage("ConcurrentSessionControlAuthenticationStrategy.exceededAllowed", new Object[] { allowableSessions }, "Maximum sessions of {0} for this principal exceeded")); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java index 1f72780e57..0f23d62ee5 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java +++ b/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java @@ -62,7 +62,7 @@ public class RegisterSessionAuthenticationStrategy implements SessionAuthenticat */ public void onAuthentication(Authentication authentication, HttpServletRequest request, HttpServletResponse response) { - sessionRegistry.registerNewSession(request.getSession().getId(), authentication.getPrincipal()); + this.sessionRegistry.registerNewSession(request.getSession().getId(), authentication.getPrincipal()); } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java index bb211a1094..cd761c28fe 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java +++ b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java @@ -82,9 +82,9 @@ public class SessionFixationProtectionStrategy extends AbstractSessionFixationPr final HttpSession applySessionFixation(HttpServletRequest request) { HttpSession session = request.getSession(); String originalSessionId = session.getId(); - if (logger.isDebugEnabled()) { - logger.debug("Invalidating session with Id '" + originalSessionId + "' " - + (migrateSessionAttributes ? "and" : "without") + " migrating attributes."); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Invalidating session with Id '" + originalSessionId + "' " + + (this.migrateSessionAttributes ? "and" : "without") + " migrating attributes."); } Map attributesToMigrate = extractAttributes(session); @@ -93,12 +93,12 @@ public class SessionFixationProtectionStrategy extends AbstractSessionFixationPr session.invalidate(); session = request.getSession(true); // we now have a new session - if (logger.isDebugEnabled()) { - logger.debug("Started new session: " + session.getId()); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Started new session: " + session.getId()); } transferAttributes(attributesToMigrate, session); - if (migrateSessionAttributes) { + if (this.migrateSessionAttributes) { session.setMaxInactiveInterval(maxInactiveIntervalToMigrate); } return session; @@ -125,7 +125,7 @@ public class SessionFixationProtectionStrategy extends AbstractSessionFixationPr while (enumer.hasMoreElements()) { String key = (String) enumer.nextElement(); - if (!migrateSessionAttributes && !key.startsWith("SPRING_SECURITY_")) { + if (!this.migrateSessionAttributes && !key.startsWith("SPRING_SECURITY_")) { // Only retain Spring Security attributes continue; } diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java index 4f6d760a7b..70ba6108bb 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java @@ -40,7 +40,7 @@ public class AuthenticationSwitchUserEvent extends AbstractAuthenticationEvent { } public UserDetails getTargetUser() { - return targetUser; + return this.targetUser; } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java index 90f262a262..5764b1ca3b 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java @@ -51,12 +51,12 @@ public final class SwitchUserGrantedAuthority implements GrantedAuthority { * @return The original Authentication object of the switched user. */ public Authentication getSource() { - return source; + return this.source; } @Override public String getAuthority() { - return role; + return this.role; } @Override @@ -82,7 +82,7 @@ public final class SwitchUserGrantedAuthority implements GrantedAuthority { @Override public String toString() { - return "Switch User Authority [" + role + "," + source + "]"; + return "Switch User Authority [" + this.role + "," + this.source + "]"; } } diff --git a/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java index 3babb5b8f9..c7378269a3 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java @@ -111,21 +111,22 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean { this.logoutSuccessUrl = DEFAULT_LOGIN_PAGE_URL + "?logout"; this.failureUrl = DEFAULT_LOGIN_PAGE_URL + "?" + ERROR_PARAMETER_NAME; if (authFilter != null) { - formLoginEnabled = true; - usernameParameter = authFilter.getUsernameParameter(); - passwordParameter = authFilter.getPasswordParameter(); + this.formLoginEnabled = true; + this.usernameParameter = authFilter.getUsernameParameter(); + this.passwordParameter = authFilter.getPasswordParameter(); if (authFilter.getRememberMeServices() instanceof AbstractRememberMeServices) { - rememberMeParameter = ((AbstractRememberMeServices) authFilter.getRememberMeServices()).getParameter(); + this.rememberMeParameter = ((AbstractRememberMeServices) authFilter.getRememberMeServices()) + .getParameter(); } } if (openIDFilter != null) { - openIdEnabled = true; - openIDusernameParameter = "openid_identifier"; + this.openIdEnabled = true; + this.openIDusernameParameter = "openid_identifier"; if (openIDFilter.getRememberMeServices() instanceof AbstractRememberMeServices) { - openIDrememberMeParameter = ((AbstractRememberMeServices) openIDFilter.getRememberMeServices()) + this.openIDrememberMeParameter = ((AbstractRememberMeServices) openIDFilter.getRememberMeServices()) .getParameter(); } } @@ -143,7 +144,7 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean { } public boolean isEnabled() { - return formLoginEnabled || openIdEnabled || oauth2LoginEnabled || this.saml2LoginEnabled; + return this.formLoginEnabled || this.openIdEnabled || this.oauth2LoginEnabled || this.saml2LoginEnabled; } public void setLogoutSuccessUrl(String logoutSuccessUrl) { @@ -151,7 +152,7 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean { } public String getLoginPageUrl() { - return loginPageUrl; + return this.loginPageUrl; } public void setLoginPageUrl(String loginPageUrl) { @@ -270,7 +271,7 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean { + " \n"); } - if (openIdEnabled) { + if (this.openIdEnabled) { sb.append("
\n" + " \n" @@ -283,12 +284,12 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean { + "
\n"); } - if (oauth2LoginEnabled) { + if (this.oauth2LoginEnabled) { sb.append(""); sb.append(createError(loginError, errorMsg)); sb.append(createLogoutSuccess(logoutSuccess)); sb.append("\n"); - for (Map.Entry clientAuthenticationUrlToClientName : oauth2AuthenticationUrlToClientName + for (Map.Entry clientAuthenticationUrlToClientName : this.oauth2AuthenticationUrlToClientName .entrySet()) { sb.append("
"); String url = clientAuthenticationUrlToClientName.getKey(); @@ -306,7 +307,8 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean { sb.append(createError(loginError, errorMsg)); sb.append(createLogoutSuccess(logoutSuccess)); sb.append("\n"); - for (Map.Entry relyingPartyUrlToName : saml2AuthenticationUrlToProviderName.entrySet()) { + for (Map.Entry relyingPartyUrlToName : this.saml2AuthenticationUrlToProviderName + .entrySet()) { sb.append("
"); String url = relyingPartyUrlToName.getKey(); sb.append(""); @@ -340,15 +342,15 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean { } private boolean isLogoutSuccess(HttpServletRequest request) { - return logoutSuccessUrl != null && matches(request, logoutSuccessUrl); + return this.logoutSuccessUrl != null && matches(request, this.logoutSuccessUrl); } private boolean isLoginUrlRequest(HttpServletRequest request) { - return matches(request, loginPageUrl); + return matches(request, this.loginPageUrl); } private boolean isErrorPage(HttpServletRequest request) { - return matches(request, failureUrl); + return matches(request, this.failureUrl); } private static String createError(boolean isError, String message) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java index f044ec6725..b602b65fe9 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java @@ -45,17 +45,17 @@ public class BasicAuthenticationEntryPoint implements AuthenticationEntryPoint, private String realmName; public void afterPropertiesSet() { - Assert.hasText(realmName, "realmName must be specified"); + Assert.hasText(this.realmName, "realmName must be specified"); } public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException { - response.addHeader("WWW-Authenticate", "Basic realm=\"" + realmName + "\""); + response.addHeader("WWW-Authenticate", "Basic realm=\"" + this.realmName + "\""); response.sendError(HttpStatus.UNAUTHORIZED.value(), HttpStatus.UNAUTHORIZED.getReasonPhrase()); } public String getRealmName() { - return realmName; + return this.realmName; } public void setRealmName(String realmName) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java index 4d39673623..620179bebe 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java @@ -143,7 +143,7 @@ public class BasicAuthenticationFilter extends OncePerRequestFilter { throws IOException, ServletException { final boolean debug = this.logger.isDebugEnabled(); try { - UsernamePasswordAuthenticationToken authRequest = authenticationConverter.convert(request); + UsernamePasswordAuthenticationToken authRequest = this.authenticationConverter.convert(request); if (authRequest == null) { chain.doFilter(request, response); return; @@ -254,7 +254,7 @@ public class BasicAuthenticationFilter extends OncePerRequestFilter { public void setAuthenticationDetailsSource( AuthenticationDetailsSource authenticationDetailsSource) { - authenticationConverter.setAuthenticationDetailsSource(authenticationDetailsSource); + this.authenticationConverter.setAuthenticationDetailsSource(authenticationDetailsSource); } public void setRememberMeServices(RememberMeServices rememberMeServices) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java index 6284faf187..7a464b2d2d 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java @@ -58,7 +58,7 @@ public class DigestAuthenticationEntryPoint implements AuthenticationEntryPoint, private int order = Integer.MAX_VALUE; // ~ default public int getOrder() { - return order; + return this.order; } public void setOrder(int order) { @@ -66,11 +66,11 @@ public class DigestAuthenticationEntryPoint implements AuthenticationEntryPoint, } public void afterPropertiesSet() { - if ((realmName == null) || "".equals(realmName)) { + if ((this.realmName == null) || "".equals(this.realmName)) { throw new IllegalArgumentException("realmName must be specified"); } - if ((key == null) || "".equals(key)) { + if ((this.key == null) || "".equals(this.key)) { throw new IllegalArgumentException("key must be specified"); } } @@ -82,16 +82,16 @@ public class DigestAuthenticationEntryPoint implements AuthenticationEntryPoint, // compute a nonce (do not use remote IP address due to proxy farms) // format of nonce is: // base64(expirationTime + ":" + md5Hex(expirationTime + ":" + key)) - long expiryTime = System.currentTimeMillis() + (nonceValiditySeconds * 1000); - String signatureValue = DigestAuthUtils.md5Hex(expiryTime + ":" + key); + long expiryTime = System.currentTimeMillis() + (this.nonceValiditySeconds * 1000); + String signatureValue = DigestAuthUtils.md5Hex(expiryTime + ":" + this.key); String nonceValue = expiryTime + ":" + signatureValue; String nonceValueBase64 = new String(Base64.getEncoder().encode(nonceValue.getBytes())); // qop is quality of protection, as defined by RFC 2617. // we do not use opaque due to IE violation of RFC 2617 in not // representing opaque on subsequent requests in same session. - String authenticateHeader = "Digest realm=\"" + realmName + "\", " + "qop=\"auth\", nonce=\"" + nonceValueBase64 - + "\""; + String authenticateHeader = "Digest realm=\"" + this.realmName + "\", " + "qop=\"auth\", nonce=\"" + + nonceValueBase64 + "\""; if (authException instanceof NonceExpiredException) { authenticateHeader = authenticateHeader + ", stale=\"true\""; @@ -106,15 +106,15 @@ public class DigestAuthenticationEntryPoint implements AuthenticationEntryPoint, } public String getKey() { - return key; + return this.key; } public int getNonceValiditySeconds() { - return nonceValiditySeconds; + return this.nonceValiditySeconds; } public String getRealmName() { - return realmName; + return this.realmName; } public void setKey(String key) { diff --git a/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java b/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java index 95bde72c8c..a0cbdbc50f 100644 --- a/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java +++ b/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java @@ -39,7 +39,7 @@ public final class HttpRequestResponseHolder { } public HttpServletRequest getRequest() { - return request; + return this.request; } public void setRequest(HttpServletRequest request) { @@ -47,7 +47,7 @@ public final class HttpRequestResponseHolder { } public HttpServletResponse getResponse() { - return response; + return this.response; } public void setResponse(HttpServletResponse response) { diff --git a/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java index 090cd33774..0d4d0729c8 100644 --- a/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java +++ b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java @@ -117,8 +117,8 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo SecurityContext context = readSecurityContextFromSession(httpSession); if (context == null) { - if (logger.isDebugEnabled()) { - logger.debug("No SecurityContext was available from the HttpSession: " + httpSession + ". " + if (this.logger.isDebugEnabled()) { + this.logger.debug("No SecurityContext was available from the HttpSession: " + httpSession + ". " + "A new one will be created."); } context = generateNewContext(); @@ -157,18 +157,18 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo return false; } - return session.getAttribute(springSecurityContextKey) != null; + return session.getAttribute(this.springSecurityContextKey) != null; } /** * @param httpSession the session obtained from the request. */ private SecurityContext readSecurityContextFromSession(HttpSession httpSession) { - final boolean debug = logger.isDebugEnabled(); + final boolean debug = this.logger.isDebugEnabled(); if (httpSession == null) { if (debug) { - logger.debug("No HttpSession currently exists"); + this.logger.debug("No HttpSession currently exists"); } return null; @@ -176,11 +176,11 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo // Session exists, so try to obtain a context from it. - Object contextFromSession = httpSession.getAttribute(springSecurityContextKey); + Object contextFromSession = httpSession.getAttribute(this.springSecurityContextKey); if (contextFromSession == null) { if (debug) { - logger.debug("HttpSession returned null object for SPRING_SECURITY_CONTEXT"); + this.logger.debug("HttpSession returned null object for SPRING_SECURITY_CONTEXT"); } return null; @@ -188,8 +188,8 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo // We now have the security context object from the session. if (!(contextFromSession instanceof SecurityContext)) { - if (logger.isWarnEnabled()) { - logger.warn(springSecurityContextKey + " did not contain a SecurityContext but contained: '" + if (this.logger.isWarnEnabled()) { + this.logger.warn(this.springSecurityContextKey + " did not contain a SecurityContext but contained: '" + contextFromSession + "'; are you improperly modifying the HttpSession directly " + "(you should always use SecurityContextHolder) or using the HttpSession attribute " + "reserved for this class?"); @@ -199,7 +199,7 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo } if (debug) { - logger.debug("Obtained a valid SecurityContext from " + springSecurityContextKey + ": '" + this.logger.debug("Obtained a valid SecurityContext from " + this.springSecurityContextKey + ": '" + contextFromSession + "'"); } @@ -264,14 +264,14 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo @Override public AsyncContext startAsync() { - response.disableSaveOnResponseCommitted(); + this.response.disableSaveOnResponseCommitted(); return super.startAsync(); } @Override public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException { - response.disableSaveOnResponseCommitted(); + this.response.disableSaveOnResponseCommitted(); return super.startAsync(servletRequest, servletResponse); } @@ -308,7 +308,7 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo */ SaveToSessionResponseWrapper(HttpServletResponse response, HttpServletRequest request, boolean httpSessionExistedAtStartOfRequest, SecurityContext context) { - super(response, disableUrlRewriting); + super(response, HttpSessionSecurityContextRepository.this.disableUrlRewriting); this.request = request; this.httpSessionExistedAtStartOfRequest = httpSessionExistedAtStartOfRequest; this.contextBeforeExecution = context; @@ -329,19 +329,20 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo @Override protected void saveContext(SecurityContext context) { final Authentication authentication = context.getAuthentication(); - HttpSession httpSession = request.getSession(false); + HttpSession httpSession = this.request.getSession(false); // See SEC-776 - if (authentication == null || trustResolver.isAnonymous(authentication)) { - if (logger.isDebugEnabled()) { - logger.debug( + if (authentication == null + || HttpSessionSecurityContextRepository.this.trustResolver.isAnonymous(authentication)) { + if (HttpSessionSecurityContextRepository.this.logger.isDebugEnabled()) { + HttpSessionSecurityContextRepository.this.logger.debug( "SecurityContext is empty or contents are anonymous - context will not be stored in HttpSession."); } - if (httpSession != null && authBeforeExecution != null) { + if (httpSession != null && this.authBeforeExecution != null) { // SEC-1587 A non-anonymous context may still be in the session // SEC-1735 remove if the contextBeforeExecution was not anonymous - httpSession.removeAttribute(springSecurityContextKey); + httpSession.removeAttribute(HttpSessionSecurityContextRepository.this.springSecurityContextKey); } return; } @@ -355,18 +356,21 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo if (httpSession != null) { // We may have a new session, so check also whether the context attribute // is set SEC-1561 - if (contextChanged(context) || httpSession.getAttribute(springSecurityContextKey) == null) { - httpSession.setAttribute(springSecurityContextKey, context); + if (contextChanged(context) || httpSession + .getAttribute(HttpSessionSecurityContextRepository.this.springSecurityContextKey) == null) { + httpSession.setAttribute(HttpSessionSecurityContextRepository.this.springSecurityContextKey, + context); - if (logger.isDebugEnabled()) { - logger.debug("SecurityContext '" + context + "' stored to HttpSession: '" + httpSession); + if (HttpSessionSecurityContextRepository.this.logger.isDebugEnabled()) { + HttpSessionSecurityContextRepository.this.logger + .debug("SecurityContext '" + context + "' stored to HttpSession: '" + httpSession); } } } } private boolean contextChanged(SecurityContext context) { - return context != contextBeforeExecution || context.getAuthentication() != authBeforeExecution; + return context != this.contextBeforeExecution || context.getAuthentication() != this.authBeforeExecution; } private HttpSession createNewSessionIfAllowed(SecurityContext context) { @@ -374,18 +378,19 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo return null; } - if (httpSessionExistedAtStartOfRequest) { - if (logger.isDebugEnabled()) { - logger.debug("HttpSession is now null, but was not null at start of request; " - + "session was invalidated, so do not create a new session"); + if (this.httpSessionExistedAtStartOfRequest) { + if (HttpSessionSecurityContextRepository.this.logger.isDebugEnabled()) { + HttpSessionSecurityContextRepository.this.logger + .debug("HttpSession is now null, but was not null at start of request; " + + "session was invalidated, so do not create a new session"); } return null; } - if (!allowSessionCreation) { - if (logger.isDebugEnabled()) { - logger.debug("The HttpSession is currently null, and the " + if (!HttpSessionSecurityContextRepository.this.allowSessionCreation) { + if (HttpSessionSecurityContextRepository.this.logger.isDebugEnabled()) { + HttpSessionSecurityContextRepository.this.logger.debug("The HttpSession is currently null, and the " + HttpSessionSecurityContextRepository.class.getSimpleName() + " is prohibited from creating an HttpSession " + "(because the allowSessionCreation property is false) - SecurityContext thus not " @@ -396,9 +401,9 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo } // Generate a HttpSession only if we need to - if (contextObject.equals(context)) { - if (logger.isDebugEnabled()) { - logger.debug( + if (HttpSessionSecurityContextRepository.this.contextObject.equals(context)) { + if (HttpSessionSecurityContextRepository.this.logger.isDebugEnabled()) { + HttpSessionSecurityContextRepository.this.logger.debug( "HttpSession is null, but SecurityContext has not changed from default empty context: ' " + context + "'; not creating HttpSession or storing SecurityContext"); } @@ -406,18 +411,20 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo return null; } - if (logger.isDebugEnabled()) { - logger.debug("HttpSession being created as SecurityContext is non-default"); + if (HttpSessionSecurityContextRepository.this.logger.isDebugEnabled()) { + HttpSessionSecurityContextRepository.this.logger + .debug("HttpSession being created as SecurityContext is non-default"); } try { - return request.getSession(true); + return this.request.getSession(true); } catch (IllegalStateException e) { // Response must already be committed, therefore can't create a new // session - logger.warn("Failed to create a session, as response has been committed. Unable to store" - + " SecurityContext."); + HttpSessionSecurityContextRepository.this.logger + .warn("Failed to create a session, as response has been committed. Unable to store" + + " SecurityContext."); } return null; diff --git a/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java index cce3d0fbc5..b74b7a1e19 100644 --- a/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java +++ b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java @@ -83,20 +83,20 @@ public class SecurityContextPersistenceFilter extends GenericFilterBean { return; } - final boolean debug = logger.isDebugEnabled(); + final boolean debug = this.logger.isDebugEnabled(); request.setAttribute(FILTER_APPLIED, Boolean.TRUE); - if (forceEagerSessionCreation) { + if (this.forceEagerSessionCreation) { HttpSession session = request.getSession(); if (debug && session.isNew()) { - logger.debug("Eagerly created session: " + session.getId()); + this.logger.debug("Eagerly created session: " + session.getId()); } } HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); - SecurityContext contextBeforeChainExecution = repo.loadContext(holder); + SecurityContext contextBeforeChainExecution = this.repo.loadContext(holder); try { SecurityContextHolder.setContext(contextBeforeChainExecution); @@ -109,11 +109,11 @@ public class SecurityContextPersistenceFilter extends GenericFilterBean { // Crucial removal of SecurityContextHolder contents - do this before anything // else. SecurityContextHolder.clearContext(); - repo.saveContext(contextAfterChainExecution, holder.getRequest(), holder.getResponse()); + this.repo.saveContext(contextAfterChainExecution, holder.getRequest(), holder.getResponse()); request.removeAttribute(FILTER_APPLIED); if (debug) { - logger.debug("SecurityContextHolder now cleared, as request processing completed"); + this.logger.debug("SecurityContextHolder now cleared, as request processing completed"); } } } diff --git a/web/src/main/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptor.java b/web/src/main/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptor.java index 0eebfdcfa0..9f9a2fda46 100644 --- a/web/src/main/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptor.java +++ b/web/src/main/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptor.java @@ -66,14 +66,14 @@ public final class SecurityContextCallableProcessingInterceptor extends Callable @Override public void beforeConcurrentHandling(NativeWebRequest request, Callable task) { - if (securityContext == null) { + if (this.securityContext == null) { setSecurityContext(SecurityContextHolder.getContext()); } } @Override public void preProcess(NativeWebRequest request, Callable task) { - SecurityContextHolder.setContext(securityContext); + SecurityContextHolder.setContext(this.securityContext); } @Override diff --git a/web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java b/web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java index a5a6f69c61..b885ea265a 100644 --- a/web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java +++ b/web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java @@ -69,11 +69,11 @@ public final class CookieCsrfTokenRepository implements CsrfTokenRepository { public void saveToken(CsrfToken token, HttpServletRequest request, HttpServletResponse response) { String tokenValue = token == null ? "" : token.getToken(); Cookie cookie = new Cookie(this.cookieName, tokenValue); - if (secure == null) { + if (this.secure == null) { cookie.setSecure(request.isSecure()); } else { - cookie.setSecure(secure); + cookie.setSecure(this.secure); } if (this.cookiePath != null && !this.cookiePath.isEmpty()) { @@ -88,7 +88,7 @@ public final class CookieCsrfTokenRepository implements CsrfTokenRepository { else { cookie.setMaxAge(-1); } - cookie.setHttpOnly(cookieHttpOnly); + cookie.setHttpOnly(this.cookieHttpOnly); if (this.cookieDomain != null && !this.cookieDomain.isEmpty()) { cookie.setDomain(this.cookieDomain); } diff --git a/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java b/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java index 232ddcb480..4ed1cab388 100644 --- a/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java +++ b/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java @@ -67,8 +67,8 @@ public final class DebugFilter implements Filter { HttpServletResponse response = (HttpServletResponse) srvltResponse; List filters = getFilters(request); - logger.info("Request received for " + request.getMethod() + " '" + UrlUtils.buildRequestUrl(request) + "':\n\n" - + request + "\n\n" + "servletPath:" + request.getServletPath() + "\n" + "pathInfo:" + this.logger.info("Request received for " + request.getMethod() + " '" + UrlUtils.buildRequestUrl(request) + + "':\n\n" + request + "\n\n" + "servletPath:" + request.getServletPath() + "\n" + "pathInfo:" + request.getPathInfo() + "\n" + "headers: \n" + formatHeaders(request) + "\n\n" + formatFilters(filters)); @@ -76,7 +76,7 @@ public final class DebugFilter implements Filter { invokeWithWrappedRequest(request, response, filterChain); } else { - fcp.doFilter(request, response, filterChain); + this.fcp.doFilter(request, response, filterChain); } } @@ -85,7 +85,7 @@ public final class DebugFilter implements Filter { request.setAttribute(ALREADY_FILTERED_ATTR_NAME, Boolean.TRUE); request = new DebugRequestWrapper(request); try { - fcp.doFilter(request, response, filterChain); + this.fcp.doFilter(request, response, filterChain); } finally { request.removeAttribute(ALREADY_FILTERED_ATTR_NAME); @@ -132,7 +132,7 @@ public final class DebugFilter implements Filter { } private List getFilters(HttpServletRequest request) { - for (SecurityFilterChain chain : fcp.getFilterChains()) { + for (SecurityFilterChain chain : this.fcp.getFilterChains()) { if (chain.matches(request)) { return chain.getFilters(); } diff --git a/web/src/main/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandler.java b/web/src/main/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandler.java index 8d8ed2b353..4a0bf2f5c8 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandler.java +++ b/web/src/main/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandler.java @@ -40,7 +40,7 @@ public class HttpStatusRequestRejectedHandler implements RequestRejectedHandler * Constructs an instance which uses {@code 400} as response code. */ public HttpStatusRequestRejectedHandler() { - httpError = HttpServletResponse.SC_BAD_REQUEST; + this.httpError = HttpServletResponse.SC_BAD_REQUEST; } /** @@ -58,7 +58,7 @@ public class HttpStatusRequestRejectedHandler implements RequestRejectedHandler logger.debug("Rejecting request due to: " + requestRejectedException.getMessage(), requestRejectedException); } - response.sendError(httpError); + response.sendError(this.httpError); } } diff --git a/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java b/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java index 76184ff16d..44f623ffe8 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java +++ b/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java @@ -53,12 +53,12 @@ final class RequestWrapper extends FirewalledRequest { RequestWrapper(HttpServletRequest request) { super(request); - strippedServletPath = strip(request.getServletPath()); + this.strippedServletPath = strip(request.getServletPath()); String pathInfo = strip(request.getPathInfo()); if (pathInfo != null && pathInfo.length() == 0) { pathInfo = null; } - strippedPathInfo = pathInfo; + this.strippedPathInfo = pathInfo; } /** @@ -112,12 +112,12 @@ final class RequestWrapper extends FirewalledRequest { @Override public String getPathInfo() { - return stripPaths ? strippedPathInfo : super.getPathInfo(); + return this.stripPaths ? this.strippedPathInfo : super.getPathInfo(); } @Override public String getServletPath() { - return stripPaths ? strippedServletPath : super.getServletPath(); + return this.stripPaths ? this.strippedServletPath : super.getServletPath(); } @Override @@ -158,7 +158,7 @@ final class RequestWrapper extends FirewalledRequest { } private RequestDispatcher getDelegateDispatcher() { - return RequestWrapper.super.getRequestDispatcher(path); + return RequestWrapper.super.getRequestDispatcher(this.path); } } diff --git a/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java b/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java index ea1e1aac89..4b63eb9b43 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java +++ b/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java @@ -460,7 +460,7 @@ public class StrictHttpFirewall implements HttpFirewall { return new FirewalledRequest(request) { @Override public long getDateHeader(String name) { - if (!allowedHeaderNames.test(name)) { + if (!StrictHttpFirewall.this.allowedHeaderNames.test(name)) { throw new RequestRejectedException( "The request was rejected because the header name \"" + name + "\" is not allowed."); } @@ -469,7 +469,7 @@ public class StrictHttpFirewall implements HttpFirewall { @Override public int getIntHeader(String name) { - if (!allowedHeaderNames.test(name)) { + if (!StrictHttpFirewall.this.allowedHeaderNames.test(name)) { throw new RequestRejectedException( "The request was rejected because the header name \"" + name + "\" is not allowed."); } @@ -478,12 +478,12 @@ public class StrictHttpFirewall implements HttpFirewall { @Override public String getHeader(String name) { - if (!allowedHeaderNames.test(name)) { + if (!StrictHttpFirewall.this.allowedHeaderNames.test(name)) { throw new RequestRejectedException( "The request was rejected because the header name \"" + name + "\" is not allowed."); } String value = super.getHeader(name); - if (value != null && !allowedHeaderValues.test(value)) { + if (value != null && !StrictHttpFirewall.this.allowedHeaderValues.test(value)) { throw new RequestRejectedException( "The request was rejected because the header value \"" + value + "\" is not allowed."); } @@ -492,7 +492,7 @@ public class StrictHttpFirewall implements HttpFirewall { @Override public Enumeration getHeaders(String name) { - if (!allowedHeaderNames.test(name)) { + if (!StrictHttpFirewall.this.allowedHeaderNames.test(name)) { throw new RequestRejectedException( "The request was rejected because the header name \"" + name + "\" is not allowed."); } @@ -507,7 +507,7 @@ public class StrictHttpFirewall implements HttpFirewall { @Override public String nextElement() { String value = valuesEnumeration.nextElement(); - if (!allowedHeaderValues.test(value)) { + if (!StrictHttpFirewall.this.allowedHeaderValues.test(value)) { throw new RequestRejectedException("The request was rejected because the header value \"" + value + "\" is not allowed."); } @@ -528,7 +528,7 @@ public class StrictHttpFirewall implements HttpFirewall { @Override public String nextElement() { String name = namesEnumeration.nextElement(); - if (!allowedHeaderNames.test(name)) { + if (!StrictHttpFirewall.this.allowedHeaderNames.test(name)) { throw new RequestRejectedException("The request was rejected because the header name \"" + name + "\" is not allowed."); } @@ -539,12 +539,12 @@ public class StrictHttpFirewall implements HttpFirewall { @Override public String getParameter(String name) { - if (!allowedParameterNames.test(name)) { + if (!StrictHttpFirewall.this.allowedParameterNames.test(name)) { throw new RequestRejectedException( "The request was rejected because the parameter name \"" + name + "\" is not allowed."); } String value = super.getParameter(name); - if (value != null && !allowedParameterValues.test(value)) { + if (value != null && !StrictHttpFirewall.this.allowedParameterValues.test(value)) { throw new RequestRejectedException( "The request was rejected because the parameter value \"" + value + "\" is not allowed."); } @@ -557,12 +557,12 @@ public class StrictHttpFirewall implements HttpFirewall { for (Map.Entry entry : parameterMap.entrySet()) { String name = entry.getKey(); String[] values = entry.getValue(); - if (!allowedParameterNames.test(name)) { + if (!StrictHttpFirewall.this.allowedParameterNames.test(name)) { throw new RequestRejectedException( "The request was rejected because the parameter name \"" + name + "\" is not allowed."); } for (String value : values) { - if (!allowedParameterValues.test(value)) { + if (!StrictHttpFirewall.this.allowedParameterValues.test(value)) { throw new RequestRejectedException("The request was rejected because the parameter value \"" + value + "\" is not allowed."); } @@ -583,7 +583,7 @@ public class StrictHttpFirewall implements HttpFirewall { @Override public String nextElement() { String name = namesEnumeration.nextElement(); - if (!allowedParameterNames.test(name)) { + if (!StrictHttpFirewall.this.allowedParameterNames.test(name)) { throw new RequestRejectedException("The request was rejected because the parameter name \"" + name + "\" is not allowed."); } @@ -594,14 +594,14 @@ public class StrictHttpFirewall implements HttpFirewall { @Override public String[] getParameterValues(String name) { - if (!allowedParameterNames.test(name)) { + if (!StrictHttpFirewall.this.allowedParameterNames.test(name)) { throw new RequestRejectedException( "The request was rejected because the parameter name \"" + name + "\" is not allowed."); } String[] values = super.getParameterValues(name); if (values != null) { for (String value : values) { - if (!allowedParameterValues.test(value)) { + if (!StrictHttpFirewall.this.allowedParameterValues.test(value)) { throw new RequestRejectedException("The request was rejected because the parameter value \"" + value + "\" is not allowed."); } diff --git a/web/src/main/java/org/springframework/security/web/header/Header.java b/web/src/main/java/org/springframework/security/web/header/Header.java index 69658fdac0..8902a190cc 100644 --- a/web/src/main/java/org/springframework/security/web/header/Header.java +++ b/web/src/main/java/org/springframework/security/web/header/Header.java @@ -79,12 +79,12 @@ public final class Header { @Override public int hashCode() { - return headerName.hashCode() + headerValues.hashCode(); + return this.headerName.hashCode() + this.headerValues.hashCode(); } @Override public String toString() { - return "Header [name: " + headerName + ", values: " + headerValues + "]"; + return "Header [name: " + this.headerName + ", values: " + this.headerValues + "]"; } } diff --git a/web/src/main/java/org/springframework/security/web/header/writers/ClearSiteDataHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/ClearSiteDataHeaderWriter.java index e761f41299..82ff0f3ecc 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/ClearSiteDataHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/ClearSiteDataHeaderWriter.java @@ -76,8 +76,8 @@ public final class ClearSiteDataHeaderWriter implements HeaderWriter { response.setHeader(CLEAR_SITE_DATA_HEADER, this.headerValue); } } - else if (logger.isDebugEnabled()) { - logger.debug("Not injecting Clear-Site-Data header since it did not match the " + "requestMatcher " + else if (this.logger.isDebugEnabled()) { + this.logger.debug("Not injecting Clear-Site-Data header since it did not match the " + "requestMatcher " + this.requestMatcher); } } diff --git a/web/src/main/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriter.java index 4ba5ff81c6..79c29ad4a8 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriter.java @@ -116,9 +116,10 @@ public final class ContentSecurityPolicyHeaderWriter implements HeaderWriter { */ @Override public void writeHeaders(HttpServletRequest request, HttpServletResponse response) { - String headerName = !reportOnly ? CONTENT_SECURITY_POLICY_HEADER : CONTENT_SECURITY_POLICY_REPORT_ONLY_HEADER; + String headerName = !this.reportOnly ? CONTENT_SECURITY_POLICY_HEADER + : CONTENT_SECURITY_POLICY_REPORT_ONLY_HEADER; if (!response.containsHeader(headerName)) { - response.setHeader(headerName, policyDirectives); + response.setHeader(headerName, this.policyDirectives); } } @@ -143,7 +144,8 @@ public final class ContentSecurityPolicyHeaderWriter implements HeaderWriter { @Override public String toString() { - return getClass().getName() + " [policyDirectives=" + policyDirectives + "; reportOnly=" + reportOnly + "]"; + return getClass().getName() + " [policyDirectives=" + this.policyDirectives + "; reportOnly=" + this.reportOnly + + "]"; } } diff --git a/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java index cb848e4838..120bc46ea5 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java @@ -178,19 +178,19 @@ public final class HpkpHeaderWriter implements HeaderWriter { * .servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ public void writeHeaders(HttpServletRequest request, HttpServletResponse response) { - if (requestMatcher.matches(request)) { - if (!pins.isEmpty()) { - String headerName = reportOnly ? HPKP_RO_HEADER_NAME : HPKP_HEADER_NAME; + if (this.requestMatcher.matches(request)) { + if (!this.pins.isEmpty()) { + String headerName = this.reportOnly ? HPKP_RO_HEADER_NAME : HPKP_HEADER_NAME; if (!response.containsHeader(headerName)) { - response.setHeader(headerName, hpkpHeaderValue); + response.setHeader(headerName, this.hpkpHeaderValue); } } - if (logger.isDebugEnabled()) { - logger.debug("Not injecting HPKP header since there aren't any pins"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Not injecting HPKP header since there aren't any pins"); } } - else if (logger.isDebugEnabled()) { - logger.debug("Not injecting HPKP header since it wasn't a secure connection"); + else if (this.logger.isDebugEnabled()) { + this.logger.debug("Not injecting HPKP header since it wasn't a secure connection"); } } @@ -426,14 +426,14 @@ public final class HpkpHeaderWriter implements HeaderWriter { } private void updateHpkpHeaderValue() { - String headerValue = "max-age=" + maxAgeInSeconds; - for (Map.Entry pin : pins.entrySet()) { + String headerValue = "max-age=" + this.maxAgeInSeconds; + for (Map.Entry pin : this.pins.entrySet()) { headerValue += " ; pin-" + pin.getValue() + "=\"" + pin.getKey() + "\""; } - if (reportUri != null) { - headerValue += " ; report-uri=\"" + reportUri.toString() + "\""; + if (this.reportUri != null) { + headerValue += " ; report-uri=\"" + this.reportUri.toString() + "\""; } - if (includeSubDomains) { + if (this.includeSubDomains) { headerValue += " ; includeSubDomains"; } this.hpkpHeaderValue = headerValue; diff --git a/web/src/main/java/org/springframework/security/web/header/writers/StaticHeadersWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/StaticHeadersWriter.java index 5358d6e154..5aa05bcad2 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/StaticHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/StaticHeadersWriter.java @@ -56,7 +56,7 @@ public class StaticHeadersWriter implements HeaderWriter { } public void writeHeaders(HttpServletRequest request, HttpServletResponse response) { - for (Header header : headers) { + for (Header header : this.headers) { if (!response.containsHeader(header.getName())) { for (String value : header.getValues()) { response.addHeader(header.getName(), value); @@ -67,7 +67,7 @@ public class StaticHeadersWriter implements HeaderWriter { @Override public String toString() { - return getClass().getName() + " [headers=" + headers + "]"; + return getClass().getName() + " [headers=" + this.headers + "]"; } } diff --git a/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java index fe255ae402..832d2dac88 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java @@ -50,7 +50,7 @@ public final class XXssProtectionHeaderWriter implements HeaderWriter { public void writeHeaders(HttpServletRequest request, HttpServletResponse response) { if (!response.containsHeader(XSS_PROTECTION_HEADER)) { - response.setHeader(XSS_PROTECTION_HEADER, headerValue); + response.setHeader(XSS_PROTECTION_HEADER, this.headerValue); } } @@ -90,7 +90,7 @@ public final class XXssProtectionHeaderWriter implements HeaderWriter { * @param block the new value */ public void setBlock(boolean block) { - if (!enabled && block) { + if (!this.enabled && block) { throw new IllegalArgumentException("Cannot set block to true with enabled false"); } this.block = block; @@ -98,19 +98,19 @@ public final class XXssProtectionHeaderWriter implements HeaderWriter { } private void updateHeaderValue() { - if (!enabled) { + if (!this.enabled) { this.headerValue = "0"; return; } this.headerValue = "1"; - if (block) { + if (this.block) { this.headerValue += "; mode=block"; } } @Override public String toString() { - return getClass().getName() + " [headerValue=" + headerValue + "]"; + return getClass().getName() + " [headerValue=" + this.headerValue + "]"; } } diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java index 521606956d..d1468e7c27 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java @@ -46,9 +46,9 @@ abstract class AbstractRequestParameterAllowFromStrategy implements AllowFromStr protected final Log log = LogFactory.getLog(getClass()); public String getAllowFromValue(HttpServletRequest request) { - String allowFromOrigin = request.getParameter(allowFromParameterName); - if (log.isDebugEnabled()) { - log.debug("Supplied origin '" + allowFromOrigin + "'"); + String allowFromOrigin = request.getParameter(this.allowFromParameterName); + if (this.log.isDebugEnabled()) { + this.log.debug("Supplied origin '" + allowFromOrigin + "'"); } if (StringUtils.hasText(allowFromOrigin) && allowed(allowFromOrigin)) { return allowFromOrigin; diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java index f3c95e8a0a..3a6d98d1ed 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java @@ -48,7 +48,7 @@ public final class RegExpAllowFromStrategy extends AbstractRequestParameterAllow @Override protected boolean allowed(String allowFromOrigin) { - return pattern.matcher(allowFromOrigin).matches(); + return this.pattern.matcher(allowFromOrigin).matches(); } } diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategy.java index 12c45e6e18..fdaffe60ce 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategy.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategy.java @@ -37,7 +37,7 @@ public final class StaticAllowFromStrategy implements AllowFromStrategy { } public String getAllowFromValue(HttpServletRequest request) { - return uri.toString(); + return this.uri.toString(); } } diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategy.java index bc96798f3b..a778f67bfa 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategy.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategy.java @@ -45,7 +45,7 @@ public final class WhiteListedAllowFromStrategy extends AbstractRequestParameter @Override protected boolean allowed(String allowFromOrigin) { - return allowed.contains(allowFromOrigin); + return this.allowed.contains(allowFromOrigin); } } diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java index a44e864a31..13361add5c 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java @@ -84,7 +84,7 @@ public final class XFrameOptionsHeaderWriter implements HeaderWriter { * @param response the servlet response */ public void writeHeaders(HttpServletRequest request, HttpServletResponse response) { - if (XFrameOptionsMode.ALLOW_FROM.equals(frameOptionsMode)) { + if (XFrameOptionsMode.ALLOW_FROM.equals(this.frameOptionsMode)) { String allowFromValue = this.allowFromStrategy.getAllowFromValue(request); if (XFrameOptionsMode.DENY.getMode().equals(allowFromValue)) { if (!response.containsHeader(XFRAME_OPTIONS_HEADER)) { @@ -99,7 +99,7 @@ public final class XFrameOptionsHeaderWriter implements HeaderWriter { } } else { - response.setHeader(XFRAME_OPTIONS_HEADER, frameOptionsMode.getMode()); + response.setHeader(XFRAME_OPTIONS_HEADER, this.frameOptionsMode.getMode()); } } @@ -133,7 +133,7 @@ public final class XFrameOptionsHeaderWriter implements HeaderWriter { * @return the mode for the X-Frame-Options header value. */ private String getMode() { - return mode; + return this.mode; } } diff --git a/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java index 99ca04eba8..d288ff7157 100644 --- a/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java +++ b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java @@ -72,16 +72,16 @@ public class JaasApiIntegrationFilter extends GenericFilterBean { throws ServletException, IOException { Subject subject = obtainSubject(request); - if (subject == null && createEmptySubject) { - if (logger.isDebugEnabled()) { - logger.debug( + if (subject == null && this.createEmptySubject) { + if (this.logger.isDebugEnabled()) { + this.logger.debug( "Subject returned was null and createEmtpySubject is true; creating new empty subject to run as."); } subject = new Subject(); } if (subject == null) { - if (logger.isDebugEnabled()) { - logger.debug("Subject is null continue running with no Subject."); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Subject is null continue running with no Subject."); } chain.doFilter(request, response); return; @@ -91,8 +91,8 @@ public class JaasApiIntegrationFilter extends GenericFilterBean { return null; }; - if (logger.isDebugEnabled()) { - logger.debug("Running as Subject " + subject); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Running as Subject " + subject); } try { Subject.doAs(subject, continueChain); @@ -119,8 +119,8 @@ public class JaasApiIntegrationFilter extends GenericFilterBean { */ protected Subject obtainSubject(ServletRequest request) { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (logger.isDebugEnabled()) { - logger.debug("Attempting to obtainSubject using authentication : " + authentication); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Attempting to obtainSubject using authentication : " + authentication); } if (authentication == null) { return null; diff --git a/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java b/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java index 9453af199c..84b4b5f4a9 100644 --- a/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java +++ b/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java @@ -124,7 +124,7 @@ public final class AuthenticationPrincipalArgumentResolver implements HandlerMet StandardEvaluationContext context = new StandardEvaluationContext(); context.setRootObject(principal); context.setVariable("this", principal); - context.setBeanResolver(beanResolver); + context.setBeanResolver(this.beanResolver); Expression expression = this.parser.parseExpression(expressionToParse); principal = expression.getValue(context); diff --git a/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolver.java b/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolver.java index 323050980a..5764e0b33c 100644 --- a/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolver.java +++ b/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolver.java @@ -86,7 +86,7 @@ public class AuthenticationPrincipalArgumentResolver extends HandlerMethodArgume StandardEvaluationContext context = new StandardEvaluationContext(); context.setRootObject(principal); context.setVariable("this", principal); - context.setBeanResolver(beanResolver); + context.setBeanResolver(this.beanResolver); Expression expression = this.parser.parseExpression(expressionToParse); principal = expression.getValue(context); diff --git a/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolver.java b/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolver.java index 5757eb7c46..5a0c490d0e 100644 --- a/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolver.java +++ b/web/src/main/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolver.java @@ -109,7 +109,7 @@ public class CurrentSecurityContextArgumentResolver extends HandlerMethodArgumen StandardEvaluationContext context = new StandardEvaluationContext(); context.setRootObject(securityContext); context.setVariable("this", securityContext); - context.setBeanResolver(beanResolver); + context.setBeanResolver(this.beanResolver); Expression expression = this.parser.parseExpression(expressionToParse); securityContextResult = expression.getValue(context); diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/CookieRequestCache.java b/web/src/main/java/org/springframework/security/web/savedrequest/CookieRequestCache.java index 0c827dae38..a848804bdb 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/CookieRequestCache.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/CookieRequestCache.java @@ -54,7 +54,7 @@ public class CookieRequestCache implements RequestCache { @Override public void saveRequest(HttpServletRequest request, HttpServletResponse response) { - if (requestMatcher.matches(request)) { + if (this.requestMatcher.matches(request)) { String redirectUrl = UrlUtils.buildFullRequestUrl(request); Cookie savedCookie = new Cookie(COOKIE_NAME, encodeCookie(redirectUrl)); savedCookie.setMaxAge(COOKIE_MAX_AGE); @@ -65,7 +65,7 @@ public class CookieRequestCache implements RequestCache { response.addCookie(savedCookie); } else { - logger.debug("Request not saved as configured RequestMatcher did not match"); + this.logger.debug("Request not saved as configured RequestMatcher did not match"); } } diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java index a1db061978..7dfb04223d 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java @@ -166,11 +166,11 @@ public class DefaultSavedRequest implements SavedRequest { } private void addCookie(Cookie cookie) { - cookies.add(new SavedCookie(cookie)); + this.cookies.add(new SavedCookie(cookie)); } private void addHeader(String name, String value) { - List values = headers.computeIfAbsent(name, k -> new ArrayList<>()); + List values = this.headers.computeIfAbsent(name, k -> new ArrayList<>()); values.add(value); } @@ -186,7 +186,7 @@ public class DefaultSavedRequest implements SavedRequest { } private void addLocale(Locale locale) { - locales.add(locale); + this.locales.add(locale); } /** @@ -209,7 +209,7 @@ public class DefaultSavedRequest implements SavedRequest { } private void addParameter(String name, String[] values) { - parameters.put(name, values); + this.parameters.put(name, values); } /** @@ -234,7 +234,7 @@ public class DefaultSavedRequest implements SavedRequest { return false; } - if (!"GET".equals(request.getMethod()) && "GET".equals(method)) { + if (!"GET".equals(request.getMethod()) && "GET".equals(this.method)) { // A save GET should not match an incoming non-GET method return false; } @@ -264,14 +264,14 @@ public class DefaultSavedRequest implements SavedRequest { } public String getContextPath() { - return contextPath; + return this.contextPath; } @Override public List getCookies() { - List cookieList = new ArrayList<>(cookies.size()); + List cookieList = new ArrayList<>(this.cookies.size()); - for (SavedCookie savedCookie : cookies) { + for (SavedCookie savedCookie : this.cookies) { cookieList.add(savedCookie.getCookie()); } @@ -284,17 +284,18 @@ public class DefaultSavedRequest implements SavedRequest { */ @Override public String getRedirectUrl() { - return UrlUtils.buildFullRequestUrl(scheme, serverName, serverPort, requestURI, queryString); + return UrlUtils.buildFullRequestUrl(this.scheme, this.serverName, this.serverPort, this.requestURI, + this.queryString); } @Override public Collection getHeaderNames() { - return headers.keySet(); + return this.headers.keySet(); } @Override public List getHeaderValues(String name) { - List values = headers.get(name); + List values = this.headers.get(name); if (values == null) { return Collections.emptyList(); @@ -305,30 +306,30 @@ public class DefaultSavedRequest implements SavedRequest { @Override public List getLocales() { - return locales; + return this.locales; } @Override public String getMethod() { - return method; + return this.method; } @Override public Map getParameterMap() { - return parameters; + return this.parameters; } public Collection getParameterNames() { - return parameters.keySet(); + return this.parameters.keySet(); } @Override public String[] getParameterValues(String name) { - return parameters.get(name); + return this.parameters.get(name); } public String getPathInfo() { - return pathInfo; + return this.pathInfo; } public String getQueryString() { @@ -340,23 +341,23 @@ public class DefaultSavedRequest implements SavedRequest { } public String getRequestURL() { - return requestURL; + return this.requestURL; } public String getScheme() { - return scheme; + return this.scheme; } public String getServerName() { - return serverName; + return this.serverName; } public int getServerPort() { - return serverPort; + return this.serverPort; } public String getServletPath() { - return servletPath; + return this.servletPath; } private boolean propertyEquals(String log, Object arg1, Object arg2) { diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java b/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java index 75cd7566fd..5692f643a3 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java @@ -116,7 +116,7 @@ public class Enumerator implements Enumeration { * one more element to provide, false otherwise */ public boolean hasMoreElements() { - return (iterator.hasNext()); + return (this.iterator.hasNext()); } /** @@ -126,7 +126,7 @@ public class Enumerator implements Enumeration { * @exception NoSuchElementException if no more elements exist */ public T nextElement() throws NoSuchElementException { - return (iterator.next()); + return (this.iterator.next()); } } diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/HttpSessionRequestCache.java b/web/src/main/java/org/springframework/security/web/savedrequest/HttpSessionRequestCache.java index 63e415bcba..4704e2fe0f 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/HttpSessionRequestCache.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/HttpSessionRequestCache.java @@ -55,19 +55,19 @@ public class HttpSessionRequestCache implements RequestCache { * Stores the current request, provided the configuration properties allow it. */ public void saveRequest(HttpServletRequest request, HttpServletResponse response) { - if (requestMatcher.matches(request)) { - DefaultSavedRequest savedRequest = new DefaultSavedRequest(request, portResolver); + if (this.requestMatcher.matches(request)) { + DefaultSavedRequest savedRequest = new DefaultSavedRequest(request, this.portResolver); - if (createSessionAllowed || request.getSession(false) != null) { + if (this.createSessionAllowed || request.getSession(false) != null) { // Store the HTTP request itself. Used by // AbstractAuthenticationProcessingFilter // for redirection after successful authentication (SEC-29) request.getSession().setAttribute(this.sessionAttrName, savedRequest); - logger.debug("DefaultSavedRequest added to Session: " + savedRequest); + this.logger.debug("DefaultSavedRequest added to Session: " + savedRequest); } } else { - logger.debug("Request not saved as configured RequestMatcher did not match"); + this.logger.debug("Request not saved as configured RequestMatcher did not match"); } } @@ -85,7 +85,7 @@ public class HttpSessionRequestCache implements RequestCache { HttpSession session = currentRequest.getSession(false); if (session != null) { - logger.debug("Removing DefaultSavedRequest from session if present"); + this.logger.debug("Removing DefaultSavedRequest from session if present"); session.removeAttribute(this.sessionAttrName); } } @@ -94,7 +94,7 @@ public class HttpSessionRequestCache implements RequestCache { SavedRequest saved = getRequest(request, response); if (!matchesSavedRequest(request, saved)) { - logger.debug("saved request doesn't match"); + this.logger.debug("saved request doesn't match"); return null; } diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilter.java b/web/src/main/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilter.java index 72f9793fec..7aa57e956c 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilter.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilter.java @@ -57,7 +57,7 @@ public class RequestCacheAwareFilter extends GenericFilterBean { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - HttpServletRequest wrappedSavedRequest = requestCache.getMatchingRequest((HttpServletRequest) request, + HttpServletRequest wrappedSavedRequest = this.requestCache.getMatchingRequest((HttpServletRequest) request, (HttpServletResponse) response); chain.doFilter(wrappedSavedRequest == null ? request : wrappedSavedRequest, response); diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java index 922bf169ec..8db916cbfc 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java @@ -60,35 +60,35 @@ public class SavedCookie implements Serializable { } public String getName() { - return name; + return this.name; } public String getValue() { - return value; + return this.value; } public String getComment() { - return comment; + return this.comment; } public String getDomain() { - return domain; + return this.domain; } public int getMaxAge() { - return maxAge; + return this.maxAge; } public String getPath() { - return path; + return this.path; } public boolean isSecure() { - return secure; + return this.secure; } public int getVersion() { - return version; + return this.version; } public Cookie getCookie() { diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java index a8852f59cf..adee0172e6 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java @@ -72,15 +72,15 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { SavedRequestAwareWrapper(SavedRequest saved, HttpServletRequest request) { super(request); - savedRequest = saved; + this.savedRequest = saved; - formats[0] = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); - formats[1] = new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US); - formats[2] = new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US); + this.formats[0] = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); + this.formats[1] = new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US); + this.formats[2] = new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US); - formats[0].setTimeZone(GMT_ZONE); - formats[1].setTimeZone(GMT_ZONE); - formats[2].setTimeZone(GMT_ZONE); + this.formats[0].setTimeZone(GMT_ZONE); + this.formats[1].setTimeZone(GMT_ZONE); + this.formats[2].setTimeZone(GMT_ZONE); } @Override @@ -92,7 +92,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { } // Attempt to convert the date header in a variety of formats - long result = FastHttpDateFormat.parseDate(value, formats); + long result = FastHttpDateFormat.parseDate(value, this.formats); if (result != -1L) { return result; @@ -103,7 +103,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { @Override public String getHeader(String name) { - List values = savedRequest.getHeaderValues(name); + List values = this.savedRequest.getHeaderValues(name); return values.isEmpty() ? null : values.get(0); } @@ -111,13 +111,13 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { @Override @SuppressWarnings("unchecked") public Enumeration getHeaderNames() { - return new Enumerator<>(savedRequest.getHeaderNames()); + return new Enumerator<>(this.savedRequest.getHeaderNames()); } @Override @SuppressWarnings("unchecked") public Enumeration getHeaders(String name) { - return new Enumerator<>(savedRequest.getHeaderValues(name)); + return new Enumerator<>(this.savedRequest.getHeaderValues(name)); } @Override @@ -134,7 +134,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { @Override public Locale getLocale() { - List locales = savedRequest.getLocales(); + List locales = this.savedRequest.getLocales(); return locales.isEmpty() ? Locale.getDefault() : locales.get(0); } @@ -142,7 +142,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { @Override @SuppressWarnings("unchecked") public Enumeration getLocales() { - List locales = savedRequest.getLocales(); + List locales = this.savedRequest.getLocales(); if (locales.isEmpty()) { // Fall back to default locale @@ -155,7 +155,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { @Override public String getMethod() { - return savedRequest.getMethod(); + return this.savedRequest.getMethod(); } /** @@ -176,7 +176,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { return value; } - String[] values = savedRequest.getParameterValues(name); + String[] values = this.savedRequest.getParameterValues(name); if (values == null || values.length == 0) { return null; @@ -202,7 +202,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { private Set getCombinedParameterNames() { Set names = new HashSet<>(); names.addAll(super.getParameterMap().keySet()); - names.addAll(savedRequest.getParameterMap().keySet()); + names.addAll(this.savedRequest.getParameterMap().keySet()); return names; } @@ -215,7 +215,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { @Override public String[] getParameterValues(String name) { - String[] savedRequestParams = savedRequest.getParameterValues(name); + String[] savedRequestParams = this.savedRequest.getParameterValues(name); String[] wrappedRequestParams = super.getParameterValues(name); if (savedRequestParams == null) { diff --git a/web/src/main/java/org/springframework/security/web/server/DelegatingServerAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/server/DelegatingServerAuthenticationEntryPoint.java index 40c2f3d177..460c875a28 100644 --- a/web/src/main/java/org/springframework/security/web/server/DelegatingServerAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/server/DelegatingServerAuthenticationEntryPoint.java @@ -66,7 +66,7 @@ public class DelegatingServerAuthenticationEntryPoint implements ServerAuthentic } }).switchIfEmpty(Mono.just(this.defaultEntryPoint).doOnNext(it -> { if (logger.isDebugEnabled()) { - logger.debug("No match found. Using default entry point " + defaultEntryPoint); + logger.debug("No match found. Using default entry point " + this.defaultEntryPoint); } })).flatMap(entryPoint -> entryPoint.commence(exchange, e)); } diff --git a/web/src/main/java/org/springframework/security/web/server/MatcherSecurityWebFilterChain.java b/web/src/main/java/org/springframework/security/web/server/MatcherSecurityWebFilterChain.java index bd9be5d2dd..081e0c865e 100644 --- a/web/src/main/java/org/springframework/security/web/server/MatcherSecurityWebFilterChain.java +++ b/web/src/main/java/org/springframework/security/web/server/MatcherSecurityWebFilterChain.java @@ -48,7 +48,7 @@ public class MatcherSecurityWebFilterChain implements SecurityWebFilterChain { @Override public Mono matches(ServerWebExchange exchange) { - return matcher.matches(exchange).map(m -> m.isMatch()); + return this.matcher.matches(exchange).map(m -> m.isMatch()); } @Override diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/AnonymousAuthenticationWebFilter.java b/web/src/main/java/org/springframework/security/web/server/authentication/AnonymousAuthenticationWebFilter.java index 04aa38c961..efc927d835 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/AnonymousAuthenticationWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/AnonymousAuthenticationWebFilter.java @@ -95,7 +95,8 @@ public class AnonymousAuthenticationWebFilter implements WebFilter { } protected Authentication createAuthentication(ServerWebExchange exchange) { - AnonymousAuthenticationToken auth = new AnonymousAuthenticationToken(key, principal, authorities); + AnonymousAuthenticationToken auth = new AnonymousAuthenticationToken(this.key, this.principal, + this.authorities); return auth; } diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManager.java b/web/src/main/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManager.java index 85e2a3deb1..27512861b2 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManager.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManager.java @@ -58,9 +58,9 @@ public class ReactivePreAuthenticatedAuthenticationManager implements ReactiveAu @Override public Mono authenticate(Authentication authentication) { return Mono.just(authentication).filter(this::supports).map(Authentication::getName) - .flatMap(userDetailsService::findByUsername) + .flatMap(this.userDetailsService::findByUsername) .switchIfEmpty(Mono.error(() -> new UsernameNotFoundException("User not found"))) - .doOnNext(userDetailsChecker::check).map(ud -> { + .doOnNext(this.userDetailsChecker::check).map(ud -> { PreAuthenticatedAuthenticationToken result = new PreAuthenticatedAuthenticationToken(ud, authentication.getCredentials(), ud.getAuthorities()); result.setDetails(authentication.getDetails()); diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/ServerX509AuthenticationConverter.java b/web/src/main/java/org/springframework/security/web/server/authentication/ServerX509AuthenticationConverter.java index 5d2f51a285..f7b9caae19 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/ServerX509AuthenticationConverter.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/ServerX509AuthenticationConverter.java @@ -50,16 +50,16 @@ public class ServerX509AuthenticationConverter implements ServerAuthenticationCo public Mono convert(ServerWebExchange exchange) { SslInfo sslInfo = exchange.getRequest().getSslInfo(); if (sslInfo == null) { - if (logger.isDebugEnabled()) { - logger.debug("No SslInfo provided with a request, skipping x509 authentication"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No SslInfo provided with a request, skipping x509 authentication"); } return Mono.empty(); } if (sslInfo.getPeerCertificates() == null || sslInfo.getPeerCertificates().length == 0) { - if (logger.isDebugEnabled()) { - logger.debug("No peer certificates found in SslInfo, skipping x509 authentication"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No peer certificates found in SslInfo, skipping x509 authentication"); } return Mono.empty(); diff --git a/web/src/main/java/org/springframework/security/web/server/authentication/SwitchUserWebFilter.java b/web/src/main/java/org/springframework/security/web/server/authentication/SwitchUserWebFilter.java index e4e45b9e4f..82455c1699 100644 --- a/web/src/main/java/org/springframework/security/web/server/authentication/SwitchUserWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/authentication/SwitchUserWebFilter.java @@ -181,7 +181,7 @@ public class SwitchUserWebFilter implements WebFilter { * found by username */ protected Mono switchUser(WebFilterExchange webFilterExchange) { - return switchUserMatcher.matches(webFilterExchange.getExchange()) + return this.switchUserMatcher.matches(webFilterExchange.getExchange()) .filter(ServerWebExchangeMatcher.MatchResult::isMatch) .flatMap(matchResult -> ReactiveSecurityContextHolder.getContext()) .map(SecurityContext::getAuthentication).flatMap(currentAuthentication -> { @@ -200,7 +200,7 @@ public class SwitchUserWebFilter implements WebFilter { * switched. */ protected Mono exitSwitchUser(WebFilterExchange webFilterExchange) { - return exitUserMatcher.matches(webFilterExchange.getExchange()) + return this.exitUserMatcher.matches(webFilterExchange.getExchange()) .filter(ServerWebExchangeMatcher.MatchResult::isMatch) .flatMap(matchResult -> ReactiveSecurityContextHolder.getContext() .map(SecurityContext::getAuthentication) @@ -225,8 +225,9 @@ public class SwitchUserWebFilter implements WebFilter { this.logger.debug("Attempt to switch to user [" + userName + "]"); } - return userDetailsService.findByUsername(userName) - .switchIfEmpty(Mono.error(this::noTargetAuthenticationException)).doOnNext(userDetailsChecker::check) + return this.userDetailsService.findByUsername(userName) + .switchIfEmpty(Mono.error(this::noTargetAuthenticationException)) + .doOnNext(this.userDetailsChecker::check) .map(userDetails -> createSwitchUserToken(userDetails, currentAuthentication)); } @@ -245,14 +246,14 @@ public class SwitchUserWebFilter implements WebFilter { private Mono onAuthenticationSuccess(Authentication authentication, WebFilterExchange webFilterExchange) { final ServerWebExchange exchange = webFilterExchange.getExchange(); final SecurityContextImpl securityContext = new SecurityContextImpl(authentication); - return securityContextRepository.save(exchange, securityContext) + return this.securityContextRepository.save(exchange, securityContext) .then(this.successHandler.onAuthenticationSuccess(webFilterExchange, authentication)) .subscriberContext(ReactiveSecurityContextHolder.withSecurityContext(Mono.just(securityContext))); } private Mono onAuthenticationFailure(AuthenticationException exception, WebFilterExchange webFilterExchange) { - return Mono.justOrEmpty(failureHandler).switchIfEmpty(Mono.defer(() -> { - logger.error("Switch User failed", exception); + return Mono.justOrEmpty(this.failureHandler).switchIfEmpty(Mono.defer(() -> { + this.logger.error("Switch User failed", exception); return Mono.error(exception); })).flatMap(failureHandler -> failureHandler.onAuthenticationFailure(webFilterExchange, exception)); } @@ -262,7 +263,7 @@ public class SwitchUserWebFilter implements WebFilter { if (sourceAuthentication.isPresent()) { // SEC-1763. Check first if we are already switched. - logger.info("Found original switch user granted authority [" + sourceAuthentication.get() + "]"); + this.logger.info("Found original switch user granted authority [" + sourceAuthentication.get() + "]"); currentAuthentication = sourceAuthentication.get(); } diff --git a/web/src/main/java/org/springframework/security/web/server/authorization/AuthorizationContext.java b/web/src/main/java/org/springframework/security/web/server/authorization/AuthorizationContext.java index 2f8bd8dfc6..9d8125dcd2 100644 --- a/web/src/main/java/org/springframework/security/web/server/authorization/AuthorizationContext.java +++ b/web/src/main/java/org/springframework/security/web/server/authorization/AuthorizationContext.java @@ -41,11 +41,11 @@ public class AuthorizationContext { } public ServerWebExchange getExchange() { - return exchange; + return this.exchange; } public Map getVariables() { - return Collections.unmodifiableMap(variables); + return Collections.unmodifiableMap(this.variables); } } diff --git a/web/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java b/web/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java index 63b542ed52..1579308e9b 100644 --- a/web/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java +++ b/web/src/main/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManager.java @@ -48,7 +48,7 @@ public final class DelegatingReactiveAuthorizationManager implements ReactiveAut @Override public Mono check(Mono authentication, ServerWebExchange exchange) { - return Flux.fromIterable(mappings).concatMap(mapping -> mapping.getMatcher().matches(exchange) + return Flux.fromIterable(this.mappings).concatMap(mapping -> mapping.getMatcher().matches(exchange) .filter(MatchResult::isMatch).map(MatchResult::getVariables).flatMap(variables -> { if (logger.isDebugEnabled()) { logger.debug( @@ -77,7 +77,7 @@ public final class DelegatingReactiveAuthorizationManager implements ReactiveAut } public DelegatingReactiveAuthorizationManager build() { - return new DelegatingReactiveAuthorizationManager(mappings); + return new DelegatingReactiveAuthorizationManager(this.mappings); } } diff --git a/web/src/main/java/org/springframework/security/web/server/header/HttpHeaderWriterWebFilter.java b/web/src/main/java/org/springframework/security/web/server/header/HttpHeaderWriterWebFilter.java index d147bc74eb..ab02ac1b09 100644 --- a/web/src/main/java/org/springframework/security/web/server/header/HttpHeaderWriterWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/header/HttpHeaderWriterWebFilter.java @@ -39,7 +39,7 @@ public class HttpHeaderWriterWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { - exchange.getResponse().beforeCommit(() -> writer.writeHttpHeaders(exchange)); + exchange.getResponse().beforeCommit(() -> this.writer.writeHttpHeaders(exchange)); return chain.filter(exchange); } diff --git a/web/src/main/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriter.java b/web/src/main/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriter.java index 42d0596d7f..dabfeab63e 100644 --- a/web/src/main/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriter.java @@ -65,12 +65,12 @@ public class StaticServerHttpHeadersWriter implements ServerHttpHeadersWriter { private HttpHeaders headers = new HttpHeaders(); public Builder header(String headerName, String... values) { - headers.put(headerName, Arrays.asList(values)); + this.headers.put(headerName, Arrays.asList(values)); return this; } public StaticServerHttpHeadersWriter build() { - return new StaticServerHttpHeadersWriter(headers); + return new StaticServerHttpHeadersWriter(this.headers); } } diff --git a/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java b/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java index f81989f94c..b1deb3c465 100644 --- a/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java @@ -58,7 +58,7 @@ public final class StrictTransportSecurityServerHttpHeadersWriter implements Ser */ @Override public Mono writeHttpHeaders(ServerWebExchange exchange) { - return isSecure(exchange) ? delegate.writeHttpHeaders(exchange) : Mono.empty(); + return isSecure(exchange) ? this.delegate.writeHttpHeaders(exchange) : Mono.empty(); } /** @@ -66,7 +66,7 @@ public final class StrictTransportSecurityServerHttpHeadersWriter implements Ser * @param includeSubDomains if subdomains should be included */ public void setIncludeSubDomains(boolean includeSubDomains) { - subdomain = includeSubDomains ? " ; includeSubDomains" : ""; + this.subdomain = includeSubDomains ? " ; includeSubDomains" : ""; updateDelegate(); } @@ -98,8 +98,8 @@ public final class StrictTransportSecurityServerHttpHeadersWriter implements Ser } private void updateDelegate() { - delegate = StaticServerHttpHeadersWriter.builder() - .header(STRICT_TRANSPORT_SECURITY, maxAge + subdomain + preload).build(); + this.delegate = StaticServerHttpHeadersWriter.builder() + .header(STRICT_TRANSPORT_SECURITY, this.maxAge + this.subdomain + this.preload).build(); } private boolean isSecure(ServerWebExchange exchange) { diff --git a/web/src/main/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriter.java b/web/src/main/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriter.java index cb5a64c9c8..7dcd2a385a 100644 --- a/web/src/main/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriter.java @@ -39,7 +39,7 @@ public class XFrameOptionsServerHttpHeadersWriter implements ServerHttpHeadersWr */ @Override public Mono writeHttpHeaders(ServerWebExchange exchange) { - return delegate.writeHttpHeaders(exchange); + return this.delegate.writeHttpHeaders(exchange); } /** diff --git a/web/src/main/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java b/web/src/main/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java index 54f9711b71..c3d1fd05f5 100644 --- a/web/src/main/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java @@ -53,7 +53,7 @@ public class XXssProtectionServerHttpHeadersWriter implements ServerHttpHeadersW */ @Override public Mono writeHttpHeaders(ServerWebExchange exchange) { - return delegate.writeHttpHeaders(exchange); + return this.delegate.writeHttpHeaders(exchange); } /** @@ -92,7 +92,7 @@ public class XXssProtectionServerHttpHeadersWriter implements ServerHttpHeadersW * @param block the new value */ public void setBlock(boolean block) { - if (!enabled && block) { + if (!this.enabled && block) { throw new IllegalArgumentException("Cannot set block to true with enabled false"); } this.block = block; @@ -105,10 +105,10 @@ public class XXssProtectionServerHttpHeadersWriter implements ServerHttpHeadersW } private String createHeaderValue() { - if (!enabled) { + if (!this.enabled) { return "0"; } - if (!block) { + if (!this.block) { return "1"; } return "1 ; mode=block"; diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java index 49aa7a94b1..774b5fb569 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java @@ -61,7 +61,7 @@ public class AndServerWebExchangeMatcher implements ServerWebExchangeMatcher { public Mono matches(ServerWebExchange exchange) { return Mono.defer(() -> { Map variables = new HashMap<>(); - return Flux.fromIterable(matchers).doOnNext(it -> { + return Flux.fromIterable(this.matchers).doOnNext(it -> { if (logger.isDebugEnabled()) { logger.debug("Trying to match using " + it); } @@ -78,7 +78,7 @@ public class AndServerWebExchangeMatcher implements ServerWebExchangeMatcher { @Override public String toString() { - return "AndServerWebExchangeMatcher{" + "matchers=" + matchers + '}'; + return "AndServerWebExchangeMatcher{" + "matchers=" + this.matchers + '}'; } } diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java index e5bc6dedf6..5ac9796f6e 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java @@ -49,7 +49,7 @@ public class NegatedServerWebExchangeMatcher implements ServerWebExchangeMatcher */ @Override public Mono matches(ServerWebExchange exchange) { - return matcher.matches(exchange).flatMap(m -> m.isMatch() ? MatchResult.notMatch() : MatchResult.match()) + return this.matcher.matches(exchange).flatMap(m -> m.isMatch() ? MatchResult.notMatch() : MatchResult.match()) .doOnNext(it -> { if (logger.isDebugEnabled()) { logger.debug("matches = " + it.isMatch()); @@ -59,7 +59,7 @@ public class NegatedServerWebExchangeMatcher implements ServerWebExchangeMatcher @Override public String toString() { - return "NegatedServerWebExchangeMatcher{" + "matcher=" + matcher + '}'; + return "NegatedServerWebExchangeMatcher{" + "matcher=" + this.matcher + '}'; } } diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java index d253ea26eb..8675567f9a 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java @@ -57,7 +57,7 @@ public class OrServerWebExchangeMatcher implements ServerWebExchangeMatcher { */ @Override public Mono matches(ServerWebExchange exchange) { - return Flux.fromIterable(matchers).doOnNext(it -> { + return Flux.fromIterable(this.matchers).doOnNext(it -> { if (logger.isDebugEnabled()) { logger.debug("Trying to match using " + it); } @@ -71,7 +71,7 @@ public class OrServerWebExchangeMatcher implements ServerWebExchangeMatcher { @Override public String toString() { - return "OrServerWebExchangeMatcher{" + "matchers=" + matchers + '}'; + return "OrServerWebExchangeMatcher{" + "matchers=" + this.matchers + '}'; } } diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/PathPatternParserServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/PathPatternParserServerWebExchangeMatcher.java index 0b3c8ff476..4fd4f0f1f8 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/PathPatternParserServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/PathPatternParserServerWebExchangeMatcher.java @@ -99,7 +99,8 @@ public final class PathPatternParserServerWebExchangeMatcher implements ServerWe @Override public String toString() { - return "PathMatcherServerWebExchangeMatcher{" + "pattern='" + pattern + '\'' + ", method=" + method + '}'; + return "PathMatcherServerWebExchangeMatcher{" + "pattern='" + this.pattern + '\'' + ", method=" + this.method + + '}'; } } diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcher.java index fa30e9605e..c831ad0c2b 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcher.java @@ -52,7 +52,7 @@ public interface ServerWebExchangeMatcher { } public boolean isMatch() { - return match; + return this.match; } /** @@ -60,7 +60,7 @@ public interface ServerWebExchangeMatcher { * @return */ public Map getVariables() { - return variables; + return this.variables; } /** diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcherEntry.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcherEntry.java index 56accfa5fd..a2a7dd7512 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcherEntry.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatcherEntry.java @@ -34,11 +34,11 @@ public class ServerWebExchangeMatcherEntry { } public ServerWebExchangeMatcher getMatcher() { - return matcher; + return this.matcher; } public T getEntry() { - return entry; + return this.entry; } } diff --git a/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java b/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java index 0782757970..d5784ebf73 100644 --- a/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java +++ b/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java @@ -43,11 +43,11 @@ public final class CsrfRequestDataValueProcessor implements RequestDataValueProc } public String processAction(HttpServletRequest request, String action, String method) { - if (method != null && DISABLE_CSRF_TOKEN_PATTERN.matcher(method).matches()) { - request.setAttribute(DISABLE_CSRF_TOKEN_ATTR, Boolean.TRUE); + if (method != null && this.DISABLE_CSRF_TOKEN_PATTERN.matcher(method).matches()) { + request.setAttribute(this.DISABLE_CSRF_TOKEN_ATTR, Boolean.TRUE); } else { - request.removeAttribute(DISABLE_CSRF_TOKEN_ATTR); + request.removeAttribute(this.DISABLE_CSRF_TOKEN_ATTR); } return action; } @@ -57,8 +57,8 @@ public final class CsrfRequestDataValueProcessor implements RequestDataValueProc } public Map getExtraHiddenFields(HttpServletRequest request) { - if (Boolean.TRUE.equals(request.getAttribute(DISABLE_CSRF_TOKEN_ATTR))) { - request.removeAttribute(DISABLE_CSRF_TOKEN_ATTR); + if (Boolean.TRUE.equals(request.getAttribute(this.DISABLE_CSRF_TOKEN_ATTR))) { + request.removeAttribute(this.DISABLE_CSRF_TOKEN_ATTR); return Collections.emptyMap(); } diff --git a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java index 6fa6aec689..42932190ff 100644 --- a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java +++ b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java @@ -89,7 +89,7 @@ public class SecurityContextHolderAwareRequestWrapper extends HttpServletRequest private Authentication getAuthentication() { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (!trustResolver.isAnonymous(auth)) { + if (!this.trustResolver.isAnonymous(auth)) { return auth; } @@ -136,8 +136,8 @@ public class SecurityContextHolderAwareRequestWrapper extends HttpServletRequest private boolean isGranted(String role) { Authentication auth = getAuthentication(); - if (rolePrefix != null && role != null && !role.startsWith(rolePrefix)) { - role = rolePrefix + role; + if (this.rolePrefix != null && role != null && !role.startsWith(this.rolePrefix)) { + role = this.rolePrefix + role; } if ((auth == null) || (auth.getPrincipal() == null)) { diff --git a/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java b/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java index 3af59ac8ac..585f55288c 100644 --- a/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java +++ b/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java @@ -102,7 +102,7 @@ public class ConcurrentSessionFilter extends GenericFilterBean { HttpServletResponse response = event.getResponse(); SessionInformation info = event.getSessionInformation(); - redirectStrategy.sendRedirect(request, response, determineExpiredUrl(request, info)); + this.redirectStrategy.sendRedirect(request, response, determineExpiredUrl(request, info)); }; } @@ -116,7 +116,7 @@ public class ConcurrentSessionFilter extends GenericFilterBean { @Override public void afterPropertiesSet() { - Assert.notNull(sessionRegistry, "SessionRegistry required"); + Assert.notNull(this.sessionRegistry, "SessionRegistry required"); } public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) @@ -127,13 +127,13 @@ public class ConcurrentSessionFilter extends GenericFilterBean { HttpSession session = request.getSession(false); if (session != null) { - SessionInformation info = sessionRegistry.getSessionInformation(session.getId()); + SessionInformation info = this.sessionRegistry.getSessionInformation(session.getId()); if (info != null) { if (info.isExpired()) { // Expired - abort processing - if (logger.isDebugEnabled()) { - logger.debug("Requested session ID " + request.getRequestedSessionId() + " has expired."); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Requested session ID " + request.getRequestedSessionId() + " has expired."); } doLogout(request, response); @@ -143,7 +143,7 @@ public class ConcurrentSessionFilter extends GenericFilterBean { } else { // Non-expired - update last request date/time - sessionRegistry.refreshLastRequest(info.getSessionId()); + this.sessionRegistry.refreshLastRequest(info.getSessionId()); } } } @@ -162,7 +162,7 @@ public class ConcurrentSessionFilter extends GenericFilterBean { */ @Deprecated protected String determineExpiredUrl(HttpServletRequest request, SessionInformation info) { - return expiredUrl; + return this.expiredUrl; } private void doLogout(HttpServletRequest request, HttpServletResponse response) { diff --git a/web/src/main/java/org/springframework/security/web/session/HttpSessionIdChangedEvent.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionIdChangedEvent.java index 99ca160e16..1d075c8a98 100644 --- a/web/src/main/java/org/springframework/security/web/session/HttpSessionIdChangedEvent.java +++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionIdChangedEvent.java @@ -40,12 +40,12 @@ public class HttpSessionIdChangedEvent extends SessionIdChangedEvent { @Override public String getOldSessionId() { - return oldSessionId; + return this.oldSessionId; } @Override public String getNewSessionId() { - return newSessionId; + return this.newSessionId; } } diff --git a/web/src/main/java/org/springframework/security/web/session/InvalidSessionAccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/session/InvalidSessionAccessDeniedHandler.java index d8c157efd0..8a9a467a8e 100644 --- a/web/src/main/java/org/springframework/security/web/session/InvalidSessionAccessDeniedHandler.java +++ b/web/src/main/java/org/springframework/security/web/session/InvalidSessionAccessDeniedHandler.java @@ -46,7 +46,7 @@ public final class InvalidSessionAccessDeniedHandler implements AccessDeniedHand public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException { - invalidSessionStrategy.onInvalidSessionDetected(request, response); + this.invalidSessionStrategy.onInvalidSessionDetected(request, response); } } \ No newline at end of file diff --git a/web/src/main/java/org/springframework/security/web/session/SessionInformationExpiredEvent.java b/web/src/main/java/org/springframework/security/web/session/SessionInformationExpiredEvent.java index 4d469d2da6..7211a99e2a 100644 --- a/web/src/main/java/org/springframework/security/web/session/SessionInformationExpiredEvent.java +++ b/web/src/main/java/org/springframework/security/web/session/SessionInformationExpiredEvent.java @@ -54,14 +54,14 @@ public final class SessionInformationExpiredEvent extends ApplicationEvent { * @return the request */ public HttpServletRequest getRequest() { - return request; + return this.request; } /** * @return the response */ public HttpServletResponse getResponse() { - return response; + return this.response; } public SessionInformation getSessionInformation() { diff --git a/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java b/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java index 1c9f342b2d..ade6b59d4b 100644 --- a/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java +++ b/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java @@ -85,20 +85,20 @@ public class SessionManagementFilter extends GenericFilterBean { request.setAttribute(FILTER_APPLIED, Boolean.TRUE); - if (!securityContextRepository.containsContext(request)) { + if (!this.securityContextRepository.containsContext(request)) { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication != null && !trustResolver.isAnonymous(authentication)) { + if (authentication != null && !this.trustResolver.isAnonymous(authentication)) { // The user has been authenticated during the current request, so call the // session strategy try { - sessionAuthenticationStrategy.onAuthentication(authentication, request, response); + this.sessionAuthenticationStrategy.onAuthentication(authentication, request, response); } catch (SessionAuthenticationException e) { // The session strategy can reject the authentication - logger.debug("SessionAuthenticationStrategy rejected the authentication object", e); + this.logger.debug("SessionAuthenticationStrategy rejected the authentication object", e); SecurityContextHolder.clearContext(); - failureHandler.onAuthenticationFailure(request, response, e); + this.failureHandler.onAuthenticationFailure(request, response, e); return; } @@ -106,18 +106,18 @@ public class SessionManagementFilter extends GenericFilterBean { // re-entrant // requests which may occur before the current request completes. // SEC-1396. - securityContextRepository.saveContext(SecurityContextHolder.getContext(), request, response); + this.securityContextRepository.saveContext(SecurityContextHolder.getContext(), request, response); } else { // No security context or authentication present. Check for a session // timeout if (request.getRequestedSessionId() != null && !request.isRequestedSessionIdValid()) { - if (logger.isDebugEnabled()) { - logger.debug("Requested session ID " + request.getRequestedSessionId() + " is invalid."); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Requested session ID " + request.getRequestedSessionId() + " is invalid."); } - if (invalidSessionStrategy != null) { - invalidSessionStrategy.onInvalidSessionDetected(request, response); + if (this.invalidSessionStrategy != null) { + this.invalidSessionStrategy.onInvalidSessionDetected(request, response); return; } } diff --git a/web/src/main/java/org/springframework/security/web/session/SimpleRedirectInvalidSessionStrategy.java b/web/src/main/java/org/springframework/security/web/session/SimpleRedirectInvalidSessionStrategy.java index 4de98a70f3..46ef7b6f01 100644 --- a/web/src/main/java/org/springframework/security/web/session/SimpleRedirectInvalidSessionStrategy.java +++ b/web/src/main/java/org/springframework/security/web/session/SimpleRedirectInvalidSessionStrategy.java @@ -50,11 +50,11 @@ public final class SimpleRedirectInvalidSessionStrategy implements InvalidSessio } public void onInvalidSessionDetected(HttpServletRequest request, HttpServletResponse response) throws IOException { - logger.debug("Starting new session (if required) and redirecting to '" + destinationUrl + "'"); - if (createNewSession) { + this.logger.debug("Starting new session (if required) and redirecting to '" + this.destinationUrl + "'"); + if (this.createNewSession) { request.getSession(); } - redirectStrategy.sendRedirect(request, response, destinationUrl); + this.redirectStrategy.sendRedirect(request, response, this.destinationUrl); } /** diff --git a/web/src/main/java/org/springframework/security/web/session/SimpleRedirectSessionInformationExpiredStrategy.java b/web/src/main/java/org/springframework/security/web/session/SimpleRedirectSessionInformationExpiredStrategy.java index f213b74c4e..e83fe3fb08 100644 --- a/web/src/main/java/org/springframework/security/web/session/SimpleRedirectSessionInformationExpiredStrategy.java +++ b/web/src/main/java/org/springframework/security/web/session/SimpleRedirectSessionInformationExpiredStrategy.java @@ -52,8 +52,8 @@ public final class SimpleRedirectSessionInformationExpiredStrategy implements Se } public void onExpiredSessionDetected(SessionInformationExpiredEvent event) throws IOException { - logger.debug("Redirecting to '" + destinationUrl + "'"); - redirectStrategy.sendRedirect(event.getRequest(), event.getResponse(), destinationUrl); + this.logger.debug("Redirecting to '" + this.destinationUrl + "'"); + this.redirectStrategy.sendRedirect(event.getRequest(), event.getResponse(), this.destinationUrl); } } diff --git a/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java b/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java index b9a8f77835..61b2a1e666 100644 --- a/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java +++ b/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java @@ -75,30 +75,30 @@ public class RedirectUrlBuilder { public String getUrl() { StringBuilder sb = new StringBuilder(); - Assert.notNull(scheme, "scheme cannot be null"); - Assert.notNull(serverName, "serverName cannot be null"); + Assert.notNull(this.scheme, "scheme cannot be null"); + Assert.notNull(this.serverName, "serverName cannot be null"); - sb.append(scheme).append("://").append(serverName); + sb.append(this.scheme).append("://").append(this.serverName); // Append the port number if it's not standard for the scheme - if (port != (scheme.equals("http") ? 80 : 443)) { - sb.append(":").append(port); + if (this.port != (this.scheme.equals("http") ? 80 : 443)) { + sb.append(":").append(this.port); } - if (contextPath != null) { - sb.append(contextPath); + if (this.contextPath != null) { + sb.append(this.contextPath); } - if (servletPath != null) { - sb.append(servletPath); + if (this.servletPath != null) { + sb.append(this.servletPath); } - if (pathInfo != null) { - sb.append(pathInfo); + if (this.pathInfo != null) { + sb.append(this.pathInfo); } - if (query != null) { - sb.append("?").append(query); + if (this.query != null) { + sb.append("?").append(this.query); } return sb.toString(); diff --git a/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java index c272f7c576..9b6af8a73e 100755 --- a/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java +++ b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java @@ -175,7 +175,7 @@ public class ThrowableAnalyzer { * @return the cause, may be null if none could be resolved */ private Throwable extractCause(Throwable throwable) { - for (Map.Entry, ThrowableCauseExtractor> entry : extractorMap.entrySet()) { + for (Map.Entry, ThrowableCauseExtractor> entry : this.extractorMap.entrySet()) { Class throwableType = entry.getKey(); if (throwableType.isInstance(throwable)) { ThrowableCauseExtractor extractor = entry.getValue(); diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/AndRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/AndRequestMatcher.java index 01f081e257..3818db6df7 100644 --- a/web/src/main/java/org/springframework/security/web/util/matcher/AndRequestMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/matcher/AndRequestMatcher.java @@ -59,22 +59,22 @@ public final class AndRequestMatcher implements RequestMatcher { } public boolean matches(HttpServletRequest request) { - for (RequestMatcher matcher : requestMatchers) { - if (logger.isDebugEnabled()) { - logger.debug("Trying to match using " + matcher); + for (RequestMatcher matcher : this.requestMatchers) { + if (this.logger.isDebugEnabled()) { + this.logger.debug("Trying to match using " + matcher); } if (!matcher.matches(request)) { - logger.debug("Did not match"); + this.logger.debug("Did not match"); return false; } } - logger.debug("All requestMatchers returned true"); + this.logger.debug("All requestMatchers returned true"); return true; } @Override public String toString() { - return "AndRequestMatcher [requestMatchers=" + requestMatchers + "]"; + return "AndRequestMatcher [requestMatchers=" + this.requestMatchers + "]"; } } \ No newline at end of file diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java index c591028d36..a41ebdf151 100644 --- a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java @@ -45,12 +45,12 @@ public class ELRequestMatcher implements RequestMatcher { public ELRequestMatcher(String el) { SpelExpressionParser parser = new SpelExpressionParser(); - expression = parser.parseExpression(el); + this.expression = parser.parseExpression(el); } public boolean matches(HttpServletRequest request) { EvaluationContext context = createELContext(request); - return expression.getValue(context, Boolean.class); + return this.expression.getValue(context, Boolean.class); } /** diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java index a4e216c6c5..bb429742a5 100644 --- a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java +++ b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java @@ -28,11 +28,11 @@ class ELRequestMatcherContext { } public boolean hasIpAddress(String ipAddress) { - return (new IpAddressMatcher(ipAddress).matches(request)); + return (new IpAddressMatcher(ipAddress).matches(this.request)); } public boolean hasHeader(String headerName, String value) { - String header = request.getHeader(headerName); + String header = this.request.getHeader(headerName); if (!StringUtils.hasText(header)) { return false; } diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java index 52cb321e3d..6ab47a19f7 100644 --- a/web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java @@ -50,14 +50,14 @@ public final class IpAddressMatcher implements RequestMatcher { if (ipAddress.indexOf('/') > 0) { String[] addressAndMask = StringUtils.split(ipAddress, "/"); ipAddress = addressAndMask[0]; - nMaskBits = Integer.parseInt(addressAndMask[1]); + this.nMaskBits = Integer.parseInt(addressAndMask[1]); } else { - nMaskBits = -1; + this.nMaskBits = -1; } - requiredAddress = parseAddress(ipAddress); - Assert.isTrue(requiredAddress.getAddress().length * 8 >= nMaskBits, - String.format("IP address %s is too short for bitmask of length %d", ipAddress, nMaskBits)); + this.requiredAddress = parseAddress(ipAddress); + Assert.isTrue(this.requiredAddress.getAddress().length * 8 >= this.nMaskBits, + String.format("IP address %s is too short for bitmask of length %d", ipAddress, this.nMaskBits)); } public boolean matches(HttpServletRequest request) { @@ -67,19 +67,19 @@ public final class IpAddressMatcher implements RequestMatcher { public boolean matches(String address) { InetAddress remoteAddress = parseAddress(address); - if (!requiredAddress.getClass().equals(remoteAddress.getClass())) { + if (!this.requiredAddress.getClass().equals(remoteAddress.getClass())) { return false; } - if (nMaskBits < 0) { - return remoteAddress.equals(requiredAddress); + if (this.nMaskBits < 0) { + return remoteAddress.equals(this.requiredAddress); } byte[] remAddr = remoteAddress.getAddress(); - byte[] reqAddr = requiredAddress.getAddress(); + byte[] reqAddr = this.requiredAddress.getAddress(); - int nMaskFullBytes = nMaskBits / 8; - byte finalByte = (byte) (0xFF00 >> (nMaskBits & 0x07)); + int nMaskFullBytes = this.nMaskBits / 8; + byte finalByte = (byte) (0xFF00 >> (this.nMaskBits & 0x07)); // System.out.println("Mask is " + new sun.misc.HexDumpEncoder().encode(mask)); diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/NegatedRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/NegatedRequestMatcher.java index 430c652355..1dd2631e41 100644 --- a/web/src/main/java/org/springframework/security/web/util/matcher/NegatedRequestMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/matcher/NegatedRequestMatcher.java @@ -47,16 +47,16 @@ public class NegatedRequestMatcher implements RequestMatcher { } public boolean matches(HttpServletRequest request) { - boolean result = !requestMatcher.matches(request); - if (logger.isDebugEnabled()) { - logger.debug("matches = " + result); + boolean result = !this.requestMatcher.matches(request); + if (this.logger.isDebugEnabled()) { + this.logger.debug("matches = " + result); } return result; } @Override public String toString() { - return "NegatedRequestMatcher [requestMatcher=" + requestMatcher + "]"; + return "NegatedRequestMatcher [requestMatcher=" + this.requestMatcher + "]"; } } \ No newline at end of file diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/OrRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/OrRequestMatcher.java index da03cda07e..4e38d5c600 100644 --- a/web/src/main/java/org/springframework/security/web/util/matcher/OrRequestMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/matcher/OrRequestMatcher.java @@ -59,22 +59,22 @@ public final class OrRequestMatcher implements RequestMatcher { } public boolean matches(HttpServletRequest request) { - for (RequestMatcher matcher : requestMatchers) { - if (logger.isDebugEnabled()) { - logger.debug("Trying to match using " + matcher); + for (RequestMatcher matcher : this.requestMatchers) { + if (this.logger.isDebugEnabled()) { + this.logger.debug("Trying to match using " + matcher); } if (matcher.matches(request)) { - logger.debug("matched"); + this.logger.debug("matched"); return true; } } - logger.debug("No matches found"); + this.logger.debug("No matches found"); return false; } @Override public String toString() { - return "OrRequestMatcher [requestMatchers=" + requestMatchers + "]"; + return "OrRequestMatcher [requestMatchers=" + this.requestMatchers + "]"; } } \ No newline at end of file diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/RegexRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/RegexRequestMatcher.java index 56b4b79d49..b6158d30be 100644 --- a/web/src/main/java/org/springframework/security/web/util/matcher/RegexRequestMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/matcher/RegexRequestMatcher.java @@ -81,7 +81,7 @@ public final class RegexRequestMatcher implements RequestMatcher { * @return true if the pattern matches the URL, false otherwise. */ public boolean matches(HttpServletRequest request) { - if (httpMethod != null && request.getMethod() != null && httpMethod != valueOf(request.getMethod())) { + if (this.httpMethod != null && request.getMethod() != null && this.httpMethod != valueOf(request.getMethod())) { return false; } @@ -103,10 +103,10 @@ public final class RegexRequestMatcher implements RequestMatcher { } if (logger.isDebugEnabled()) { - logger.debug("Checking match of request : '" + url + "'; against '" + pattern + "'"); + logger.debug("Checking match of request : '" + url + "'; against '" + this.pattern + "'"); } - return pattern.matcher(url).matches(); + return this.pattern.matcher(url).matches(); } /** diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcher.java index 274c9e01ba..235e001e1d 100644 --- a/web/src/main/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcher.java @@ -81,18 +81,18 @@ public final class RequestHeaderRequestMatcher implements RequestMatcher { } public boolean matches(HttpServletRequest request) { - String actualHeaderValue = request.getHeader(expectedHeaderName); - if (expectedHeaderValue == null) { + String actualHeaderValue = request.getHeader(this.expectedHeaderName); + if (this.expectedHeaderValue == null) { return actualHeaderValue != null; } - return expectedHeaderValue.equals(actualHeaderValue); + return this.expectedHeaderValue.equals(actualHeaderValue); } @Override public String toString() { - return "RequestHeaderRequestMatcher [expectedHeaderName=" + expectedHeaderName + ", expectedHeaderValue=" - + expectedHeaderValue + "]"; + return "RequestHeaderRequestMatcher [expectedHeaderName=" + this.expectedHeaderName + ", expectedHeaderValue=" + + this.expectedHeaderValue + "]"; } } diff --git a/web/src/test/java/org/springframework/security/MockFilterConfig.java b/web/src/test/java/org/springframework/security/MockFilterConfig.java index a105de9600..f2ac50619f 100644 --- a/web/src/test/java/org/springframework/security/MockFilterConfig.java +++ b/web/src/test/java/org/springframework/security/MockFilterConfig.java @@ -36,7 +36,7 @@ public class MockFilterConfig implements FilterConfig { } public String getInitParameter(String arg0) { - Object result = map.get(arg0); + Object result = this.map.get(arg0); if (result != null) { return (String) result; @@ -55,7 +55,7 @@ public class MockFilterConfig implements FilterConfig { } public void setInitParmeter(String parameter, String value) { - map.put(parameter, value); + this.map.put(parameter, value); } } diff --git a/web/src/test/java/org/springframework/security/MockPortResolver.java b/web/src/test/java/org/springframework/security/MockPortResolver.java index 245de791ec..65be621c9b 100644 --- a/web/src/test/java/org/springframework/security/MockPortResolver.java +++ b/web/src/test/java/org/springframework/security/MockPortResolver.java @@ -38,10 +38,10 @@ public class MockPortResolver implements PortResolver { public int getServerPort(ServletRequest request) { if ((request.getScheme() != null) && request.getScheme().equals("https")) { - return https; + return this.https; } else { - return http; + return this.http; } } diff --git a/web/src/test/java/org/springframework/security/test/web/reactive/server/WebTestHandler.java b/web/src/test/java/org/springframework/security/test/web/reactive/server/WebTestHandler.java index 166e893415..6eb74cd5c4 100644 --- a/web/src/test/java/org/springframework/security/test/web/reactive/server/WebTestHandler.java +++ b/web/src/test/java/org/springframework/security/test/web/reactive/server/WebTestHandler.java @@ -37,7 +37,7 @@ public final class WebTestHandler { private final WebHandler handler; private WebTestHandler(WebFilter... filters) { - this.handler = new FilteringWebHandler(webHandler, Arrays.asList(filters)); + this.handler = new FilteringWebHandler(this.webHandler, Arrays.asList(filters)); } public WebHandlerResult exchange(BaseBuilder baseBuilder) { @@ -46,8 +46,8 @@ public final class WebTestHandler { } public WebHandlerResult exchange(ServerWebExchange exchange) { - handler.handle(exchange).block(); - return new WebHandlerResult(webHandler.exchange); + this.handler.handle(exchange).block(); + return new WebHandlerResult(this.webHandler.exchange); } public static final class WebHandlerResult { @@ -59,7 +59,7 @@ public final class WebTestHandler { } public ServerWebExchange getExchange() { - return exchange; + return this.exchange; } } diff --git a/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java b/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java index 5bf0ccab8c..2c11daeee9 100644 --- a/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java +++ b/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java @@ -71,21 +71,21 @@ public class FilterChainProxyTests { @Before public void setup() throws Exception { - matcher = mock(RequestMatcher.class); - filter = mock(Filter.class); + this.matcher = mock(RequestMatcher.class); + this.filter = mock(Filter.class); doAnswer((Answer) inv -> { Object[] args = inv.getArguments(); FilterChain fc = (FilterChain) args[2]; HttpServletRequestWrapper extraWrapper = new HttpServletRequestWrapper((HttpServletRequest) args[0]); fc.doFilter(extraWrapper, (HttpServletResponse) args[1]); return null; - }).when(filter).doFilter(any(), any(), any()); - fcp = new FilterChainProxy(new DefaultSecurityFilterChain(matcher, Arrays.asList(filter))); - fcp.setFilterChainValidator(mock(FilterChainProxy.FilterChainValidator.class)); - request = new MockHttpServletRequest("GET", ""); - request.setServletPath("/path"); - response = new MockHttpServletResponse(); - chain = mock(FilterChain.class); + }).when(this.filter).doFilter(any(), any(), any()); + this.fcp = new FilterChainProxy(new DefaultSecurityFilterChain(this.matcher, Arrays.asList(this.filter))); + this.fcp.setFilterChainValidator(mock(FilterChainProxy.FilterChainValidator.class)); + this.request = new MockHttpServletRequest("GET", ""); + this.request.setServletPath("/path"); + this.response = new MockHttpServletResponse(); + this.chain = mock(FilterChain.class); } @After @@ -95,58 +95,60 @@ public class FilterChainProxyTests { @Test public void toStringCallSucceeds() { - fcp.afterPropertiesSet(); - fcp.toString(); + this.fcp.afterPropertiesSet(); + this.fcp.toString(); } @Test public void securityFilterChainIsNotInvokedIfMatchFails() throws Exception { - when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false); - fcp.doFilter(request, response, chain); - assertThat(fcp.getFilterChains()).hasSize(1); - assertThat(fcp.getFilterChains().get(0).getFilters().get(0)).isSameAs(filter); + when(this.matcher.matches(any(HttpServletRequest.class))).thenReturn(false); + this.fcp.doFilter(this.request, this.response, this.chain); + assertThat(this.fcp.getFilterChains()).hasSize(1); + assertThat(this.fcp.getFilterChains().get(0).getFilters().get(0)).isSameAs(this.filter); - verifyZeroInteractions(filter); + verifyZeroInteractions(this.filter); // The actual filter chain should be invoked though - verify(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); + verify(this.chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); } @Test public void originalChainIsInvokedAfterSecurityChainIfMatchSucceeds() throws Exception { - when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true); - fcp.doFilter(request, response, chain); + when(this.matcher.matches(any(HttpServletRequest.class))).thenReturn(true); + this.fcp.doFilter(this.request, this.response, this.chain); - verify(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class)); - verify(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); + verify(this.filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), + any(FilterChain.class)); + verify(this.chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); } @Test public void originalFilterChainIsInvokedIfMatchingSecurityChainIsEmpty() throws Exception { List noFilters = Collections.emptyList(); - fcp = new FilterChainProxy(new DefaultSecurityFilterChain(matcher, noFilters)); + this.fcp = new FilterChainProxy(new DefaultSecurityFilterChain(this.matcher, noFilters)); - when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true); - fcp.doFilter(request, response, chain); + when(this.matcher.matches(any(HttpServletRequest.class))).thenReturn(true); + this.fcp.doFilter(this.request, this.response, this.chain); - verify(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); + verify(this.chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); } @Test public void requestIsWrappedForMatchingAndFilteringWhenMatchIsFound() throws Exception { - when(matcher.matches(any())).thenReturn(true); - fcp.doFilter(request, response, chain); - verify(matcher).matches(any(FirewalledRequest.class)); - verify(filter).doFilter(any(FirewalledRequest.class), any(HttpServletResponse.class), any(FilterChain.class)); - verify(chain).doFilter(any(), any(HttpServletResponse.class)); + when(this.matcher.matches(any())).thenReturn(true); + this.fcp.doFilter(this.request, this.response, this.chain); + verify(this.matcher).matches(any(FirewalledRequest.class)); + verify(this.filter).doFilter(any(FirewalledRequest.class), any(HttpServletResponse.class), + any(FilterChain.class)); + verify(this.chain).doFilter(any(), any(HttpServletResponse.class)); } @Test public void requestIsWrappedForMatchingAndFilteringWhenMatchIsNotFound() throws Exception { - when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false); - fcp.doFilter(request, response, chain); - verify(matcher).matches(any(FirewalledRequest.class)); - verifyZeroInteractions(filter); - verify(chain).doFilter(any(FirewalledRequest.class), any(HttpServletResponse.class)); + when(this.matcher.matches(any(HttpServletRequest.class))).thenReturn(false); + this.fcp.doFilter(this.request, this.response, this.chain); + verify(this.matcher).matches(any(FirewalledRequest.class)); + verifyZeroInteractions(this.filter); + verify(this.chain).doFilter(any(FirewalledRequest.class), any(HttpServletResponse.class)); } @Test @@ -155,10 +157,10 @@ public class FilterChainProxyTests { FirewalledRequest fwr = mock(FirewalledRequest.class); when(fwr.getRequestURI()).thenReturn("/"); when(fwr.getContextPath()).thenReturn(""); - fcp.setFirewall(fw); - when(fw.getFirewalledRequest(request)).thenReturn(fwr); - when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false); - fcp.doFilter(request, response, chain); + this.fcp.setFirewall(fw); + when(fw.getFirewalledRequest(this.request)).thenReturn(fwr); + when(this.matcher.matches(any(HttpServletRequest.class))).thenReturn(false); + this.fcp.doFilter(this.request, this.response, this.chain); verify(fwr).reset(); } @@ -166,50 +168,52 @@ public class FilterChainProxyTests { @Test public void bothWrappersAreResetWithNestedFcps() throws Exception { HttpFirewall fw = mock(HttpFirewall.class); - FilterChainProxy firstFcp = new FilterChainProxy(new DefaultSecurityFilterChain(matcher, fcp)); + FilterChainProxy firstFcp = new FilterChainProxy(new DefaultSecurityFilterChain(this.matcher, this.fcp)); firstFcp.setFirewall(fw); - fcp.setFirewall(fw); + this.fcp.setFirewall(fw); FirewalledRequest firstFwr = mock(FirewalledRequest.class, "firstFwr"); when(firstFwr.getRequestURI()).thenReturn("/"); when(firstFwr.getContextPath()).thenReturn(""); FirewalledRequest fwr = mock(FirewalledRequest.class, "fwr"); when(fwr.getRequestURI()).thenReturn("/"); when(fwr.getContextPath()).thenReturn(""); - when(fw.getFirewalledRequest(request)).thenReturn(firstFwr); + when(fw.getFirewalledRequest(this.request)).thenReturn(firstFwr); when(fw.getFirewalledRequest(firstFwr)).thenReturn(fwr); when(fwr.getRequest()).thenReturn(firstFwr); - when(firstFwr.getRequest()).thenReturn(request); - when(matcher.matches(any())).thenReturn(true); - firstFcp.doFilter(request, response, chain); + when(firstFwr.getRequest()).thenReturn(this.request); + when(this.matcher.matches(any())).thenReturn(true); + firstFcp.doFilter(this.request, this.response, this.chain); verify(firstFwr).reset(); verify(fwr).reset(); } @Test public void doFilterClearsSecurityContextHolder() throws Exception { - when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true); + when(this.matcher.matches(any(HttpServletRequest.class))).thenReturn(true); doAnswer((Answer) inv -> { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("username", "password")); return null; - }).when(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class)); + }).when(this.filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), + any(FilterChain.class)); - fcp.doFilter(request, response, chain); + this.fcp.doFilter(this.request, this.response, this.chain); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test public void doFilterClearsSecurityContextHolderWithException() throws Exception { - when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true); + when(this.matcher.matches(any(HttpServletRequest.class))).thenReturn(true); doAnswer((Answer) inv -> { SecurityContextHolder.getContext() .setAuthentication(new TestingAuthenticationToken("username", "password")); throw new ServletException("oops"); - }).when(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class)); + }).when(this.filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), + any(FilterChain.class)); try { - fcp.doFilter(request, response, chain); + this.fcp.doFilter(this.request, this.response, this.chain); fail("Expected Exception"); } catch (ServletException success) { @@ -222,22 +226,23 @@ public class FilterChainProxyTests { @Test public void doFilterClearsSecurityContextHolderOnceOnForwards() throws Exception { final FilterChain innerChain = mock(FilterChain.class); - when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true); + when(this.matcher.matches(any(HttpServletRequest.class))).thenReturn(true); doAnswer((Answer) inv -> { TestingAuthenticationToken expected = new TestingAuthenticationToken("username", "password"); SecurityContextHolder.getContext().setAuthentication(expected); doAnswer((Answer) inv1 -> { - innerChain.doFilter(request, response); + innerChain.doFilter(this.request, this.response); return null; - }).when(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), + }).when(this.filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class)); - fcp.doFilter(request, response, innerChain); + this.fcp.doFilter(this.request, this.response, innerChain); assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(expected); return null; - }).when(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class)); + }).when(this.filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), + any(FilterChain.class)); - fcp.doFilter(request, response, chain); + this.fcp.doFilter(this.request, this.response, this.chain); verify(innerChain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); @@ -245,19 +250,19 @@ public class FilterChainProxyTests { @Test(expected = IllegalArgumentException.class) public void setRequestRejectedHandlerDoesNotAcceptNull() { - fcp.setRequestRejectedHandler(null); + this.fcp.setRequestRejectedHandler(null); } @Test public void requestRejectedHandlerIsCalledIfFirewallThrowsRequestRejectedException() throws Exception { HttpFirewall fw = mock(HttpFirewall.class); RequestRejectedHandler rjh = mock(RequestRejectedHandler.class); - fcp.setFirewall(fw); - fcp.setRequestRejectedHandler(rjh); + this.fcp.setFirewall(fw); + this.fcp.setRequestRejectedHandler(rjh); RequestRejectedException requestRejectedException = new RequestRejectedException("Contains illegal chars"); - when(fw.getFirewalledRequest(request)).thenThrow(requestRejectedException); - fcp.doFilter(request, response, chain); - verify(rjh).handle(eq(request), eq(response), eq((requestRejectedException))); + when(fw.getFirewalledRequest(this.request)).thenThrow(requestRejectedException); + this.fcp.doFilter(this.request, this.response, this.chain); + verify(rjh).handle(eq(this.request), eq(this.response), eq((requestRejectedException))); } } diff --git a/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java b/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java index 2f2a52b20f..f5e98a599f 100644 --- a/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java +++ b/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java @@ -56,43 +56,43 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests { @Before public final void setUp() { - interceptor = new FilterSecurityInterceptor(); - ods = mock(FilterInvocationSecurityMetadataSource.class); - adm = mock(AccessDecisionManager.class); - ram = mock(RunAsManager.class); - interceptor.setAuthenticationManager(mock(AuthenticationManager.class)); - interceptor.setSecurityMetadataSource(ods); - interceptor.setAccessDecisionManager(adm); - interceptor.setRunAsManager(ram); - interceptor.setApplicationEventPublisher(mock(ApplicationEventPublisher.class)); + this.interceptor = new FilterSecurityInterceptor(); + this.ods = mock(FilterInvocationSecurityMetadataSource.class); + this.adm = mock(AccessDecisionManager.class); + this.ram = mock(RunAsManager.class); + this.interceptor.setAuthenticationManager(mock(AuthenticationManager.class)); + this.interceptor.setSecurityMetadataSource(this.ods); + this.interceptor.setAccessDecisionManager(this.adm); + this.interceptor.setRunAsManager(this.ram); + this.interceptor.setApplicationEventPublisher(mock(ApplicationEventPublisher.class)); SecurityContextHolder.clearContext(); } @Test public void permitsAccessIfNoMatchingAttributesAndPublicInvocationsAllowed() { - DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(interceptor); - when(ods.getAttributes(anyObject())).thenReturn(null); + DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(this.interceptor); + when(this.ods.getAttributes(anyObject())).thenReturn(null); assertThat(wipe.isAllowed("/context", "/foo/index.jsp", "GET", mock(Authentication.class))).isTrue(); } @Test public void deniesAccessIfNoMatchingAttributesAndPublicInvocationsNotAllowed() { - DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(interceptor); - when(ods.getAttributes(anyObject())).thenReturn(null); - interceptor.setRejectPublicInvocations(true); + DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(this.interceptor); + when(this.ods.getAttributes(anyObject())).thenReturn(null); + this.interceptor.setRejectPublicInvocations(true); assertThat(wipe.isAllowed("/context", "/foo/index.jsp", "GET", mock(Authentication.class))).isFalse(); } @Test public void deniesAccessIfAuthenticationIsNull() { - DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(interceptor); + DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(this.interceptor); assertThat(wipe.isAllowed("/foo/index.jsp", null)).isFalse(); } @Test public void allowsAccessIfAccessDecisionManagerDoes() { Authentication token = new TestingAuthenticationToken("test", "Password", "MOCK_INDEX"); - DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(interceptor); + DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(this.interceptor); assertThat(wipe.isAllowed("/foo/index.jsp", token)).isTrue(); } @@ -100,9 +100,9 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests { @Test public void deniesAccessIfAccessDecisionManagerDoes() { Authentication token = new TestingAuthenticationToken("test", "Password", "MOCK_INDEX"); - DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(interceptor); + DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(this.interceptor); - doThrow(new AccessDeniedException("")).when(adm).decide(any(Authentication.class), anyObject(), anyList()); + doThrow(new AccessDeniedException("")).when(this.adm).decide(any(Authentication.class), anyObject(), anyList()); assertThat(wipe.isAllowed("/foo/index.jsp", token)).isFalse(); } diff --git a/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java b/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java index ae3af51c4b..d7a53f822e 100644 --- a/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java @@ -59,35 +59,35 @@ public class DelegatingAccessDeniedHandlerTests { @Before public void setup() { - handlers = new LinkedHashMap<>(); + this.handlers = new LinkedHashMap<>(); } @Test public void moreSpecificDoesNotInvokeLessSpecific() throws Exception { - handlers.put(CsrfException.class, handler1); - handler = new DelegatingAccessDeniedHandler(handlers, handler3); + this.handlers.put(CsrfException.class, this.handler1); + this.handler = new DelegatingAccessDeniedHandler(this.handlers, this.handler3); AccessDeniedException accessDeniedException = new AccessDeniedException(""); - handler.handle(request, response, accessDeniedException); + this.handler.handle(this.request, this.response, accessDeniedException); - verify(handler1, never()).handle(any(HttpServletRequest.class), any(HttpServletResponse.class), + verify(this.handler1, never()).handle(any(HttpServletRequest.class), any(HttpServletResponse.class), any(AccessDeniedException.class)); - verify(handler3).handle(request, response, accessDeniedException); + verify(this.handler3).handle(this.request, this.response, accessDeniedException); } @Test public void matchesDoesNotInvokeDefault() throws Exception { - handlers.put(InvalidCsrfTokenException.class, handler1); - handlers.put(MissingCsrfTokenException.class, handler2); - handler = new DelegatingAccessDeniedHandler(handlers, handler3); + this.handlers.put(InvalidCsrfTokenException.class, this.handler1); + this.handlers.put(MissingCsrfTokenException.class, this.handler2); + this.handler = new DelegatingAccessDeniedHandler(this.handlers, this.handler3); AccessDeniedException accessDeniedException = new MissingCsrfTokenException("123"); - handler.handle(request, response, accessDeniedException); + this.handler.handle(this.request, this.response, accessDeniedException); - verify(handler1, never()).handle(any(HttpServletRequest.class), any(HttpServletResponse.class), + verify(this.handler1, never()).handle(any(HttpServletRequest.class), any(HttpServletResponse.class), any(AccessDeniedException.class)); - verify(handler2).handle(request, response, accessDeniedException); - verify(handler3, never()).handle(any(HttpServletRequest.class), any(HttpServletResponse.class), + verify(this.handler2).handle(this.request, this.response, accessDeniedException); + verify(this.handler3, never()).handle(any(HttpServletRequest.class), any(HttpServletResponse.class), any(AccessDeniedException.class)); } diff --git a/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java b/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java index 10ff2b8a23..884035c0e6 100644 --- a/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java @@ -101,7 +101,7 @@ public class ExceptionTranslationFilterTests { new AnonymousAuthenticationToken("ignored", "ignored", AuthorityUtils.createAuthorityList("IGNORED"))); // Test - ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint); + ExceptionTranslationFilter filter = new ExceptionTranslationFilter(this.mockEntryPoint); filter.setAuthenticationTrustResolver(new AuthenticationTrustResolverImpl()); assertThat(filter.getAuthenticationTrustResolver()).isNotNull(); @@ -134,7 +134,7 @@ public class ExceptionTranslationFilterTests { SecurityContextHolder.setContext(securityContext); // Test - ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint); + ExceptionTranslationFilter filter = new ExceptionTranslationFilter(this.mockEntryPoint); MockHttpServletResponse response = new MockHttpServletResponse(); filter.doFilter(request, response, fc); assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/login.jsp"); @@ -161,7 +161,7 @@ public class ExceptionTranslationFilterTests { adh.setErrorPage("/error.jsp"); // Test - ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint); + ExceptionTranslationFilter filter = new ExceptionTranslationFilter(this.mockEntryPoint); filter.setAccessDeniedHandler(adh); MockHttpServletResponse response = new MockHttpServletResponse(); @@ -217,7 +217,7 @@ public class ExceptionTranslationFilterTests { any(HttpServletResponse.class)); // Test - ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint); + ExceptionTranslationFilter filter = new ExceptionTranslationFilter(this.mockEntryPoint); filter.afterPropertiesSet(); MockHttpServletResponse response = new MockHttpServletResponse(); filter.doFilter(request, response, fc); @@ -244,7 +244,7 @@ public class ExceptionTranslationFilterTests { // Test HttpSessionRequestCache requestCache = new HttpSessionRequestCache(); - ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint, requestCache); + ExceptionTranslationFilter filter = new ExceptionTranslationFilter(this.mockEntryPoint, requestCache); requestCache.setPortResolver(new MockPortResolver(8080, 8443)); filter.afterPropertiesSet(); MockHttpServletResponse response = new MockHttpServletResponse(); @@ -260,7 +260,7 @@ public class ExceptionTranslationFilterTests { @Test(expected = IllegalArgumentException.class) public void startupDetectsMissingRequestCache() { - new ExceptionTranslationFilter(mockEntryPoint, null); + new ExceptionTranslationFilter(this.mockEntryPoint, null); } @Test @@ -270,8 +270,8 @@ public class ExceptionTranslationFilterTests { request.setServletPath("/secure/page.html"); // Test - ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint); - assertThat(filter.getAuthenticationEntryPoint()).isSameAs(mockEntryPoint); + ExceptionTranslationFilter filter = new ExceptionTranslationFilter(this.mockEntryPoint); + assertThat(filter.getAuthenticationEntryPoint()).isSameAs(this.mockEntryPoint); MockHttpServletResponse response = new MockHttpServletResponse(); filter.doFilter(request, response, mock(FilterChain.class)); @@ -279,7 +279,7 @@ public class ExceptionTranslationFilterTests { @Test public void thrownIOExceptionServletExceptionAndRuntimeExceptionsAreRethrown() throws Exception { - ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint); + ExceptionTranslationFilter filter = new ExceptionTranslationFilter(this.mockEntryPoint); filter.afterPropertiesSet(); Exception[] exceptions = { new IOException(), new ServletException(), new RuntimeException() }; @@ -307,12 +307,12 @@ public class ExceptionTranslationFilterTests { }; MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); - ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint); + ExceptionTranslationFilter filter = new ExceptionTranslationFilter(this.mockEntryPoint); assertThatThrownBy(() -> filter.doFilter(request, response, chain)).isInstanceOf(ServletException.class) .hasCauseInstanceOf(AccessDeniedException.class); - verifyZeroInteractions(mockEntryPoint); + verifyZeroInteractions(this.mockEntryPoint); } private AuthenticationEntryPoint mockEntryPoint = (request, response, authException) -> response diff --git a/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java index 64464a451a..ba8b7ea096 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java @@ -162,13 +162,13 @@ public class ChannelProcessingFilterTests { } public void decide(FilterInvocation invocation, Collection config) throws IOException { - if (commitAResponse) { + if (this.commitAResponse) { invocation.getHttpResponse().sendRedirect("/redirected"); } } public boolean supports(ConfigAttribute attribute) { - if (attribute.getAttribute().equals(supportAttribute)) { + if (attribute.getAttribute().equals(this.supportAttribute)) { return true; } else { @@ -195,8 +195,8 @@ public class ChannelProcessingFilterTests { public Collection getAttributes(Object object) throws IllegalArgumentException { FilterInvocation fi = (FilterInvocation) object; - if (servletPath.equals(fi.getHttpRequest().getServletPath())) { - return toReturn; + if (this.servletPath.equals(fi.getHttpRequest().getServletPath())) { + return this.toReturn; } else { return null; @@ -204,11 +204,11 @@ public class ChannelProcessingFilterTests { } public Collection getAllConfigAttributes() { - if (!provideIterator) { + if (!this.provideIterator) { return null; } - return toReturn; + return this.toReturn; } public boolean supports(Class clazz) { diff --git a/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java b/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java index 711d9a3359..16a5f0e164 100644 --- a/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java @@ -54,7 +54,7 @@ public class DefaultWebSecurityExpressionHandlerTests { @Before public void setup() { - handler = new DefaultWebSecurityExpressionHandler(); + this.handler = new DefaultWebSecurityExpressionHandler(); } @After @@ -68,29 +68,29 @@ public class DefaultWebSecurityExpressionHandlerTests { RootBeanDefinition bean = new RootBeanDefinition(SecurityConfig.class); bean.getConstructorArgumentValues().addGenericArgumentValue("ROLE_A"); appContext.registerBeanDefinition("role", bean); - handler.setApplicationContext(appContext); + this.handler.setApplicationContext(appContext); - EvaluationContext ctx = handler.createEvaluationContext(mock(Authentication.class), + EvaluationContext ctx = this.handler.createEvaluationContext(mock(Authentication.class), mock(FilterInvocation.class)); - ExpressionParser parser = handler.getExpressionParser(); + ExpressionParser parser = this.handler.getExpressionParser(); assertThat(parser.parseExpression("@role.getAttribute() == 'ROLE_A'").getValue(ctx, Boolean.class)).isTrue(); assertThat(parser.parseExpression("@role.attribute == 'ROLE_A'").getValue(ctx, Boolean.class)).isTrue(); } @Test(expected = IllegalArgumentException.class) public void setTrustResolverNull() { - handler.setTrustResolver(null); + this.handler.setTrustResolver(null); } @Test public void createEvaluationContextCustomTrustResolver() { - handler.setTrustResolver(trustResolver); + this.handler.setTrustResolver(this.trustResolver); - Expression expression = handler.getExpressionParser().parseExpression("anonymous"); - EvaluationContext context = handler.createEvaluationContext(authentication, invocation); + Expression expression = this.handler.getExpressionParser().parseExpression("anonymous"); + EvaluationContext context = this.handler.createEvaluationContext(this.authentication, this.invocation); assertThat(expression.getValue(context, Boolean.class)).isFalse(); - verify(trustResolver).isAnonymous(authentication); + verify(this.trustResolver).isAnonymous(this.authentication); } } diff --git a/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java b/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java index b2da9ea7e3..f08f177a57 100644 --- a/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java @@ -60,8 +60,9 @@ public class WebExpressionVoterTests { @Test public void abstainsIfNoAttributeFound() { WebExpressionVoter voter = new WebExpressionVoter(); - assertThat(voter.vote(user, new FilterInvocation("/path", "GET"), SecurityConfig.createList("A", "B", "C"))) - .isEqualTo(AccessDecisionVoter.ACCESS_ABSTAIN); + assertThat( + voter.vote(this.user, new FilterInvocation("/path", "GET"), SecurityConfig.createList("A", "B", "C"))) + .isEqualTo(AccessDecisionVoter.ACCESS_ABSTAIN); } @Test @@ -76,16 +77,16 @@ public class WebExpressionVoterTests { SecurityExpressionHandler eh = mock(SecurityExpressionHandler.class); FilterInvocation fi = new FilterInvocation("/path", "GET"); voter.setExpressionHandler(eh); - when(eh.createEvaluationContext(user, fi)).thenReturn(ctx); + when(eh.createEvaluationContext(this.user, fi)).thenReturn(ctx); when(ex.getValue(ctx, Boolean.class)).thenReturn(Boolean.TRUE).thenReturn(Boolean.FALSE); ArrayList attributes = new ArrayList(); attributes.addAll(SecurityConfig.createList("A", "B", "C")); attributes.add(weca); - assertThat(voter.vote(user, fi, attributes)).isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); + assertThat(voter.vote(this.user, fi, attributes)).isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); // Second time false - assertThat(voter.vote(user, fi, attributes)).isEqualTo(AccessDecisionVoter.ACCESS_DENIED); + assertThat(voter.vote(this.user, fi, attributes)).isEqualTo(AccessDecisionVoter.ACCESS_DENIED); } // SEC-2507 diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java index a9c34ba4bd..d56a4de170 100644 --- a/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java +++ b/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java @@ -76,17 +76,17 @@ public class FilterSecurityInterceptorTests { @Before public final void setUp() { - interceptor = new FilterSecurityInterceptor(); - am = mock(AuthenticationManager.class); - ods = mock(FilterInvocationSecurityMetadataSource.class); - adm = mock(AccessDecisionManager.class); - ram = mock(RunAsManager.class); - publisher = mock(ApplicationEventPublisher.class); - interceptor.setAuthenticationManager(am); - interceptor.setSecurityMetadataSource(ods); - interceptor.setAccessDecisionManager(adm); - interceptor.setRunAsManager(ram); - interceptor.setApplicationEventPublisher(publisher); + this.interceptor = new FilterSecurityInterceptor(); + this.am = mock(AuthenticationManager.class); + this.ods = mock(FilterInvocationSecurityMetadataSource.class); + this.adm = mock(AccessDecisionManager.class); + this.ram = mock(RunAsManager.class); + this.publisher = mock(ApplicationEventPublisher.class); + this.interceptor.setAuthenticationManager(this.am); + this.interceptor.setSecurityMetadataSource(this.ods); + this.interceptor.setAccessDecisionManager(this.adm); + this.interceptor.setRunAsManager(this.ram); + this.interceptor.setApplicationEventPublisher(this.publisher); SecurityContextHolder.clearContext(); } @@ -97,14 +97,14 @@ public class FilterSecurityInterceptorTests { @Test(expected = IllegalArgumentException.class) public void testEnsuresAccessDecisionManagerSupportsFilterInvocationClass() throws Exception { - when(adm.supports(FilterInvocation.class)).thenReturn(true); - interceptor.afterPropertiesSet(); + when(this.adm.supports(FilterInvocation.class)).thenReturn(true); + this.interceptor.afterPropertiesSet(); } @Test(expected = IllegalArgumentException.class) public void testEnsuresRunAsManagerSupportsFilterInvocationClass() throws Exception { - when(adm.supports(FilterInvocation.class)).thenReturn(false); - interceptor.afterPropertiesSet(); + when(this.adm.supports(FilterInvocation.class)).thenReturn(false); + this.interceptor.afterPropertiesSet(); } /** @@ -120,12 +120,12 @@ public class FilterSecurityInterceptorTests { FilterInvocation fi = createinvocation(); - when(ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK")); + when(this.ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK")); - interceptor.invoke(fi); + this.interceptor.invoke(fi); // SEC-1697 - verify(publisher, never()).publishEvent(any(AuthorizedEvent.class)); + verify(this.publisher, never()).publishEvent(any(AuthorizedEvent.class)); } @Test @@ -138,13 +138,13 @@ public class FilterSecurityInterceptorTests { doThrow(new RuntimeException()).when(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); - when(ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK")); + when(this.ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK")); AfterInvocationManager aim = mock(AfterInvocationManager.class); - interceptor.setAfterInvocationManager(aim); + this.interceptor.setAfterInvocationManager(aim); try { - interceptor.invoke(fi); + this.interceptor.invoke(fi); fail("Expected exception"); } catch (RuntimeException expected) { @@ -165,20 +165,20 @@ public class FilterSecurityInterceptorTests { RunAsManager runAsManager = mock(RunAsManager.class); when(runAsManager.buildRunAs(eq(token), any(), anyCollection())) .thenReturn(new RunAsUserToken("key", "someone", "creds", token.getAuthorities(), token.getClass())); - interceptor.setRunAsManager(runAsManager); + this.interceptor.setRunAsManager(runAsManager); FilterInvocation fi = createinvocation(); FilterChain chain = fi.getChain(); doThrow(new RuntimeException()).when(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); - when(ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK")); + when(this.ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK")); AfterInvocationManager aim = mock(AfterInvocationManager.class); - interceptor.setAfterInvocationManager(aim); + this.interceptor.setAfterInvocationManager(aim); try { - interceptor.invoke(fi); + this.interceptor.invoke(fi); fail("Expected exception"); } catch (RuntimeException expected) { diff --git a/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java index be8d0831a9..aa1d4986fb 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java @@ -83,10 +83,10 @@ public class AbstractAuthenticationProcessingFilterTests { @Before public void setUp() { - successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); - successHandler.setDefaultTargetUrl("/logged_in.jsp"); - failureHandler = new SimpleUrlAuthenticationFailureHandler(); - failureHandler.setDefaultFailureUrl("/failed.jsp"); + this.successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); + this.successHandler.setDefaultTargetUrl("/logged_in.jsp"); + this.failureHandler = new SimpleUrlAuthenticationFailureHandler(); + this.failureHandler.setDefaultFailureUrl("/failed.jsp"); SecurityContextHolder.clearContext(); } @@ -128,7 +128,7 @@ public class AbstractAuthenticationProcessingFilterTests { // Setup our test object, to grant access MockAuthenticationFilter filter = new MockAuthenticationFilter(true); filter.setFilterProcessesUrl("/j_OTHER_LOCATION"); - filter.setAuthenticationSuccessHandler(successHandler); + filter.setAuthenticationSuccessHandler(this.successHandler); // Test filter.doFilter(request, response, chain); @@ -192,8 +192,8 @@ public class AbstractAuthenticationProcessingFilterTests { filter.setFilterProcessesUrl("/j_mock_post"); filter.setSessionAuthenticationStrategy(mock(SessionAuthenticationStrategy.class)); - filter.setAuthenticationSuccessHandler(successHandler); - filter.setAuthenticationFailureHandler(failureHandler); + filter.setAuthenticationSuccessHandler(this.successHandler); + filter.setAuthenticationFailureHandler(this.failureHandler); filter.setAuthenticationManager(mock(AuthenticationManager.class)); filter.afterPropertiesSet(); @@ -225,8 +225,8 @@ public class AbstractAuthenticationProcessingFilterTests { mock(AuthenticationManager.class)); filter.setSessionAuthenticationStrategy(mock(SessionAuthenticationStrategy.class)); - filter.setAuthenticationSuccessHandler(successHandler); - filter.setAuthenticationFailureHandler(failureHandler); + filter.setAuthenticationSuccessHandler(this.successHandler); + filter.setAuthenticationFailureHandler(this.failureHandler); filter.afterPropertiesSet(); // Test @@ -259,8 +259,8 @@ public class AbstractAuthenticationProcessingFilterTests { new AntPathRequestMatcher("/j_eradicate_corona_virus"), mock(AuthenticationManager.class)); filter.setSessionAuthenticationStrategy(mock(SessionAuthenticationStrategy.class)); - filter.setAuthenticationSuccessHandler(successHandler); - filter.setAuthenticationFailureHandler(failureHandler); + filter.setAuthenticationSuccessHandler(this.successHandler); + filter.setAuthenticationFailureHandler(this.failureHandler); filter.afterPropertiesSet(); // Test @@ -275,9 +275,9 @@ public class AbstractAuthenticationProcessingFilterTests { @Test public void testStartupDetectsInvalidAuthenticationManager() { AbstractAuthenticationProcessingFilter filter = new MockAuthenticationFilter(); - filter.setAuthenticationFailureHandler(failureHandler); - successHandler.setDefaultTargetUrl("/"); - filter.setAuthenticationSuccessHandler(successHandler); + filter.setAuthenticationFailureHandler(this.failureHandler); + this.successHandler.setDefaultTargetUrl("/"); + filter.setAuthenticationSuccessHandler(this.successHandler); filter.setFilterProcessesUrl("/login"); try { @@ -292,9 +292,9 @@ public class AbstractAuthenticationProcessingFilterTests { @Test public void testStartupDetectsInvalidFilterProcessesUrl() { AbstractAuthenticationProcessingFilter filter = new MockAuthenticationFilter(); - filter.setAuthenticationFailureHandler(failureHandler); + filter.setAuthenticationFailureHandler(this.failureHandler); filter.setAuthenticationManager(mock(AuthenticationManager.class)); - filter.setAuthenticationSuccessHandler(successHandler); + filter.setAuthenticationSuccessHandler(this.successHandler); try { filter.setFilterProcessesUrl(null); @@ -321,7 +321,7 @@ public class AbstractAuthenticationProcessingFilterTests { // Setup our test object, to grant access MockAuthenticationFilter filter = new MockAuthenticationFilter(true); filter.setFilterProcessesUrl("/j_mock_post"); - filter.setAuthenticationSuccessHandler(successHandler); + filter.setAuthenticationSuccessHandler(this.successHandler); // Test filter.doFilter(request, response, chain); @@ -339,7 +339,7 @@ public class AbstractAuthenticationProcessingFilterTests { // Setup our test object, to deny access filter = new MockAuthenticationFilter(false); filter.setFilterProcessesUrl("/j_mock_post"); - filter.setAuthenticationFailureHandler(failureHandler); + filter.setAuthenticationFailureHandler(this.failureHandler); // Test filter.doFilter(request, response, chain); @@ -414,8 +414,8 @@ public class AbstractAuthenticationProcessingFilterTests { // Reject authentication, so exception would normally be stored in session MockAuthenticationFilter filter = new MockAuthenticationFilter(false); - failureHandler.setAllowSessionCreation(false); - filter.setAuthenticationFailureHandler(failureHandler); + this.failureHandler.setAllowSessionCreation(false); + filter.setAuthenticationFailureHandler(this.failureHandler); filter.doFilter(request, response, chain); @@ -434,8 +434,8 @@ public class AbstractAuthenticationProcessingFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); MockAuthenticationFilter filter = new MockAuthenticationFilter(false); - successHandler.setDefaultTargetUrl("https://monkeymachine.co.uk/"); - filter.setAuthenticationSuccessHandler(successHandler); + this.successHandler.setDefaultTargetUrl("https://monkeymachine.co.uk/"); + filter.setAuthenticationSuccessHandler(this.successHandler); filter.doFilter(request, response, chain); @@ -456,8 +456,8 @@ public class AbstractAuthenticationProcessingFilterTests { MockAuthenticationFilter filter = new MockAuthenticationFilter(false); ReflectionTestUtils.setField(filter, "logger", logger); filter.exceptionToThrow = new InternalAuthenticationServiceException("Mock requested to do so"); - successHandler.setDefaultTargetUrl("https://monkeymachine.co.uk/"); - filter.setAuthenticationSuccessHandler(successHandler); + this.successHandler.setDefaultTargetUrl("https://monkeymachine.co.uk/"); + filter.setAuthenticationSuccessHandler(this.successHandler); filter.doFilter(request, response, chain); @@ -508,12 +508,12 @@ public class AbstractAuthenticationProcessingFilterTests { public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException { - if (grantAccess) { + if (this.grantAccess) { return new UsernamePasswordAuthenticationToken("test", "test", AuthorityUtils.createAuthorityList("TEST")); } else { - throw exceptionToThrow; + throw this.exceptionToThrow; } } @@ -533,7 +533,7 @@ public class AbstractAuthenticationProcessingFilterTests { } public void doFilter(ServletRequest request, ServletResponse response) { - if (!expectToProceed) { + if (!this.expectToProceed) { fail("Did not expect filter chain to proceed"); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java index 0816a26477..8fe9848e70 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java @@ -115,7 +115,7 @@ public class AnonymousAuthenticationFilterTests { } public void doFilter(ServletRequest request, ServletResponse response) { - if (!expectToProceed) { + if (!this.expectToProceed) { fail("Did not expect filter chain to proceed"); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/AuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AuthenticationFilterTests.java index 9e3d720999..53e60f8f62 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AuthenticationFilterTests.java @@ -212,7 +212,7 @@ public class AuthenticationFilterTests { AuthenticationFilter filter = new AuthenticationFilter(this.authenticationManagerResolver, this.authenticationConverter); - filter.setSuccessHandler(successHandler); + filter.setSuccessHandler(this.successHandler); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/"); MockHttpServletResponse response = new MockHttpServletResponse(); @@ -232,7 +232,7 @@ public class AuthenticationFilterTests { AuthenticationFilter filter = new AuthenticationFilter(this.authenticationManagerResolver, this.authenticationConverter); - filter.setSuccessHandler(successHandler); + filter.setSuccessHandler(this.successHandler); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/"); MockHttpServletResponse response = new MockHttpServletResponse(); diff --git a/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java index d270d3773a..ff8e4b3560 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java @@ -49,9 +49,9 @@ public class DefaultLoginPageGeneratingFilterTests { public void generatingPageWithAuthenticationProcessingFilterOnlyIsSuccessFul() throws Exception { DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter( new UsernamePasswordAuthenticationFilter()); - filter.doFilter(new MockHttpServletRequest("GET", "/login"), new MockHttpServletResponse(), chain); + filter.doFilter(new MockHttpServletRequest("GET", "/login"), new MockHttpServletResponse(), this.chain); filter.doFilter(new MockHttpServletRequest("GET", "/login;pathparam=unused"), new MockHttpServletResponse(), - chain); + this.chain); } @Test @@ -60,7 +60,7 @@ public class DefaultLoginPageGeneratingFilterTests { new UsernamePasswordAuthenticationFilter()); MockHttpServletResponse response = new MockHttpServletResponse(); - filter.doFilter(new MockHttpServletRequest("GET", "/login"), response, chain); + filter.doFilter(new MockHttpServletRequest("GET", "/login"), response, this.chain); assertThat(response.getContentAsString()).isNotEmpty(); } @@ -72,7 +72,7 @@ public class DefaultLoginPageGeneratingFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletRequest request = new MockHttpServletRequest("POST", "/login"); - filter.doFilter(request, response, chain); + filter.doFilter(request, response, this.chain); assertThat(response.getContentAsString()).isEmpty(); } @@ -85,7 +85,7 @@ public class DefaultLoginPageGeneratingFilterTests { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context/login"); request.setContextPath("/context"); - filter.doFilter(request, response, chain); + filter.doFilter(request, response, this.chain); assertThat(response.getContentAsString()).isNotEmpty(); } @@ -96,7 +96,7 @@ public class DefaultLoginPageGeneratingFilterTests { new UsernamePasswordAuthenticationFilter()); MockHttpServletResponse response = new MockHttpServletResponse(); - filter.doFilter(new MockHttpServletRequest("GET", "/api/login"), response, chain); + filter.doFilter(new MockHttpServletRequest("GET", "/api/login"), response, this.chain); assertThat(response.getContentAsString()).isEmpty(); } @@ -110,7 +110,7 @@ public class DefaultLoginPageGeneratingFilterTests { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/login"); request.setQueryString("error"); - filter.doFilter(request, response, chain); + filter.doFilter(request, response, this.chain); assertThat(response.getContentAsString()).isNotEmpty(); } @@ -124,7 +124,7 @@ public class DefaultLoginPageGeneratingFilterTests { Collections.singletonMap("XYUU", "\u8109\u640F\u7F51\u5E10\u6237\u767B\u5F55")); MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/login"); - filter.doFilter(request, response, chain); + filter.doFilter(request, response, this.chain); assertThat(response .getContentLength() == response.getContentAsString().getBytes(response.getCharacterEncoding()).length) .isTrue(); @@ -139,7 +139,7 @@ public class DefaultLoginPageGeneratingFilterTests { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/login"); request.setQueryString("not"); - filter.doFilter(request, response, chain); + filter.doFilter(request, response, this.chain); assertThat(response.getContentAsString()).isEmpty(); } @@ -147,7 +147,7 @@ public class DefaultLoginPageGeneratingFilterTests { @Test public void generatingPageWithOpenIdFilterOnlyIsSuccessFul() throws Exception { DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(new MockProcessingFilter()); - filter.doFilter(new MockHttpServletRequest("GET", "/login"), new MockHttpServletResponse(), chain); + filter.doFilter(new MockHttpServletRequest("GET", "/login"), new MockHttpServletResponse(), this.chain); } // Fake OpenID filter (since it's not in this module @@ -182,7 +182,7 @@ public class DefaultLoginPageGeneratingFilterTests { "Bad credentials", Locale.KOREA); request.getSession().setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, new BadCredentialsException(message)); - filter.doFilter(request, new MockHttpServletResponse(), chain); + filter.doFilter(request, new MockHttpServletResponse(), this.chain); } // gh-5394 @@ -197,7 +197,7 @@ public class DefaultLoginPageGeneratingFilterTests { Collections.singletonMap("/oauth2/authorization/google", clientName)); MockHttpServletResponse response = new MockHttpServletResponse(); - filter.doFilter(new MockHttpServletRequest("GET", "/login"), response, chain); + filter.doFilter(new MockHttpServletRequest("GET", "/login"), response, this.chain); assertThat(response.getContentAsString()) .contains("Google < > " ' &"); @@ -213,7 +213,7 @@ public class DefaultLoginPageGeneratingFilterTests { filter.setSaml2AuthenticationUrlToProviderName(Collections.singletonMap("/saml/sso/google", clientName)); MockHttpServletResponse response = new MockHttpServletResponse(); - filter.doFilter(new MockHttpServletRequest("GET", "/login"), response, chain); + filter.doFilter(new MockHttpServletRequest("GET", "/login"), response, this.chain); assertThat(response.getContentAsString()).contains("Login with SAML 2.0"); assertThat(response.getContentAsString()) diff --git a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java index 9c80ce2b63..43980c148a 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java @@ -56,9 +56,9 @@ public class DelegatingAuthenticationEntryPointContextTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.setRemoteAddr("192.168.1.10"); request.addHeader("User-Agent", "Mozilla/5.0"); - daep.commence(request, null, null); - verify(firstAEP).commence(request, null, null); - verify(defaultAEP, never()).commence(any(HttpServletRequest.class), any(HttpServletResponse.class), + this.daep.commence(request, null, null); + verify(this.firstAEP).commence(request, null, null); + verify(this.defaultAEP, never()).commence(any(HttpServletRequest.class), any(HttpServletResponse.class), any(AuthenticationException.class)); } @@ -68,9 +68,9 @@ public class DelegatingAuthenticationEntryPointContextTests { public void testDefaultAEP() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setRemoteAddr("192.168.1.10"); - daep.commence(request, null, null); - verify(defaultAEP).commence(request, null, null); - verify(firstAEP, never()).commence(any(HttpServletRequest.class), any(HttpServletResponse.class), + this.daep.commence(request, null, null); + verify(this.defaultAEP).commence(request, null, null); + verify(this.firstAEP, never()).commence(any(HttpServletRequest.class), any(HttpServletResponse.class), any(AuthenticationException.class)); } diff --git a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java index 4f97b0e352..767f6ce5ac 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java @@ -50,23 +50,23 @@ public class DelegatingAuthenticationEntryPointTests { @Before public void before() { - defaultEntryPoint = mock(AuthenticationEntryPoint.class); - entryPoints = new LinkedHashMap<>(); - daep = new DelegatingAuthenticationEntryPoint(entryPoints); - daep.setDefaultEntryPoint(defaultEntryPoint); + this.defaultEntryPoint = mock(AuthenticationEntryPoint.class); + this.entryPoints = new LinkedHashMap<>(); + this.daep = new DelegatingAuthenticationEntryPoint(this.entryPoints); + this.daep.setDefaultEntryPoint(this.defaultEntryPoint); } @Test public void testDefaultEntryPoint() throws Exception { AuthenticationEntryPoint firstAEP = mock(AuthenticationEntryPoint.class); RequestMatcher firstRM = mock(RequestMatcher.class); - when(firstRM.matches(request)).thenReturn(false); - entryPoints.put(firstRM, firstAEP); + when(firstRM.matches(this.request)).thenReturn(false); + this.entryPoints.put(firstRM, firstAEP); - daep.commence(request, null, null); + this.daep.commence(this.request, null, null); - verify(defaultEntryPoint).commence(request, null, null); - verify(firstAEP, never()).commence(request, null, null); + verify(this.defaultEntryPoint).commence(this.request, null, null); + verify(firstAEP, never()).commence(this.request, null, null); } @Test @@ -75,16 +75,16 @@ public class DelegatingAuthenticationEntryPointTests { RequestMatcher firstRM = mock(RequestMatcher.class); AuthenticationEntryPoint secondAEP = mock(AuthenticationEntryPoint.class); RequestMatcher secondRM = mock(RequestMatcher.class); - when(firstRM.matches(request)).thenReturn(true); - entryPoints.put(firstRM, firstAEP); - entryPoints.put(secondRM, secondAEP); + when(firstRM.matches(this.request)).thenReturn(true); + this.entryPoints.put(firstRM, firstAEP); + this.entryPoints.put(secondRM, secondAEP); - daep.commence(request, null, null); + this.daep.commence(this.request, null, null); - verify(firstAEP).commence(request, null, null); - verify(secondAEP, never()).commence(request, null, null); - verify(defaultEntryPoint, never()).commence(request, null, null); - verify(secondRM, never()).matches(request); + verify(firstAEP).commence(this.request, null, null); + verify(secondAEP, never()).commence(this.request, null, null); + verify(this.defaultEntryPoint, never()).commence(this.request, null, null); + verify(secondRM, never()).matches(this.request); } @Test @@ -93,16 +93,16 @@ public class DelegatingAuthenticationEntryPointTests { RequestMatcher firstRM = mock(RequestMatcher.class); AuthenticationEntryPoint secondAEP = mock(AuthenticationEntryPoint.class); RequestMatcher secondRM = mock(RequestMatcher.class); - when(firstRM.matches(request)).thenReturn(false); - when(secondRM.matches(request)).thenReturn(true); - entryPoints.put(firstRM, firstAEP); - entryPoints.put(secondRM, secondAEP); + when(firstRM.matches(this.request)).thenReturn(false); + when(secondRM.matches(this.request)).thenReturn(true); + this.entryPoints.put(firstRM, firstAEP); + this.entryPoints.put(secondRM, secondAEP); - daep.commence(request, null, null); + this.daep.commence(this.request, null, null); - verify(secondAEP).commence(request, null, null); - verify(firstAEP, never()).commence(request, null, null); - verify(defaultEntryPoint, never()).commence(request, null, null); + verify(secondAEP).commence(this.request, null, null); + verify(firstAEP, never()).commence(this.request, null, null); + verify(this.defaultEntryPoint, never()).commence(this.request, null, null); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java index d4422d8d2a..8883e12c4d 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java @@ -71,76 +71,76 @@ public class DelegatingAuthenticationFailureHandlerTests { @Before public void setup() { - handlers = new LinkedHashMap<>(); + this.handlers = new LinkedHashMap<>(); } @Test public void handleByDefaultHandler() throws Exception { - handlers.put(BadCredentialsException.class, handler1); - handler = new DelegatingAuthenticationFailureHandler(handlers, defaultHandler); + this.handlers.put(BadCredentialsException.class, this.handler1); + this.handler = new DelegatingAuthenticationFailureHandler(this.handlers, this.defaultHandler); AuthenticationException exception = new AccountExpiredException(""); - handler.onAuthenticationFailure(request, response, exception); + this.handler.onAuthenticationFailure(this.request, this.response, exception); - verifyZeroInteractions(handler1, handler2); - verify(defaultHandler).onAuthenticationFailure(request, response, exception); + verifyZeroInteractions(this.handler1, this.handler2); + verify(this.defaultHandler).onAuthenticationFailure(this.request, this.response, exception); } @Test public void handleByMappedHandlerWithSameType() throws Exception { - handlers.put(BadCredentialsException.class, handler1); // same type - handlers.put(AccountStatusException.class, handler2); - handler = new DelegatingAuthenticationFailureHandler(handlers, defaultHandler); + this.handlers.put(BadCredentialsException.class, this.handler1); // same type + this.handlers.put(AccountStatusException.class, this.handler2); + this.handler = new DelegatingAuthenticationFailureHandler(this.handlers, this.defaultHandler); AuthenticationException exception = new BadCredentialsException(""); - handler.onAuthenticationFailure(request, response, exception); + this.handler.onAuthenticationFailure(this.request, this.response, exception); - verifyZeroInteractions(handler2, defaultHandler); - verify(handler1).onAuthenticationFailure(request, response, exception); + verifyZeroInteractions(this.handler2, this.defaultHandler); + verify(this.handler1).onAuthenticationFailure(this.request, this.response, exception); } @Test public void handleByMappedHandlerWithSuperType() throws Exception { - handlers.put(BadCredentialsException.class, handler1); - handlers.put(AccountStatusException.class, handler2); // super type of - // CredentialsExpiredException - handler = new DelegatingAuthenticationFailureHandler(handlers, defaultHandler); + this.handlers.put(BadCredentialsException.class, this.handler1); + this.handlers.put(AccountStatusException.class, this.handler2); // super type of + // CredentialsExpiredException + this.handler = new DelegatingAuthenticationFailureHandler(this.handlers, this.defaultHandler); AuthenticationException exception = new CredentialsExpiredException(""); - handler.onAuthenticationFailure(request, response, exception); + this.handler.onAuthenticationFailure(this.request, this.response, exception); - verifyZeroInteractions(handler1, defaultHandler); - verify(handler2).onAuthenticationFailure(request, response, exception); + verifyZeroInteractions(this.handler1, this.defaultHandler); + verify(this.handler2).onAuthenticationFailure(this.request, this.response, exception); } @Test public void handlersIsNull() { - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("handlers cannot be null or empty"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("handlers cannot be null or empty"); - new DelegatingAuthenticationFailureHandler(null, defaultHandler); + new DelegatingAuthenticationFailureHandler(null, this.defaultHandler); } @Test public void handlersIsEmpty() { - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("handlers cannot be null or empty"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("handlers cannot be null or empty"); - new DelegatingAuthenticationFailureHandler(handlers, defaultHandler); + new DelegatingAuthenticationFailureHandler(this.handlers, this.defaultHandler); } @Test public void defaultHandlerIsNull() { - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("defaultHandler cannot be null"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("defaultHandler cannot be null"); - handlers.put(BadCredentialsException.class, handler1); - new DelegatingAuthenticationFailureHandler(handlers, null); + this.handlers.put(BadCredentialsException.class, this.handler1); + new DelegatingAuthenticationFailureHandler(this.handlers, null); } diff --git a/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java index 46e8b2a17d..2ad510a7ea 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java @@ -42,11 +42,11 @@ public class HttpStatusEntryPointTests { @SuppressWarnings("serial") @Before public void setup() { - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); - authException = new AuthenticationException("") { + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); + this.authException = new AuthenticationException("") { }; - entryPoint = new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED); + this.entryPoint = new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED); } @Test(expected = IllegalArgumentException.class) @@ -56,9 +56,9 @@ public class HttpStatusEntryPointTests { @Test public void unauthorized() throws Exception { - entryPoint.commence(request, response, authException); + this.entryPoint.commence(this.request, this.response, this.authException); - assertThat(response.getStatus()).isEqualTo(HttpStatus.UNAUTHORIZED.value()); + assertThat(this.response.getStatus()).isEqualTo(HttpStatus.UNAUTHORIZED.value()); } } \ No newline at end of file diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java index 4b575ccfe8..6050578eaf 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java @@ -33,7 +33,7 @@ public class LogoutHandlerTests { @Before public void setUp() { - filter = new LogoutFilter("/success", new SecurityContextLogoutHandler()); + this.filter = new LogoutFilter("/success", new SecurityContextLogoutHandler()); } @Test @@ -46,7 +46,7 @@ public class LogoutHandlerTests { request.setQueryString("otherparam=blah"); DefaultHttpFirewall fw = new DefaultHttpFirewall(); - assertThat(filter.requiresLogout(fw.getFirewalledRequest(request), response)).isTrue(); + assertThat(this.filter.requiresLogout(fw.getFirewalledRequest(request), response)).isTrue(); } @Test @@ -59,7 +59,7 @@ public class LogoutHandlerTests { request.setRequestURI("/context/logout?param=blah"); request.setQueryString("otherparam=blah"); - assertThat(filter.requiresLogout(request, response)).isTrue(); + assertThat(this.filter.requiresLogout(request, response)).isTrue(); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutSuccessEventPublishingLogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutSuccessEventPublishingLogoutHandlerTests.java index 8e5f5f20ac..31c2b4372d 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutSuccessEventPublishingLogoutHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutSuccessEventPublishingLogoutHandlerTests.java @@ -61,7 +61,7 @@ public class LogoutSuccessEventPublishingLogoutHandlerTests { @Override public void publishEvent(Object event) { if (LogoutSuccessEvent.class.isAssignableFrom(event.getClass())) { - flag = true; + this.flag = true; } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java index 9bd5e9dbb5..0874268b81 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java @@ -43,10 +43,10 @@ public class SecurityContextLogoutHandlerTests { @Before public void setUp() { - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); - handler = new SecurityContextLogoutHandler(); + this.handler = new SecurityContextLogoutHandler(); SecurityContext context = SecurityContextHolder.createEmptyContext(); context.setAuthentication( @@ -63,16 +63,16 @@ public class SecurityContextLogoutHandlerTests { @Test public void clearsAuthentication() { SecurityContext beforeContext = SecurityContextHolder.getContext(); - handler.logout(request, response, SecurityContextHolder.getContext().getAuthentication()); + this.handler.logout(this.request, this.response, SecurityContextHolder.getContext().getAuthentication()); assertThat(beforeContext.getAuthentication()).isNull(); } @Test public void disableClearsAuthentication() { - handler.setClearAuthentication(false); + this.handler.setClearAuthentication(false); SecurityContext beforeContext = SecurityContextHolder.getContext(); Authentication beforeAuthentication = beforeContext.getAuthentication(); - handler.logout(request, response, SecurityContextHolder.getContext().getAuthentication()); + this.handler.logout(this.request, this.response, SecurityContextHolder.getContext().getAuthentication()); assertThat(beforeContext.getAuthentication()).isNotNull(); assertThat(beforeContext.getAuthentication()).isSameAs(beforeAuthentication); diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java index 922d3b8b92..1f2a9cde5f 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java @@ -59,7 +59,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { @Before public void createFilter() { - filter = new AbstractPreAuthenticatedProcessingFilter() { + this.filter = new AbstractPreAuthenticatedProcessingFilter() { protected Object getPreAuthenticatedCredentials(HttpServletRequest request) { return "n/a"; } @@ -80,9 +80,9 @@ public class AbstractPreAuthenticatedProcessingFilterTests { public void filterChainProceedsOnFailedAuthenticationByDefault() throws Exception { AuthenticationManager am = mock(AuthenticationManager.class); when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException("")); - filter.setAuthenticationManager(am); - filter.afterPropertiesSet(); - filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), mock(FilterChain.class)); + this.filter.setAuthenticationManager(am); + this.filter.afterPropertiesSet(); + this.filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), mock(FilterChain.class)); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @@ -92,10 +92,10 @@ public class AbstractPreAuthenticatedProcessingFilterTests { throws Exception { AuthenticationManager am = mock(AuthenticationManager.class); when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException("")); - filter.setContinueFilterChainOnUnsuccessfulAuthentication(false); - filter.setAuthenticationManager(am); - filter.afterPropertiesSet(); - filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), mock(FilterChain.class)); + this.filter.setContinueFilterChainOnUnsuccessfulAuthentication(false); + this.filter.setAuthenticationManager(am); + this.filter.afterPropertiesSet(); + this.filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), mock(FilterChain.class)); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @@ -435,7 +435,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { private boolean initFilterBeanInvoked; protected Object getPreAuthenticatedPrincipal(HttpServletRequest httpRequest) { - return principal; + return this.principal; } protected Object getPreAuthenticatedCredentials(HttpServletRequest httpRequest) { @@ -445,7 +445,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { @Override protected void initFilterBean() throws ServletException { super.initFilterBean(); - initFilterBeanInvoked = true; + this.initFilterBeanInvoked = true; } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java index bea868e108..897e88532a 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java @@ -40,7 +40,7 @@ public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests { @Test public void testToString() { PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails details = new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails( - getRequest("testUser", new String[] {}), gas); + getRequest("testUser", new String[] {}), this.gas); String toString = details.toString(); assertThat(toString.contains("Role1")).as("toString should contain Role1").isTrue(); assertThat(toString.contains("Role2")).as("toString should contain Role2").isTrue(); @@ -49,11 +49,10 @@ public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests { @Test public void testGetSetPreAuthenticatedGrantedAuthorities() { PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails details = new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails( - getRequest("testUser", new String[] {}), gas); + getRequest("testUser", new String[] {}), this.gas); List returnedGas = details.getGrantedAuthorities(); - assertThat(gas.containsAll(returnedGas) && returnedGas.containsAll(gas)) - .withFailMessage( - "Collections do not contain same elements; expected: " + gas + ", returned: " + returnedGas) + assertThat(this.gas.containsAll(returnedGas) && returnedGas.containsAll(this.gas)).withFailMessage( + "Collections do not contain same elements; expected: " + this.gas + ", returned: " + returnedGas) .isTrue(); } @@ -62,7 +61,7 @@ public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests { private Set roles = new HashSet<>(Arrays.asList(aRoles)); public boolean isUserInRole(String arg0) { - return roles.contains(arg0); + return this.roles.contains(arg0); } }; req.setRemoteUser(userName); diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java index a8af439c91..d3c1df80fe 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java @@ -170,7 +170,7 @@ public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests { private Set roles = new HashSet<>(Arrays.asList(aRoles)); public boolean isUserInRole(String arg0) { - return roles.contains(arg0); + return this.roles.contains(arg0); } }; req.setRemoteUser(userName); diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java index e2026090de..d0677000c0 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java @@ -52,7 +52,7 @@ public class J2eePreAuthenticatedProcessingFilterTests { private Set roles = new HashSet<>(Arrays.asList(aRoles)); public boolean isUserInRole(String arg0) { - return roles.contains(arg0); + return this.roles.contains(arg0); } }; req.setRemoteUser(aUserName); diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java index ecdb831ebd..6c1e7da0be 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java @@ -32,37 +32,37 @@ public class SubjectDnX509PrincipalExtractorTests { @Before public void setUp() { - extractor = new SubjectDnX509PrincipalExtractor(); - extractor.setMessageSource(new SpringSecurityMessageSource()); + this.extractor = new SubjectDnX509PrincipalExtractor(); + this.extractor.setMessageSource(new SpringSecurityMessageSource()); } @Test(expected = IllegalArgumentException.class) public void invalidRegexFails() { - extractor.setSubjectDnRegex("CN=(.*?,"); // missing closing bracket on group + this.extractor.setSubjectDnRegex("CN=(.*?,"); // missing closing bracket on group } @Test public void defaultCNPatternReturnsExcpectedPrincipal() throws Exception { - Object principal = extractor.extractPrincipal(X509TestUtils.buildTestCertificate()); + Object principal = this.extractor.extractPrincipal(X509TestUtils.buildTestCertificate()); assertThat(principal).isEqualTo("Luke Taylor"); } @Test public void matchOnEmailReturnsExpectedPrincipal() throws Exception { - extractor.setSubjectDnRegex("emailAddress=(.*?),"); - Object principal = extractor.extractPrincipal(X509TestUtils.buildTestCertificate()); + this.extractor.setSubjectDnRegex("emailAddress=(.*?),"); + Object principal = this.extractor.extractPrincipal(X509TestUtils.buildTestCertificate()); assertThat(principal).isEqualTo("luke@monkeymachine"); } @Test(expected = BadCredentialsException.class) public void matchOnShoeSizeThrowsBadCredentials() throws Exception { - extractor.setSubjectDnRegex("shoeSize=(.*?),"); - extractor.extractPrincipal(X509TestUtils.buildTestCertificate()); + this.extractor.setSubjectDnRegex("shoeSize=(.*?),"); + this.extractor.extractPrincipal(X509TestUtils.buildTestCertificate()); } @Test public void defaultCNPatternReturnsPrincipalAtEndOfDNString() throws Exception { - Object principal = extractor.extractPrincipal(X509TestUtils.buildTestCertificateWithCnAtEnd()); + Object principal = this.extractor.extractPrincipal(X509TestUtils.buildTestCertificateWithCnAtEnd()); assertThat(principal).isEqualTo("Duke"); } diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java index 42bb0831fa..d6c2569e85 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java @@ -58,17 +58,17 @@ public class AbstractRememberMeServicesTests { @Before public void setup() { - uds = new MockUserDetailsService(joe, false); + this.uds = new MockUserDetailsService(joe, false); } @Test(expected = InvalidCookieException.class) public void nonBase64CookieShouldBeDetected() { - new MockRememberMeServices(uds).decodeCookie("nonBase64CookieValue%"); + new MockRememberMeServices(this.uds).decodeCookie("nonBase64CookieValue%"); } @Test public void setAndGetAreConsistent() throws Exception { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); assertThat(services.getCookieName()).isNotNull(); assertThat(services.getParameter()).isNotNull(); assertThat(services.getKey()).isEqualTo("xxxx"); @@ -78,7 +78,7 @@ public class AbstractRememberMeServicesTests { assertThat(services.getCookieName()).isEqualTo("kookie"); services.setTokenValiditySeconds(600); assertThat(services.getTokenValiditySeconds()).isEqualTo(600); - assertThat(services.getUserDetailsService()).isSameAs(uds); + assertThat(services.getUserDetailsService()).isSameAs(this.uds); AuthenticationDetailsSource ads = Mockito.mock(AuthenticationDetailsSource.class); services.setAuthenticationDetailsSource(ads); assertThat(services.getAuthenticationDetailsSource()).isSameAs(ads); @@ -88,7 +88,7 @@ public class AbstractRememberMeServicesTests { @Test public void cookieShouldBeCorrectlyEncodedAndDecoded() { String[] cookie = new String[] { "name:with:colon", "cookie", "tokens", "blah" }; - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); String encoded = services.encodeCookie(cookie); // '=' aren't allowed in version 0 cookies. @@ -101,7 +101,7 @@ public class AbstractRememberMeServicesTests { @Test public void cookieWithOpenIDidentifierAsNameIsEncodedAndDecoded() { String[] cookie = new String[] { "https://id.openid.zz", "cookie", "tokens", "blah" }; - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); String[] decoded = services.decodeCookie(services.encodeCookie(cookie)); assertThat(decoded).hasSize(4); @@ -116,7 +116,7 @@ public class AbstractRememberMeServicesTests { @Test public void autoLoginShouldReturnNullIfNoLoginCookieIsPresented() { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); @@ -135,7 +135,7 @@ public class AbstractRememberMeServicesTests { @Test public void successfulAutoLoginReturnsExpectedAuthentication() throws Exception { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); services.afterPropertiesSet(); assertThat(services.getUserDetailsService()).isNotNull(); @@ -151,7 +151,7 @@ public class AbstractRememberMeServicesTests { @Test public void autoLoginShouldFailIfCookieIsNotBase64() { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); @@ -163,7 +163,7 @@ public class AbstractRememberMeServicesTests { @Test public void autoLoginShouldFailIfCookieIsEmpty() { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); @@ -191,8 +191,8 @@ public class AbstractRememberMeServicesTests { @Test public void autoLoginShouldFailIfUserNotFound() { - uds.setThrowException(true); - MockRememberMeServices services = new MockRememberMeServices(uds); + this.uds.setThrowException(true); + MockRememberMeServices services = new MockRememberMeServices(this.uds); MockHttpServletRequest request = new MockHttpServletRequest(); request.setCookies(createLoginCookie("cookie:1:2")); @@ -207,9 +207,9 @@ public class AbstractRememberMeServicesTests { @Test public void autoLoginShouldFailIfUserAccountIsLocked() { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); services.setUserDetailsChecker(new AccountStatusUserDetailsChecker()); - uds.toReturn = new User("joe", "password", false, true, true, true, joe.getAuthorities()); + this.uds.toReturn = new User("joe", "password", false, true, true, true, joe.getAuthorities()); MockHttpServletRequest request = new MockHttpServletRequest(); request.setCookies(createLoginCookie("cookie:1:2")); @@ -224,8 +224,8 @@ public class AbstractRememberMeServicesTests { @Test public void loginFailShouldCancelCookie() { - uds.setThrowException(true); - MockRememberMeServices services = new MockRememberMeServices(uds); + this.uds.setThrowException(true); + MockRememberMeServices services = new MockRememberMeServices(this.uds); MockHttpServletRequest request = new MockHttpServletRequest(); request.setContextPath("contextpath"); @@ -239,7 +239,7 @@ public class AbstractRememberMeServicesTests { @Test public void logoutShouldCancelCookie() { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); services.setCookieDomain("spring.io"); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -261,7 +261,7 @@ public class AbstractRememberMeServicesTests { @Test public void cancelledCookieShouldUseSecureFlag() { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); services.setCookieDomain("spring.io"); services.setUseSecureCookie(true); @@ -285,7 +285,7 @@ public class AbstractRememberMeServicesTests { @Test public void cancelledCookieShouldUseRequestIsSecure() { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); services.setCookieDomain("spring.io"); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -309,7 +309,7 @@ public class AbstractRememberMeServicesTests { @Test(expected = CookieTheftException.class) public void cookieTheftExceptionShouldBeRethrown() { - MockRememberMeServices services = new MockRememberMeServices(uds) { + MockRememberMeServices services = new MockRememberMeServices(this.uds) { protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request, HttpServletResponse response) { @@ -327,7 +327,7 @@ public class AbstractRememberMeServicesTests { @Test public void loginSuccessCallsOnLoginSuccessCorrectly() { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); @@ -338,26 +338,26 @@ public class AbstractRememberMeServicesTests { assertThat(services.loginSuccessCalled).isFalse(); // Parameter set to true - services = new MockRememberMeServices(uds); + services = new MockRememberMeServices(this.uds); request.setParameter(MockRememberMeServices.DEFAULT_PARAMETER, "true"); services.loginSuccess(request, response, auth); assertThat(services.loginSuccessCalled).isTrue(); // Different parameter name, set to true - services = new MockRememberMeServices(uds); + services = new MockRememberMeServices(this.uds); services.setParameter("my_parameter"); request.setParameter("my_parameter", "true"); services.loginSuccess(request, response, auth); assertThat(services.loginSuccessCalled).isTrue(); // Parameter set to false - services = new MockRememberMeServices(uds); + services = new MockRememberMeServices(this.uds); request.setParameter(MockRememberMeServices.DEFAULT_PARAMETER, "false"); services.loginSuccess(request, response, auth); assertThat(services.loginSuccessCalled).isFalse(); // alwaysRemember set to true - services = new MockRememberMeServices(uds); + services = new MockRememberMeServices(this.uds); services.setAlwaysRemember(true); services.loginSuccess(request, response, auth); assertThat(services.loginSuccessCalled).isTrue(); @@ -368,7 +368,7 @@ public class AbstractRememberMeServicesTests { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); request.setContextPath("contextpath"); - MockRememberMeServices services = new MockRememberMeServices(uds) { + MockRememberMeServices services = new MockRememberMeServices(this.uds) { protected String encodeCookie(String[] cookieTokens) { return cookieTokens[0]; @@ -391,7 +391,7 @@ public class AbstractRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); request.setContextPath("contextpath"); - MockRememberMeServices services = new MockRememberMeServices(uds) { + MockRememberMeServices services = new MockRememberMeServices(this.uds) { protected String encodeCookie(String[] cookieTokens) { return cookieTokens[0]; @@ -409,7 +409,7 @@ public class AbstractRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); request.setContextPath("contextpath"); - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); services.setCookie(new String[] { "mycookie" }, 1000, request, response); Cookie cookie = response.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); assertThat(cookie.isHttpOnly()).isTrue(); @@ -470,7 +470,7 @@ public class AbstractRememberMeServicesTests { } private Cookie[] createLoginCookie(String cookieToken) { - MockRememberMeServices services = new MockRememberMeServices(uds); + MockRememberMeServices services = new MockRememberMeServices(this.uds); Cookie cookie = new Cookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY, services.encodeCookie(StringUtils.delimitedListToStringArray(cookieToken, ":"))); @@ -501,7 +501,7 @@ public class AbstractRememberMeServicesTests { protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) { - loginSuccessCalled = true; + this.loginSuccessCalled = true; } protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request, @@ -533,11 +533,11 @@ public class AbstractRememberMeServicesTests { } public UserDetails loadUserByUsername(String username) { - if (throwException) { + if (this.throwException) { throw new UsernameNotFoundException("as requested by mock"); } - return toReturn; + return this.toReturn; } public void setThrowException(boolean value) { diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java index 595be85ccf..0f2b2c693b 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java @@ -75,27 +75,27 @@ public class JdbcTokenRepositoryImplTests { @Before public void populateDatabase() { - repo = new JdbcTokenRepositoryImpl(); - ReflectionTestUtils.setField(repo, "logger", logger); - repo.setDataSource(dataSource); - repo.initDao(); - template = repo.getJdbcTemplate(); - template.execute("create table persistent_logins (username varchar(100) not null, " + this.repo = new JdbcTokenRepositoryImpl(); + ReflectionTestUtils.setField(this.repo, "logger", this.logger); + this.repo.setDataSource(dataSource); + this.repo.initDao(); + this.template = this.repo.getJdbcTemplate(); + this.template.execute("create table persistent_logins (username varchar(100) not null, " + "series varchar(100) not null, token varchar(500) not null, last_used timestamp not null)"); } @After public void clearData() { - template.execute("drop table persistent_logins"); + this.template.execute("drop table persistent_logins"); } @Test public void createNewTokenInsertsCorrectData() { Timestamp currentDate = new Timestamp(Calendar.getInstance().getTimeInMillis()); PersistentRememberMeToken token = new PersistentRememberMeToken("joeuser", "joesseries", "atoken", currentDate); - repo.createNewToken(token); + this.repo.createNewToken(token); - Map results = template.queryForMap("select * from persistent_logins"); + Map results = this.template.queryForMap("select * from persistent_logins"); assertThat(results.get("last_used")).isEqualTo(currentDate); assertThat(results.get("username")).isEqualTo("joeuser"); @@ -106,9 +106,9 @@ public class JdbcTokenRepositoryImplTests { @Test public void retrievingTokenReturnsCorrectData() { - template.execute("insert into persistent_logins (series, username, token, last_used) values " + this.template.execute("insert into persistent_logins (series, username, token, last_used) values " + "('joesseries', 'joeuser', 'atoken', '2007-10-09 18:19:25.000000000')"); - PersistentRememberMeToken token = repo.getTokenForSeries("joesseries"); + PersistentRememberMeToken token = this.repo.getTokenForSeries("joesseries"); assertThat(token.getUsername()).isEqualTo("joeuser"); assertThat(token.getSeries()).isEqualTo("joesseries"); @@ -118,45 +118,45 @@ public class JdbcTokenRepositoryImplTests { @Test public void retrievingTokenWithDuplicateSeriesReturnsNull() { - template.execute("insert into persistent_logins (series, username, token, last_used) values " + this.template.execute("insert into persistent_logins (series, username, token, last_used) values " + "('joesseries', 'joeuser', 'atoken2', '2007-10-19 18:19:25.000000000')"); - template.execute("insert into persistent_logins (series, username, token, last_used) values " + this.template.execute("insert into persistent_logins (series, username, token, last_used) values " + "('joesseries', 'joeuser', 'atoken', '2007-10-09 18:19:25.000000000')"); // List results = // template.queryForList("select * from persistent_logins where series = // 'joesseries'"); - assertThat(repo.getTokenForSeries("joesseries")).isNull(); + assertThat(this.repo.getTokenForSeries("joesseries")).isNull(); } // SEC-1964 @Test public void retrievingTokenWithNoSeriesReturnsNull() { - when(logger.isDebugEnabled()).thenReturn(true); + when(this.logger.isDebugEnabled()).thenReturn(true); - assertThat(repo.getTokenForSeries("missingSeries")).isNull(); + assertThat(this.repo.getTokenForSeries("missingSeries")).isNull(); - verify(logger).isDebugEnabled(); - verify(logger).debug(eq("Querying token for series 'missingSeries' returned no results."), + verify(this.logger).isDebugEnabled(); + verify(this.logger).debug(eq("Querying token for series 'missingSeries' returned no results."), any(EmptyResultDataAccessException.class)); - verifyNoMoreInteractions(logger); + verifyNoMoreInteractions(this.logger); } @Test public void removingUserTokensDeletesData() { - template.execute("insert into persistent_logins (series, username, token, last_used) values " + this.template.execute("insert into persistent_logins (series, username, token, last_used) values " + "('joesseries2', 'joeuser', 'atoken2', '2007-10-19 18:19:25.000000000')"); - template.execute("insert into persistent_logins (series, username, token, last_used) values " + this.template.execute("insert into persistent_logins (series, username, token, last_used) values " + "('joesseries', 'joeuser', 'atoken', '2007-10-09 18:19:25.000000000')"); // List results = // template.queryForList("select * from persistent_logins where series = // 'joesseries'"); - repo.removeUserTokens("joeuser"); + this.repo.removeUserTokens("joeuser"); - List> results = template + List> results = this.template .queryForList("select * from persistent_logins where username = 'joeuser'"); assertThat(results).isEmpty(); @@ -165,11 +165,11 @@ public class JdbcTokenRepositoryImplTests { @Test public void updatingTokenModifiesTokenValueAndLastUsed() { Timestamp ts = new Timestamp(System.currentTimeMillis() - 1); - template.execute("insert into persistent_logins (series, username, token, last_used) values " + this.template.execute("insert into persistent_logins (series, username, token, last_used) values " + "('joesseries', 'joeuser', 'atoken', '" + ts.toString() + "')"); - repo.updateToken("joesseries", "newtoken", new Date()); + this.repo.updateToken("joesseries", "newtoken", new Date()); - Map results = template + Map results = this.template .queryForMap("select * from persistent_logins where series = 'joesseries'"); assertThat(results.get("username")).isEqualTo("joeuser"); @@ -181,13 +181,13 @@ public class JdbcTokenRepositoryImplTests { @Test public void createTableOnStartupCreatesCorrectTable() { - template.execute("drop table persistent_logins"); - repo = new JdbcTokenRepositoryImpl(); - repo.setDataSource(dataSource); - repo.setCreateTableOnStartup(true); - repo.initDao(); + this.template.execute("drop table persistent_logins"); + this.repo = new JdbcTokenRepositoryImpl(); + this.repo.setDataSource(dataSource); + this.repo.setCreateTableOnStartup(true); + this.repo.initDao(); - template.queryForList("select username,series,token,last_used from persistent_logins"); + this.template.queryForList("select username,series,token,last_used from persistent_logins"); } // SEC-2879 diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java index 6d72826eb5..addb75cb0e 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java @@ -41,75 +41,76 @@ public class PersistentTokenBasedRememberMeServicesTests { @Before public void setUpData() throws Exception { - services = new PersistentTokenBasedRememberMeServices("key", + this.services = new PersistentTokenBasedRememberMeServices("key", new AbstractRememberMeServicesTests.MockUserDetailsService(AbstractRememberMeServicesTests.joe, false), new InMemoryTokenRepositoryImpl()); - services.setCookieName("mycookiename"); + this.services.setCookieName("mycookiename"); // Default to 100 days (see SEC-1081). - services.setTokenValiditySeconds(100 * 24 * 60 * 60); - services.afterPropertiesSet(); + this.services.setTokenValiditySeconds(100 * 24 * 60 * 60); + this.services.afterPropertiesSet(); } @Test(expected = InvalidCookieException.class) public void loginIsRejectedWithWrongNumberOfCookieTokens() { - services.processAutoLoginCookie(new String[] { "series", "token", "extra" }, new MockHttpServletRequest(), + this.services.processAutoLoginCookie(new String[] { "series", "token", "extra" }, new MockHttpServletRequest(), new MockHttpServletResponse()); } @Test(expected = RememberMeAuthenticationException.class) public void loginIsRejectedWhenNoTokenMatchingSeriesIsFound() { - services = create(null); - services.processAutoLoginCookie(new String[] { "series", "token" }, new MockHttpServletRequest(), + this.services = create(null); + this.services.processAutoLoginCookie(new String[] { "series", "token" }, new MockHttpServletRequest(), new MockHttpServletResponse()); } @Test(expected = RememberMeAuthenticationException.class) public void loginIsRejectedWhenTokenIsExpired() { - services = create(new PersistentRememberMeToken("joe", "series", "token", + this.services = create(new PersistentRememberMeToken("joe", "series", "token", new Date(System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(1) - 100))); - services.setTokenValiditySeconds(1); + this.services.setTokenValiditySeconds(1); - services.processAutoLoginCookie(new String[] { "series", "token" }, new MockHttpServletRequest(), + this.services.processAutoLoginCookie(new String[] { "series", "token" }, new MockHttpServletRequest(), new MockHttpServletResponse()); } @Test(expected = CookieTheftException.class) public void cookieTheftIsDetectedWhenSeriesAndTokenDontMatch() { - services = create(new PersistentRememberMeToken("joe", "series", "wrongtoken", new Date())); - services.processAutoLoginCookie(new String[] { "series", "token" }, new MockHttpServletRequest(), + this.services = create(new PersistentRememberMeToken("joe", "series", "wrongtoken", new Date())); + this.services.processAutoLoginCookie(new String[] { "series", "token" }, new MockHttpServletRequest(), new MockHttpServletResponse()); } @Test public void successfulAutoLoginCreatesNewTokenAndCookieWithSameSeries() { - services = create(new PersistentRememberMeToken("joe", "series", "token", new Date())); + this.services = create(new PersistentRememberMeToken("joe", "series", "token", new Date())); // 12 => b64 length will be 16 - services.setTokenLength(12); + this.services.setTokenLength(12); MockHttpServletResponse response = new MockHttpServletResponse(); - services.processAutoLoginCookie(new String[] { "series", "token" }, new MockHttpServletRequest(), response); - assertThat(repo.getStoredToken().getSeries()).isEqualTo("series"); - assertThat(repo.getStoredToken().getTokenValue().length()).isEqualTo(16); - String[] cookie = services.decodeCookie(response.getCookie("mycookiename").getValue()); + this.services.processAutoLoginCookie(new String[] { "series", "token" }, new MockHttpServletRequest(), + response); + assertThat(this.repo.getStoredToken().getSeries()).isEqualTo("series"); + assertThat(this.repo.getStoredToken().getTokenValue().length()).isEqualTo(16); + String[] cookie = this.services.decodeCookie(response.getCookie("mycookiename").getValue()); assertThat(cookie[0]).isEqualTo("series"); - assertThat(cookie[1]).isEqualTo(repo.getStoredToken().getTokenValue()); + assertThat(cookie[1]).isEqualTo(this.repo.getStoredToken().getTokenValue()); } @Test public void loginSuccessCreatesNewTokenAndCookieWithNewSeries() { - services = create(null); - services.setAlwaysRemember(true); - services.setTokenLength(12); - services.setSeriesLength(12); + this.services = create(null); + this.services.setAlwaysRemember(true); + this.services.setTokenLength(12); + this.services.setSeriesLength(12); MockHttpServletResponse response = new MockHttpServletResponse(); - services.loginSuccess(new MockHttpServletRequest(), response, + this.services.loginSuccess(new MockHttpServletRequest(), response, new UsernamePasswordAuthenticationToken("joe", "password")); - assertThat(repo.getStoredToken().getSeries().length()).isEqualTo(16); - assertThat(repo.getStoredToken().getTokenValue().length()).isEqualTo(16); + assertThat(this.repo.getStoredToken().getSeries().length()).isEqualTo(16); + assertThat(this.repo.getStoredToken().getTokenValue().length()).isEqualTo(16); - String[] cookie = services.decodeCookie(response.getCookie("mycookiename").getValue()); + String[] cookie = this.services.decodeCookie(response.getCookie("mycookiename").getValue()); - assertThat(cookie[0]).isEqualTo(repo.getStoredToken().getSeries()); - assertThat(cookie[1]).isEqualTo(repo.getStoredToken().getTokenValue()); + assertThat(cookie[0]).isEqualTo(this.repo.getStoredToken().getSeries()); + assertThat(cookie[1]).isEqualTo(this.repo.getStoredToken().getTokenValue()); } @Test @@ -118,21 +119,21 @@ public class PersistentTokenBasedRememberMeServicesTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.setCookies(cookie); MockHttpServletResponse response = new MockHttpServletResponse(); - services = create(new PersistentRememberMeToken("joe", "series", "token", new Date())); - services.logout(request, response, new TestingAuthenticationToken("joe", "somepass", "SOME_AUTH")); + this.services = create(new PersistentRememberMeToken("joe", "series", "token", new Date())); + this.services.logout(request, response, new TestingAuthenticationToken("joe", "somepass", "SOME_AUTH")); Cookie returnedCookie = response.getCookie("mycookiename"); assertThat(returnedCookie).isNotNull(); assertThat(returnedCookie.getMaxAge()).isZero(); // SEC-1280 - services.logout(request, response, null); + this.services.logout(request, response, null); } private PersistentTokenBasedRememberMeServices create(PersistentRememberMeToken token) { - repo = new MockTokenRepository(token); + this.repo = new MockTokenRepository(token); PersistentTokenBasedRememberMeServices services = new PersistentTokenBasedRememberMeServices("key", new AbstractRememberMeServicesTests.MockUserDetailsService(AbstractRememberMeServicesTests.joe, false), - repo); + this.repo); services.setCookieName("mycookiename"); return services; @@ -143,27 +144,27 @@ public class PersistentTokenBasedRememberMeServicesTests { private PersistentRememberMeToken storedToken; private MockTokenRepository(PersistentRememberMeToken token) { - storedToken = token; + this.storedToken = token; } public void createNewToken(PersistentRememberMeToken token) { - storedToken = token; + this.storedToken = token; } public void updateToken(String series, String tokenValue, Date lastUsed) { - storedToken = new PersistentRememberMeToken(storedToken.getUsername(), storedToken.getSeries(), tokenValue, - lastUsed); + this.storedToken = new PersistentRememberMeToken(this.storedToken.getUsername(), + this.storedToken.getSeries(), tokenValue, lastUsed); } public PersistentRememberMeToken getTokenForSeries(String seriesId) { - return storedToken; + return this.storedToken; } public void removeUserTokens(String username) { } PersistentRememberMeToken getStoredToken() { - return storedToken; + return this.storedToken; } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java index 73b76b5463..8db5ac7cc6 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java @@ -81,7 +81,7 @@ public class RememberMeAuthenticationFilterTests { // Setup our filter correctly RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(mock(AuthenticationManager.class), - new MockRememberMeServices(remembered)); + new MockRememberMeServices(this.remembered)); filter.afterPropertiesSet(); // Test @@ -98,10 +98,10 @@ public class RememberMeAuthenticationFilterTests { @Test public void testOperationWhenNoAuthenticationInContextHolder() throws Exception { AuthenticationManager am = mock(AuthenticationManager.class); - when(am.authenticate(remembered)).thenReturn(remembered); + when(am.authenticate(this.remembered)).thenReturn(this.remembered); RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(am, - new MockRememberMeServices(remembered)); + new MockRememberMeServices(this.remembered)); filter.afterPropertiesSet(); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -110,7 +110,7 @@ public class RememberMeAuthenticationFilterTests { filter.doFilter(request, new MockHttpServletResponse(), fc); // Ensure filter setup with our remembered authentication object - assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(remembered); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(this.remembered); verify(fc).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); } @@ -121,7 +121,7 @@ public class RememberMeAuthenticationFilterTests { when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException("")); RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(am, - new MockRememberMeServices(remembered)) { + new MockRememberMeServices(this.remembered)) { protected void onUnsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response, AuthenticationException failed) { super.onUnsuccessfulAuthentication(request, response, failed); @@ -143,9 +143,9 @@ public class RememberMeAuthenticationFilterTests { @Test public void authenticationSuccessHandlerIsInvokedOnSuccessfulAuthenticationIfSet() throws Exception { AuthenticationManager am = mock(AuthenticationManager.class); - when(am.authenticate(remembered)).thenReturn(remembered); + when(am.authenticate(this.remembered)).thenReturn(this.remembered); RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(am, - new MockRememberMeServices(remembered)); + new MockRememberMeServices(this.remembered)); filter.setAuthenticationSuccessHandler(new SimpleUrlAuthenticationSuccessHandler("/target")); MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); @@ -168,7 +168,7 @@ public class RememberMeAuthenticationFilterTests { } public Authentication autoLogin(HttpServletRequest request, HttpServletResponse response) { - return authToReturn; + return this.authToReturn; } public void loginFail(HttpServletRequest request, HttpServletResponse response) { diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java index e32c53b971..f9e6ed94c4 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java @@ -62,20 +62,20 @@ public class TokenBasedRememberMeServicesTests { @Before public void createTokenBasedRememberMeServices() { - uds = mock(UserDetailsService.class); - services = new TokenBasedRememberMeServices("key", uds); + this.uds = mock(UserDetailsService.class); + this.services = new TokenBasedRememberMeServices("key", this.uds); } void udsWillReturnUser() { - when(uds.loadUserByUsername(any(String.class))).thenReturn(user); + when(this.uds.loadUserByUsername(any(String.class))).thenReturn(this.user); } void udsWillThrowNotFound() { - when(uds.loadUserByUsername(any(String.class))).thenThrow(new UsernameNotFoundException("")); + when(this.uds.loadUserByUsername(any(String.class))).thenThrow(new UsernameNotFoundException("")); } void udsWillReturnNull() { - when(uds.loadUserByUsername(any(String.class))).thenReturn(null); + when(this.uds.loadUserByUsername(any(String.class))).thenReturn(null); } private long determineExpiryTimeFromBased64EncodedToken(String validToken) { @@ -107,7 +107,7 @@ public class TokenBasedRememberMeServicesTests { public void autoLoginReturnsNullIfNoCookiePresented() { MockHttpServletResponse response = new MockHttpServletResponse(); - Authentication result = services.autoLogin(new MockHttpServletRequest(), response); + Authentication result = this.services.autoLogin(new MockHttpServletRequest(), response); assertThat(result).isNull(); // No cookie set assertThat(response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY)).isNull(); @@ -120,7 +120,7 @@ public class TokenBasedRememberMeServicesTests { request.setCookies(cookie); MockHttpServletResponse response = new MockHttpServletResponse(); - Authentication result = services.autoLogin(request, response); + Authentication result = this.services.autoLogin(request, response); assertThat(result).isNull(); assertThat(response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY)).isNull(); @@ -135,7 +135,7 @@ public class TokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); - assertThat(services.autoLogin(request, response)).isNull(); + assertThat(this.services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); assertThat(returnedCookie).isNotNull(); assertThat(returnedCookie.getMaxAge()).isZero(); @@ -149,7 +149,7 @@ public class TokenBasedRememberMeServicesTests { request.setCookies(cookie); MockHttpServletResponse response = new MockHttpServletResponse(); - assertThat(services.autoLogin(request, response)).isNull(); + assertThat(this.services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); assertThat(returnedCookie).isNotNull(); @@ -163,7 +163,7 @@ public class TokenBasedRememberMeServicesTests { request.setCookies(cookie); MockHttpServletResponse response = new MockHttpServletResponse(); - assertThat(services.autoLogin(request, response)).isNull(); + assertThat(this.services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); assertThat(returnedCookie).isNotNull(); @@ -180,7 +180,7 @@ public class TokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); - assertThat(services.autoLogin(request, response)).isNull(); + assertThat(this.services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); assertThat(returnedCookie).isNotNull(); @@ -195,7 +195,7 @@ public class TokenBasedRememberMeServicesTests { request.setCookies(cookie); MockHttpServletResponse response = new MockHttpServletResponse(); - assertThat(services.autoLogin(request, response)).isNull(); + assertThat(this.services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); assertThat(returnedCookie).isNotNull(); @@ -212,7 +212,7 @@ public class TokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); - assertThat(services.autoLogin(request, response)).isNull(); + assertThat(this.services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); assertThat(returnedCookie).isNotNull(); @@ -229,7 +229,7 @@ public class TokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); - services.autoLogin(request, response); + this.services.autoLogin(request, response); } @Test @@ -242,31 +242,31 @@ public class TokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); - Authentication result = services.autoLogin(request, response); + Authentication result = this.services.autoLogin(request, response); assertThat(result).isNotNull(); - assertThat(result.getPrincipal()).isEqualTo(user); + assertThat(result.getPrincipal()).isEqualTo(this.user); } @Test public void testGettersSetters() { - assertThat(services.getUserDetailsService()).isEqualTo(uds); + assertThat(this.services.getUserDetailsService()).isEqualTo(this.uds); - assertThat(services.getKey()).isEqualTo("key"); + assertThat(this.services.getKey()).isEqualTo("key"); - assertThat(services.getParameter()).isEqualTo(DEFAULT_PARAMETER); - services.setParameter("some_param"); - assertThat(services.getParameter()).isEqualTo("some_param"); + assertThat(this.services.getParameter()).isEqualTo(DEFAULT_PARAMETER); + this.services.setParameter("some_param"); + assertThat(this.services.getParameter()).isEqualTo("some_param"); - services.setTokenValiditySeconds(12); - assertThat(services.getTokenValiditySeconds()).isEqualTo(12); + this.services.setTokenValiditySeconds(12); + assertThat(this.services.getTokenValiditySeconds()).isEqualTo(12); } @Test public void loginFailClearsCookie() { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); - services.loginFail(request, response); + this.services.loginFail(request, response); Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); assertThat(cookie).isNotNull(); @@ -290,20 +290,21 @@ public class TokenBasedRememberMeServicesTests { @Test public void loginSuccessNormalWithNonUserDetailsBasedPrincipalSetsExpectedCookie() { // SEC-822 - services.setTokenValiditySeconds(500000000); + this.services.setTokenValiditySeconds(500000000); MockHttpServletRequest request = new MockHttpServletRequest(); request.addParameter(TokenBasedRememberMeServices.DEFAULT_PARAMETER, "true"); MockHttpServletResponse response = new MockHttpServletResponse(); - services.loginSuccess(request, response, new TestingAuthenticationToken("someone", "password", "ROLE_ABC")); + this.services.loginSuccess(request, response, + new TestingAuthenticationToken("someone", "password", "ROLE_ABC")); Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - String expiryTime = services.decodeCookie(cookie.getValue())[1]; + String expiryTime = this.services.decodeCookie(cookie.getValue())[1]; long expectedExpiryTime = 1000L * 500000000; expectedExpiryTime += System.currentTimeMillis(); assertThat(Long.parseLong(expiryTime) > expectedExpiryTime - 10000).isTrue(); assertThat(cookie).isNotNull(); - assertThat(cookie.getMaxAge()).isEqualTo(services.getTokenValiditySeconds()); + assertThat(cookie.getMaxAge()).isEqualTo(this.services.getTokenValiditySeconds()); assertThat(Base64.isArrayByteBase64(cookie.getValue().getBytes())).isTrue(); assertThat(new Date().before(new Date(determineExpiryTimeFromBased64EncodedToken(cookie.getValue())))).isTrue(); } @@ -314,11 +315,12 @@ public class TokenBasedRememberMeServicesTests { request.addParameter(TokenBasedRememberMeServices.DEFAULT_PARAMETER, "true"); MockHttpServletResponse response = new MockHttpServletResponse(); - services.loginSuccess(request, response, new TestingAuthenticationToken("someone", "password", "ROLE_ABC")); + this.services.loginSuccess(request, response, + new TestingAuthenticationToken("someone", "password", "ROLE_ABC")); Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); assertThat(cookie).isNotNull(); - assertThat(cookie.getMaxAge()).isEqualTo(services.getTokenValiditySeconds()); + assertThat(cookie.getMaxAge()).isEqualTo(this.services.getTokenValiditySeconds()); assertThat(Base64.isArrayByteBase64(cookie.getValue().getBytes())).isTrue(); assertThat(new Date().before(new Date(determineExpiryTimeFromBased64EncodedToken(cookie.getValue())))).isTrue(); } @@ -327,7 +329,7 @@ public class TokenBasedRememberMeServicesTests { @Test public void obtainPasswordReturnsNullForTokenWithNullCredentials() { TestingAuthenticationToken token = new TestingAuthenticationToken("username", null); - assertThat(services.retrievePassword(token)).isNull(); + assertThat(this.services.retrievePassword(token)).isNull(); } // SEC-949 @@ -337,8 +339,9 @@ public class TokenBasedRememberMeServicesTests { request.addParameter(DEFAULT_PARAMETER, "true"); MockHttpServletResponse response = new MockHttpServletResponse(); - services.setTokenValiditySeconds(-1); - services.loginSuccess(request, response, new TestingAuthenticationToken("someone", "password", "ROLE_ABC")); + this.services.setTokenValiditySeconds(-1); + this.services.loginSuccess(request, response, + new TestingAuthenticationToken("someone", "password", "ROLE_ABC")); Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); assertThat(cookie).isNotNull(); diff --git a/web/src/test/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategyTests.java index a55f7799f0..c840dd570b 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategyTests.java @@ -74,30 +74,30 @@ public class CompositeSessionAuthenticationStrategyTests { @Test public void delegatesToAll() { CompositeSessionAuthenticationStrategy strategy = new CompositeSessionAuthenticationStrategy( - Arrays.asList(strategy1, strategy2)); - strategy.onAuthentication(authentication, request, response); + Arrays.asList(this.strategy1, this.strategy2)); + strategy.onAuthentication(this.authentication, this.request, this.response); - verify(strategy1).onAuthentication(authentication, request, response); - verify(strategy2).onAuthentication(authentication, request, response); + verify(this.strategy1).onAuthentication(this.authentication, this.request, this.response); + verify(this.strategy2).onAuthentication(this.authentication, this.request, this.response); } @Test public void delegateShortCircuits() { - doThrow(new SessionAuthenticationException("oops")).when(strategy1).onAuthentication(authentication, request, - response); + doThrow(new SessionAuthenticationException("oops")).when(this.strategy1).onAuthentication(this.authentication, + this.request, this.response); CompositeSessionAuthenticationStrategy strategy = new CompositeSessionAuthenticationStrategy( - Arrays.asList(strategy1, strategy2)); + Arrays.asList(this.strategy1, this.strategy2)); try { - strategy.onAuthentication(authentication, request, response); + strategy.onAuthentication(this.authentication, this.request, this.response); fail("Expected Exception"); } catch (SessionAuthenticationException success) { } - verify(strategy1).onAuthentication(authentication, request, response); - verify(strategy2, times(0)).onAuthentication(authentication, request, response); + verify(this.strategy1).onAuthentication(this.authentication, this.request, this.response); + verify(this.strategy2, times(0)).onAuthentication(this.authentication, this.request, this.response); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java index fc585794d2..9bcfc4b7dd 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java @@ -62,12 +62,13 @@ public class ConcurrentSessionControlAuthenticationStrategyTests { @Before public void setup() { - authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER"); - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); - sessionInformation = new SessionInformation(authentication.getPrincipal(), "unique", new Date(1374766134216L)); + this.authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER"); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); + this.sessionInformation = new SessionInformation(this.authentication.getPrincipal(), "unique", + new Date(1374766134216L)); - strategy = new ConcurrentSessionControlAuthenticationStrategy(sessionRegistry); + this.strategy = new ConcurrentSessionControlAuthenticationStrategy(this.sessionRegistry); } @Test(expected = IllegalArgumentException.class) @@ -77,84 +78,84 @@ public class ConcurrentSessionControlAuthenticationStrategyTests { @Test public void noRegisteredSession() { - when(sessionRegistry.getAllSessions(any(), anyBoolean())) + when(this.sessionRegistry.getAllSessions(any(), anyBoolean())) .thenReturn(Collections.emptyList()); - strategy.setMaximumSessions(1); - strategy.setExceptionIfMaximumExceeded(true); + this.strategy.setMaximumSessions(1); + this.strategy.setExceptionIfMaximumExceeded(true); - strategy.onAuthentication(authentication, request, response); + this.strategy.onAuthentication(this.authentication, this.request, this.response); // no exception } @Test public void maxSessionsSameSessionId() { - MockHttpSession session = new MockHttpSession(new MockServletContext(), sessionInformation.getSessionId()); - request.setSession(session); - when(sessionRegistry.getAllSessions(any(), anyBoolean())) - .thenReturn(Collections.singletonList(sessionInformation)); - strategy.setMaximumSessions(1); - strategy.setExceptionIfMaximumExceeded(true); + MockHttpSession session = new MockHttpSession(new MockServletContext(), this.sessionInformation.getSessionId()); + this.request.setSession(session); + when(this.sessionRegistry.getAllSessions(any(), anyBoolean())) + .thenReturn(Collections.singletonList(this.sessionInformation)); + this.strategy.setMaximumSessions(1); + this.strategy.setExceptionIfMaximumExceeded(true); - strategy.onAuthentication(authentication, request, response); + this.strategy.onAuthentication(this.authentication, this.request, this.response); // no exception } @Test(expected = SessionAuthenticationException.class) public void maxSessionsWithException() { - when(sessionRegistry.getAllSessions(any(), anyBoolean())) - .thenReturn(Collections.singletonList(sessionInformation)); - strategy.setMaximumSessions(1); - strategy.setExceptionIfMaximumExceeded(true); + when(this.sessionRegistry.getAllSessions(any(), anyBoolean())) + .thenReturn(Collections.singletonList(this.sessionInformation)); + this.strategy.setMaximumSessions(1); + this.strategy.setExceptionIfMaximumExceeded(true); - strategy.onAuthentication(authentication, request, response); + this.strategy.onAuthentication(this.authentication, this.request, this.response); } @Test public void maxSessionsExpireExistingUser() { - when(sessionRegistry.getAllSessions(any(), anyBoolean())) - .thenReturn(Collections.singletonList(sessionInformation)); - strategy.setMaximumSessions(1); + when(this.sessionRegistry.getAllSessions(any(), anyBoolean())) + .thenReturn(Collections.singletonList(this.sessionInformation)); + this.strategy.setMaximumSessions(1); - strategy.onAuthentication(authentication, request, response); + this.strategy.onAuthentication(this.authentication, this.request, this.response); - assertThat(sessionInformation.isExpired()).isTrue(); + assertThat(this.sessionInformation.isExpired()).isTrue(); } @Test public void maxSessionsExpireLeastRecentExistingUser() { - SessionInformation moreRecentSessionInfo = new SessionInformation(authentication.getPrincipal(), "unique", + SessionInformation moreRecentSessionInfo = new SessionInformation(this.authentication.getPrincipal(), "unique", new Date(1374766999999L)); - when(sessionRegistry.getAllSessions(any(), anyBoolean())) - .thenReturn(Arrays.asList(moreRecentSessionInfo, sessionInformation)); - strategy.setMaximumSessions(2); + when(this.sessionRegistry.getAllSessions(any(), anyBoolean())) + .thenReturn(Arrays.asList(moreRecentSessionInfo, this.sessionInformation)); + this.strategy.setMaximumSessions(2); - strategy.onAuthentication(authentication, request, response); + this.strategy.onAuthentication(this.authentication, this.request, this.response); - assertThat(sessionInformation.isExpired()).isTrue(); + assertThat(this.sessionInformation.isExpired()).isTrue(); } @Test public void onAuthenticationWhenMaxSessionsExceededByTwoThenTwoSessionsExpired() { - SessionInformation oldestSessionInfo = new SessionInformation(authentication.getPrincipal(), "unique1", + SessionInformation oldestSessionInfo = new SessionInformation(this.authentication.getPrincipal(), "unique1", new Date(1374766134214L)); - SessionInformation secondOldestSessionInfo = new SessionInformation(authentication.getPrincipal(), "unique2", - new Date(1374766134215L)); - when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn( - Arrays.asList(oldestSessionInfo, secondOldestSessionInfo, sessionInformation)); - strategy.setMaximumSessions(2); + SessionInformation secondOldestSessionInfo = new SessionInformation(this.authentication.getPrincipal(), + "unique2", new Date(1374766134215L)); + when(this.sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn( + Arrays.asList(oldestSessionInfo, secondOldestSessionInfo, this.sessionInformation)); + this.strategy.setMaximumSessions(2); - strategy.onAuthentication(authentication, request, response); + this.strategy.onAuthentication(this.authentication, this.request, this.response); assertThat(oldestSessionInfo.isExpired()).isTrue(); assertThat(secondOldestSessionInfo.isExpired()).isTrue(); - assertThat(sessionInformation.isExpired()).isFalse(); + assertThat(this.sessionInformation.isExpired()).isFalse(); } @Test(expected = IllegalArgumentException.class) public void setMessageSourceNull() { - strategy.setMessageSource(null); + this.strategy.setMessageSource(null); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategyTests.java index 389841c2c9..bcc1747e54 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategyTests.java @@ -49,10 +49,10 @@ public class RegisterSessionAuthenticationStrategyTests { @Before public void setup() { - authenticationStrategy = new RegisterSessionAuthenticationStrategy(registry); - authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER"); - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); + this.authenticationStrategy = new RegisterSessionAuthenticationStrategy(this.registry); + this.authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER"); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); } @Test(expected = IllegalArgumentException.class) @@ -62,9 +62,9 @@ public class RegisterSessionAuthenticationStrategyTests { @Test public void onAuthenticationRegistersSession() { - authenticationStrategy.onAuthentication(authentication, request, response); + this.authenticationStrategy.onAuthentication(this.authentication, this.request, this.response); - verify(registry).registerNewSession(request.getSession().getId(), authentication.getPrincipal()); + verify(this.registry).registerNewSession(this.request.getSession().getId(), this.authentication.getPrincipal()); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java index 3c4979448c..3a4b5e401a 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java @@ -500,8 +500,8 @@ public class SwitchUserFilterTests { // gh-3697 @Test public void switchAuthorityRoleCannotBeNull() { - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("switchAuthorityRole cannot be null"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("switchAuthorityRole cannot be null"); switchToUserWithAuthorityRole("dano", null); } @@ -559,16 +559,16 @@ public class SwitchUserFilterTests { // wofat (account expired) // steve (credentials expired) if ("jacklord".equals(username) || "dano".equals(username)) { - return new User(username, password, true, true, true, true, ROLES_12); + return new User(username, this.password, true, true, true, true, ROLES_12); } else if ("mcgarrett".equals(username)) { - return new User(username, password, false, true, true, true, ROLES_12); + return new User(username, this.password, false, true, true, true, ROLES_12); } else if ("wofat".equals(username)) { - return new User(username, password, true, false, true, true, ROLES_12); + return new User(username, this.password, true, false, true, true, ROLES_12); } else if ("steve".equals(username)) { - return new User(username, password, true, true, false, true, ROLES_12); + return new User(username, this.password, true, true, false, true, ROLES_12); } else { throw new UsernameNotFoundException("Could not find: " + username); diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationConverterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationConverterTests.java index 902538ac22..33d282965b 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationConverterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationConverterTests.java @@ -48,7 +48,7 @@ public class BasicAuthenticationConverterTests { @Before public void setup() { - converter = new BasicAuthenticationConverter(authenticationDetailsSource); + this.converter = new BasicAuthenticationConverter(this.authenticationDetailsSource); } @Test @@ -56,9 +56,9 @@ public class BasicAuthenticationConverterTests { String token = "rod:koala"; MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes()))); - UsernamePasswordAuthenticationToken authentication = converter.convert(request); + UsernamePasswordAuthenticationToken authentication = this.converter.convert(request); - verify(authenticationDetailsSource).buildDetails(any()); + verify(this.authenticationDetailsSource).buildDetails(any()); assertThat(authentication).isNotNull(); assertThat(authentication.getName()).isEqualTo("rod"); } @@ -68,9 +68,9 @@ public class BasicAuthenticationConverterTests { String token = "rod:koala"; MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Authorization", "BaSiC " + new String(Base64.encodeBase64(token.getBytes()))); - UsernamePasswordAuthenticationToken authentication = converter.convert(request); + UsernamePasswordAuthenticationToken authentication = this.converter.convert(request); - verify(authenticationDetailsSource).buildDetails(any()); + verify(this.authenticationDetailsSource).buildDetails(any()); assertThat(authentication).isNotNull(); assertThat(authentication.getName()).isEqualTo("rod"); } @@ -79,9 +79,9 @@ public class BasicAuthenticationConverterTests { public void testWhenUnsupportedAuthorizationHeaderThenIgnored() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Authorization", "Bearer someOtherToken"); - UsernamePasswordAuthenticationToken authentication = converter.convert(request); + UsernamePasswordAuthenticationToken authentication = this.converter.convert(request); - verifyZeroInteractions(authenticationDetailsSource); + verifyZeroInteractions(this.authenticationDetailsSource); assertThat(authentication).isNull(); } @@ -90,7 +90,7 @@ public class BasicAuthenticationConverterTests { String token = "NOT_A_VALID_TOKEN_AS_MISSING_COLON"; MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes()))); - converter.convert(request); + this.converter.convert(request); } @Test(expected = BadCredentialsException.class) @@ -98,7 +98,7 @@ public class BasicAuthenticationConverterTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Authorization", "Basic NOT_VALID_BASE64"); - converter.convert(request); + this.converter.convert(request); } @Test @@ -106,9 +106,9 @@ public class BasicAuthenticationConverterTests { String token = "rod:"; MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes()))); - UsernamePasswordAuthenticationToken authentication = converter.convert(request); + UsernamePasswordAuthenticationToken authentication = this.converter.convert(request); - verify(authenticationDetailsSource).buildDetails(any()); + verify(this.authenticationDetailsSource).buildDetails(any()); assertThat(authentication).isNotNull(); assertThat(authentication.getName()).isEqualTo("rod"); assertThat(authentication.getCredentials()).isEqualTo(""); @@ -118,7 +118,7 @@ public class BasicAuthenticationConverterTests { public void requestWhenEmptyBasicAuthorizationHeaderTokenThenError() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Authorization", "Basic "); - converter.convert(request); + this.converter.convert(request); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java index 10fa23917c..9367eac111 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java @@ -68,11 +68,11 @@ public class BasicAuthenticationFilterTests { Authentication rod = new UsernamePasswordAuthenticationToken("rod", "koala", AuthorityUtils.createAuthorityList("ROLE_1")); - manager = mock(AuthenticationManager.class); - when(manager.authenticate(rodRequest)).thenReturn(rod); - when(manager.authenticate(not(eq(rodRequest)))).thenThrow(new BadCredentialsException("")); + this.manager = mock(AuthenticationManager.class); + when(this.manager.authenticate(rodRequest)).thenReturn(rod); + when(this.manager.authenticate(not(eq(rodRequest)))).thenThrow(new BadCredentialsException("")); - filter = new BasicAuthenticationFilter(manager, new BasicAuthenticationEntryPoint()); + this.filter = new BasicAuthenticationFilter(this.manager, new BasicAuthenticationEntryPoint()); } @After @@ -88,7 +88,7 @@ public class BasicAuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, response, chain); + this.filter.doFilter(request, response, chain); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); @@ -98,8 +98,8 @@ public class BasicAuthenticationFilterTests { @Test public void testGettersSetters() { - assertThat(filter.getAuthenticationManager()).isNotNull(); - assertThat(filter.getAuthenticationEntryPoint()).isNotNull(); + assertThat(this.filter.getAuthenticationManager()).isNotNull(); + assertThat(this.filter.getAuthenticationEntryPoint()).isNotNull(); } @Test @@ -112,7 +112,7 @@ public class BasicAuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, response, chain); + this.filter.doFilter(request, response, chain); verify(chain, never()).doFilter(any(ServletRequest.class), any(ServletResponse.class)); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); @@ -128,7 +128,7 @@ public class BasicAuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, response, chain); + this.filter.doFilter(request, response, chain); // The filter chain shouldn't proceed verify(chain, never()).doFilter(any(ServletRequest.class), any(ServletResponse.class)); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); @@ -145,7 +145,7 @@ public class BasicAuthenticationFilterTests { // Test assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, new MockHttpServletResponse(), chain); + this.filter.doFilter(request, new MockHttpServletResponse(), chain); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); @@ -163,7 +163,7 @@ public class BasicAuthenticationFilterTests { // Test assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, new MockHttpServletResponse(), chain); + this.filter.doFilter(request, new MockHttpServletResponse(), chain); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); @@ -179,7 +179,7 @@ public class BasicAuthenticationFilterTests { assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, new MockHttpServletResponse(), chain); + this.filter.doFilter(request, new MockHttpServletResponse(), chain); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); @@ -193,7 +193,7 @@ public class BasicAuthenticationFilterTests { request.addHeader("Authorization", "SOME_OTHER_AUTHENTICATION_SCHEME"); request.setServletPath("/some_file.html"); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, new MockHttpServletResponse(), chain); + this.filter.doFilter(request, new MockHttpServletResponse(), chain); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); @@ -201,7 +201,7 @@ public class BasicAuthenticationFilterTests { @Test(expected = IllegalArgumentException.class) public void testStartupDetectsMissingAuthenticationEntryPoint() { - new BasicAuthenticationFilter(manager, null); + new BasicAuthenticationFilter(this.manager, null); } @Test(expected = IllegalArgumentException.class) @@ -218,7 +218,7 @@ public class BasicAuthenticationFilterTests { final MockHttpServletResponse response1 = new MockHttpServletResponse(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, response1, chain); + this.filter.doFilter(request, response1, chain); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); @@ -234,7 +234,7 @@ public class BasicAuthenticationFilterTests { final MockHttpServletResponse response2 = new MockHttpServletResponse(); chain = mock(FilterChain.class); - filter.doFilter(request, response2, chain); + this.filter.doFilter(request, response2, chain); verify(chain, never()).doFilter(any(ServletRequest.class), any(ServletResponse.class)); request.setServletPath("/some_file.html"); @@ -254,10 +254,10 @@ public class BasicAuthenticationFilterTests { request.setServletPath("/some_file.html"); request.setSession(new MockHttpSession()); - filter = new BasicAuthenticationFilter(manager); - assertThat(filter.isIgnoreFailure()).isTrue(); + this.filter = new BasicAuthenticationFilter(this.manager); + assertThat(this.filter.isIgnoreFailure()).isTrue(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, new MockHttpServletResponse(), chain); + this.filter.doFilter(request, new MockHttpServletResponse(), chain); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); @@ -272,11 +272,11 @@ public class BasicAuthenticationFilterTests { request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes()))); request.setServletPath("/some_file.html"); request.setSession(new MockHttpSession()); - assertThat(filter.isIgnoreFailure()).isFalse(); + assertThat(this.filter.isIgnoreFailure()).isFalse(); final MockHttpServletResponse response = new MockHttpServletResponse(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, response, chain); + this.filter.doFilter(request, response, chain); // Test - the filter chain will not be invoked, as we get a 401 forbidden response verify(chain, never()).doFilter(any(ServletRequest.class), any(ServletResponse.class)); @@ -297,7 +297,7 @@ public class BasicAuthenticationFilterTests { FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, response, chain); + this.filter.doFilter(request, response, chain); assertThat(response.getStatus()).isEqualTo(200); } @@ -311,11 +311,11 @@ public class BasicAuthenticationFilterTests { Authentication rod = new UsernamePasswordAuthenticationToken("rod", "äöü", AuthorityUtils.createAuthorityList("ROLE_1")); - manager = mock(AuthenticationManager.class); - when(manager.authenticate(rodRequest)).thenReturn(rod); - when(manager.authenticate(not(eq(rodRequest)))).thenThrow(new BadCredentialsException("")); + this.manager = mock(AuthenticationManager.class); + when(this.manager.authenticate(rodRequest)).thenReturn(rod); + when(this.manager.authenticate(not(eq(rodRequest)))).thenThrow(new BadCredentialsException("")); - filter = new BasicAuthenticationFilter(manager, new BasicAuthenticationEntryPoint()); + this.filter = new BasicAuthenticationFilter(this.manager, new BasicAuthenticationEntryPoint()); String token = "rod:äöü"; MockHttpServletRequest request = new MockHttpServletRequest(); @@ -329,7 +329,7 @@ public class BasicAuthenticationFilterTests { assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, response, chain); + this.filter.doFilter(request, response, chain); assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_OK); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); @@ -346,12 +346,12 @@ public class BasicAuthenticationFilterTests { Authentication rod = new UsernamePasswordAuthenticationToken("rod", "äöü", AuthorityUtils.createAuthorityList("ROLE_1")); - manager = mock(AuthenticationManager.class); - when(manager.authenticate(rodRequest)).thenReturn(rod); - when(manager.authenticate(not(eq(rodRequest)))).thenThrow(new BadCredentialsException("")); + this.manager = mock(AuthenticationManager.class); + when(this.manager.authenticate(rodRequest)).thenReturn(rod); + when(this.manager.authenticate(not(eq(rodRequest)))).thenThrow(new BadCredentialsException("")); - filter = new BasicAuthenticationFilter(manager, new BasicAuthenticationEntryPoint()); - filter.setCredentialsCharset("ISO-8859-1"); + this.filter = new BasicAuthenticationFilter(this.manager, new BasicAuthenticationEntryPoint()); + this.filter.setCredentialsCharset("ISO-8859-1"); String token = "rod:äöü"; MockHttpServletRequest request = new MockHttpServletRequest(); @@ -365,7 +365,7 @@ public class BasicAuthenticationFilterTests { assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, response, chain); + this.filter.doFilter(request, response, chain); assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_OK); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); @@ -382,12 +382,12 @@ public class BasicAuthenticationFilterTests { Authentication rod = new UsernamePasswordAuthenticationToken("rod", "äöü", AuthorityUtils.createAuthorityList("ROLE_1")); - manager = mock(AuthenticationManager.class); - when(manager.authenticate(rodRequest)).thenReturn(rod); - when(manager.authenticate(not(eq(rodRequest)))).thenThrow(new BadCredentialsException("")); + this.manager = mock(AuthenticationManager.class); + when(this.manager.authenticate(rodRequest)).thenReturn(rod); + when(this.manager.authenticate(not(eq(rodRequest)))).thenThrow(new BadCredentialsException("")); - filter = new BasicAuthenticationFilter(manager, new BasicAuthenticationEntryPoint()); - filter.setCredentialsCharset("ISO-8859-1"); + this.filter = new BasicAuthenticationFilter(this.manager, new BasicAuthenticationEntryPoint()); + this.filter.setCredentialsCharset("ISO-8859-1"); String token = "rod:äöü"; MockHttpServletRequest request = new MockHttpServletRequest(); @@ -401,7 +401,7 @@ public class BasicAuthenticationFilterTests { assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, response, chain); + this.filter.doFilter(request, response, chain); assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_UNAUTHORIZED); verify(chain, never()).doFilter(any(ServletRequest.class), any(ServletResponse.class)); @@ -417,7 +417,7 @@ public class BasicAuthenticationFilterTests { final MockHttpServletResponse response = new MockHttpServletResponse(); FilterChain chain = mock(FilterChain.class); - filter.doFilter(request, response, chain); + this.filter.doFilter(request, response, chain); verify(chain, never()).doFilter(any(ServletRequest.class), any(ServletResponse.class)); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java index f1fabc3d98..cc5ae3a032 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java @@ -128,12 +128,12 @@ public class DigestAuthenticationFilterTests { ep.setRealmName(REALM); ep.setKey(KEY); - filter = new DigestAuthenticationFilter(); - filter.setUserDetailsService(uds); - filter.setAuthenticationEntryPoint(ep); + this.filter = new DigestAuthenticationFilter(); + this.filter.setUserDetailsService(uds); + this.filter.setAuthenticationEntryPoint(ep); - request = new MockHttpServletRequest("GET", REQUEST_URI); - request.setServletPath(REQUEST_URI); + this.request = new MockHttpServletRequest("GET", REQUEST_URI); + this.request.setServletPath(REQUEST_URI); } @Test @@ -142,12 +142,12 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, nonce, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); Thread.sleep(1000); // ensures token expired - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); @@ -164,10 +164,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, badNonce, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, badNonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(response.getStatus()).isEqualTo(401); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); @@ -175,7 +175,7 @@ public class DigestAuthenticationFilterTests { @Test public void testFilterIgnoresRequestsContainingNoAuthorizationHeader() throws Exception { - executeFilterInContainerSimulator(filter, request, true); + executeFilterInContainerSimulator(this.filter, this.request, true); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @@ -199,9 +199,9 @@ public class DigestAuthenticationFilterTests { public void testInvalidDigestAuthorizationTokenGeneratesError() throws Exception { String token = "NOT_A_VALID_TOKEN_AS_MISSING_COLON"; - request.addHeader("Authorization", "Digest " + new String(Base64.encodeBase64(token.getBytes()))); + this.request.addHeader("Authorization", "Digest " + new String(Base64.encodeBase64(token.getBytes()))); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(response.getStatus()).isEqualTo(401); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); @@ -209,9 +209,9 @@ public class DigestAuthenticationFilterTests { @Test public void testMalformedHeaderReturnsForbidden() throws Exception { - request.addHeader("Authorization", "Digest scsdcsdc"); + this.request.addHeader("Authorization", "Digest scsdcsdc"); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); @@ -224,10 +224,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, nonce, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); @@ -239,10 +239,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, nonce, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); @@ -254,10 +254,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, nonce, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); @@ -269,10 +269,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, nonce, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); @@ -284,10 +284,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(true, USERNAME, REALM, encodedPassword, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - executeFilterInContainerSimulator(filter, request, true); + executeFilterInContainerSimulator(this.filter, this.request, true); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); assertThat(((UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername()) @@ -299,10 +299,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - executeFilterInContainerSimulator(filter, request, true); + executeFilterInContainerSimulator(this.filter, this.request, true); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); assertThat(((UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername()) @@ -315,11 +315,11 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - filter.setCreateAuthenticatedToken(true); - executeFilterInContainerSimulator(filter, request, true); + this.filter.setCreateAuthenticatedToken(true); + executeFilterInContainerSimulator(this.filter, this.request, true); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); assertThat(((UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername()) @@ -331,9 +331,9 @@ public class DigestAuthenticationFilterTests { @Test public void otherAuthorizationSchemeIsIgnored() throws Exception { - request.addHeader("Authorization", "SOME_OTHER_AUTHENTICATION_SCHEME"); + this.request.addHeader("Authorization", "SOME_OTHER_AUTHENTICATION_SCHEME"); - executeFilterInContainerSimulator(filter, request, true); + executeFilterInContainerSimulator(this.filter, this.request, true); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @@ -357,10 +357,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - executeFilterInContainerSimulator(filter, request, true); + executeFilterInContainerSimulator(this.filter, this.request, true); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); @@ -368,11 +368,11 @@ public class DigestAuthenticationFilterTests { responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, "WRONG_PASSWORD", "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE); - request = new MockHttpServletRequest(); - request.addHeader("Authorization", + this.request = new MockHttpServletRequest(); + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); // Check we lost our previous authentication assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); @@ -386,10 +386,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, "DIFFERENT_CNONCE"); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, cnonce)); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); @@ -401,10 +401,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, password, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); @@ -416,10 +416,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, realm, PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, realm, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); @@ -430,10 +430,10 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, "NOT_A_KNOWN_USER", REALM, PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); + MockHttpServletResponse response = executeFilterInContainerSimulator(this.filter, this.request, false); assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); assertThat(response.getStatus()).isEqualTo(401); @@ -452,11 +452,11 @@ public class DigestAuthenticationFilterTests { String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE); - request.addHeader("Authorization", + this.request.addHeader("Authorization", createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE)); - filter.setCreateAuthenticatedToken(true); - executeFilterInContainerSimulator(filter, request, true); + this.filter.setCreateAuthenticatedToken(true); + executeFilterInContainerSimulator(this.filter, this.request, true); assertThat(existingAuthentication).isSameAs(existingContext.getAuthentication()); } diff --git a/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java index 65ea39de3b..3a0344cb33 100644 --- a/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java @@ -49,7 +49,7 @@ public class AuthenticationPrincipalArgumentResolverTests { @Before public void setup() { - resolver = new AuthenticationPrincipalArgumentResolver(); + this.resolver = new AuthenticationPrincipalArgumentResolver(); } @After @@ -59,84 +59,88 @@ public class AuthenticationPrincipalArgumentResolverTests { @Test public void supportsParameterNoAnnotation() { - assertThat(resolver.supportsParameter(showUserNoAnnotation())).isFalse(); + assertThat(this.resolver.supportsParameter(showUserNoAnnotation())).isFalse(); } @Test public void supportsParameterAnnotation() { - assertThat(resolver.supportsParameter(showUserAnnotationObject())).isTrue(); + assertThat(this.resolver.supportsParameter(showUserAnnotationObject())).isTrue(); } @Test public void supportsParameterCustomAnnotation() { - assertThat(resolver.supportsParameter(showUserCustomAnnotation())).isTrue(); + assertThat(this.resolver.supportsParameter(showUserCustomAnnotation())).isTrue(); } @Test public void resolveArgumentNullAuthentication() throws Exception { - assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); } @Test public void resolveArgumentNullPrincipal() throws Exception { setAuthenticationPrincipal(null); - assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); } @Test public void resolveArgumentString() throws Exception { setAuthenticationPrincipal("john"); - assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentPrincipalStringOnObject() throws Exception { setAuthenticationPrincipal("john"); - assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationObject(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentUserDetails() throws Exception { setAuthenticationPrincipal(new User("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER"))); - assertThat(resolver.resolveArgument(showUserAnnotationUserDetails(), null, null, null)) - .isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationUserDetails(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentCustomUserPrincipal() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - assertThat(resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null, null, null)) - .isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentCustomAnnotation() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null, null, null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserCustomAnnotation(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentNullOnInvalidType() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); } @Test(expected = ClassCastException.class) public void resolveArgumentErrorOnInvalidType() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null, null, null); + this.resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null, null, null); } @Test(expected = ClassCastException.class) public void resolveArgumentCustomserErrorOnInvalidType() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null, null, null); + this.resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null, null, null); } @Test public void resolveArgumentObject() throws Exception { setAuthenticationPrincipal(new Object()); - assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationObject(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } private MethodParameter showUserNoAnnotation() { @@ -226,7 +230,7 @@ public class AuthenticationPrincipalArgumentResolverTests { private void setAuthenticationPrincipal(Object principal) { this.expectedPrincipal = principal; SecurityContextHolder.getContext() - .setAuthentication(new TestingAuthenticationToken(expectedPrincipal, "password", "ROLE_USER")); + .setAuthentication(new TestingAuthenticationToken(this.expectedPrincipal, "password", "ROLE_USER")); } } diff --git a/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java index ca049bad82..4d0927b4e2 100644 --- a/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java +++ b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java @@ -120,7 +120,7 @@ public class HttpSessionSecurityContextRepositoryTests { HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContext context = repo.loadContext(holder); // Change context - context.setAuthentication(testToken); + context.setAuthentication(this.testToken); repo.saveContext(context, holder.getRequest(), holder.getResponse()); assertThat(request.getSession(false)).isNull(); } @@ -130,13 +130,13 @@ public class HttpSessionSecurityContextRepositoryTests { HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository(); repo.setSpringSecurityContextKey("imTheContext"); MockHttpServletRequest request = new MockHttpServletRequest(); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); request.getSession().setAttribute("imTheContext", SecurityContextHolder.getContext()); MockHttpServletResponse response = new MockHttpServletResponse(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContext context = repo.loadContext(holder); assertThat(context).isNotNull(); - assertThat(context.getAuthentication()).isEqualTo(testToken); + assertThat(context.getAuthentication()).isEqualTo(this.testToken); // Won't actually be saved as it hasn't changed, but go through the use case // anyway repo.saveContext(context, holder.getRequest(), holder.getResponse()); @@ -151,7 +151,7 @@ public class HttpSessionSecurityContextRepositoryTests { // Set up an existing authenticated context, mocking that it is in the session // already SecurityContext ctx = SecurityContextHolder.getContext(); - ctx.setAuthentication(testToken); + ctx.setAuthentication(this.testToken); HttpSession session = mock(HttpSession.class); when(session.getAttribute(SPRING_SECURITY_CONTEXT_KEY)).thenReturn(ctx); request.setSession(session); @@ -171,7 +171,7 @@ public class HttpSessionSecurityContextRepositoryTests { public void nonSecurityContextInSessionIsIgnored() { HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository(); MockHttpServletRequest request = new MockHttpServletRequest(); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); request.getSession().setAttribute(SPRING_SECURITY_CONTEXT_KEY, "NotASecurityContextInstance"); MockHttpServletResponse response = new MockHttpServletResponse(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); @@ -189,7 +189,7 @@ public class HttpSessionSecurityContextRepositoryTests { SecurityContext context = repo.loadContext(holder); assertThat(request.getSession(false)).isNull(); // Simulate authentication during the request - context.setAuthentication(testToken); + context.setAuthentication(this.testToken); repo.saveContext(context, holder.getRequest(), holder.getResponse()); assertThat(request.getSession(false)).isNotNull(); assertThat(request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY)).isEqualTo(context); @@ -203,7 +203,7 @@ public class HttpSessionSecurityContextRepositoryTests { MockHttpServletResponse response = new MockHttpServletResponse(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContextHolder.setContext(repo.loadContext(holder)); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); holder.getResponse().sendRedirect("/doesntmatter"); assertThat(request.getSession().getAttribute("imTheContext")).isEqualTo(SecurityContextHolder.getContext()); assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isContextSaved()).isTrue(); @@ -220,7 +220,7 @@ public class HttpSessionSecurityContextRepositoryTests { MockHttpServletResponse response = new MockHttpServletResponse(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContextHolder.setContext(repo.loadContext(holder)); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); holder.getResponse().sendError(404); assertThat(request.getSession().getAttribute("imTheContext")).isEqualTo(SecurityContextHolder.getContext()); @@ -239,7 +239,7 @@ public class HttpSessionSecurityContextRepositoryTests { MockHttpServletResponse response = new MockHttpServletResponse(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContextHolder.setContext(repo.loadContext(holder)); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); holder.getResponse().flushBuffer(); assertThat(request.getSession().getAttribute("imTheContext")).isEqualTo(SecurityContextHolder.getContext()); assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isContextSaved()).isTrue(); @@ -257,7 +257,7 @@ public class HttpSessionSecurityContextRepositoryTests { MockHttpServletResponse response = new MockHttpServletResponse(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContextHolder.setContext(repo.loadContext(holder)); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); holder.getResponse().getWriter().flush(); assertThat(request.getSession().getAttribute("imTheContext")).isEqualTo(SecurityContextHolder.getContext()); assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isContextSaved()).isTrue(); @@ -275,7 +275,7 @@ public class HttpSessionSecurityContextRepositoryTests { MockHttpServletResponse response = new MockHttpServletResponse(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContextHolder.setContext(repo.loadContext(holder)); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); holder.getResponse().getWriter().close(); assertThat(request.getSession().getAttribute("imTheContext")).isEqualTo(SecurityContextHolder.getContext()); assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isContextSaved()).isTrue(); @@ -293,7 +293,7 @@ public class HttpSessionSecurityContextRepositoryTests { MockHttpServletResponse response = new MockHttpServletResponse(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContextHolder.setContext(repo.loadContext(holder)); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); holder.getResponse().getOutputStream().flush(); assertThat(request.getSession().getAttribute("imTheContext")).isEqualTo(SecurityContextHolder.getContext()); assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isContextSaved()).isTrue(); @@ -311,7 +311,7 @@ public class HttpSessionSecurityContextRepositoryTests { MockHttpServletResponse response = new MockHttpServletResponse(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContextHolder.setContext(repo.loadContext(holder)); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); holder.getResponse().getOutputStream().close(); assertThat(request.getSession().getAttribute("imTheContext")).isEqualTo(SecurityContextHolder.getContext()); assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isContextSaved()).isTrue(); @@ -331,7 +331,7 @@ public class HttpSessionSecurityContextRepositoryTests { when(response.getOutputStream()).thenReturn(outputstream); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContextHolder.setContext(repo.loadContext(holder)); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); holder.getResponse().getOutputStream().close(); verify(outputstream).close(); } @@ -347,7 +347,7 @@ public class HttpSessionSecurityContextRepositoryTests { when(response.getOutputStream()).thenReturn(outputstream); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContextHolder.setContext(repo.loadContext(holder)); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); holder.getResponse().getOutputStream().flush(); verify(outputstream).flush(); } @@ -360,7 +360,7 @@ public class HttpSessionSecurityContextRepositoryTests { MockHttpServletResponse response = new MockHttpServletResponse(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContextHolder.setContext(repo.loadContext(holder)); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); request.getSession().invalidate(); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); assertThat(request.getSession(false)).isNull(); @@ -386,12 +386,12 @@ public class HttpSessionSecurityContextRepositoryTests { HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository(); MockHttpServletRequest request = new MockHttpServletRequest(); SecurityContext ctxInSession = SecurityContextHolder.createEmptyContext(); - ctxInSession.setAuthentication(testToken); + ctxInSession.setAuthentication(this.testToken); request.getSession().setAttribute(SPRING_SECURITY_CONTEXT_KEY, ctxInSession); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse()); repo.loadContext(holder); SecurityContextHolder.getContext() - .setAuthentication(new AnonymousAuthenticationToken("x", "x", testToken.getAuthorities())); + .setAuthentication(new AnonymousAuthenticationToken("x", "x", this.testToken.getAuthorities())); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); assertThat(request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY)).isNull(); } @@ -402,7 +402,7 @@ public class HttpSessionSecurityContextRepositoryTests { repo.setSpringSecurityContextKey("imTheContext"); MockHttpServletRequest request = new MockHttpServletRequest(); SecurityContext ctxInSession = SecurityContextHolder.createEmptyContext(); - ctxInSession.setAuthentication(testToken); + ctxInSession.setAuthentication(this.testToken); request.getSession().setAttribute("imTheContext", ctxInSession); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse()); repo.loadContext(holder); @@ -419,7 +419,7 @@ public class HttpSessionSecurityContextRepositoryTests { HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse()); repo.loadContext(holder); SecurityContext ctxInSession = SecurityContextHolder.createEmptyContext(); - ctxInSession.setAuthentication(testToken); + ctxInSession.setAuthentication(this.testToken); request.getSession().setAttribute(SPRING_SECURITY_CONTEXT_KEY, ctxInSession); SecurityContextHolder.getContext().setAuthentication( new AnonymousAuthenticationToken("x", "x", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"))); @@ -433,7 +433,7 @@ public class HttpSessionSecurityContextRepositoryTests { HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository(); MockHttpServletRequest request = new MockHttpServletRequest(); SecurityContext ctxInSession = SecurityContextHolder.createEmptyContext(); - ctxInSession.setAuthentication(testToken); + ctxInSession.setAuthentication(this.testToken); request.getSession().setAttribute(SPRING_SECURITY_CONTEXT_KEY, ctxInSession); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse()); @@ -492,7 +492,7 @@ public class HttpSessionSecurityContextRepositoryTests { @Test public void saveContextCustomTrustResolver() { SecurityContext contextToSave = SecurityContextHolder.createEmptyContext(); - contextToSave.setAuthentication(testToken); + contextToSave.setAuthentication(this.testToken); HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository(); MockHttpServletRequest request = new MockHttpServletRequest(); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse()); @@ -521,7 +521,7 @@ public class HttpSessionSecurityContextRepositoryTests { SecurityContext context = repo.loadContext(holder); assertThat(request.getSession(false)).isNull(); // Simulate authentication during the request - context.setAuthentication(testToken); + context.setAuthentication(this.testToken); repo.saveContext(context, new HttpServletRequestWrapper(holder.getRequest()), new HttpServletResponseWrapper(holder.getResponse())); @@ -536,7 +536,7 @@ public class HttpSessionSecurityContextRepositoryTests { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); SecurityContext context = SecurityContextHolder.createEmptyContext(); - context.setAuthentication(testToken); + context.setAuthentication(this.testToken); repo.saveContext(context, request, response); } diff --git a/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java b/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java index 3d2040bab5..8ea6d0344e 100644 --- a/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java +++ b/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java @@ -47,9 +47,9 @@ public class SaveContextOnUpdateOrErrorResponseWrapperTests { @Before public void setUp() { - response = new MockHttpServletResponse(); - wrappedResponse = new SaveContextOnUpdateOrErrorResponseWrapperStub(response, true); - SecurityContextHolder.setContext(securityContext); + this.response = new MockHttpServletResponse(); + this.wrappedResponse = new SaveContextOnUpdateOrErrorResponseWrapperStub(this.response, true); + SecurityContextHolder.setContext(this.securityContext); } @After @@ -60,121 +60,121 @@ public class SaveContextOnUpdateOrErrorResponseWrapperTests { @Test public void sendErrorSavesSecurityContext() throws Exception { int error = HttpServletResponse.SC_FORBIDDEN; - wrappedResponse.sendError(error); - assertThat(wrappedResponse.securityContext).isEqualTo(securityContext); - assertThat(response.getStatus()).isEqualTo(error); + this.wrappedResponse.sendError(error); + assertThat(this.wrappedResponse.securityContext).isEqualTo(this.securityContext); + assertThat(this.response.getStatus()).isEqualTo(error); } @Test public void sendErrorSkipsSaveSecurityContextDisables() throws Exception { final int error = HttpServletResponse.SC_FORBIDDEN; - wrappedResponse.disableSaveOnResponseCommitted(); - wrappedResponse.sendError(error); - assertThat(wrappedResponse.securityContext).isNull(); - assertThat(response.getStatus()).isEqualTo(error); + this.wrappedResponse.disableSaveOnResponseCommitted(); + this.wrappedResponse.sendError(error); + assertThat(this.wrappedResponse.securityContext).isNull(); + assertThat(this.response.getStatus()).isEqualTo(error); } @Test public void sendErrorWithMessageSavesSecurityContext() throws Exception { int error = HttpServletResponse.SC_FORBIDDEN; String message = "Forbidden"; - wrappedResponse.sendError(error, message); - assertThat(wrappedResponse.securityContext).isEqualTo(securityContext); - assertThat(response.getStatus()).isEqualTo(error); - assertThat(response.getErrorMessage()).isEqualTo(message); + this.wrappedResponse.sendError(error, message); + assertThat(this.wrappedResponse.securityContext).isEqualTo(this.securityContext); + assertThat(this.response.getStatus()).isEqualTo(error); + assertThat(this.response.getErrorMessage()).isEqualTo(message); } @Test public void sendErrorWithMessageSkipsSaveSecurityContextDisables() throws Exception { final int error = HttpServletResponse.SC_FORBIDDEN; final String message = "Forbidden"; - wrappedResponse.disableSaveOnResponseCommitted(); - wrappedResponse.sendError(error, message); - assertThat(wrappedResponse.securityContext).isNull(); - assertThat(response.getStatus()).isEqualTo(error); - assertThat(response.getErrorMessage()).isEqualTo(message); + this.wrappedResponse.disableSaveOnResponseCommitted(); + this.wrappedResponse.sendError(error, message); + assertThat(this.wrappedResponse.securityContext).isNull(); + assertThat(this.response.getStatus()).isEqualTo(error); + assertThat(this.response.getErrorMessage()).isEqualTo(message); } @Test public void sendRedirectSavesSecurityContext() throws Exception { String url = "/location"; - wrappedResponse.sendRedirect(url); - assertThat(wrappedResponse.securityContext).isEqualTo(securityContext); - assertThat(response.getRedirectedUrl()).isEqualTo(url); + this.wrappedResponse.sendRedirect(url); + assertThat(this.wrappedResponse.securityContext).isEqualTo(this.securityContext); + assertThat(this.response.getRedirectedUrl()).isEqualTo(url); } @Test public void sendRedirectSkipsSaveSecurityContextDisables() throws Exception { final String url = "/location"; - wrappedResponse.disableSaveOnResponseCommitted(); - wrappedResponse.sendRedirect(url); - assertThat(wrappedResponse.securityContext).isNull(); - assertThat(response.getRedirectedUrl()).isEqualTo(url); + this.wrappedResponse.disableSaveOnResponseCommitted(); + this.wrappedResponse.sendRedirect(url); + assertThat(this.wrappedResponse.securityContext).isNull(); + assertThat(this.response.getRedirectedUrl()).isEqualTo(url); } @Test public void outputFlushSavesSecurityContext() throws Exception { - wrappedResponse.getOutputStream().flush(); - assertThat(wrappedResponse.securityContext).isEqualTo(securityContext); + this.wrappedResponse.getOutputStream().flush(); + assertThat(this.wrappedResponse.securityContext).isEqualTo(this.securityContext); } @Test public void outputFlushSkipsSaveSecurityContextDisables() throws Exception { - wrappedResponse.disableSaveOnResponseCommitted(); - wrappedResponse.getOutputStream().flush(); - assertThat(wrappedResponse.securityContext).isNull(); + this.wrappedResponse.disableSaveOnResponseCommitted(); + this.wrappedResponse.getOutputStream().flush(); + assertThat(this.wrappedResponse.securityContext).isNull(); } @Test public void outputCloseSavesSecurityContext() throws Exception { - wrappedResponse.getOutputStream().close(); - assertThat(wrappedResponse.securityContext).isEqualTo(securityContext); + this.wrappedResponse.getOutputStream().close(); + assertThat(this.wrappedResponse.securityContext).isEqualTo(this.securityContext); } @Test public void outputCloseSkipsSaveSecurityContextDisables() throws Exception { - wrappedResponse.disableSaveOnResponseCommitted(); - wrappedResponse.getOutputStream().close(); - assertThat(wrappedResponse.securityContext).isNull(); + this.wrappedResponse.disableSaveOnResponseCommitted(); + this.wrappedResponse.getOutputStream().close(); + assertThat(this.wrappedResponse.securityContext).isNull(); } @Test public void writerFlushSavesSecurityContext() throws Exception { - wrappedResponse.getWriter().flush(); - assertThat(wrappedResponse.securityContext).isEqualTo(securityContext); + this.wrappedResponse.getWriter().flush(); + assertThat(this.wrappedResponse.securityContext).isEqualTo(this.securityContext); } @Test public void writerFlushSkipsSaveSecurityContextDisables() throws Exception { - wrappedResponse.disableSaveOnResponseCommitted(); - wrappedResponse.getWriter().flush(); - assertThat(wrappedResponse.securityContext).isNull(); + this.wrappedResponse.disableSaveOnResponseCommitted(); + this.wrappedResponse.getWriter().flush(); + assertThat(this.wrappedResponse.securityContext).isNull(); } @Test public void writerCloseSavesSecurityContext() throws Exception { - wrappedResponse.getWriter().close(); - assertThat(wrappedResponse.securityContext).isEqualTo(securityContext); + this.wrappedResponse.getWriter().close(); + assertThat(this.wrappedResponse.securityContext).isEqualTo(this.securityContext); } @Test public void writerCloseSkipsSaveSecurityContextDisables() throws Exception { - wrappedResponse.disableSaveOnResponseCommitted(); - wrappedResponse.getWriter().close(); - assertThat(wrappedResponse.securityContext).isNull(); + this.wrappedResponse.disableSaveOnResponseCommitted(); + this.wrappedResponse.getWriter().close(); + assertThat(this.wrappedResponse.securityContext).isNull(); } @Test public void flushBufferSavesSecurityContext() throws Exception { - wrappedResponse.flushBuffer(); - assertThat(wrappedResponse.securityContext).isEqualTo(securityContext); + this.wrappedResponse.flushBuffer(); + assertThat(this.wrappedResponse.securityContext).isEqualTo(this.securityContext); } @Test public void flushBufferSkipsSaveSecurityContextDisables() throws Exception { - wrappedResponse.disableSaveOnResponseCommitted(); - wrappedResponse.flushBuffer(); - assertThat(wrappedResponse.securityContext).isNull(); + this.wrappedResponse.disableSaveOnResponseCommitted(); + this.wrappedResponse.flushBuffer(); + assertThat(this.wrappedResponse.securityContext).isNull(); } private static class SaveContextOnUpdateOrErrorResponseWrapperStub @@ -188,7 +188,7 @@ public class SaveContextOnUpdateOrErrorResponseWrapperTests { @Override protected void saveContext(SecurityContext context) { - securityContext = context; + this.securityContext = context; } } diff --git a/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java b/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java index c0447913d3..8bd39186b2 100644 --- a/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java @@ -54,7 +54,7 @@ public class SecurityContextPersistenceFilterTests { final MockHttpServletRequest request = new MockHttpServletRequest(); final MockHttpServletResponse response = new MockHttpServletResponse(); SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter(); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); filter.doFilter(request, response, chain); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); @@ -67,7 +67,7 @@ public class SecurityContextPersistenceFilterTests { final MockHttpServletRequest request = new MockHttpServletRequest(); final MockHttpServletResponse response = new MockHttpServletResponse(); SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter(); - SecurityContextHolder.getContext().setAuthentication(testToken); + SecurityContextHolder.getContext().setAuthentication(this.testToken); doThrow(new IOException()).when(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); try { filter.doFilter(request, response, chain); @@ -86,7 +86,7 @@ public class SecurityContextPersistenceFilterTests { final TestingAuthenticationToken beforeAuth = new TestingAuthenticationToken("someoneelse", "passwd", "ROLE_B"); final SecurityContext scBefore = new SecurityContextImpl(); final SecurityContext scExpectedAfter = new SecurityContextImpl(); - scExpectedAfter.setAuthentication(testToken); + scExpectedAfter.setAuthentication(this.testToken); scBefore.setAuthentication(beforeAuth); final SecurityContextRepository repo = mock(SecurityContextRepository.class); SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter(repo); diff --git a/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java b/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java index c7527604fa..46a235bfe5 100644 --- a/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java +++ b/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java @@ -58,27 +58,27 @@ public class SecurityContextCallableProcessingInterceptorTests { @Test public void currentSecurityContext() throws Exception { SecurityContextCallableProcessingInterceptor interceptor = new SecurityContextCallableProcessingInterceptor(); - SecurityContextHolder.setContext(securityContext); - interceptor.beforeConcurrentHandling(webRequest, callable); + SecurityContextHolder.setContext(this.securityContext); + interceptor.beforeConcurrentHandling(this.webRequest, this.callable); SecurityContextHolder.clearContext(); - interceptor.preProcess(webRequest, callable); - assertThat(SecurityContextHolder.getContext()).isSameAs(securityContext); + interceptor.preProcess(this.webRequest, this.callable); + assertThat(SecurityContextHolder.getContext()).isSameAs(this.securityContext); - interceptor.postProcess(webRequest, callable, null); - assertThat(SecurityContextHolder.getContext()).isNotSameAs(securityContext); + interceptor.postProcess(this.webRequest, this.callable, null); + assertThat(SecurityContextHolder.getContext()).isNotSameAs(this.securityContext); } @Test public void specificSecurityContext() throws Exception { SecurityContextCallableProcessingInterceptor interceptor = new SecurityContextCallableProcessingInterceptor( - securityContext); + this.securityContext); - interceptor.preProcess(webRequest, callable); - assertThat(SecurityContextHolder.getContext()).isSameAs(securityContext); + interceptor.preProcess(this.webRequest, this.callable); + assertThat(SecurityContextHolder.getContext()).isSameAs(this.securityContext); - interceptor.postProcess(webRequest, callable, null); - assertThat(SecurityContextHolder.getContext()).isNotSameAs(securityContext); + interceptor.postProcess(this.webRequest, this.callable, null); + assertThat(SecurityContextHolder.getContext()).isNotSameAs(this.securityContext); } } diff --git a/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java index bcc21e6c6c..ad49a9e4df 100644 --- a/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java @@ -70,18 +70,18 @@ public class WebAsyncManagerIntegrationFilterTests { @Before public void setUp() { - filterChain = new MockFilterChain(); + this.filterChain = new MockFilterChain(); - threadFactory = new JoinableThreadFactory(); + this.threadFactory = new JoinableThreadFactory(); SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor(); - executor.setThreadFactory(threadFactory); + executor.setThreadFactory(this.threadFactory); - asyncManager = WebAsyncUtils.getAsyncManager(request); - asyncManager.setAsyncWebRequest(asyncWebRequest); - asyncManager.setTaskExecutor(executor); - when(request.getAttribute(WebAsyncUtils.WEB_ASYNC_MANAGER_ATTRIBUTE)).thenReturn(asyncManager); + this.asyncManager = WebAsyncUtils.getAsyncManager(this.request); + this.asyncManager.setAsyncWebRequest(this.asyncWebRequest); + this.asyncManager.setTaskExecutor(executor); + when(this.request.getAttribute(WebAsyncUtils.WEB_ASYNC_MANAGER_ATTRIBUTE)).thenReturn(this.asyncManager); - filter = new WebAsyncManagerIntegrationFilter(); + this.filter = new WebAsyncManagerIntegrationFilter(); } @After @@ -91,37 +91,39 @@ public class WebAsyncManagerIntegrationFilterTests { @Test public void doFilterInternalRegistersSecurityContextCallableProcessor() throws Exception { - SecurityContextHolder.setContext(securityContext); - asyncManager.registerCallableInterceptors(new CallableProcessingInterceptorAdapter() { + SecurityContextHolder.setContext(this.securityContext); + this.asyncManager.registerCallableInterceptors(new CallableProcessingInterceptorAdapter() { @Override public void postProcess(NativeWebRequest request, Callable task, Object concurrentResult) { - assertThat(SecurityContextHolder.getContext()).isNotSameAs(securityContext); + assertThat(SecurityContextHolder.getContext()) + .isNotSameAs(WebAsyncManagerIntegrationFilterTests.this.securityContext); } }); - filter.doFilterInternal(request, response, filterChain); + this.filter.doFilterInternal(this.request, this.response, this.filterChain); VerifyingCallable verifyingCallable = new VerifyingCallable(); - asyncManager.startCallableProcessing(verifyingCallable); - threadFactory.join(); - assertThat(asyncManager.getConcurrentResult()).isSameAs(securityContext); + this.asyncManager.startCallableProcessing(verifyingCallable); + this.threadFactory.join(); + assertThat(this.asyncManager.getConcurrentResult()).isSameAs(this.securityContext); } @Test public void doFilterInternalRegistersSecurityContextCallableProcessorContextUpdated() throws Exception { SecurityContextHolder.setContext(SecurityContextHolder.createEmptyContext()); - asyncManager.registerCallableInterceptors(new CallableProcessingInterceptorAdapter() { + this.asyncManager.registerCallableInterceptors(new CallableProcessingInterceptorAdapter() { @Override public void postProcess(NativeWebRequest request, Callable task, Object concurrentResult) { - assertThat(SecurityContextHolder.getContext()).isNotSameAs(securityContext); + assertThat(SecurityContextHolder.getContext()) + .isNotSameAs(WebAsyncManagerIntegrationFilterTests.this.securityContext); } }); - filter.doFilterInternal(request, response, filterChain); - SecurityContextHolder.setContext(securityContext); + this.filter.doFilterInternal(this.request, this.response, this.filterChain); + SecurityContextHolder.setContext(this.securityContext); VerifyingCallable verifyingCallable = new VerifyingCallable(); - asyncManager.startCallableProcessing(verifyingCallable); - threadFactory.join(); - assertThat(asyncManager.getConcurrentResult()).isSameAs(securityContext); + this.asyncManager.startCallableProcessing(verifyingCallable); + this.threadFactory.join(); + assertThat(this.asyncManager.getConcurrentResult()).isSameAs(this.securityContext); } private static final class JoinableThreadFactory implements ThreadFactory { @@ -129,12 +131,12 @@ public class WebAsyncManagerIntegrationFilterTests { private Thread t; public Thread newThread(Runnable r) { - t = new Thread(r); - return t; + this.t = new Thread(r); + return this.t; } public void join() throws InterruptedException { - t.join(); + this.t.join(); } } diff --git a/web/src/test/java/org/springframework/security/web/csrf/CsrfLogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/csrf/CsrfLogoutHandlerTests.java index e2dbd09701..424df7e7a1 100644 --- a/web/src/test/java/org/springframework/security/web/csrf/CsrfLogoutHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/csrf/CsrfLogoutHandlerTests.java @@ -45,9 +45,9 @@ public class CsrfLogoutHandlerTests { @Before public void setup() { - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); - handler = new CsrfLogoutHandler(csrfTokenRepository); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); + this.handler = new CsrfLogoutHandler(this.csrfTokenRepository); } @Test(expected = IllegalArgumentException.class) @@ -57,9 +57,10 @@ public class CsrfLogoutHandlerTests { @Test public void logoutRemovesCsrfToken() { - handler.logout(request, response, new TestingAuthenticationToken("user", "password", "ROLE_USER")); + this.handler.logout(this.request, this.response, + new TestingAuthenticationToken("user", "password", "ROLE_USER")); - verify(csrfTokenRepository).saveToken(null, request, response); + verify(this.csrfTokenRepository).saveToken(null, this.request, this.response); } } diff --git a/web/src/test/java/org/springframework/security/web/csrf/DefaultCsrfTokenTests.java b/web/src/test/java/org/springframework/security/web/csrf/DefaultCsrfTokenTests.java index 48b5710bcf..2fbfc69992 100644 --- a/web/src/test/java/org/springframework/security/web/csrf/DefaultCsrfTokenTests.java +++ b/web/src/test/java/org/springframework/security/web/csrf/DefaultCsrfTokenTests.java @@ -31,32 +31,32 @@ public class DefaultCsrfTokenTests { @Test(expected = IllegalArgumentException.class) public void constructorNullHeaderName() { - new DefaultCsrfToken(null, parameterName, tokenValue); + new DefaultCsrfToken(null, this.parameterName, this.tokenValue); } @Test(expected = IllegalArgumentException.class) public void constructorEmptyHeaderName() { - new DefaultCsrfToken("", parameterName, tokenValue); + new DefaultCsrfToken("", this.parameterName, this.tokenValue); } @Test(expected = IllegalArgumentException.class) public void constructorNullParameterName() { - new DefaultCsrfToken(headerName, null, tokenValue); + new DefaultCsrfToken(this.headerName, null, this.tokenValue); } @Test(expected = IllegalArgumentException.class) public void constructorEmptyParameterName() { - new DefaultCsrfToken(headerName, "", tokenValue); + new DefaultCsrfToken(this.headerName, "", this.tokenValue); } @Test(expected = IllegalArgumentException.class) public void constructorNullTokenValue() { - new DefaultCsrfToken(headerName, parameterName, null); + new DefaultCsrfToken(this.headerName, this.parameterName, null); } @Test(expected = IllegalArgumentException.class) public void constructorEmptyTokenValue() { - new DefaultCsrfToken(headerName, parameterName, ""); + new DefaultCsrfToken(this.headerName, this.parameterName, ""); } } diff --git a/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java b/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java index 6145fd1329..3280c2741a 100644 --- a/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java +++ b/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java @@ -39,19 +39,19 @@ public class HttpSessionCsrfTokenRepositoryTests { @Before public void setup() { - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); - repo = new HttpSessionCsrfTokenRepository(); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); + this.repo = new HttpSessionCsrfTokenRepository(); } @Test public void generateToken() { - token = repo.generateToken(request); + this.token = this.repo.generateToken(this.request); - assertThat(token.getParameterName()).isEqualTo("_csrf"); - assertThat(token.getToken()).isNotEmpty(); + assertThat(this.token.getParameterName()).isEqualTo("_csrf"); + assertThat(this.token.getToken()).isNotEmpty(); - CsrfToken loadedToken = repo.loadToken(request); + CsrfToken loadedToken = this.repo.loadToken(this.request); assertThat(loadedToken).isNull(); } @@ -59,44 +59,44 @@ public class HttpSessionCsrfTokenRepositoryTests { @Test public void generateCustomParameter() { String paramName = "_csrf"; - repo.setParameterName(paramName); + this.repo.setParameterName(paramName); - token = repo.generateToken(request); + this.token = this.repo.generateToken(this.request); - assertThat(token.getParameterName()).isEqualTo(paramName); - assertThat(token.getToken()).isNotEmpty(); + assertThat(this.token.getParameterName()).isEqualTo(paramName); + assertThat(this.token.getToken()).isNotEmpty(); } @Test public void generateCustomHeader() { String headerName = "CSRF"; - repo.setHeaderName(headerName); + this.repo.setHeaderName(headerName); - token = repo.generateToken(request); + this.token = this.repo.generateToken(this.request); - assertThat(token.getHeaderName()).isEqualTo(headerName); - assertThat(token.getToken()).isNotEmpty(); + assertThat(this.token.getHeaderName()).isEqualTo(headerName); + assertThat(this.token.getToken()).isNotEmpty(); } @Test public void loadTokenNull() { - assertThat(repo.loadToken(request)).isNull(); - assertThat(request.getSession(false)).isNull(); + assertThat(this.repo.loadToken(this.request)).isNull(); + assertThat(this.request.getSession(false)).isNull(); } @Test public void loadTokenNullWhenSessionExists() { - request.getSession(); - assertThat(repo.loadToken(request)).isNull(); + this.request.getSession(); + assertThat(this.repo.loadToken(this.request)).isNull(); } @Test public void saveToken() { CsrfToken tokenToSave = new DefaultCsrfToken("123", "abc", "def"); - repo.saveToken(tokenToSave, request, response); + this.repo.saveToken(tokenToSave, this.request, this.response); - String attrName = request.getSession().getAttributeNames().nextElement(); - CsrfToken loadedToken = (CsrfToken) request.getSession().getAttribute(attrName); + String attrName = this.request.getSession().getAttributeNames().nextElement(); + CsrfToken loadedToken = (CsrfToken) this.request.getSession().getAttribute(attrName); assertThat(loadedToken).isEqualTo(tokenToSave); } @@ -105,10 +105,10 @@ public class HttpSessionCsrfTokenRepositoryTests { public void saveTokenCustomSessionAttribute() { CsrfToken tokenToSave = new DefaultCsrfToken("123", "abc", "def"); String sessionAttributeName = "custom"; - repo.setSessionAttributeName(sessionAttributeName); - repo.saveToken(tokenToSave, request, response); + this.repo.setSessionAttributeName(sessionAttributeName); + this.repo.saveToken(tokenToSave, this.request, this.response); - CsrfToken loadedToken = (CsrfToken) request.getSession().getAttribute(sessionAttributeName); + CsrfToken loadedToken = (CsrfToken) this.request.getSession().getAttribute(sessionAttributeName); assertThat(loadedToken).isEqualTo(tokenToSave); } @@ -117,37 +117,37 @@ public class HttpSessionCsrfTokenRepositoryTests { public void saveTokenNullToken() { saveToken(); - repo.saveToken(null, request, response); + this.repo.saveToken(null, this.request, this.response); - assertThat(request.getSession().getAttributeNames().hasMoreElements()).isFalse(); + assertThat(this.request.getSession().getAttributeNames().hasMoreElements()).isFalse(); } @Test public void saveTokenNullTokenWhenSessionNotExists() { - repo.saveToken(null, request, response); + this.repo.saveToken(null, this.request, this.response); - assertThat(request.getSession(false)).isNull(); + assertThat(this.request.getSession(false)).isNull(); } @Test(expected = IllegalArgumentException.class) public void setSessionAttributeNameEmpty() { - repo.setSessionAttributeName(""); + this.repo.setSessionAttributeName(""); } @Test(expected = IllegalArgumentException.class) public void setSessionAttributeNameNull() { - repo.setSessionAttributeName(null); + this.repo.setSessionAttributeName(null); } @Test(expected = IllegalArgumentException.class) public void setParameterNameEmpty() { - repo.setParameterName(""); + this.repo.setParameterName(""); } @Test(expected = IllegalArgumentException.class) public void setParameterNameNull() { - repo.setParameterName(null); + this.repo.setParameterName(null); } } diff --git a/web/src/test/java/org/springframework/security/web/debug/DebugFilterTests.java b/web/src/test/java/org/springframework/security/web/debug/DebugFilterTests.java index 6fdcd455d6..f75efc8e0e 100644 --- a/web/src/test/java/org/springframework/security/web/debug/DebugFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/debug/DebugFilterTests.java @@ -77,45 +77,45 @@ public class DebugFilterTests { @Before public void setUp() { - when(request.getHeaderNames()).thenReturn(Collections.enumeration(Collections.emptyList())); - when(request.getServletPath()).thenReturn("/login"); - filter = new DebugFilter(fcp); - ReflectionTestUtils.setField(filter, "logger", logger); - requestAttr = DebugFilter.ALREADY_FILTERED_ATTR_NAME; + when(this.request.getHeaderNames()).thenReturn(Collections.enumeration(Collections.emptyList())); + when(this.request.getServletPath()).thenReturn("/login"); + this.filter = new DebugFilter(this.fcp); + ReflectionTestUtils.setField(this.filter, "logger", this.logger); + this.requestAttr = DebugFilter.ALREADY_FILTERED_ATTR_NAME; } @Test public void doFilterProcessesRequests() throws Exception { - filter.doFilter(request, response, filterChain); + this.filter.doFilter(this.request, this.response, this.filterChain); - verify(logger).info(anyString()); - verify(request).setAttribute(requestAttr, Boolean.TRUE); - verify(fcp).doFilter(requestCaptor.capture(), eq(response), eq(filterChain)); - assertThat(requestCaptor.getValue().getClass()).isEqualTo(DebugRequestWrapper.class); - verify(request).removeAttribute(requestAttr); + verify(this.logger).info(anyString()); + verify(this.request).setAttribute(this.requestAttr, Boolean.TRUE); + verify(this.fcp).doFilter(this.requestCaptor.capture(), eq(this.response), eq(this.filterChain)); + assertThat(this.requestCaptor.getValue().getClass()).isEqualTo(DebugRequestWrapper.class); + verify(this.request).removeAttribute(this.requestAttr); } // SEC-1901 @Test public void doFilterProcessesForwardedRequests() throws Exception { - when(request.getAttribute(requestAttr)).thenReturn(Boolean.TRUE); + when(this.request.getAttribute(this.requestAttr)).thenReturn(Boolean.TRUE); HttpServletRequest request = new DebugRequestWrapper(this.request); - filter.doFilter(request, response, filterChain); + this.filter.doFilter(request, this.response, this.filterChain); - verify(logger).info(anyString()); - verify(fcp).doFilter(request, response, filterChain); - verify(this.request, never()).removeAttribute(requestAttr); + verify(this.logger).info(anyString()); + verify(this.fcp).doFilter(request, this.response, this.filterChain); + verify(this.request, never()).removeAttribute(this.requestAttr); } @Test public void doFilterDoesNotWrapWithDebugRequestWrapperAgain() throws Exception { - when(request.getAttribute(requestAttr)).thenReturn(Boolean.TRUE); + when(this.request.getAttribute(this.requestAttr)).thenReturn(Boolean.TRUE); HttpServletRequest fireWalledRequest = new HttpServletRequestWrapper(new DebugRequestWrapper(this.request)); - filter.doFilter(fireWalledRequest, response, filterChain); + this.filter.doFilter(fireWalledRequest, this.response, this.filterChain); - verify(fcp).doFilter(fireWalledRequest, response, filterChain); + verify(this.fcp).doFilter(fireWalledRequest, this.response, this.filterChain); } @Test @@ -128,12 +128,12 @@ public class DebugFilterTests { request.addHeader("A", "Another Value"); request.addHeader("B", "B Value"); - filter.doFilter(request, response, filterChain); + this.filter.doFilter(request, this.response, this.filterChain); - verify(logger).info(logCaptor.capture()); + verify(this.logger).info(this.logCaptor.capture()); - assertThat(logCaptor.getValue()).isEqualTo("Request received for GET '/path/':\n" + "\n" + request + "\n" + "\n" - + "servletPath:/path\n" + "pathInfo:/\n" + "headers: \n" + "A: A Value, Another Value\n" + assertThat(this.logCaptor.getValue()).isEqualTo("Request received for GET '/path/':\n" + "\n" + request + "\n" + + "\n" + "servletPath:/path\n" + "pathInfo:/\n" + "headers: \n" + "A: A Value, Another Value\n" + "B: B Value\n" + "\n" + "\n" + "Security filter chain: no match"); } diff --git a/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java b/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java index 1ffb9e79aa..df0d31f616 100644 --- a/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java +++ b/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java @@ -43,57 +43,57 @@ public class FirewalledResponseTests { @Before public void setup() { - response = mock(HttpServletResponse.class); - fwResponse = new FirewalledResponse(response); + this.response = mock(HttpServletResponse.class); + this.fwResponse = new FirewalledResponse(this.response); } @Test public void sendRedirectWhenValidThenNoException() throws Exception { - fwResponse.sendRedirect("/theURL"); + this.fwResponse.sendRedirect("/theURL"); - verify(response).sendRedirect("/theURL"); + verify(this.response).sendRedirect("/theURL"); } @Test public void sendRedirectWhenNullThenDelegateInvoked() throws Exception { - fwResponse.sendRedirect(null); + this.fwResponse.sendRedirect(null); - verify(response).sendRedirect(null); + verify(this.response).sendRedirect(null); } @Test public void sendRedirectWhenHasCrlfThenThrowsException() throws Exception { expectCrlfValidationException(); - fwResponse.sendRedirect("/theURL\r\nsomething"); + this.fwResponse.sendRedirect("/theURL\r\nsomething"); } @Test public void addHeaderWhenValidThenDelegateInvoked() { - fwResponse.addHeader("foo", "bar"); + this.fwResponse.addHeader("foo", "bar"); - verify(response).addHeader("foo", "bar"); + verify(this.response).addHeader("foo", "bar"); } @Test public void addHeaderWhenNullValueThenDelegateInvoked() { - fwResponse.addHeader("foo", null); + this.fwResponse.addHeader("foo", null); - verify(response).addHeader("foo", null); + verify(this.response).addHeader("foo", null); } @Test public void addHeaderWhenHeaderValueHasCrlfThenException() { expectCrlfValidationException(); - fwResponse.addHeader("foo", "abc\r\nContent-Length:100"); + this.fwResponse.addHeader("foo", "abc\r\nContent-Length:100"); } @Test public void addHeaderWhenHeaderNameHasCrlfThenException() { expectCrlfValidationException(); - fwResponse.addHeader("abc\r\nContent-Length:100", "bar"); + this.fwResponse.addHeader("abc\r\nContent-Length:100", "bar"); } @Test @@ -103,16 +103,16 @@ public class FirewalledResponseTests { cookie.setDomain("foobar"); cookie.setComment("foobar"); - fwResponse.addCookie(cookie); + this.fwResponse.addCookie(cookie); - verify(response).addCookie(cookie); + verify(this.response).addCookie(cookie); } @Test public void addCookieWhenNullThenDelegateInvoked() { - fwResponse.addCookie(null); + this.fwResponse.addCookie(null); - verify(response).addCookie(null); + verify(this.response).addCookie(null); } @Test @@ -127,7 +127,7 @@ public class FirewalledResponseTests { }; expectCrlfValidationException(); - fwResponse.addCookie(cookie); + this.fwResponse.addCookie(cookie); } @Test @@ -135,7 +135,7 @@ public class FirewalledResponseTests { Cookie cookie = new Cookie("foo", "foo\r\nbar"); expectCrlfValidationException(); - fwResponse.addCookie(cookie); + this.fwResponse.addCookie(cookie); } @Test @@ -144,7 +144,7 @@ public class FirewalledResponseTests { cookie.setPath("/foo\r\nbar"); expectCrlfValidationException(); - fwResponse.addCookie(cookie); + this.fwResponse.addCookie(cookie); } @Test @@ -153,7 +153,7 @@ public class FirewalledResponseTests { cookie.setDomain("foo\r\nbar"); expectCrlfValidationException(); - fwResponse.addCookie(cookie); + this.fwResponse.addCookie(cookie); } @Test @@ -162,7 +162,7 @@ public class FirewalledResponseTests { cookie.setComment("foo\r\nbar"); expectCrlfValidationException(); - fwResponse.addCookie(cookie); + this.fwResponse.addCookie(cookie); } @Test @@ -177,13 +177,13 @@ public class FirewalledResponseTests { } private void expectCrlfValidationException() { - expectedException.expect(IllegalArgumentException.class); - expectedException.expectMessage("Invalid characters (CR/LF)"); + this.expectedException.expect(IllegalArgumentException.class); + this.expectedException.expectMessage("Invalid characters (CR/LF)"); } private void validateLineEnding(String name, String value) { try { - fwResponse.validateCrlf(name, value); + this.fwResponse.validateCrlf(name, value); fail("IllegalArgumentException should have thrown"); } catch (IllegalArgumentException expected) { diff --git a/web/src/test/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriterTests.java index b57993c4e5..5deaa5c785 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriterTests.java @@ -43,27 +43,27 @@ public class ContentSecurityPolicyHeaderWriterTests { @Before public void setup() { - request = new MockHttpServletRequest(); - request.setSecure(true); - response = new MockHttpServletResponse(); - writer = new ContentSecurityPolicyHeaderWriter(DEFAULT_POLICY_DIRECTIVES); + this.request = new MockHttpServletRequest(); + this.request.setSecure(true); + this.response = new MockHttpServletResponse(); + this.writer = new ContentSecurityPolicyHeaderWriter(DEFAULT_POLICY_DIRECTIVES); } @Test public void writeHeadersWhenNoPolicyDirectivesThenUsesDefault() { ContentSecurityPolicyHeaderWriter noPolicyWriter = new ContentSecurityPolicyHeaderWriter(); - noPolicyWriter.writeHeaders(request, response); + noPolicyWriter.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Content-Security-Policy")).isEqualTo(DEFAULT_POLICY_DIRECTIVES); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Content-Security-Policy")).isEqualTo(DEFAULT_POLICY_DIRECTIVES); } @Test public void writeHeadersContentSecurityPolicyDefault() { - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Content-Security-Policy")).isEqualTo(DEFAULT_POLICY_DIRECTIVES); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Content-Security-Policy")).isEqualTo(DEFAULT_POLICY_DIRECTIVES); } @Test @@ -71,48 +71,48 @@ public class ContentSecurityPolicyHeaderWriterTests { String policyDirectives = "default-src 'self'; " + "object-src plugins1.example.com plugins2.example.com; " + "script-src trustedscripts.example.com"; - writer = new ContentSecurityPolicyHeaderWriter(policyDirectives); - writer.writeHeaders(request, response); + this.writer = new ContentSecurityPolicyHeaderWriter(policyDirectives); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Content-Security-Policy")).isEqualTo(policyDirectives); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Content-Security-Policy")).isEqualTo(policyDirectives); } @Test public void writeHeadersWhenNoPolicyDirectivesReportOnlyThenUsesDefault() { ContentSecurityPolicyHeaderWriter noPolicyWriter = new ContentSecurityPolicyHeaderWriter(); - writer.setReportOnly(true); - noPolicyWriter.writeHeaders(request, response); + this.writer.setReportOnly(true); + noPolicyWriter.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Content-Security-Policy")).isEqualTo(DEFAULT_POLICY_DIRECTIVES); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Content-Security-Policy")).isEqualTo(DEFAULT_POLICY_DIRECTIVES); } @Test public void writeHeadersContentSecurityPolicyReportOnlyDefault() { - writer.setReportOnly(true); - writer.writeHeaders(request, response); + this.writer.setReportOnly(true); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Content-Security-Policy-Report-Only")).isEqualTo(DEFAULT_POLICY_DIRECTIVES); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Content-Security-Policy-Report-Only")).isEqualTo(DEFAULT_POLICY_DIRECTIVES); } @Test public void writeHeadersContentSecurityPolicyReportOnlyCustom() { String policyDirectives = "default-src https:; report-uri https://example.com/"; - writer = new ContentSecurityPolicyHeaderWriter(policyDirectives); - writer.setReportOnly(true); - writer.writeHeaders(request, response); + this.writer = new ContentSecurityPolicyHeaderWriter(policyDirectives); + this.writer.setReportOnly(true); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Content-Security-Policy-Report-Only")).isEqualTo(policyDirectives); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Content-Security-Policy-Report-Only")).isEqualTo(policyDirectives); } @Test(expected = IllegalArgumentException.class) public void writeHeadersContentSecurityPolicyInvalid() { - writer = new ContentSecurityPolicyHeaderWriter(""); - writer = new ContentSecurityPolicyHeaderWriter(null); + this.writer = new ContentSecurityPolicyHeaderWriter(""); + this.writer = new ContentSecurityPolicyHeaderWriter(null); } @Test diff --git a/web/src/test/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriterTests.java index f37f8510eb..f80b2cafef 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriterTests.java @@ -51,37 +51,37 @@ public class DelegatingRequestMatcherHeaderWriterTests { @Before public void setup() { - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); - headerWriter = new DelegatingRequestMatcherHeaderWriter(matcher, delegate); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); + this.headerWriter = new DelegatingRequestMatcherHeaderWriter(this.matcher, this.delegate); } @Test(expected = IllegalArgumentException.class) public void constructorNullRequestMatcher() { - new DelegatingRequestMatcherHeaderWriter(null, delegate); + new DelegatingRequestMatcherHeaderWriter(null, this.delegate); } @Test(expected = IllegalArgumentException.class) public void constructorNullDelegate() { - new DelegatingRequestMatcherHeaderWriter(matcher, null); + new DelegatingRequestMatcherHeaderWriter(this.matcher, null); } @Test public void writeHeadersOnMatch() { - when(matcher.matches(request)).thenReturn(true); + when(this.matcher.matches(this.request)).thenReturn(true); - headerWriter.writeHeaders(request, response); + this.headerWriter.writeHeaders(this.request, this.response); - verify(delegate).writeHeaders(request, response); + verify(this.delegate).writeHeaders(this.request, this.response); } @Test public void writeHeadersOnNoMatch() { - when(matcher.matches(request)).thenReturn(false); + when(this.matcher.matches(this.request)).thenReturn(false); - headerWriter.writeHeaders(request, response); + this.headerWriter.writeHeaders(this.request, this.response); - verify(delegate, times(0)).writeHeaders(request, response); + verify(this.delegate, times(0)).writeHeaders(this.request, this.response); } } diff --git a/web/src/test/java/org/springframework/security/web/header/writers/FeaturePolicyHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/FeaturePolicyHeaderWriterTests.java index 9639c5f0a9..00454d0459 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/FeaturePolicyHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/FeaturePolicyHeaderWriterTests.java @@ -52,7 +52,7 @@ public class FeaturePolicyHeaderWriterTests { @Test public void writeHeadersFeaturePolicyDefault() { - writer.writeHeaders(this.request, this.response); + this.writer.writeHeaders(this.request, this.response); assertThat(this.response.getHeaderNames()).hasSize(1); assertThat(this.response.getHeader("Feature-Policy")).isEqualTo(DEFAULT_POLICY_DIRECTIVES); diff --git a/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java index 9e0e1a75b5..a3386c5734 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java @@ -55,154 +55,154 @@ public class HpkpHeaderWriterTests { @Before public void setup() { - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); - writer = new HpkpHeaderWriter(); + this.writer = new HpkpHeaderWriter(); Map defaultPins = new LinkedHashMap<>(); defaultPins.put("d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=", "sha256"); - writer.setPins(defaultPins); + this.writer.setPins(defaultPins); - request.setSecure(true); + this.request.setSecure(true); } @Test public void writeHeadersDefaultValues() { - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Public-Key-Pins-Report-Only")) + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Public-Key-Pins-Report-Only")) .isEqualTo("max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\""); } @Test public void maxAgeCustomConstructorWriteHeaders() { - writer = new HpkpHeaderWriter(2592000); - writer.setPins(DEFAULT_PINS); + this.writer = new HpkpHeaderWriter(2592000); + this.writer.setPins(DEFAULT_PINS); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Public-Key-Pins-Report-Only")) + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Public-Key-Pins-Report-Only")) .isEqualTo("max-age=2592000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\""); } @Test public void maxAgeAndIncludeSubdomainsCustomConstructorWriteHeaders() { - writer = new HpkpHeaderWriter(2592000, true); - writer.setPins(DEFAULT_PINS); + this.writer = new HpkpHeaderWriter(2592000, true); + this.writer.setPins(DEFAULT_PINS); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( "max-age=2592000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; includeSubDomains"); } @Test public void allArgsCustomConstructorWriteHeaders() { - writer = new HpkpHeaderWriter(2592000, true, false); - writer.setPins(DEFAULT_PINS); + this.writer = new HpkpHeaderWriter(2592000, true, false); + this.writer.setPins(DEFAULT_PINS); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Public-Key-Pins")).isEqualTo( + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Public-Key-Pins")).isEqualTo( "max-age=2592000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; includeSubDomains"); } @Test public void writeHeadersCustomMaxAgeInSeconds() { - writer.setMaxAgeInSeconds(2592000); + this.writer.setMaxAgeInSeconds(2592000); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Public-Key-Pins-Report-Only")) + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Public-Key-Pins-Report-Only")) .isEqualTo("max-age=2592000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\""); } @Test public void writeHeadersIncludeSubDomains() { - writer.setIncludeSubDomains(true); + this.writer.setIncludeSubDomains(true); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( "max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; includeSubDomains"); } @Test public void writeHeadersTerminateConnection() { - writer.setReportOnly(false); + this.writer.setReportOnly(false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Public-Key-Pins")) + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Public-Key-Pins")) .isEqualTo("max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\""); } @Test public void writeHeadersTerminateConnectionWithURI() throws URISyntaxException { - writer.setReportOnly(false); - writer.setReportUri(new URI("https://example.com/pkp-report")); + this.writer.setReportOnly(false); + this.writer.setReportUri(new URI("https://example.com/pkp-report")); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Public-Key-Pins")).isEqualTo( + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Public-Key-Pins")).isEqualTo( "max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; report-uri=\"https://example.com/pkp-report\""); } @Test public void writeHeadersTerminateConnectionWithURIAsString() { - writer.setReportOnly(false); - writer.setReportUri("https://example.com/pkp-report"); + this.writer.setReportOnly(false); + this.writer.setReportUri("https://example.com/pkp-report"); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Public-Key-Pins")).isEqualTo( + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Public-Key-Pins")).isEqualTo( "max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; report-uri=\"https://example.com/pkp-report\""); } @Test public void writeHeadersAddSha256Pins() { - writer.addSha256Pins("d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=", + this.writer.addSha256Pins("d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=", "E9CZ9INDbd+2eRQozYqqbQ2yXLVKB9+xcprMF+44U1g="); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( "max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; pin-sha256=\"E9CZ9INDbd+2eRQozYqqbQ2yXLVKB9+xcprMF+44U1g=\""); } @Test public void writeHeadersInsecureRequestDoesNotWriteHeader() { - request.setSecure(false); + this.request.setSecure(false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).isEmpty(); + assertThat(this.response.getHeaderNames()).isEmpty(); } @Test(expected = IllegalArgumentException.class) public void setMaxAgeInSecondsToNegative() { - writer.setMaxAgeInSeconds(-1); + this.writer.setMaxAgeInSeconds(-1); } @Test(expected = IllegalArgumentException.class) public void addSha256PinsWithNullPin() { - writer.addSha256Pins("d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=", null); + this.writer.addSha256Pins("d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=", null); } @Test(expected = IllegalArgumentException.class) public void setIncorrectReportUri() { - writer.setReportUri("some url here..."); + this.writer.setReportUri("some url here..."); } @Test diff --git a/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java index d762e8d46e..0129af05a3 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java @@ -41,111 +41,114 @@ public class HstsHeaderWriterTests { @Before public void setup() { - request = new MockHttpServletRequest(); - request.setSecure(true); - response = new MockHttpServletResponse(); + this.request = new MockHttpServletRequest(); + this.request.setSecure(true); + this.response = new MockHttpServletResponse(); - writer = new HstsHeaderWriter(); + this.writer = new HstsHeaderWriter(); } @Test public void allArgsCustomConstructorWriteHeaders() { - request.setSecure(false); - writer = new HstsHeaderWriter(AnyRequestMatcher.INSTANCE, 15768000, false); + this.request.setSecure(false); + this.writer = new HstsHeaderWriter(AnyRequestMatcher.INSTANCE, 15768000, false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=15768000"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=15768000"); } @Test public void maxAgeAndIncludeSubdomainsCustomConstructorWriteHeaders() { - request.setSecure(false); - writer = new HstsHeaderWriter(AnyRequestMatcher.INSTANCE, 15768000, false); + this.request.setSecure(false); + this.writer = new HstsHeaderWriter(AnyRequestMatcher.INSTANCE, 15768000, false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=15768000"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=15768000"); } @Test public void maxAgeCustomConstructorWriteHeaders() { - writer = new HstsHeaderWriter(15768000); + this.writer = new HstsHeaderWriter(15768000); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=15768000 ; includeSubDomains"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Strict-Transport-Security")) + .isEqualTo("max-age=15768000 ; includeSubDomains"); } @Test public void includeSubDomainsCustomConstructorWriteHeaders() { - writer = new HstsHeaderWriter(false); + this.writer = new HstsHeaderWriter(false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=31536000"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=31536000"); } @Test public void writeHeadersDefaultValues() { - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=31536000 ; includeSubDomains"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Strict-Transport-Security")) + .isEqualTo("max-age=31536000 ; includeSubDomains"); } @Test public void writeHeadersIncludeSubDomainsFalse() { - writer.setIncludeSubDomains(false); + this.writer.setIncludeSubDomains(false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=31536000"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=31536000"); } @Test public void writeHeadersCustomMaxAgeInSeconds() { - writer.setMaxAgeInSeconds(1); + this.writer.setMaxAgeInSeconds(1); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=1 ; includeSubDomains"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=1 ; includeSubDomains"); } @Test public void writeHeadersInsecureRequestDoesNotWriteHeader() { - request.setSecure(false); + this.request.setSecure(false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames().isEmpty()).isTrue(); + assertThat(this.response.getHeaderNames().isEmpty()).isTrue(); } @Test public void writeHeadersAnyRequestMatcher() { - writer.setRequestMatcher(AnyRequestMatcher.INSTANCE); - request.setSecure(false); + this.writer.setRequestMatcher(AnyRequestMatcher.INSTANCE); + this.request.setSecure(false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=31536000 ; includeSubDomains"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader("Strict-Transport-Security")) + .isEqualTo("max-age=31536000 ; includeSubDomains"); } @Test(expected = IllegalArgumentException.class) public void setMaxAgeInSecondsToNegative() { - writer.setMaxAgeInSeconds(-1); + this.writer.setMaxAgeInSeconds(-1); } @Test(expected = IllegalArgumentException.class) public void setRequestMatcherToNull() { - writer.setRequestMatcher(null); + this.writer.setRequestMatcher(null); } @Test diff --git a/web/src/test/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriterTests.java index f51bd14cb2..01eb4b6cec 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriterTests.java @@ -53,7 +53,7 @@ public class ReferrerPolicyHeaderWriterTests { this.writer.writeHeaders(this.request, this.response); assertThat(this.response.getHeaderNames()).hasSize(1); - assertThat(this.response.getHeader("Referrer-Policy")).isEqualTo(DEFAULT_REFERRER_POLICY); + assertThat(this.response.getHeader("Referrer-Policy")).isEqualTo(this.DEFAULT_REFERRER_POLICY); } @Test diff --git a/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java index eeb8c1ba9a..1a502e56d6 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java @@ -43,8 +43,8 @@ public class StaticHeaderWriterTests { @Before public void setup() { - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); } @Test(expected = IllegalArgumentException.class) @@ -78,8 +78,8 @@ public class StaticHeaderWriterTests { String headerValue = "foo"; StaticHeadersWriter factory = new StaticHeadersWriter(headerName, headerValue); - factory.writeHeaders(request, response); - assertThat(response.getHeaderValues(headerName)).isEqualTo(Arrays.asList(headerValue)); + factory.writeHeaders(this.request, this.response); + assertThat(this.response.getHeaderValues(headerName)).isEqualTo(Arrays.asList(headerValue)); } @Test @@ -88,11 +88,11 @@ public class StaticHeaderWriterTests { Header cacheControl = new Header("Cache-Control", "no-cache", "no-store", "must-revalidate"); StaticHeadersWriter factory = new StaticHeadersWriter(Arrays.asList(pragma, cacheControl)); - factory.writeHeaders(request, response); + factory.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(2); - assertThat(response.getHeaderValues(pragma.getName())).isEqualTo(pragma.getValues()); - assertThat(response.getHeaderValues(cacheControl.getName())).isEqualTo(cacheControl.getValues()); + assertThat(this.response.getHeaderNames()).hasSize(2); + assertThat(this.response.getHeaderValues(pragma.getName())).isEqualTo(pragma.getValues()); + assertThat(this.response.getHeaderValues(cacheControl.getName())).isEqualTo(cacheControl.getValues()); } @Test diff --git a/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java index 92141c4e00..41ec5a4d14 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java @@ -37,17 +37,17 @@ public class XContentTypeOptionsHeaderWriterTests { @Before public void setup() { - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); - writer = new XContentTypeOptionsHeaderWriter(); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); + this.writer = new XContentTypeOptionsHeaderWriter(); } @Test public void writeHeaders() { - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeaderValues("X-Content-Type-Options")).containsExactly("nosniff"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeaderValues("X-Content-Type-Options")).containsExactly("nosniff"); } } diff --git a/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java index 98ba297a54..7cfe28314f 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java @@ -40,56 +40,56 @@ public class XXssProtectionHeaderWriterTests { @Before public void setup() { - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); - writer = new XXssProtectionHeaderWriter(); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); + this.writer = new XXssProtectionHeaderWriter(); } @Test public void writeHeaders() { - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeaderValues("X-XSS-Protection")).containsOnly("1; mode=block"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeaderValues("X-XSS-Protection")).containsOnly("1; mode=block"); } @Test public void writeHeadersNoBlock() { - writer.setBlock(false); + this.writer.setBlock(false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeaderValues("X-XSS-Protection")).containsOnly("1"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeaderValues("X-XSS-Protection")).containsOnly("1"); } @Test public void writeHeadersDisabled() { - writer.setBlock(false); - writer.setEnabled(false); + this.writer.setBlock(false); + this.writer.setEnabled(false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeaderValues("X-XSS-Protection")).containsOnly("0"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeaderValues("X-XSS-Protection")).containsOnly("0"); } @Test public void setEnabledFalseWithBlockTrue() { - writer.setEnabled(false); + this.writer.setEnabled(false); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeaderValues("X-XSS-Protection")).containsOnly("0"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeaderValues("X-XSS-Protection")).containsOnly("0"); } @Test(expected = IllegalArgumentException.class) public void setBlockTrueWithEnabledFalse() { - writer.setBlock(false); - writer.setEnabled(false); + this.writer.setBlock(false); + this.writer.setEnabled(false); - writer.setBlock(true); + this.writer.setBlock(true); } @Test diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java index f8fa7300a8..c01dba9c8d 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java @@ -32,50 +32,50 @@ public class AbstractRequestParameterAllowFromStrategyTests { @Before public void setup() { - request = new MockHttpServletRequest(); + this.request = new MockHttpServletRequest(); } @Test public void nullAllowFromParameterValue() { RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(true); - assertThat(strategy.getAllowFromValue(request)).isEqualTo("DENY"); + assertThat(strategy.getAllowFromValue(this.request)).isEqualTo("DENY"); } @Test public void emptyAllowFromParameterValue() { - request.setParameter("x-frames-allow-from", ""); + this.request.setParameter("x-frames-allow-from", ""); RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(true); - assertThat(strategy.getAllowFromValue(request)).isEqualTo("DENY"); + assertThat(strategy.getAllowFromValue(this.request)).isEqualTo("DENY"); } @Test public void emptyAllowFromCustomParameterValue() { String customParam = "custom"; - request.setParameter(customParam, ""); + this.request.setParameter(customParam, ""); RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(true); strategy.setAllowFromParameterName(customParam); - assertThat(strategy.getAllowFromValue(request)).isEqualTo("DENY"); + assertThat(strategy.getAllowFromValue(this.request)).isEqualTo("DENY"); } @Test public void allowFromParameterValueAllowed() { String value = "https://example.com"; - request.setParameter("x-frames-allow-from", value); + this.request.setParameter("x-frames-allow-from", value); RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(true); - assertThat(strategy.getAllowFromValue(request)).isEqualTo(value); + assertThat(strategy.getAllowFromValue(this.request)).isEqualTo(value); } @Test public void allowFromParameterValueDenied() { String value = "https://example.com"; - request.setParameter("x-frames-allow-from", value); + this.request.setParameter("x-frames-allow-from", value); RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(false); - assertThat(strategy.getAllowFromValue(request)).isEqualTo("DENY"); + assertThat(strategy.getAllowFromValue(this.request)).isEqualTo("DENY"); } private static class RequestParameterAllowFromStrategyStub extends AbstractRequestParameterAllowFromStrategy { @@ -88,7 +88,7 @@ public class AbstractRequestParameterAllowFromStrategyTests { @Override protected boolean allowed(String allowFromOrigin) { - return match; + return this.match; } } diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java index deeb9dc7ba..52fc10499f 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java @@ -46,8 +46,8 @@ public class FrameOptionsHeaderWriterTests { @Before public void setup() { - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); } @Test(expected = IllegalArgumentException.class) @@ -67,56 +67,56 @@ public class FrameOptionsHeaderWriterTests { @Test public void writeHeadersAllowFromReturnsNull() { - writer = new XFrameOptionsHeaderWriter(strategy); + this.writer = new XFrameOptionsHeaderWriter(this.strategy); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames().isEmpty()).isTrue(); + assertThat(this.response.getHeaderNames().isEmpty()).isTrue(); } @Test public void writeHeadersAllowFrom() { String allowFromValue = "https://example.com/"; - when(strategy.getAllowFromValue(request)).thenReturn(allowFromValue); - writer = new XFrameOptionsHeaderWriter(strategy); + when(this.strategy.getAllowFromValue(this.request)).thenReturn(allowFromValue); + this.writer = new XFrameOptionsHeaderWriter(this.strategy); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)) + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)) .isEqualTo("ALLOW-FROM " + allowFromValue); } @Test public void writeHeadersDeny() { - writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY); + this.writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)).isEqualTo("DENY"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)).isEqualTo("DENY"); } @Test public void writeHeadersSameOrigin() { - writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.SAMEORIGIN); + this.writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.SAMEORIGIN); - writer.writeHeaders(request, response); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)).isEqualTo("SAMEORIGIN"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)).isEqualTo("SAMEORIGIN"); } @Test public void writeHeadersTwiceLastWins() { - writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.SAMEORIGIN); - writer.writeHeaders(request, response); + this.writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.SAMEORIGIN); + this.writer.writeHeaders(this.request, this.response); - writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY); - writer.writeHeaders(request, response); + this.writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY); + this.writer.writeHeaders(this.request, this.response); - assertThat(response.getHeaderNames()).hasSize(1); - assertThat(response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)).isEqualTo("DENY"); + assertThat(this.response.getHeaderNames()).hasSize(1); + assertThat(this.response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)).isEqualTo("DENY"); } } diff --git a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java index d269aa3aa2..67c8b2f39d 100644 --- a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java @@ -78,11 +78,11 @@ public class JaasApiIntegrationFilterTests { this.request = new MockHttpServletRequest(); this.response = new MockHttpServletResponse(); - authenticatedSubject = new Subject(); - authenticatedSubject.getPrincipals().add(() -> "principal"); - authenticatedSubject.getPrivateCredentials().add("password"); - authenticatedSubject.getPublicCredentials().add("username"); - callbackHandler = callbacks -> { + this.authenticatedSubject = new Subject(); + this.authenticatedSubject.getPrincipals().add(() -> "principal"); + this.authenticatedSubject.getPrivateCredentials().add("password"); + this.authenticatedSubject.getPublicCredentials().add("username"); + this.callbackHandler = callbacks -> { for (Callback callback : callbacks) { if (callback instanceof NameCallback) { ((NameCallback) callback).setName("user"); @@ -98,7 +98,7 @@ public class JaasApiIntegrationFilterTests { } } }; - testConfiguration = new Configuration() { + this.testConfiguration = new Configuration() { public void refresh() { } @@ -108,11 +108,11 @@ public class JaasApiIntegrationFilterTests { LoginModuleControlFlag.REQUIRED, new HashMap<>()) }; } }; - LoginContext ctx = new LoginContext("SubjectDoAsFilterTest", authenticatedSubject, callbackHandler, - testConfiguration); + LoginContext ctx = new LoginContext("SubjectDoAsFilterTest", this.authenticatedSubject, this.callbackHandler, + this.testConfiguration); ctx.login(); - token = new JaasAuthenticationToken("username", "password", AuthorityUtils.createAuthorityList("ROLE_ADMIN"), - ctx); + this.token = new JaasAuthenticationToken("username", "password", + AuthorityUtils.createAuthorityList("ROLE_ADMIN"), ctx); // just in case someone forgot to clear the context SecurityContextHolder.clearContext(); @@ -133,7 +133,7 @@ public class JaasApiIntegrationFilterTests { @Test public void obtainSubjectNullAuthentication() { - assertNullSubject(filter.obtainSubject(request)); + assertNullSubject(this.filter.obtainSubject(this.request)); } @Test @@ -141,51 +141,52 @@ public class JaasApiIntegrationFilterTests { Authentication authentication = new TestingAuthenticationToken("un", "pwd"); authentication.setAuthenticated(true); SecurityContextHolder.getContext().setAuthentication(authentication); - assertNullSubject(filter.obtainSubject(request)); + assertNullSubject(this.filter.obtainSubject(this.request)); } @Test public void obtainSubjectNullLoginContext() { - token = new JaasAuthenticationToken("un", "pwd", AuthorityUtils.createAuthorityList("ROLE_ADMIN"), null); - SecurityContextHolder.getContext().setAuthentication(token); - assertNullSubject(filter.obtainSubject(request)); + this.token = new JaasAuthenticationToken("un", "pwd", AuthorityUtils.createAuthorityList("ROLE_ADMIN"), null); + SecurityContextHolder.getContext().setAuthentication(this.token); + assertNullSubject(this.filter.obtainSubject(this.request)); } @Test public void obtainSubjectNullSubject() throws Exception { - LoginContext ctx = new LoginContext("obtainSubjectNullSubject", null, callbackHandler, testConfiguration); + LoginContext ctx = new LoginContext("obtainSubjectNullSubject", null, this.callbackHandler, + this.testConfiguration); assertThat(ctx.getSubject()).isNull(); - token = new JaasAuthenticationToken("un", "pwd", AuthorityUtils.createAuthorityList("ROLE_ADMIN"), ctx); - SecurityContextHolder.getContext().setAuthentication(token); - assertNullSubject(filter.obtainSubject(request)); + this.token = new JaasAuthenticationToken("un", "pwd", AuthorityUtils.createAuthorityList("ROLE_ADMIN"), ctx); + SecurityContextHolder.getContext().setAuthentication(this.token); + assertNullSubject(this.filter.obtainSubject(this.request)); } @Test public void obtainSubject() { - SecurityContextHolder.getContext().setAuthentication(token); - assertThat(filter.obtainSubject(request)).isEqualTo(authenticatedSubject); + SecurityContextHolder.getContext().setAuthentication(this.token); + assertThat(this.filter.obtainSubject(this.request)).isEqualTo(this.authenticatedSubject); } @Test public void doFilterCurrentSubjectPopulated() throws Exception { - SecurityContextHolder.getContext().setAuthentication(token); - assertJaasSubjectEquals(authenticatedSubject); + SecurityContextHolder.getContext().setAuthentication(this.token); + assertJaasSubjectEquals(this.authenticatedSubject); } @Test public void doFilterAuthenticationNotAuthenticated() throws Exception { // Authentication is null, so no Subject is populated. - token.setAuthenticated(false); - SecurityContextHolder.getContext().setAuthentication(token); + this.token.setAuthenticated(false); + SecurityContextHolder.getContext().setAuthentication(this.token); assertJaasSubjectEquals(null); - filter.setCreateEmptySubject(true); + this.filter.setCreateEmptySubject(true); assertJaasSubjectEquals(new Subject()); } @Test public void doFilterAuthenticationNull() throws Exception { assertJaasSubjectEquals(null); - filter.setCreateEmptySubject(true); + this.filter.setCreateEmptySubject(true); assertJaasSubjectEquals(new Subject()); } @@ -202,7 +203,7 @@ public class JaasApiIntegrationFilterTests { super.doFilter(request, response); } }; - filter.doFilter(request, response, chain); + this.filter.doFilter(this.request, this.response, chain); // ensure that the chain was actually invoked assertThat(chain.getRequest()).isNotNull(); } diff --git a/web/src/test/java/org/springframework/security/web/jackson2/AbstractMixinTests.java b/web/src/test/java/org/springframework/security/web/jackson2/AbstractMixinTests.java index 97f6a63711..0b64b22bfb 100644 --- a/web/src/test/java/org/springframework/security/web/jackson2/AbstractMixinTests.java +++ b/web/src/test/java/org/springframework/security/web/jackson2/AbstractMixinTests.java @@ -31,9 +31,9 @@ public abstract class AbstractMixinTests { @Before public void setup() { - mapper = new ObjectMapper(); + this.mapper = new ObjectMapper(); ClassLoader loader = getClass().getClassLoader(); - mapper.registerModules(SecurityJackson2Modules.getModules(loader)); + this.mapper.registerModules(SecurityJackson2Modules.getModules(loader)); } } diff --git a/web/src/test/java/org/springframework/security/web/jackson2/CookieMixinTests.java b/web/src/test/java/org/springframework/security/web/jackson2/CookieMixinTests.java index 61556153c2..7a6b00d6e3 100644 --- a/web/src/test/java/org/springframework/security/web/jackson2/CookieMixinTests.java +++ b/web/src/test/java/org/springframework/security/web/jackson2/CookieMixinTests.java @@ -51,13 +51,13 @@ public class CookieMixinTests extends AbstractMixinTests { @Test public void serializeCookie() throws JsonProcessingException, JSONException { Cookie cookie = new Cookie("demo", "cookie1"); - String actualString = mapper.writeValueAsString(cookie); + String actualString = this.mapper.writeValueAsString(cookie); JSONAssert.assertEquals(COOKIE_JSON, actualString, true); } @Test public void deserializeCookie() throws IOException { - Cookie cookie = mapper.readValue(COOKIE_JSON, Cookie.class); + Cookie cookie = this.mapper.readValue(COOKIE_JSON, Cookie.class); assertThat(cookie).isNotNull(); assertThat(cookie.getName()).isEqualTo("demo"); assertThat(cookie.getDomain()).isEqualTo(""); diff --git a/web/src/test/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixinTests.java b/web/src/test/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixinTests.java index fdb0e76e6b..0130cc3b9e 100644 --- a/web/src/test/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixinTests.java +++ b/web/src/test/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixinTests.java @@ -46,13 +46,13 @@ public class DefaultCsrfTokenMixinTests extends AbstractMixinTests { @Test public void defaultCsrfTokenSerializedTest() throws JsonProcessingException, JSONException { DefaultCsrfToken token = new DefaultCsrfToken("csrf-header", "_csrf", "1"); - String serializedJson = mapper.writeValueAsString(token); + String serializedJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(CSRF_JSON, serializedJson, true); } @Test public void defaultCsrfTokenDeserializeTest() throws IOException { - DefaultCsrfToken token = mapper.readValue(CSRF_JSON, DefaultCsrfToken.class); + DefaultCsrfToken token = this.mapper.readValue(CSRF_JSON, DefaultCsrfToken.class); assertThat(token).isNotNull(); assertThat(token.getHeaderName()).isEqualTo("csrf-header"); assertThat(token.getParameterName()).isEqualTo("_csrf"); @@ -62,13 +62,13 @@ public class DefaultCsrfTokenMixinTests extends AbstractMixinTests { @Test(expected = JsonMappingException.class) public void defaultCsrfTokenDeserializeWithoutClassTest() throws IOException { String tokenJson = "{\"headerName\": \"csrf-header\", \"parameterName\": \"_csrf\", \"token\": \"1\"}"; - mapper.readValue(tokenJson, DefaultCsrfToken.class); + this.mapper.readValue(tokenJson, DefaultCsrfToken.class); } @Test(expected = JsonMappingException.class) public void defaultCsrfTokenDeserializeNullValuesTest() throws IOException { String tokenJson = "{\"@class\": \"org.springframework.security.web.csrf.DefaultCsrfToken\", \"headerName\": \"\", \"parameterName\": null, \"token\": \"1\"}"; - mapper.readValue(tokenJson, DefaultCsrfToken.class); + this.mapper.readValue(tokenJson, DefaultCsrfToken.class); } } diff --git a/web/src/test/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixinTests.java b/web/src/test/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixinTests.java index cbf4605e49..33da0c0a6d 100644 --- a/web/src/test/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixinTests.java +++ b/web/src/test/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixinTests.java @@ -102,7 +102,7 @@ public class DefaultSavedRequestMixinTests extends AbstractMixinTests { return new Cookie[] { new Cookie("SESSION", "123456789") }; } }; - String actualString = mapper.writerWithDefaultPrettyPrinter() + String actualString = this.mapper.writerWithDefaultPrettyPrinter() .writeValueAsString(new DefaultSavedRequest(requestToWrite, new PortResolverImpl())); JSONAssert.assertEquals(REQUEST_JSON, actualString, true); } @@ -115,13 +115,13 @@ public class DefaultSavedRequestMixinTests extends AbstractMixinTests { .setRequestURL("http://localhost").setServerName("localhost").setRequestURI("") .setLocales(Collections.singletonList(new Locale("en"))).setContextPath("").setMethod("") .setServletPath("").build(); - String actualString = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(request); + String actualString = this.mapper.writerWithDefaultPrettyPrinter().writeValueAsString(request); JSONAssert.assertEquals(REQUEST_JSON, actualString, true); } @Test public void deserializeDefaultSavedRequest() throws IOException { - DefaultSavedRequest request = (DefaultSavedRequest) mapper.readValue(REQUEST_JSON, Object.class); + DefaultSavedRequest request = (DefaultSavedRequest) this.mapper.readValue(REQUEST_JSON, Object.class); assertThat(request).isNotNull(); assertThat(request.getCookies()).hasSize(1); assertThat(request.getLocales()).hasSize(1).contains(new Locale("en")); diff --git a/web/src/test/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixinTests.java b/web/src/test/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixinTests.java index 602416dfec..acc7f3feda 100644 --- a/web/src/test/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixinTests.java +++ b/web/src/test/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixinTests.java @@ -49,24 +49,24 @@ public class PreAuthenticatedAuthenticationTokenMixinTests extends AbstractMixin @Before public void setupExpected() { - expected = new PreAuthenticatedAuthenticationToken("principal", "credentials", + this.expected = new PreAuthenticatedAuthenticationToken("principal", "credentials", AuthorityUtils.createAuthorityList("ROLE_USER")); } @Test public void serializeWhenPrincipalCredentialsAuthoritiesThenSuccess() throws JsonProcessingException, JSONException { - String serializedJson = mapper.writeValueAsString(expected); + String serializedJson = this.mapper.writeValueAsString(this.expected); JSONAssert.assertEquals(PREAUTH_JSON, serializedJson, true); } @Test public void deserializeAuthenticatedUsernamePasswordAuthenticationTokenMixinTest() throws Exception { - PreAuthenticatedAuthenticationToken deserialized = mapper.readValue(PREAUTH_JSON, + PreAuthenticatedAuthenticationToken deserialized = this.mapper.readValue(PREAUTH_JSON, PreAuthenticatedAuthenticationToken.class); assertThat(deserialized).isNotNull(); assertThat(deserialized.isAuthenticated()).isTrue(); - assertThat(deserialized.getAuthorities()).isEqualTo(expected.getAuthorities()); + assertThat(deserialized.getAuthorities()).isEqualTo(this.expected.getAuthorities()); } } diff --git a/web/src/test/java/org/springframework/security/web/jackson2/SavedCookieMixinTests.java b/web/src/test/java/org/springframework/security/web/jackson2/SavedCookieMixinTests.java index c6d2b8bcd8..597357a8ca 100644 --- a/web/src/test/java/org/springframework/security/web/jackson2/SavedCookieMixinTests.java +++ b/web/src/test/java/org/springframework/security/web/jackson2/SavedCookieMixinTests.java @@ -61,16 +61,16 @@ public class SavedCookieMixinTests extends AbstractMixinTests { @Test public void serializeWithDefaultConfigurationTest() throws JsonProcessingException, JSONException { SavedCookie savedCookie = new SavedCookie(new Cookie("SESSION", "123456789")); - String actualJson = mapper.writeValueAsString(savedCookie); + String actualJson = this.mapper.writeValueAsString(savedCookie); JSONAssert.assertEquals(COOKIE_JSON, actualJson, true); } @Test public void serializeWithOverrideConfigurationTest() throws JsonProcessingException, JSONException { SavedCookie savedCookie = new SavedCookie(new Cookie("SESSION", "123456789")); - mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.PUBLIC_ONLY) + this.mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.PUBLIC_ONLY) .setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.ANY); - String actualJson = mapper.writeValueAsString(savedCookie); + String actualJson = this.mapper.writeValueAsString(savedCookie); JSONAssert.assertEquals(COOKIE_JSON, actualJson, true); } @@ -78,14 +78,14 @@ public class SavedCookieMixinTests extends AbstractMixinTests { public void serializeSavedCookieWithList() throws JsonProcessingException, JSONException { List savedCookies = new ArrayList<>(); savedCookies.add(new SavedCookie(new Cookie("SESSION", "123456789"))); - String actualJson = mapper.writeValueAsString(savedCookies); + String actualJson = this.mapper.writeValueAsString(savedCookies); JSONAssert.assertEquals(COOKIES_JSON, actualJson, true); } @Test @SuppressWarnings("unchecked") public void deserializeSavedCookieWithList() throws IOException { - List savedCookies = (List) mapper.readValue(COOKIES_JSON, Object.class); + List savedCookies = (List) this.mapper.readValue(COOKIES_JSON, Object.class); assertThat(savedCookies).isNotNull().hasSize(1); assertThat(savedCookies.get(0).getName()).isEqualTo("SESSION"); assertThat(savedCookies.get(0).getValue()).isEqualTo("123456789"); @@ -93,7 +93,7 @@ public class SavedCookieMixinTests extends AbstractMixinTests { @Test public void deserializeSavedCookieJsonTest() throws IOException { - SavedCookie savedCookie = (SavedCookie) mapper.readValue(COOKIE_JSON, Object.class); + SavedCookie savedCookie = (SavedCookie) this.mapper.readValue(COOKIE_JSON, Object.class); assertThat(savedCookie).isNotNull(); assertThat(savedCookie.getName()).isEqualTo("SESSION"); assertThat(savedCookie.getValue()).isEqualTo("123456789"); diff --git a/web/src/test/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixinTests.java b/web/src/test/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixinTests.java index 35848f3c2c..2a821f308a 100644 --- a/web/src/test/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixinTests.java +++ b/web/src/test/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixinTests.java @@ -52,7 +52,7 @@ public class WebAuthenticationDetailsMixinTests extends AbstractMixinTests { WebAuthenticationDetails details = new WebAuthenticationDetails(request); - WebAuthenticationDetails authenticationDetails = mapper.readValue(AUTHENTICATION_DETAILS_JSON, + WebAuthenticationDetails authenticationDetails = this.mapper.readValue(AUTHENTICATION_DETAILS_JSON, WebAuthenticationDetails.class); assertThat(details.equals(authenticationDetails)); } @@ -63,13 +63,13 @@ public class WebAuthenticationDetailsMixinTests extends AbstractMixinTests { request.setRemoteAddr("/localhost"); request.setSession(new MockHttpSession(null, "1")); WebAuthenticationDetails details = new WebAuthenticationDetails(request); - String actualJson = mapper.writeValueAsString(details); + String actualJson = this.mapper.writeValueAsString(details); JSONAssert.assertEquals(AUTHENTICATION_DETAILS_JSON, actualJson, true); } @Test public void webAuthenticationDetailsDeserializeTest() throws IOException { - WebAuthenticationDetails details = mapper.readValue(AUTHENTICATION_DETAILS_JSON, + WebAuthenticationDetails details = this.mapper.readValue(AUTHENTICATION_DETAILS_JSON, WebAuthenticationDetails.class); assertThat(details).isNotNull(); assertThat(details.getRemoteAddress()).isEqualTo("/localhost"); diff --git a/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java b/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java index 605a796c27..58c6eccc9b 100644 --- a/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java +++ b/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java @@ -293,8 +293,8 @@ public final class ResolvableMethod { @SafeVarargs public final Builder annotPresent(Class... annotationTypes) { String message = "annotationPresent=" + Arrays.toString(annotationTypes); - addFilter(message, method -> Arrays.stream(annotationTypes) - .allMatch(annotType -> AnnotatedElementUtils.findMergedAnnotation(method, annotType) != null)); + addFilter(message, candidate -> Arrays.stream(annotationTypes) + .allMatch(annotType -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null)); return this; } @@ -304,13 +304,13 @@ public final class ResolvableMethod { @SafeVarargs public final Builder annotNotPresent(Class... annotationTypes) { String message = "annotationNotPresent=" + Arrays.toString(annotationTypes); - addFilter(message, method -> { + addFilter(message, candidate -> { if (annotationTypes.length != 0) { return Arrays.stream(annotationTypes).noneMatch( - annotType -> AnnotatedElementUtils.findMergedAnnotation(method, annotType) != null); + annotType -> AnnotatedElementUtils.findMergedAnnotation(candidate, annotType) != null); } else { - return method.getAnnotations().length == 0; + return candidate.getAnnotations().length == 0; } }); return this; @@ -574,8 +574,8 @@ public final class ResolvableMethod { private List applyFilters() { List matches = new ArrayList<>(); - for (int i = 0; i < method.getParameterCount(); i++) { - MethodParameter param = new SynthesizingMethodParameter(method, i); + for (int i = 0; i < ResolvableMethod.this.method.getParameterCount(); i++) { + MethodParameter param = new SynthesizingMethodParameter(ResolvableMethod.this.method, i); param.initParameterNameDiscovery(nameDiscoverer); if (this.filters.stream().allMatch(p -> p.test(param))) { matches.add(param); diff --git a/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java index c20f92a6fd..9d5af585de 100644 --- a/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java @@ -48,7 +48,7 @@ public class AuthenticationPrincipalArgumentResolverTests { @Before public void setup() { - resolver = new AuthenticationPrincipalArgumentResolver(); + this.resolver = new AuthenticationPrincipalArgumentResolver(); } @After @@ -58,60 +58,63 @@ public class AuthenticationPrincipalArgumentResolverTests { @Test public void supportsParameterNoAnnotation() { - assertThat(resolver.supportsParameter(showUserNoAnnotation())).isFalse(); + assertThat(this.resolver.supportsParameter(showUserNoAnnotation())).isFalse(); } @Test public void supportsParameterAnnotation() { - assertThat(resolver.supportsParameter(showUserAnnotationObject())).isTrue(); + assertThat(this.resolver.supportsParameter(showUserAnnotationObject())).isTrue(); } @Test public void supportsParameterCustomAnnotation() { - assertThat(resolver.supportsParameter(showUserCustomAnnotation())).isTrue(); + assertThat(this.resolver.supportsParameter(showUserCustomAnnotation())).isTrue(); } @Test public void resolveArgumentNullAuthentication() throws Exception { - assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); } @Test public void resolveArgumentNullPrincipal() throws Exception { setAuthenticationPrincipal(null); - assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); } @Test public void resolveArgumentString() throws Exception { setAuthenticationPrincipal("john"); - assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentPrincipalStringOnObject() throws Exception { setAuthenticationPrincipal("john"); - assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationObject(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentUserDetails() throws Exception { setAuthenticationPrincipal(new User("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER"))); - assertThat(resolver.resolveArgument(showUserAnnotationUserDetails(), null, null, null)) - .isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationUserDetails(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentCustomUserPrincipal() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - assertThat(resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null, null, null)) - .isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } @Test public void resolveArgumentCustomAnnotation() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null, null, null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserCustomAnnotation(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } @Test @@ -134,25 +137,26 @@ public class AuthenticationPrincipalArgumentResolverTests { @Test public void resolveArgumentNullOnInvalidType() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); + assertThat(this.resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull(); } @Test(expected = ClassCastException.class) public void resolveArgumentErrorOnInvalidType() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null, null, null); + this.resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null, null, null); } @Test(expected = ClassCastException.class) public void resolveArgumentCustomserErrorOnInvalidType() throws Exception { setAuthenticationPrincipal(new CustomUserPrincipal()); - resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null, null, null); + this.resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null, null, null); } @Test public void resolveArgumentObject() throws Exception { setAuthenticationPrincipal(new Object()); - assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null)).isEqualTo(expectedPrincipal); + assertThat(this.resolver.resolveArgument(showUserAnnotationObject(), null, null, null)) + .isEqualTo(this.expectedPrincipal); } private MethodParameter showUserNoAnnotation() { @@ -304,7 +308,7 @@ public class AuthenticationPrincipalArgumentResolverTests { private void setAuthenticationPrincipal(Object principal) { this.expectedPrincipal = principal; SecurityContextHolder.getContext() - .setAuthentication(new TestingAuthenticationToken(expectedPrincipal, "password", "ROLE_USER")); + .setAuthentication(new TestingAuthenticationToken(this.expectedPrincipal, "password", "ROLE_USER")); } } diff --git a/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java index 3d8b235342..78a0257842 100644 --- a/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java @@ -58,32 +58,34 @@ public class CsrfTokenArgumentResolverTests { @Before public void setup() { - token = new DefaultCsrfToken("X-CSRF-TOKEN", "_csrf", "secret"); - resolver = new CsrfTokenArgumentResolver(); - request = new MockHttpServletRequest(); - webRequest = new ServletWebRequest(request); + this.token = new DefaultCsrfToken("X-CSRF-TOKEN", "_csrf", "secret"); + this.resolver = new CsrfTokenArgumentResolver(); + this.request = new MockHttpServletRequest(); + this.webRequest = new ServletWebRequest(this.request); } @Test public void supportsParameterFalse() { - assertThat(resolver.supportsParameter(noToken())).isFalse(); + assertThat(this.resolver.supportsParameter(noToken())).isFalse(); } @Test public void supportsParameterTrue() { - assertThat(resolver.supportsParameter(token())).isTrue(); + assertThat(this.resolver.supportsParameter(token())).isTrue(); } @Test public void resolveArgumentNotFound() throws Exception { - assertThat(resolver.resolveArgument(token(), mavContainer, webRequest, binderFactory)).isNull(); + assertThat(this.resolver.resolveArgument(token(), this.mavContainer, this.webRequest, this.binderFactory)) + .isNull(); } @Test public void resolveArgumentFound() throws Exception { - request.setAttribute(CsrfToken.class.getName(), token); + this.request.setAttribute(CsrfToken.class.getName(), this.token); - assertThat(resolver.resolveArgument(token(), mavContainer, webRequest, binderFactory)).isSameAs(token); + assertThat(this.resolver.resolveArgument(token(), this.mavContainer, this.webRequest, this.binderFactory)) + .isSameAs(this.token); } private MethodParameter noToken() { diff --git a/web/src/test/java/org/springframework/security/web/method/annotation/CurrentSecurityContextArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/method/annotation/CurrentSecurityContextArgumentResolverTests.java index b4877f11d5..61d4f06744 100644 --- a/web/src/test/java/org/springframework/security/web/method/annotation/CurrentSecurityContextArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/method/annotation/CurrentSecurityContextArgumentResolverTests.java @@ -334,7 +334,7 @@ public class CurrentSecurityContextArgumentResolverTests { @Override public Authentication getAuthentication() { - return authentication; + return this.authentication; } @Override diff --git a/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolverTests.java index b61603f66a..ec368956ee 100644 --- a/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolverTests.java @@ -76,36 +76,36 @@ public class AuthenticationPrincipalArgumentResolverTests { @Before public void setup() { - resolver = new AuthenticationPrincipalArgumentResolver(new ReactiveAdapterRegistry()); + this.resolver = new AuthenticationPrincipalArgumentResolver(new ReactiveAdapterRegistry()); this.resolver.setBeanResolver(this.beanResolver); } @Test public void supportsParameterAuthenticationPrincipal() { - assertThat(resolver.supportsParameter(this.authenticationPrincipal.arg(String.class))).isTrue(); + assertThat(this.resolver.supportsParameter(this.authenticationPrincipal.arg(String.class))).isTrue(); } @Test public void supportsParameterCurrentUser() { - assertThat(resolver.supportsParameter(this.meta.arg(String.class))).isTrue(); + assertThat(this.resolver.supportsParameter(this.meta.arg(String.class))).isTrue(); } @Test public void resolveArgumentWhenIsAuthenticationThenObtainsPrincipal() { MethodParameter parameter = this.authenticationPrincipal.arg(String.class); - when(authentication.getPrincipal()).thenReturn("user"); + when(this.authentication.getPrincipal()).thenReturn("user"); - Mono argument = resolver.resolveArgument(parameter, bindingContext, exchange) - .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)); + Mono argument = this.resolver.resolveArgument(parameter, this.bindingContext, this.exchange) + .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.authentication)); - assertThat(argument.block()).isEqualTo(authentication.getPrincipal()); + assertThat(argument.block()).isEqualTo(this.authentication.getPrincipal()); } @Test public void resolveArgumentWhenIsEmptyThenMonoEmpty() { MethodParameter parameter = this.authenticationPrincipal.arg(String.class); - Mono argument = resolver.resolveArgument(parameter, bindingContext, exchange); + Mono argument = this.resolver.resolveArgument(parameter, this.bindingContext, this.exchange); assertThat(argument).isNotNull(); assertThat(argument.block()).isNull(); @@ -114,34 +114,34 @@ public class AuthenticationPrincipalArgumentResolverTests { @Test public void resolveArgumentWhenMonoIsAuthenticationThenObtainsPrincipal() { MethodParameter parameter = this.authenticationPrincipal.arg(Mono.class, String.class); - when(authentication.getPrincipal()).thenReturn("user"); + when(this.authentication.getPrincipal()).thenReturn("user"); - Mono argument = resolver.resolveArgument(parameter, bindingContext, exchange) - .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)); + Mono argument = this.resolver.resolveArgument(parameter, this.bindingContext, this.exchange) + .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.authentication)); - assertThat(argument.cast(Mono.class).block().block()).isEqualTo(authentication.getPrincipal()); + assertThat(argument.cast(Mono.class).block().block()).isEqualTo(this.authentication.getPrincipal()); } @Test public void resolveArgumentWhenMonoIsAuthenticationAndNoGenericThenObtainsPrincipal() { MethodParameter parameter = ResolvableMethod.on(getClass()).named("authenticationPrincipalNoGeneric").build() .arg(Mono.class); - when(authentication.getPrincipal()).thenReturn("user"); + when(this.authentication.getPrincipal()).thenReturn("user"); - Mono argument = resolver.resolveArgument(parameter, bindingContext, exchange) - .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)); + Mono argument = this.resolver.resolveArgument(parameter, this.bindingContext, this.exchange) + .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.authentication)); - assertThat(argument.cast(Mono.class).block().block()).isEqualTo(authentication.getPrincipal()); + assertThat(argument.cast(Mono.class).block().block()).isEqualTo(this.authentication.getPrincipal()); } @Test public void resolveArgumentWhenSpelThenObtainsPrincipal() { MyUser user = new MyUser(3L); MethodParameter parameter = this.spel.arg(Long.class); - when(authentication.getPrincipal()).thenReturn(user); + when(this.authentication.getPrincipal()).thenReturn(user); - Mono argument = resolver.resolveArgument(parameter, bindingContext, exchange) - .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)); + Mono argument = this.resolver.resolveArgument(parameter, this.bindingContext, this.exchange) + .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.authentication)); assertThat(argument.block()).isEqualTo(user.getId()); } @@ -150,11 +150,11 @@ public class AuthenticationPrincipalArgumentResolverTests { public void resolveArgumentWhenBeanThenObtainsPrincipal() throws Exception { MyUser user = new MyUser(3L); MethodParameter parameter = this.bean.arg(Long.class); - when(authentication.getPrincipal()).thenReturn(user); + when(this.authentication.getPrincipal()).thenReturn(user); when(this.beanResolver.resolve(any(), eq("beanName"))).thenReturn(new Bean()); - Mono argument = resolver.resolveArgument(parameter, bindingContext, exchange) - .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)); + Mono argument = this.resolver.resolveArgument(parameter, this.bindingContext, this.exchange) + .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.authentication)); assertThat(argument.block()).isEqualTo(user.getId()); } @@ -162,10 +162,10 @@ public class AuthenticationPrincipalArgumentResolverTests { @Test public void resolveArgumentWhenMetaThenObtainsPrincipal() { MethodParameter parameter = this.meta.arg(String.class); - when(authentication.getPrincipal()).thenReturn("user"); + when(this.authentication.getPrincipal()).thenReturn("user"); - Mono argument = resolver.resolveArgument(parameter, bindingContext, exchange) - .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)); + Mono argument = this.resolver.resolveArgument(parameter, this.bindingContext, this.exchange) + .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.authentication)); assertThat(argument.block()).isEqualTo("user"); } @@ -174,10 +174,10 @@ public class AuthenticationPrincipalArgumentResolverTests { public void resolveArgumentWhenErrorOnInvalidTypeImplicit() { MethodParameter parameter = ResolvableMethod.on(getClass()).named("errorOnInvalidTypeWhenImplicit").build() .arg(Integer.class); - when(authentication.getPrincipal()).thenReturn("user"); + when(this.authentication.getPrincipal()).thenReturn("user"); - Mono argument = resolver.resolveArgument(parameter, bindingContext, exchange) - .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)); + Mono argument = this.resolver.resolveArgument(parameter, this.bindingContext, this.exchange) + .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.authentication)); assertThat(argument.block()).isNull(); } @@ -186,10 +186,10 @@ public class AuthenticationPrincipalArgumentResolverTests { public void resolveArgumentWhenErrorOnInvalidTypeExplicitFalse() { MethodParameter parameter = ResolvableMethod.on(getClass()).named("errorOnInvalidTypeWhenExplicitFalse").build() .arg(Integer.class); - when(authentication.getPrincipal()).thenReturn("user"); + when(this.authentication.getPrincipal()).thenReturn("user"); - Mono argument = resolver.resolveArgument(parameter, bindingContext, exchange) - .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)); + Mono argument = this.resolver.resolveArgument(parameter, this.bindingContext, this.exchange) + .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.authentication)); assertThat(argument.block()).isNull(); } @@ -198,10 +198,10 @@ public class AuthenticationPrincipalArgumentResolverTests { public void resolveArgumentWhenErrorOnInvalidTypeExplicitTrue() { MethodParameter parameter = ResolvableMethod.on(getClass()).named("errorOnInvalidTypeWhenExplicitTrue").build() .arg(Integer.class); - when(authentication.getPrincipal()).thenReturn("user"); + when(this.authentication.getPrincipal()).thenReturn("user"); - Mono argument = resolver.resolveArgument(parameter, bindingContext, exchange) - .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication)); + Mono argument = this.resolver.resolveArgument(parameter, this.bindingContext, this.exchange) + .subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.authentication)); assertThatThrownBy(() -> argument.block()).isInstanceOf(ClassCastException.class); } @@ -248,7 +248,7 @@ public class AuthenticationPrincipalArgumentResolverTests { } public Long getId() { - return id; + return this.id; } } diff --git a/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolverTests.java index 69108ad0a9..a6e3c40c26 100644 --- a/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolverTests.java @@ -379,7 +379,7 @@ public class CurrentSecurityContextArgumentResolverTests { @Override public Authentication getAuthentication() { - return authentication; + return this.authentication; } @Override diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java index 8222d25dad..b950773887 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java @@ -111,35 +111,35 @@ public class HttpSessionRequestCacheTests { } public String getRedirectUrl() { - return delegate.getRedirectUrl(); + return this.delegate.getRedirectUrl(); } public List getCookies() { - return delegate.getCookies(); + return this.delegate.getCookies(); } public String getMethod() { - return delegate.getMethod(); + return this.delegate.getMethod(); } public List getHeaderValues(String name) { - return delegate.getHeaderValues(name); + return this.delegate.getHeaderValues(name); } public Collection getHeaderNames() { - return delegate.getHeaderNames(); + return this.delegate.getHeaderNames(); } public List getLocales() { - return delegate.getLocales(); + return this.delegate.getLocales(); } public String[] getParameterValues(String name) { - return delegate.getParameterValues(name); + return this.delegate.getParameterValues(name); } public Map getParameterMap() { - return delegate.getParameterMap(); + return this.delegate.getParameterMap(); } private static final long serialVersionUID = 2426831999233621470L; diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java index d71ca86641..999042e694 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java @@ -32,67 +32,67 @@ public class SavedCookieTests { @Before public void setUp() { - cookie = new Cookie("name", "value"); - cookie.setComment("comment"); - cookie.setDomain("domain"); - cookie.setMaxAge(100); - cookie.setPath("path"); - cookie.setSecure(true); - cookie.setVersion(11); - savedCookie = new SavedCookie(cookie); + this.cookie = new Cookie("name", "value"); + this.cookie.setComment("comment"); + this.cookie.setDomain("domain"); + this.cookie.setMaxAge(100); + this.cookie.setPath("path"); + this.cookie.setSecure(true); + this.cookie.setVersion(11); + this.savedCookie = new SavedCookie(this.cookie); } @Test public void testGetName() { - assertThat(savedCookie.getName()).isEqualTo(cookie.getName()); + assertThat(this.savedCookie.getName()).isEqualTo(this.cookie.getName()); } @Test public void testGetValue() { - assertThat(savedCookie.getValue()).isEqualTo(cookie.getValue()); + assertThat(this.savedCookie.getValue()).isEqualTo(this.cookie.getValue()); } @Test public void testGetComment() { - assertThat(savedCookie.getComment()).isEqualTo(cookie.getComment()); + assertThat(this.savedCookie.getComment()).isEqualTo(this.cookie.getComment()); } @Test public void testGetDomain() { - assertThat(savedCookie.getDomain()).isEqualTo(cookie.getDomain()); + assertThat(this.savedCookie.getDomain()).isEqualTo(this.cookie.getDomain()); } @Test public void testGetMaxAge() { - assertThat(savedCookie.getMaxAge()).isEqualTo(cookie.getMaxAge()); + assertThat(this.savedCookie.getMaxAge()).isEqualTo(this.cookie.getMaxAge()); } @Test public void testGetPath() { - assertThat(savedCookie.getPath()).isEqualTo(cookie.getPath()); + assertThat(this.savedCookie.getPath()).isEqualTo(this.cookie.getPath()); } @Test public void testGetVersion() { - assertThat(savedCookie.getVersion()).isEqualTo(cookie.getVersion()); + assertThat(this.savedCookie.getVersion()).isEqualTo(this.cookie.getVersion()); } @Test public void testGetCookie() { - Cookie other = savedCookie.getCookie(); - assertThat(other.getComment()).isEqualTo(cookie.getComment()); - assertThat(other.getDomain()).isEqualTo(cookie.getDomain()); - assertThat(other.getMaxAge()).isEqualTo(cookie.getMaxAge()); - assertThat(other.getName()).isEqualTo(cookie.getName()); - assertThat(other.getPath()).isEqualTo(cookie.getPath()); - assertThat(other.getSecure()).isEqualTo(cookie.getSecure()); - assertThat(other.getValue()).isEqualTo(cookie.getValue()); - assertThat(other.getVersion()).isEqualTo(cookie.getVersion()); + Cookie other = this.savedCookie.getCookie(); + assertThat(other.getComment()).isEqualTo(this.cookie.getComment()); + assertThat(other.getDomain()).isEqualTo(this.cookie.getDomain()); + assertThat(other.getMaxAge()).isEqualTo(this.cookie.getMaxAge()); + assertThat(other.getName()).isEqualTo(this.cookie.getName()); + assertThat(other.getPath()).isEqualTo(this.cookie.getPath()); + assertThat(other.getSecure()).isEqualTo(this.cookie.getSecure()); + assertThat(other.getValue()).isEqualTo(this.cookie.getValue()); + assertThat(other.getVersion()).isEqualTo(this.cookie.getVersion()); } @Test public void testSerializable() { - assertThat(savedCookie instanceof Serializable).isTrue(); + assertThat(this.savedCookie instanceof Serializable).isTrue(); } } diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTests.java index 2c98b364ea..65ccc44332 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTests.java @@ -45,7 +45,7 @@ public class ReactivePreAuthenticatedAuthenticationManagerTests { private ReactiveUserDetailsService mockUserDetailsService = mock(ReactiveUserDetailsService.class); private ReactivePreAuthenticatedAuthenticationManager manager = new ReactivePreAuthenticatedAuthenticationManager( - mockUserDetailsService); + this.mockUserDetailsService); private final User validAccount = new User("valid", "", Collections.emptySet()); @@ -62,45 +62,47 @@ public class ReactivePreAuthenticatedAuthenticationManagerTests { @Test public void returnsAuthenticatedTokenForValidAccount() { - when(mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.just(validAccount)); + when(this.mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.just(this.validAccount)); - Authentication authentication = manager.authenticate(tokenForUser(validAccount.getUsername())).block(); + Authentication authentication = this.manager.authenticate(tokenForUser(this.validAccount.getUsername())) + .block(); assertThat(authentication.isAuthenticated()).isEqualTo(true); } @Test(expected = UsernameNotFoundException.class) public void returnsNullForNonExistingAccount() { - when(mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.empty()); + when(this.mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.empty()); - manager.authenticate(tokenForUser(nonExistingAccount.getUsername())).block(); + this.manager.authenticate(tokenForUser(this.nonExistingAccount.getUsername())).block(); } @Test(expected = LockedException.class) public void throwsExceptionForLockedAccount() { - when(mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.just(lockedAccount)); + when(this.mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.just(this.lockedAccount)); - manager.authenticate(tokenForUser(lockedAccount.getUsername())).block(); + this.manager.authenticate(tokenForUser(this.lockedAccount.getUsername())).block(); } @Test(expected = DisabledException.class) public void throwsExceptionForDisabledAccount() { - when(mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.just(disabledAccount)); + when(this.mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.just(this.disabledAccount)); - manager.authenticate(tokenForUser(disabledAccount.getUsername())).block(); + this.manager.authenticate(tokenForUser(this.disabledAccount.getUsername())).block(); } @Test(expected = AccountExpiredException.class) public void throwsExceptionForExpiredAccount() { - when(mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.just(expiredAccount)); + when(this.mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.just(this.expiredAccount)); - manager.authenticate(tokenForUser(expiredAccount.getUsername())).block(); + this.manager.authenticate(tokenForUser(this.expiredAccount.getUsername())).block(); } @Test(expected = CredentialsExpiredException.class) public void throwsExceptionForAccountWithExpiredCredentials() { - when(mockUserDetailsService.findByUsername(anyString())).thenReturn(Mono.just(accountWithExpiredCredentials)); + when(this.mockUserDetailsService.findByUsername(anyString())) + .thenReturn(Mono.just(this.accountWithExpiredCredentials)); - manager.authenticate(tokenForUser(accountWithExpiredCredentials.getUsername())).block(); + this.manager.authenticate(tokenForUser(this.accountWithExpiredCredentials.getUsername())).block(); } private Authentication tokenForUser(String username) { diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/ServerX509AuthenticationConverterTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/ServerX509AuthenticationConverterTests.java index 291d164514..02dd8c067f 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/ServerX509AuthenticationConverterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/ServerX509AuthenticationConverterTests.java @@ -51,27 +51,29 @@ public class ServerX509AuthenticationConverterTests { @Before public void setUp() throws Exception { - request = MockServerHttpRequest.get("/"); + this.request = MockServerHttpRequest.get("/"); - certificate = X509TestUtils.buildTestCertificate(); - when(principalExtractor.extractPrincipal(any())).thenReturn("Luke Taylor"); + this.certificate = X509TestUtils.buildTestCertificate(); + when(this.principalExtractor.extractPrincipal(any())).thenReturn("Luke Taylor"); } @Test public void shouldReturnNullForInvalidCertificate() { - Authentication authentication = converter.convert(MockServerWebExchange.from(request.build())).block(); + Authentication authentication = this.converter.convert(MockServerWebExchange.from(this.request.build())) + .block(); assertThat(authentication).isNull(); } @Test public void shouldReturnAuthenticationForValidCertificate() { - request.sslInfo(new MockSslInfo(certificate)); + this.request.sslInfo(new MockSslInfo(this.certificate)); - Authentication authentication = converter.convert(MockServerWebExchange.from(request.build())).block(); + Authentication authentication = this.converter.convert(MockServerWebExchange.from(this.request.build())) + .block(); assertThat(authentication.getName()).isEqualTo("Luke Taylor"); - assertThat(authentication.getCredentials()).isEqualTo(certificate); + assertThat(authentication.getCredentials()).isEqualTo(this.certificate); } class MockSslInfo implements SslInfo { diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/SwitchUserWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/SwitchUserWebFilterTests.java index 8c19a1ba59..26acbd9255 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/SwitchUserWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/SwitchUserWebFilterTests.java @@ -92,8 +92,9 @@ public class SwitchUserWebFilterTests { @Before public void setUp() { - switchUserWebFilter = new SwitchUserWebFilter(userDetailsService, successHandler, failureHandler); - switchUserWebFilter.setSecurityContextRepository(serverSecurityContextRepository); + this.switchUserWebFilter = new SwitchUserWebFilter(this.userDetailsService, this.successHandler, + this.failureHandler); + this.switchUserWebFilter.setSecurityContextRepository(this.serverSecurityContextRepository); } @Test @@ -105,12 +106,12 @@ public class SwitchUserWebFilterTests { when(chain.filter(exchange)).thenReturn(Mono.empty()); // when - switchUserWebFilter.filter(exchange, chain).block(); + this.switchUserWebFilter.filter(exchange, chain).block(); // then - verifyNoInteractions(userDetailsService); - verifyNoInteractions(successHandler); - verifyNoInteractions(failureHandler); - verifyNoInteractions(serverSecurityContextRepository); + verifyNoInteractions(this.userDetailsService); + verifyNoInteractions(this.successHandler); + verifyNoInteractions(this.failureHandler); + verifyNoInteractions(this.serverSecurityContextRepository); verify(chain).filter(exchange); } @@ -130,25 +131,27 @@ public class SwitchUserWebFilterTests { "credentials"); final SecurityContextImpl securityContext = new SecurityContextImpl(originalAuthentication); - when(userDetailsService.findByUsername(targetUsername)).thenReturn(Mono.just(switchUserDetails)); - when(serverSecurityContextRepository.save(eq(exchange), any(SecurityContext.class))).thenReturn(Mono.empty()); - when(successHandler.onAuthenticationSuccess(any(WebFilterExchange.class), any(Authentication.class))) + when(this.userDetailsService.findByUsername(targetUsername)).thenReturn(Mono.just(switchUserDetails)); + when(this.serverSecurityContextRepository.save(eq(exchange), any(SecurityContext.class))) + .thenReturn(Mono.empty()); + when(this.successHandler.onAuthenticationSuccess(any(WebFilterExchange.class), any(Authentication.class))) .thenReturn(Mono.empty()); // when - switchUserWebFilter.filter(exchange, chain).subscriberContext(withSecurityContext(Mono.just(securityContext))) - .block(); + this.switchUserWebFilter.filter(exchange, chain) + .subscriberContext(withSecurityContext(Mono.just(securityContext))).block(); // then verifyNoInteractions(chain); - verify(userDetailsService).findByUsername(targetUsername); + verify(this.userDetailsService).findByUsername(targetUsername); final ArgumentCaptor securityContextCaptor = ArgumentCaptor.forClass(SecurityContext.class); - verify(serverSecurityContextRepository).save(eq(exchange), securityContextCaptor.capture()); + verify(this.serverSecurityContextRepository).save(eq(exchange), securityContextCaptor.capture()); final SecurityContext savedSecurityContext = securityContextCaptor.getValue(); final ArgumentCaptor authenticationCaptor = ArgumentCaptor.forClass(Authentication.class); - verify(successHandler).onAuthenticationSuccess(any(WebFilterExchange.class), authenticationCaptor.capture()); + verify(this.successHandler).onAuthenticationSuccess(any(WebFilterExchange.class), + authenticationCaptor.capture()); final Authentication switchUserAuthentication = authenticationCaptor.getValue(); @@ -185,19 +188,21 @@ public class SwitchUserWebFilterTests { final WebFilterChain chain = mock(WebFilterChain.class); - when(serverSecurityContextRepository.save(eq(exchange), any(SecurityContext.class))).thenReturn(Mono.empty()); - when(successHandler.onAuthenticationSuccess(any(WebFilterExchange.class), any(Authentication.class))) + when(this.serverSecurityContextRepository.save(eq(exchange), any(SecurityContext.class))) .thenReturn(Mono.empty()); - when(userDetailsService.findByUsername(targetUsername)) + when(this.successHandler.onAuthenticationSuccess(any(WebFilterExchange.class), any(Authentication.class))) + .thenReturn(Mono.empty()); + when(this.userDetailsService.findByUsername(targetUsername)) .thenReturn(Mono.just(switchUserDetails(targetUsername, true))); // when - switchUserWebFilter.filter(exchange, chain).subscriberContext(withSecurityContext(Mono.just(securityContext))) - .block(); + this.switchUserWebFilter.filter(exchange, chain) + .subscriberContext(withSecurityContext(Mono.just(securityContext))).block(); // then final ArgumentCaptor authenticationCaptor = ArgumentCaptor.forClass(Authentication.class); - verify(successHandler).onAuthenticationSuccess(any(WebFilterExchange.class), authenticationCaptor.capture()); + verify(this.successHandler).onAuthenticationSuccess(any(WebFilterExchange.class), + authenticationCaptor.capture()); final Authentication secondSwitchUserAuthentication = authenticationCaptor.getValue(); @@ -220,12 +225,12 @@ public class SwitchUserWebFilterTests { final WebFilterChain chain = mock(WebFilterChain.class); final SecurityContextImpl securityContext = new SecurityContextImpl(mock(Authentication.class)); - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("The userName can not be null."); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("The userName can not be null."); // when - switchUserWebFilter.filter(exchange, chain).subscriberContext(withSecurityContext(Mono.just(securityContext))) - .block(); + this.switchUserWebFilter.filter(exchange, chain) + .subscriberContext(withSecurityContext(Mono.just(securityContext))).block(); verifyNoInteractions(chain); } @@ -239,22 +244,22 @@ public class SwitchUserWebFilterTests { final SecurityContextImpl securityContext = new SecurityContextImpl(mock(Authentication.class)); final UserDetails switchUserDetails = switchUserDetails(targetUsername, false); - when(userDetailsService.findByUsername(any(String.class))).thenReturn(Mono.just(switchUserDetails)); - when(failureHandler.onAuthenticationFailure(any(WebFilterExchange.class), any(DisabledException.class))) + when(this.userDetailsService.findByUsername(any(String.class))).thenReturn(Mono.just(switchUserDetails)); + when(this.failureHandler.onAuthenticationFailure(any(WebFilterExchange.class), any(DisabledException.class))) .thenReturn(Mono.empty()); // when - switchUserWebFilter.filter(exchange, chain).subscriberContext(withSecurityContext(Mono.just(securityContext))) - .block(); + this.switchUserWebFilter.filter(exchange, chain) + .subscriberContext(withSecurityContext(Mono.just(securityContext))).block(); - verify(failureHandler).onAuthenticationFailure(any(WebFilterExchange.class), any(DisabledException.class)); + verify(this.failureHandler).onAuthenticationFailure(any(WebFilterExchange.class), any(DisabledException.class)); verifyNoInteractions(chain); } @Test public void switchUserWhenFailureHandlerNotDefinedThenReturnError() { // given - switchUserWebFilter = new SwitchUserWebFilter(userDetailsService, successHandler, null); + this.switchUserWebFilter = new SwitchUserWebFilter(this.userDetailsService, this.successHandler, null); final String targetUsername = "TEST_USERNAME"; final MockServerWebExchange exchange = MockServerWebExchange @@ -264,13 +269,13 @@ public class SwitchUserWebFilterTests { final SecurityContextImpl securityContext = new SecurityContextImpl(mock(Authentication.class)); final UserDetails switchUserDetails = switchUserDetails(targetUsername, false); - when(userDetailsService.findByUsername(any(String.class))).thenReturn(Mono.just(switchUserDetails)); + when(this.userDetailsService.findByUsername(any(String.class))).thenReturn(Mono.just(switchUserDetails)); - exceptionRule.expect(DisabledException.class); + this.exceptionRule.expect(DisabledException.class); // when then - switchUserWebFilter.filter(exchange, chain).subscriberContext(withSecurityContext(Mono.just(securityContext))) - .block(); + this.switchUserWebFilter.filter(exchange, chain) + .subscriberContext(withSecurityContext(Mono.just(securityContext))).block(); verifyNoInteractions(chain); } @@ -291,21 +296,23 @@ public class SwitchUserWebFilterTests { final WebFilterChain chain = mock(WebFilterChain.class); final SecurityContextImpl securityContext = new SecurityContextImpl(switchUserAuthentication); - when(serverSecurityContextRepository.save(eq(exchange), any(SecurityContext.class))).thenReturn(Mono.empty()); - when(successHandler.onAuthenticationSuccess(any(WebFilterExchange.class), any(Authentication.class))) + when(this.serverSecurityContextRepository.save(eq(exchange), any(SecurityContext.class))) + .thenReturn(Mono.empty()); + when(this.successHandler.onAuthenticationSuccess(any(WebFilterExchange.class), any(Authentication.class))) .thenReturn(Mono.empty()); // when - switchUserWebFilter.filter(exchange, chain).subscriberContext(withSecurityContext(Mono.just(securityContext))) - .block(); + this.switchUserWebFilter.filter(exchange, chain) + .subscriberContext(withSecurityContext(Mono.just(securityContext))).block(); // then final ArgumentCaptor securityContextCaptor = ArgumentCaptor.forClass(SecurityContext.class); - verify(serverSecurityContextRepository).save(eq(exchange), securityContextCaptor.capture()); + verify(this.serverSecurityContextRepository).save(eq(exchange), securityContextCaptor.capture()); final SecurityContext savedSecurityContext = securityContextCaptor.getValue(); final ArgumentCaptor authenticationCaptor = ArgumentCaptor.forClass(Authentication.class); - verify(successHandler).onAuthenticationSuccess(any(WebFilterExchange.class), authenticationCaptor.capture()); + verify(this.successHandler).onAuthenticationSuccess(any(WebFilterExchange.class), + authenticationCaptor.capture()); final Authentication originalAuthenticationValue = authenticationCaptor.getValue(); @@ -326,12 +333,12 @@ public class SwitchUserWebFilterTests { final WebFilterChain chain = mock(WebFilterChain.class); final SecurityContextImpl securityContext = new SecurityContextImpl(originalAuthentication); - exceptionRule.expect(AuthenticationCredentialsNotFoundException.class); - exceptionRule.expectMessage("Could not find original Authentication object"); + this.exceptionRule.expect(AuthenticationCredentialsNotFoundException.class); + this.exceptionRule.expectMessage("Could not find original Authentication object"); // when then - switchUserWebFilter.filter(exchange, chain).subscriberContext(withSecurityContext(Mono.just(securityContext))) - .block(); + this.switchUserWebFilter.filter(exchange, chain) + .subscriberContext(withSecurityContext(Mono.just(securityContext))).block(); verifyNoInteractions(chain); } @@ -343,11 +350,11 @@ public class SwitchUserWebFilterTests { final WebFilterChain chain = mock(WebFilterChain.class); - exceptionRule.expect(AuthenticationCredentialsNotFoundException.class); - exceptionRule.expectMessage("No current user associated with this request"); + this.exceptionRule.expect(AuthenticationCredentialsNotFoundException.class); + this.exceptionRule.expectMessage("No current user associated with this request"); // when - switchUserWebFilter.filter(exchange, chain).block(); + this.switchUserWebFilter.filter(exchange, chain).block(); // then verifyNoInteractions(chain); } @@ -355,77 +362,77 @@ public class SwitchUserWebFilterTests { @Test public void constructorUserDetailsServiceRequired() { // given - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("userDetailsService must be specified"); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("userDetailsService must be specified"); // when - switchUserWebFilter = new SwitchUserWebFilter(null, mock(ServerAuthenticationSuccessHandler.class), + this.switchUserWebFilter = new SwitchUserWebFilter(null, mock(ServerAuthenticationSuccessHandler.class), mock(ServerAuthenticationFailureHandler.class)); } @Test public void constructorServerAuthenticationSuccessHandlerRequired() { // given - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("successHandler must be specified"); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("successHandler must be specified"); // when - switchUserWebFilter = new SwitchUserWebFilter(mock(ReactiveUserDetailsService.class), null, + this.switchUserWebFilter = new SwitchUserWebFilter(mock(ReactiveUserDetailsService.class), null, mock(ServerAuthenticationFailureHandler.class)); } @Test public void constructorSuccessTargetUrlRequired() { // given - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("successTargetUrl must be specified"); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("successTargetUrl must be specified"); // when - switchUserWebFilter = new SwitchUserWebFilter(mock(ReactiveUserDetailsService.class), null, + this.switchUserWebFilter = new SwitchUserWebFilter(mock(ReactiveUserDetailsService.class), null, "failure/target/url"); } @Test public void constructorFirstDefaultValues() { // when - switchUserWebFilter = new SwitchUserWebFilter(mock(ReactiveUserDetailsService.class), + this.switchUserWebFilter = new SwitchUserWebFilter(mock(ReactiveUserDetailsService.class), mock(ServerAuthenticationSuccessHandler.class), mock(ServerAuthenticationFailureHandler.class)); // then - final Object securityContextRepository = ReflectionTestUtils.getField(switchUserWebFilter, + final Object securityContextRepository = ReflectionTestUtils.getField(this.switchUserWebFilter, "securityContextRepository"); assertTrue(securityContextRepository instanceof WebSessionServerSecurityContextRepository); - final Object userDetailsChecker = ReflectionTestUtils.getField(switchUserWebFilter, "userDetailsChecker"); + final Object userDetailsChecker = ReflectionTestUtils.getField(this.switchUserWebFilter, "userDetailsChecker"); assertTrue(userDetailsChecker instanceof AccountStatusUserDetailsChecker); } @Test public void constructorSecondDefaultValues() { // when - switchUserWebFilter = new SwitchUserWebFilter(mock(ReactiveUserDetailsService.class), "success/target/url", + this.switchUserWebFilter = new SwitchUserWebFilter(mock(ReactiveUserDetailsService.class), "success/target/url", "failure/target/url"); // then - final Object successHandler = ReflectionTestUtils.getField(switchUserWebFilter, "successHandler"); + final Object successHandler = ReflectionTestUtils.getField(this.switchUserWebFilter, "successHandler"); assertTrue(successHandler instanceof RedirectServerAuthenticationSuccessHandler); - final Object failureHandler = ReflectionTestUtils.getField(switchUserWebFilter, "failureHandler"); + final Object failureHandler = ReflectionTestUtils.getField(this.switchUserWebFilter, "failureHandler"); assertTrue(failureHandler instanceof RedirectServerAuthenticationFailureHandler); - final Object securityContextRepository = ReflectionTestUtils.getField(switchUserWebFilter, + final Object securityContextRepository = ReflectionTestUtils.getField(this.switchUserWebFilter, "securityContextRepository"); assertTrue(securityContextRepository instanceof WebSessionServerSecurityContextRepository); - final Object userDetailsChecker = ReflectionTestUtils.getField(switchUserWebFilter, "userDetailsChecker"); + final Object userDetailsChecker = ReflectionTestUtils.getField(this.switchUserWebFilter, "userDetailsChecker"); assertTrue(userDetailsChecker instanceof AccountStatusUserDetailsChecker); } @Test public void setSecurityContextRepositoryWhenNullThenThrowException() { // given - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("securityContextRepository cannot be null"); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("securityContextRepository cannot be null"); // when - switchUserWebFilter.setSecurityContextRepository(null); + this.switchUserWebFilter.setSecurityContextRepository(null); // then fail("Test should fail with exception"); } @@ -433,16 +440,16 @@ public class SwitchUserWebFilterTests { @Test public void setSecurityContextRepositoryWhenDefinedThenChangeDefaultValue() { // given - final Object oldSecurityContextRepository = ReflectionTestUtils.getField(switchUserWebFilter, + final Object oldSecurityContextRepository = ReflectionTestUtils.getField(this.switchUserWebFilter, "securityContextRepository"); - assertSame(serverSecurityContextRepository, oldSecurityContextRepository); + assertSame(this.serverSecurityContextRepository, oldSecurityContextRepository); final ServerSecurityContextRepository newSecurityContextRepository = mock( ServerSecurityContextRepository.class); // when - switchUserWebFilter.setSecurityContextRepository(newSecurityContextRepository); + this.switchUserWebFilter.setSecurityContextRepository(newSecurityContextRepository); // then - final Object currentSecurityContextRepository = ReflectionTestUtils.getField(switchUserWebFilter, + final Object currentSecurityContextRepository = ReflectionTestUtils.getField(this.switchUserWebFilter, "securityContextRepository"); assertSame(newSecurityContextRepository, currentSecurityContextRepository); } @@ -450,10 +457,10 @@ public class SwitchUserWebFilterTests { @Test public void setExitUserUrlWhenNullThenThrowException() { // given - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("exitUserUrl cannot be empty and must be a valid redirect URL"); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("exitUserUrl cannot be empty and must be a valid redirect URL"); // when - switchUserWebFilter.setExitUserUrl(null); + this.switchUserWebFilter.setExitUserUrl(null); // then fail("Test should fail with exception"); } @@ -461,10 +468,10 @@ public class SwitchUserWebFilterTests { @Test public void setExitUserUrlWhenInvalidUrlThenThrowException() { // given - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("exitUserUrl cannot be empty and must be a valid redirect URL"); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("exitUserUrl cannot be empty and must be a valid redirect URL"); // when - switchUserWebFilter.setExitUserUrl("wrongUrl"); + this.switchUserWebFilter.setExitUserUrl("wrongUrl"); // then fail("Test should fail with exception"); } @@ -476,18 +483,18 @@ public class SwitchUserWebFilterTests { .from(MockServerHttpRequest.post("/logout/impersonate")); final ServerWebExchangeMatcher oldExitUserMatcher = (ServerWebExchangeMatcher) ReflectionTestUtils - .getField(switchUserWebFilter, "exitUserMatcher"); + .getField(this.switchUserWebFilter, "exitUserMatcher"); assertThat(oldExitUserMatcher.matches(exchange).block().isMatch()).isTrue(); // when - switchUserWebFilter.setExitUserUrl("/exit-url"); + this.switchUserWebFilter.setExitUserUrl("/exit-url"); // then final MockServerWebExchange newExchange = MockServerWebExchange.from(MockServerHttpRequest.post("/exit-url")); final ServerWebExchangeMatcher newExitUserMatcher = (ServerWebExchangeMatcher) ReflectionTestUtils - .getField(switchUserWebFilter, "exitUserMatcher"); + .getField(this.switchUserWebFilter, "exitUserMatcher"); assertThat(newExitUserMatcher.matches(newExchange).block().isMatch()).isTrue(); } @@ -495,10 +502,10 @@ public class SwitchUserWebFilterTests { @Test public void setExitUserMatcherWhenNullThenThrowException() { // given - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("exitUserMatcher cannot be null"); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("exitUserMatcher cannot be null"); // when - switchUserWebFilter.setExitUserMatcher(null); + this.switchUserWebFilter.setExitUserMatcher(null); // then fail("Test should fail with exception"); } @@ -510,7 +517,7 @@ public class SwitchUserWebFilterTests { .from(MockServerHttpRequest.post("/logout/impersonate")); final ServerWebExchangeMatcher oldExitUserMatcher = (ServerWebExchangeMatcher) ReflectionTestUtils - .getField(switchUserWebFilter, "exitUserMatcher"); + .getField(this.switchUserWebFilter, "exitUserMatcher"); assertThat(oldExitUserMatcher.matches(exchange).block().isMatch()).isTrue(); @@ -518,12 +525,12 @@ public class SwitchUserWebFilterTests { "/exit-url"); // when - switchUserWebFilter.setExitUserMatcher(newExitUserMatcher); + this.switchUserWebFilter.setExitUserMatcher(newExitUserMatcher); // then final ServerWebExchangeMatcher currentExitUserMatcher = (ServerWebExchangeMatcher) ReflectionTestUtils - .getField(switchUserWebFilter, "exitUserMatcher"); + .getField(this.switchUserWebFilter, "exitUserMatcher"); assertSame(newExitUserMatcher, currentExitUserMatcher); } @@ -531,10 +538,10 @@ public class SwitchUserWebFilterTests { @Test public void setSwitchUserUrlWhenNullThenThrowException() { // given - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("switchUserUrl cannot be empty and must be a valid redirect URL"); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("switchUserUrl cannot be empty and must be a valid redirect URL"); // when - switchUserWebFilter.setSwitchUserUrl(null); + this.switchUserWebFilter.setSwitchUserUrl(null); // then fail("Test should fail with exception"); } @@ -542,10 +549,10 @@ public class SwitchUserWebFilterTests { @Test public void setSwitchUserUrlWhenInvalidThenThrowException() { // given - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("switchUserUrl cannot be empty and must be a valid redirect URL"); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("switchUserUrl cannot be empty and must be a valid redirect URL"); // when - switchUserWebFilter.setSwitchUserUrl("wrongUrl"); + this.switchUserWebFilter.setSwitchUserUrl("wrongUrl"); // then fail("Test should fail with exception"); } @@ -557,18 +564,18 @@ public class SwitchUserWebFilterTests { .from(MockServerHttpRequest.post("/login/impersonate")); final ServerWebExchangeMatcher oldSwitchUserMatcher = (ServerWebExchangeMatcher) ReflectionTestUtils - .getField(switchUserWebFilter, "switchUserMatcher"); + .getField(this.switchUserWebFilter, "switchUserMatcher"); assertThat(oldSwitchUserMatcher.matches(exchange).block().isMatch()).isTrue(); // when - switchUserWebFilter.setSwitchUserUrl("/switch-url"); + this.switchUserWebFilter.setSwitchUserUrl("/switch-url"); // then final MockServerWebExchange newExchange = MockServerWebExchange.from(MockServerHttpRequest.post("/switch-url")); final ServerWebExchangeMatcher newSwitchUserMatcher = (ServerWebExchangeMatcher) ReflectionTestUtils - .getField(switchUserWebFilter, "switchUserMatcher"); + .getField(this.switchUserWebFilter, "switchUserMatcher"); assertThat(newSwitchUserMatcher.matches(newExchange).block().isMatch()).isTrue(); } @@ -576,10 +583,10 @@ public class SwitchUserWebFilterTests { @Test public void setSwitchUserMatcherWhenNullThenThrowException() { // given - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("switchUserMatcher cannot be null"); + this.exceptionRule.expect(IllegalArgumentException.class); + this.exceptionRule.expectMessage("switchUserMatcher cannot be null"); // when - switchUserWebFilter.setSwitchUserMatcher(null); + this.switchUserWebFilter.setSwitchUserMatcher(null); // then fail("Test should fail with exception"); } @@ -591,7 +598,7 @@ public class SwitchUserWebFilterTests { .from(MockServerHttpRequest.post("/login/impersonate")); final ServerWebExchangeMatcher oldSwitchUserMatcher = (ServerWebExchangeMatcher) ReflectionTestUtils - .getField(switchUserWebFilter, "switchUserMatcher"); + .getField(this.switchUserWebFilter, "switchUserMatcher"); assertThat(oldSwitchUserMatcher.matches(exchange).block().isMatch()).isTrue(); @@ -599,12 +606,12 @@ public class SwitchUserWebFilterTests { "/switch-url"); // when - switchUserWebFilter.setSwitchUserMatcher(newSwitchUserMatcher); + this.switchUserWebFilter.setSwitchUserMatcher(newSwitchUserMatcher); // then final ServerWebExchangeMatcher currentExitUserMatcher = (ServerWebExchangeMatcher) ReflectionTestUtils - .getField(switchUserWebFilter, "switchUserMatcher"); + .getField(this.switchUserWebFilter, "switchUserMatcher"); assertSame(newSwitchUserMatcher, currentExitUserMatcher); } diff --git a/web/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java b/web/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java index b251073861..fd51b46a10 100644 --- a/web/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java @@ -68,30 +68,32 @@ public class DelegatingReactiveAuthorizationManagerTests { @Before public void setup() { - manager = DelegatingReactiveAuthorizationManager.builder() - .add(new ServerWebExchangeMatcherEntry<>(match1, delegate1)) - .add(new ServerWebExchangeMatcherEntry<>(match2, delegate2)).build(); + this.manager = DelegatingReactiveAuthorizationManager.builder() + .add(new ServerWebExchangeMatcherEntry<>(this.match1, this.delegate1)) + .add(new ServerWebExchangeMatcherEntry<>(this.match2, this.delegate2)).build(); } @Test public void checkWhenFirstMatchesThenNoMoreMatchersAndNoMoreDelegatesInvoked() { - when(match1.matches(any())).thenReturn(ServerWebExchangeMatcher.MatchResult.match()); - when(delegate1.check(eq(authentication), any(AuthorizationContext.class))).thenReturn(Mono.just(decision)); + when(this.match1.matches(any())).thenReturn(ServerWebExchangeMatcher.MatchResult.match()); + when(this.delegate1.check(eq(this.authentication), any(AuthorizationContext.class))) + .thenReturn(Mono.just(this.decision)); - assertThat(manager.check(authentication, exchange).block()).isEqualTo(decision); + assertThat(this.manager.check(this.authentication, this.exchange).block()).isEqualTo(this.decision); - verifyZeroInteractions(match2, delegate2); + verifyZeroInteractions(this.match2, this.delegate2); } @Test public void checkWhenSecondMatchesThenNoMoreMatchersAndNoMoreDelegatesInvoked() { - when(match1.matches(any())).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); - when(match2.matches(any())).thenReturn(ServerWebExchangeMatcher.MatchResult.match()); - when(delegate2.check(eq(authentication), any(AuthorizationContext.class))).thenReturn(Mono.just(decision)); + when(this.match1.matches(any())).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); + when(this.match2.matches(any())).thenReturn(ServerWebExchangeMatcher.MatchResult.match()); + when(this.delegate2.check(eq(this.authentication), any(AuthorizationContext.class))) + .thenReturn(Mono.just(this.decision)); - assertThat(manager.check(authentication, exchange).block()).isEqualTo(decision); + assertThat(this.manager.check(this.authentication, this.exchange).block()).isEqualTo(this.decision); - verifyZeroInteractions(delegate1); + verifyZeroInteractions(this.delegate1); } } diff --git a/web/src/test/java/org/springframework/security/web/server/context/SecurityContextServerWebExchangeWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/context/SecurityContextServerWebExchangeWebFilterTests.java index ec72ed3591..c81b62f70c 100644 --- a/web/src/test/java/org/springframework/security/web/server/context/SecurityContextServerWebExchangeWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/context/SecurityContextServerWebExchangeWebFilterTests.java @@ -46,7 +46,7 @@ public class SecurityContextServerWebExchangeWebFilterTests { public void filterWhenExistingContextAndPrincipalNotNullThenContextPopulated() { Mono result = this.filter .filter(this.exchange, new DefaultWebFilterChain(e -> e.getPrincipal() - .doOnSuccess(contextPrincipal -> assertThat(contextPrincipal).isEqualTo(principal)) + .doOnSuccess(contextPrincipal -> assertThat(contextPrincipal).isEqualTo(this.principal)) .flatMap(contextPrincipal -> Mono.subscriberContext()) .doOnSuccess(context -> assertThat(context.get("foo")).isEqualTo("bar")).then())) .subscriberContext(context -> context.put("foo", "bar")) diff --git a/web/src/test/java/org/springframework/security/web/server/header/CacheControlServerHttpHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/server/header/CacheControlServerHttpHeadersWriterTests.java index e19fcf4a43..2d32dca7f4 100644 --- a/web/src/test/java/org/springframework/security/web/server/header/CacheControlServerHttpHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/header/CacheControlServerHttpHeadersWriterTests.java @@ -36,60 +36,61 @@ public class CacheControlServerHttpHeadersWriterTests { ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/").build()); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); @Test public void writeHeadersWhenCacheHeadersThenWritesAllCacheControl() { - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).hasSize(3); - assertThat(headers.get(HttpHeaders.CACHE_CONTROL)) + assertThat(this.headers).hasSize(3); + assertThat(this.headers.get(HttpHeaders.CACHE_CONTROL)) .containsOnly(CacheControlServerHttpHeadersWriter.CACHE_CONTRTOL_VALUE); - assertThat(headers.get(HttpHeaders.EXPIRES)).containsOnly(CacheControlServerHttpHeadersWriter.EXPIRES_VALUE); - assertThat(headers.get(HttpHeaders.PRAGMA)).containsOnly(CacheControlServerHttpHeadersWriter.PRAGMA_VALUE); + assertThat(this.headers.get(HttpHeaders.EXPIRES)) + .containsOnly(CacheControlServerHttpHeadersWriter.EXPIRES_VALUE); + assertThat(this.headers.get(HttpHeaders.PRAGMA)).containsOnly(CacheControlServerHttpHeadersWriter.PRAGMA_VALUE); } @Test public void writeHeadersWhenCacheControlThenNoCacheControlHeaders() { String cacheControl = "max-age=1234"; - headers.set(HttpHeaders.CACHE_CONTROL, cacheControl); + this.headers.set(HttpHeaders.CACHE_CONTROL, cacheControl); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers.get(HttpHeaders.CACHE_CONTROL)).containsOnly(cacheControl); + assertThat(this.headers.get(HttpHeaders.CACHE_CONTROL)).containsOnly(cacheControl); } @Test public void writeHeadersWhenPragmaThenNoCacheControlHeaders() { String pragma = "1"; - headers.set(HttpHeaders.PRAGMA, pragma); + this.headers.set(HttpHeaders.PRAGMA, pragma); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).hasSize(1); - assertThat(headers.get(HttpHeaders.PRAGMA)).containsOnly(pragma); + assertThat(this.headers).hasSize(1); + assertThat(this.headers.get(HttpHeaders.PRAGMA)).containsOnly(pragma); } @Test public void writeHeadersWhenExpiresThenNoCacheControlHeaders() { String expires = "1"; - headers.set(HttpHeaders.EXPIRES, expires); + this.headers.set(HttpHeaders.EXPIRES, expires); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).hasSize(1); - assertThat(headers.get(HttpHeaders.EXPIRES)).containsOnly(expires); + assertThat(this.headers).hasSize(1); + assertThat(this.headers.get(HttpHeaders.EXPIRES)).containsOnly(expires); } @Test // gh-5534 public void writeHeadersWhenNotModifiedThenNoCacheControlHeaders() { - exchange.getResponse().setStatusCode(HttpStatus.NOT_MODIFIED); + this.exchange.getResponse().setStatusCode(HttpStatus.NOT_MODIFIED); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).isEmpty(); + assertThat(this.headers).isEmpty(); } } diff --git a/web/src/test/java/org/springframework/security/web/server/header/ClearSiteDataServerHttpHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/server/header/ClearSiteDataServerHttpHeadersWriterTests.java index 9dbadbdd71..faa8b87451 100644 --- a/web/src/test/java/org/springframework/security/web/server/header/ClearSiteDataServerHttpHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/header/ClearSiteDataServerHttpHeadersWriterTests.java @@ -107,7 +107,7 @@ public class ClearSiteDataServerHttpHeadersWriterTests { } List getHeader() { - return actual.getHeaders().get(ClearSiteDataServerHttpHeadersWriter.CLEAR_SITE_DATA_HEADER); + return this.actual.getHeaders().get(ClearSiteDataServerHttpHeadersWriter.CLEAR_SITE_DATA_HEADER); } } diff --git a/web/src/test/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriterTests.java index eecedea166..2c442bde7a 100644 --- a/web/src/test/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/header/CompositeServerHttpHeadersWriterTests.java @@ -56,42 +56,42 @@ public class CompositeServerHttpHeadersWriterTests { @Before public void setup() { - writer = new CompositeServerHttpHeadersWriter(Arrays.asList(writer1, writer2)); + this.writer = new CompositeServerHttpHeadersWriter(Arrays.asList(this.writer1, this.writer2)); } @Test public void writeHttpHeadersWhenErrorNoErrorThenError() { - when(writer1.writeHttpHeaders(exchange)).thenReturn(Mono.error(new RuntimeException())); + when(this.writer1.writeHttpHeaders(this.exchange)).thenReturn(Mono.error(new RuntimeException())); - Mono result = writer.writeHttpHeaders(exchange); + Mono result = this.writer.writeHttpHeaders(this.exchange); StepVerifier.create(result).expectError().verify(); - verify(writer1).writeHttpHeaders(exchange); + verify(this.writer1).writeHttpHeaders(this.exchange); } @Test public void writeHttpHeadersWhenErrorErrorThenError() { - when(writer1.writeHttpHeaders(exchange)).thenReturn(Mono.error(new RuntimeException())); + when(this.writer1.writeHttpHeaders(this.exchange)).thenReturn(Mono.error(new RuntimeException())); - Mono result = writer.writeHttpHeaders(exchange); + Mono result = this.writer.writeHttpHeaders(this.exchange); StepVerifier.create(result).expectError().verify(); - verify(writer1).writeHttpHeaders(exchange); + verify(this.writer1).writeHttpHeaders(this.exchange); } @Test public void writeHttpHeadersWhenNoErrorThenNoError() { - when(writer1.writeHttpHeaders(exchange)).thenReturn(Mono.empty()); - when(writer2.writeHttpHeaders(exchange)).thenReturn(Mono.empty()); + when(this.writer1.writeHttpHeaders(this.exchange)).thenReturn(Mono.empty()); + when(this.writer2.writeHttpHeaders(this.exchange)).thenReturn(Mono.empty()); - Mono result = writer.writeHttpHeaders(exchange); + Mono result = this.writer.writeHttpHeaders(this.exchange); StepVerifier.create(result).expectComplete().verify(); - verify(writer1).writeHttpHeaders(exchange); - verify(writer2).writeHttpHeaders(exchange); + verify(this.writer1).writeHttpHeaders(this.exchange); + verify(this.writer2).writeHttpHeaders(this.exchange); } @Test diff --git a/web/src/test/java/org/springframework/security/web/server/header/HttpHeaderWriterWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/header/HttpHeaderWriterWebFilterTests.java index 3a0c499179..576dc5c349 100644 --- a/web/src/test/java/org/springframework/security/web/server/header/HttpHeaderWriterWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/header/HttpHeaderWriterWebFilterTests.java @@ -47,30 +47,30 @@ public class HttpHeaderWriterWebFilterTests { @Before public void setup() { - when(writer.writeHttpHeaders(any())).thenReturn(Mono.empty()); - filter = new HttpHeaderWriterWebFilter(writer); + when(this.writer.writeHttpHeaders(any())).thenReturn(Mono.empty()); + this.filter = new HttpHeaderWriterWebFilter(this.writer); } @Test public void filterWhenCompleteThenWritten() { - WebTestClient rest = WebTestClientBuilder.bindToWebFilters(filter).build(); + WebTestClient rest = WebTestClientBuilder.bindToWebFilters(this.filter).build(); rest.get().uri("/foo").exchange(); - verify(writer).writeHttpHeaders(any()); + verify(this.writer).writeHttpHeaders(any()); } @Test public void filterWhenNotCompleteThenNotWritten() { - WebTestHandler handler = WebTestHandler.bindToWebFilters(filter); + WebTestHandler handler = WebTestHandler.bindToWebFilters(this.filter); WebHandlerResult result = handler.exchange(MockServerHttpRequest.get("/foo")); - verify(writer, never()).writeHttpHeaders(any()); + verify(this.writer, never()).writeHttpHeaders(any()); result.getExchange().getResponse().setComplete().block(); - verify(writer).writeHttpHeaders(any()); + verify(this.writer).writeHttpHeaders(any()); } } diff --git a/web/src/test/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriterTests.java index ea763b9d3d..f2f850fbf4 100644 --- a/web/src/test/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriterTests.java @@ -37,55 +37,57 @@ public class StaticServerHttpHeadersWriterTests { ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/").build()); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); @Test public void writeHeadersWhenSingleHeaderThenWritesHeader() { - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers.get(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS)) + assertThat(this.headers.get(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS)) .containsOnly(ContentTypeOptionsServerHttpHeadersWriter.NOSNIFF); } @Test public void writeHeadersWhenSingleHeaderAndHeaderWrittenThenSuccess() { String headerValue = "other"; - headers.set(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS, headerValue); + this.headers.set(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS, headerValue); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers.get(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS)).containsOnly(headerValue); + assertThat(this.headers.get(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS)) + .containsOnly(headerValue); } @Test public void writeHeadersWhenMultiHeaderThenWritesAllHeaders() { - writer = StaticServerHttpHeadersWriter.builder() + this.writer = StaticServerHttpHeadersWriter.builder() .header(HttpHeaders.CACHE_CONTROL, CacheControlServerHttpHeadersWriter.CACHE_CONTRTOL_VALUE) .header(HttpHeaders.PRAGMA, CacheControlServerHttpHeadersWriter.PRAGMA_VALUE) .header(HttpHeaders.EXPIRES, CacheControlServerHttpHeadersWriter.EXPIRES_VALUE).build(); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers.get(HttpHeaders.CACHE_CONTROL)) + assertThat(this.headers.get(HttpHeaders.CACHE_CONTROL)) .containsOnly(CacheControlServerHttpHeadersWriter.CACHE_CONTRTOL_VALUE); - assertThat(headers.get(HttpHeaders.PRAGMA)).containsOnly(CacheControlServerHttpHeadersWriter.PRAGMA_VALUE); - assertThat(headers.get(HttpHeaders.EXPIRES)).containsOnly(CacheControlServerHttpHeadersWriter.EXPIRES_VALUE); + assertThat(this.headers.get(HttpHeaders.PRAGMA)).containsOnly(CacheControlServerHttpHeadersWriter.PRAGMA_VALUE); + assertThat(this.headers.get(HttpHeaders.EXPIRES)) + .containsOnly(CacheControlServerHttpHeadersWriter.EXPIRES_VALUE); } @Test public void writeHeadersWhenMultiHeaderAndSingleWrittenThenNoHeadersOverridden() { String headerValue = "other"; - headers.set(HttpHeaders.CACHE_CONTROL, headerValue); + this.headers.set(HttpHeaders.CACHE_CONTROL, headerValue); - writer = StaticServerHttpHeadersWriter.builder() + this.writer = StaticServerHttpHeadersWriter.builder() .header(HttpHeaders.CACHE_CONTROL, CacheControlServerHttpHeadersWriter.CACHE_CONTRTOL_VALUE) .header(HttpHeaders.PRAGMA, CacheControlServerHttpHeadersWriter.PRAGMA_VALUE) .header(HttpHeaders.EXPIRES, CacheControlServerHttpHeadersWriter.EXPIRES_VALUE).build(); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).hasSize(1); - assertThat(headers.get(HttpHeaders.CACHE_CONTROL)).containsOnly(headerValue); + assertThat(this.headers).hasSize(1); + assertThat(this.headers.get(HttpHeaders.CACHE_CONTROL)).containsOnly(headerValue); } } diff --git a/web/src/test/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriterTests.java index afab695569..16f6520443 100644 --- a/web/src/test/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriterTests.java @@ -39,11 +39,11 @@ public class StrictTransportSecurityServerHttpHeadersWriterTests { @Test public void writeHttpHeadersWhenHttpsThenWrites() { - exchange = exchange(MockServerHttpRequest.get("https://example.com/")); + this.exchange = exchange(MockServerHttpRequest.get("https://example.com/")); - hsts.writeHttpHeaders(exchange); + this.hsts.writeHttpHeaders(this.exchange); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); assertThat(headers).hasSize(1); assertThat(headers).containsEntry(StrictTransportSecurityServerHttpHeadersWriter.STRICT_TRANSPORT_SECURITY, Arrays.asList("max-age=31536000 ; includeSubDomains")); @@ -52,12 +52,12 @@ public class StrictTransportSecurityServerHttpHeadersWriterTests { @Test public void writeHttpHeadersWhenCustomMaxAgeThenWrites() { Duration maxAge = Duration.ofDays(1); - hsts.setMaxAge(maxAge); - exchange = exchange(MockServerHttpRequest.get("https://example.com/")); + this.hsts.setMaxAge(maxAge); + this.exchange = exchange(MockServerHttpRequest.get("https://example.com/")); - hsts.writeHttpHeaders(exchange); + this.hsts.writeHttpHeaders(this.exchange); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); assertThat(headers).hasSize(1); assertThat(headers).containsEntry(StrictTransportSecurityServerHttpHeadersWriter.STRICT_TRANSPORT_SECURITY, Arrays.asList("max-age=" + maxAge.getSeconds() + " ; includeSubDomains")); @@ -65,12 +65,12 @@ public class StrictTransportSecurityServerHttpHeadersWriterTests { @Test public void writeHttpHeadersWhenCustomIncludeSubDomainsThenWrites() { - hsts.setIncludeSubDomains(false); - exchange = exchange(MockServerHttpRequest.get("https://example.com/")); + this.hsts.setIncludeSubDomains(false); + this.exchange = exchange(MockServerHttpRequest.get("https://example.com/")); - hsts.writeHttpHeaders(exchange); + this.hsts.writeHttpHeaders(this.exchange); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); assertThat(headers).hasSize(1); assertThat(headers).containsEntry(StrictTransportSecurityServerHttpHeadersWriter.STRICT_TRANSPORT_SECURITY, Arrays.asList("max-age=31536000")); @@ -78,21 +78,21 @@ public class StrictTransportSecurityServerHttpHeadersWriterTests { @Test public void writeHttpHeadersWhenNullSchemeThenNoHeaders() { - exchange = exchange(MockServerHttpRequest.get("/")); + this.exchange = exchange(MockServerHttpRequest.get("/")); - hsts.writeHttpHeaders(exchange); + this.hsts.writeHttpHeaders(this.exchange); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); assertThat(headers).isEmpty(); } @Test public void writeHttpHeadersWhenHttpThenNoHeaders() { - exchange = exchange(MockServerHttpRequest.get("http://localhost/")); + this.exchange = exchange(MockServerHttpRequest.get("http://localhost/")); - hsts.writeHttpHeaders(exchange); + this.hsts.writeHttpHeaders(this.exchange); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); assertThat(headers).isEmpty(); } diff --git a/web/src/test/java/org/springframework/security/web/server/header/XContentTypeOptionsServerHttpHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/server/header/XContentTypeOptionsServerHttpHeadersWriterTests.java index 4ad324becf..099ebfac57 100644 --- a/web/src/test/java/org/springframework/security/web/server/header/XContentTypeOptionsServerHttpHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/header/XContentTypeOptionsServerHttpHeadersWriterTests.java @@ -34,26 +34,27 @@ public class XContentTypeOptionsServerHttpHeadersWriterTests { ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/").build()); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); @Test public void writeHeadersWhenNoHeadersThenWriteHeaders() { - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).hasSize(1); - assertThat(headers.get(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS)) + assertThat(this.headers).hasSize(1); + assertThat(this.headers.get(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS)) .containsOnly(ContentTypeOptionsServerHttpHeadersWriter.NOSNIFF); } @Test public void writeHeadersWhenHeaderWrittenThenDoesNotOverrride() { String headerValue = "value"; - headers.set(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS, headerValue); + this.headers.set(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS, headerValue); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).hasSize(1); - assertThat(headers.get(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS)).containsOnly(headerValue); + assertThat(this.headers).hasSize(1); + assertThat(this.headers.get(ContentTypeOptionsServerHttpHeadersWriter.X_CONTENT_OPTIONS)) + .containsOnly(headerValue); } } diff --git a/web/src/test/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriterTests.java index 6df82302a2..cef79b2993 100644 --- a/web/src/test/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriterTests.java @@ -37,36 +37,36 @@ public class XFrameOptionsServerHttpHeadersWriterTests { @Before public void setup() { - writer = new XFrameOptionsServerHttpHeadersWriter(); + this.writer = new XFrameOptionsServerHttpHeadersWriter(); } @Test public void writeHeadersWhenUsingDefaultsThenWritesDeny() { - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); assertThat(headers).hasSize(1); assertThat(headers.get(XFrameOptionsServerHttpHeadersWriter.X_FRAME_OPTIONS)).containsOnly("DENY"); } @Test public void writeHeadersWhenUsingExplicitDenyThenWritesDeny() { - writer.setMode(XFrameOptionsServerHttpHeadersWriter.Mode.DENY); + this.writer.setMode(XFrameOptionsServerHttpHeadersWriter.Mode.DENY); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); assertThat(headers).hasSize(1); assertThat(headers.get(XFrameOptionsServerHttpHeadersWriter.X_FRAME_OPTIONS)).containsOnly("DENY"); } @Test public void writeHeadersWhenUsingSameOriginThenWritesSameOrigin() { - writer.setMode(XFrameOptionsServerHttpHeadersWriter.Mode.SAMEORIGIN); + this.writer.setMode(XFrameOptionsServerHttpHeadersWriter.Mode.SAMEORIGIN); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); assertThat(headers).hasSize(1); assertThat(headers.get(XFrameOptionsServerHttpHeadersWriter.X_FRAME_OPTIONS)).containsOnly("SAMEORIGIN"); } @@ -74,11 +74,11 @@ public class XFrameOptionsServerHttpHeadersWriterTests { @Test public void writeHeadersWhenAlreadyWrittenThenWritesHeader() { String headerValue = "other"; - exchange.getResponse().getHeaders().set(XFrameOptionsServerHttpHeadersWriter.X_FRAME_OPTIONS, headerValue); + this.exchange.getResponse().getHeaders().set(XFrameOptionsServerHttpHeadersWriter.X_FRAME_OPTIONS, headerValue); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); assertThat(headers).hasSize(1); assertThat(headers.get(XFrameOptionsServerHttpHeadersWriter.X_FRAME_OPTIONS)).containsOnly(headerValue); } diff --git a/web/src/test/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriterTests.java index 3ed9201e4b..e735f1b233 100644 --- a/web/src/test/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriterTests.java @@ -32,47 +32,48 @@ public class XXssProtectionServerHttpHeadersWriterTests { ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/").build()); - HttpHeaders headers = exchange.getResponse().getHeaders(); + HttpHeaders headers = this.exchange.getResponse().getHeaders(); XXssProtectionServerHttpHeadersWriter writer = new XXssProtectionServerHttpHeadersWriter(); @Test public void writeHeadersWhenNoHeadersThenWriteHeaders() { - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).hasSize(1); - assertThat(headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION)).containsOnly("1 ; mode=block"); + assertThat(this.headers).hasSize(1); + assertThat(this.headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION)) + .containsOnly("1 ; mode=block"); } @Test public void writeHeadersWhenBlockFalseThenWriteHeaders() { - writer.setBlock(false); + this.writer.setBlock(false); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).hasSize(1); - assertThat(headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION)).containsOnly("1"); + assertThat(this.headers).hasSize(1); + assertThat(this.headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION)).containsOnly("1"); } @Test public void writeHeadersWhenEnabledFalseThenWriteHeaders() { - writer.setEnabled(false); + this.writer.setEnabled(false); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).hasSize(1); - assertThat(headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION)).containsOnly("0"); + assertThat(this.headers).hasSize(1); + assertThat(this.headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION)).containsOnly("0"); } @Test public void writeHeadersWhenHeaderWrittenThenDoesNotOverrride() { String headerValue = "value"; - headers.set(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION, headerValue); + this.headers.set(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION, headerValue); - writer.writeHttpHeaders(exchange); + this.writer.writeHttpHeaders(this.exchange); - assertThat(headers).hasSize(1); - assertThat(headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION)).containsOnly(headerValue); + assertThat(this.headers).hasSize(1); + assertThat(this.headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION)).containsOnly(headerValue); } } diff --git a/web/src/test/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixinTests.java b/web/src/test/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixinTests.java index 7b6ad834ec..e5aaaa6d70 100644 --- a/web/src/test/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixinTests.java +++ b/web/src/test/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixinTests.java @@ -47,13 +47,13 @@ public class DefaultCsrfServerTokenMixinTests extends AbstractMixinTests { @Test public void defaultCsrfTokenSerializedTest() throws JsonProcessingException, JSONException { DefaultCsrfToken token = new DefaultCsrfToken("csrf-header", "_csrf", "1"); - String serializedJson = mapper.writeValueAsString(token); + String serializedJson = this.mapper.writeValueAsString(token); JSONAssert.assertEquals(CSRF_JSON, serializedJson, true); } @Test public void defaultCsrfTokenDeserializeTest() throws IOException { - DefaultCsrfToken token = mapper.readValue(CSRF_JSON, DefaultCsrfToken.class); + DefaultCsrfToken token = this.mapper.readValue(CSRF_JSON, DefaultCsrfToken.class); assertThat(token).isNotNull(); assertThat(token.getHeaderName()).isEqualTo("csrf-header"); assertThat(token.getParameterName()).isEqualTo("_csrf"); @@ -63,13 +63,13 @@ public class DefaultCsrfServerTokenMixinTests extends AbstractMixinTests { @Test(expected = JsonMappingException.class) public void defaultCsrfTokenDeserializeWithoutClassTest() throws IOException { String tokenJson = "{\"headerName\": \"csrf-header\", \"parameterName\": \"_csrf\", \"token\": \"1\"}"; - mapper.readValue(tokenJson, DefaultCsrfToken.class); + this.mapper.readValue(tokenJson, DefaultCsrfToken.class); } @Test(expected = JsonMappingException.class) public void defaultCsrfTokenDeserializeNullValuesTest() throws IOException { String tokenJson = "{\"@class\": \"org.springframework.security.web.server.csrf.DefaultCsrfToken\", \"headerName\": \"\", \"parameterName\": null, \"token\": \"1\"}"; - mapper.readValue(tokenJson, DefaultCsrfToken.class); + this.mapper.readValue(tokenJson, DefaultCsrfToken.class); } } diff --git a/web/src/test/java/org/springframework/security/web/server/savedrequest/ServerRequestCacheWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/savedrequest/ServerRequestCacheWebFilterTests.java index e8fc9c970e..5ce76f1faa 100644 --- a/web/src/test/java/org/springframework/security/web/server/savedrequest/ServerRequestCacheWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/savedrequest/ServerRequestCacheWebFilterTests.java @@ -60,7 +60,7 @@ public class ServerRequestCacheWebFilterTests { @Before public void setup() { this.requestCacheFilter = new ServerRequestCacheWebFilter(); - this.requestCacheFilter.setRequestCache(requestCache); + this.requestCacheFilter.setRequestCache(this.requestCache); when(this.chain.filter(any(ServerWebExchange.class))).thenReturn(Mono.empty()); } @@ -73,8 +73,8 @@ public class ServerRequestCacheWebFilterTests { this.requestCacheFilter.filter(exchange, this.chain).block(); - verify(chain).filter(exchangeCaptor.capture()); - ServerWebExchange updatedExchange = exchangeCaptor.getValue(); + verify(this.chain).filter(this.exchangeCaptor.capture()); + ServerWebExchange updatedExchange = this.exchangeCaptor.getValue(); assertThat(updatedExchange.getRequest()).isEqualTo(savedRequest); } @@ -86,8 +86,8 @@ public class ServerRequestCacheWebFilterTests { this.requestCacheFilter.filter(exchange, this.chain).block(); - verify(chain).filter(exchangeCaptor.capture()); - ServerWebExchange updatedExchange = exchangeCaptor.getValue(); + verify(this.chain).filter(this.exchangeCaptor.capture()); + ServerWebExchange updatedExchange = this.exchangeCaptor.getValue(); assertThat(updatedExchange.getRequest()).isEqualTo(initialRequest); } diff --git a/web/src/test/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcherTests.java b/web/src/test/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcherTests.java index 329c77e221..9c32a9f027 100644 --- a/web/src/test/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcherTests.java @@ -52,66 +52,66 @@ public class AndServerWebExchangeMatcherTests { @Before public void setUp() { - matcher = new AndServerWebExchangeMatcher(matcher1, matcher2); + this.matcher = new AndServerWebExchangeMatcher(this.matcher1, this.matcher2); } @Test public void matchesWhenTrueTrueThenTrue() { Map params1 = Collections.singletonMap("foo", "bar"); Map params2 = Collections.singletonMap("x", "y"); - when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params1)); - when(matcher2.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params2)); + when(this.matcher1.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params1)); + when(this.matcher2.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params2)); - ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block(); + ServerWebExchangeMatcher.MatchResult matches = this.matcher.matches(this.exchange).block(); assertThat(matches.isMatch()).isTrue(); assertThat(matches.getVariables()).hasSize(2); assertThat(matches.getVariables()).containsAllEntriesOf(params1); assertThat(matches.getVariables()).containsAllEntriesOf(params2); - verify(matcher1).matches(exchange); - verify(matcher2).matches(exchange); + verify(this.matcher1).matches(this.exchange); + verify(this.matcher2).matches(this.exchange); } @Test public void matchesWhenFalseFalseThenFalseAndMatcher2NotInvoked() { - when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); + when(this.matcher1.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); - ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block(); + ServerWebExchangeMatcher.MatchResult matches = this.matcher.matches(this.exchange).block(); assertThat(matches.isMatch()).isFalse(); assertThat(matches.getVariables()).isEmpty(); - verify(matcher1).matches(exchange); - verify(matcher2, never()).matches(exchange); + verify(this.matcher1).matches(this.exchange); + verify(this.matcher2, never()).matches(this.exchange); } @Test public void matchesWhenTrueFalseThenFalse() { Map params = Collections.singletonMap("foo", "bar"); - when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params)); - when(matcher2.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); + when(this.matcher1.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params)); + when(this.matcher2.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); - ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block(); + ServerWebExchangeMatcher.MatchResult matches = this.matcher.matches(this.exchange).block(); assertThat(matches.isMatch()).isFalse(); assertThat(matches.getVariables()).isEmpty(); - verify(matcher1).matches(exchange); - verify(matcher2).matches(exchange); + verify(this.matcher1).matches(this.exchange); + verify(this.matcher2).matches(this.exchange); } @Test public void matchesWhenFalseTrueThenFalse() { - when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); + when(this.matcher1.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); - ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block(); + ServerWebExchangeMatcher.MatchResult matches = this.matcher.matches(this.exchange).block(); assertThat(matches.isMatch()).isFalse(); assertThat(matches.getVariables()).isEmpty(); - verify(matcher1).matches(exchange); - verify(matcher2, never()).matches(exchange); + verify(this.matcher1).matches(this.exchange); + verify(this.matcher2, never()).matches(this.exchange); } } diff --git a/web/src/test/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcherTests.java b/web/src/test/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcherTests.java index b1a2bc0c06..ae7d339dc3 100644 --- a/web/src/test/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcherTests.java @@ -45,31 +45,31 @@ public class NegatedServerWebExchangeMatcherTests { @Before public void setUp() { - matcher = new NegatedServerWebExchangeMatcher(matcher1); + this.matcher = new NegatedServerWebExchangeMatcher(this.matcher1); } @Test public void matchesWhenFalseThenTrue() { - when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); + when(this.matcher1.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); - ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block(); + ServerWebExchangeMatcher.MatchResult matches = this.matcher.matches(this.exchange).block(); assertThat(matches.isMatch()).isTrue(); assertThat(matches.getVariables()).isEmpty(); - verify(matcher1).matches(exchange); + verify(this.matcher1).matches(this.exchange); } @Test public void matchesWhenTrueThenFalse() { - when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match()); + when(this.matcher1.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match()); - ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block(); + ServerWebExchangeMatcher.MatchResult matches = this.matcher.matches(this.exchange).block(); assertThat(matches.isMatch()).isFalse(); assertThat(matches.getVariables()).isEmpty(); - verify(matcher1).matches(exchange); + verify(this.matcher1).matches(this.exchange); } } diff --git a/web/src/test/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcherTests.java b/web/src/test/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcherTests.java index 3024aa8be9..c46c4f0951 100644 --- a/web/src/test/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcherTests.java @@ -52,50 +52,50 @@ public class OrServerWebExchangeMatcherTests { @Before public void setUp() { - matcher = new OrServerWebExchangeMatcher(matcher1, matcher2); + this.matcher = new OrServerWebExchangeMatcher(this.matcher1, this.matcher2); } @Test public void matchesWhenFalseFalseThenFalse() { - when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); - when(matcher2.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); + when(this.matcher1.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); + when(this.matcher2.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); - ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block(); + ServerWebExchangeMatcher.MatchResult matches = this.matcher.matches(this.exchange).block(); assertThat(matches.isMatch()).isFalse(); assertThat(matches.getVariables()).isEmpty(); - verify(matcher1).matches(exchange); - verify(matcher2).matches(exchange); + verify(this.matcher1).matches(this.exchange); + verify(this.matcher2).matches(this.exchange); } @Test public void matchesWhenTrueFalseThenTrueAndMatcher2NotInvoked() { Map params = Collections.singletonMap("foo", "bar"); - when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params)); + when(this.matcher1.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params)); - ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block(); + ServerWebExchangeMatcher.MatchResult matches = this.matcher.matches(this.exchange).block(); assertThat(matches.isMatch()).isTrue(); assertThat(matches.getVariables()).isEqualTo(params); - verify(matcher1).matches(exchange); - verify(matcher2, never()).matches(exchange); + verify(this.matcher1).matches(this.exchange); + verify(this.matcher2, never()).matches(this.exchange); } @Test public void matchesWhenFalseTrueThenTrue() { Map params = Collections.singletonMap("foo", "bar"); - when(matcher1.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); - when(matcher2.matches(exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params)); + when(this.matcher1.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.notMatch()); + when(this.matcher2.matches(this.exchange)).thenReturn(ServerWebExchangeMatcher.MatchResult.match(params)); - ServerWebExchangeMatcher.MatchResult matches = matcher.matches(exchange).block(); + ServerWebExchangeMatcher.MatchResult matches = this.matcher.matches(this.exchange).block(); assertThat(matches.isMatch()).isTrue(); assertThat(matches.getVariables()).isEqualTo(params); - verify(matcher1).matches(exchange); - verify(matcher2).matches(exchange); + verify(this.matcher1).matches(this.exchange); + verify(this.matcher2).matches(this.exchange); } } diff --git a/web/src/test/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcherTests.java b/web/src/test/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcherTests.java index e953a07c87..870347f26c 100644 --- a/web/src/test/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcherTests.java @@ -59,10 +59,10 @@ public class PathMatcherServerWebExchangeMatcherTests { MockServerHttpRequest request = MockServerHttpRequest.post("/path").build(); MockServerHttpResponse response = new MockServerHttpResponse(); DefaultWebSessionManager sessionManager = new DefaultWebSessionManager(); - exchange = MockServerWebExchange.from(request); - path = "/path"; + this.exchange = MockServerWebExchange.from(request); + this.path = "/path"; - matcher = new PathPatternParserServerWebExchangeMatcher(pattern); + this.matcher = new PathPatternParserServerWebExchangeMatcher(this.pattern); } @Test(expected = IllegalArgumentException.class) @@ -77,39 +77,40 @@ public class PathMatcherServerWebExchangeMatcherTests { @Test public void matchesWhenPathMatcherTrueThenReturnTrue() { - when(pattern.matches(any())).thenReturn(true); - when(pattern.matchAndExtract(any())).thenReturn(pathMatchInfo); - when(pathMatchInfo.getUriVariables()).thenReturn(new HashMap<>()); + when(this.pattern.matches(any())).thenReturn(true); + when(this.pattern.matchAndExtract(any())).thenReturn(this.pathMatchInfo); + when(this.pathMatchInfo.getUriVariables()).thenReturn(new HashMap<>()); - assertThat(matcher.matches(exchange).block().isMatch()).isTrue(); + assertThat(this.matcher.matches(this.exchange).block().isMatch()).isTrue(); } @Test public void matchesWhenPathMatcherFalseThenReturnFalse() { - when(pattern.matches(any())).thenReturn(false); + when(this.pattern.matches(any())).thenReturn(false); - assertThat(matcher.matches(exchange).block().isMatch()).isFalse(); + assertThat(this.matcher.matches(this.exchange).block().isMatch()).isFalse(); } @Test public void matchesWhenPathMatcherTrueAndMethodTrueThenReturnTrue() { - matcher = new PathPatternParserServerWebExchangeMatcher(pattern, exchange.getRequest().getMethod()); - when(pattern.matches(any())).thenReturn(true); - when(pattern.matchAndExtract(any())).thenReturn(pathMatchInfo); - when(pathMatchInfo.getUriVariables()).thenReturn(new HashMap<>()); + this.matcher = new PathPatternParserServerWebExchangeMatcher(this.pattern, + this.exchange.getRequest().getMethod()); + when(this.pattern.matches(any())).thenReturn(true); + when(this.pattern.matchAndExtract(any())).thenReturn(this.pathMatchInfo); + when(this.pathMatchInfo.getUriVariables()).thenReturn(new HashMap<>()); - assertThat(matcher.matches(exchange).block().isMatch()).isTrue(); + assertThat(this.matcher.matches(this.exchange).block().isMatch()).isTrue(); } @Test public void matchesWhenPathMatcherTrueAndMethodFalseThenReturnFalse() { HttpMethod method = HttpMethod.OPTIONS; - assertThat(exchange.getRequest().getMethod()).isNotEqualTo(method); - matcher = new PathPatternParserServerWebExchangeMatcher(pattern, method); + assertThat(this.exchange.getRequest().getMethod()).isNotEqualTo(method); + this.matcher = new PathPatternParserServerWebExchangeMatcher(this.pattern, method); - assertThat(matcher.matches(exchange).block().isMatch()).isFalse(); + assertThat(this.matcher.matches(this.exchange).block().isMatch()).isFalse(); - verifyZeroInteractions(pattern); + verifyZeroInteractions(this.pattern); } } diff --git a/web/src/test/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatchersTests.java b/web/src/test/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatchersTests.java index 6bc4010405..938af60bfd 100644 --- a/web/src/test/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatchersTests.java +++ b/web/src/test/java/org/springframework/security/web/server/util/matcher/ServerWebExchangeMatchersTests.java @@ -39,29 +39,30 @@ public class ServerWebExchangeMatchersTests { @Test public void pathMatchersWhenSingleAndSamePatternThenMatches() { - assertThat(pathMatchers("/").matches(exchange).block().isMatch()).isTrue(); + assertThat(pathMatchers("/").matches(this.exchange).block().isMatch()).isTrue(); } @Test public void pathMatchersWhenSingleAndSamePatternAndMethodThenMatches() { - assertThat(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, "/").matches(exchange).block().isMatch()) + assertThat(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, "/").matches(this.exchange).block().isMatch()) .isTrue(); } @Test public void pathMatchersWhenSingleAndSamePatternAndDiffMethodThenDoesNotMatch() { - assertThat(ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, "/").matches(exchange).block().isMatch()) - .isFalse(); + assertThat( + ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, "/").matches(this.exchange).block().isMatch()) + .isFalse(); } @Test public void pathMatchersWhenSingleAndDifferentPatternThenDoesNotMatch() { - assertThat(pathMatchers("/foobar").matches(exchange).block().isMatch()).isFalse(); + assertThat(pathMatchers("/foobar").matches(this.exchange).block().isMatch()).isFalse(); } @Test public void pathMatchersWhenMultiThenMatches() { - assertThat(pathMatchers("/foobar", "/").matches(exchange).block().isMatch()).isTrue(); + assertThat(pathMatchers("/foobar", "/").matches(this.exchange).block().isMatch()).isTrue(); } @Test diff --git a/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java b/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java index 661dae27fa..1b2ef782ac 100644 --- a/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java +++ b/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java @@ -46,13 +46,13 @@ public class CsrfRequestDataValueProcessorTests { @Before public void setup() { - request = new MockHttpServletRequest(); - processor = new CsrfRequestDataValueProcessor(); + this.request = new MockHttpServletRequest(); + this.processor = new CsrfRequestDataValueProcessor(); - token = new DefaultCsrfToken("1", "a", "b"); - request.setAttribute(CsrfToken.class.getName(), token); + this.token = new DefaultCsrfToken("1", "a", "b"); + this.request.setAttribute(CsrfToken.class.getName(), this.token); - expected.put(token.getParameterName(), token.getToken()); + this.expected.put(this.token.getParameterName(), this.token.getToken()); } @Test @@ -68,72 +68,72 @@ public class CsrfRequestDataValueProcessorTests { @Test public void getExtraHiddenFieldsNoCsrfToken() { - request = new MockHttpServletRequest(); - assertThat(processor.getExtraHiddenFields(request)).isEmpty(); + this.request = new MockHttpServletRequest(); + assertThat(this.processor.getExtraHiddenFields(this.request)).isEmpty(); } @Test public void getExtraHiddenFieldsHasCsrfTokenNoMethodSet() { - assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected); + assertThat(this.processor.getExtraHiddenFields(this.request)).isEqualTo(this.expected); } @Test public void getExtraHiddenFieldsHasCsrfToken_GET() { - processor.processAction(request, "action", "GET"); - assertThat(processor.getExtraHiddenFields(request)).isEmpty(); + this.processor.processAction(this.request, "action", "GET"); + assertThat(this.processor.getExtraHiddenFields(this.request)).isEmpty(); } @Test public void getExtraHiddenFieldsHasCsrfToken_get() { - processor.processAction(request, "action", "get"); - assertThat(processor.getExtraHiddenFields(request)).isEmpty(); + this.processor.processAction(this.request, "action", "get"); + assertThat(this.processor.getExtraHiddenFields(this.request)).isEmpty(); } @Test public void getExtraHiddenFieldsHasCsrfToken_POST() { - processor.processAction(request, "action", "POST"); - assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected); + this.processor.processAction(this.request, "action", "POST"); + assertThat(this.processor.getExtraHiddenFields(this.request)).isEqualTo(this.expected); } @Test public void getExtraHiddenFieldsHasCsrfToken_post() { - processor.processAction(request, "action", "post"); - assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected); + this.processor.processAction(this.request, "action", "post"); + assertThat(this.processor.getExtraHiddenFields(this.request)).isEqualTo(this.expected); } @Test public void processAction() { String action = "action"; - assertThat(processor.processAction(request, action)).isEqualTo(action); + assertThat(this.processor.processAction(this.request, action)).isEqualTo(action); } @Test public void processActionWithMethodArg() { String action = "action"; - assertThat(processor.processAction(request, action, null)).isEqualTo(action); + assertThat(this.processor.processAction(this.request, action, null)).isEqualTo(action); } @Test public void processFormFieldValue() { String value = "action"; - assertThat(processor.processFormFieldValue(request, "name", value, "hidden")).isEqualTo(value); + assertThat(this.processor.processFormFieldValue(this.request, "name", value, "hidden")).isEqualTo(value); } @Test public void processUrl() { String url = "url"; - assertThat(processor.processUrl(request, url)).isEqualTo(url); + assertThat(this.processor.processUrl(this.request, url)).isEqualTo(url); } @Test public void createGetExtraHiddenFieldsHasCsrfToken() { CsrfToken token = new DefaultCsrfToken("1", "a", "b"); - request.setAttribute(CsrfToken.class.getName(), token); + this.request.setAttribute(CsrfToken.class.getName(), token); Map expected = new HashMap<>(); expected.put(token.getParameterName(), token.getToken()); RequestDataValueProcessor processor = new CsrfRequestDataValueProcessor(); - assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected); + assertThat(processor.getExtraHiddenFields(this.request)).isEqualTo(expected); } } diff --git a/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java b/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java index 091a04db38..400aea182b 100644 --- a/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java +++ b/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java @@ -39,34 +39,34 @@ public class HttpSessionDestroyedEventTests { @Before public void setUp() { - session = new MockHttpSession(); - session.setAttribute("notcontext", "notcontext"); - session.setAttribute("null", null); - session.setAttribute("context", new SecurityContextImpl()); - destroyedEvent = new HttpSessionDestroyedEvent(session); + this.session = new MockHttpSession(); + this.session.setAttribute("notcontext", "notcontext"); + this.session.setAttribute("null", null); + this.session.setAttribute("context", new SecurityContextImpl()); + this.destroyedEvent = new HttpSessionDestroyedEvent(this.session); } // SEC-1870 @Test public void getSecurityContexts() { - List securityContexts = destroyedEvent.getSecurityContexts(); + List securityContexts = this.destroyedEvent.getSecurityContexts(); assertThat(securityContexts).hasSize(1); - assertThat(securityContexts.get(0)).isSameAs(session.getAttribute("context")); + assertThat(securityContexts.get(0)).isSameAs(this.session.getAttribute("context")); } @Test public void getSecurityContextsMulti() { - session.setAttribute("another", new SecurityContextImpl()); - List securityContexts = destroyedEvent.getSecurityContexts(); + this.session.setAttribute("another", new SecurityContextImpl()); + List securityContexts = this.destroyedEvent.getSecurityContexts(); assertThat(securityContexts).hasSize(2); } @Test public void getSecurityContextsDiffImpl() { - session.setAttribute("context", mock(SecurityContext.class)); - List securityContexts = destroyedEvent.getSecurityContexts(); + this.session.setAttribute("context", mock(SecurityContext.class)); + List securityContexts = this.destroyedEvent.getSecurityContexts(); assertThat(securityContexts).hasSize(1); - assertThat(securityContexts.get(0)).isSameAs(session.getAttribute("context")); + assertThat(securityContexts.get(0)).isSameAs(this.session.getAttribute("context")); } } diff --git a/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java b/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java index ba7fa20817..115641d974 100644 --- a/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java +++ b/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java @@ -33,22 +33,22 @@ public class MockApplicationListener implements ApplicationListener mediaTypes = null; - new MediaTypeRequestMatcher(negotiationStrategy, mediaTypes); + new MediaTypeRequestMatcher(this.negotiationStrategy, mediaTypes); } @Test(expected = IllegalArgumentException.class) public void constructorEmtpyMediaTypes() { - new MediaTypeRequestMatcher(negotiationStrategy, Collections.emptyList()); + new MediaTypeRequestMatcher(this.negotiationStrategy, Collections.emptyList()); } @Test(expected = IllegalArgumentException.class) @@ -93,284 +93,285 @@ public class MediaTypeRequestMatcherTests { @Test public void negotiationStrategyThrowsHMTNAE() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenThrow(new HttpMediaTypeNotAcceptableException("oops")); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.ALL); - assertThat(matcher.matches(request)).isFalse(); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.ALL); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void mediaAllMatches() throws Exception { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(MediaType.ALL)); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.TEXT_HTML); + assertThat(this.matcher.matches(this.request)).isTrue(); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_XHTML_XML); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.APPLICATION_XHTML_XML); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenAcceptHeaderAsteriskThenAll() { - request.addHeader("Accept", "*/*"); - matcher = new MediaTypeRequestMatcher(MediaType.ALL); - assertThat(matcher.matches(request)).isTrue(); + this.request.addHeader("Accept", "*/*"); + this.matcher = new MediaTypeRequestMatcher(MediaType.ALL); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenAcceptHeaderAsteriskThenAnyone() { - request.addHeader("Accept", "*/*"); - matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); - assertThat(matcher.matches(request)).isTrue(); + this.request.addHeader("Accept", "*/*"); + this.matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenAcceptHeaderAsteriskThenAllInCollection() { - request.addHeader("Accept", "*/*"); - matcher = new MediaTypeRequestMatcher(Collections.singleton(MediaType.ALL)); - assertThat(matcher.matches(request)).isTrue(); + this.request.addHeader("Accept", "*/*"); + this.matcher = new MediaTypeRequestMatcher(Collections.singleton(MediaType.ALL)); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenAcceptHeaderAsteriskThenAnyoneInCollection() { - request.addHeader("Accept", "*/*"); - matcher = new MediaTypeRequestMatcher(Collections.singleton(MediaType.TEXT_HTML)); - assertThat(matcher.matches(request)).isTrue(); + this.request.addHeader("Accept", "*/*"); + this.matcher = new MediaTypeRequestMatcher(Collections.singleton(MediaType.TEXT_HTML)); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenNoAcceptHeaderThenAll() { - request.removeHeader("Accept"); + this.request.removeHeader("Accept"); // if not set Accept, it is match all - matcher = new MediaTypeRequestMatcher(MediaType.ALL); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(MediaType.ALL); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenNoAcceptHeaderThenAnyone() { - request.removeHeader("Accept"); - matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); - assertThat(matcher.matches(request)).isTrue(); + this.request.removeHeader("Accept"); + this.matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenSingleAcceptHeaderThenOne() { - request.addHeader("Accept", "text/html"); - matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); - assertThat(matcher.matches(request)).isTrue(); + this.request.addHeader("Accept", "text/html"); + this.matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenSingleAcceptHeaderThenOneWithCollection() { - request.addHeader("Accept", "text/html"); - matcher = new MediaTypeRequestMatcher(Collections.singleton(MediaType.TEXT_HTML)); - assertThat(matcher.matches(request)).isTrue(); + this.request.addHeader("Accept", "text/html"); + this.matcher = new MediaTypeRequestMatcher(Collections.singleton(MediaType.TEXT_HTML)); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenMultipleAcceptHeaderThenMatchMultiple() { - request.addHeader("Accept", "text/html, application/xhtml+xml, application/xml;q=0.9"); - matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML, MediaType.APPLICATION_XHTML_XML, + this.request.addHeader("Accept", "text/html, application/xhtml+xml, application/xml;q=0.9"); + this.matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML, MediaType.APPLICATION_XHTML_XML, MediaType.APPLICATION_XML); - assertThat(matcher.matches(request)).isTrue(); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenMultipleAcceptHeaderThenAnyoneInCollection() { - request.addHeader("Accept", "text/html, application/xhtml+xml, application/xml;q=0.9"); - matcher = new MediaTypeRequestMatcher(Arrays.asList(MediaType.APPLICATION_XHTML_XML)); - assertThat(matcher.matches(request)).isTrue(); + this.request.addHeader("Accept", "text/html, application/xhtml+xml, application/xml;q=0.9"); + this.matcher = new MediaTypeRequestMatcher(Arrays.asList(MediaType.APPLICATION_XHTML_XML)); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void multipleMediaType() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(MediaType.TEXT_PLAIN, MediaType.APPLICATION_XHTML_XML, MediaType.TEXT_HTML)); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_ATOM_XML, MediaType.TEXT_HTML); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.APPLICATION_ATOM_XML, + MediaType.TEXT_HTML); + assertThat(this.matcher.matches(this.request)).isTrue(); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_XHTML_XML, + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.APPLICATION_XHTML_XML, MediaType.APPLICATION_JSON); - assertThat(matcher.matches(request)).isTrue(); + assertThat(this.matcher.matches(this.request)).isTrue(); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_FORM_URLENCODED, + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.APPLICATION_FORM_URLENCODED, MediaType.APPLICATION_JSON); - assertThat(matcher.matches(request)).isFalse(); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void resolveTextPlainMatchesTextAll() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(MediaType.TEXT_PLAIN)); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, new MediaType("text", "*")); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, new MediaType("text", "*")); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenAcceptHeaderIsTextThenMediaTypeAllIsMatched() { - request.addHeader("Accept", MediaType.TEXT_PLAIN_VALUE); + this.request.addHeader("Accept", MediaType.TEXT_PLAIN_VALUE); - matcher = new MediaTypeRequestMatcher(new MediaType("text", "*")); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(new MediaType("text", "*")); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void resolveTextAllMatchesTextPlain() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(new MediaType("text", "*"))); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_PLAIN); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.TEXT_PLAIN); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchWhenAcceptHeaderIsTextWildcardThenMediaTypeTextIsMatched() { - request.addHeader("Accept", "text/*"); + this.request.addHeader("Accept", "text/*"); - matcher = new MediaTypeRequestMatcher(MediaType.TEXT_PLAIN); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(MediaType.TEXT_PLAIN); + assertThat(this.matcher.matches(this.request)).isTrue(); } // useEquals @Test public void useEqualsResolveTextAllMatchesTextPlain() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(new MediaType("text", "*"))); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_PLAIN); - matcher.setUseEquals(true); - assertThat(matcher.matches(request)).isFalse(); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.TEXT_PLAIN); + this.matcher.setUseEquals(true); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void useEqualsWhenTrueThenMediaTypeTextIsNotMatched() { - request.addHeader("Accept", "text/*"); + this.request.addHeader("Accept", "text/*"); - matcher = new MediaTypeRequestMatcher(MediaType.TEXT_PLAIN); - matcher.setUseEquals(true); - assertThat(matcher.matches(request)).isFalse(); + this.matcher = new MediaTypeRequestMatcher(MediaType.TEXT_PLAIN); + this.matcher.setUseEquals(true); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void useEqualsResolveTextPlainMatchesTextAll() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(MediaType.TEXT_PLAIN)); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, new MediaType("text", "*")); - matcher.setUseEquals(true); - assertThat(matcher.matches(request)).isFalse(); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, new MediaType("text", "*")); + this.matcher.setUseEquals(true); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void useEqualsWhenTrueThenMediaTypeTextAllIsNotMatched() { - request.addHeader("Accept", MediaType.TEXT_PLAIN_VALUE); + this.request.addHeader("Accept", MediaType.TEXT_PLAIN_VALUE); - matcher = new MediaTypeRequestMatcher(new MediaType("text", "*")); - matcher.setUseEquals(true); - assertThat(matcher.matches(request)).isFalse(); + this.matcher = new MediaTypeRequestMatcher(new MediaType("text", "*")); + this.matcher.setUseEquals(true); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void useEqualsSame() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(MediaType.TEXT_PLAIN)); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_PLAIN); - matcher.setUseEquals(true); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.TEXT_PLAIN); + this.matcher.setUseEquals(true); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void useEqualsWhenTrueThenMediaTypeIsMatchedWithEqualString() { - request.addHeader("Accept", MediaType.TEXT_PLAIN_VALUE); + this.request.addHeader("Accept", MediaType.TEXT_PLAIN_VALUE); - matcher = new MediaTypeRequestMatcher(MediaType.TEXT_PLAIN); - matcher.setUseEquals(true); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(MediaType.TEXT_PLAIN); + this.matcher.setUseEquals(true); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void useEqualsWithCustomMediaType() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(new MediaType("text", "unique"))); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, new MediaType("text", "unique")); - matcher.setUseEquals(true); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, new MediaType("text", "unique")); + this.matcher.setUseEquals(true); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void useEqualsWhenTrueThenCustomMediaTypeIsMatched() { - request.addHeader("Accept", "text/unique"); + this.request.addHeader("Accept", "text/unique"); - matcher = new MediaTypeRequestMatcher(new MediaType("text", "unique")); - matcher.setUseEquals(true); - assertThat(matcher.matches(request)).isTrue(); + this.matcher = new MediaTypeRequestMatcher(new MediaType("text", "unique")); + this.matcher.setUseEquals(true); + assertThat(this.matcher.matches(this.request)).isTrue(); } // ignoreMediaTypeAll @Test public void mediaAllIgnoreMediaTypeAll() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(MediaType.ALL)); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML); - matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.TEXT_HTML); + this.matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); - assertThat(matcher.matches(request)).isFalse(); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void ignoredMediaTypesWhenAllThenAnyoneIsNotMatched() { - request.addHeader("Accept", MediaType.ALL_VALUE); - matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); - matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); + this.request.addHeader("Accept", MediaType.ALL_VALUE); + this.matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); + this.matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); - assertThat(matcher.matches(request)).isFalse(); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void mediaAllAndTextHtmlIgnoreMediaTypeAll() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(MediaType.ALL, MediaType.TEXT_HTML)); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML); - matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.TEXT_HTML); + this.matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); - assertThat(matcher.matches(request)).isTrue(); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void ignoredMediaTypesWhenAllAndTextThenTextCanBeMatched() { - request.addHeader("Accept", MediaType.ALL_VALUE + ", " + MediaType.TEXT_HTML_VALUE); - matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); - matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); + this.request.addHeader("Accept", MediaType.ALL_VALUE + ", " + MediaType.TEXT_HTML_VALUE); + this.matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); + this.matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); - assertThat(matcher.matches(request)).isTrue(); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void mediaAllQ08AndTextPlainIgnoreMediaTypeAll() throws HttpMediaTypeNotAcceptableException { - when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) + when(this.negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))) .thenReturn(Arrays.asList(MediaType.TEXT_PLAIN, MediaType.parseMediaType("*/*;q=0.8"))); - matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML); - matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); + this.matcher = new MediaTypeRequestMatcher(this.negotiationStrategy, MediaType.TEXT_HTML); + this.matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); - assertThat(matcher.matches(request)).isFalse(); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void ignoredMediaTypesWhenAllThenQ08WithTextIsNotMatched() { - request.addHeader("Accept", MediaType.TEXT_PLAIN + ", */*;q=0.8"); - matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); - matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); + this.request.addHeader("Accept", MediaType.TEXT_PLAIN + ", */*;q=0.8"); + this.matcher = new MediaTypeRequestMatcher(MediaType.TEXT_HTML); + this.matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL)); - assertThat(matcher.matches(request)).isFalse(); + assertThat(this.matcher.matches(this.request)).isFalse(); } } diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java index 71e8acd008..c587839f38 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java @@ -47,18 +47,18 @@ public class NegatedRequestMatcherTests { @Test public void matchesDelegateFalse() { - when(delegate.matches(request)).thenReturn(false); - matcher = new NegatedRequestMatcher(delegate); + when(this.delegate.matches(this.request)).thenReturn(false); + this.matcher = new NegatedRequestMatcher(this.delegate); - assertThat(matcher.matches(request)).isTrue(); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchesDelegateTrue() { - when(delegate.matches(request)).thenReturn(true); - matcher = new NegatedRequestMatcher(delegate); + when(this.delegate.matches(this.request)).thenReturn(true); + this.matcher = new NegatedRequestMatcher(this.delegate); - assertThat(matcher.matches(request)).isFalse(); + assertThat(this.matcher.matches(this.request)).isFalse(); } } diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java index 3284acfd03..0401304aa7 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java @@ -79,43 +79,43 @@ public class OrRequestMatcherTests { @Test public void matchesSingleTrue() { - when(delegate.matches(request)).thenReturn(true); - matcher = new OrRequestMatcher(delegate); + when(this.delegate.matches(this.request)).thenReturn(true); + this.matcher = new OrRequestMatcher(this.delegate); - assertThat(matcher.matches(request)).isTrue(); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchesMultiTrue() { - when(delegate.matches(request)).thenReturn(true); - matcher = new OrRequestMatcher(delegate, delegate2); + when(this.delegate.matches(this.request)).thenReturn(true); + this.matcher = new OrRequestMatcher(this.delegate, this.delegate2); - assertThat(matcher.matches(request)).isTrue(); + assertThat(this.matcher.matches(this.request)).isTrue(); } @Test public void matchesSingleFalse() { - when(delegate.matches(request)).thenReturn(false); - matcher = new OrRequestMatcher(delegate); + when(this.delegate.matches(this.request)).thenReturn(false); + this.matcher = new OrRequestMatcher(this.delegate); - assertThat(matcher.matches(request)).isFalse(); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void matchesMultiBothFalse() { - when(delegate.matches(request)).thenReturn(false); - when(delegate2.matches(request)).thenReturn(false); - matcher = new OrRequestMatcher(delegate, delegate2); + when(this.delegate.matches(this.request)).thenReturn(false); + when(this.delegate2.matches(this.request)).thenReturn(false); + this.matcher = new OrRequestMatcher(this.delegate, this.delegate2); - assertThat(matcher.matches(request)).isFalse(); + assertThat(this.matcher.matches(this.request)).isFalse(); } @Test public void matchesMultiSingleFalse() { - when(delegate.matches(request)).thenReturn(true); - matcher = new OrRequestMatcher(delegate, delegate2); + when(this.delegate.matches(this.request)).thenReturn(true); + this.matcher = new OrRequestMatcher(this.delegate, this.delegate2); - assertThat(matcher.matches(request)).isTrue(); + assertThat(this.matcher.matches(this.request)).isTrue(); } } diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java index 6af02418f9..298629371b 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java @@ -115,9 +115,9 @@ public class RegexRequestMatcherTests { } private HttpServletRequest createRequestWithNullMethod(String path) { - when(request.getQueryString()).thenReturn("doesntMatter"); - when(request.getServletPath()).thenReturn(path); - return request; + when(this.request.getQueryString()).thenReturn("doesntMatter"); + when(this.request.getServletPath()).thenReturn(path); + return this.request; } } diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java index 69e09cca4e..7f9d4b3b77 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java @@ -36,7 +36,7 @@ public class RequestHeaderRequestMatcherTests { @Before public void setup() { - request = new MockHttpServletRequest(); + this.request = new MockHttpServletRequest(); } @Test(expected = IllegalArgumentException.class) @@ -51,39 +51,39 @@ public class RequestHeaderRequestMatcherTests { @Test public void matchesHeaderNameMatches() { - request.addHeader(headerName, headerValue); - assertThat(new RequestHeaderRequestMatcher(headerName).matches(request)).isTrue(); + this.request.addHeader(this.headerName, this.headerValue); + assertThat(new RequestHeaderRequestMatcher(this.headerName).matches(this.request)).isTrue(); } @Test public void matchesHeaderNameDoesNotMatch() { - request.addHeader(headerName + "notMatch", headerValue); - assertThat(new RequestHeaderRequestMatcher(headerName).matches(request)).isFalse(); + this.request.addHeader(this.headerName + "notMatch", this.headerValue); + assertThat(new RequestHeaderRequestMatcher(this.headerName).matches(this.request)).isFalse(); } @Test public void matchesHeaderNameValueMatches() { - request.addHeader(headerName, headerValue); - assertThat(new RequestHeaderRequestMatcher(headerName, headerValue).matches(request)).isTrue(); + this.request.addHeader(this.headerName, this.headerValue); + assertThat(new RequestHeaderRequestMatcher(this.headerName, this.headerValue).matches(this.request)).isTrue(); } @Test public void matchesHeaderNameValueHeaderNameNotMatch() { - request.addHeader(headerName + "notMatch", headerValue); - assertThat(new RequestHeaderRequestMatcher(headerName, headerValue).matches(request)).isFalse(); + this.request.addHeader(this.headerName + "notMatch", this.headerValue); + assertThat(new RequestHeaderRequestMatcher(this.headerName, this.headerValue).matches(this.request)).isFalse(); } @Test public void matchesHeaderNameValueHeaderValueNotMatch() { - request.addHeader(headerName, headerValue + "notMatch"); - assertThat(new RequestHeaderRequestMatcher(headerName, headerValue).matches(request)).isFalse(); + this.request.addHeader(this.headerName, this.headerValue + "notMatch"); + assertThat(new RequestHeaderRequestMatcher(this.headerName, this.headerValue).matches(this.request)).isFalse(); } @Test public void matchesHeaderNameValueHeaderValueMultiNotMatch() { - request.addHeader(headerName, headerValue + "notMatch"); - request.addHeader(headerName, headerValue); - assertThat(new RequestHeaderRequestMatcher(headerName, headerValue).matches(request)).isFalse(); + this.request.addHeader(this.headerName, this.headerValue + "notMatch"); + this.request.addHeader(this.headerName, this.headerValue); + assertThat(new RequestHeaderRequestMatcher(this.headerName, this.headerValue).matches(this.request)).isFalse(); } }