mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
17717: This check-in contains changes in Java and .NET TCK tests related to CMIS-43 and CMIS-44 JIRA tasks. Also some bugs were faced out and fixed in 17727: CMIS-69: Alfresco to CMIS ACL mapping: Part 1: API 17732: Merge HEAD to DEV/CMIS10 17756: MOB-563: SQL Tests - Lexer 17764: CMIS-69: Alfresco to CMIS ACL mapping: get ACL support 17802: More for CMIS-69: Alfresco to CMIS ACL mapping. Implementation for applyAcl. 17830: Fixes for CMIS lexer and parser tests 17838: Access fix ups for access by the WS/Rest layers 17869: 1) remote-api: 17874: SAIL-146: Alfresco to CMIS ACL mapping: Support to group ACEs by principal id 17883: Adjust version properties for dev/cmis10 branch. 17885: Update OASIS CMIS TC status. 17889: Fix issue where objectid is not rendered correctly for CMIS private working copies. 17890: SAIL-146: Alfresco to CMIS ACL mapping: Fixes for ACL merging when reporting and ordering of ACEs. Report full permissions and not unique short names. 17902: Fix issue where CMIS queries via GET used incorrect defaults for paging. 17909: Fix CMIS link relations for folder tree. 17912: Fix CMIS type descendants atompub link 17922: Update AtomPub binding to CMIS 1.0 CD05 XSDs. 17924: SAIL-146: Alfresco to CMIS ACL mapping: Test set using full permissions (as opposed to short unique names) 17927: Fix content stream create/update status to comply with CMIS 1.0 CD05. 17934: Resolve encoding issues in CMIS AtomPub binding. 17973: SAIL-171: CMIS Renditions REST binding 17975: SAIL-146: Alfresco to CMIS ACL mapping: Completed AllowedAction and Permissions mapping. Added missing canDeleteTree. 17990: Update CMIS AtomPub to CD06 17996: Updates for cmis.alfresco.com for CD06 in prep for public review 2. 18007: WS-Bindings were updated with CMIS 1.0 cd06 changes. 18016: CMIS web services: Add missing generated files from WSDL 18018: CMIS index page updates for cmis.alfresco.com 18041: Merged HEAD to DEV/CMIS_10 18059: SAIL-227: 18067: SAIL-157: Strict vs Non-Strict Query Language: Enforce restrictions on the use of SCORE() and CONTAINS() 18080: Fix for SAIL-213:Bug: Query engine does not check that select list properties are valid for selectors 18131: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\'. 18132: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\': Fix underlying lucene impl for prefix and fuzzy queries to match wildcard/like 18143: SAIL-156: Query Language Compliance: Fix and check qualifiers in IN_TREE and IN_FOLDER. Improved scoring for CONTAINS() 18173: SAIL-245: Exclude thumbnails from normal query results 18179: SAIL 214: Query Language Compliance: Check for valid object ids in IN_FOLDER and IN_TREE 18210: SAIL-156: Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS. 18211: SAIL-156: Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS. 18215: SAIL 156: Query Language Compliance: Fix CMIS type info to reflect the underlying settings of the Alfresco type for includeInSuperTypeQuery 18244: SAIL 156: Query Language Compliance: includeInSuperTypeQuery -> includedInSuperTypeQuery: First cut of cmis query test model. Fixed modelSchema.xml to validate 18255: SAIL 156: Query Language Compliance: First set of tests for predicates using properties mapped to CMIS Strings. 18261: CMIS-49 SAIL-163: Alfresco to CMIS Change Log mapping - New CMIS Audit mapping is implemented. ChangeLogDataExtractor was added. 18263: Build Fix 18285: SAIL 156: Query Language Compliance: Restrictions on predicates that may be used by single-valued and multi-valued properties 18287: SAIL-186: Changes to make CMIS Rendition REST bindings pass new TCK tests 18291: Fix Eclipse classpath problems 18323: CMIS-44 SAIL-187: Change Log tests (WS) – Java and .NET tests for change log were implemented. 18325: SAIL 156: Query Language Compliance: Fixes and tests for d:mltext mappings 18329: Updated Chemistry TCK jar including Dave W's rendition tests. 18333: Fix compile error - spurious imports. 18334: Fix issue where absurl web script method failed when deployed to root context. 18339: Update CMIS index page for start of public review 2. 18387: SAIL-147: CMIS ACL REST bindings + framework fixes 18392: Fix typo 18394: SAIL 156: Query Language Compliance: Fixes and tests for d:<numeric> 18406: SAIL 156: Query Language Compliance: Remaining type/predicate combinations. Restriction of In/Comparisons for ID/Boolean 18408: CMIS Query language - remove (pointless) multi-valued column from language definition 18409: Formatting change for CMIS.g 18410: Formatting change for FTS.g 18411: CMIS TCK tests were updated to CMIS 1.0 cd06 schemas. 18412: SAIL 156: Query Language Compliance: Tests and fixes for aliases for all data types in simple predicates (they behave as the direct column reference) 18417: Update Chemistry TCK which now incorporates Dave W's ACL tests. 18419: Update CMIS index page to include public review end date. 18427: SAIL 156: Query Language Compliance: Expose multi-valued properties in queries. Tests for all accessors. Fix content length to be long. 18435: SAIL 156: Query Language Compliance: Use queryable correctly and fix up model mappings. Add tests for baseTypeId, contentStreamId and path. 18472: SAIL 156: Query Language Compliance: Tests and fixes for FTS/Contains expressions. Adhere strictly to the spec - no extensions available by default. Improved FTS error reporting (and stop any recovery). 18477: SAIL-164: CMIS change log REST bindings 18495: SAIL 156: Query Language Compliance: Tests and fixes for escaping in string literals, LIKE and FTS expressions. 18537: SAIL 156: Query Language Compliance: Sorting support. Basic sort test for all orderable/indexed CMIS properties. 18538: SAIL-164: CMIS change log fixes for TCK compliance 18547: SAIL 156: Query Language Compliance: Ordering tests for all datatypes, including null values. 18582: Incorporate latest Chemistry TCK 18583: Update list of supported CMIS capabilities in index page. 18606: SAIL-156, SAIL-157, SAIL-158: Query Language Compliance: Respect all query options including locale. Fixes and tests for MLText cross language support. 18608: SAIL-159: Java / Javascript API access to CMIS Query Language 18617: SAIL-158: Query Tests: Check policy and relationship types are not queryable. 18636: SAIL-184: ACL tests (WS) 18663: ACL tests were updated in accordance with last requirements by David Caruana. 18680: Update to CMIS CD07 18681: Fix CMIS ContentStreamId property when document has no content. 18700: CMIS: Head merge problem resolution. Phase 1: Merge up to and including revision 18700, as this the point where both AtomPub and Web Services TCK tests succeed completely on dev branch. Note: includes CMIS rendition support ready for integration and testing with DM renditions. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
465 lines
16 KiB
Java
465 lines
16 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
|
|
* This program 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 General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
* As a special exception to the terms and conditions of version 2.0 of
|
|
* the GPL, you may redistribute this Program in connection with Free/Libre
|
|
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
|
* FLOSS exception. You should have received a copy of the text describing
|
|
* the FLOSS exception, and it is also available here:
|
|
* http://www.alfresco.com/legal/licensing"
|
|
*/
|
|
package org.alfresco.repo.audit;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.HashMap;
|
|
import java.util.Map;
|
|
|
|
import org.alfresco.error.StackTraceUtil;
|
|
import org.alfresco.repo.audit.model.AuditApplication;
|
|
import org.alfresco.repo.domain.schema.SchemaBootstrap;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
|
import org.alfresco.service.Auditable;
|
|
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
|
|
import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
|
|
import org.alfresco.service.transaction.TransactionService;
|
|
import org.aopalliance.intercept.MethodInterceptor;
|
|
import org.aopalliance.intercept.MethodInvocation;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
|
/**
|
|
* A method interceptor to wrap method invocations with auditing.
|
|
* <p/>
|
|
* <b><u>V3.2 Configuration</u>:</b>
|
|
* As of V3.2, the pre- and post-invocation values are passed to the audit component
|
|
* for processing. Individual applications have to extract the desired audit values.
|
|
* Values are audited before and after the invocation so that applications that desire
|
|
* to extract derived data before the invocation can have a chance to do so; generally,
|
|
* however, the post-invocation values will be the most useful.
|
|
* <p/>
|
|
* The values passed to the audit component (assuming auditing is enabled and the
|
|
* new configuration is being used) are:
|
|
* <pre>
|
|
* /alfresco-api
|
|
* /pre
|
|
* /<service>
|
|
* /<method>
|
|
* /args
|
|
* /<arg-name>=<value>
|
|
* /<arg-name>=<value>
|
|
* ...
|
|
* /service
|
|
* /post
|
|
* /<service>
|
|
* /<method>
|
|
* /args
|
|
* /<arg-name>=<value>
|
|
* /<arg-name>=<value>
|
|
* ...
|
|
* /result=<value>
|
|
* /error=<value>
|
|
* /no-error=<null>
|
|
*
|
|
* </pre>
|
|
* Applications can remap the paths onto their configurations as appropriate.
|
|
* <p/>
|
|
* TODO: Audit configuration mapping needs to support conditionals
|
|
*
|
|
* @author Andy Hind
|
|
* @author Derek Hulley
|
|
*/
|
|
public class AuditMethodInterceptor implements MethodInterceptor
|
|
{
|
|
public static final String AUDIT_PATH_API_ROOT = "/alfresco-api";
|
|
public static final String AUDIT_PATH_API_PRE = AUDIT_PATH_API_ROOT + "/pre";
|
|
public static final String AUDIT_PATH_API_POST = AUDIT_PATH_API_ROOT + "/post";
|
|
public static final String AUDIT_SNIPPET_ARGS = "/args";
|
|
public static final String AUDIT_SNIPPET_RESULT = "/result";
|
|
public static final String AUDIT_SNIPPET_ERROR = "/error";
|
|
public static final String AUDIT_SNIPPET_NO_ERROR = "/no-error";
|
|
|
|
private static final Log logger = LogFactory.getLog(AuditMethodInterceptor.class);
|
|
|
|
private PublicServiceIdentifier publicServiceIdentifier;
|
|
private AuditComponent auditComponent;
|
|
private TransactionService transactionService;
|
|
|
|
// SysAdmin cache - used to cluster certain configuration parameters
|
|
private boolean useNewConfig = false;
|
|
|
|
private final ThreadLocal<Boolean> inAudit = new ThreadLocal<Boolean>();
|
|
private final ThreadLocal<Boolean> auditEnabled = new ThreadLocal<Boolean>();
|
|
|
|
public AuditMethodInterceptor()
|
|
{
|
|
super();
|
|
}
|
|
|
|
/**
|
|
* Use the new audit configuration (default: <b>false</b>)
|
|
*
|
|
* @param useNewConfig <tt>true</tt> to use the new audit configuration
|
|
*/
|
|
public void setUseNewConfig(boolean useNewConfig)
|
|
{
|
|
this.useNewConfig = useNewConfig;
|
|
}
|
|
|
|
public void setPublicServiceIdentifier(PublicServiceIdentifier serviceIdentifier)
|
|
{
|
|
this.publicServiceIdentifier = serviceIdentifier;
|
|
}
|
|
|
|
public void setAuditComponent(AuditComponent auditComponent)
|
|
{
|
|
this.auditComponent = auditComponent;
|
|
}
|
|
|
|
public void setTransactionService(TransactionService transactionService)
|
|
{
|
|
this.transactionService = transactionService;
|
|
}
|
|
|
|
public Object invoke(MethodInvocation mi) throws Throwable
|
|
{
|
|
// Cache the enabled flag at the top of the stack
|
|
Boolean wasEnabled = auditEnabled.get();
|
|
try
|
|
{
|
|
boolean enabled;
|
|
if (wasEnabled == null)
|
|
{
|
|
// There hasn't been an invocation in this thread yet, so check whether we are currently enabled in the
|
|
// audit subsystem
|
|
enabled = this.auditComponent.isSourcePathMapped(AUDIT_PATH_API_ROOT);
|
|
auditEnabled.set(enabled);
|
|
}
|
|
else
|
|
{
|
|
enabled = wasEnabled;
|
|
}
|
|
|
|
if(!enabled)
|
|
{
|
|
// No auditing
|
|
return mi.proceed();
|
|
}
|
|
else if (useNewConfig)
|
|
{
|
|
// New configuration to be used
|
|
return proceed(mi);
|
|
}
|
|
else
|
|
{
|
|
// Use previous configuration
|
|
return auditComponent.audit(mi);
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
auditEnabled.set(wasEnabled);
|
|
}
|
|
|
|
}
|
|
|
|
/**
|
|
* Allow the given method invocation to proceed, auditing values before invocation and
|
|
* after returning or throwing.
|
|
*
|
|
* @param mi the invocation
|
|
* @return Returns the method return (if a value is not thrown)
|
|
* @throws Throwable rethrows any exception generated by the invocation
|
|
*
|
|
* @since 3.2
|
|
*/
|
|
private Object proceed(MethodInvocation mi) throws Throwable
|
|
{
|
|
Auditable auditableDef = mi.getMethod().getAnnotation(Auditable.class);
|
|
if (auditableDef == null)
|
|
{
|
|
// No annotation, so just continue as normal
|
|
return mi.proceed();
|
|
}
|
|
|
|
// First get the argument map, if present
|
|
Object[] args = mi.getArguments();
|
|
Map<String, Serializable> namedArguments = getInvocationArguments(auditableDef, args);
|
|
// Get the service name
|
|
String serviceName = publicServiceIdentifier.getPublicServiceName(mi);
|
|
if (serviceName == null)
|
|
{
|
|
// Not a public service
|
|
return mi.proceed();
|
|
}
|
|
String methodName = mi.getMethod().getName();
|
|
|
|
// Are we in a nested audit
|
|
Boolean wasInAudit = inAudit.get();
|
|
// TODO: Need to make this configurable for the interceptor or a conditional mapping for audit
|
|
if (wasInAudit != null)
|
|
{
|
|
return mi.proceed();
|
|
}
|
|
// Record that we have entered an audit method
|
|
inAudit.set(Boolean.TRUE);
|
|
try
|
|
{
|
|
return proceedWithAudit(mi, auditableDef, serviceName, methodName, namedArguments);
|
|
}
|
|
finally
|
|
{
|
|
inAudit.set(wasInAudit);
|
|
}
|
|
}
|
|
|
|
private Object proceedWithAudit(
|
|
MethodInvocation mi,
|
|
Auditable auditableDef,
|
|
String serviceName,
|
|
String methodName,
|
|
Map<String, Serializable> namedArguments) throws Throwable
|
|
{
|
|
try
|
|
{
|
|
auditInvocationBefore(serviceName, methodName, namedArguments);
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
// Failure to audit should not break the invocation
|
|
logger.error(
|
|
"Failed to audit pre-invocation: \n" +
|
|
" Invocation: " + mi,
|
|
e);
|
|
}
|
|
|
|
// Execute the call
|
|
Object ret = null;
|
|
Throwable thrown = null;
|
|
try
|
|
{
|
|
ret = mi.proceed();
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
thrown = e;
|
|
}
|
|
|
|
// We don't ALWAYS want to record the return value
|
|
Object auditRet = auditableDef.recordReturnedObject() ? ret : null;
|
|
try
|
|
{
|
|
auditInvocationAfter(serviceName, methodName, namedArguments, auditRet, thrown);
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
// Failure to audit should not break the invocation
|
|
logger.error(
|
|
"Failed to audit post-invocation: \n" +
|
|
" Invocation: " + mi,
|
|
e);
|
|
}
|
|
|
|
// Done
|
|
if (thrown != null)
|
|
{
|
|
throw thrown;
|
|
}
|
|
else
|
|
{
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @return Returns the arguments mapped by name
|
|
*
|
|
* @since 3.2
|
|
*/
|
|
private Map<String, Serializable> getInvocationArguments(Auditable auditableDef, Object[] args)
|
|
{
|
|
// Use the annotation to name the arguments
|
|
String[] params = auditableDef.parameters();
|
|
boolean[] recordable = auditableDef.recordable();
|
|
|
|
Map<String, Serializable> namedArgs = new HashMap<String, Serializable>(args.length * 2);
|
|
for (int i = 0; i < args.length; i++)
|
|
{
|
|
if (i >= params.length)
|
|
{
|
|
// The name list is finished. Unnamed arguments are not recorded.
|
|
break;
|
|
}
|
|
if (i < recordable.length)
|
|
{
|
|
// Arguments are recordable by default
|
|
if (!recordable[i])
|
|
{
|
|
// Don't record the argument
|
|
continue;
|
|
}
|
|
}
|
|
Serializable arg;
|
|
if (args[i] == null)
|
|
{
|
|
arg = null;
|
|
}
|
|
else if (args[i] instanceof Serializable)
|
|
{
|
|
arg = (Serializable) args[i];
|
|
}
|
|
else
|
|
{
|
|
// TODO: How to treat non-serializable args
|
|
// arg = args[i].toString();
|
|
try
|
|
{
|
|
arg = DefaultTypeConverter.INSTANCE.convert(String.class, args[i]);
|
|
}
|
|
catch (TypeConversionException e)
|
|
{
|
|
// No viable conversion
|
|
continue;
|
|
}
|
|
}
|
|
// Trim strings
|
|
if (arg instanceof String)
|
|
{
|
|
arg = SchemaBootstrap.trimStringForTextFields((String)arg);
|
|
}
|
|
// It is named and recordable
|
|
namedArgs.put(params[i], arg);
|
|
}
|
|
// Done
|
|
return namedArgs;
|
|
}
|
|
|
|
/**
|
|
* Audit values before the invocation
|
|
*
|
|
* @param serviceName the service name
|
|
* @param methodName the method name
|
|
* @param namedArguments the named arguments passed to the invocation
|
|
*
|
|
* @since 3.2
|
|
*/
|
|
private void auditInvocationBefore(
|
|
final String serviceName,
|
|
final String methodName,
|
|
final Map<String, Serializable> namedArguments)
|
|
{
|
|
final String rootPath = AuditApplication.buildPath(AUDIT_PATH_API_PRE, serviceName, methodName, AUDIT_SNIPPET_ARGS);
|
|
|
|
// Audit in a read-write txn
|
|
Map<String, Serializable> auditedData = auditComponent.recordAuditValues(rootPath, namedArguments);
|
|
// Done
|
|
if (logger.isDebugEnabled() && auditedData.size() > 0)
|
|
{
|
|
logger.debug(
|
|
"Audited before invocation: \n" +
|
|
" Values: " + auditedData);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Audit values after the invocation
|
|
*
|
|
* @param serviceName the service name
|
|
* @param methodName the method name
|
|
* @param namedArguments the named arguments passed to the invocation
|
|
* @param ret the result of the execution (may be <tt>null</tt>)
|
|
* @param thrown the error thrown by the invocation (may be <tt>null</tt>)
|
|
*
|
|
* @since 3.2
|
|
*/
|
|
private void auditInvocationAfter(
|
|
String serviceName, String methodName, Map<String, Serializable> namedArguments,
|
|
Object ret, Throwable thrown)
|
|
{
|
|
final String rootPath = AuditApplication.buildPath(AUDIT_PATH_API_POST, serviceName, methodName);
|
|
|
|
final Map<String, Serializable> auditData = new HashMap<String, Serializable>(23);
|
|
for (Map.Entry<String, Serializable> entry : namedArguments.entrySet())
|
|
{
|
|
String argName = entry.getKey();
|
|
Serializable argValue = entry.getValue();
|
|
auditData.put(
|
|
AuditApplication.buildPath(AUDIT_SNIPPET_ARGS, argName),
|
|
argValue);
|
|
}
|
|
if (ret != null)
|
|
{
|
|
if (ret instanceof String)
|
|
{
|
|
// Make sure the string fits
|
|
ret = SchemaBootstrap.trimStringForTextFields((String) ret);
|
|
}
|
|
if (ret instanceof Serializable)
|
|
{
|
|
auditData.put(AUDIT_SNIPPET_RESULT, (Serializable) ret);
|
|
}
|
|
else
|
|
{
|
|
// TODO: How do we treat non-serializable return values
|
|
try
|
|
{
|
|
ret = DefaultTypeConverter.INSTANCE.convert(String.class, ret);
|
|
auditData.put(AUDIT_SNIPPET_RESULT, (String) ret);
|
|
}
|
|
catch (TypeConversionException e)
|
|
{
|
|
// No viable conversion
|
|
}
|
|
}
|
|
}
|
|
Map<String, Serializable> auditedData;
|
|
if (thrown != null)
|
|
{
|
|
StringBuilder sb = new StringBuilder(1024);
|
|
StackTraceUtil.buildStackTrace(
|
|
thrown.getMessage(), thrown.getStackTrace(), sb, Integer.MAX_VALUE);
|
|
auditData.put(AUDIT_SNIPPET_ERROR, SchemaBootstrap.trimStringForTextFields(sb.toString()));
|
|
|
|
// An exception will generally roll the current transaction back
|
|
RetryingTransactionCallback<Map<String, Serializable>> auditCallback =
|
|
new RetryingTransactionCallback<Map<String, Serializable>>()
|
|
{
|
|
public Map<String, Serializable> execute() throws Throwable
|
|
{
|
|
return auditComponent.recordAuditValues(rootPath, auditData);
|
|
}
|
|
};
|
|
auditedData = transactionService.getRetryingTransactionHelper().doInTransaction(auditCallback, false, true);
|
|
}
|
|
else
|
|
{
|
|
// Add the "no error" indicator
|
|
auditData.put(AUDIT_SNIPPET_NO_ERROR, null);
|
|
// The current transaction will be fine
|
|
auditedData = auditComponent.recordAuditValues(rootPath, auditData);
|
|
}
|
|
|
|
// Done
|
|
if (logger.isDebugEnabled() && auditedData.size() > 0)
|
|
{
|
|
logger.debug(
|
|
"Audited after invocation: \n" +
|
|
(thrown == null ? "" : " Exception: " + thrown.getMessage() + "\n") +
|
|
" Values: " + auditedData);
|
|
}
|
|
}
|
|
}
|