Commit dc2a02c2 authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #649 in ZP/z-push from...

Merge pull request #649 in ZP/z-push from bugfix/ZP-1355-auth-username-when-impersonating-is-always-lowercase to develop

* commit 'e4a2cf05':
  ZP-1355 Make sure the impersonated username is always lowercase.
  ZP-1355 Don't lowercase the auth+impersonation username automatically when impersonating.
parents 9479c0d1 e4a2cf05
...@@ -144,7 +144,7 @@ class BackendKopano implements IBackend, ISearchProvider { ...@@ -144,7 +144,7 @@ class BackendKopano implements IBackend, ISearchProvider {
$this->mainUser = strtolower($user); $this->mainUser = strtolower($user);
// TODO the impersonated user should be passed directly to IBackend->Logon() - ZP-1351 // TODO the impersonated user should be passed directly to IBackend->Logon() - ZP-1351
$this->impersonateUser = Request::GetImpersonatedUser(); $this->impersonateUser = strtolower(Request::GetImpersonatedUser());
// check if we are impersonating someone // check if we are impersonating someone
// $defaultUser will be used for $this->defaultStore // $defaultUser will be used for $this->defaultStore
......
...@@ -190,7 +190,7 @@ class Request { ...@@ -190,7 +190,7 @@ class Request {
self::$authUser = self::$authUserString; // auth will fail when impersonating & KOE_CAPABILITY_IMPERSONATE is disabled self::$authUser = self::$authUserString; // auth will fail when impersonating & KOE_CAPABILITY_IMPERSONATE is disabled
if (defined('KOE_CAPABILITY_IMPERSONATE') && KOE_CAPABILITY_IMPERSONATE && stripos(self::$authUserString, self::IMPERSONATE_DELIM) !== false) { if (defined('KOE_CAPABILITY_IMPERSONATE') && KOE_CAPABILITY_IMPERSONATE && stripos(self::$authUserString, self::IMPERSONATE_DELIM) !== false) {
list(self::$authUser, self::$impersonatedUser) = explode(self::IMPERSONATE_DELIM, strtolower(self::$authUserString)); list(self::$authUser, self::$impersonatedUser) = explode(self::IMPERSONATE_DELIM, self::$authUserString);
} }
if(defined('USE_FULLEMAIL_FOR_LOGIN') && ! USE_FULLEMAIL_FOR_LOGIN) { if(defined('USE_FULLEMAIL_FOR_LOGIN') && ! USE_FULLEMAIL_FOR_LOGIN) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment