Attachment 8398 Details for Bug 43384 – patch

[patch] patch

43384.patch (text/plain), 1.76 KB, created by Florian Best on 2017-02-03 13:17:20 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-02-03 13:17:20 CET

Size: 1.76 KB

patch

obsolete

>diff --git a/saml/univention-saml/simplesamlphp-modules/uldap/lib/Auth/Source/uLDAP.php b/saml/univention-saml/simplesamlphp-modules/uldap/lib/Auth/Source/uLDAP.php
>index bfe9fb1..94937f6 100644
>--- a/saml/univention-saml/simplesamlphp-modules/uldap/lib/Auth/Source/uLDAP.php
>+++ b/saml/univention-saml/simplesamlphp-modules/uldap/lib/Auth/Source/uLDAP.php
>@@ -54,13 +54,17 @@ class sspmod_uldap_Auth_Source_uLDAP extends sspmod_core_Auth_UserPassBase {
> 		assert('is_string($password)');
> 
> 		try {
>-			return $this->ldapConfig->login($username, $password, $sasl_args);
>+			$attributes = $this->ldapConfig->login($username, $password, $sasl_args);
> 		} catch (SimpleSAML_Error_Error $e) {
> 			if ($e->getMessage() == 'WRONGUSERPASS') {
>-				$this->throw_common_login_errors($username);
>+				$user_dn = $this->ldap->searchfordn($this->config['search.base'], $this->config['search.attributes'], $username, TRUE);
>+				$attributes = $this->ldap->getAttributes($user_dn);
>+				$this->throw_common_login_errors($attributes);
> 			}
> 			throw $e;
> 		}
>+		$this->throw_common_login_errors($attributes);
>+		return $attributes;
> 
> 	}
> 
>@@ -68,13 +72,9 @@ class sspmod_uldap_Auth_Source_uLDAP extends sspmod_core_Auth_UserPassBase {
> 	/**
> 	 * Investigate login failure
> 	 *
>-	 * @param string $username  The username the user wrote.
>+	 * @param string $attributes
> 	 */
>-	private function throw_common_login_errors($username) {
>-		assert('is_string($username)');
>-
>-		$user_dn = $this->ldap->searchfordn($this->config['search.base'], $this->config['search.attributes'], $username, TRUE);
>-		$attributes = $this->ldap->getAttributes($user_dn);
>+	private function throw_common_login_errors($attributes) {
> 		SimpleSAML_Logger::debug('got LDAP attributes:' . var_export($attributes, true));
> 
> 		$the_time = time();

Actions: View | Diff

Attachments on bug 43384: 8383 | 8398