Author: dj
Date: Mon Oct 3 07:54:26 2016
New Revision: 1763123
URL: http://svn.apache.org/viewvc?rev=1763123&view=rev
Log:
OAK-4860 : Backport OAK-4301 and OAK-4845
- reverted r1762757, OAK-4845 has been reverted in trunk
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
jackrabbit/oak/branches/1.4/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java
jackrabbit/oak/branches/1.4/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 3 07:54:26 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462
,1750465,1750495,1750626,1750809,1750886,1751410,1751445-1751446,1751478,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1762751
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462
,1750465,1750495,1750626,1750809,1750886,1751410,1751445-1751446,1751478,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.4/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java?rev=1763123&r1=1763122&r2=1763123&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
Mon Oct 3 07:54:26 2016
@@ -531,8 +531,7 @@ public class DefaultSyncContext implemen
if (a == null) {
grp = createGroup(extGroup);
log.debug("- created new group");
- } else if (a.isGroup() && (getIdentityRef(a) == null ||
isSameIDP(a))) {
- // limit to same IDP or local (no IDP ref) groups, see OAK-4845
+ } else if (a.isGroup() && isSameIDP(a)) {
grp = (Group) a;
} else {
log.warn("Existing authorizable '{}' is not a group from this
IDP '{}'.", extGroup.getId(), idp.getName());
Modified:
jackrabbit/oak/branches/1.4/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java?rev=1763123&r1=1763122&r2=1763123&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java
Mon Oct 3 07:54:26 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.1.1")
+@Version("1.1.0")
@Export
package org.apache.jackrabbit.oak.spi.security.authentication.external.basic;
Modified:
jackrabbit/oak/branches/1.4/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java?rev=1763123&r1=1763122&r2=1763123&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
Mon Oct 3 07:54:26 2016
@@ -64,7 +64,6 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
public class DefaultSyncContextTest extends AbstractExternalAuthTest {
@@ -540,13 +539,11 @@ public class DefaultSyncContextTest exte
// 1. membership nesting is < 0 => membership not synchronized
syncConfig.user().setMembershipNestingDepth(-1);
syncCtx.sync(user.getID()).getStatus();
- root.commit();
assertTrue(gr.isDeclaredMember(user));
// 2. membership nesting is > 0 => membership gets synchronized
syncConfig.user().setMembershipNestingDepth(1);
assertEquals(SyncResult.Status.UPDATE,
syncCtx.sync(user.getID()).getStatus());
- root.commit();
assertFalse(gr.isDeclaredMember(user));
}
@@ -571,7 +568,6 @@ public class DefaultSyncContextTest exte
syncConfig.user().setMembershipNestingDepth(1);
assertEquals(SyncResult.Status.UPDATE,
syncCtx.sync(user.getID()).getStatus());
- root.commit();
// since the group is not associated with the test-IDP the
group-membership
// must NOT be modified during the sync.
@@ -618,7 +614,8 @@ public class DefaultSyncContextTest exte
setExternalID(gr, "foreignIDP"); // but don't set rep:lastSynced :-)
root.commit();
- sync(externalUser);
+ SyncResult result = syncCtx.sync(externalUser);
+ assertSame(SyncResult.Status.ADD, result.getStatus());
User user = userManager.getAuthorizable(externalUser.getId(),
User.class);
assertNotNull(user);
@@ -639,37 +636,6 @@ public class DefaultSyncContextTest exte
}
}
- /**
- * @see <a
href="https://issues.apache.org/jira/browse/OAK-4845";>OAK-4845</a>
- */
- @Test
- public void testMembershipForExistingLocalGroup() throws Exception {
-
syncConfig.user().setMembershipNestingDepth(1).setMembershipExpirationTime(-1).setExpirationTime(-1);
- syncConfig.group().setExpirationTime(-1);
-
- ExternalUser externalUser = idp.getUser(USER_ID);
- ExternalIdentityRef groupRef =
externalUser.getDeclaredGroups().iterator().next();
-
- // create the group locally (has no rep:externalId)
- Group gr = userManager.createGroup(groupRef.getId());
- root.commit();
-
- sync(externalUser);
-
- User user = userManager.getAuthorizable(externalUser.getId(),
User.class);
- assertNotNull(user);
-
- // verify membership gets added
- assertTrue(gr.isDeclaredMember(user));
- Iterator<Group> declared = user.declaredMemberOf();
- while (declared.hasNext()) {
- if (gr.getID().equals(declared.next().getID())) {
- return;
- }
- }
- fail();
- }
-
@Test
public void testGetAuthorizableUser() throws Exception {
ExternalIdentity extUser = idp.listUsers().next();
