Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-07 11:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle null Authentication.getAuthorities() in AuthorizeTag.

Browse Source
This commit is contained in:
Ben Alex 2005-03-27 06:36:41 +00:00
parent 8e6305ae81
commit 684d5bc10e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/org/acegisecurity/taglibs/authz/AuthorizeTag.java
View File

@ -25,7 +25,12 @@ import org.springframework.util.StringUtils;
import org.springframework.web.util.ExpressionEvaluationUtils; import org.springframework.web.util.ExpressionEvaluationUtils;
import java.util.*; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.Tag;
@ -130,6 +135,11 @@ public class AuthorizeTag extends TagSupport {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
if ((null == currentUser.getAuthorities())
|| (currentUser.getAuthorities().length < 1)) {
return Collections.EMPTY_LIST;
}
Collection granted = Arrays.asList(currentUser.getAuthorities()); Collection granted = Arrays.asList(currentUser.getAuthorities());
return granted; return granted;

1
doc/xdocs/changes.xml
View File

@ -28,6 +28,7 @@
<release version="0.8.2" date="In CVS"> <release version="0.8.2" date="In CVS">
<action dev="benalex" type="fix">Correct location of AuthenticationSimpleHttpInvokerRequestExecutor in clientContext.xml</action> <action dev="benalex" type="fix">Correct location of AuthenticationSimpleHttpInvokerRequestExecutor in clientContext.xml</action>
<action dev="benalex" type="fix">TokenBasedRememberMeServices changed to use long instead of int for tokenValiditySeconds (SPR-807)</action> <action dev="benalex" type="fix">TokenBasedRememberMeServices changed to use long instead of int for tokenValiditySeconds (SPR-807)</action>
<action dev="benalex" type="fix">Handle null Authentication.getAuthorities() in AuthorizeTag</action>
<action dev="benalex" type="update">Add credentialsExpiredFailureUrl getter/setter to AbstractProcessingFilter</action> <action dev="benalex" type="update">Add credentialsExpiredFailureUrl getter/setter to AbstractProcessingFilter</action>
<action dev="benalex" type="update">Update commons-codec dependency to 1.3</action> <action dev="benalex" type="update">Update commons-codec dependency to 1.3</action>
</release> </release>