From 095b910fd1d735776a6067b91ee1898b2326d220 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 22 Apr 2016 13:45:13 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 125686: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 125578 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 125558 ltuca: MNT-16163 : Custom Type - ... in Description 124858: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 124799 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 124794 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) 124785 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7) 124784 adavis: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11) 124775 cturlica: MNT-15921: CLONE - 4.1.10: invite and other emails 124817: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 124814 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) << Similar change required in nb, pt_BR, ru, zh_CN files that don't exist in 5.0.N >> 124691 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) 124688 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7) 124686 amukha: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1-BUG-FIX (4.1.11) 124681 cturlica: MNT-15919: into invite and other emails - on premise email template changes part III, 124697: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 124693 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 124691 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) 124688 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7) 124686 amukha: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1-BUG-FIX (4.1.11) 124681 cturlica: MNT-15919: into invite and other emails - on premise email template changes part III, 124634: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 124625 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 124619 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) 124611 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7) 124609 amukha: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11) 124606 amukha: MNT-15921: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1.10 (4.1.10.10) 124594 cturlica: MNT-15919: into invite and other emails - on premise email template changes part II, 124633: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 124624 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 124618 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) 124610 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7) 124608 amukha: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11) 124605 amukha: MNT-15921: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1.10 (4.1.10.10) 124567 cturlica: MNT-15919: into invite and other emails - on premise email template changes, 124367: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 124349 adavis: Merged 5.1.0-CLOUD43 (Cloud ) to 5.1.N (5.1.2) 123596 skopf: ACE-2540 - commits without changes: 123860,123908,124221,124223,124227,124279,124366, 124368,124479,124522,124531,124700,124855,124857,124859,124873,124957, 124961-124962,125057,125154,125234,125236,125325,125348,125389,125519-125520, 125590,125685,125687-125688 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@125701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repository/forms/formdefinition.lib.ftl | 2 +- .../opencmis/PublicApiAlfrescoCmisService.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.lib.ftl index 2aa4d58f75..96ff2f3f46 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.lib.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.lib.ftl @@ -26,7 +26,7 @@ { "name": "${field.name}", "label": "${field.label!""}", - <#if field.description??>"description": "${field.description}", + <#if field.description??>"description": "${field.description?js_string?html}", <#if field.indexTokenisationMode??>"indexTokenisationMode": "${field.indexTokenisationMode}", "protectedField": ${field.protectedField?string}, <#if field.defaultValue??>"defaultValue": "${field.defaultValue}", diff --git a/source/java/org/alfresco/opencmis/PublicApiAlfrescoCmisService.java b/source/java/org/alfresco/opencmis/PublicApiAlfrescoCmisService.java index 38459029d8..f4e8711b91 100644 --- a/source/java/org/alfresco/opencmis/PublicApiAlfrescoCmisService.java +++ b/source/java/org/alfresco/opencmis/PublicApiAlfrescoCmisService.java @@ -125,9 +125,19 @@ public class PublicApiAlfrescoCmisService extends AlfrescoCmisServiceImpl @Override public RepositoryInfo getRepositoryInfo(String repositoryId, ExtensionsData extension) { - checkRepositoryId(repositoryId); + Network network = null; + + try + { + checkRepositoryId(repositoryId); + network = networksService.getNetwork(repositoryId); + } + catch(Exception e) + { + // ACE-2540: Avoid information leak. Same response if repository does not exist or if user is not a member + throw new CmisObjectNotFoundException("Unknown repository '" + repositoryId + "'!"); + } - Network network = networksService.getNetwork(repositoryId); return getRepositoryInfo(network); }