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

SEC-1132: Moved access-control/authorization specific code to org.sf.security.access package. Created provisioning package for user management classes to remove cyclical deps. Some other moving of classes to remove code tangles. Restructuring of portlet module under org.sf.security.portlet

Browse Source
This commit is contained in:
Luke Taylor
2009-04-12 12:23:23 +00:00
parent 7c4d54f356
commit 9efb5a7007
288 changed files with 773 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/contacts/src/main/java/sample/contact/ContactManager.java
View File

@@ -14,10 +14,10 @@
*/
package sample.contact;
import org.springframework.security.access.expression.annotation.PostFilter;
import org.springframework.security.access.expression.annotation.PreAuthorize;
import org.springframework.security.acls.Permission;
import org.springframework.security.acls.sid.Sid;
import org.springframework.security.expression.annotation.PostFilter;
import org.springframework.security.expression.annotation.PreAuthorize;
import java.util.List;

2
samples/contacts/src/main/java/sample/contact/SecureIndexController.java
View File

@@ -18,10 +18,10 @@ package sample.contact;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.security.Authentication;
import org.springframework.security.access.expression.PermissionEvaluator;
import org.springframework.security.acls.Permission;
import org.springframework.security.acls.domain.BasePermission;
import org.springframework.security.context.SecurityContextHolder;
import org.springframework.security.expression.PermissionEvaluator;
import org.springframework.util.Assert;
import org.springframework.web.servlet.ModelAndView;

2
samples/contacts/src/main/webapp/WEB-INF/applicationContext-security.xml
View File

@@ -48,7 +48,7 @@
<b:property name="targetUrl" value="/secure/index.htm"/>
</b:bean>
<b:bean id="expressionHandler" class="org.springframework.security.expression.support.DefaultMethodSecurityExpressionHandler">
<b:bean id="expressionHandler" class="org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler">
<b:property name="permissionEvaluator" ref="permissionEvaluator" />
</b:bean>

2
samples/contacts/src/test/resources/applicationContext-contacts-test.xml
View File

@@ -24,7 +24,7 @@
<jdbc-user-service data-source-ref="dataSource"/>
</authentication-provider>
<b:bean id="expressionHandler" class="org.springframework.security.expression.support.DefaultMethodSecurityExpressionHandler">
<b:bean id="expressionHandler" class="org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler">
<b:property name="permissionEvaluator" ref="permissionEvaluator" />
</b:bean>

10
samples/dms/src/main/resources/applicationContext-dms-secure.xml
View File

@@ -108,7 +108,7 @@
<!-- An access decision voter that reads ROLE_* configuration settings -->
<bean id="roleVoter" class="org.springframework.security.vote.RoleVoter"/>
<bean id="roleVoter" class="org.springframework.security.access.vote.RoleVoter"/>
<!-- An access decision voter that reads ACL_ABSTRACT_ELEMENT_WRITE_PARENT configuration settings -->
<bean id="aclAbstractElementWriteParentVoter" class="org.springframework.security.acls.vote.AclEntryVoter">
@@ -138,7 +138,7 @@
</bean>
<!-- An access decision manager used by the business objects -->
<bean id="businessAccessDecisionManager" class="org.springframework.security.vote.AffirmativeBased">
<bean id="businessAccessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
<property name="allowIfAllAbstainDecisions" value="true"/>
<property name="decisionVoters">
<list>
@@ -195,7 +195,7 @@
<!-- ============== "AFTER INTERCEPTION" AUTHORIZATION DEFINITIONS =========== -->
<bean id="afterInvocationManager" class="org.springframework.security.afterinvocation.AfterInvocationProviderManager">
<bean id="afterInvocationManager" class="org.springframework.security.access.intercept.AfterInvocationProviderManager">
<property name="providers">
<list>
<ref local="afterAclCollectionRead"/>
@@ -216,9 +216,9 @@
<!-- ================= METHOD INVOCATION AUTHORIZATION ==================== -->
<bean id="methodSecurityAdvisor" class="org.springframework.security.intercept.method.aopalliance.MethodSecurityMetadataSourceAdvisor" autowire="constructor"/>
<bean id="methodSecurityAdvisor" class="org.springframework.security.access.intercept.method.aopalliance.MethodSecurityMetadataSourceAdvisor" autowire="constructor"/>
<bean id="methodSecurityInterceptor" class="org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor">
<bean id="methodSecurityInterceptor" class="org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor">
<property name="authenticationManager"><ref bean="authenticationManager"/></property>
<property name="accessDecisionManager"><ref local="businessAccessDecisionManager"/></property>
<property name="afterInvocationManager"><ref local="afterInvocationManager"/></property>

