Merge branch 'main' into 'nc-25'

# Install unzip for unzipping artifacts

RUN apt-get update && apt-get install unzip

# Custom apps

RUN curl -fsSL -o news.tar.gz \

    "https://github.com/nextcloud/news/releases/download/${NEWS_VERSION}/news.tar.gz" && \

    tar -xf news.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm news.tar.gz;

RUN curl -fsSL -o quota_warning.tar.gz \

    "https://github.com/nextcloud-releases/quota_warning/releases/download/v${QUOTA_WARN_VERSION}/quota_warning-v${QUOTA_WARN_VERSION}.tar.gz" && \

    tar -xf quota_warning.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm quota_warning.tar.gz;

RUN curl -fsSL -o notes.tar.gz \

    "https://github.com/nextcloud/notes/releases/download/v${NOTES_VERSION}/notes.tar.gz" && \

    tar -xf notes.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    mv dist/contacts ${BASE_DIR}/custom_apps/ && \

    rm contacts.zip;

# custom Calendar 3.2.4

RUN curl -fsSL -o calendar.zip \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/calendar/-/jobs/${CALENDAR_JOB_ID}/artifacts/download" && \

    unzip calendar.zip && \

    mv dist/calendar ${BASE_DIR}/custom_apps/ && \

    rm calendar.zip;

RUN curl -fsSL -o user_backend_sql_raw.tar.gz \

    "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \

    tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm user_backend_sql_raw.tar.gz;

RUN curl -fsSL -o email-recovery.zip \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/email-recovery/-/jobs/${EMAIL_RECOVERY_JOB_ID}/artifacts/download" && \

    unzip email-recovery.zip && \

    mv dist/email-recovery ${BASE_DIR}/custom_apps/ && \

    rm email-recovery.zip;

RUN curl -fsSL -o rainloop.tar.gz \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}.tar.gz" && \

    tar -xf rainloop.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    mv "${BASE_DIR}/custom_apps/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}" "${BASE_DIR}/custom_apps/rainloop" && \

    rm rainloop.tar.gz;

RUN curl -fsSL -o ecloud-theme-helper.zip \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-theme-helper/-/jobs/${THEME_HELPER_JOB_ID}/artifacts/download" && \

    mv dist/ecloud-dashboard ${BASE_DIR}/custom_apps/ && \

    rm ecloud-dashboard.zip;

RUN curl -fsSL -o snappymail.tar.gz \

    "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \

    tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm snappymail.tar.gz;

# Snappy theme

RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \

    tar -xf Murena-snappymail-theme.tar.gz -C /tmp/ && \

    mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \

    chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \

    rm -rf Murena-snappymail-theme.tar.gz

# Remove unzip when unzipping is done

RUN apt-get -y remove unzip

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="selfhost-22.0.0"

ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"

# Patches

COPY patches/ ${TMP_PATCH_DIR}/

RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch

RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch

RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch

RUN patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-reminder-service-handle-exception.patch

RUN rm -rf ${TMP_PATCH_DIR}

# Custom theme

    chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \

    rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/

# User Backend

RUN curl -fsSL -o user_backend_sql_raw.tar.gz \

    "https://github.com/PanCakeConnaisseur/user_backend_sql_raw/releases/download/v${USER_BACKEND_RAW_SQL_VERSION}/user_backend_sql_raw.tar.gz" && \

    tar -xf user_backend_sql_raw.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm user_backend_sql_raw.tar.gz;

# Set default class of hidden to settings-hint

RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php

# change notifications icon src

From selfhost as ecloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="24.0.1"

ARG THEME_VERSION="24.0.4"

ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0"

ARG OIDC_LOGIN_VERSION="2.4.0"

RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch

RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch

RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch

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 cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.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 cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch

RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch

RUN rm -rf ${TMP_PATCH_DIR}

RUN curl -fsSL -o ldap_write_support.tar.gz \

RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar-main.js

RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[o,"displayname"\]},//' js/calendar-main.js

# Set default widgets to calendar, tasks and notes

RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php

# Remove colored background from email template logo

RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php

# Seds to fix displayname save regression

RUN sed -i "s/'email' ||/'email'/" ${BASE_DIR}/apps/settings/js/federationsettingsview.js

RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js

image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"

if version_greater "$image_version" "$installed_version"; then

    rsync $rsync_options --include "/news/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/notes/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/quota_warning/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/calendar/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/contacts/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/user_backend_sql_raw/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

From: Akhil <akhil@e.email>

Date: Fri, 17 Sep 2021 13:00 +0530

Subject: [PATCH] Removes user status widget from Dashboard

This patch removes user status widget from available widgets in dashboard

--- DashboardController.php	2021-09-17 12:56:19.691685082 +0530

+++ DashboardController-new.php	2021-09-17 12:59:18.906502554 +0530

@@ -108,6 +108,9 @@

 				'url' => $widget->getUrl()

 			];

 		}, $this->dashboardManager->getWidgets());

+                $widgets = array_filter($widgets, function($widget) {

+                        return($widget['id'] !== "user_status");

+                });

 		$configStatuses = $this->config->getUserValue($this->userId, 'dashboard', 'statuses', '');

 		$statuses = json_decode($configStatuses, true);

 		// We avoid getting an empty array as it will not produce an object in UI's JS

From: Akhil <akhil@e.email>

Date: Wed, 04 Jan 2023 16:24 +0530

Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce number of LDAP binds and SQL UPDATE operations per password check

--- ./apps/user_ldap/lib/User_LDAP.php	2023-01-04 16:20:02.747181606 +0530

+++ ./apps/user_ldap/lib/User_LDAP-new.php	2023-01-17 19:22:51.776857415 +0530

@@ -114,11 +114,12 @@

 	 * @return string|false

 	 * @throws \Exception

 	 */

-	public function loginName2UserName($loginName) {

+	public function loginName2UserName($loginName, bool $forceLdapRefetch = false) {

 		$cacheKey = 'loginName2UserName-' . $loginName;

 		$username = $this->access->connection->getFromCache($cacheKey);

-		if ($username !== null) {

+		$ignoreCache = ($username === false && $forceLdapRefetch);

+		if ($username !== null && !$ignoreCache) {

 			return $username;

 		}

@@ -133,6 +134,9 @@

 			}

 			$username = $user->getUsername();

 			$this->access->connection->writeToCache($cacheKey, $username);

+			if($forceLdapRefetch) {

+				$user->processAttributes($ldapRecord);

+			}

 			return $username;

 		} catch (NotOnLDAP $e) {

 			$this->access->connection->writeToCache($cacheKey, false);

@@ -176,16 +180,11 @@

 	 * @return false|string

 	 */

 	public function checkPassword($uid, $password) {

-		try {

-			$ldapRecord = $this->getLDAPUserByLoginName($uid);

-		} catch (NotOnLDAP $e) {

-			$this->logger->debug(

-				$e->getMessage(),

-				['app' => 'user_ldap', 'exception' => $e]

-			);

+		$username = $this->loginName2UserName($uid, true);

+		if(!$username) {

 			return false;

 		}

-		$dn = $ldapRecord['dn'][0];

+		$dn = $this->access->username2dn($username);

 		$user = $this->access->userManager->get($dn);

 		if (!$user instanceof User) {

@@ -203,7 +202,6 @@

 			}

 			$this->access->cacheUserExists($user->getUsername());

-			$user->processAttributes($ldapRecord);

 			$user->markLogin();

 			return $user->getUsername();

--- ./apps/dav/lib/CalDAV/Reminder/ReminderService.php	2023-03-06 21:26:20.835422901 +0530

+++ ./apps/dav/lib/CalDAV/Reminder/ReminderService-new.php	2023-03-06 21:28:49.325422185 +0530

@@ -143,7 +143,13 @@

 				continue;

 			}

-			$vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']);

+			try {

+				$vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']);

+			} catch (MaxInstancesExceededException $e) {

+				$this->logger->debug('Recurrence with too many instances detected, skipping VEVENT', ['exception' => $e]);

+				$this->backend->removeReminder($reminder['id']);

+				continue;

+			}

 			if (!$vevent) {

 				$this->backend->removeReminder($reminder['id']);

 				continue;