Loading Dockerfile +1 −1 Original line number Diff line number Diff line Loading @@ -168,7 +168,7 @@ RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete- RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/023-patch_getbyemail.patch RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/023-optimize-get-by-email.patch RUN rm -rf ${TMP_PATCH_DIR} RUN curl -fsSL -o ldap_write_support.tar.gz \ Loading patches/023-optimize-get-by-email.patch 0 → 100644 +44 −0 Original line number Diff line number Diff line From: Akhil <akhil@e.email> Date: Tue, 10 Mar 2023 10:00 +0530 Subject: [PATCH] To optimize getByEmail as we have boundary conditions that email is unique per-user and can only match one of the two domains --- ./lib/private/User/Manager.php 2023-03-10 10:01:44.729561986 +0530 +++ ./lib/private/User/Manager-new.php 2023-03-10 10:05:18.767230727 +0530 @@ -706,11 +706,33 @@ */ public function getByEmail($email) { // looking for 'email' only (and not primary_mail) is intentional - $userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email); + $mailDomain = $this->config->getSystemValue('mail_domain', ''); + $altMailDomain = $this->config->getSystemValue('alt_mail_domain', ''); + $users = []; + + if(empty($mailDomain) && empty($altMailDomain)) { + $userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email); - $users = array_map(function ($uid) { - return $this->get($uid); - }, $userIds); + $users = array_map(function ($uid) { + return $this->get($uid); + }, $userIds); + } else { + $uid = ''; + $mailDomainSuffix = empty($mailDomain) ? '' : '@' . $mailDomain; + $altMailDomainSuffix = empty($altMailDomain) ? '' : '@' . $altMailDomain; + + if (!empty($mailDomainSuffix) && stristr($email, $mailDomainSuffix) !== FALSE) { + // In case of mail_domain, username is email + $uid = $email; + } else if (!empty($altMailDomainSuffix) && stristr($email, $altMailDomainSuffix) !== FALSE) { + // In case of alt_mail_domain, username is email without domain suffix + $uid = str_replace($altMailDomainSuffix, '', $email); + } + // If no match of domain, no user + if(!empty($uid)) { + $users = [$this->get($uid)]; + } + } return array_values(array_filter($users, function ($u) { return ($u instanceof IUser); patches/023-patch_getbyemail.patchdeleted 100644 → 0 +0 −52 Original line number Diff line number Diff line --- ./lib/private/User/Manager.php 2023-02-03 17:18:44.729561986 +0530 +++ ./lib/private/User/Manager-new.php 2023-02-10 17:10:18.767230727 +0530 @@ -705,6 +705,49 @@ * @since 9.1.0 */ public function getByEmail($email) { + $uid=$email; // get first part of email if it contains alt domain, otherwise it is just $email + $mail_domain = $this->config->getSystemValue('mail_domain', ''); + $alt_domain = $this->config->getSystemValue('alt_mail_domain', ''); + + $mail_domain_suffix =''; + $alt_domain_suffix =''; + $domain_found=1; + + if (isset($mail_domain) && !empty($mail_domain)) { + $mail_domain_suffix ='@' . $mail_domain; + } + + if (isset($alt_domain) && !empty($alt_domain)) { + $alt_domain_suffix ='@' . $alt_domain; + } + + if (!empty($mail_domain_suffix) && stristr($email, $mail_domain_suffix) == FALSE) { + $domain_found=0; + } + + if (!empty($alt_domain_suffix) && stristr($email, $alt_domain_suffix) == FALSE) { + $domain_found=0; + } + + if($domain_found == 0){ + return []; + } + + if (!empty($alt_domain_suffix) && stristr($email, $alt_domain_suffix) !== FALSE) { + $uid = str_replace($alt_domain_suffix, '', $email); + } + + if (!empty($alt_domain_suffix) && stristr($email, $alt_domain_suffix) !== FALSE) { + $uid = str_replace($alt_domain_suffix, '', $email); + } + + if (!empty($alt_domain_suffix) && stristr($email, $alt_domain_suffix) !== FALSE) { + $uid = str_replace($alt_domain_suffix, '', $email); + } + + if ($user = $this->get($uid)) { + return([$user]); + } // looking for 'email' only (and not primary_mail) is intentional $userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email); Loading
Dockerfile +1 −1 Original line number Diff line number Diff line Loading @@ -168,7 +168,7 @@ RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete- RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/023-patch_getbyemail.patch RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/023-optimize-get-by-email.patch RUN rm -rf ${TMP_PATCH_DIR} RUN curl -fsSL -o ldap_write_support.tar.gz \ Loading
patches/023-optimize-get-by-email.patch 0 → 100644 +44 −0 Original line number Diff line number Diff line From: Akhil <akhil@e.email> Date: Tue, 10 Mar 2023 10:00 +0530 Subject: [PATCH] To optimize getByEmail as we have boundary conditions that email is unique per-user and can only match one of the two domains --- ./lib/private/User/Manager.php 2023-03-10 10:01:44.729561986 +0530 +++ ./lib/private/User/Manager-new.php 2023-03-10 10:05:18.767230727 +0530 @@ -706,11 +706,33 @@ */ public function getByEmail($email) { // looking for 'email' only (and not primary_mail) is intentional - $userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email); + $mailDomain = $this->config->getSystemValue('mail_domain', ''); + $altMailDomain = $this->config->getSystemValue('alt_mail_domain', ''); + $users = []; + + if(empty($mailDomain) && empty($altMailDomain)) { + $userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email); - $users = array_map(function ($uid) { - return $this->get($uid); - }, $userIds); + $users = array_map(function ($uid) { + return $this->get($uid); + }, $userIds); + } else { + $uid = ''; + $mailDomainSuffix = empty($mailDomain) ? '' : '@' . $mailDomain; + $altMailDomainSuffix = empty($altMailDomain) ? '' : '@' . $altMailDomain; + + if (!empty($mailDomainSuffix) && stristr($email, $mailDomainSuffix) !== FALSE) { + // In case of mail_domain, username is email + $uid = $email; + } else if (!empty($altMailDomainSuffix) && stristr($email, $altMailDomainSuffix) !== FALSE) { + // In case of alt_mail_domain, username is email without domain suffix + $uid = str_replace($altMailDomainSuffix, '', $email); + } + // If no match of domain, no user + if(!empty($uid)) { + $users = [$this->get($uid)]; + } + } return array_values(array_filter($users, function ($u) { return ($u instanceof IUser);
patches/023-patch_getbyemail.patchdeleted 100644 → 0 +0 −52 Original line number Diff line number Diff line --- ./lib/private/User/Manager.php 2023-02-03 17:18:44.729561986 +0530 +++ ./lib/private/User/Manager-new.php 2023-02-10 17:10:18.767230727 +0530 @@ -705,6 +705,49 @@ * @since 9.1.0 */ public function getByEmail($email) { + $uid=$email; // get first part of email if it contains alt domain, otherwise it is just $email + $mail_domain = $this->config->getSystemValue('mail_domain', ''); + $alt_domain = $this->config->getSystemValue('alt_mail_domain', ''); + + $mail_domain_suffix =''; + $alt_domain_suffix =''; + $domain_found=1; + + if (isset($mail_domain) && !empty($mail_domain)) { + $mail_domain_suffix ='@' . $mail_domain; + } + + if (isset($alt_domain) && !empty($alt_domain)) { + $alt_domain_suffix ='@' . $alt_domain; + } + + if (!empty($mail_domain_suffix) && stristr($email, $mail_domain_suffix) == FALSE) { + $domain_found=0; + } + + if (!empty($alt_domain_suffix) && stristr($email, $alt_domain_suffix) == FALSE) { + $domain_found=0; + } + + if($domain_found == 0){ + return []; + } + + if (!empty($alt_domain_suffix) && stristr($email, $alt_domain_suffix) !== FALSE) { + $uid = str_replace($alt_domain_suffix, '', $email); + } + + if (!empty($alt_domain_suffix) && stristr($email, $alt_domain_suffix) !== FALSE) { + $uid = str_replace($alt_domain_suffix, '', $email); + } + + if (!empty($alt_domain_suffix) && stristr($email, $alt_domain_suffix) !== FALSE) { + $uid = str_replace($alt_domain_suffix, '', $email); + } + + if ($user = $this->get($uid)) { + return([$user]); + } // looking for 'email' only (and not primary_mail) is intentional $userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email);
