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

Fixed ALF-3884: Share does not report access denied exceptions correctly

Browse Source 
- Restored error 'Access Denied. The system is currently in read-only mode.'
 - Share does not respect a read-only system at all ... raising


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22343 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-09-08 15:18:53 +00:00
parent 8143ba5440
commit 273e3bbcd4
3 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
View File

@@ -79,6 +79,7 @@ import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.NodeRef.Status;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.ReadOnlyServerException;
import org.alfresco.util.EqualsHelper;
import org.alfresco.util.GUID;
import org.alfresco.util.Pair;
@@ -530,7 +531,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
// Check that this is a writable txn
if (AlfrescoTransactionSupport.getTransactionReadState() != TxnReadState.TXN_READ_WRITE)
{
throw new IllegalStateException("Transaction entries can only be created for writable transactions");
throw new ReadOnlyServerException();
}
// Have to create a new transaction entry
Long serverId = getServerId();

10
source/java/org/alfresco/repo/security/permissions/impl/ExceptionTranslatorMethodInterceptor.java
View File

@@ -19,6 +19,7 @@
package org.alfresco.repo.security.permissions.impl;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.service.transaction.ReadOnlyServerException;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -30,7 +31,6 @@ import org.springframework.dao.TransientDataAccessResourceException;
public class ExceptionTranslatorMethodInterceptor implements MethodInterceptor
{
private static final String MSG_ACCESS_DENIED = "permissions.err_access_denied";
private static final String MSG_READ_ONLY = "permissions.err_read_only";
public ExceptionTranslatorMethodInterceptor()
{
@@ -47,15 +47,19 @@ public class ExceptionTranslatorMethodInterceptor implements MethodInterceptor
{
throw new AccessDeniedException(MSG_ACCESS_DENIED, ade);
}
catch (ReadOnlyServerException e)
{
throw new AccessDeniedException(ReadOnlyServerException.MSG_READ_ONLY, e);
}
catch (TransientDataAccessResourceException e)
{
// this usually occurs when the server is in read-only mode
throw new AccessDeniedException(MSG_READ_ONLY, e);
throw new AccessDeniedException(ReadOnlyServerException.MSG_READ_ONLY, e);
}
catch (InvalidDataAccessApiUsageException e)
{
// this usually occurs when the server is in read-only mode
throw new AccessDeniedException(MSG_READ_ONLY, e);
throw new AccessDeniedException(ReadOnlyServerException.MSG_READ_ONLY, e);
}
}
}