You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2018/03/22 13:33:58 UTC
svn commit: r1827487 -
/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java
Author: tripod
Date: Thu Mar 22 13:33:58 2018
New Revision: 1827487
URL: http://svn.apache.org/viewvc?rev=1827487&view=rev
Log:
JCRVLT-278 - Root path ACEs removed due to JCRVLT-227
Added:
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java
Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java?rev=1827487&view=auto
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java (added)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java Thu Mar 22 13:33:58 2018
@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.vault.packaging.integration;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.security.Principal;
+import java.util.Properties;
+import java.util.zip.Deflater;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+import org.apache.jackrabbit.api.JackrabbitSession;
+import org.apache.jackrabbit.api.security.user.User;
+import org.apache.jackrabbit.api.security.user.UserManager;
+import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
+import org.apache.jackrabbit.vault.fs.api.ImportMode;
+import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
+import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
+import org.apache.jackrabbit.vault.fs.config.DefaultMetaInf;
+import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
+import org.apache.jackrabbit.vault.fs.filter.DefaultPathFilter;
+import org.apache.jackrabbit.vault.fs.io.AccessControlHandling;
+import org.apache.jackrabbit.vault.fs.io.Archive;
+import org.apache.jackrabbit.vault.fs.io.ImportOptions;
+import org.apache.jackrabbit.vault.fs.io.Importer;
+import org.apache.jackrabbit.vault.fs.io.ZipStreamArchive;
+import org.apache.jackrabbit.vault.packaging.ExportOptions;
+import org.apache.jackrabbit.vault.packaging.PackageException;
+import org.apache.jackrabbit.vault.packaging.PackageProperties;
+import org.apache.jackrabbit.vault.packaging.VaultPackage;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class TestACEsAtRoot extends IntegrationTestBase {
+
+ @Test
+ public void export() throws RepositoryException, IOException, PackageException, ConfigurationException {
+
+
+ UserManager userManager = ((JackrabbitSession)admin).getUserManager();
+
+ // Create a test user
+
+ String userId = "user1";
+ String userPwd = "pwd1";
+ User user1 = userManager.createUser(userId, userPwd);
+ Principal principal1 = user1.getPrincipal();
+ String userPath = user1.getPath();
+ AccessControlUtils.addAccessControlEntry(admin, userPath, principal1, new String[]{"jcr:all"}, true);
+ String repPolicyPath = String.format("%s/rep:policy", userPath);
+ String profilePath = admin.getNode(userPath).addNode("profile").getPath();
+ admin.save();
+
+ // Setup ACEs at the root path, for the user
+
+ AccessControlUtils.addAccessControlEntry(admin, null, principal1, new String[]{"jcr:namespaceManagement"}, true);
+ AccessControlUtils.addAccessControlEntry(admin, "/", principal1, new String[]{"jcr:read"}, true);
+
+ // Check the number of ACEs at the root
+
+ assertEquals(2, AccessControlUtils.getAccessControlList(admin, "/").getAccessControlEntries().length);
+ assertEquals(1, AccessControlUtils.getAccessControlList(admin, null).getAccessControlEntries().length);
+
+ // Export with the user session
+
+ ExportOptions opts = new ExportOptions();
+ DefaultMetaInf inf = new DefaultMetaInf();
+ DefaultWorkspaceFilter filter = new DefaultWorkspaceFilter();
+
+// PathFilterSet pfilterSet = new PathFilterSet("/");
+// filter.addPropertyFilterSet(pfilterSet);
+
+ PathFilterSet userFilterSet = new PathFilterSet(userPath);
+ userFilterSet.addInclude(new DefaultPathFilter(userPath));
+ filter.add(userFilterSet);
+
+ PathFilterSet profileSet = new PathFilterSet(profilePath);
+ profileSet.addInclude(new DefaultPathFilter(profilePath));
+ filter.add(profileSet);
+
+ PathFilterSet repPolicySet = new PathFilterSet(repPolicyPath);
+ filter.add(repPolicySet);
+
+ inf.setFilter(filter);
+ Properties props = new Properties();
+ props.setProperty(VaultPackage.NAME_VERSION, "0.0.1");
+ props.setProperty(VaultPackage.NAME_GROUP, "jackrabbit/test");
+ props.setProperty(VaultPackage.NAME_NAME, "test-package");
+ props.setProperty(PackageProperties.NAME_USE_BINARY_REFERENCES, "false");
+ inf.setProperties(props);
+
+ opts.setMetaInf(inf);
+ opts.setMountPath("/");
+ opts.setRootPath("/");
+ opts.setCompressionLevel(Deflater.BEST_SPEED);
+
+ File tmpFile = File.createTempFile("vaulttest", "zip");
+ OutputStream os = new FileOutputStream(tmpFile);
+ Session session = repository.login(new SimpleCredentials(userId, userPwd.toCharArray()));
+ packMgr.assemble(session, opts, os);
+ os.close();
+ session.logout();
+
+ // Import with admin session
+
+ clean(userPath);
+
+ ImportOptions importOptions = new ImportOptions();
+ importOptions.setImportMode(ImportMode.UPDATE);
+ importOptions.setAccessControlHandling(AccessControlHandling.OVERWRITE);
+ importOptions.setPatchKeepInRepo(false);
+
+// importOptions.setAccessControlHandling(AccessControlHandling.MERGE);
+
+ Importer importer = new Importer(importOptions);
+ Archive archive = new ZipStreamArchive(new FileInputStream(tmpFile));
+ archive.open(true);
+
+
+ importer.run(archive, admin.getRootNode());
+ if (admin.hasPendingChanges()) {
+ admin.save();
+ }
+
+ archive.close();
+
+ // Check the number of ACEs at the root, the count should not have changed.
+
+ assertNodeExists(userPath);
+ assertEquals(2, AccessControlUtils.getAccessControlList(admin, "/").getAccessControlEntries().length);
+ assertEquals(1, AccessControlUtils.getAccessControlList(admin, null).getAccessControlEntries().length);
+
+ tmpFile.delete();
+
+ }
+
+}
+