Merge branch 'dev/nc32' of https://gitlab.e.foundation/e/infra/ecloud/nextcloud into dev/nc32 (16810130) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+6 −6

Original line number	Diff line number	Diff line
		@@ -4,14 +4,14 @@ ARG TMP_PATCH_DIR="/tmp/build_patches"

		ARG CONTACTS_URL="https://gitlab.e.foundation/api/v4/projects/1238/packages/generic/contacts/v7.2.0+murena-20251111/contacts-v7.2.0+murena-20251111.tar.gz"
		ARG CALENDAR_URL="https://gitlab.e.foundation/api/v4/projects/1199/packages/generic/calendar/v5.3.5+murena-20251016/calendar-v5.3.5+murena-20251016.tar.gz"
		ARG THEME_HELPER_URL="https://gitlab.e.foundation/api/v4/projects/952/packages/generic/ecloud-theme-helper/v9.0.0/ecloud-theme-helper-v9.0.0.tar.gz"
		ARG LAUNCHER_URL="https://gitlab.e.foundation/api/v4/projects/927/packages/generic/murena_launcher/v9.0.0/murena_launcher-v9.0.0.tar.gz"
		ARG DASHBOARD_URL="https://gitlab.e.foundation/api/v4/projects/1195/packages/generic/murena-dashboard/v9.0.0/murena-dashboard-v9.0.0.tar.gz"
		ARG THEME_HELPER_URL="https://gitlab.e.foundation/api/v4/projects/952/packages/generic/ecloud-theme-helper/v11.0.0/ecloud-theme-helper-v11.0.0.tar.gz"
		ARG LAUNCHER_URL="https://gitlab.e.foundation/api/v4/projects/927/packages/generic/murena_launcher/v10.0.0/murena_launcher-v10.0.0.tar.gz"
		ARG DASHBOARD_URL="https://gitlab.e.foundation/api/v4/projects/1195/packages/generic/murena-dashboard/v10.0.0/murena-dashboard-v10.0.0.tar.gz"
		ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/v2.38.2+murena-20251117/snappymail-v2.38.2+murena-20251117.tar.gz"
		ARG OIDC_LOGIN_URL="https://gitlab.e.foundation/api/v4/projects/1496/packages/generic/oidc_login/v3.2.2+murena-20251028/oidc_login-v3.2.2+murena-20251028.tar.gz"
		ARG SNAPPY_THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/1377/packages/generic/snappymail/v4.0.5/snappymail-v4.0.5.tar.gz"
		ARG EA_URL="https://gitlab.e.foundation/api/v4/projects/648/packages/generic/ecloud-accounts/v13.0.0/ecloud-accounts-v13.0.0.tar.gz"
		ARG EMAIL_RECOVERY_URL="https://gitlab.e.foundation/api/v4/projects/868/packages/generic/email-recovery/v12.2.0/email-recovery-v12.2.0.tar.gz"
		ARG EA_URL="https://gitlab.e.foundation/api/v4/projects/648/packages/generic/ecloud-accounts/v14.0.0/ecloud-accounts-v14.0.0.tar.gz"
		ARG EMAIL_RECOVERY_URL="https://gitlab.e.foundation/api/v4/projects/868/packages/generic/email-recovery/v13.0.0/email-recovery-v13.0.0.tar.gz"
		ARG USER_MIGRATION_URL="https://gitlab.e.foundation/api/v4/projects/1468/packages/generic/user_migration/8.0.0+murena-20251020/user_migration-8.0.0+murena-20251020.tar.gz"

		ARG NOTES_URL="https://github.com/nextcloud-releases/notes/releases/download/v4.13.1/notes-v4.13.1.tar.gz"
		@@ -19,7 +19,7 @@ ARG MEMORIES_URL="https://github.com/pulsejet/memories/releases/download/v7.8.2/
		ARG DROP_ACCOUNT_URL="https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.7.1.tar.gz"
		ARG GOOGLE_INTEGRATION_URL="https://github.com/nextcloud-releases/integration_google/releases/download/v4.2.0/integration_google-v4.2.0.tar.gz"

		RUN sed -i 's/32,0,6,1/32,0,6,1/' ${BASE_DIR}/version.php
		RUN sed -i 's/32,0,6,1/32,0,6,2/' ${BASE_DIR}/version.php
		COPY custom_entrypoint.sh /
		RUN chmod +x /custom_entrypoint.sh
		RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images

patches/002-login-without-domain.patch

+11 −11

Original line number	Diff line number	Diff line
		@@ -7,9 +7,9 @@ This patch auto append the domain handled by nc, configured in env var.
		only the admin user (also configured in env var) will not have his login appended with a @domain suffix

		diff --git ./core/Controller/LoginController.php ./core/Controller/LoginController-new.php
		--- ./core/Controller/LoginController.php 2024-04-26 15:08:54.979407062 +0530
		+++ ./core/Controller/LoginController-new.php 2024-04-26 15:16:48.582366408 +0530
		@@ -315,6 +315,27 @@
		--- ./core/Controller/LoginController.php 2026-03-23 17:46:38.368004410 +0600
		+++ ./core/Controller/LoginController-new.php 2026-03-23 17:56:15.665110462 +0600
		@@ -341,6 +341,27 @@
		);
		}

		@@ -37,7 +37,7 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
		$data = new LoginData(
		$this->request,
		$user,
		@@ -327,7 +348,7 @@
		@@ -354,7 +375,7 @@
		if (!$result->isSuccess()) {
		return $this->createLoginFailedResponse(
		$data->getUsername(),
		@@ -47,8 +47,8 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
		$result->getErrorMessage()
		);

		--- ./core/Controller/WebAuthnController.php 2023-04-21 15:18:58.813220092 +0530
		+++ ./core/Controller/WebAuthnController-new.php 2023-04-21 15:24:40.036538414 +0530
		--- ./core/Controller/WebAuthnController.php 2026-03-23 18:12:33.546326153 +0600
		+++ ./core/Controller/WebAuthnController-new.php 2026-03-23 18:12:26.157698882 +0600
		@@ -48,6 +48,27 @@

		$this->logger->debug('Converting login name to UID');
		@@ -78,9 +78,9 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
		'\OCA\Files_Sharing\API\Server2Server',
		'preLoginNameUsedAsUserName',

		--- ./lib/private/User/Session.php 2023-04-21 15:27:00.417034490 +0530
		+++ ./lib/private/User/Session-new.php 2023-04-21 15:28:18.309111435 +0530
		@@ -383,6 +383,10 @@
		--- ./lib/private/User/Session.php 2026-03-23 17:46:39.585001447 +0600
		+++ ./lib/private/User/Session-new.php 2026-03-23 17:59:52.577453313 +0600
		@@ -384,6 +384,10 @@
		$remoteAddress = $request->getRemoteAddress();
		$currentDelay = $throttler->sleepDelayOrThrowOnMax($remoteAddress, 'login');

patches/006-recovery-email-changes.patch

+6 −8

Original line number	Diff line number	Diff line
		--- ./core/Controller/LostController.php 2023-05-05 18:38:07.080445742 +0530
		+++ ./core/Controller/LostController-new.php 2023-05-05 18:48:27.385043088 +0530
		@@ -126,7 +126,24 @@
		--- ./core/Controller/LostController.php 2026-03-23 17:46:38.368004410 +0600
		+++ ./core/Controller/LostController-new.php 2026-03-23 19:00:49.176323284 +0600
		@@ -127,7 +127,23 @@
		protected function checkPasswordResetToken(string $token, string $userId): void {
		try {
		$user = $this->userManager->get($userId);
		@@ -22,12 +22,11 @@
		+ $user = $this->userManager->get($userId);
		+ $recoveryEmail = $this->config->getUserValue($userId, 'email-recovery', 'recovery-email', '');
		+ $this->verificationToken->check($token, $user, 'lostpassword', $user ? $recoveryEmail : '', true);
		+
		} catch (InvalidTokenException $e) {
		$error = $e->getCode() === InvalidTokenException::TOKEN_EXPIRED
		? $this->l10n->t('Could not reset password because the token is expired')
		@@ -236,9 +253,22 @@
		* @throws \OCP\PreConditionNotMetException
		@@ -237,9 +253,23 @@
		* @throws PreConditionNotMetException
		*/
		protected function sendEmail(string $input): void {
		+ $legacyDomain = $this->config->getSystemValue('legacy_domain', '');
		@@ -45,9 +44,8 @@
		+ }
		$user = $this->findUserByIdOrMail($input);
		$email = $user->getEMailAddress();
		-

		+ $email = $this->config->getUserValue($user->getUID(), 'email-recovery', 'recovery-email', '');
		if (empty($email)) {
		throw new ResetPasswordException('Could not send reset e-mail since there is no email for username ' . $input);
		}

patches/007-remove-dev-notice.patch

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,9 +5,9 @@ Subject: [PATCH] Remove development notice portion in personal info settings
		This patch removes the development notice portion in personal info settings

		diff --git ./apps/settings/lib/Settings/Personal/ServerDevNotice.php ./apps/settings/lib/Settings/Personal/ServerDevNotice-new.php
		--- ./apps/settings/lib/Settings/Personal/ServerDevNotice.php 2022-03-23 12:22:57.000000000 +0100
		+++ ./apps/settings/lib/Settings/Personal/ServerDevNotice.php-new 2022-03-23 12:23:25.000000000 +0100
		@@ -81,11 +81,7 @@
		--- ./apps/settings/lib/Settings/Personal/ServerDevNotice.php 2026-03-23 17:46:38.150004938 +0600
		+++ ./apps/settings/lib/Settings/Personal/ServerDevNotice-new.php 2026-03-23 19:06:54.783056705 +0600
		@@ -59,11 +59,7 @@
		* @return string\|null the section ID, e.g. 'sharing'
		*/
		public function getSection(): ?string {