CFM-75_LdapConnector

app/availableplugins/PasswordAuthenticator/src/Model/Table/PasswordAuthenticatorsTable.php

@@ -142,6 +142,19 @@ public function beforeMarshal(EventInterface $event, \ArrayObject $data, \ArrayO
 
   /**
    * Assemble Authenticator data for provisioning.
+   *
+   * Example return:
+   * <code>
+   * [
+   *   [
+   *     'id' => 1301,
+   *     'password_authenticator_id' => 1,
+   *     'person_id' => 101,
+   *     'password' => '7sK29a...SSHA_HASH...',
+   *     'type' => 'SH' // PasswordEncodingEnum::SSHA ('SH'), Crypt ('CR'), PlainText ('PL')
+   *   ]
+   * ]
+   * </code>
    * 
    * @since  COmanage Registry v5.2.0
    * @param  Authenticator  $cfg      Authenticator Configuration

app/plugins/CoreServer/src/Model/Table/LdapServersTable.php

@@ -396,7 +396,7 @@ public function modReplace(\LDAP\Connection $cxn, string $dn, array $attributes)
    * @param \LDAP\Connection $cxn Active LDAP connection (already connected and bound).
    * @param string $oldDn Current (full) DN of the entry.
    * @param string $newRdn New RDN (relative distinguished name) for the entry.
-   * @param string|null $newParentDn New parent DN, or null to keep the same parent.
+   * @param string $newParentDn New parent DN, or an empty string to keep the same parent.
    * @param bool $deleteOldRdn Whether to delete the old RDN value from the entry.
    * @return void
    * @throws \RuntimeException On LDAP rename failure.
@@ -406,7 +406,7 @@ public function renameEntry(
     \LDAP\Connection $cxn,
     string $oldDn,
     string $newRdn,
-    ?string $newParentDn = null,
+    string $newParentDn = '',
     bool $deleteOldRdn = true
   ): void {
     $currentErrorReporting = error_reporting(0);
@@ -465,7 +465,7 @@ public function readEntry(\LDAP\Connection $cxn, string $dn, array $attributes =
    * @param array $attributes
    * @return array{action:string,dn:string}
    */
-  protected function addOrModifyAt(\LDAP\Connection $cxn, string $dn, array $attributes): array {
+  public function addOrModifyAt(\LDAP\Connection $cxn, string $dn, array $attributes): array {
     try {
       $this->modReplace($cxn, $dn, $attributes);
       return ['action' => 'modify', 'dn' => $dn];
@@ -495,7 +495,7 @@ protected function addOrModifyAt(\LDAP\Connection $cxn, string $dn, array $attri
    * Performs a case-insensitive suffix match. If $baseDn is empty or not a suffix
    * of $newDn, returns $newDn unchanged.
    */
-  protected function removeBaseDnSuffix(string $newDn, string $baseDn): string {
+  public function removeBaseDnSuffix(string $newDn, string $baseDn): string {
     if ($baseDn === '') {
       return $newDn;
     }
@@ -510,6 +510,7 @@ protected function removeBaseDnSuffix(string $newDn, string $baseDn): string {
     return $newDn;
   }
 
+
   /**
    * Disconnect (unbind) an LDAP connection for a given server ID.
    *