8
samples/portlet/src/main/java/org/springframework/web/portlet/sample/SecurityContextPortlet.java
View File

@@ -15,8 +15,8 @@ import org.springframework.security.web.authentication.AbstractProcessingFilter;
/**
* A simple portlet which prints out the contents of the current {@link org.springframework.security.context.SecurityContext}
*
* A simple portlet which prints out the contents of the current {@link org.springframework.security.context.SecurityContext}
*
* @author Luke Taylor
*/
public class SecurityContextPortlet extends GenericPortlet {
@@ -27,13 +27,13 @@ public class SecurityContextPortlet extends GenericPortlet {
out.println("<h2>Security Context Display Portlet</h2>");
out.println("<p>");
out.println(new Date());
out.println("<p>Current Session " + request.getPortletSession().getId() + "</p>");
out.println("<p>Current Session " + request.getPortletSession().getId() + "</p>");
out.println("</p>");
out.println("<p>The security context contains: " +
SecurityContextHolder.getContext().getAuthentication() +
"</p>");
Object lastException = request.getPortletSession().getAttribute(AbstractProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY, PortletSession.APPLICATION_SCOPE);
if (lastException != null) {
out.println("Last Exception: " + lastException);
}

8
samples/portlet/src/main/resources/portlet/securityContextPortlet.xml
View File

@@ -30,13 +30,13 @@
<bean id="defaultExceptionHandler" parent="defaultExceptionHandlerTemplate"/>
<bean id="portletContextIntegrationInterceptor" class="org.springframework.security.context.PortletSessionContextIntegrationInterceptor"/>
<bean id="portletContextIntegrationInterceptor" class="org.springframework.security.portlet.PortletSessionContextIntegrationInterceptor"/>
<bean id="portletAuthenticationInterceptor" class="org.springframework.security.ui.portlet.PortletProcessingInterceptor">
<bean id="portletAuthenticationInterceptor" class="org.springframework.security.portlet.PortletProcessingInterceptor">
<property name="authenticationDetailsSource">
<bean class="org.springframework.security.ui.portlet.PortletPreAuthenticatedAuthenticationDetailsSource">
<bean class="org.springframework.security.portlet.PortletPreAuthenticatedAuthenticationDetailsSource">
<property name="mappableRolesRetriever">
<bean class="org.springframework.security.authoritymapping.SimpleMappableAttributesRetriever">
<bean class="org.springframework.security.access.authoritymapping.SimpleMappableAttributesRetriever">
<property name="mappableAttributes">
<set>
<value>tomcat</value>

6
samples/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml
View File

@@ -52,7 +52,7 @@
<property name="userRoles2GrantedAuthoritiesMapper" ref="j2eeUserRoles2GrantedAuthoritiesMapper"/>
</bean>
<bean id="j2eeUserRoles2GrantedAuthoritiesMapper" class="org.springframework.security.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper">
<bean id="j2eeUserRoles2GrantedAuthoritiesMapper" class="org.springframework.security.access.authoritymapping.SimpleAttributes2GrantedAuthoritiesMapper">
<property name="convertAttributeToUpperCase" value="true"/>
</bean>
@@ -73,7 +73,7 @@
<property name="authenticationEntryPoint" ref="preAuthenticatedProcessingFilterEntryPoint"/>
</bean>
<bean id="httpRequestAccessDecisionManager" class="org.springframework.security.vote.AffirmativeBased">
<bean id="httpRequestAccessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
<property name="allowIfAllAbstainDecisions" value="false"/>
<property name="decisionVoters">
<list>
@@ -94,7 +94,7 @@
</property>
</bean>
<bean id="roleVoter" class="org.springframework.security.vote.RoleVoter"/>
<bean id="roleVoter" class="org.springframework.security.access.vote.RoleVoter"/>
<bean id="securityContextHolderAwareRequestFilter" class="org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestFilter">
<property name="wrapperClass" value="org.springframework.security.web.wrapper.SecurityContextHolderAwareRequestWrapper"/>

2
samples/runall.sh
View File

@@ -52,7 +52,7 @@ stop_jetty
cd ../cas
if [[ -e ./server/cas-server-webapp-3.2.1.war ]]
if [[ -e ./server/cas-server-webapp-3.3.1.war ]]
then
echo "Found cas server war. Running cas sample"
cd server

2
samples/tutorial/src/main/java/bigbank/BankService.java
View File

@@ -1,6 +1,6 @@
package bigbank;
import org.springframework.security.expression.annotation.PreAuthorize;
import org.springframework.security.access.expression.annotation.PreAuthorize;
public interface BankService {