You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2015/04/09 21:34:21 UTC
svn commit: r1672469 [1/2] -
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/
Author: angela
Date: Thu Apr 9 19:34:21 2015
New Revision: 1672469
URL: http://svn.apache.org/r1672469
Log:
OAK-2742 : Add UserImport tests that run with a non-admin session
Added:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithPoliciesTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithoutAdminTest.java
- copied, changed from r1671848, jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportAbortTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportBestEffortTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportIgnoreTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/SystemUserImportTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportAbortTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportBestEffortTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportFromJackrabbit.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportIgnoreTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java?rev=1672469&r1=1672468&r2=1672469&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java Thu Apr 9 19:34:21 2015
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.jcr.se
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -48,7 +47,6 @@ import org.apache.jackrabbit.oak.spi.xml
import org.apache.jackrabbit.test.NotExecutableException;
import org.junit.After;
import org.junit.Before;
-import org.junit.Test;
import static org.apache.jackrabbit.oak.jcr.AbstractRepositoryTest.dispose;
import static org.junit.Assert.assertFalse;
@@ -155,8 +153,16 @@ public abstract class AbstractImportTest
protected abstract String getTargetPath();
+ protected Session getImportSession() {
+ return adminSession;
+ }
+
+ protected UserManager getUserManager() throws RepositoryException {
+ return ((JackrabbitSession) getImportSession()).getUserManager();
+ }
+
protected Node getTargetNode() throws RepositoryException {
- return adminSession.getNode(getTargetPath());
+ return getImportSession().getNode(getTargetPath());
}
protected String getExistingUUID() throws RepositoryException {
@@ -171,6 +177,10 @@ public abstract class AbstractImportTest
}
protected void doImport(String parentPath, String xml, int importUUIDBehavior) throws Exception {
+ doImport(getImportSession(), parentPath, xml, importUUIDBehavior);
+ }
+
+ protected void doImport(Session importSession, String parentPath, String xml, int importUUIDBehavior) throws Exception {
InputStream in;
if (xml.charAt(0) == '<') {
in = new ByteArrayInputStream(xml.getBytes());
@@ -182,7 +192,7 @@ public abstract class AbstractImportTest
in = getClass().getResourceAsStream(xml);
}
try {
- adminSession.importXML(parentPath, in, importUUIDBehavior);
+ importSession.importXML(parentPath, in, importUUIDBehavior);
} finally {
in.close();
}
@@ -196,24 +206,4 @@ public abstract class AbstractImportTest
assertFalse(potentialID.equals(session.getNode(member.getPath()).getIdentifier()));
}
}
-
- private String getTestXml() {
- StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
- for (StackTraceElement element : stackTraceElements) {
- try {
- Class<?> clazz = Class.forName(element.getClassName());
- for (Method method : clazz.getMethods()){
- if(method.getName().equals(element.getMethodName())){
- if (method.getAnnotation(Test.class) != null) {
- return clazz.getSimpleName() + "-" + method.getName() + ".xml";
- }
- }
-
- }
- } catch (Exception e) {
- // oops do something here
- }
- }
- throw new IllegalArgumentException("no import xml given.");
- }
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportAbortTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportAbortTest.java?rev=1672469&r1=1672468&r2=1672469&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportAbortTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportAbortTest.java Thu Apr 9 19:34:21 2015
@@ -64,7 +64,7 @@ public class GroupImportAbortTest extend
} catch (RepositoryException e) {
// success as well
} finally {
- adminSession.refresh(false);
+ getImportSession().refresh(false);
}
}
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportBestEffortTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportBestEffortTest.java?rev=1672469&r1=1672468&r2=1672469&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportBestEffortTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportBestEffortTest.java Thu Apr 9 19:34:21 2015
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.UUID;
import javax.jcr.Node;
import javax.jcr.PropertyType;
+import javax.jcr.Session;
import javax.jcr.Value;
import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -57,6 +58,7 @@ public class GroupImportBestEffortTest e
invalid.add(UUID.randomUUID().toString()); // random uuid
invalid.add(getExistingUUID()); // uuid of non-authorizable node
+ Session s = getImportSession();
for (String id : invalid) {
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<sv:node sv:name=\"gFolder\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
@@ -70,11 +72,11 @@ public class GroupImportBestEffortTest e
try {
// BESTEFFORT behavior -> must import non-existing members.
doImport(getTargetPath(), xml);
- Authorizable a = userMgr.getAuthorizable("g1");
+ Authorizable a = getUserManager().getAuthorizable("g1");
if (a.isGroup()) {
// the rep:members property must contain the invalid value
boolean found = false;
- Node grNode = adminSession.getNode(a.getPath());
+ Node grNode = s.getNode(a.getPath());
for (Value memberValue : grNode.getProperty(UserConstants.REP_MEMBERS).getValues()) {
assertEquals(PropertyType.WEAKREFERENCE, memberValue.getType());
if (id.equals(memberValue.getString())) {
@@ -85,12 +87,12 @@ public class GroupImportBestEffortTest e
assertTrue("ImportBehavior.BESTEFFORT must import non-existing members.",found);
// declared members must not list the invalid entry.
- assertNotDeclaredMember((Group) a, id, adminSession);
+ assertNotDeclaredMember((Group) a, id, s);
} else {
fail("'g1' was not imported as Group.");
}
} finally {
- adminSession.refresh(false);
+ s.refresh(false);
}
}
}
@@ -100,7 +102,7 @@ public class GroupImportBestEffortTest e
String g1Id = "0120a4f9-196a-3f9e-b9f5-23f31f914da7";
String nonExistingId = "b2f5ff47-4366-31b6-a533-d8dc3614845d"; // groupId of 'g' group.
- if (userMgr.getAuthorizable("g") != null) {
+ if (getUserManager().getAuthorizable("g") != null) {
throw new NotExecutableException();
}
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
@@ -115,11 +117,11 @@ public class GroupImportBestEffortTest e
// BESTEFFORT behavior -> must import non-existing members.
doImport(getTargetPath(), xml);
- Authorizable g1 = userMgr.getAuthorizable("g1");
+ Authorizable g1 = getUserManager().getAuthorizable("g1");
if (g1.isGroup()) {
// the rep:members property must contain the invalid value
boolean found = false;
- Node grNode = adminSession.getNode(g1.getPath());
+ Node grNode = getImportSession().getNode(g1.getPath());
for (Value memberValue : grNode.getProperty(UserConstants.REP_MEMBERS).getValues()) {
assertEquals(PropertyType.WEAKREFERENCE, memberValue.getType());
if (nonExistingId.equals(memberValue.getString())) {
@@ -138,7 +140,7 @@ public class GroupImportBestEffortTest e
String g1Id = "0120a4f9-196a-3f9e-b9f5-23f31f914da7";
String nonExistingId = "b2f5ff47-4366-31b6-a533-d8dc3614845d"; // groupId of 'g' group.
- if (userMgr.getAuthorizable("g") != null) {
+ if (getUserManager().getAuthorizable("g") != null) {
throw new NotExecutableException();
}
@@ -174,10 +176,10 @@ public class GroupImportBestEffortTest e
*/
doImport(getTargetPath() + "/gFolder", xml2);
- Authorizable g = userMgr.getAuthorizable("g");
+ Authorizable g = getUserManager().getAuthorizable("g");
assertNotNull(g);
if (g.isGroup()) {
- assertNotDeclaredMember((Group) g, g1Id, adminSession);
+ assertNotDeclaredMember((Group) g, g1Id, getImportSession());
} else {
fail("'g' was not imported as Group.");
}
@@ -199,10 +201,10 @@ public class GroupImportBestEffortTest e
"</sv:node>";
doImport(getTargetPath(), xml);
- User user = userMgr.createUser("angi", "pw");
- adminSession.save();
+ User user = getUserManager().createUser("angi", "pw");
+ getImportSession().save();
- Group g1 = (Group) userMgr.getAuthorizable("g1");
+ Group g1 = (Group) getUserManager().getAuthorizable("g1");
assertTrue(g1.isMember(user));
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportIgnoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportIgnoreTest.java?rev=1672469&r1=1672468&r2=1672469&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportIgnoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportIgnoreTest.java Thu Apr 9 19:34:21 2015
@@ -56,9 +56,9 @@ public class GroupImportIgnoreTest exten
"</sv:node>";
doImport(getTargetPath(), xml);
// no exception during import -> member must have been ignored though.
- Authorizable a = userMgr.getAuthorizable("g1");
+ Authorizable a = getUserManager().getAuthorizable("g1");
if (a.isGroup()) {
- assertNotDeclaredMember((Group) a, invalidId, adminSession);
+ assertNotDeclaredMember((Group) a, invalidId, getImportSession());
} else {
fail("'g1' was not imported as Group.");
}
@@ -84,14 +84,14 @@ public class GroupImportIgnoreTest exten
// there should be no exception during import,
// but invalid members must be ignored.
doImport(getTargetPath(), xml);
- Authorizable a = userMgr.getAuthorizable("g1");
+ Authorizable a = getUserManager().getAuthorizable("g1");
if (a.isGroup()) {
- assertNotDeclaredMember((Group) a, id, adminSession);
+ assertNotDeclaredMember((Group) a, id, getImportSession());
} else {
fail("'g1' was not imported as Group.");
}
} finally {
- adminSession.refresh(false);
+ getImportSession().refresh(false);
}
}
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java?rev=1672469&r1=1672468&r2=1672469&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java Thu Apr 9 19:34:21 2015
@@ -23,13 +23,14 @@ import java.util.List;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.jcr.nodetype.ConstraintViolationException;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
+import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
-import org.junit.Ignore;
import org.junit.Test;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -67,15 +68,17 @@ public class GroupImportTest extends Abs
doImport(getTargetPath(), xml);
assertTrue(target.isModified());
- assertTrue(adminSession.hasPendingChanges());
- Authorizable newGroup = userMgr.getAuthorizable("g");
+ Session s = getImportSession();
+ assertTrue(s.hasPendingChanges());
+
+ Authorizable newGroup = getUserManager().getAuthorizable("g");
assertNotNull(newGroup);
assertTrue(newGroup.isGroup());
assertEquals("g", newGroup.getPrincipal().getName());
assertEquals("g", newGroup.getID());
- Node n = adminSession.getNode(newGroup.getPath());
+ Node n = s.getNode(newGroup.getPath());
assertTrue(n.isNew());
assertTrue(n.getParent().isSame(target));
@@ -84,7 +87,7 @@ public class GroupImportTest extends Abs
// saving changes of the import -> must succeed. add mandatory
// props should have been created.
- adminSession.save();
+ s.save();
}
@Test
@@ -108,7 +111,7 @@ public class GroupImportTest extends Abs
try {
doImport(getTargetPath(), xml);
- adminSession.save();
+ getImportSession().save();
fail("Import must detect conflicting principals.");
} catch (RepositoryException e) {
@@ -124,6 +127,7 @@ public class GroupImportTest extends Abs
" <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
" <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g</sv:value><sv:value>g2</sv:value><sv:value>g</sv:value></sv:property></sv:node>";
+ Session s = getImportSession();
/*
importing a group with a multi-valued rep:principalName property
- nonProtected node rep:Group must be created.
@@ -135,9 +139,9 @@ public class GroupImportTest extends Abs
doImport(getTargetPath(), xml);
assertTrue(target.isModified());
- assertTrue(adminSession.hasPendingChanges());
+ assertTrue(s.hasPendingChanges());
- Authorizable newGroup = userMgr.getAuthorizable("g");
+ Authorizable newGroup = getUserManager().getAuthorizable("g");
assertNotNull(newGroup);
assertTrue(target.hasNode("g"));
@@ -146,7 +150,7 @@ public class GroupImportTest extends Abs
// saving changes of the import -> must fail as mandatory prop is missing
try {
- adminSession.save();
+ s.save();
fail("Import must be incomplete. Saving changes must fail.");
} catch (ConstraintViolationException e) {
// success
@@ -168,7 +172,7 @@ public class GroupImportTest extends Abs
doImport(getTargetPath(), xml);
// saving changes of the import -> must fail as mandatory prop is missing
try {
- adminSession.save();
+ getImportSession().save();
fail("Import must be incomplete. Saving changes must fail.");
} catch (ConstraintViolationException e) {
// success
@@ -197,16 +201,17 @@ public class GroupImportTest extends Abs
doImport(getTargetPath(), xml);
- Group g = (Group) userMgr.getAuthorizable("g");
+ Group g = (Group) getUserManager().getAuthorizable("g");
assertNotNull(g);
- Group g1 = (Group) userMgr.getAuthorizable("g1");
+ Group g1 = (Group) getUserManager().getAuthorizable("g1");
assertNotNull(g1);
- Node n = adminSession.getNode(g1.getPath());
+ Session s = getImportSession();
+ Node n = s.getNode(g1.getPath());
assertTrue(n.hasProperty(UserConstants.REP_MEMBERS) || n.hasNode(UserConstants.NT_REP_MEMBERS));
// getWeakReferences only works upon save.
- adminSession.save();
+ s.save();
assertTrue(g1.isMember(g));
}
@@ -232,24 +237,26 @@ public class GroupImportTest extends Abs
doImport(getTargetPath(), xml);
- Group g = (Group) userMgr.getAuthorizable("g");
+ Group g = (Group) getUserManager().getAuthorizable("g");
assertNotNull(g);
- Group g1 = (Group) userMgr.getAuthorizable("g1");
+ Group g1 = (Group) getUserManager().getAuthorizable("g1");
assertNotNull(g1);
- Node n = adminSession.getNode(g1.getPath());
+ Session s = getImportSession();
+ Node n = s.getNode(g1.getPath());
assertTrue(n.hasProperty(UserConstants.REP_MEMBERS) || n.hasNode(UserConstants.NT_REP_MEMBERS));
// getWeakReferences only works upon save.
- adminSession.save();
+ s.save();
assertTrue(g1.isMember(g));
}
@Test
public void testImportMembers() throws Exception {
- Authorizable admin = checkNotNull(userMgr.getAuthorizable(UserConstants.DEFAULT_ADMIN_ID));
- String uuid = adminSession.getNode(admin.getPath()).getUUID();
+ Session s = getImportSession();
+ Authorizable admin = checkNotNull(getUserManager().getAuthorizable(UserConstants.DEFAULT_ADMIN_ID));
+ String uuid = s.getNode(admin.getPath()).getUUID();
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<sv:node sv:name=\"gFolder\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
" <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:AuthorizableFolder</sv:value></sv:property>" +
@@ -263,11 +270,11 @@ public class GroupImportTest extends Abs
doImport(getTargetPath(), xml);
- Group g1 = (Group) userMgr.getAuthorizable("g1");
+ Group g1 = (Group) getUserManager().getAuthorizable("g1");
assertNotNull(g1);
// getWeakReferences only works upon save.
- adminSession.save();
+ s.save();
assertTrue(g1.isMember(admin));
@@ -280,8 +287,9 @@ public class GroupImportTest extends Abs
@Test
public void testImportMembersWithIdDifferentFromNodeName() throws Exception {
- Authorizable admin = checkNotNull(userMgr.getAuthorizable(UserConstants.DEFAULT_ADMIN_ID));
- String uuid = adminSession.getNode(admin.getPath()).getUUID();
+ Session s = getImportSession();
+ Authorizable admin = checkNotNull(getUserManager().getAuthorizable(UserConstants.DEFAULT_ADMIN_ID));
+ String uuid = s.getNode(admin.getPath()).getUUID();
// deliberately put the 'rep:members' before the 'rep:authorizableId' to cover OAK-2367
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<sv:node sv:name=\"gFolder\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
@@ -297,11 +305,11 @@ public class GroupImportTest extends Abs
doImport(getTargetPath(), xml);
- Group g1 = (Group) userMgr.getAuthorizable("g1");
+ Group g1 = (Group) getUserManager().getAuthorizable("g1");
assertNotNull(g1);
// getWeakReferences only works upon save.
- adminSession.save();
+ s.save();
assertTrue(g1.isMember(admin));
@@ -315,48 +323,53 @@ public class GroupImportTest extends Abs
@Test
public void testImportGroupMembersFromNodes() throws Exception {
List<String> createdUsers = new LinkedList<String>();
- Node target = getTargetNode();
+
+ Session s = getImportSession();
+ UserManager uMgr = getUserManager();
+
try {
String[] users = {"angi", "adi", "hansi", "lisi", "luzi", "susi", "pipi", "hari", "gabi", "eddi",
"debbi", "cati", "admin", "anonymous"};
for (String user : users) {
- if (userMgr.getAuthorizable(user) == null) {
- userMgr.createUser(user, user);
+ if (uMgr.getAuthorizable(user) == null) {
+ uMgr.createUser(user, user);
createdUsers.add(user);
}
}
- if (!userMgr.isAutoSave()) {
- adminSession.save();
+ if (!uMgr.isAutoSave()) {
+ s.save();
}
- doImport(getTargetPath(), getClass().getSimpleName() + "-testImportGroupMembersFromNodes.xml");
- if (!userMgr.isAutoSave()) {
- adminSession.save();
+ doImport(getTargetPath(), "GroupImportTest-testImportGroupMembersFromNodes.xml");
+ if (!uMgr.isAutoSave()) {
+ s.save();
}
- Authorizable aShrimps = userMgr.getAuthorizable("shrimps");
+ Authorizable aShrimps = uMgr.getAuthorizable("shrimps");
assertNotNull("Shrimps authorizable must exist", aShrimps);
assertTrue("Shrimps authorizable must be a group", aShrimps.isGroup());
Group gShrimps = (Group) aShrimps;
for (String user : users) {
- assertTrue(user + " should be member of " + gShrimps, gShrimps.isMember(userMgr.getAuthorizable(user)));
+ assertTrue(user + " should be member of " + gShrimps, gShrimps.isMember(uMgr.getAuthorizable(user)));
}
} finally {
- adminSession.refresh(false);
for (String user : createdUsers) {
- Authorizable a = userMgr.getAuthorizable(user);
+ Authorizable a = uMgr.getAuthorizable(user);
if (a != null && !a.isGroup()) {
a.remove();
}
}
- for (NodeIterator it = target.getNodes(); it.hasNext(); ) {
- it.nextNode().remove();
+ for (NodeIterator it = s.getNode(getTargetPath()).getNodes(); it.hasNext(); ) {
+ Node n = it.nextNode();
+ if (!n.getDefinition().isProtected()) {
+ n.remove();
+ }
}
- adminSession.save();
+ s.save();
}
}
@@ -366,55 +379,60 @@ public class GroupImportTest extends Abs
@Test
public void testImportGroupMembersFromOakNodes() throws Exception {
List<String> createdUsers = new LinkedList<String>();
- Node target = getTargetNode();
+
+ Session s = getImportSession();
+ UserManager uMgr = getUserManager();
+
try {
for (int i=0; i<32; i++) {
String user = "testUser" + i;
- if (userMgr.getAuthorizable(user) == null) {
- userMgr.createUser(user, user);
+ if (uMgr.getAuthorizable(user) == null) {
+ uMgr.createUser(user, user);
createdUsers.add(user);
}
}
- if (!userMgr.isAutoSave()) {
- adminSession.save();
+ if (!uMgr.isAutoSave()) {
+ s.save();
}
- doImport(getTargetPath(), getClass().getSimpleName() + "-testImportGroupMembersFromOakNodes.xml");
- if (!userMgr.isAutoSave()) {
- adminSession.save();
+ doImport(getTargetPath(), "GroupImportTest-testImportGroupMembersFromOakNodes.xml");
+ if (!uMgr.isAutoSave()) {
+ s.save();
}
- Authorizable authorizable = userMgr.getAuthorizable("testGroup");
+ Authorizable authorizable = uMgr.getAuthorizable("testGroup");
assertNotNull("testGroup authorizable must exist", authorizable);
assertTrue("testGroup authorizable must be a group", authorizable.isGroup());
Group testGroup = (Group) authorizable;
for (int i=0; i<32; i++) {
String user = "testUser" + i;
- assertTrue(user + " should be member of " + testGroup, testGroup.isMember(userMgr.getAuthorizable(user)));
+ assertTrue(user + " should be member of " + testGroup, testGroup.isMember(uMgr.getAuthorizable(user)));
}
- authorizable = userMgr.getAuthorizable("shrimps");
+ authorizable = uMgr.getAuthorizable("shrimps");
assertNotNull("shrimps authorizable must exist", authorizable);
assertTrue("shrimps authorizable must be a group", authorizable.isGroup());
testGroup = (Group) authorizable;
for (int i=0; i<32; i++) {
String user = "testUser" + i;
- assertTrue(user + " should be member of " + testGroup, testGroup.isMember(userMgr.getAuthorizable(user)));
+ assertTrue(user + " should be member of " + testGroup, testGroup.isMember(uMgr.getAuthorizable(user)));
}
} finally {
- adminSession.refresh(false);
for (String user : createdUsers) {
- Authorizable a = userMgr.getAuthorizable(user);
+ Authorizable a = uMgr.getAuthorizable(user);
if (a != null && !a.isGroup()) {
a.remove();
}
}
- for (NodeIterator it = target.getNodes(); it.hasNext(); ) {
- it.nextNode().remove();
+ for (NodeIterator it = s.getNode(getTargetPath()).getNodes(); it.hasNext(); ) {
+ Node n = it.nextNode();
+ if (!n.getDefinition().isProtected()) {
+ n.remove();
+ }
}
- adminSession.save();
+ s.save();
}
}
@@ -433,14 +451,15 @@ public class GroupImportTest extends Abs
doImport(getTargetPath(), xml);
- Authorizable newGroup = userMgr.getAuthorizable("g");
+ Session s = getImportSession();
+ Authorizable newGroup = getUserManager().getAuthorizable("g");
assertNotNull(newGroup);
assertTrue(newGroup.isGroup());
assertEquals("g", newGroup.getID());
- assertTrue(adminSession.propertyExists(newGroup.getPath() + "/rep:authorizableId"));
- assertEquals("g", adminSession.getProperty(newGroup.getPath() + "/rep:authorizableId").getString());
+ assertTrue(s.propertyExists(newGroup.getPath() + "/rep:authorizableId"));
+ assertEquals("g", s.getProperty(newGroup.getPath() + "/rep:authorizableId").getString());
- adminSession.save();
+ s.save();
}
@Test
@@ -459,10 +478,11 @@ public class GroupImportTest extends Abs
"</sv:node>";
doImport(getTargetPath(), xml);
- User user = userMgr.createUser("angi", "pw");
- adminSession.save();
- Group g1 = (Group) userMgr.getAuthorizable("g1");
+ User user = getUserManager().createUser("angi", "pw");
+ getImportSession().save();
+
+ Group g1 = (Group) getUserManager().getAuthorizable("g1");
// not BEST_EFFORT -> member is not resolved
assertFalse(g1.isMember(user));
Added: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithPoliciesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithPoliciesTest.java?rev=1672469&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithPoliciesTest.java (added)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithPoliciesTest.java Thu Apr 9 19:34:21 2015
@@ -0,0 +1,138 @@
+/*
+ * 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.oak.jcr.security.user;
+
+import java.util.UUID;
+import javax.jcr.ImportUUIDBehavior;
+import javax.jcr.Node;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+import javax.jcr.security.AccessControlEntry;
+import javax.jcr.security.AccessControlList;
+import javax.jcr.security.Privilege;
+
+import org.apache.jackrabbit.api.security.user.Authorizable;
+import org.apache.jackrabbit.api.security.user.User;
+import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
+import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
+import org.apache.jackrabbit.test.api.util.Text;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class GroupImportWithPoliciesTest extends AbstractImportTest {
+
+ private String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<sv:node sv:name=\"g\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
+ " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
+ " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
+ " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g</sv:value></sv:property>" +
+ " <sv:property sv:name=\"jcr:mixinTypes\" sv:type=\"Name\" sv:multiple=\"true\"><sv:value>rep:AccessControllable</sv:value></sv:property>" +
+ " <sv:node sv:name=\"rep:policy\"><sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:ACL</sv:value></sv:property><sv:node sv:name=\"allow\"><sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:GrantACE</sv:value></sv:property><sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>administrators</sv:value></sv:property><sv:property sv:name=\"rep:privileges\" sv:type=\"Name\" sv:multiple=\"true\"><sv:value>jcr:read</sv:value></sv:property></sv:node></sv:node>" +
+ "</sv:node>";
+
+ private String testUserID = "testUser" + UUID.randomUUID();
+ private Session testSession;
+
+ @Override
+ public void before() throws Exception {
+ super.before();
+
+ User testUser = userMgr.createUser(testUserID, testUserID);
+ AccessControlUtils.addAccessControlEntry(adminSession, Text.getRelativeParent(GROUPPATH, 1), testUser.getPrincipal(), new String[]{
+ Privilege.JCR_READ,
+ Privilege.JCR_WRITE,
+ Privilege.JCR_READ_ACCESS_CONTROL,
+ Privilege.JCR_MODIFY_ACCESS_CONTROL,
+ Privilege.JCR_NODE_TYPE_MANAGEMENT,
+ PrivilegeConstants.REP_USER_MANAGEMENT}, true);
+ // registering new namespaces curing import requires jcr:namespaceManagement privilege on the repo level (null path)
+ AccessControlUtils.addAccessControlEntry(adminSession, null, testUser.getPrincipal(), new String[] {PrivilegeConstants.JCR_NAMESPACE_MANAGEMENT}, true);
+ adminSession.save();
+
+ testSession = adminSession.getRepository().login(new SimpleCredentials(testUserID, testUserID.toCharArray()));
+ }
+
+ @Override
+ public void after() throws Exception {
+ try {
+ testSession.logout();
+
+ adminSession.refresh(false);
+ userMgr.getAuthorizable(testUserID).remove();
+ Authorizable g = userMgr.getAuthorizable("g");
+ if (g != null) {
+ g.remove();
+ }
+ adminSession.save();
+ } finally {
+ super.after();
+ }
+ }
+
+ @Override
+ protected String getTargetPath() {
+ return GROUPPATH;
+ }
+
+ @Override
+ protected Session getImportSession() {
+ return testSession;
+ }
+
+ @Override
+ protected String getImportBehavior() {
+ return null;
+ }
+
+ @Test
+ public void testImportGroupWithPolicies() throws Exception {
+ Node target = getTargetNode();
+ doImport(getTargetPath(), xml, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING);
+
+ assertTrue(getImportSession().hasPendingChanges());
+
+ Authorizable newGroup = getUserManager().getAuthorizable("g");
+ assertNotNull(newGroup);
+ assertTrue(newGroup.isGroup());
+ assertEquals("g", newGroup.getPrincipal().getName());
+ assertEquals("g", newGroup.getID());
+
+ Node n = getImportSession().getNode(newGroup.getPath());
+ assertTrue(n.isNew());
+ assertTrue(n.getParent().isSame(target));
+
+ assertEquals("g", n.getName());
+ assertEquals("g", n.getProperty(UserConstants.REP_PRINCIPAL_NAME).getString());
+
+ AccessControlList acl = AccessControlUtils.getAccessControlList(getImportSession(), newGroup.getPath());
+ assertNotNull(acl);
+
+ AccessControlEntry[] aces = acl.getAccessControlEntries();
+ assertEquals(1, aces.length);
+ assertEquals("administrators", aces[0].getPrincipal().getName());
+ assertEquals(PrivilegeConstants.JCR_READ, aces[0].getPrivileges()[0].getName());
+
+ // saving changes of the import -> must succeed. add mandatory
+ // props should have been created.
+ getImportSession().save();
+ }
+
+}
\ No newline at end of file
Copied: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithoutAdminTest.java (from r1671848, jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithoutAdminTest.java?p2=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithoutAdminTest.java&p1=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java&r1=1671848&r2=1672469&rev=1672469&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithoutAdminTest.java Thu Apr 9 19:34:21 2015
@@ -16,455 +16,54 @@
*/
package org.apache.jackrabbit.oak.jcr.security.user;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.ConstraintViolationException;
+import java.util.UUID;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.api.security.user.Authorizable;
-import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
-import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
+import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.apache.jackrabbit.test.api.util.Text;
/**
* Testing group import with default {@link org.apache.jackrabbit.oak.spi.xml.ImportBehavior}
*/
-public class GroupImportTest extends AbstractImportTest {
+public class GroupImportWithoutAdminTest extends GroupImportTest {
- @Override
- protected String getTargetPath() {
- return GROUPPATH;
- }
+ private String uid = "testUser" + UUID.randomUUID();
+ private Session testSession;
@Override
- protected String getImportBehavior() {
- return null;
- }
-
- @Test
- public void testImportGroup() throws Exception {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<sv:node sv:name=\"g\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g</sv:value></sv:property>" +
- "</sv:node>";
-
- Node target = getTargetNode();
- doImport(getTargetPath(), xml);
-
- assertTrue(target.isModified());
- assertTrue(adminSession.hasPendingChanges());
-
- Authorizable newGroup = userMgr.getAuthorizable("g");
- assertNotNull(newGroup);
- assertTrue(newGroup.isGroup());
- assertEquals("g", newGroup.getPrincipal().getName());
- assertEquals("g", newGroup.getID());
-
- Node n = adminSession.getNode(newGroup.getPath());
- assertTrue(n.isNew());
- assertTrue(n.getParent().isSame(target));
-
- assertEquals("g", n.getName());
- assertEquals("g", n.getProperty(UserConstants.REP_PRINCIPAL_NAME).getString());
-
- // saving changes of the import -> must succeed. add mandatory
- // props should have been created.
- adminSession.save();
- }
-
- @Test
- public void testConflictingPrincipalsWithinImport() throws Exception {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<sv:node sv:name=\"gFolder\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- "<sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\">" +
- " <sv:value>rep:AuthorizableFolder</sv:value>" +
- "</sv:property>" +
- "<sv:node sv:name=\"g\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g</sv:value></sv:property>" +
- "</sv:node>" +
- "<sv:node sv:name=\"g1\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>0120a4f9-196a-3f9e-b9f5-23f31f914da7</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g</sv:value></sv:property>" +
- "</sv:node>" +
- "</sv:node>";
-
- try {
- doImport(getTargetPath(), xml);
- adminSession.save();
-
- fail("Import must detect conflicting principals.");
- } catch (RepositoryException e) {
- // success
- }
- }
-
- @Test
- public void testMultiValuedPrincipalName() throws Exception {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<sv:node sv:name=\"g\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g</sv:value><sv:value>g2</sv:value><sv:value>g</sv:value></sv:property></sv:node>";
-
- /*
- importing a group with a multi-valued rep:principalName property
- - nonProtected node rep:Group must be created.
- - property rep:principalName must be created regularly without being protected
- - saving changes must fail with ConstraintViolationEx. as the protected
- mandatory property rep:principalName is missing
- */
- Node target = getTargetNode();
- doImport(getTargetPath(), xml);
-
- assertTrue(target.isModified());
- assertTrue(adminSession.hasPendingChanges());
-
- Authorizable newGroup = userMgr.getAuthorizable("g");
- assertNotNull(newGroup);
-
- assertTrue(target.hasNode("g"));
- assertTrue(target.hasProperty("g/rep:principalName"));
- assertFalse(target.getProperty("g/rep:principalName").getDefinition().isProtected());
-
- // saving changes of the import -> must fail as mandatory prop is missing
- try {
- adminSession.save();
- fail("Import must be incomplete. Saving changes must fail.");
- } catch (ConstraintViolationException e) {
- // success
- }
- }
-
- @Test
- public void testIncompleteGroup() throws Exception {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<sv:node sv:name=\"g\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
- "</sv:node>";
-
- /*
- importing a group without rep:principalName property
- - saving changes must fail with ConstraintViolationEx.
- */
- doImport(getTargetPath(), xml);
- // saving changes of the import -> must fail as mandatory prop is missing
- try {
- adminSession.save();
- fail("Import must be incomplete. Saving changes must fail.");
- } catch (ConstraintViolationException e) {
- // success
- }
- }
-
- @Test
- public void testImportNewMembers() throws Exception {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<sv:node sv:name=\"gFolder\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- "<sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\">" +
- " <sv:value>rep:AuthorizableFolder</sv:value>" +
- "</sv:property>" +
- "<sv:node sv:name=\"g\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g</sv:value></sv:property>" +
- "</sv:node>" +
- "<sv:node sv:name=\"g1\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>0120a4f9-196a-3f9e-b9f5-23f31f914da7</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g1</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:members\" sv:type=\"WeakReference\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
- "</sv:node>" +
- "</sv:node>";
-
- doImport(getTargetPath(), xml);
-
- Group g = (Group) userMgr.getAuthorizable("g");
- assertNotNull(g);
- Group g1 = (Group) userMgr.getAuthorizable("g1");
- assertNotNull(g1);
-
- Node n = adminSession.getNode(g1.getPath());
- assertTrue(n.hasProperty(UserConstants.REP_MEMBERS) || n.hasNode(UserConstants.NT_REP_MEMBERS));
-
- // getWeakReferences only works upon save.
- adminSession.save();
-
- assertTrue(g1.isMember(g));
- }
-
- @Test
- public void testImportNewMembersReverseOrder() throws Exception {
- // group is imported before the member
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<sv:node sv:name=\"gFolder\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:AuthorizableFolder</sv:value></sv:property>" +
- " <sv:node sv:name=\"g1\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>0120a4f9-196a-3f9e-b9f5-23f31f914da7</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g1</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:members\" sv:type=\"WeakReference\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
- " </sv:node>" +
- " <sv:node sv:name=\"g\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g</sv:value></sv:property>" +
- " </sv:node>" +
- "</sv:node>";
-
- doImport(getTargetPath(), xml);
-
- Group g = (Group) userMgr.getAuthorizable("g");
- assertNotNull(g);
- Group g1 = (Group) userMgr.getAuthorizable("g1");
- assertNotNull(g1);
-
- Node n = adminSession.getNode(g1.getPath());
- assertTrue(n.hasProperty(UserConstants.REP_MEMBERS) || n.hasNode(UserConstants.NT_REP_MEMBERS));
-
- // getWeakReferences only works upon save.
- adminSession.save();
-
- assertTrue(g1.isMember(g));
- }
-
- @Test
- public void testImportMembers() throws Exception {
- Authorizable admin = checkNotNull(userMgr.getAuthorizable(UserConstants.DEFAULT_ADMIN_ID));
- String uuid = adminSession.getNode(admin.getPath()).getUUID();
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<sv:node sv:name=\"gFolder\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:AuthorizableFolder</sv:value></sv:property>" +
- " <sv:node sv:name=\"g1\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>0120a4f9-196a-3f9e-b9f5-23f31f914da7</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g1</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:members\" sv:type=\"WeakReference\"><sv:value>" + uuid + "</sv:value></sv:property>" +
- " </sv:node>" +
- "</sv:node>";
-
- doImport(getTargetPath(), xml);
+ public void before() throws Exception {
+ super.before();
- Group g1 = (Group) userMgr.getAuthorizable("g1");
- assertNotNull(g1);
-
- // getWeakReferences only works upon save.
+ User u = userMgr.createUser(uid, "pw");
adminSession.save();
- assertTrue(g1.isMember(admin));
-
- boolean found = false;
- for (Iterator<Group> it = admin.declaredMemberOf(); it.hasNext() && !found; ) {
- found = "g1".equals(it.next().getID());
- }
- assertTrue(found);
- }
-
- @Test
- public void testImportMembersWithIdDifferentFromNodeName() throws Exception {
- Authorizable admin = checkNotNull(userMgr.getAuthorizable(UserConstants.DEFAULT_ADMIN_ID));
- String uuid = adminSession.getNode(admin.getPath()).getUUID();
- // deliberately put the 'rep:members' before the 'rep:authorizableId' to cover OAK-2367
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<sv:node sv:name=\"gFolder\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:AuthorizableFolder</sv:value></sv:property>" +
- " <sv:node sv:name=\"g_different\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>0120a4f9-196a-3f9e-b9f5-23f31f914da7</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g1</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:members\" sv:type=\"WeakReference\"><sv:value>" + uuid + "</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:authorizableId\" sv:type=\"String\"><sv:value>g1</sv:value></sv:property>" +
- " </sv:node>" +
- "</sv:node>";
-
- doImport(getTargetPath(), xml);
-
- Group g1 = (Group) userMgr.getAuthorizable("g1");
- assertNotNull(g1);
-
- // getWeakReferences only works upon save.
+ AccessControlUtils.addAccessControlEntry(adminSession, Text.getRelativeParent(getTargetPath(), 1), u.getPrincipal(), new String[] {Privilege.JCR_ALL}, true);
+ AccessControlUtils.addAccessControlEntry(adminSession, null, u.getPrincipal(), new String[] {PrivilegeConstants.JCR_NAMESPACE_MANAGEMENT}, true);
adminSession.save();
- assertTrue(g1.isMember(admin));
-
- boolean found = false;
- for (Iterator<Group> it = admin.declaredMemberOf(); it.hasNext() && !found; ) {
- found = "g1".equals(it.next().getID());
- }
- assertTrue(found);
+ testSession = adminSession.getRepository().login(new SimpleCredentials(uid, "pw".toCharArray()));
}
- @Test
- public void testImportGroupMembersFromNodes() throws Exception {
- List<String> createdUsers = new LinkedList<String>();
- Node target = getTargetNode();
+ @Override
+ public void after() throws Exception {
try {
- String[] users = {"angi", "adi", "hansi", "lisi", "luzi", "susi", "pipi", "hari", "gabi", "eddi",
- "debbi", "cati", "admin", "anonymous"};
-
- for (String user : users) {
- if (userMgr.getAuthorizable(user) == null) {
- userMgr.createUser(user, user);
- createdUsers.add(user);
- }
- }
- if (!userMgr.isAutoSave()) {
- adminSession.save();
- }
-
- doImport(getTargetPath(), getClass().getSimpleName() + "-testImportGroupMembersFromNodes.xml");
- if (!userMgr.isAutoSave()) {
- adminSession.save();
- }
-
- Authorizable aShrimps = userMgr.getAuthorizable("shrimps");
- assertNotNull("Shrimps authorizable must exist", aShrimps);
- assertTrue("Shrimps authorizable must be a group", aShrimps.isGroup());
-
- Group gShrimps = (Group) aShrimps;
- for (String user : users) {
- assertTrue(user + " should be member of " + gShrimps, gShrimps.isMember(userMgr.getAuthorizable(user)));
- }
-
+ testSession.logout();
- } finally {
- adminSession.refresh(false);
- for (String user : createdUsers) {
- Authorizable a = userMgr.getAuthorizable(user);
- if (a != null && !a.isGroup()) {
- a.remove();
- }
- }
- for (NodeIterator it = target.getNodes(); it.hasNext(); ) {
- it.nextNode().remove();
- }
+ Authorizable testUser = userMgr.getAuthorizable(uid);
+ testUser.remove();
adminSession.save();
- }
- }
-
- /**
- * @since OAK 1.0 : Importing new rep:MembershipReferences structure
- */
- @Test
- public void testImportGroupMembersFromOakNodes() throws Exception {
- List<String> createdUsers = new LinkedList<String>();
- Node target = getTargetNode();
- try {
- for (int i=0; i<32; i++) {
- String user = "testUser" + i;
- if (userMgr.getAuthorizable(user) == null) {
- userMgr.createUser(user, user);
- createdUsers.add(user);
- }
- }
- if (!userMgr.isAutoSave()) {
- adminSession.save();
- }
-
- doImport(getTargetPath(), getClass().getSimpleName() + "-testImportGroupMembersFromOakNodes.xml");
- if (!userMgr.isAutoSave()) {
- adminSession.save();
- }
-
- Authorizable authorizable = userMgr.getAuthorizable("testGroup");
- assertNotNull("testGroup authorizable must exist", authorizable);
- assertTrue("testGroup authorizable must be a group", authorizable.isGroup());
- Group testGroup = (Group) authorizable;
- for (int i=0; i<32; i++) {
- String user = "testUser" + i;
- assertTrue(user + " should be member of " + testGroup, testGroup.isMember(userMgr.getAuthorizable(user)));
- }
-
- authorizable = userMgr.getAuthorizable("shrimps");
- assertNotNull("shrimps authorizable must exist", authorizable);
- assertTrue("shrimps authorizable must be a group", authorizable.isGroup());
- testGroup = (Group) authorizable;
- for (int i=0; i<32; i++) {
- String user = "testUser" + i;
- assertTrue(user + " should be member of " + testGroup, testGroup.isMember(userMgr.getAuthorizable(user)));
- }
-
-
} finally {
- adminSession.refresh(false);
- for (String user : createdUsers) {
- Authorizable a = userMgr.getAuthorizable(user);
- if (a != null && !a.isGroup()) {
- a.remove();
- }
- }
- for (NodeIterator it = target.getNodes(); it.hasNext(); ) {
- it.nextNode().remove();
- }
- adminSession.save();
+ super.after();
}
}
- /**
- * @since OAK 1.0 : Importing rep:authorizableId
- */
- @Test
- public void testImportGroupWithAuthorizableId() throws Exception {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<sv:node sv:name=\"g\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>b2f5ff47-4366-31b6-a533-d8dc3614845d</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:authorizableId\" sv:type=\"String\"><sv:value>g</sv:value></sv:property>" +
- "</sv:node>";
-
- doImport(getTargetPath(), xml);
-
- Authorizable newGroup = userMgr.getAuthorizable("g");
- assertNotNull(newGroup);
- assertTrue(newGroup.isGroup());
- assertEquals("g", newGroup.getID());
- assertTrue(adminSession.propertyExists(newGroup.getPath() + "/rep:authorizableId"));
- assertEquals("g", adminSession.getProperty(newGroup.getPath() + "/rep:authorizableId").getString());
-
- adminSession.save();
- }
-
- @Test
- public void testImportNewMembersLateSave() throws Exception {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<sv:node sv:name=\"gFolder\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
- "<sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\">" +
- " <sv:value>rep:AuthorizableFolder</sv:value>" +
- "</sv:property>" +
- "<sv:node sv:name=\"g1\">" +
- " <sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\"><sv:value>rep:Group</sv:value></sv:property>" +
- " <sv:property sv:name=\"jcr:uuid\" sv:type=\"String\"><sv:value>0120a4f9-196a-3f9e-b9f5-23f31f914da7</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>g1</sv:value></sv:property>" +
- " <sv:property sv:name=\"rep:members\" sv:type=\"WeakReference\"><sv:value>a468b64f-b1df-377c-b325-20d97aaa1ad9</sv:value></sv:property>" +
- "</sv:node>" +
- "</sv:node>";
-
- doImport(getTargetPath(), xml);
- User user = userMgr.createUser("angi", "pw");
- adminSession.save();
-
- Group g1 = (Group) userMgr.getAuthorizable("g1");
-
- // not BEST_EFFORT -> member is not resolved
- assertFalse(g1.isMember(user));
+ @Override
+ protected Session getImportSession() {
+ return testSession;
}
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/SystemUserImportTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/SystemUserImportTest.java?rev=1672469&r1=1672468&r2=1672469&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/SystemUserImportTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/SystemUserImportTest.java Thu Apr 9 19:34:21 2015
@@ -23,6 +23,7 @@ import javax.jcr.ImportUUIDBehavior;
import javax.jcr.ItemExistsException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.security.auth.Subject;
@@ -90,10 +91,11 @@ public class SystemUserImportTest extend
Node target = getTargetNode();
doImport(getTargetPath(), xml);
+ Session s = getImportSession();
assertTrue(target.isModified());
- assertTrue(adminSession.hasPendingChanges());
+ assertTrue(s.hasPendingChanges());
- Authorizable newUser = userMgr.getAuthorizable("t");
+ Authorizable newUser = getUserManager().getAuthorizable("t");
assertNotNull(newUser);
assertFalse(newUser.isGroup());
assertTrue(((User) newUser).isSystemUser());
@@ -103,7 +105,7 @@ public class SystemUserImportTest extend
assertTrue(((User) newUser).isDisabled());
assertEquals("disabledUser", ((User) newUser).getDisabledReason());
- Node n = adminSession.getNode(newUser.getPath());
+ Node n = s.getNode(newUser.getPath());
assertTrue(n.isNew());
assertTrue(n.getParent().isSame(target));
@@ -114,7 +116,7 @@ public class SystemUserImportTest extend
assertFalse(n.hasProperty(UserConstants.REP_PASSWORD));
// saving changes of the import -> must succeed. all mandatory props should have been created.
- adminSession.save();
+ s.save();
}
/**
@@ -134,25 +136,26 @@ public class SystemUserImportTest extend
importing a system user below the regular users-path:
- saving changes must fail with ConstraintViolationEx.
*/
- Node target = adminSession.getNode(USERPATH);
+ Session s = getImportSession();
+ Node target = s.getNode(USERPATH);
doImport(USERPATH, xml);
assertTrue(target.isModified());
- assertTrue(adminSession.hasPendingChanges());
+ assertTrue(s.hasPendingChanges());
- Authorizable user = userMgr.getAuthorizable("t");
+ Authorizable user = getUserManager().getAuthorizable("t");
assertNotNull(user);
assertTrue(target.hasNode("t"));
assertTrue(target.hasProperty("t/rep:principalName"));
// saving changes of the import -> must fail
try {
- adminSession.save();
+ s.save();
fail("Import must be incomplete. Saving changes must fail.");
} catch (ConstraintViolationException e) {
// success
} finally {
- adminSession.refresh(false);
+ s.refresh(false);
if (target.hasNode("t")) {
target.getNode("t").remove();
target.save();
@@ -177,7 +180,7 @@ public class SystemUserImportTest extend
doImport(getTargetPath(), xml);
assertTrue(target.isModified());
- assertTrue(adminSession.hasPendingChanges());
+ assertTrue(getImportSession().hasPendingChanges());
// node must be present:
assertTrue(target.hasNode("t"));
@@ -186,17 +189,19 @@ public class SystemUserImportTest extend
// but UserManager.getAuthorizable(String) will not find the
// authorizable
- Authorizable newUser = userMgr.getAuthorizable("t");
+ Authorizable newUser = getUserManager().getAuthorizable("t");
assertNull(newUser);
}
@Test
public void testExistingPrincipal() throws Exception {
Principal existing = null;
- PrincipalIterator principalIterator = ((JackrabbitSession) adminSession).getPrincipalManager().getPrincipals(PrincipalManager.SEARCH_TYPE_ALL);
+
+ Session s = getImportSession();
+ PrincipalIterator principalIterator = ((JackrabbitSession) s).getPrincipalManager().getPrincipals(PrincipalManager.SEARCH_TYPE_ALL);
while (principalIterator.hasNext()) {
Principal p = principalIterator.nextPrincipal();
- if (userMgr.getAuthorizable(p) != null) {
+ if (getUserManager().getAuthorizable(p) != null) {
existing = p;
break;
}
@@ -214,7 +219,7 @@ public class SystemUserImportTest extend
try {
doImport(getTargetPath(), xml);
- adminSession.save();
+ s.save();
fail("Import must detect conflicting principals.");
} catch (RepositoryException e) {
@@ -237,12 +242,12 @@ public class SystemUserImportTest extend
Node target = getTargetNode();
assertFalse(target.hasProperty(UserConstants.REP_PASSWORD));
- Authorizable user = userMgr.getAuthorizable("t");
+ Authorizable user = getUserManager().getAuthorizable("t");
assertNotNull(user);
assertFalse(user.isGroup());
assertTrue(((User)user).isSystemUser());
- adminSession.save();
+ getImportSession().save();
}
/**
@@ -268,9 +273,9 @@ public class SystemUserImportTest extend
doImport(getTargetPath(), xml);
assertTrue(target.isModified());
- assertTrue(adminSession.hasPendingChanges());
+ assertTrue(getImportSession().hasPendingChanges());
- Authorizable newUser = userMgr.getAuthorizable("t");
+ Authorizable newUser = getUserManager().getAuthorizable("t");
assertNotNull(newUser);
assertTrue(target.hasNode("t"));
@@ -293,22 +298,23 @@ public class SystemUserImportTest extend
" <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>t</sv:value></sv:property>" +
"</sv:node>");
+ Session s = getImportSession();
for (String xml : incompleteXml) {
- Node target = adminSession.getNode(getTargetPath());
+ Node target = s.getNode(getTargetPath());
try {
doImport(getTargetPath(), xml);
// saving changes of the import -> must fail as mandatory prop is missing
try {
- adminSession.save();
+ s.save();
fail("Import must be incomplete. Saving changes must fail.");
} catch (ConstraintViolationException e) {
// success
}
} finally {
- adminSession.refresh(false);
+ s.refresh(false);
if (target.hasNode("t")) {
target.getNode("t").remove();
- adminSession.save();
+ s.save();
}
}
}
@@ -328,10 +334,10 @@ public class SystemUserImportTest extend
doImport(getTargetPath(), xml);
- Authorizable user = userMgr.getAuthorizable("t");
+ Authorizable user = getUserManager().getAuthorizable("t");
assertNotNull(user);
assertFalse(user.isGroup());
- assertFalse(adminSession.propertyExists(user.getPath() + "/rep:password"));
+ assertFalse(getImportSession().propertyExists(user.getPath() + "/rep:password"));
}
@Test
@@ -360,15 +366,15 @@ public class SystemUserImportTest extend
doImport(getTargetPath(), xml);
assertTrue(target.isModified());
- assertTrue(adminSession.hasPendingChanges());
+ assertTrue(getImportSession().hasPendingChanges());
- Authorizable newUser = userMgr.getAuthorizable("t3");
+ Authorizable newUser = getUserManager().getAuthorizable("t3");
assertNotNull(newUser);
assertFalse(newUser.isGroup());
assertEquals("t3", newUser.getPrincipal().getName());
assertEquals("t3", newUser.getID());
- Node n = adminSession.getNode(newUser.getPath());
+ Node n = getImportSession().getNode(newUser.getPath());
assertTrue(n.isNew());
Node parent = n.getParent();
@@ -400,10 +406,10 @@ public class SystemUserImportTest extend
doImport(getTargetPath(), xml);
- Authorizable newUser = userMgr.getAuthorizable("t");
+ Authorizable newUser = getUserManager().getAuthorizable("t");
assertNotNull(newUser);
- Authorizable u2 = userMgr.getAuthorizable("g");
+ Authorizable u2 = getUserManager().getAuthorizable("g");
assertNotNull(u2);
Subject subj = new Subject();
@@ -429,7 +435,7 @@ public class SystemUserImportTest extend
// saving changes of the import -> must succeed. add mandatory
// props should have been created.
- adminSession.save();
+ getImportSession().save();
}
/**
@@ -447,14 +453,14 @@ public class SystemUserImportTest extend
" <sv:property sv:name=\"rep:principalName\" sv:type=\"String\"><sv:value>t</sv:value></sv:property>" +
"</sv:node>";
doImport(getTargetPath(), xml);
- adminSession.save();
+ getImportSession().save();
// re-import should succeed if UUID-behavior is set accordingly
doImport(getTargetPath(), xml, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING);
// saving changes of the import -> must succeed. add mandatory
// props should have been created.
- adminSession.save();
+ getImportSession().save();
}
@Test
@@ -491,13 +497,14 @@ public class SystemUserImportTest extend
doImport(getTargetPath(), xml);
- Authorizable newUser = userMgr.getAuthorizable("t");
+ Session s = getImportSession();
+ Authorizable newUser = getUserManager().getAuthorizable("t");
assertNotNull(newUser);
assertFalse(newUser.isGroup());
assertEquals("t", newUser.getID());
- assertTrue(adminSession.propertyExists(newUser.getPath() + "/rep:authorizableId"));
- assertEquals("t", adminSession.getProperty(newUser.getPath() + "/rep:authorizableId").getString());
- adminSession.save();
+ assertTrue(s.propertyExists(newUser.getPath() + "/rep:authorizableId"));
+ assertEquals("t", s.getProperty(newUser.getPath() + "/rep:authorizableId").getString());
+ s.save();
}
/**
@@ -516,14 +523,15 @@ public class SystemUserImportTest extend
doImport(getTargetPath(), xml);
- Authorizable newUser = userMgr.getAuthorizable("t");
+ Session s = getImportSession();
+ Authorizable newUser = getUserManager().getAuthorizable("t");
assertNotNull(newUser);
assertFalse(newUser.isGroup());
assertEquals("t", newUser.getID());
- assertTrue(adminSession.propertyExists(newUser.getPath() + "/rep:authorizableId"));
- assertEquals("t", adminSession.getProperty(newUser.getPath() + "/rep:authorizableId").getString());
- adminSession.save();
+ assertTrue(s.propertyExists(newUser.getPath() + "/rep:authorizableId"));
+ assertEquals("t", s.getProperty(newUser.getPath() + "/rep:authorizableId").getString());
+ s.save();
}
/**
@@ -543,14 +551,15 @@ public class SystemUserImportTest extend
"</sv:node>";
doImport(getTargetPath(), xml);
- Authorizable newUser = userMgr.getAuthorizable("t");
+ Authorizable newUser = getUserManager().getAuthorizable("t");
+ Session s = getImportSession();
assertNotNull(newUser);
assertFalse(newUser.isGroup());
assertEquals("t", newUser.getID());
- assertTrue(adminSession.propertyExists(newUser.getPath() + "/rep:authorizableId"));
- assertEquals("t", adminSession.getProperty(newUser.getPath() + "/rep:authorizableId").getString());
- adminSession.save();
+ assertTrue(s.propertyExists(newUser.getPath() + "/rep:authorizableId"));
+ assertEquals("t", s.getProperty(newUser.getPath() + "/rep:authorizableId").getString());
+ s.save();
}
/**
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportAbortTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportAbortTest.java?rev=1672469&r1=1672468&r2=1672469&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportAbortTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportAbortTest.java Thu Apr 9 19:34:21 2015
@@ -61,7 +61,7 @@ public class UserImportAbortTest extends
} catch (RepositoryException e) {
// success
} finally {
- adminSession.refresh(false);
+ getImportSession().refresh(false);
}
}
}
@@ -83,7 +83,7 @@ public class UserImportAbortTest extends
} catch (RepositoryException e) {
// success
} finally {
- adminSession.refresh(false);
+ getImportSession().refresh(false);
}
}
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportBestEffortTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportBestEffortTest.java?rev=1672469&r1=1672468&r2=1672469&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportBestEffortTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportBestEffortTest.java Thu Apr 9 19:34:21 2015
@@ -65,7 +65,7 @@ public class UserImportBestEffortTest ex
// saving changes of the import -> must succeed. add mandatory
// props should have been created.
- adminSession.save();
+ getImportSession().save();
}
/**
@@ -83,14 +83,14 @@ public class UserImportBestEffortTest ex
"</sv:node>";
doImport(getTargetPath(), xml);
- adminSession.save();
+ getImportSession().save();
// re-import should succeed if UUID-behavior is set accordingly
doImport(getTargetPath(), xml, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING);
// saving changes of the import -> must succeed. add mandatory
// props should have been created.
- adminSession.save();
+ getImportSession().save();
}
@Test
@@ -132,10 +132,10 @@ public class UserImportBestEffortTest ex
"</sv:node>";
doImport(getTargetPath(), xml);
- Authorizable newUser = userMgr.getAuthorizable("t");
+ Authorizable newUser = getUserManager().getAuthorizable("t");
assertNotNull(newUser);
- Authorizable u2 = userMgr.getAuthorizable("g");
+ Authorizable u2 = getUserManager().getAuthorizable("g");
assertNotNull(u2);
Subject subj = new Subject();
@@ -158,7 +158,7 @@ public class UserImportBestEffortTest ex
"</sv:node>";
doImport(getTargetPath(), xml);
- Authorizable a = userMgr.getAuthorizable("t");
+ Authorizable a = getUserManager().getAuthorizable("t");
assertFalse(a.isGroup());
boolean found = false;