Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-28402 LDAP configuration values being stored in lower case, causi…

…ng misconfiguration

It looks like array_change_key_case() does not work recursively, so we
were not actually lowercasing the expiration attribute key. As the
configuration setting is always lowercase they didn't match.
  • Loading branch information...
commit fa5f5c206f2739437d669987842e6237ef09b3eb 1 parent a014e3b
Iñaki Arenaza iarenaza authored stronk7 committed
Showing with 11 additions and 10 deletions.
  1. +11 −10 auth/ldap/auth.php
21 auth/ldap/auth.php
View
@@ -579,16 +579,17 @@ function password_expire($username) {
$sr = ldap_read($ldapconnection, $user_dn, '(objectClass=*)', $search_attribs);
if ($sr) {
$info = ldap_get_entries_moodle($ldapconnection, $sr);
- $info = array_change_key_case($info, CASE_LOWER);
- if (!empty ($info) and !empty($info[0][$this->config->expireattr][0])) {
- $expiretime = $this->ldap_expirationtime2unix($info[0][$this->config->expireattr][0], $ldapconnection, $user_dn);
- if ($expiretime != 0) {
- $now = time();
- if ($expiretime > $now) {
- $result = ceil(($expiretime - $now) / DAYSECS);
- }
- else {
- $result = floor(($expiretime - $now) / DAYSECS);
+ if (!empty ($info)) {
+ $info = array_change_key_case($info[0], CASE_LOWER);
+ if (!empty($info[$this->config->expireattr][0])) {
+ $expiretime = $this->ldap_expirationtime2unix($info[$this->config->expireattr][0], $ldapconnection, $user_dn);
+ if ($expiretime != 0) {
+ $now = time();
+ if ($expiretime > $now) {
+ $result = ceil(($expiretime - $now) / DAYSECS);
+ } else {
+ $result = floor(($expiretime - $now) / DAYSECS);
+ }
}
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.