You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2017/06/23 15:21:42 UTC
syncope git commit: [SYNCOPE-1116] Reference
LDAPNestedRealmPropagationActions and relative IT tests
Repository: syncope
Updated Branches:
refs/heads/master 3b88f6830 -> e76c59da5
[SYNCOPE-1116] Reference LDAPNestedRealmPropagationActions and relative IT tests
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e76c59da
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e76c59da
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e76c59da
Branch: refs/heads/master
Commit: e76c59da537ba66f29bea9759e3488c9a7a0e936
Parents: 3b88f68
Author: Andrea Patricelli <an...@apache.org>
Authored: Fri Jun 23 17:20:34 2017 +0200
Committer: Andrea Patricelli <an...@apache.org>
Committed: Fri Jun 23 17:21:10 2017 +0200
----------------------------------------------------------------------
.../persistence/jpa/outer/ResourceTest.java | 4 +-
.../test/resources/domains/MasterContent.xml | 4 +
.../LDAPNestedRealmPropagationActions.java | 84 ++++++++++++++++++++
.../core/reference/ITImplementationLookup.java | 2 +
.../apache/syncope/fit/core/PushTaskITCase.java | 2 +-
.../apache/syncope/fit/core/RealmITCase.java | 22 ++++-
6 files changed, 113 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e76c59da/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/ResourceTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/ResourceTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/ResourceTest.java
index f027930..9160d3d 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/ResourceTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/ResourceTest.java
@@ -293,13 +293,15 @@ public class ResourceTest extends AbstractTest {
ExternalResource resource = resourceDAO.find("resource-ldap-orgunit");
assertNotNull(resource);
assertNotNull(resource.getOrgUnit());
+ assertTrue(resource.getPropagationActionsClassNames().size() == 1);
String orgUnitKey = resource.getOrgUnit().getKey();
assertNotNull(entityManager().find(JPAOrgUnit.class, orgUnitKey));
resource.getOrgUnit().setResource(null);
resource.setOrgUnit(null);
-
+ resource.getPropagationActionsClassNames().clear();
+
resourceDAO.save(resource);
resourceDAO.flush();
http://git-wip-us.apache.org/repos/asf/syncope/blob/e76c59da/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
index ec97437..820fbcc 100644
--- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
@@ -753,6 +753,10 @@ under the License.
jsonConf='[{"schema":{"name":"uidAttribute","displayName":"Uid Attribute","helpMessage":"The name of the LDAP attribute which is mapped to the Uid attribute. Default is \"entryUUID\".","type":"java.lang.String","required":false,"order":21,"confidential":false,"defaultValues":["entryUUID"]},"overridable":true,"values":["entryUUID"]},{"schema":{"name":"baseContexts","displayName":"Base Contexts","helpMessage":"One or more starting points in the LDAP tree that will be used when searching the tree. Searches are performed when discovering users from the LDAP server or when looking for the groups of which a user is a member.","type":"[Ljava.lang.String;","required":true,"order":7,"confidential":false,"defaultValues":[]},"overridable":true,"values":["o=isp"]}]'/>
<OrgUnit id="599a59cf-9a23-4447-9a59-cf9a2334473a" connObjectLink="'ou=' + name + ',o=isp'"
extAttrName="ou" objectClass="organizationalUnit" resource_id="resource-ldap-orgunit"/>
+
+ <ExternalResource_PropActions resource_id="resource-ldap-orgunit"
+ actionClassName="org.apache.syncope.core.provisioning.java.propagation.LDAPNestedRealmPropagationActions"/>
+
<ExternalResource id="ws-target-resource-nopropagation" connector_id="fcf9f2b0-f7d6-42c9-84a6-61b28255a42b"
randomPwdIfNotProvided="0" enforceMandatoryCondition="1" overrideCapabilities="0"
createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" provisioningTraceLevel="ALL"
http://git-wip-us.apache.org/repos/asf/syncope/blob/e76c59da/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPNestedRealmPropagationActions.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPNestedRealmPropagationActions.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPNestedRealmPropagationActions.java
new file mode 100644
index 0000000..73ff1b6
--- /dev/null
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPNestedRealmPropagationActions.java
@@ -0,0 +1,84 @@
+/*
+ * 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.syncope.core.provisioning.java.propagation;
+
+import java.util.HashSet;
+import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.core.persistence.api.dao.RealmDAO;
+import org.apache.syncope.core.persistence.api.entity.Realm;
+import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
+import org.identityconnectors.framework.common.objects.Attribute;
+import org.identityconnectors.framework.common.objects.AttributeUtil;
+import org.identityconnectors.framework.common.objects.ConnectorObject;
+import org.identityconnectors.framework.common.objects.Name;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class LDAPNestedRealmPropagationActions extends DefaultPropagationActions {
+
+ private static final Logger LOG = LoggerFactory.getLogger(LDAPNestedRealmPropagationActions.class);
+
+ @Autowired
+ private RealmDAO realmDAO;
+
+ @Override
+ public void before(final PropagationTask task, final ConnectorObject beforeObj) {
+ super.before(task, beforeObj);
+ if (task.getAnyType() == null && task.getAnyTypeKind() == null && task.getResource().getOrgUnit() != null) {
+ // search realm involved
+ Realm realm = realmDAO.find(task.getEntityKey());
+ Name objectLinkAttr = AttributeUtil.getNameFromAttributes(task.getAttributes());
+ String oldObjectLink = objectLinkAttr.getNameValue();
+ String extAttrName = task.getResource().getOrgUnit().getExtAttrName();
+
+ String[] fullPathSplitted = realm == null ? null : StringUtils.split(realm.getFullPath(), "/");
+ if (fullPathSplitted != null
+ && fullPathSplitted.length > 1
+ && StringUtils.isNotBlank(oldObjectLink)
+ && StringUtils.isNotBlank(extAttrName)) {
+ // if realm depth is greater than 1 adapt Object Link accordingly
+ LOG.debug("{} has depth greater than 1, adapting Object Link.", task.getConnObjectKey(),
+ fullPathSplitted);
+ StringBuilder newOlPrefix = new StringBuilder();
+
+ for (int i = fullPathSplitted.length - 1; i >= 0; i--) {
+ newOlPrefix.append(extAttrName).append("=").append(fullPathSplitted[i]).append(",");
+ }
+
+ String[] olSplitted = oldObjectLink.split(extAttrName + "=" + "[a-zA-Z0-9]*,");
+
+ if (olSplitted.length < 2) {
+ LOG.error("Unable to generate new object link starting from {}", oldObjectLink);
+ } else {
+ // change Object Link name attribute
+ Set<Attribute> attributes = new HashSet<>(task.getAttributes());
+ attributes.remove(objectLinkAttr);
+ attributes.add(new Name(newOlPrefix.append(olSplitted[1]).toString()));
+ task.setAttributes(attributes);
+ }
+ }
+
+ } else {
+ LOG.debug("Object to propagte is not a Realm, nothing to do.");
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/e76c59da/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/ITImplementationLookup.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/ITImplementationLookup.java b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/ITImplementationLookup.java
index ea86696..827499a 100644
--- a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/ITImplementationLookup.java
+++ b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/ITImplementationLookup.java
@@ -56,6 +56,7 @@ import org.apache.syncope.core.provisioning.java.DefaultLogicActions;
import org.apache.syncope.core.provisioning.java.data.DefaultMappingItemTransformer;
import org.apache.syncope.core.provisioning.java.propagation.DBPasswordPropagationActions;
import org.apache.syncope.core.provisioning.java.propagation.LDAPMembershipPropagationActions;
+import org.apache.syncope.core.provisioning.java.propagation.LDAPNestedRealmPropagationActions;
import org.apache.syncope.core.provisioning.java.propagation.LDAPPasswordPropagationActions;
import org.apache.syncope.core.provisioning.java.pushpull.DBPasswordPullActions;
import org.apache.syncope.core.provisioning.java.pushpull.LDAPMembershipPullActions;
@@ -114,6 +115,7 @@ public class ITImplementationLookup implements ImplementationLookup {
classNames.add(LDAPMembershipPropagationActions.class.getName());
classNames.add(LDAPPasswordPropagationActions.class.getName());
classNames.add(DBPasswordPropagationActions.class.getName());
+ classNames.add(LDAPNestedRealmPropagationActions.class.getName());
put(Type.PROPAGATION_ACTIONS, classNames);
classNames = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/syncope/blob/e76c59da/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
index a4cc27d..0403dfe 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
@@ -295,7 +295,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
// 2. check
assertNotNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, "ou=odd,o=isp"));
assertNotNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, "ou=even,o=isp"));
- assertNotNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, "ou=two,o=isp"));
+ assertNotNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, "ou=two,ou=even,o=isp"));
}
@Test
http://git-wip-us.apache.org/repos/asf/syncope/blob/e76c59da/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
index ae2bf7b..aa096a6 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
@@ -203,25 +203,41 @@ public class RealmITCase extends AbstractITCase {
RealmTO realm = new RealmTO();
realm.setName("test");
realm.getResources().add(RESOURCE_NAME_LDAP_ORGUNIT);
+ RealmTO childRealm = new RealmTO();
+ childRealm.setName("child");
+ childRealm.getResources().add(RESOURCE_NAME_LDAP_ORGUNIT);
// 2. check propagation
ProvisioningResult<RealmTO> result =
realmService.create("/", realm).readEntity(new GenericType<ProvisioningResult<RealmTO>>() {
- });
+ });
+ ProvisioningResult<RealmTO> resultChild =
+ realmService.create("/test", childRealm).readEntity(new GenericType<ProvisioningResult<RealmTO>>() {
+ });
assertNotNull(result);
+ assertNotNull(resultChild);
assertEquals(1, result.getPropagationStatuses().size());
+ assertEquals(1, resultChild.getPropagationStatuses().size());
assertEquals(RESOURCE_NAME_LDAP_ORGUNIT, result.getPropagationStatuses().get(0).getResource());
+ assertEquals(RESOURCE_NAME_LDAP_ORGUNIT, resultChild.getPropagationStatuses().get(0).getResource());
assertEquals(PropagationTaskExecStatus.SUCCESS, result.getPropagationStatuses().get(0).getStatus());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, resultChild.getPropagationStatuses().get(0).getStatus());
realm = result.getEntity();
// 3. check on LDAP
assertNotNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, "ou=test,o=isp"));
- // 4. remove realm
+ // 3.1. check on LDAP also child realm, it should be under test organizational unit
+ assertNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, "ou=child,o=isp"));
+ assertNotNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, "ou=child,ou=test,o=isp"));
+
+ // 4. remove realms
+ realmService.delete("/test/child");
realmService.delete(realm.getFullPath());
- // 5. check on LDAP
+ // 5. check on LDAP: both realms should be deleted
assertNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, "ou=test,o=isp"));
+ assertNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, "ou=child,ou=test,o=isp"));
}
}