From 55b2d10d06b2a808d12a2fe0857b3d0bce4a0853 Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Fri, 21 May 2021 15:57:13 -0400 Subject: [PATCH 1/5] #2589 - Fixes issues with 6.4.8 compat. - Issues with too-modern repo init set properties - Issues with sling service user mapping --- ...poinit.RepositoryInitializer-aem-cs.config | 22 ++++++++-------- ...viceUserMapperImpl.amended-acs-commons.xml | 9 +++++++ ...eUserMapperImpl.amended~acs-commons.config | 25 ------------------- .../main/content/META-INF/vault/filter.xml | 3 +++ .../global/settings/redirects/.content.xml | 4 +++ 5 files changed, 27 insertions(+), 36 deletions(-) create mode 100644 ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml delete mode 100644 ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~acs-commons.config create mode 100644 ui.content/src/main/content/jcr_root/conf/global/settings/redirects/.content.xml diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config index 45d1642bb7..a902a57e50 100644 --- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config @@ -5,13 +5,19 @@ create path /content/cq:tags(sling:Folder) create path /etc/packages(sling:Folder) # create default contextual configuration for redirects: /conf/global/settings/redirects -create path /conf/global(sling:Folder)/settings(sling:Folder)/redirects(nt:unstructured) -set properties on /conf/global/settings/redirects - set sling:resourceType{String} to acs-commons/components/utilities/manage-redirects/redirects -end +create path /conf/global(sling:Folder) +create path /conf/global/settings(sling:Folder) +create path /conf/global/settings/redirects(nt:unstructured) + +# Not supported in 6.4.8 +#set properties on /conf/global/settings/redirects +# set sling:resourceType{String} to acs-commons/components/utilities/manage-redirects/redirects +#end + # user to invalidate cached redirects on change create service user acs-commons-manage-redirects-service with path system/acs-aem-commons set ACL for acs-commons-manage-redirects-service + allow jcr:read on / allow jcr:read on /conf end @@ -20,7 +26,7 @@ set ACL for anonymous allow jcr:read on /conf restriction(rep:glob,/*/settings/redirects) end -create service user acs-commons-automatic-package-replicator-service with path system/acs-commons +create service user acs-commons-automatic-package-replicator-service with path system/acs-aem-commons set ACL for acs-commons-automatic-package-replicator-service allow jcr:read,jcr:versionManagement,rep:write,crx:replicate on /etc/packages allow jcr:read on / @@ -41,12 +47,6 @@ set ACL for acs-commons-remote-assets-service # If /etc/tags is used, these ACLs be set manually - if RepoInit defines this structure, it supersedes the use of /content/cq:tags # allow jcr:read, jcr:versionManagement, rep:write, crx:replicate on /etc/tags end - -create service user acs-commons-manage-redirects-service with path system/acs-aem-commons -set ACL for acs-commons-manage-redirects-service - allow jcr:read on / -end - " ] diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml new file mode 100644 index 0000000000..25916848c9 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~acs-commons.config b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~acs-commons.config deleted file mode 100644 index 675e882076..0000000000 --- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~acs-commons.config +++ /dev/null @@ -1,25 +0,0 @@ -user.mapping=[ \ - "com.adobe.acs.acs-aem-commons-bundle:ensure-oak-index\=[acs-commons-ensure-oak-index-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:email-service\=[acs-commons-email-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:httpcache-jcr-storage-service\=[acs-commons-httpcache-jcr-storage-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:review-task-asset-mover\=[acs-commons-review-task-asset-mover-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:error-page-handler\=[acs-commons-error-page-handler-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:form-helper\=[acs-commons-form-helper-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:dispatcher-flush\=[acs-commons-dispatcher-flush-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:package-replication-status-event-listener\=[acs-commons-package-replication-status-event-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:component-error-handler\=[acs-commons-component-error-handler-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:system-notifications\=[acs-commons-system-notifications-service]", \ - "com.adobe.acs.acs-aem-commons-bundle-twitter:twitter-updater\=[acs-commons-twitter-updater-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:workflow-remover\=[acs-commons-workflow-remover-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:bulk-workflow\=[acs-commons-bulk-workflow-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:bulk-workflow-runner\=[workflow-process-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:ensure-service-user\=[acs-commons-ensure-service-user-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:shared-component-props\=[acs-commons-shared-component-props-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:manage-controlled-processes\=[acs-commons-manage-controlled-processes-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:automatic-package-replicator\=[acs-commons-automatic-package-replicator-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:on-deploy-scripts\=[acs-commons-on-deploy-scripts-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:remote-assets\=[acs-commons-remote-assets-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:workflowpackagemanager-service\=[acs-commons-workflowpackagemanager-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:redirect-manager\=[acs-commons-manage-redirects-service]", \ - "com.adobe.acs.acs-aem-commons-bundle:file-fetch\=[acs-commons-file-fetch-service]" \ -] diff --git a/ui.content/src/main/content/META-INF/vault/filter.xml b/ui.content/src/main/content/META-INF/vault/filter.xml index 29cb10ebc8..c7a4729dcb 100644 --- a/ui.content/src/main/content/META-INF/vault/filter.xml +++ b/ui.content/src/main/content/META-INF/vault/filter.xml @@ -3,6 +3,9 @@ + + + diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/redirects/.content.xml b/ui.content/src/main/content/jcr_root/conf/global/settings/redirects/.content.xml new file mode 100644 index 0000000000..83239625a7 --- /dev/null +++ b/ui.content/src/main/content/jcr_root/conf/global/settings/redirects/.content.xml @@ -0,0 +1,4 @@ + + From 82aa331db95a06b128954d2aaa3260af3eccdfef Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Mon, 24 May 2021 11:07:59 -0400 Subject: [PATCH 2/5] #2589 - Formatting of XML --- ...viceUserMapperImpl.amended-acs-commons.xml | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml index 25916848c9..ff2f82c1c4 100644 --- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml @@ -2,7 +2,31 @@ + user.mapping="[ + com.adobe.acs.acs-aem-commons-bundle:ensure-oak-index=[acs-commons-ensure-oak-index-service], + com.adobe.acs.acs-aem-commons-bundle:email-service=[acs-commons-email-service], + com.adobe.acs.acs-aem-commons-bundle:httpcache-jcr-storage-service=[acs-commons-httpcache-jcr-storage-service], + com.adobe.acs.acs-aem-commons-bundle:review-task-asset-mover=[acs-commons-review-task-asset-mover-service], + com.adobe.acs.acs-aem-commons-bundle:error-page-handler=[acs-commons-error-page-handler-service], + com.adobe.acs.acs-aem-commons-bundle:form-helper=[acs-commons-form-helper-service], + com.adobe.acs.acs-aem-commons-bundle:dispatcher-flush=[acs-commons-dispatcher-flush-service], + com.adobe.acs.acs-aem-commons-bundle:package-replication-status-event-listener=[acs-commons-package-replication-status-event-service], + com.adobe.acs.acs-aem-commons-bundle:component-error-handler=[acs-commons-component-error-handler-service], + com.adobe.acs.acs-aem-commons-bundle:system-notifications=[acs-commons-system-notifications-service], + com.adobe.acs.acs-aem-commons-bundle-twitter:twitter-updater=[acs-commons-twitter-updater-service], + com.adobe.acs.acs-aem-commons-bundle:workflow-remover=[acs-commons-workflow-remover-service], + com.adobe.acs.acs-aem-commons-bundle:bulk-workflow=[acs-commons-bulk-workflow-service], + com.adobe.acs.acs-aem-commons-bundle:bulk-workflow-runner=[workflow-process-service], + com.adobe.acs.acs-aem-commons-bundle:ensure-service-user=[acs-commons-ensure-service-user-service], + com.adobe.acs.acs-aem-commons-bundle:shared-component-props=[acs-commons-shared-component-props-service], + com.adobe.acs.acs-aem-commons-bundle:manage-controlled-processes=[acs-commons-manage-controlled-processes-service], + com.adobe.acs.acs-aem-commons-bundle:automatic-package-replicator=[acs-commons-automatic-package-replicator-service], + com.adobe.acs.acs-aem-commons-bundle:on-deploy-scripts=[acs-commons-on-deploy-scripts-service], + com.adobe.acs.acs-aem-commons-bundle:remote-assets=[acs-commons-remote-assets-service], + com.adobe.acs.acs-aem-commons-bundle:workflowpackagemanager-service=[acs-commons-workflowpackagemanager-service], + com.adobe.acs.acs-aem-commons-bundle:redirect-manager=[acs-commons-manage-redirects-service], + com.adobe.acs.acs-aem-commons-bundle:file-fetch=[acs-commons-file-fetch-service] + ]"/> From 394d6ec73bb81aec76736e339b8eef370bcf3434 Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Mon, 24 May 2021 11:33:46 -0400 Subject: [PATCH 3/5] #2589 - reverted path change --- ...che.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config index a902a57e50..afa76040b8 100644 --- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config @@ -11,7 +11,7 @@ create path /conf/global/settings/redirects(nt:unstructured) # Not supported in 6.4.8 #set properties on /conf/global/settings/redirects -# set sling:resourceType{String} to acs-commons/components/utilities/manage-redirects/redirects +# set sling:resourceType{String} to acs-commons/components/utilitiacs-commons-automatic-package-replicator-servicees/manage-redirects/redirects #end # user to invalidate cached redirects on change @@ -26,7 +26,7 @@ set ACL for anonymous allow jcr:read on /conf restriction(rep:glob,/*/settings/redirects) end -create service user acs-commons-automatic-package-replicator-service with path system/acs-aem-commons +create service user acs-commons-automatic-package-replicator-service with path system/acs-commons set ACL for acs-commons-automatic-package-replicator-service allow jcr:read,jcr:versionManagement,rep:write,crx:replicate on /etc/packages allow jcr:read on / From 55a0924723a4391baa23e0fa67bb19557557a3e0 Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Mon, 24 May 2021 13:06:26 -0400 Subject: [PATCH 4/5] #2589 - Fixed mangled comment --- ...pache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config index afa76040b8..ab7130f937 100644 --- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config @@ -11,7 +11,7 @@ create path /conf/global/settings/redirects(nt:unstructured) # Not supported in 6.4.8 #set properties on /conf/global/settings/redirects -# set sling:resourceType{String} to acs-commons/components/utilitiacs-commons-automatic-package-replicator-servicees/manage-redirects/redirects +# set sling:resourceType{String} to acs-commons/components/utilities/manage-redirects/redirects #end # user to invalidate cached redirects on change From 8469af6c61aeb8d0f7be6d23a741311791cb2684 Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Tue, 25 May 2021 15:18:48 -0400 Subject: [PATCH 5/5] #2589 - Reverted to .config format, using older `-` factory filename separation --- CHANGELOG.md | 1 + ...eUserMapperImpl.amended-acs-commons.config | 25 ++++++++++++++ ...viceUserMapperImpl.amended-acs-commons.xml | 33 ------------------- 3 files changed, 26 insertions(+), 33 deletions(-) create mode 100644 ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.config delete mode 100644 ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 7155a70ccf..0829a4a852 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com) ### Fixed - #2581 - Versioned ClientLibs no longer works with proxied clientlibs - #2562 - Fixed cache refresh on versioned clientlibs request when enforceMd5 is false (default). +- #2590- Fixed issue on 6.4.x with Service User mappings not being registered due to unsupported filename format of OSGi config. ### Added - #2536 - Extended renovator MCP Process to handle audit trail entries of moved assets and pages. diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.config b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.config new file mode 100644 index 0000000000..675e882076 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.config @@ -0,0 +1,25 @@ +user.mapping=[ \ + "com.adobe.acs.acs-aem-commons-bundle:ensure-oak-index\=[acs-commons-ensure-oak-index-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:email-service\=[acs-commons-email-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:httpcache-jcr-storage-service\=[acs-commons-httpcache-jcr-storage-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:review-task-asset-mover\=[acs-commons-review-task-asset-mover-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:error-page-handler\=[acs-commons-error-page-handler-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:form-helper\=[acs-commons-form-helper-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:dispatcher-flush\=[acs-commons-dispatcher-flush-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:package-replication-status-event-listener\=[acs-commons-package-replication-status-event-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:component-error-handler\=[acs-commons-component-error-handler-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:system-notifications\=[acs-commons-system-notifications-service]", \ + "com.adobe.acs.acs-aem-commons-bundle-twitter:twitter-updater\=[acs-commons-twitter-updater-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:workflow-remover\=[acs-commons-workflow-remover-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:bulk-workflow\=[acs-commons-bulk-workflow-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:bulk-workflow-runner\=[workflow-process-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:ensure-service-user\=[acs-commons-ensure-service-user-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:shared-component-props\=[acs-commons-shared-component-props-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:manage-controlled-processes\=[acs-commons-manage-controlled-processes-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:automatic-package-replicator\=[acs-commons-automatic-package-replicator-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:on-deploy-scripts\=[acs-commons-on-deploy-scripts-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:remote-assets\=[acs-commons-remote-assets-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:workflowpackagemanager-service\=[acs-commons-workflowpackagemanager-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:redirect-manager\=[acs-commons-manage-redirects-service]", \ + "com.adobe.acs.acs-aem-commons-bundle:file-fetch\=[acs-commons-file-fetch-service]" \ +] diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml b/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml deleted file mode 100644 index ff2f82c1c4..0000000000 --- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - -