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 V3.2 to HEAD

Browse Source 
15579: Merged V3.1 to V3.2
      14048: Fixed ETHREEOH-1612: Unable to modify the 'guest' username(s)
      14093: Build/test fix - fallout from recent guest changes
   15581: Removed reference to 'alfresco.messages.portlets' resource bundle
   15582: Fixed merge errors after guest user changes
   15583: Merged V3.1 to V3.2
      14049: Minor addition to ETHREEOH-1612 fix: Guest and Admin usernames should not be changed AFTER INSTALLATION
      14060: Handle null username in calls to authenticate
      14086: Removed references to non-existent GROUP_ALFRESCO_GUESTS.
   15584: Merged V3.1 to V3.2
      14103: Build/test fix - fallout from recent guest changes (revert previous change + move makeHomeFolderIfRequired out of getPersonOrNull)
   15585: Merged V3.1 to V3.2
      14110: Build/test fix (CMISTest) - fallout from recent guest changes (test server ctx must be init'ed before calling runAs)
      14166: Fixed ETHREEOH-2016: Usernames with domain-name separators lead to "bad filename" errors
      14184: *RECORD ONLY* Fixed ETHREEOH-2018: NTLM SSO fails with NPE
      14495: *RECORD ONLY*
      14511: *RECORD ONLY*
      14516: ETHREEOH-2162 (DB2 script key rename)
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.0:r14494
   Merged /alfresco/BRANCHES/V3.1:r14048-14049,14060,14086,14093,14103,14110,14166,14184,14495,14511,14516
   Merged /alfresco/BRANCHES/V3.2:r15579,15581-15585


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16859 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-10-13 11:51:40 +00:00
parent 2eeefe0a72
commit 69249332d3
38 changed files with 472 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/java/org/alfresco/repo/admin/patch/impl/CategoryRootPermissionPatch.java
View File

@@ -29,12 +29,10 @@ import java.util.List;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.admin.PatchException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.NamespaceService;
/**
* Grant <b>Consumer</b> role to <b>Guest</b> in <b>Category Root</b> folder.
@@ -48,9 +46,6 @@ public class CategoryRootPermissionPatch extends AbstractPatch
private PermissionService permissionService;
private ImporterBootstrap spacesBootstrap;
private SearchService searchService;
private NamespaceService namespaceService;
private NodeService nodeService;
public void setPermissionService(PermissionService permissionService)
@@ -63,22 +58,6 @@ public class CategoryRootPermissionPatch extends AbstractPatch
this.spacesBootstrap = spacesBootstrap;
}
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
public void setSearchService(SearchService searchService)
{
this.searchService = searchService;
}
public void setNamespaceService(NamespaceService namespaceService)
{
this.namespaceService = namespaceService;
}
@Override
protected String applyInternal() throws Exception
{
@@ -95,7 +74,11 @@ public class CategoryRootPermissionPatch extends AbstractPatch
NodeRef categoryRootRef = nodeRefs.get(0);
// apply permission
permissionService.setPermission(categoryRootRef, PermissionService.GUEST_AUTHORITY, PermissionService.READ, true);
permissionService.setPermission(
categoryRootRef,
AuthenticationUtil.getGuestUserName(),
PermissionService.READ,
true);
// done
String msg = I18NUtil.getMessage(MSG_RESULT, categoryRootPath);

9
source/java/org/alfresco/repo/admin/patch/impl/GuestPersonPermissionPatch.java
View File

@@ -26,6 +26,7 @@ package org.alfresco.repo.admin.patch.impl;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.security.PersonService;
@@ -43,18 +44,11 @@ public class GuestPersonPermissionPatch extends AbstractPatch
private PermissionService permissionService;
private String guestId = "guest";
public GuestPersonPermissionPatch()
{
super();
}
public void setGuestId(String guestId)
{
this.guestId = guestId;
}
public void setPermissionService(PermissionService permissionService)
{
this.permissionService = permissionService;
@@ -68,6 +62,7 @@ public class GuestPersonPermissionPatch extends AbstractPatch
@Override
protected String applyInternal() throws Exception
{
String guestId = AuthenticationUtil.getGuestUserName();
if (personService.personExists(guestId))
{
NodeRef personRef = personService.getPerson(guestId);

9
source/java/org/alfresco/repo/admin/patch/impl/GuestPersonPermissionPatch2.java
View File

@@ -26,6 +26,7 @@ package org.alfresco.repo.admin.patch.impl;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.security.PersonService;
@@ -43,18 +44,11 @@ public class GuestPersonPermissionPatch2 extends AbstractPatch
private PermissionService permissionService;
private String guestId = "guest";
public GuestPersonPermissionPatch2()
{
super();
}
public void setGuestId(String guestId)
{
this.guestId = guestId;
}
public void setPermissionService(PermissionService permissionService)
{
this.permissionService = permissionService;
@@ -68,6 +62,7 @@ public class GuestPersonPermissionPatch2 extends AbstractPatch
@Override
protected String applyInternal() throws Exception
{
String guestId = AuthenticationUtil.getGuestUserName();
if (personService.personExists(guestId))
{
NodeRef personRef = personService.getPerson(guestId);

34
source/java/org/alfresco/repo/admin/patch/impl/GuestUserPatch.java
View File

@@ -34,15 +34,13 @@ import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.admin.PatchException;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.springframework.context.MessageSource;
@@ -66,18 +64,10 @@ public class GuestUserPatch extends AbstractPatch
private PersonService personService;
private NodeService nodeService;
private SearchService searchService;
private PermissionService permissionService;
private ImporterBootstrap importerBootstrap;
private NamespaceService namespaceService;
private String guestId = "guest";
private MessageSource messageSource;
public GuestUserPatch()
@@ -85,26 +75,11 @@ public class GuestUserPatch extends AbstractPatch
super();
}
public void setGuestId(String guestId)
{
this.guestId = guestId;
}
public void setImporterBootstrap(ImporterBootstrap importerBootstrap)
{
this.importerBootstrap = importerBootstrap;
}
public void setNamespaceService(NamespaceService namespaceService)
{
this.namespaceService = namespaceService;
}
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
public void setPermissionService(PermissionService permissionService)
{
this.permissionService = permissionService;
@@ -115,11 +90,6 @@ public class GuestUserPatch extends AbstractPatch
this.personService = personService;
}
public void setSearchService(SearchService searchService)
{
this.searchService = searchService;
}
public void setMessageSource(MessageSource messageSource)
{
this.messageSource = messageSource;
@@ -169,6 +139,7 @@ public class GuestUserPatch extends AbstractPatch
private void addGuestUser(NodeRef guestHomeRef)
{
String guestId = AuthenticationUtil.getGuestUserName();
if (!personService.personExists(guestId))
{
HashMap<QName, Serializable> properties = new HashMap<QName, Serializable>();
@@ -245,6 +216,7 @@ public class GuestUserPatch extends AbstractPatch
private void setGuestHomePermissions(NodeRef nodeRef)
{
String guestId = AuthenticationUtil.getGuestUserName();
permissionService.setInheritParentPermissions(nodeRef, false);
permissionService.setPermission(nodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.CONSUMER, true);
permissionService.setPermission(nodeRef, guestId, PermissionService.CONSUMER, true);

8
source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ACPImportPackageHandler;
import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.admin.PatchException;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -231,7 +232,7 @@ public class RSSTemplatesFolderPatch extends AbstractPatch
// apply Guest permission to the folder
permissionService.setPermission(
rssFolderNodeRef,
PermissionService.GUEST_AUTHORITY,
AuthenticationUtil.getGuestUserName(),
PermissionService.CONSUMER,
true);
@@ -244,6 +245,11 @@ public class RSSTemplatesFolderPatch extends AbstractPatch
else
{
// it already exists
permissionService.setPermission(
rssFolderNodeRef,
AuthenticationUtil.getGuestUserName(),
PermissionService.CONSUMER,
true);
msg = I18NUtil.getMessage(MSG_EXISTS, rssFolderNodeRef);
}
// done

5
source/java/org/alfresco/repo/admin/patch/impl/SpacesStoreGuestPermissionPatch.java
View File

@@ -30,6 +30,7 @@ import org.alfresco.i18n.I18NUtil;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.admin.PatchException;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -89,7 +90,7 @@ public class SpacesStoreGuestPermissionPatch extends AbstractPatch
logger.debug("Store Ref:" + store + " NodeRef: " + rootRef);
}
permissionService.setPermission(
rootRef, PermissionService.GUEST_AUTHORITY, PermissionService.READ, true);
rootRef, AuthenticationUtil.getGuestUserName(), PermissionService.READ, true);
String sysQName = importerBootstrap.getConfiguration().getProperty("system.system_container.childname");
String catQName = "cm:categoryRoot";
@@ -107,7 +108,7 @@ public class SpacesStoreGuestPermissionPatch extends AbstractPatch
else if (ref.getQName().equals(QName.createQName(catQName, namespaceService)))
{
// found cm:categoryRoot node
permissionService.clearPermission(ref.getChildRef(), PermissionService.GUEST_AUTHORITY);
permissionService.clearPermission(ref.getChildRef(), AuthenticationUtil.getGuestUserName());
}
}