mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
35366: Fix for ALF-13542 - Notification is not displayed, when you try to create duplicate user. 35538: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/V4.0-BUG-FIX: (pre-req for ALF-13791) 35410: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: - fix merge issue (compilation fix) 35443: Merge build/test fix (record-only) 35463: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30194: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29718: ALF-6029: Additional MT fix to force default tenant 29719: THOR-7: Create tenant 35541: Fix for ALF-13723 SOLR does not include the same query unit tests as lucene - added base tests 35547: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/V4.0-BUG-FIX: (ALF-13791) 35511: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30252: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29763: THOR-107: MT-aware immutable singletons 29766: THOR-107: MT-aware immutable singletons 29768: THOR-31: MT-aware shared cache 29770: THOR-107: MT-aware immutable singletons 35512: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30253: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29771: THOR-31: MT-aware shared cache 29777: THOR-107: MT-aware immutable singletons 29786: THOR-107: MT-aware immutable singletons 29787: THOR-31: MT-aware shared cache (fix MultiTNodeServiceInterceptorTest) 29799: THOR-107: MT-aware immutable singletons 35513: Merge build/test fix 35516: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/CLOUD1: 30026: THOR-5: tenant-aware caches 35517: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30260: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: (core) 29860: THOR-73: prep for HEAD sync/merge-forward 29866: THOR-73: prep for HEAD sync/merge-forward 30026: THOR-5: tenant-aware caches 35520: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30297: THOR-73: Line-endings only 30298: THOR-73: Line-endings only 30300: THOR-73: fix ActivitiWorkflowServiceIntegrationTest 30302: THOR-73: fix SubscriptionServiceActivitiesTest 35528: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30459: THOR-156: prep - consolidate/improve get current user's tenant domain 30469: Fix bootstrap config check when running unit tests (where one tenant already exists) (partial merge only) 35565: MT: fix update tenant entity - pre-req for ALF-13757 35567: Fix merge fallout (compile error) 35569: ALF-13757: MT - minor patch to migrate existing tenants, if any (when upgrading) 35592: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX: (ALF-13791) 34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti) 35598: ALF-11459: Added null-check on in-flight process diagram-generation to prevent error when running headless 35604: ALF-13426 Transformation: DOCX conversion failure <<< Fix split into two parts to make merge of this general part to 3.4.10 simpler. >>> <<< The second part contains 4.0.x specific changes. >>> - Change to ContentServiceImpl to fail over to other available transformers on error (can be turned off with global property content.transformer.failover=false). 35605: ALF-13426 Transformation: DOCX conversion failure <<< Second part >>> - Remove explicit transformation sections for OOXML (added in 4.0.1 ALF-12461) as these are stopping other transformers from being used. Was done originally as a copy paste from another bean that needed an explicit section. - The combination of allowing other transformers (that were used prior to 4.0.1) and fail over from OOXML to these transformers allows to docx fixes that do and do not contain an embedded image to be transformed to png. 35608: fix build 35609: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.2) RECORD ONLY 35607: Merged V4.0-BUG-FIX (4.0.2) to V3.4-BUG-FIX (3.4.10) 35604: ALF-13426 Transformation: DOCX conversion failure <<< Fix split into two parts to make merge of this general part to 3.4.10 simpler. >>> <<< The second part contains 4.0.x specific changes. >>> - Change to ContentServiceImpl to fail over to other available transformers on error (can be turned off with global property content.transformer.failover=false). 35619: ALL LANGUAGES: Translation updates based on EN r35407 35630: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX: 34289: Upgrading JUnit lib to 4.10 to get full Rules support. 34317: Some initial documentation on JUnit Rules samples. 34328: More JUnit rules fun. Added a new rule to help with the creation and automatic cleanup of temporary test nodes. 34777: Added enhancement to TemporaryNodes rule to allow for dummy content. 34805: Added a convenience method to the ApplicationContextInit @Rule to allow for easier spring overriding in test code. 35621: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to HEAD: 35620: More JUnit Rules Enhancements, covering well known nodes and easier context loading 35631: Fixing some Eclipse junit/lib dependencies which had become out of date - seemingly before my pervious commit (35630). 35640: Fix for ALF-10085 "Adding/removing CMIS Relationship changes last modified date of source object" 35647: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35588 to BRANCHES/DEV/V4.0-BUG-FIX: 35589: Creating new branch from $FROM 35591: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35195 to BRANCHES/DEV/DAM/V4.0-BUG-FIX-35588: 35196: Creating new branch from $FROM 35338: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Moved tooltip to simple viewRenderer 35340: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Moved fnRenderCellSelected logic to DocumentListViewRenderer - Moved fnRenderCellStatus logic to DocumentListViewRenderer - Moved fnRenderCellDescription logic to DocumentListViewRenderer - Moved fnRenderCellActions logic to DocumentListViewRenderer 35346: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Moved onEventHighlightRow logic to DocumentListViewRenderer - Moved onEventUnhighlightRow logic to DocumentListViewRenderer - Moved onActionShowMore logic to DocumentListViewRenderer - Minor private method renaming 35427: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Changed check for display of metadata banners and lines to more explicit bannerView and lineView properties which are set to the viewRenderer's name by default, but can now more easily be overridden 35503: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Renamed bannerView property to more specific metadataBannerViewName - Renamed lineView property to more specific metadataLineViewName 35583: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Added rowClassName property to make finding the row easier in cases where an event trigger element might not be the row itself - Added check for expected row element class name in getDataTableRecordIdFromRowElement, if not present trying getAncestorByClassName with rowClassName property - Moved onFileRenamed to DocumentListViewRenderer - Changed fnActionHandler to use getDataTableRecordIdFromRowElement rather than target.offsetParent - Changed onLikes to use getDataTableRecordIdFromRowElement rather than assume the row parameter is the correct element - Changed onFavourite to use getDataTableRecordIdFromRowElement rather than assume the row parameter is the correct element 35610: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Changed method of grabbing container element in selectFiles to use parentElementIdSuffix from current viewRenderer 35650: Fix for ALF-13813 SOLR fails for fuzzy queries 35651: Fix tests for ALF-13813 SOLR fails for fuzzy queries More for ALF-13723 SOLR does not include the same query unit tests as lucene - added tests for Alfresco fts run via the request handler - fixed fuzzy query tests so far ... - report queries that generate errors 35664: ALF-13294 - CIFS: When versionable aspect is active, using the Microsoft Word for Mac 2008 option "always create a backup copy" leads to document versions loss 35679: Fix DataList QName hard-codings by pulling out to a proper Model Java Constants Interface 35689: Add the NameSpace constants for the Links model 35699: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/DEV/V4.0-BUG-FIX: 35698: New WebScript to provide the Share View URL for a given NodeRef (based on the Node Type and SysAdminParams) 35716: Make overriding just the Share URL easier (needed for Cloud installs) 35741: ALF-13819 Remove description+template for a controller-less webscript that was committed by mistake in v3.4 35765: Fixed version of junit.jar in build files 35772: ALF-1994 - Allow user defined white-list of HTML tags for HTML sanitisation process. Spring config added for tags and attributes. 35781: Fix for MySQL part of ALF-13150: Performance of Purging Empty Transactions (like 10M) ALF-13839: MySQL: "Failed to purge txns" from DeletedNodeCleanupWorker - Added MySQL override of the NodeDAO for this call with a dedicated DELETE ... JOIN ... for MySQL 35784: Fix for ALF-13845 SOLR "alfresco" queries are not cached correctly 35785: More for ALF-13723 SOLR does not include the same query unit tests as lucene - duplicated sort and AFTS tests from the lucene sub-system - run queries via request handler - addded new locale tests for d:text ordering 35805: ALF-13828 Method name typo, should be getThumbnailDefinitions not getThumbnailDefintions. (Old method retained, @deprecated, for backwards compatibility) 35806: More debug to setFileInformation 35836: Fix for ALF-13794 Mismatch in SOLRAPIClient and NodeContentGet webscript causes content of type d:content not to get indexed 35862: Fix for ALF-13826 Solr CMIS Query After Delete a Node Throws CmisRuntimeException: Node does not exist - make appropriate methods aware of node existence.... 35867: ALF-13886 Certain errors may lead to no conn model object being available, so check it is there before using it to render the "Return to folder" link 35901: ALF-13474 possibility of deleting compleded workflows + explorer ui cancel action fix 35923: Fix for ALF-13724 Share folder permission management - changes to parent/child folders not accurately reflected 35936: More for ALF-13723 SOLR does not include the same query unit tests as lucene - tests for mltext localised collation 35944: BufferedContentDiskDriver needs to use deviceName and sessionKey to make it unique rather than userName 35949: ALF-13755: MT is configured (but not enabled) by default - note: also related to THOR-248 (effectively means that r31407 becomes a merge record-only) 35951: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX: 34107: record-only (follow on to r35949 - see ALF-13755 / THOR-248) 35953: ALF-12792 - Creation Date and Modification Date initialization for open files. 35968: Follow up to fix for ALF-13839: MySQL: "Failed to purge txns" from DeletedNodeCleanupWorker - Sanity check highlighted transactional resource block in the database - Each cleanup runs its own transactions as required now - See also ALF-13150: Performance of Purging Empty Transactions suffers if the number of unused transactions grows too large (like 10M) 35970: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35924 to BRANCHES/DEV/V4.0-BUG-FIX: 35925: Creating new branch from BRANCHES/DEV/V4.0-BUG-FIX 35966: ALF-13912: Move DocumentList.onHighlightFile UI Logic to DocumentListViewRenderer - Moved DocumentList.onHighlightFile logic to DocumentListViewRenderer - Added DocumentListViewRenderer.getRowElementFromDataTableRecord and DocumentListViewRenderer.getRowSelectElementFromDataTableRecord - Changed onHighlightFile to call those new getRow* methods for easier reuse in view renderer extensions 35979: ALF-10278, ALF-13902: Ending task now done with the right assignee when unassigned (eg. not claimed from pool) or when workflow-owner completes the task assigned to someone else, without claiming first 35981: Fix for ALF-12670 - An exception occurs during creation wiki page Changed Wiki title field limit to the 100 char limit imposed by QName which unfortunately is used by the underlying service to store the field title. 35991: ALF-13901: Incorrect workflow-history gathering/displaying on uncompleted tasks in ended parallel multi-instance activity 35993: ALF-10278, ALF-13902: Fixed failing test (was not using AuthenticationUtil for test-user) 36001: BDE-69: create test-minimal and continuous-minimal Ant targets 36004: Fixes for: ALF-12813 - jsonUtils.toJSONString mangles up Associative Arrays - Added support for nested Java Map/List to jsonUtils ALF-13647 - the first time a ICAL calendar URL is called with kerberos SSO a JSESSIONID cookie is not sent by the client, request fails with a 500 Internal server error - Support for "negotiate" HTTP auth header and general improvements to that area ALF-13877 - Invalid WebScript URLs cause ERROR-level exception stacks - DEBUG only output for "missing" webscripts and invalid API call URLs 36014: ALF-13844: XSLT Filtering Not 100% Secure - added more namespaces to the security filter. - verified that include/import uses the security filter. 36018: ALF-13609: Enterprise installers lay down sample site and users -Added feature to SiteLoadPatch to disable loading. -Added property "disable.sample.site". Set property (system or otherwise) disable.sample.site=true to skip loading the sample site on a new installation. 36031: debug improvement. 36039: ALF-13779: isPooled() implemented correctly now 36044: ALF-13770: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.2) 36043: ALF-13769: Merged V3.4.8 (3.4.8.7) to V3.4-BUG-FIX (3.4.10) 35776: ALF-11535 Home Folder Synchronizer fails when destination folder already exists - Don't move home folders that are the same as the provider's root folder or even above it! If the same, these tend to be shared folders. If above, this indicates that an LDAP sync has corrupted the original provider name and has hence changed what we think is the root folder! 36046: ALF-13745: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.2) <<< Also added placeholder thumbnails (copies if docx, pptx and xlsx which in turn appear to be copies of the 2003 doc, ppt and xls) >>> 36041: ALF-13667 Additional OpenOffice mimetypes to be added to the mime-type maps - Added mimetypes for docm dotx dotm pptm ppsx ppsm potx potm ppam sldx sldm xltm xlsm xltm xlam xlsb - Added transformation limits to avoid very long running tasks. - Disable Jod and OpenOffice transformers via PDFBox for new types to txt, as there are better options with the exception of potm and xlsb that can only be done by Office. - TransformerDebug include max source size in available transformer list 35958: ALF-13745 Add Support for Microsoft Word File Format DOCM << General TransformationOptionLimits change >> - Addition of TransformationOptionLimitsMap to make it simpler to add lots of TransformationOptionLimits. Only one per line rather than about 10 - Needed for this JIRA as lots of limits are needed - Changes to transformerDebug to make it more obvious which transformers are excluded 36047: Fix for ALF-13925 - UsernamePropertyDecorator incorrectly handles displayName construction 36048: More for ALF-13723 SOLR does not include the same query unit tests as lucene - tests and fixes for internal fields 36061: Fix remoteapi tests by putting back repository tests before, where they belong 36064: ALF-13682 'View Process Diagram' not working if auditing is turned on - modified Auditable annotation on the getWorkflowImage() method which was returning an InputStream so we would not consume the input again. - modified AuditMethodInterceptor to ignore any InputStream and OutputStream values. Implemented as a list of non aubitable classes. Refactored generation of auditable arguments and return value to a method rather than two almost identical in-line copies. 36065: ALF-13756: MT - replace Tenant attributes with Tenant table - update schema comp files for x5 DBs - note: will need to be tested in DB build plans (via schema comp -> when fail on error is enabled) 36066: ALF-13609: Enterprise installers lay down sample site and users -Removed extraneous line of code. -Renamed boolean to "disabled" and associated accessors. -Added property "sample.site.disabled=false" to repository.properties. -To disable loading of the sample site on a new installation, set property (system or otherwise) "sample.site.disabled=true" 36080: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-36070 to BRANCHES/DEV/V4.0-BUG-FIX: 36071: Creating new branch from BRANCHES/DEV/V4.0-BUG-FIX 36079: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35924 to BRANCHES/DEV/DAM/V4.0-BUG-FIX-36070: 36069: ALF-13935: Move DocumentList Upload Indicators and Instructions to DocumentListViewRenderer - Created renderEmptyDataSourceHtml method in DocumentListViewRenderer which contains the view logic previously in _setupDataSource - Created _setEmptyDataSourceMessage which actually appends the constructed empty HTML instructions for cases where extensions simply want the same instructions but in a different container - Added firing of Bubbling event postSetupViewRenderers at the end of _setupViewRenderers since all viewRenderers now have to be registered before _setupDataSource is called 36085: More for ALF-13723 SOLR does not include the same query unit tests as lucene - internal fields - paging - security filters 36089: ALF-11725: Replication document with comment fails due to integrity exception - updated script transfer service. 36094: ALF-11725 : config change. 36098: ALF-13719: Javascript addAspect(aspect, properties) does not apply cm:autoVersionOnUpdateProps property value 36105: SESURF-102: Fix dependency handling when use-checksum-dependencies is not enabled. 36107: Tweak wiki page create/update logic, to handle clearing the tags when updating a page when all tags are removed (ALF-10979) 36109: ALF-7874 MimeType definitions for Adobe AfterEffects files 36110: ALF-7874 Upgrade Tika for improved detection of Adobe Premier and AfterEffects 36112: ALF-7874 MimeType definition addition for Adobe Premier files 36133: Merged DEV to V4.0-BUG-FIX 36130: ALF-13988 : apply_amps script no longer works on Mac OSX apply_amps.sh was corrected to resolve "readlink -f" Mac OS problem. 36135: ALF-12330: Editing of completed task now redirects to referring page (if available) + transition-buttons not rendered on completed tasks 36141: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 35641: ALF-13452: Open office startup from Java not working on OSX - Fix from Bitrock in combination with new wrapper in BINARIES 35687: ALF-13520: alfresco.log file ending up in system32 directory - Not anymore! 35736: ALF-13751: Reduce over-agressive traversal of child associations when detecting cyclic groups in LDAP sync - Recurse upwards to topmost parent then recurse downwards - No need to recurse upwards and downwards on every recursion step! 35987: Merged DEV to V3.4-BUG-FIX 35984: ALF-11850 WCM - Incorrect message when copying/cutting assets within a Web Project 1. In ClipboardBean.addClipboardNode(NodeRef ref, NodeRef parent, ClipboardStatus mode) was added check whether the node in the AVM. 2. In webclient.properties was added node_added_clipboard_avm property. 36049: Fix for ALF-9662 To allow admin user to view dashboard of moderated site. 36050: Fix for ALF-13843 - Content creation silently fails when it's being created with already existent name. 36054: Fix for ALF-13231 - Message 'Failure' on workflow cancelation 36055: Fix for ALF-13926 - Intranet compatibility options override share's settings 36102: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX 36097: Fix for ALF-13976 - 404 error handling in Share no longer correctly receives JSON response. OKed by DaveW. 36103: ALF-13578 : CIFS AlfJLANWorker threads (concurrency) - server not responding 36137: Merged V3.4 to V3.4-BUG-FIX 35433: ALF-13021: Folder deletion from Editorial not deleting from Live folder automatically - Fix by Valery - Needs further work for 4.0.x 35488: ALF-13718: Full reindex performance on SQL Server - ORDER BY on child assoc query changed to only include ID (with Derek's permission) - ADMLuceneIndexerImpl altered to not use batch loading in getChildAssocs so as not to blow the transactional caches when reindexing a large hierarchy - ADMLuceneIndexerImpl altered so that it only checks for the existence of child associations when 'lazily' creating parent containers - ADMLuceneTest corrected (with Andy's permission) so that this doesn't throw the unit test out 35505: ALF-13718: Corrected ADMLuceneCategoryTest to clear the 'real' index before creating a fake 'test' index 35809: Merged DEV to V3.4 35800: ALF-10353 : Internet Explorer hangs when using the object picker with a larger number of documents YUI library was modified to use chunked unloading of listeners via a series of setTimeout() functions in event.js for IE 6,7,8. 36101: ALF-13978: Merged V4.0-BUG-FIX to V3.4 36014: ALF-13844: XSLT Filtering Not 100% Secure - added more namespaces to the security filter. - verified that include/import uses the security filter. 36108: ALF-13978: Fixed compilation errors 36129: Merged DEV to V3.4 36123: ALF-13951 : It's impossible to customize dashboard in Alfresco Share A yui-2.8.1-patched library contains a fix for ALF-10353. 36142: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 35432: ALF-13762: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 35366: Fix for ALF-13542 - Notification is not displayed, when you try to create duplicate user. 35593: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX: 35375: Fix for ALF-13711: "Hidden Aspect applied to Mac powerpoint files." - re-instated previous hidden aspect behaviour - unit tests - also fixed cascade behaviour 36144: Merged V4.0 to V4.0-BUG-FIX 35918: 31473: -- initial commit for ALF-11027 -- enables CE / EE deployment of artifacts to a maven repository -- added necessary ant build files and build properties. -- also added a README 31474: -- added .project to svn:ignore 32534: -- added missing artifacts and fixed wrong ones -- added possibility of custom artifacts labeling (by adding -Dmaven.custom.label), e.g. to allow snapshot / release deployments from working branches -- TODO: document required ~/.m2/settings.xml 32582: -- renamed alfresco-datamodel to alfresco-data-model -- fixed release/snapshot and custom version labeling -- tested with Community, enterprise build undergoing (removed distribute-extras as pre-requisite) 32610: -- tested enterprise only deployment -- removed tabs -- fixed property placeholding -- tested all artifacts 32611: -- added maven-ant-tasks library to automatically load ant maven tasks without dependencies on the ant installation -- added typedef in the main maven.xml 35250: -- reworking on ALF-11027 to enable automated deployment of artifacts to the Maven repo -- following conversations with DaveW implemented the following: - removed classifier (just rely on different groupId, org.alfresco for Community and org.alfresco.enterprise for Enterprise) - Added debugging lines to make sure proper repo / groupId configuration is picked up - enabled SNAPSHOT/RELEASE deployment for both community and enterprise -- updated README-maven-deploy.txt with all instructions on how to run the build 35388: -- added references to Maven settings.xml in the BINARIES as discussed with DaveW 35648: [ALF-11027] Since artifact:mvn does not support settingsFile attribute, switching to embedded command line -gs parameter to specify a custom settings.xml location 35649: [ALF-11027] Since artifact:mvn does not support settingsFile attribute, switching to embedded command line -gs parameter to specify a custom settings.xml location 35652: [ALF-11027] artifact:mvn uses an older Maven version which command line switch is -s instead of -gs 35775: [ALF-11027] Removed DoD and Kofax deployment from enteprise deployment procedure 35783: [ALF-11027] removing custom README and added documentation in line of the tw maven.xml files 35793: Fix comment syntax: no -- allowed there 35802: [ALF-11027] Removed calls to DoD targets 35810: [ALF-11027] Introducing a maven-build-deploy goal to build and deploy at once, maven-deploy now "just does the job 35822: [ALF-11027] Moved the maven setup steps to a maven-env-prerequisites separate target, so it gets executed earlier and defines the task 35851: [ALF-11027] Move targets around to fix the regular, non-continuous build 35894: [ALF-11027] Add maven.do.deploy variable, to control maven deployment from bamboo using parameterised plan 35896: [ALF-11027] Using Bamboo Plan Variables properly 35899: [ALF-11027] Use Bamboo variable to specify release vs snapshot rather than deployment or not 35905: [ALF-11027] Upload source and javadoc jars into Maven repo as well 35912: Upgrade maven-deploy-plugin to 2.7, to be able to deploy Javadoc and Source jars as well 35950: ALF-11027: Fix typo in jlan-embed deployment, removed svn revision from version, removed deployment of jmx-dumper 36145: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY) 34612: Merged V4.0-BUG-FIX to V4.0 ALF-12740: Update to previous fix (only apply to IE8 and below) 34618: Merged V4.0-BUG-FIX to V4.0 34474: ALF-13169 Tomcat fails to shutdown - fix non daemon Timers 34637: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0 (4.0.1) 34636: Fix for ALF-13365 SOLR: Recently modified docs dashlet sorts incorrectly 34690: MERGE V4.0_BUG-FIX to V4.0 34226 : ALF-12780 Mac OS X Lion 10.7.2: Editing a document via CIFS and TextEdit removes versionable aspect from this file 34716: Merged V4.0-BUG-FIX to V4.0 34715: Fix for __ShowDetails desktop action returned URL is truncated if hostname too long. ALF-13202. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36155 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
529 lines
19 KiB
Java
529 lines
19 KiB
Java
/*
|
|
* Copyright (C) 2005-2012 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco 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 Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.repo.audit;
|
|
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
import java.io.Serializable;
|
|
import java.util.HashMap;
|
|
import java.util.Map;
|
|
import java.util.Map.Entry;
|
|
import java.util.concurrent.ThreadPoolExecutor;
|
|
|
|
import net.sf.acegisecurity.Authentication;
|
|
|
|
import org.alfresco.error.AlfrescoRuntimeException;
|
|
import org.alfresco.error.StackTraceUtil;
|
|
import org.alfresco.repo.audit.model.AuditApplication;
|
|
import org.alfresco.repo.domain.schema.SchemaBootstrap;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
|
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_PRE_CALL_DATA = "/preCallData";
|
|
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 String NOT_RECORDABLE = "not auditable";
|
|
|
|
@SuppressWarnings("rawtypes")
|
|
private static final Class[] NON_RECORDABLE_CLASSES = new Class[] { InputStream.class, OutputStream.class };
|
|
|
|
private static final Log logger = LogFactory.getLog(AuditMethodInterceptor.class);
|
|
|
|
private BeanIdentifier beanIdentifier;
|
|
private AuditComponent auditComponent;
|
|
private TransactionService transactionService;
|
|
|
|
private ThreadPoolExecutor threadPoolExecutor;
|
|
|
|
private final ThreadLocal<Boolean> inAudit = 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)
|
|
{
|
|
logger.warn("Property 'useNewConfig' is no longer used.");
|
|
}
|
|
|
|
public void setBeanIdentifier(BeanIdentifier beanIdentifier)
|
|
{
|
|
this.beanIdentifier = beanIdentifier;
|
|
}
|
|
|
|
public void setAuditComponent(AuditComponent auditComponent)
|
|
{
|
|
this.auditComponent = auditComponent;
|
|
}
|
|
|
|
public void setTransactionService(TransactionService transactionService)
|
|
{
|
|
this.transactionService = transactionService;
|
|
}
|
|
|
|
public void setThreadPoolExecutor(ThreadPoolExecutor threadPoolExecutor)
|
|
{
|
|
this.threadPoolExecutor = threadPoolExecutor;
|
|
}
|
|
|
|
public Object invoke(MethodInvocation mi) throws Throwable
|
|
{
|
|
// Bypass all auditing if the system is in read-only mode
|
|
if (!transactionService.getAllowWrite())
|
|
{
|
|
return mi.proceed();
|
|
}
|
|
// Shortcut if no audit values are required
|
|
if(!auditComponent.areAuditValuesRequired(AUDIT_PATH_API_ROOT))
|
|
{
|
|
// No auditing or server is read-only
|
|
return mi.proceed();
|
|
}
|
|
else
|
|
{
|
|
// New configuration will be used
|
|
return proceed(mi);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* 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
|
|
{
|
|
// Are we in a nested audit?
|
|
Boolean wasInAudit = inAudit.get();
|
|
try
|
|
{
|
|
// If we are already in a nested audit call, there is nothing to do
|
|
if (wasInAudit != null)
|
|
{
|
|
return mi.proceed();
|
|
}
|
|
|
|
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 = beanIdentifier.getBeanName(mi);
|
|
if (serviceName == null)
|
|
{
|
|
// Not a public service
|
|
return mi.proceed();
|
|
}
|
|
String methodName = mi.getMethod().getName();
|
|
|
|
// Record that we have entered an audit method
|
|
inAudit.set(Boolean.TRUE);
|
|
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
|
|
{
|
|
Map<String, Serializable> preAuditedData = null;
|
|
try
|
|
{
|
|
preAuditedData = auditInvocationBefore(serviceName, methodName, namedArguments);
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
// Failure to audit must stop the process: ALF-11139
|
|
throw new AlfrescoRuntimeException(
|
|
"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, preAuditedData);
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
// Failure to audit must stop the process: ALF-11139
|
|
throw new AlfrescoRuntimeException(
|
|
"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 value = getRecordableValue(args[i]);
|
|
if (value == NOT_RECORDABLE)
|
|
{
|
|
// No viable conversion
|
|
continue;
|
|
}
|
|
|
|
// It is named and recordable
|
|
namedArgs.put(params[i], value);
|
|
}
|
|
// Done
|
|
return namedArgs;
|
|
}
|
|
|
|
/**
|
|
* Returns a value that may be included in audit map data. Called for method arguments and return
|
|
* values. Not all values may be audited. Some cannot be converted to something that can be
|
|
* serialised or may only be read once (so would be damaged). String audit values may be trimmed.
|
|
* @param value to be audited.
|
|
* @return Return {@link NOT_AUDITABLE} if it is not possible to audit the value,a value that may be audited. May be null.
|
|
* @throws TypeConversionException if not possible to convert the original object.
|
|
*/
|
|
private Serializable getRecordableValue(Object value)
|
|
{
|
|
if (value == null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
Serializable audit = instanceofNonAuditClass(value);
|
|
if (audit == null)
|
|
{
|
|
if (value instanceof Serializable)
|
|
{
|
|
audit = (Serializable) value;
|
|
}
|
|
else
|
|
{
|
|
try
|
|
{
|
|
audit = DefaultTypeConverter.INSTANCE.convert(String.class, value);
|
|
}
|
|
catch (TypeConversionException e)
|
|
{
|
|
return NOT_RECORDABLE;
|
|
}
|
|
}
|
|
// Trim strings
|
|
if (audit instanceof String)
|
|
{
|
|
audit = SchemaBootstrap.trimStringForTextFields((String) audit);
|
|
}
|
|
}
|
|
return audit;
|
|
}
|
|
|
|
// Returns a non null value if the supplied value is a non auditable class.
|
|
private Serializable instanceofNonAuditClass(Object value)
|
|
{
|
|
for (@SuppressWarnings("rawtypes") Class clazz: NON_RECORDABLE_CLASSES)
|
|
{
|
|
if (clazz.isInstance(value))
|
|
{
|
|
return NOT_RECORDABLE;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* 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 Map<String, Serializable> auditInvocationBefore(
|
|
final String serviceName,
|
|
final String methodName,
|
|
final Map<String, Serializable> namedArguments)
|
|
{
|
|
String rootPath;
|
|
Map<String, Serializable> auditData;
|
|
if (namedArguments == null || namedArguments.isEmpty())
|
|
{
|
|
rootPath = AuditApplication.buildPath(AUDIT_PATH_API_PRE, serviceName, methodName);
|
|
auditData = new HashMap<String, Serializable>(1);
|
|
auditData.put(AUDIT_SNIPPET_ARGS, null);
|
|
}
|
|
else
|
|
{
|
|
rootPath = AuditApplication.buildPath(AUDIT_PATH_API_PRE, serviceName, methodName, AUDIT_SNIPPET_ARGS);
|
|
auditData = namedArguments;
|
|
}
|
|
|
|
// Audit in a read-write txn
|
|
Map<String, Serializable> auditedData = auditComponent.recordAuditValues(rootPath, auditData);
|
|
// Done
|
|
if (logger.isDebugEnabled() && auditedData.size() > 0)
|
|
{
|
|
logger.debug(
|
|
"Audited before invocation: \n" +
|
|
" Values: " + auditedData);
|
|
}
|
|
return 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>)
|
|
* @param preAuditedData the audited data from before the method call.
|
|
*
|
|
* @since 3.2
|
|
*/
|
|
private void auditInvocationAfter(
|
|
String serviceName, String methodName, Map<String, Serializable> namedArguments,
|
|
Object ret, final Throwable thrown, Map<String, Serializable> preAuditedData)
|
|
{
|
|
final String rootPath = AuditApplication.buildPath(AUDIT_PATH_API_POST, serviceName, methodName);
|
|
|
|
final Map<String, Serializable> auditData = new HashMap<String, Serializable>(23);
|
|
if (namedArguments.isEmpty())
|
|
{
|
|
auditData.put(AUDIT_SNIPPET_ARGS, null);
|
|
}
|
|
else
|
|
{
|
|
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);
|
|
}
|
|
}
|
|
|
|
// Add audited data prior to the method call, so it may be repeated
|
|
for (Entry<String, Serializable> entry: preAuditedData.entrySet())
|
|
{
|
|
String path = AuditApplication.buildPath(AUDIT_SNIPPET_PRE_CALL_DATA, entry.getKey());
|
|
auditData.put(path, entry.getValue());
|
|
}
|
|
|
|
Serializable value = getRecordableValue(ret);
|
|
if (value != null && value != NOT_RECORDABLE)
|
|
{
|
|
auditData.put(AUDIT_SNIPPET_RESULT, value);
|
|
}
|
|
|
|
if (thrown != null)
|
|
{
|
|
// ALF-3055: an exception has occurred - make sure the audit occurs in a new thread
|
|
// rather than a nested transaction to avoid contention for the same audit table
|
|
// ALF-12638: ensure that the new thread context matches the current thread context
|
|
final Authentication authContext = AuthenticationUtil.getFullAuthentication();
|
|
threadPoolExecutor.execute(new Runnable()
|
|
{
|
|
public void run()
|
|
{
|
|
Map<String, Serializable> auditedData;
|
|
|
|
StringBuilder sb = new StringBuilder(1024);
|
|
StackTraceUtil.buildStackTrace(
|
|
thrown.getMessage(), thrown.getStackTrace(), sb, Integer.MAX_VALUE);
|
|
auditData.put(AUDIT_SNIPPET_ERROR, SchemaBootstrap.trimStringForTextFields(sb.toString()));
|
|
|
|
// Ensure we have a transaction
|
|
RetryingTransactionCallback<Map<String, Serializable>> auditCallback =
|
|
new RetryingTransactionCallback<Map<String, Serializable>>()
|
|
{
|
|
public Map<String, Serializable> execute() throws Throwable
|
|
{
|
|
return auditComponent.recordAuditValues(rootPath, auditData);
|
|
}
|
|
};
|
|
try
|
|
{
|
|
AuthenticationUtil.setFullAuthentication(authContext);
|
|
auditedData = transactionService.getRetryingTransactionHelper().doInTransaction(auditCallback, false, true);
|
|
}
|
|
finally
|
|
{
|
|
AuthenticationUtil.clearCurrentSecurityContext();
|
|
}
|
|
|
|
// Done
|
|
if (logger.isDebugEnabled() && auditedData.size() > 0)
|
|
{
|
|
logger.debug(
|
|
"Audited after invocation: \n" +
|
|
(thrown == null ? "" : " Exception: " + thrown.getMessage() + "\n") +
|
|
" Values: " + auditedData);
|
|
}
|
|
}
|
|
});
|
|
}
|
|
else
|
|
{
|
|
Map<String, Serializable> auditedData;
|
|
// 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);
|
|
}
|
|
}
|
|
}
|
|
}
|