Java5 updates.
This commit is contained in:
parent
98422b69a8
commit
3e8de229be
|
@ -1,13 +1,12 @@
|
||||||
package org.springframework.security.annotation;
|
package org.springframework.security.annotation;
|
||||||
|
|
||||||
import org.springframework.security.GrantedAuthority;
|
|
||||||
import org.springframework.security.ConfigAttribute;
|
|
||||||
import org.springframework.security.Authentication;
|
|
||||||
import org.springframework.security.vote.AccessDecisionVoter;
|
|
||||||
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.springframework.security.Authentication;
|
||||||
|
import org.springframework.security.ConfigAttribute;
|
||||||
|
import org.springframework.security.GrantedAuthority;
|
||||||
|
import org.springframework.security.vote.AccessDecisionVoter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Voter on JSR-250 configuration attributes.
|
* Voter on JSR-250 configuration attributes.
|
||||||
*
|
*
|
||||||
|
@ -45,12 +44,7 @@ public class Jsr250Voter implements AccessDecisionVoter {
|
||||||
* @return The vote.
|
* @return The vote.
|
||||||
*/
|
*/
|
||||||
public int vote(Authentication authentication, Object object, List<ConfigAttribute> definition) {
|
public int vote(Authentication authentication, Object object, List<ConfigAttribute> definition) {
|
||||||
int result = ACCESS_ABSTAIN;
|
for (ConfigAttribute attribute : definition) {
|
||||||
Iterator iter = definition.iterator();
|
|
||||||
|
|
||||||
while (iter.hasNext()) {
|
|
||||||
ConfigAttribute attribute = (ConfigAttribute) iter.next();
|
|
||||||
|
|
||||||
if (Jsr250SecurityConfig.PERMIT_ALL_ATTRIBUTE.equals(attribute)) {
|
if (Jsr250SecurityConfig.PERMIT_ALL_ATTRIBUTE.equals(attribute)) {
|
||||||
return ACCESS_GRANTED;
|
return ACCESS_GRANTED;
|
||||||
}
|
}
|
||||||
|
@ -60,18 +54,18 @@ public class Jsr250Voter implements AccessDecisionVoter {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (supports(attribute)) {
|
if (supports(attribute)) {
|
||||||
result = ACCESS_DENIED;
|
|
||||||
|
|
||||||
// Attempt to find a matching granted authority
|
// Attempt to find a matching granted authority
|
||||||
for (GrantedAuthority authority : authentication.getAuthorities()) {
|
for (GrantedAuthority authority : authentication.getAuthorities()) {
|
||||||
if (attribute.getAttribute().equals(authority.getAuthority())) {
|
if (attribute.getAttribute().equals(authority.getAuthority())) {
|
||||||
return ACCESS_GRANTED;
|
return ACCESS_GRANTED;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// No match - deny access
|
||||||
|
return ACCESS_DENIED;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return ACCESS_ABSTAIN;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue