LDAP connector 3.3-M4

Evolveum · Aug 2, 2021 · 8bcdb30 · 8bcdb30
1 parent dc32649
commit 8bcdb30
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -892,7 +892,7 @@
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-ldap</artifactId>
                 <!-- Do not forget to update provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml when changing connector version. -->
-                <version>3.3-M3</version>
+                <version>3.3-M4</version>
                 <exclusions>
                     <!-- Needed otherwise the JDK14 SLF4J binding can override the midpoint's logback binding -->
                     <exclusion>

diff --git a/provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml b/provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
@@ -14,7 +14,7 @@
     <name>ICF com.evolveum.polygon.connector.ldap.LdapConnector</name>
     <framework>http://midpoint.evolveum.com/xml/ns/public/connector/icf-1</framework>
     <connectorType>com.evolveum.polygon.connector.ldap.LdapConnector</connectorType>
-    <connectorVersion>3.3-M3</connectorVersion>
+    <connectorVersion>3.3-M4</connectorVersion>
     <connectorBundle>com.evolveum.polygon.connector-ldap</connectorBundle>
     <namespace>http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-ldap/com.evolveum.polygon.connector.ldap.LdapConnector</namespace>
     <schema>

diff --git a/testing/conntest/src/test/resources/opendj-dumber/resource.xml b/testing/conntest/src/test/resources/opendj-dumber/resource.xml
@@ -42,6 +42,7 @@
             <icfcldap:additionalSearchFilter>(!(roomNumber=invisible))</icfcldap:additionalSearchFilter>
             <icfcldap:synchronizationStrategy>modifyTimestamp</icfcldap:synchronizationStrategy>
             <icfcldap:useUnbind>true</icfcldap:useUnbind> <!-- MID-6724 -->
+            <icfcldap:timeout>5000</icfcldap:timeout>
         </icfc:configurationProperties>
         <icfc:resultsHandlerConfiguration>
             <icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>

diff --git a/testing/conntest/src/test/resources/opendj/resource-unsafe.xml b/testing/conntest/src/test/resources/opendj/resource-unsafe.xml
@@ -40,13 +40,15 @@
             <icfcldap:bindPassword><t:clearValue>secret</t:clearValue></icfcldap:bindPassword>
             <icfcldap:pagingStrategy>auto</icfcldap:pagingStrategy>
             <icfcldap:vlvSortAttribute>uid</icfcldap:vlvSortAttribute>
-             <icfcldap:operationalAttributes>ds-pwp-account-disabled</icfcldap:operationalAttributes>
-             <icfcldap:operationalAttributes>isMemberOf</icfcldap:operationalAttributes>
-             <icfcldap:operationalAttributes>createTimestamp</icfcldap:operationalAttributes>
-             <icfcldap:useUnsafeNameHint>true</icfcldap:useUnsafeNameHint>
-             <icfcldap:includeObjectClassFilter>true</icfcldap:includeObjectClassFilter>
-             <icfcldap:additionalSearchFilter>(!(roomNumber=invisible))</icfcldap:additionalSearchFilter>
-             <icfcldap:enableExtraTests>false</icfcldap:enableExtraTests> <!-- MID-3477 -->
+            <icfcldap:operationalAttributes>ds-pwp-account-disabled</icfcldap:operationalAttributes>
+            <icfcldap:operationalAttributes>isMemberOf</icfcldap:operationalAttributes>
+            <icfcldap:operationalAttributes>createTimestamp</icfcldap:operationalAttributes>
+            <icfcldap:useUnsafeNameHint>true</icfcldap:useUnsafeNameHint>
+            <icfcldap:includeObjectClassFilter>true</icfcldap:includeObjectClassFilter>
+            <icfcldap:additionalSearchFilter>(!(roomNumber=invisible))</icfcldap:additionalSearchFilter>
+            <!-- compatibility, legacy way to set global timeout -->
+            <icfcldap:connectTimeout>1000</icfcldap:connectTimeout>
+            <icfcldap:enableExtraTests>false</icfcldap:enableExtraTests> <!-- MID-3477 -->
         </icfc:configurationProperties>
         <icfc:resultsHandlerConfiguration>
             <icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>

diff --git a/testing/conntest/src/test/resources/opendj/resource.xml b/testing/conntest/src/test/resources/opendj/resource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2019 Evolveum and contributors
+  ~ Copyright (c) 2010-2021 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -24,7 +24,7 @@
         <filter>
             <q:and>
                 <q:equal>
-                    <q:path>c:connectorType</q:path>
+                    <q:path>connectorType</q:path>
                     <q:value>com.evolveum.polygon.connector.ldap.LdapConnector</q:value>
                 </q:equal>
             </q:and>
@@ -38,12 +38,27 @@
             <icfcldap:baseContext>dc=example,dc=com</icfcldap:baseContext>
             <icfcldap:bindDn>uid=idm,ou=Administrators,dc=example,dc=com</icfcldap:bindDn>
             <icfcldap:bindPassword><t:clearValue>secret</t:clearValue></icfcldap:bindPassword>
+
             <icfcldap:pagingStrategy>auto</icfcldap:pagingStrategy>
             <icfcldap:vlvSortAttribute>uid</icfcldap:vlvSortAttribute>
-             <icfcldap:operationalAttributes>ds-pwp-account-disabled</icfcldap:operationalAttributes>
-             <icfcldap:operationalAttributes>isMemberOf</icfcldap:operationalAttributes>
-             <icfcldap:operationalAttributes>createTimestamp</icfcldap:operationalAttributes>
-             <icfcldap:enableExtraTests>false</icfcldap:enableExtraTests> <!-- MID-3477 -->
+
+            <icfcldap:operationalAttributes>ds-pwp-account-disabled</icfcldap:operationalAttributes>
+            <icfcldap:operationalAttributes>isMemberOf</icfcldap:operationalAttributes>
+            <icfcldap:operationalAttributes>createTimestamp</icfcldap:operationalAttributes>
+
+            <!-- Setting short global timeout, then set reasonable operation-specific timeouts.
+                 Global timeout should be completely overridden. -->
+            <icfcldap:timeout>1</icfcldap:timeout>
+            <icfcldap:connectTimeout>500</icfcldap:connectTimeout>
+            <icfcldap:writeOperationTimeout>2000</icfcldap:writeOperationTimeout>
+            <icfcldap:readOperationTimeout>1000</icfcldap:readOperationTimeout>
+            <icfcldap:closeTimeout>300</icfcldap:closeTimeout>
+            <icfcldap:sendTimeout>5</icfcldap:sendTimeout>
+
+            <!-- No practical way to test keepalive in this automatic test. But we can at least that the config option is there. -->
+            <icfcldap:tcpKeepAlive>true</icfcldap:tcpKeepAlive>
+
+            <icfcldap:enableExtraTests>false</icfcldap:enableExtraTests> <!-- MID-3477 -->
         </icfc:configurationProperties>
         <icfc:resultsHandlerConfiguration>
             <icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>