Merge pull request #675 from owncloud/loginname_process_chain_ldap

[full-ci] Do not check for the username if if has been processed already

Author: jnweiger

lib/Helper.php

@@ -192,6 +192,11 @@ public function loginName2UserName($param) {
 			throw new \Exception('key uid is expected to be set in $param');
 		}
 
+		if (isset($param['hasBeenHandled']) && $param['hasBeenHandled']) {
+			// if the event has been handled already, ignore it
+			return;
+		}
+
 		$configPrefixes = $this->getServerConfigurationPrefixes(true);
 		$ldapWrapper = new LDAP();
 		$ocConfig = \OC::$server->getConfig();
@@ -204,6 +209,7 @@ public function loginName2UserName($param) {
 		$uid = $userBackend->loginName2UserName($param['uid']);
 		if ($uid !== false) {
 			$param['uid'] = $uid;
+			$param['hasBeenHandled'] = true;  // mark the event as handled
 		}
 	}
 

tests/acceptance/features/apiUserLDAP/serverConnection.feature

@@ -49,10 +49,6 @@ Feature: connect to LDAP serer
     Given LDAP config "LDAPTestId" has key "ldapHost" set to "http://%ldap_host_without_scheme%"
     When user "Alice" requests "/index.php/apps/files" with "GET" using basic auth
     Then the HTTP status code should be "401"
-    And the last lines of the log file should contain log-entries containing these attributes:
-      | app | message                                                                              |
-      | PHP | ldap_connect(): Could not create session handle: Bad parameter to an ldap routine at |
-      | PHP | ldap_set_option(): supplied argument is not a valid ldap link resource at            |
 
   @issue-49
   Scenario: authentication works when second of multiple configurations has an unreachable host configured