Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit a7aeb475 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Merge remote-tracking branch 'origin/main' into slim

parents 8edeb25e a4502172
Loading
Loading
Loading
Loading
+42 −44
Original line number Diff line number Diff line
FROM nextcloud:29.0.12-fpm AS nextcloud
FROM nextcloud:30.0.14-fpm AS nextcloud
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_HELPER_JOB_ID="1168069"
ARG THEME_HELPER_JOB_ID="1313213"
ARG NOTES_VERSION="4.11.0"
ARG CONTACTS_JOB_ID="881946"
ARG CALENDAR_JOB_ID="991372"
ARG EMAIL_RECOVERY_JOB_ID="1168177"
ARG EA_JOB_ID="1168157"
ARG LAUNCHER_JOB_ID="1168135"
ARG CONTACTS_JOB_ID="1313223"
ARG CALENDAR_JOB_ID="1313255"
ARG EMAIL_RECOVERY_JOB_ID="1313239"
ARG EA_JOB_ID="1289726"
ARG LAUNCHER_JOB_ID="1313268"
ARG GOOGLE_INTEGRATION_VERSION="3.2.0"
ARG DASHBOARD_JOB_ID="1168115"
ARG DASHBOARD_JOB_ID="1313279"
ARG SNAPPY_VERSION="2.37.2"
ARG SNAPPY_THEME_VERSION="4.0.1"
ARG USER_MIGRATION_JOB_ID="1168093"
ARG SNAPPY_THEME_VERSION="4.0.4"
ARG USER_MIGRATION_JOB_ID="1313296"
ARG MEMORIES_VERSION="7.5.2"
ARG DROP_ACCOUNT_VERSION="2.7.1"

RUN sed -i 's/29,0,12,2/29,0,12,5/' ${BASE_DIR}/version.php
RUN sed -i 's/30,0,14,1/30,0,14,8/' ${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
@@ -78,10 +78,10 @@ RUN curl -fsSL -o ecloud-dashboard.zip \
  mv dist/murena-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;
#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;

RUN curl -fsSL -o user_migration.zip \
  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/user_migration/-/jobs/${USER_MIGRATION_JOB_ID}/artifacts/download" && \
@@ -90,19 +90,19 @@ RUN curl -fsSL -o user_migration.zip \
  rm user_migration.zip;

# Fix snappymail icon
RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml
#RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml

# Hide personal settings of snappymail
RUN sed -i "s/'additional'/null/" ${BASE_DIR}/custom_apps/snappymail/lib/Settings/PersonalSettings.php
#RUN sed -i "s/'additional'/null/" ${BASE_DIR}/custom_apps/snappymail/lib/Settings/PersonalSettings.php

# 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/ && \
  mkdir -p ${BASE_DIR}/themes/Murena && \
  mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena/snappymail && \
  chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \
  rm -rf Murena-snappymail-theme.tar.gz
#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/ && \
#  mkdir -p ${BASE_DIR}/themes/Murena && \
#  mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena/snappymail && \
#  chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \
#  rm -rf Murena-snappymail-theme.tar.gz

RUN curl -fsSL -o memories.tar.gz \
  "https://github.com/pulsejet/memories/releases/download/v${MEMORIES_VERSION}/memories.tar.gz" && \
@@ -123,7 +123,7 @@ RUN apt-get -y remove unzip
RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('theme', 'eCloud');/g" ${BASE_DIR}/lib/base.php

# Disable editor feature of media viewer
RUN sed -i 's/canEdit(){return!this.isMobile&&L()/canEdit(){return!this.isMobile&&false&&L()/' ${BASE_DIR}/apps/viewer/js/viewer-main.mjs
RUN sed -i 's/canEdit(){return!this.isMobile\&\&L()/canEdit(){return!this.isMobile\&\&false\&\&L()/' ${BASE_DIR}/apps/viewer/js/viewer-main.mjs


ENTRYPOINT ["/custom_entrypoint.sh"]
@@ -133,7 +133,7 @@ From nextcloud as selfhost
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_VERSION="26.0.2"
ARG USER_BACKEND_RAW_SQL_VERSION="2.0.1"
#ARG USER_BACKEND_RAW_SQL_VERSION="2.0.1"
ARG SELFHOST_THEME_VERSION="2.0.0"
ARG IS_SELFHOST=true

@@ -168,10 +168,10 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \
  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;
#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;

# Selfhost theme
RUN if [ "$IS_SELFHOST" = true ]; then \
@@ -203,17 +203,11 @@ RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Co
# Fix API call in files script
RUN sed -i "s/ajax\/getstoragestats/api\/v1\/stats/g" ${BASE_DIR}/apps/files/js/files.js

#fix for who can access data- its needed with 011-privacy-settings.patch
RUN sed -i 's|Your home storage is encrypted using {linkopen}server-side-encryption ↗{linkclose} with a master key\. It means that administrators can access your files, but not read their content\.|Like in most cloud services, a reduced number of administrators can see your files and all the information in the database as they need to make backups, perform upgrades, reset passwords, etc.<br>{linkopen1}Learn more about this topic here.  ↗{linkclose1}|g' ${BASE_DIR}/apps/privacy/js/privacy-main.js
RUN sed -i 's/t((0,n\.Iu)("privacy","Your files on external storages may be encrypted using {linkopen}server-side-encryption ↗{linkclose} with a master key based on their configuration\."))/t("{linkopen}"+(0,n\.Iu)("privacy","To protect your data, we have implemented server-side-encryption on our servers which hides by default the content of your files and notes even to these administrators")+"↗{linkclose}")/g' ${BASE_DIR}/apps/privacy/js/privacy-main.js
RUN sed -i 's|t=t=>e.push(t.replace("{linkopen}",'"'"'<a href="https://nextcloud.com/blog/encryption-in-nextcloud/" target="_blank" rel="noreferrer noopener" class="encryption__link">'"'"').replace("{linkclose}","</a>"))|t=t=>e.push(t.replace("{linkopen}",'"'"'<a href="https://nextcloud.com/blog/encryption-in-nextcloud/" target="_blank" rel="noreferrer noopener" class="encryption__link">'"'"').replace("{linkclose}","</a>"))|g'  ${BASE_DIR}/apps/privacy/js/privacy-main.js
RUN sed -i 's|.replace("{linkclose}","</a>")|.replace("{linkclose}","</a>").replace("{linkopen1}",'"'"'<a href="https://doc.e.foundation/support-topics/services#can-the-ecloud-admin-access-my-data" target="_blank" rel="noreferrer noopener" class="encryption__link">'"'"').replace("{linkclose1}","</a>")|g' ${BASE_DIR}/apps/privacy/js/privacy-main.js

From selfhost as ecloud
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_VERSION="28.0.2"
ARG LDAP_WRITE_SUPPORT_VERSION="1.11.0"
ARG THEME_VERSION="30.0.0"
ARG LDAP_WRITE_SUPPORT_VERSION="1.12.1"
ARG IS_SELFHOST=false

RUN curl -fsSL -o ldap_write_support.tar.gz \
@@ -242,11 +236,14 @@ RUN rm -rf ${TMP_PATCH_DIR}
# Remove user avatar generation for system addressbook card
RUN sed -i 's/$this->getAvatarImage($user)/null/' ${BASE_DIR}/apps/dav/lib/CardDAV/Converter.php

# redirect user to sso login on successful resetting password
#RUN cd ${BASE_DIR}/dist && sed -i "s|window\.location\.href=(0,g\.Jv)(\"login\")|window.location.href = '/'|g" core-login.js

# show reset pwd page with a query param
# RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js

# add attr about how many notifications to notif icon
RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-src_NotificationsApp_vue.js
RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==u.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-DS2Cdf60.chunk.mjs

# Rename Memories to Gallery
RUN sed -i 's/<name>Memories<\/name>/<name>Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml
@@ -255,14 +252,14 @@ RUN cd ${BASE_DIR}/custom_apps/memories/js && sed -i 's/Memories Settings/Galler

# autocomplete leak tweak apps frontend with sed, disable group suggestion

RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i ' s/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js
RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/\["INDIVIDUAL"\]/\[\]/g' js/contacts-main.mjs
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:\[a,"displayname"\]},//' js/calendar-main.js
RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/<step>OCA\\Notes\\Migration\\EditorHint<\/step>//g' appinfo/info.xml
RUN cd ${BASE_DIR}/apps/theming && sed -i 's/<step>OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' appinfo/info.xml

# sharing search by email
RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/kM.principalPropertySearchByDisplayname(t);/kM.principalPropertySearch(\[{name:\["http:\/\/sabredav.org\/ns","email-address"\]\}],t,"anyof");/g' js/contacts-main.js
#RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/kM.principalPropertySearchByDisplayname(t);/kM.principalPropertySearch(\[{name:\["http:\/\/sabredav.org\/ns","email-address"\]\}],t,"anyof");/g' js/contacts-main.js

# Remove colored background from email template logo
RUN sed -i 's/$this->header, \[$this->themingDefaults->getDefaultColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php
@@ -275,7 +272,7 @@ RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_
RUN sed -i '/<step>OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE_DIR}/apps/dav/appinfo/info.xml

# Hide `Play sound when a call started (requires Nextcloud Talk)` checkbox from notification setting
RUN sed -i 's/attrs:{checked:e\.config\.sound_talk}/staticClass:"notification_talk",attrs:{checked:e\.config\.sound_talk}/g' ${BASE_DIR}/apps/notifications/js/notifications-settings.js
RUN sed -i 's/attrs:{checked:r\.config\.sound_talk}/staticClass:"notification_talk",attrs:{checked:r\.config\.sound_talk}/g' ${BASE_DIR}/apps/notifications/js/notifications-settings.mjs

# Hide `Navigation bar settings` from theming
RUN sed -i 's/{attrs:{name:t.t("theming","Navigation bar settings")}}/{staticClass:"navigation-bar-settings",attrs:{name:t.t("theming","Navigation bar settings")}}/g' ${BASE_DIR}/dist/theming-personal-theming.js
@@ -308,5 +305,6 @@ RUN sed -i ':a;N;$!ba;s/t("NcActionButton",{on:{click:e.onToggleSharing},scopedS
# Add id to delete account settings section and hide it by default
RUN sed -i 's/"NcSettingsSection",{attrs:{/"NcSettingsSection",{attrs:{id:"delete-account-settings-section",style:"visibility:hidden;",/' ${BASE_DIR}/custom_apps/drop_account/js/drop_account-personal-settings.mjs

# Fix of https://github.com/nextcloud/server/commit/e727a3b00bd9b574279d25c006a0bc6b8fa4eec3 for availability setting
RUN sed -i 's/n.data/await n.text()/' ${BASE_DIR}/dist/dav-settings-personal-availability.js
 No newline at end of file
# Hide personal settings of files_external
RUN sed -i "s/'externalstorages'/null/" ${BASE_DIR}/apps/files_external/lib/Settings/Personal.php
+40 −5
Original line number Diff line number Diff line
@@ -2,11 +2,46 @@

echo "Murena entrypoint"

# syslog-ng
if [ -n ${SYSLOG_HOST} ]; then
  sed -i "s|\${SYSLOG_HOST}|${SYSLOG_HOST:-127.0.0.1}|g" /etc/syslog-ng/syslog-ng.conf
  syslog-ng --no-caps
  echo "syslog-ng started."
echo "Custom eCloud entrypoint"
rsync_options="-rlDog --chown www-data:www-data --delete"

SRC_DIR="/usr/src/nextcloud"
DST_DIR="/var/www/html"

installed_version="0.0.0.0"

if [ -f /var/www/html/version.php ]; then
    installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
fi
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 "/notes/" --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/
    rsync $rsync_options --include "/email-recovery/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/ecloud-accounts/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/ecloud-theme-helper/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/murena_launcher/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/murena-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/
    #rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/
    rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/
    rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/
    rsync $rsync_options --include "/memories/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/drop_account/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/user_migration/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/selfhost-theme-helper/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
else
    echo "Skipping rsync step as version not updated!"
fi

if [ "$(id -u)" = 0 ]; then
    su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean"
else
    sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean"
fi

/entrypoint.sh "$@"
+12 −12
Original line number Diff line number Diff line
@@ -9,11 +9,10 @@ only the admin user (also configured in env var) will not have his login appende
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,7 +315,28 @@
 				self::LOGIN_MSG_CSRFCHECKFAILED
@@ -315,6 +315,27 @@
 			);
 		}
+		$user = trim($user);
 
+		$user = mb_strtolower($user, 'UTF-8');
+		$actualUser = $user;
+		$legacyDomain = $this->config->getSystemValue('legacy_domain', '');
@@ -22,7 +21,7 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
+		$mainDomainSuffix = !empty($mainDomain) ? '@'  . $mainDomain : '';
+		$admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];
+		$is_admin = strcmp($user, $admin_username) === 0;
 
+
+		if (!$is_admin && str_ends_with($user, $legacyDomainSuffix)) {
+			$user = str_replace($legacyDomainSuffix, '', $user);
+		}
@@ -37,8 +36,8 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
+
 		$data = new LoginData(
 			$this->request,
 			trim($user),
@@ -328,7 +349,7 @@
 			$user,
@@ -327,7 +348,7 @@
 		if (!$result->isSuccess()) {
 			return $this->createLoginFailedResponse(
 				$data->getUsername(),
@@ -47,13 +46,13 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
 				$redirect_url,
 				$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
@@ -66,6 +66,27 @@
@@ -48,6 +48,27 @@
 
 		$this->logger->debug('Converting login name to UID');
 		$uid = $loginName;
+
+        $uid = trim($uid);
+        $uid = mb_strtolower($uid, 'UTF-8');
+        $legacyDomain = \OC::$server->getConfig()->getSystemValue('legacy_domain', '');
@@ -74,15 +73,16 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
+        if (!\OC::$server->get(\OCP\IUserManager::class)->userExists($uid)) {
+                $uid = $uid . $legacyDomainSuffix;
+        }
+
 		Util::emitHook(
 			'\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
@@ -430,6 +430,10 @@
@@ -383,6 +383,10 @@
 		$remoteAddress = $request->getRemoteAddress();
 		$currentDelay = $throttler->sleepDelay($remoteAddress, 'login');
 		$currentDelay = $throttler->sleepDelayOrThrowOnMax($remoteAddress, 'login');
 
+		$mainDomain = $this->config->getSystemValue('main_domain', '');
+		$mainDomainSuffix = !empty($mainDomain) ? '@' . $mainDomain : '';
+4 −3
Original line number Diff line number Diff line
@@ -7,11 +7,12 @@ This patch removes some results from the contact menu controller, not to leak us
diff --git ContactsMenuController.php ContactsMenuController-new.php
--- ./core/Controller/ContactsMenuController.php	2023-02-01 21:40:07.515628276 +0530
+++ ./core/Controller/ContactsMenuController-new.php	2023-02-01 21:39:07.398140201 +0530
@@ -49,7 +49,7 @@
 	 * @throws Exception
 	 */
@@ -32,7 +32,7 @@
 	#[NoAdminRequired]
 	#[FrontpageRoute(verb: 'POST', url: '/contactsmenu/contacts')]
 	public function index(?string $filter = null): array {
-		return $this->manager->getEntries($this->userSession->getUser(), $filter);
+		return [];
 	}
 
 	/**
+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ this filtering works in conjunction with the autocomplete feature disabled in ne
diff --git lib/private/Collaboration/Collaborators/UserPlugin.php lib/private/Collaboration/Collaborators/UserPlugin-new.php
--- lib/private/Collaboration/Collaborators/UserPlugin.php	2025-02-13 19:30:40
+++ lib/private/Collaboration/Collaborators/UserPlugin-new.php	2025-03-07 12:48:50
@@ -175,8 +175,8 @@
@@ -150,8 +150,8 @@
 			if (
 				$this->shareeEnumerationFullMatch &&
 				$lowerSearch !== '' && (strtolower($uid) === $lowerSearch ||
@@ -29,7 +29,7 @@ diff --git lib/private/Collaboration/Collaborators/UserPlugin.php lib/private/Co
diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Collaboration/Collaborators/MailPlugin-new.php
--- lib/private/Collaboration/Collaborators/MailPlugin.php	2025-02-13 19:30:40
+++ lib/private/Collaboration/Collaborators/MailPlugin-new.php	2025-03-07 12:55:25
@@ -39,6 +39,7 @@
@@ -19,6 +19,7 @@
 use OCP\IUserSession;
 use OCP\Mail\IMailer;
 use OCP\Share\IShare;
@@ -37,7 +37,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
 
 class MailPlugin implements ISearchPlugin {
 	protected bool $shareWithGroupOnly;
@@ -61,8 +62,10 @@
@@ -42,8 +43,10 @@
 		private KnownUserService $knownUserService,
 		private IUserSession $userSession,
 		private IMailer $mailer,
@@ -48,7 +48,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
 		$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';
 		$this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
@@ -216,27 +219,61 @@
@@ -204,27 +207,61 @@
 						if ($exactEmailMatch) {
 							$searchResult->markExactIdMatch($emailType);
 						}
Loading