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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
93992: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93945: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93895: MNT-12873: Merged V4.2.3 (4.2.3.16) to V4.2-BUG-FIX(4.2.5)
            93552 :Merged DEV to V4.2.3 (4.2.3.16)
               93524: MNT-13156: CLONE - Introduction of SiteRole in 4.2.x breaks sites API when there is a custom role defined
                  - Implement site role as String instead of enumeration to allow custom roles. Add CustomRoleTest Unit Test. In SitesImpl convert UnknownAuthorityException into InvalidArgumentException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 15:29:20 +00:00
parent 35771b4879
commit f1ebfb963f
7 changed files with 187 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/repo/site/SiteMembersCannedQuery.java
View File

@@ -36,7 +36,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteRole;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteService.SiteMembersCallback;
import org.alfresco.util.Pair;
@@ -113,7 +112,7 @@ public class SiteMembersCannedQuery extends AbstractCannedQuery<SiteMembership>
lastName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_LASTNAME);
}
SiteMembership siteMember = new SiteMembership(siteInfo, authority, firstName, lastName, SiteRole.valueOf(permission));
SiteMembership siteMember = new SiteMembership(siteInfo, authority, firstName, lastName, permission);
siteMembers.add(siteMember);
}
@@ -229,8 +228,8 @@ public class SiteMembersCannedQuery extends AbstractCannedQuery<SiteMembership>
String firstName2 = o2.getFirstName();
String lastName1 = o1.getLastName();
String lastName2 = o2.getLastName();
SiteRole siteRole1 = o1.getRole();
SiteRole siteRole2 = o2.getRole();
String siteRole1 = o1.getRole();
String siteRole2 = o2.getRole();
int personId = safeCompare(personId1, personId2);
int firstName = safeCompare(firstName1, firstName2);

8
source/java/org/alfresco/repo/site/SiteMembership.java
View File

@@ -33,9 +33,9 @@ public class SiteMembership
private String personId;
private String firstName;
private String lastName;
private SiteRole role;
private String role;
public SiteMembership(SiteInfo siteInfo, String personId, String firstName, String lastName, SiteRole role)
public SiteMembership(SiteInfo siteInfo, String personId, String firstName, String lastName, String role)
{
super();
if(siteInfo == null)
@@ -65,7 +65,7 @@ public class SiteMembership
this.role = role;
}
public SiteMembership(SiteInfo siteInfo, String personId, SiteRole role)
public SiteMembership(SiteInfo siteInfo, String personId, String role)
{
super();
if(siteInfo == null)
@@ -106,7 +106,7 @@ public class SiteMembership
return lastName;
}
public SiteRole getRole()
public String getRole()
{
return role;
}

6
source/java/org/alfresco/repo/site/SitesCannedQuery.java
View File

@@ -108,7 +108,7 @@ public class SitesCannedQuery extends AbstractCannedQuery<SiteMembership>
String role = siteService.getMembersRole(siteName, userName);
if (role != null)
{
siteMembers.add(new SiteMembership(siteInfo, authority, SiteRole.valueOf(role)));
siteMembers.add(new SiteMembership(siteInfo, authority, role));
}
}
}
@@ -219,8 +219,8 @@ public class SitesCannedQuery extends AbstractCannedQuery<SiteMembership>
String firstName2 = o2.getFirstName();
String lastName1 = o1.getLastName();
String lastName2 = o2.getLastName();
SiteRole siteRole1 = o1.getRole();
SiteRole siteRole2 = o2.getRole();
String siteRole1 = o1.getRole();
String siteRole2 = o2.getRole();
String siteTitle1 = siteInfo1.getTitle();
String siteTitle2 = siteInfo2.getTitle();

8
source/test-java/org/alfresco/repo/forum/CommentsTest.java
View File

@@ -41,6 +41,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.PermissionReference;
import org.alfresco.repo.security.permissions.impl.ModelDAO;
import org.alfresco.repo.security.permissions.impl.PermissionServiceImpl;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
@@ -53,7 +54,6 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteRole;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.NamespaceService;
@@ -179,10 +179,10 @@ public class CommentsTest
authenticationComponent.setCurrentUser(USER_ONE_NAME);
// invite user to a site with 'Collaborator' role
siteService.setMembership(testSite.getShortName(), userTwo, SiteRole.SiteCollaborator.toString());
siteService.setMembership(testSite.getShortName(), userTwo, SiteModel.SITE_COLLABORATOR);
assertEquals(SiteRole.SiteManager.toString(), siteService.getMembersRole(testSite.getShortName(), USER_ONE_NAME));
assertEquals(SiteRole.SiteCollaborator.toString(), siteService.getMembersRole(testSite.getShortName(), userTwo));
assertEquals(SiteModel.SITE_MANAGER, siteService.getMembersRole(testSite.getShortName(), USER_ONE_NAME));
assertEquals(SiteModel.SITE_COLLABORATOR, siteService.getMembersRole(testSite.getShortName(), userTwo));
// get container of site
NodeRef doclib = siteService.getContainer(testSite.getShortName(), SiteService.DOCUMENT_LIBRARY);

122
source/test-java/org/alfresco/repo/site/CustomRoleTest.java Executable file
View File

@@ -0,0 +1,122 @@
/*
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.site;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.alfresco.model.ContentModel;
import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.BaseAlfrescoSpringTest;
import org.alfresco.util.Pair;
import org.alfresco.util.PropertyMap;
/**
* Test custom role for a Site. Based on MNT-12873
*
* @author Alex Bykov
*/
public class CustomRoleTest extends BaseAlfrescoSpringTest
{
private static final String USER_ONE = "UserOne_CustomRoleTest";
private static final String USER_TWO = "UserTwo_CustomRoleTest";
private SiteService siteService;
private PersonService personService;
@SuppressWarnings("deprecation")
protected void onSetUpInTransaction() throws Exception
{
super.onSetUpInTransaction();
// Get the required services
this.authenticationComponent = (AuthenticationComponent) this.applicationContext.getBean("authenticationComponent");
this.siteService = (SiteService) this.applicationContext.getBean("SiteService");
this.personService = (PersonService) this.applicationContext.getBean("PersonService");
// Create the test users
createUser(USER_ONE, "UserOne");
createUser(USER_TWO, "UserTwo");
// Set the current authentication
this.authenticationComponent.setCurrentUser(USER_ONE);
}
// MNT-12873
public void testCustomRole()
{
try
{
// Create a site
siteService.createSite("customrolessite", "customrolessite", "Test custom role", "Test custom role", SiteVisibility.PUBLIC);
this.siteService.setMembership("customrolessite", USER_TWO, "SiteCoordinator");
// Get the members of the site
final List<Pair<SiteService.SortFields, Boolean>> sort = new ArrayList<Pair<SiteService.SortFields, Boolean>>();
sort.add(new Pair<SiteService.SortFields, Boolean>(SiteService.SortFields.SiteTitle, Boolean.TRUE));
sort.add(new Pair<SiteService.SortFields, Boolean>(SiteService.SortFields.Role, Boolean.TRUE));
PagingResults<SiteMembership> sites = siteService.listSitesPaged(USER_TWO, sort, new PagingRequest(0, 100));
assertNotNull(sites);
assertEquals(sites.getPage().size(), 1);
}
catch (Exception ex)
{
fail("Custom role breaks sites API. Take a look on MNT-12873\n" + ex.getMessage());
}
}
@Override
protected String[] getConfigLocations()
{
String[] existingConfigLocations = ApplicationContextHelper.CONFIG_LOCATIONS;
List<String> locations = Arrays.asList(existingConfigLocations);
List<String> mutableLocationsList = new ArrayList<String>(locations);
mutableLocationsList.add("classpath:org/alfresco/repo/site/site-custom-context.xml");
String[] result = mutableLocationsList.toArray(new String[mutableLocationsList.size()]);
return result;
}
private void createUser(String userName, String nameSuffix)
{
if (this.authenticationService.authenticationExists(userName) == false)
{
this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
PropertyMap ppOne = new PropertyMap(4);
ppOne.put(ContentModel.PROP_USERNAME, userName);
ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName" + nameSuffix);
ppOne.put(ContentModel.PROP_LASTNAME, "lastName" + nameSuffix);
ppOne.put(ContentModel.PROP_EMAIL, "email" + nameSuffix + "@email.com");
ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
this.personService.createPerson(ppOne);
}
}
}

10
source/test-resources/org/alfresco/repo/site/site-custom-context.xml Executable file
View File

@@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- Bootstrap the permission model -->
<bean id="siteService_permissionBootstrap" parent="permissionModelBootstrap">
<property name="model" value="org/alfresco/repo/site/sitePermissionDefinitionsWithCustomRole.xml"/>
</bean>
</beans>

41
source/test-resources/org/alfresco/repo/site/sitePermissionDefinitionsWithCustomRole.xml Executable file
View File

@@ -0,0 +1,41 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE permissions >
<permissions>
<!-- Namespaces used in type references -->
<namespaces>
<namespace uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
<namespace uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
<namespace uri="http://www.alfresco.org/model/site/1.0" prefix="st"/>
</namespaces>
<!-- ============================================ -->
<!-- Permissions specific to the wiki integration -->
<!-- ============================================ -->
<permissionSet type="st:site" expose="selected">
<permissionGroup name="SiteManager" allowFullControl="true" expose="true" />
<permissionGroup name="SiteCollaborator" allowFullControl="false" expose="true">
<includePermissionGroup permissionGroup="Collaborator" type="cm:cmobject" />
</permissionGroup>
<permissionGroup name="SiteContributor" allowFullControl="false" expose="true">
<includePermissionGroup permissionGroup="Contributor" type="cm:cmobject" />
</permissionGroup>
<permissionGroup name="SiteConsumer" allowFullControl="false" expose="true">
<includePermissionGroup permissionGroup="Consumer" type="cm:cmobject" />
<includePermissionGroup permissionGroup="ReadPermissions" type="sys:base" />
</permissionGroup>
<permissionGroup name="SiteCoordinator" allowFullControl="false" expose="true">
<includePermissionGroup permissionGroup="Coordinator" type="cm:cmobject" />
</permissionGroup>
</permissionSet>
</permissions>