inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-991: Failed to applay patch AVMToADMRemoteStorePatch during upgrade from 3.4.13 to 4.2.0 with RM on Postgres

Browse Source 
* removed overriden rule service method level security



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@56108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-09-27 14:57:51 +00:00
parent 06625fb26f
commit 3e79550acb
3 changed files with 40 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
View File

@@ -3,6 +3,30 @@
<beans> <beans>
<!-- AVM Remote Store to ADM Remote Store migration patch -->
<!-- <bean id="patch.avmToAdmRemoteStore" class="org.alfresco.repo.admin.patch.impl.AVMToADMRemoteStorePatch" parent="basePatch">
<property name="id"><value>patch.avmToAdmRemoteStore</value></property>
<property name="description"><value>patch.avmToAdmRemoteStore.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>5011</value></property>
<property name="targetSchema"><value>5012</value></property>
<property name="requiresTransaction"><value>false</value></property>
<property name="fileFolderService" ref="fileFolderService" />
<property name="contentService" ref="contentService" />
<property name="siteService" ref="SiteService" />
<property name="ruleService" ref="ruleService" />
<property name="avmService" ref="AVMService" />
<property name="hiddenAspect" ref="hiddenAspect" />
<property name="avmStore"><value>sitestore</value></property>
<property name="avmRootPath"><value>/alfresco/site-data</value></property>
<property name="dependsOn" >
<list>
<ref bean="patch.migrateTenantsFromAttrsToTable" />
<ref bean="patch.migrateAttrTenants" />
</list>
</property>
</bean> -->
<bean id="ExtendedPermissionService" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="ExtendedPermissionService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"> <property name="proxyInterfaces">
<value>org.alfresco.repo.security.permissions.impl.ExtendedPermissionService</value> <value>org.alfresco.repo.security.permissions.impl.ExtendedPermissionService</value>
@@ -204,40 +228,6 @@
</bean> </bean>
<bean id="RuleService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
<property name="authenticationManager"><ref bean="authenticationManager"/></property>
<property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
<property name="afterInvocationManager"><ref bean="afterInvocationManager"/></property>
<property name="objectDefinitionSource">
<value>
org.alfresco.service.cmr.rule.RuleService.getRuleTypes=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.getRuleType=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.enableRules=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.disableRules=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.isEnabled=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.rulesEnabled=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.disableRule=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.enableRule=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.disableRuleType=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.enableRuleType=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.isRuleTypeEnabled=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.hasRules=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.getRules=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.countRules=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.getRule=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.saveRule=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.setRulePosition=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.removeRule=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.removeAllRules=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.getOwningNodeRef=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.isLinkedToRuleNode=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.getLinkedToRuleNode=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.getLinkedFromRuleNodes=ACL_ALLOW
org.alfresco.service.cmr.rule.RuleService.*=ACL_DENY
</value>
</property>
</bean>
<bean id="FormService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor"> <bean id="FormService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
<property name="authenticationManager"><ref bean="authenticationManager"/></property> <property name="authenticationManager"><ref bean="authenticationManager"/></property>
<property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property> <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>

37
rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
View File

@@ -181,33 +181,6 @@ rm.methodsecurity.org.alfresco.service.cmr.security.PermissionService.getInherit
rm.methodsecurity.org.alfresco.service.cmr.security.PermissionService.clearPermission=RM.Capability.0 rm.methodsecurity.org.alfresco.service.cmr.security.PermissionService.clearPermission=RM.Capability.0
rm.methodsecurity.org.alfresco.service.cmr.security.PermissionService.*=RM_DENY rm.methodsecurity.org.alfresco.service.cmr.security.PermissionService.*=RM_DENY
## Rule Service
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.getRuleTypes=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.getRuleType=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.enableRules=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.disableRules=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.isEnabled=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.rulesEnabled=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.disableRule=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.enableRule=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.disableRuleType=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.enableRuleType=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.isRuleTypeEnabled=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.hasRules=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.getRules=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.countRules=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.getRule=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.saveRule=RM_CAP.0.rma:filePlanComponent.ManageRules
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.setRulePosition=RM_CAP.0.rma:filePlanComponent.ManageRules
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.removeRule=RM_CAP.0.rma:filePlanComponent.ManageRules
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.removeAllRules=RM_CAP.0.rma:filePlanComponent.ManageRules
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.getOwningNodeRef=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.isLinkedToRuleNode=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.getLinkedToRuleNode=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.getLinkedFromRuleNodes=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.rule.RuleService.*=RM_DENY
## Site service ## Site service
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.cleanSitePermissions=RM.Read.0 rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.cleanSitePermissions=RM.Read.0
@@ -232,7 +205,15 @@ rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.listSites=RM_ALLOW,A
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.removeMembership=RM_ALLOW rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.removeMembership=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.setMembership=RM_ALLOW rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.setMembership=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.updateSite=RM_ALLOW rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.updateSite=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.*=RM_DENY rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.listMembersPaged=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.listContainers=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.countAuthoritiesWithRole=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.resolveSite=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.hasSite=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.listSitesPaged=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.getSiteShortName=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.canAddMember=RM_ALLOW
rm.methodsecurity.org.alfresco.service.cmr.site.SiteService.*=RM_ALLOW
## Form Service ## Form Service

9
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java
View File

@@ -93,9 +93,12 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
BeanDefinition beanDef = beanFactory.getBeanDefinition(bean); BeanDefinition beanDef = beanFactory.getBeanDefinition(bean);
PropertyValue beanValue = beanDef.getPropertyValues().getPropertyValue(PROP_OBJECT_DEFINITION_SOURCE); PropertyValue beanValue = beanDef.getPropertyValues().getPropertyValue(PROP_OBJECT_DEFINITION_SOURCE);
String beanStringValue = (String)((TypedStringValue)beanValue.getValue()).getValue(); if (beanValue != null)
String mergedStringValue = merge(beanStringValue); {
beanDef.getPropertyValues().addPropertyValue(PROP_OBJECT_DEFINITION_SOURCE, new TypedStringValue(mergedStringValue)); String beanStringValue = (String)((TypedStringValue)beanValue.getValue()).getValue();
String mergedStringValue = merge(beanStringValue);
beanDef.getPropertyValues().addPropertyValue(PROP_OBJECT_DEFINITION_SOURCE, new TypedStringValue(mergedStringValue));
}
} }
} }
} }