You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/05/15 08:13:22 UTC

[sling-org-apache-sling-karaf-integration-tests] 02/02: SLING-10042 Remove read permission on /content for everyone

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git

commit dfd15df5debe7256c73a86531c84a4aabc56e7ce
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed May 12 13:07:57 2021 +0200

    SLING-10042 Remove read permission on /content for everyone
    
    allow everyone read on /content (until tests are adjusted)
---
 .../tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java | 10 ++++++++++
 .../sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java |  1 +
 .../sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java   |  1 +
 3 files changed, 12 insertions(+)

diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java
index 34e3590..899b4b6 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/AbstractSlingQuickstartOakTestSupport.java
@@ -51,6 +51,7 @@ import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.karaf.testing.KarafTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.util.Filter;
 import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
@@ -60,6 +61,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 
 public abstract class AbstractSlingQuickstartOakTestSupport extends KarafTestSupport {
 
@@ -76,6 +78,14 @@ public abstract class AbstractSlingQuickstartOakTestSupport extends KarafTestSup
     public AbstractSlingQuickstartOakTestSupport() {
     }
 
+    protected Option allowEveryoneReadContent() {
+        final String[] scripts = new String[]{
+            "create path (sling:OrderedFolder) /content",
+            "set ACL for everyone\nallow jcr:read on /content\nend"
+        };
+        return editConfigurationFilePut("etc/org.apache.sling.jcr.repoinit.RepositoryInitializer-everyone_read_content.config", "scripts", scripts);
+    }
+
     @Test
     public void testSlingRepository() throws Exception {
         assertNotNull(slingRepository);
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
index df5213b..63e9e17 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
@@ -66,6 +66,7 @@ public class SlingQuickstartOakMongoIT extends AbstractSlingQuickstartOakTestSup
         final String mongoUri = String.format("mongodb://%s:%s", host, port);
         return combine(
             baseConfiguration(),
+            allowEveryoneReadContent(),
             editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "(wrap)"),
             editConfigurationFilePut("etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config", "mongouri", mongoUri),
             addSlingFeatures("sling-quickstart-oak-mongo"),
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java
index 2e5ebc0..4be998e 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java
@@ -38,6 +38,7 @@ public class SlingQuickstartOakTarIT extends AbstractSlingQuickstartOakTestSuppo
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
+            allowEveryoneReadContent(),
             addSlingFeatures("sling-quickstart-oak-tar"),
             addFelixHttpFeature()
         );