fix initialisation for now, add LDAPUserManager dep on LDAP provider

nicer fix needs changes in server

Signed-off-by: Arthur Schiwon <[email protected]>

appinfo/info.xml

@@ -10,9 +10,6 @@
     <author mail="[email protected]" homepage="http://eita.org.br">Alan Freihof Tygel</author>
     <author mail="[email protected]" homepage="https://arthur-schiwon.de">Arthur Schiwon</author>
     <namespace>LdapWriteSupport</namespace>
-    <types>
-        <authentication/>
-    </types>
     <category>integration</category>
     <category>organization</category>
     <category>tools</category>

lib/AppInfo/Application.php

@@ -7,6 +7,7 @@
 use OC;
 use OC\Group\Group;
 use OC\User\User;
+use OCA\LdapWriteSupport\LDAPConnect;
 use OCA\LdapWriteSupport\LDAPUserManager;
 use OCA\LdapWriteSupport\LDAPGroupManager;
 use OCA\User_LDAP\GroupPluginManager;
@@ -33,11 +34,29 @@ public function registerLDAPPlugins(): void {
 			return;
 		}
 
-		$this->ldapUserManager = OC::$server->query(LDAPUserManager::class);
-		$this->ldapGroupManager = OC::$server->query(LDAPGroupManager::class);
+		\OC_App::loadApp('user_ldap');
+		$c = $this->getContainer();
+		$s = $this->getContainer()->getServer();
+		$p = $s->getLDAPProvider();
 
-		$userPluginManager = OC::$server->query(UserPluginManager::class);
-		$groupPluginManager = OC::$server->query(GroupPluginManager::class);
+		// resolving LDAP provider fails indeed
+
+		$this->ldapUserManager = new LDAPUserManager(
+			$s->getUserManager(),
+			$s->getGroupManager(),
+			$s->getUserSession(),
+			new LDAPConnect($s->getConfig()),
+			$s->getConfig(),
+			$p
+		);
+
+//		$this->ldapUserManager = $c->query(LDAPUserManager::class);
+		$this->ldapGroupManager = $c->query(LDAPGroupManager::class);
+
+		/** @var UserPluginManager $userPluginManager */
+		$userPluginManager = OC::$server->query('LDAPUserPluginManager');
+		/** @var GroupPluginManager $groupPluginManager */
+		$groupPluginManager = OC::$server->query('LDAPGroupPluginManager');
 
 		$userPluginManager->register($this->ldapUserManager);
 		$groupPluginManager->register($this->ldapGroupManager);

lib/LDAPUserManager.php

@@ -5,6 +5,7 @@
  * @author Alan Tygel <[email protected]>
  * @author Vinicius Brand <[email protected]>
  * @author Daniel Tygel <[email protected]>
+ * @author Arthur Schiwon <[email protected]>
  *
  * @license AGPL-3.0
  *
@@ -25,24 +26,27 @@
 namespace OCA\LdapWriteSupport;
 
 
+use InvalidArgumentException;
 use OC\HintException;
 use OC\User\Backend;
 use OCA\User_LDAP\Exceptions\ConstraintViolationException;
 use OCA\User_LDAP\ILDAPUserPlugin;
 use OCA\User_LDAP\IUserLDAP;
