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

Merge 3.2 to HEAD:

Browse Source 
17443: Port fix for cannot delete file via CIFS that has a thumbnail associated with it. ETHREEOH-3143 and ETHREEOH-3115.
          Port fix for CIFS/Kerberos/SPNEGO logon problem with Win2008/Win7 client. ETHREEOH-3225.
   17444: Update svn:mergeinfo (Record-only)
   17512: Fix for no sites in AVM folder via CIFS/FTP when Kerberos auth enabled. ETHREEOH-3080.
   17849: Re-use open files for the same session/process id. Port of ETWOTWO-1250.
   17853: Rewrite the rename file logic to handle MS Office file rename patterns. Port of ETHREEOH-1951.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2010-01-25 13:18:15 +00:00
parent 999609e17c
commit 9436fbb567
5 changed files with 427 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/filesys/avm/AVMDiskDriver.java
View File

@@ -2434,7 +2434,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
webProjName = props.get( SandboxConstants.PROP_WEBSITE_NAME).getStringValue();
// Get the user name from teh store name
// Get the user name from the store name
userName = storeName.substring( webProjName.length() + 2);
}
@@ -2873,6 +2873,8 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
if ( pseudoFolder != null)
{
// Check if the pseudo folder is a web project folder or sandbox within a web project
String curUserName = m_authComponent.getCurrentUserName();
if ( pseudoFolder instanceof WebProjectStorePseudoFile)
{
@@ -2880,22 +2882,37 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
WebProjectStorePseudoFile webFolder = (WebProjectStorePseudoFile) pseudoFolder;
int role = webFolder.getUserRole( cInfo.getUserName());
int role = webFolder.getUserRole( curUserName);
if ( role == WebProjectStorePseudoFile.RoleNone)
{
// DEBUG
if ( logger.isDebugEnabled())
logger.debug("User " + curUserName + " has no access to web project, " + webFolder.getFileName());
// User does not have access to this web project
throw new AccessDeniedException("User " + cInfo.getUserName() + " has no access to web project, " + webFolder.getFileName());
throw new AccessDeniedException("User " + curUserName + " has no access to web project, " + webFolder.getFileName());
}
else if ( avmCtx.allowAdminStagingWrites() && cInfo.isAdministrator())
{
// DEBUG
if ( logger.isDebugEnabled())
logger.debug("User " + curUserName + " granted write access to web project, " + webFolder.getFileName());
// Allow admin write access
avmPath.setReadOnlyAccess( false);
}
else
{
// DEBUG
if ( logger.isDebugEnabled())
logger.debug("User " + curUserName + " granted read-only access to web project, " + webFolder.getFileName());
// Only allow read-only access to the staging area
avmPath.setReadOnlyAccess( true);
@@ -2914,20 +2931,20 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
WebProjectStorePseudoFile webFolder = (WebProjectStorePseudoFile) rootState.getPseudoFileList().findFile( storeFolder.getWebProject(), false);
int role = webFolder.getUserRole( cInfo.getUserName());
int role = webFolder.getUserRole( curUserName);
if ( role == WebProjectStorePseudoFile.RoleNone)
{
// User does not have access to this web project
throw new AccessDeniedException("User " + cInfo.getUserName() + " has no access to web project, " + webFolder.getFileName() + "/" + storeFolder.getFileName());
throw new AccessDeniedException("User " + curUserName + " has no access to web project, " + webFolder.getFileName() + "/" + storeFolder.getFileName());
}
else if ( role == WebProjectStorePseudoFile.RolePublisher &&
storeFolder.getUserName().equalsIgnoreCase( cInfo.getUserName()) == false)
storeFolder.getUserName().equalsIgnoreCase( curUserName) == false)
{
// User does not have access to this web project
throw new AccessDeniedException("User " + cInfo.getUserName() + " has no access to web project, " + webFolder.getFileName() + "/" + storeFolder.getFileName());
throw new AccessDeniedException("User " + curUserName + " has no access to web project, " + webFolder.getFileName() + "/" + storeFolder.getFileName());
}
}
}
@@ -2971,12 +2988,13 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
// Check for the admin user, no need to filter the list
PseudoFileList fullList = fstate.getPseudoFileList();
if ( cInfo.getUserName().equalsIgnoreCase( m_authComponent.getSystemUserName()))
if ( cInfo.isAdministrator())
return fullList;
// Create a filtered list of store pseudo folders that the user has access to
PseudoFileList filterList = new PseudoFileList();
String userName = m_authComponent.getCurrentUserName();
for ( int i = 0; i < fullList.numberOfFiles(); i++)
{
@@ -2992,7 +3010,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
WebProjectStorePseudoFile webFolder = (WebProjectStorePseudoFile) pseudoFolder;
if ( avmCtx.showStagingStores() && webFolder.getUserRole( cInfo.getUserName()) != WebProjectStorePseudoFile.RoleNone)
if ( avmCtx.showStagingStores() && webFolder.getUserRole( userName) != WebProjectStorePseudoFile.RoleNone)
{
// User has access to this store
@@ -3015,7 +3033,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
WebProjectStorePseudoFile webFolder = (WebProjectStorePseudoFile) fullList.findFile( storeFolder.getWebProject(), false);
if ( webFolder != null) {
int role = webFolder.getUserRole( cInfo.getUserName());
int role = webFolder.getUserRole( userName);
if ( role == WebProjectStorePseudoFile.RoleContentManager && avmCtx.showStoreType( storeFolder.isStoreType()))
{
@@ -3027,7 +3045,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
{
// Allow access if the user owns the current folder
if ( storeFolder.getUserName().equalsIgnoreCase( cInfo.getUserName()))
if ( storeFolder.getUserName().equalsIgnoreCase( userName))
filterList.addFile( storeFolder);
}
}