Merge branch 'nc-21.0.9' into 'nc-21' (54cfb215) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+9 −9

Original line number	Diff line number	Diff line
		FROM nextcloud:21.0.7-fpm AS nextcloud
		FROM nextcloud:21.0.9-fpm AS nextcloud
		ARG BASE_DIR="/usr/src/nextcloud"
		ARG TMP_PATCH_DIR="/tmp/build_patches"
		ARG THEME_VERSION="21.1.1"
		ARG THEME_HELPER_VERSION="1.0.2"
		ARG NEWS_VERSION="17.0.1"
		ARG QUOTA_WARN_VERSION="1.13.0"
		ARG NOTES_VERSION="4.2.0"
		ARG CONTACTS_VERSION="4.0.6"
		ARG CALENDAR_VERSION="3.0.1"
		ARG NOTES_VERSION="4.3.1"
		ARG CONTACTS_VERSION="4.0.8"
		ARG CALENDAR_VERSION="3.1.0"
		ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1"
		ARG EMAIL_RECOVERY_JOB_ID="199763"
		ARG RAINLOOP_VERSION="7.1.2"
		@@ -16,8 +16,7 @@ ARG EA_TAG="1.0.0"
		ARG ECLOUD_LAUNCHER_JOB_ID="222001"
		ARG GOOGLE_INTEGRATION_VERSION="1.0.6"

		COPY patches/ ${TMP_PATCH_DIR}/
		RUN sed -i 's/21,0,7,0/21,0,7,18/' ${BASE_DIR}/version.php
		RUN sed -i 's/21,0,9,1/21,0,9,4/' ${BASE_DIR}/version.php

		# Install unzip for unzipping artifacts
		RUN apt-get update && apt-get install unzip
		@@ -39,12 +38,12 @@ RUN curl -fsSL -o notes.tar.gz \
		rm notes.tar.gz;

		RUN curl -fsSL -o contacts.tar.gz \
		"https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts.tar.gz" && \
		"https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts-v${CONTACTS_VERSION}.tar.gz" && \
		tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		rm contacts.tar.gz;

		RUN curl -fsSL -o calendar.tar.gz \
		"https://github.com/nextcloud-releases/calendar/releases/download/v${CALENDAR_VERSION}/calendar.tar.gz" && \
		"https://github.com/nextcloud-releases/calendar/releases/download/v${CALENDAR_VERSION}/calendar-v${CALENDAR_VERSION}.tar.gz" && \
		tar -xf calendar.tar.gz -C ${BASE_DIR}/custom_apps/ && \
		rm calendar.tar.gz;

		@@ -97,6 +96,7 @@ RUN apt-get -y remove unzip
		RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('theme', 'eCloud');/g" ${BASE_DIR}/lib/base.php

		# Patches
		COPY patches/ ${TMP_PATCH_DIR}/
		RUN patch -u ${BASE_DIR}/core/Controller/LoginController.php -i ${TMP_PATCH_DIR}/002-login-without-domain.patch
		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
		@@ -247,7 +247,7 @@ RUN apt-get -y install imagemagick;\
		rm -rf /var/lib/apt/lists/*;

		VOLUME /var/www/html
		ENV NEXTCLOUD_VERSION 21.0.7
		ENV NEXTCLOUD_VERSION 21.0.9

		ENTRYPOINT ["/custom_entrypoint.sh"]
		CMD ["php-fpm"]

patches/005-autocomplete-user-leak-core.patch

+56 −56

Original line number	Diff line number	Diff line
		@@ -33,13 +33,13 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
		+use OCP\IUserManager;
		use OCP\IUserSession;
		use OCP\Share\IShare;

		@@ -71,13 +72,15 @@
		IConfig $config,
		use OCP\Mail\IMailer;
		@@ -75,13 +76,15 @@
		IGroupManager $groupManager,
		KnownUserService $knownUserService,
		- IUserSession $userSession) {
		+ IUserSession $userSession,
		IUserSession $userSession,
		- IMailer $mailer) {
		+ IMailer $mailer,
		+ IUserManager $userManager) {
		$this->contactsManager = $contactsManager;
		$this->cloudIdManager = $cloudIdManager;
		@@ -48,10 +48,10 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
		$this->knownUserService = $knownUserService;
		$this->userSession = $userSession;
		+ $this->userManager = $userManager;
		$this->mailer = $mailer;

		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
		@@ -209,27 +212,62 @@
		@@ -218,27 +221,62 @@
		if ($exactEmailMatch) {
		$searchResult->markExactIdMatch($emailType);
		}

patches/009-help-links.patch

+26 −20

Original line number	Diff line number	Diff line
		@@ -19,48 +19,54 @@ help links are shown
		$policy->addAllowedFrameDomain('\'self\'');
		--- ./apps/settings/templates/help.php 2021-07-01 15:13:08.000000000 +0530
		+++ ./apps/settings/templates/help-new.php 2021-08-10 17:22:42.771569854 +0530
		@@ -3,38 +3,21 @@
		?>
		@@ -4,45 +4,25 @@
		<div id="app-navigation">
		<ul>
		- <li>
		<li>
		- <a class="icon-user <?php if ($_['mode'] === 'user') {
		- p('active');
		-} ?>"
		- href="<?php print_unescaped($_['urlUserDocs']); ?>">
		+ <a class="icon-user"
		+ href="https://docs.nextcloud.com/server/21/user_manual/en" target="_blank" rel="noreferrer noopener">
		<span class="help-list__text">
		- <?php p($l->t('User documentation')); ?>
		- </a>
		- </li>
		+ <?php p('Nextcloud ' . $_['ncVersion'] . ' ' . $l->t('User documentation')); ?>
		</span>
		</a>
		</li>
		- <?php if ($_['admin']) { ?>
		- <li>
		<li>
		- <a class="icon-user-admin <?php if ($_['mode'] === 'admin') {
		- p('active');
		-} ?>"
		- href="<?php print_unescaped($_['urlAdminDocs']); ?>">
		+ <a href="https://support.e.foundation/how-tos#ecloud-eemail--account" class="icon-category-office" target="_blank" rel="noreferrer noopener">
		<span class="help-list__text">
		- <?php p($l->t('Administrator documentation')); ?>
		+ <li>
		+ <a class="icon-user"
		+ href="https://docs.nextcloud.com/server/21/user_manual/en/" target="_blank" rel="noreferrer noopener">
		+ <?php p('Nextcloud ' . $_['ncVersion'] . ' ' . $l->t('User documentation')); ?> ↗
		+ <?php p('/e/' . ' ' . $l->t('Documentation')); ?> ↗
		</span>
		</a>
		</li>
		- <?php } ?>
		-
		<li>
		- <a href="https://docs.nextcloud.com" class="icon-category-office" target="_blank" rel="noreferrer noopener">
		- <span class="help-list__text">
		- <?php p($l->t('Documentation')); ?> ↗
		+ <a href="https://support.e.foundation/how-tos#ecloud-eemail--account" class="icon-category-office" target="_blank" rel="noreferrer noopener">
		+ <?php p('/e/' . ' ' . $l->t('Documentation')); ?> ↗
		</a>
		</li>
		<li>
		- </span>
		- </a>
		- </li>
		- <li>
		- <a href="https://help.nextcloud.com" class="icon-comment" target="_blank" rel="noreferrer noopener">
		+ <a href="https://community.e.foundation" class="icon-comment" target="_blank" rel="noreferrer noopener">
		<span class="help-list__text">
		<?php p($l->t('Forum')); ?> ↗
		</span>
		</a>
		</li>
		</div>

		-
		-<div id="app-content" class="help-includes">
		- <iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe">
		- </iframe>

patches/011-privacy-settings.patch

+12 −14

Original line number	Diff line number	Diff line
		@@ -6,30 +6,28 @@ This patch removes certain unnecessary sections from the "privacy" section in pe

		--- ./apps/privacy/lib/Settings/MissionSettings.php 2021-09-07 17:38:08.650902445 +0530
		+++ ./apps/privacy/lib/Settings/MissionSettings-new.php 2021-09-07 17:40:30.078256502 +0530
		@@ -41,8 +41,8 @@
		/**
		* @return string
		*/
		- public function getSection():string {
		@@ -45,7 +45,7 @@
		return null;
		}

		- return 'privacy';
		+ public function getSection() {
		+ return null;
		}

		/**
		public function getPriority(): int {

		--- ./apps/privacy/lib/Settings/UserDataManifestoSettings.php 2021-09-07 17:38:06.284224253 +0530
		+++ ./apps/privacy/lib/Settings/UserDataManifestoSettings-new.php 2021-09-07 17:40:42.288315736 +0530
		@@ -41,8 +41,8 @@
		/**
		* @return string
		*/
		- public function getSection():string {
		@@ -45,7 +45,7 @@
		return null;
		}

		- return 'privacy';
		+ public function getSection() {
		+ return null;
		}

		/**
		public function getPriority(): int {

		--- ./apps/privacy/templates/who-has-access.php 2021-09-07 17:40:05.704804878 +0530
		+++ ./apps/privacy/templates/who-has-access-new.php 2021-09-07 17:40:02.714790363 +0530
		@@ -1,3 +1,8 @@