inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
120082 bhorje: ACE-4845 added definition retrieval transaction enforcement and denial of unauthenticated virtualization


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andreea Dragoi
2015-12-15 14:28:20 +00:00
parent 502d394f94
commit 884bb19489
5 changed files with 228 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/virtual/AlfrescoEnviroment.java
View File

@@ -29,7 +29,6 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.jscript.ClasspathScriptLocation;
import org.alfresco.repo.model.Repository;
import org.alfresco.repo.virtual.config.NodeRefResolver;
import org.alfresco.repo.virtual.ref.Reference;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.dictionary.InvalidAspectException;
import org.alfresco.service.cmr.dictionary.InvalidTypeException;
@@ -79,6 +78,11 @@ public class AlfrescoEnviroment implements ActualEnvironment
this.serviceRegistry = serviceRegistry;
}
public ServiceRegistry getServiceRegistry()
{
return this.serviceRegistry;
}
public void setRepositoryHelper(Repository repository)
{
this.repositoryHelper = repository;

26
source/java/org/alfresco/repo/virtual/ref/Reference.java
View File

@@ -136,23 +136,23 @@ public class Reference
}
}
// Average reference length DEBUG trace
// Average reference length log trace
private static long _debug_refLength = 0;
private static long _trace_refLength = 0;
private static long _debug_refCount = 0;
private static long _trace_refCount = 0;
private static final long _debug_refBatchSize = 256;
private static final long _trace_refBatchSize = 4096*2;
private static synchronized void debug_avg_ref_length(long refLength)
private static synchronized void _trace_avg_ref_length(long refLength)
{
_debug_refLength += refLength;
_debug_refCount++;
if (_debug_refBatchSize > 0 && _debug_refCount % _debug_refBatchSize == 0)
_trace_refLength += refLength;
_trace_refCount++;
if (_trace_refBatchSize > 0 && _trace_refCount % _trace_refBatchSize == 0)
{
logger.debug("Average reference encoding size : " + (_debug_refLength / _debug_refCount));
_debug_refCount = 0;
_debug_refLength = 0;
logger.trace("Average reference encoding size : " + (_trace_refLength / _trace_refCount));
_trace_refCount = 0;
_trace_refLength = 0;
}
}
@@ -281,9 +281,9 @@ public class Reference
NodeRef theNode = new NodeRef(storeRef,
idBuilder.toString());
if (logger.isDebugEnabled())
if (logger.isTraceEnabled())
{
debug_avg_ref_length(theNode.toString().length());
_trace_avg_ref_length(theNode.toString().length());
}
return theNode;

73
source/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
View File

@@ -38,8 +38,11 @@ import org.alfresco.query.PagingResults;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.NodePermissionEntry;
import org.alfresco.repo.security.permissions.PermissionReference;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.repo.transaction.TransactionalResourceHelper;
import org.alfresco.repo.virtual.ActualEnvironment;
import org.alfresco.repo.virtual.AlfrescoEnviroment;
import org.alfresco.repo.virtual.VirtualContentModel;
import org.alfresco.repo.virtual.VirtualizationException;
import org.alfresco.repo.virtual.page.PageCollationException;
@@ -68,6 +71,7 @@ import org.alfresco.repo.virtual.template.PropertyValueConstraint;
import org.alfresco.repo.virtual.template.VirtualFolderDefinition;
import org.alfresco.repo.virtual.template.VirtualQuery;
import org.alfresco.repo.virtual.template.VirtualQueryConstraint;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -82,9 +86,13 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.QNamePattern;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.util.Pair;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionResolver
{
private static Log logger = LogFactory.getLog(VirtualStoreImpl.class);
private static final String VIRTUAL_FOLDER_DEFINITION = "virtualfolder.definition";
private List<VirtualizationMethod> virtualizationMethods = null;
@@ -121,6 +129,20 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
@Override
public boolean canVirtualize(NodeRef nodeRef) throws VirtualizationException
{
String runAsUser = AuthenticationUtil.getRunAsUser();
if (runAsUser == null)
{
if (logger.isTraceEnabled())
{
RuntimeException stackTracingException = new RuntimeException("Stack trace.");
logger.trace("Virtualization check call in unauthenticated-context - stack trace follows:",
stackTracingException);
}
return false;
}
if (Reference.isReference(nodeRef))
{
return true;
@@ -156,8 +178,8 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
}
}
private NodeRef nodeProtocolNodeRef(NodeRef nodeRef)
throws ProtocolMethodException, ReferenceParseException, ReferenceEncodingException
private NodeRef nodeProtocolNodeRef(NodeRef nodeRef) throws ProtocolMethodException, ReferenceParseException,
ReferenceEncodingException
{
NodeRef theNodeRef = nodeRef;
if (Reference.isReference(nodeRef))
@@ -373,23 +395,40 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
return childReferences;
}
public VirtualFolderDefinition resolveVirtualFolderDefinition(Reference reference) throws ProtocolMethodException
public VirtualFolderDefinition resolveVirtualFolderDefinition(final Reference reference)
throws VirtualizationException
{
NodeRef key = reference.toNodeRef();
Map<NodeRef, VirtualFolderDefinition> definitionsCache = TransactionalResourceHelper
.getMap(VIRTUAL_FOLDER_DEFINITION);
ServiceRegistry serviceRegistry = ((AlfrescoEnviroment) environment).getServiceRegistry();
RetryingTransactionHelper transactionHelper = serviceRegistry.getRetryingTransactionHelper();
VirtualFolderDefinition virtualFolderDefinition = definitionsCache.get(key);
return transactionHelper.doInTransaction(new RetryingTransactionCallback<VirtualFolderDefinition>()
{
if (virtualFolderDefinition == null)
{
@Override
public VirtualFolderDefinition execute() throws Throwable
{
NodeRef key = reference.toNodeRef();
virtualFolderDefinition = reference.execute(new ApplyTemplateMethod(environment));
definitionsCache.put(key,
virtualFolderDefinition);
}
Map<NodeRef, VirtualFolderDefinition> definitionsCache = TransactionalResourceHelper
.getMap(VIRTUAL_FOLDER_DEFINITION);
return virtualFolderDefinition;
VirtualFolderDefinition virtualFolderDefinition = definitionsCache
.get(key);
if (virtualFolderDefinition == null)
{
virtualFolderDefinition = reference
.execute(new ApplyTemplateMethod(environment));
definitionsCache.put(key,
virtualFolderDefinition);
}
return virtualFolderDefinition;
}
},
true,
false);
}
@Override
@@ -397,7 +436,7 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
final boolean folders, final String pattern, final Set<QName> searchTypeQNames,
final Set<QName> ignoreTypeQNames, final Set<QName> ignoreAspectQNames,
final List<Pair<QName, Boolean>> sortProps, final PagingRequest pagingRequest)
throws VirtualizationException
throws VirtualizationException
{
VirtualFolderDefinition structure = resolveVirtualFolderDefinition(ref);
@@ -471,8 +510,8 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
}
@Override
public PagingResults<Reference> list(Reference ref, boolean actual, boolean virtual, boolean files, boolean folders,
String pattern, Set<QName> ignoreTypeQNames, Set<QName> ignoreAspectQNames,
public PagingResults<Reference> list(Reference ref, boolean actual, boolean virtual, boolean files,
boolean folders, String pattern, Set<QName> ignoreTypeQNames, Set<QName> ignoreAspectQNames,
List<Pair<QName, Boolean>> sortProps, PagingRequest pagingRequest) throws VirtualizationException
{
return list(ref,