Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Security 4 and Spring Framework 4.1

Browse Source 
Issue: SWF-1657, SWF-1663
This commit is contained in:
Rossen Stoyanchev
2015-06-04 15:18:28 -04:00
parent b28616e6af
commit b51b30ed01
6 changed files with 173 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
spring-faces/src/main/java/org/springframework/faces/security/FaceletsAuthorizeTag.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2013 the original author or authors.
* Copyright 2004-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.springframework.security.taglibs.authz.AbstractAuthorizeTag;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
/**
* A concrete implementation of {@link AbstractAuthorizeTag} for use with standard Facelets rendering technology.
@@ -76,7 +78,53 @@ public class FaceletsAuthorizeTag extends AbstractAuthorizeTag {
return (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext();
}
/*---- Pirvate helper methods ----*/
void setIfAllGranted(String ifAllGranted) {
String[] roles = StringUtils.tokenizeToStringArray(ifAllGranted, ",");
if (!ObjectUtils.isEmpty(roles)) {
String expression = toHasRoleExpression(roles);
setAccess(getAccess() != null ? getAccess() + " and " + expression: expression);
}
}
void setIfAnyGranted(String ifAnyGranted) {
String[] roles = StringUtils.tokenizeToStringArray(ifAnyGranted, ",");
if (!ObjectUtils.isEmpty(roles)) {
String expression = toHasAnyRoleExpression(roles, false);
setAccess(getAccess() != null ? getAccess() + " and " + expression: expression);
}
}
void setIfNotGranted(String ifNotGranted) {
String[] roles = StringUtils.tokenizeToStringArray(ifNotGranted, ",");
if (!ObjectUtils.isEmpty(roles)) {
String expression = toHasAnyRoleExpression(roles, true);
setAccess(getAccess() != null ? getAccess() + " and " + expression: expression);
}
}
private static String toHasRoleExpression(String[] roles) {
StringBuilder expression = new StringBuilder();
boolean insertSeparator = false;
for (String role : roles) {
expression.append(insertSeparator ? " and " : "");
expression.append("hasRole('").append(role).append("')");
insertSeparator = true;
}
return expression.toString();
}
private static String toHasAnyRoleExpression(String[] roles, boolean negate) {
StringBuilder expression = new StringBuilder();
expression.append(negate ? "!" : "");
expression.append("hasAnyRole(");
boolean insertSeparator = false;
for (String role : roles) {
expression.append(insertSeparator ? "," : "");
expression.append("'").append(role).append("'");
insertSeparator = true;
}
return expression.append(")").toString();
}
private String getAttributeValue(FaceletContext faceletContext, TagAttribute tagAttribute, boolean evaluate) {
String value = null;

8
spring-faces/src/main/java/org/springframework/faces/security/FaceletsAuthorizeTagUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2010 the original author or authors.
* Copyright 2004-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public abstract class FaceletsAuthorizeTagUtils {
public static boolean areAllGranted(String authorities) throws IOException {
FaceletsAuthorizeTag authorizeTag = new FaceletsAuthorizeTag();
authorizeTag.setIfAllGranted(authorities);
return authorizeTag.authorizeUsingGrantedAuthorities();
return authorizeTag.authorize();
}
/**
@@ -45,7 +45,7 @@ public abstract class FaceletsAuthorizeTagUtils {
public static boolean areAnyGranted(String authorities) throws IOException {
FaceletsAuthorizeTag authorizeTag = new FaceletsAuthorizeTag();
authorizeTag.setIfAnyGranted(authorities);
return authorizeTag.authorizeUsingGrantedAuthorities();
return authorizeTag.authorize();
}
/**
@@ -56,7 +56,7 @@ public abstract class FaceletsAuthorizeTagUtils {
public static boolean areNotGranted(String authorities) throws IOException {
FaceletsAuthorizeTag authorizeTag = new FaceletsAuthorizeTag();
authorizeTag.setIfNotGranted(authorities);
return authorizeTag.authorizeUsingGrantedAuthorities();
return authorizeTag.authorize();
}
/**