-use OCA\User_LDAP\LDAPProvider;
 use OCP\IConfig;
 use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IImage;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use OCP\LDAP\ILDAPProvider;
 
 
 class LDAPUserManager implements ILDAPUserPlugin {
-
+	/** @var ILDAPProvider */
 	private $ldapProvider;
+
+	/** @var IUserSession */
 	private $userSession;
 
 	/** @var IGroupManager */
@@ -57,16 +61,17 @@ class LDAPUserManager implements ILDAPUserPlugin {
 	/** @var IConfig */
 	private $ocConfig;
 
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager, IUserSession $userSession, LDAPConnect $ldapConnect, IConfig $ocConfig) {
+	public function __construct(IUserManager $userManager, IGroupManager $groupManager, IUserSession $userSession, LDAPConnect $ldapConnect, IConfig $ocConfig, ILDAPProvider $ldapProvider) {
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
 		$this->userSession = $userSession;
 		$this->ldapConnect = $ldapConnect;
 		$this->ocConfig = $ocConfig;
 
-		$this->userManager->listen('\OC\User', 'changeUser', array($this, 'changeUserHook'));
+		$this->userManager->listen('\OC\User', 'changeUser', [$this, 'changeUserHook']);
 
 		$this->makeLdapBackendFirst();
+		$this->ldapProvider = $ldapProvider;
 	}
 
 	/**
@@ -92,22 +97,19 @@ public function respondToActions() {
 	 * @return bool
 	 */
 	public function setDisplayName($uid, $displayName) {
-		/** @var LDAPProvider $provider */
-		$provider = $this->getLDAPProvider();
-
 		$userDN = $this->getUserDN($uid);
 
-		$connection = $provider->getLDAPConnection($uid);
+		$connection = $this->ldapProvider->getLDAPConnection($uid);
 
-		$displayNameField = $provider->getLDAPDisplayNameField($uid);
+		$displayNameField = $this->ldapProvider->getLDAPDisplayNameField($uid);
 
 		if (!is_resource($connection)) {
 			//LDAP not available
 			\OCP\Util::writeLog('user_ldap', 'LDAP resource not available.', \OCP\Util::DEBUG);
 			return false;
 		}
 		try {
-			return ldap_mod_replace($connection,$userDN, array($displayNameField => $displayName));
+			return ldap_mod_replace($connection,$userDN, [$displayNameField => $displayName]);
 		} catch(ConstraintViolationException $e) {
 			throw new HintException('DisplayName change rejected.', \OC::$server->getL10N('user_ldap')->t('DisplayName change rejected. Hint: ').$e->getMessage(), $e->getCode());
 		}
@@ -140,10 +142,8 @@ public function changeAvatar($user) {
 		if ($avatar) {
 			$data = $avatar->data();
 
-			$provider = $this->getLDAPProvider();
-
-			$connection = $provider->getLDAPConnection($user->getUID());
-			ldap_mod_replace($connection, $userDN, array('jpegphoto' => $data));
+			$connection = $this->ldapProvider->getLDAPConnection($user->getUID());
+			ldap_mod_replace($connection, $userDN, ['jpegphoto' => $data]);
 		}
 
 	}
@@ -160,10 +160,9 @@ public function changeEmail($user, $newEmail) {
 			return;
 		}
 
-		$provider = $this->getLDAPProvider();
-		$emailField = $provider->getLDAPEmailField($user->getUID());
-		$connection = $provider->getLDAPConnection($user->getUID());
-		ldap_mod_replace($connection, $userDN, array($emailField => $newEmail));
+		$emailField = $this->ldapProvider->getLDAPEmailField($user->getUID());
+		$connection = $this->ldapProvider->getLDAPConnection($user->getUID());
+		ldap_mod_replace($connection, $userDN, [$emailField => $newEmail]);
 	}
 
 	/**
@@ -180,7 +179,7 @@ public function createUser($username, $password) {
 		// NOT allowed in user_ldap: uppercase letters or underscore
 		if (preg_match('/[A-Z_]/', $username)) {
 			$l = \OC::$server->getL10N('user_ldap_extended');
-			throw new \InvalidArgumentException($l->t('Uppercase letters and underscore (_) are not allowed in usernames.'));
+			throw new InvalidArgumentException($l->t('Uppercase letters and underscore (_) are not allowed in usernames.'));
 		}
 
 		# FIXME could not create user using LDAPProvider, because its methods rely
@@ -192,19 +191,19 @@ public function createUser($username, $password) {
 
 		if ($ret = ldap_add($connection, $newUserDN, $newUserEntry)) {
 			$message = "Create LDAP user '$username' ($newUserDN)";
-			\OC::$server->getLogger()->notice($message, array('app' => 'ldapusermanagement'));
+			\OC::$server->getLogger()->notice($message, ['app' => 'ldap_write_support']);
 		} else {
 			$message = "Unable to create LDAP user '$username' ($newUserDN)";
-			\OC::$server->getLogger()->error($message, array('app' => 'ldapusermanagement'));
+			\OC::$server->getLogger()->error($message, ['app' => 'ldap_write_support']);
 		}
 		ldap_close($connection);
 		return $ret ? $newUserDN : null;
 	}
 
 	public function buildNewEntry($username, $password) {
-		$entry = array(
+		$entry = [
 			'o' => $username ,
-			'objectClass' => array( 'inetOrgPerson', 'posixAccount', 'top'),
+			'objectClass' => ['inetOrgPerson', 'posixAccount', 'top'],
 			'cn' => $username ,
 			'gidnumber' => 1, // FIXME: Why this????
 			'homedirectory' => 'x', // ignored by nextcloud
@@ -215,14 +214,12 @@ public function buildNewEntry($username, $password) {
 			'userpassword' => $password ,
 			'displayName' => $username,
 			'street' => "address",
-		);
+		];
 		return $entry;
 	}
 
 	public function deleteUser($uid) {
-		$provider = $this->getLDAPProvider();
-
-		$connection = $provider->getLDAPConnection($uid);
+		$connection = $this->ldapProvider->getLDAPConnection($uid);
 
 		$userDN = $this->getUserDN($uid);
 
@@ -237,18 +234,18 @@ public function deleteUser($uid) {
 
 		if ($res = ldap_delete($connection, $userDN)) {
 			$message = "Delete LDAP user (isDeleted): " . $uid;
-			\OC::$server->getLogger()->notice($message, array('app' => 'ldapusermanagement'));
+			\OC::$server->getLogger()->notice($message, ['app' => 'ldapusermanagement']);
 
 			$this->ocConfig->setUserValue($uid, 'user_ldap', 'isDeleted', 1);
 		} else {
 			$errno = ldap_errno($connection);
 			if ($errno ==  0x20) { #LDAP_NO_SUCH_OBJECT
 				$message = "Delete LDAP user (" . $uid. "): object not found. Is already deleted? Assuming YES";
-				\OC::$server->getLogger()->notice($message, array('app' => 'ldapusermanagement'));
+				\OC::$server->getLogger()->notice($message, ['app' => 'ldapusermanagement']);
 				$res = true;
 			} else {
 				$message = "Unable to delete LDAP user " . $uid;
-				\OC::$server->getLogger()->error($message, array('app' => 'ldapusermanagement'));
+				\OC::$server->getLogger()->error($message, ['app' => 'ldapusermanagement']);
 			}
 		}
 		ldap_close($connection);
@@ -303,7 +300,7 @@ public function countUsers() {
 
 	public function makeLdapBackendFirst() {
 		$backends = $this->userManager->getBackends();
-		$otherBackends = array();
+		$otherBackends = [];
 		$this->userManager->clearBackends();
 		foreach ($backends as $backend) {
 			if ($backend instanceof IUserLDAP) {
@@ -319,18 +316,6 @@ public function makeLdapBackendFirst() {
 		}
 	}
 
-	/**
-	 * Provides LDAP Provider. Cannot be established in constructor
-	 *
-	 * @return LDAPProvider
-	 */
-	private function getLDAPProvider() {
-		if (!$this->ldapProvider) {
-			$this->ldapProvider = \OC::$server->query('LDAPProvider');
-		}
-		return $this->ldapProvider;
-	}
-
 	public function changeUserHook($user, $feature, $attr1, $attr2) {
 		switch ($feature) {
 			case 'avatar':
@@ -345,7 +330,6 @@ public function changeUserHook($user, $feature, $attr1, $attr2) {
 	}
 
 	private function getUserDN($uid) {
-		return $this->getLDAPProvider()->getUserDN($uid);
-		//return "cn=$uid,".$this->ldapConnect->getLDAPBaseUsers();
+		return $this->ldapProvider->getUserDN($uid);
 	}
 }