Loading Dockerfile +8 −9 Original line number Diff line number Diff line FROM nextcloud:22.2.8-fpm AS nextcloud FROM nextcloud:22.2.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.2" ARG THEME_HELPER_VERSION="1.3.1" ARG NEWS_VERSION="18.0.1" ARG THEME_VERSION="22.1.3" ARG THEME_HELPER_VERSION="1.3.2" ARG NEWS_VERSION="18.1.0" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.3.1" ARG CONTACTS_JOB_ID="329486" ARG CALENDAR_JOB_ID="329481" ARG CALENDAR_JOB_ID="344794" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="313915" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_TAG="2.0.2" ARG ECLOUD_LAUNCHER_JOB_ID="318040" ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" RUN sed -i 's/22,2,8,1/22,2,8,27/' ${BASE_DIR}/version.php RUN sed -i 's/22,2,9,1/22,2,9,1/' ${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 Loading Loading @@ -126,8 +126,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/014-add-mail-usage.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.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/Authentication/Listeners/UserDeletedFilesCleanupListener.php -i ${TMP_PATCH_DIR}/017-storage-wrapper.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/019-occ-user-setting.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion Loading patches/017-storage-wrapper.patchdeleted 100644 → 0 +0 −22 Original line number Diff line number Diff line --- ./lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php 2022-05-27 12:40:13.680838300 +0530 +++ ./lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener-new.php 2022-05-27 12:41:07.530838300 +0530 @@ -26,6 +26,7 @@ namespace OC\Authentication\Listeners; use OC\Files\Cache\Cache; +use OC\Files\Storage\Wrapper\Wrapper; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; use OCP\Files\Config\IMountProviderCollection; @@ -56,6 +57,11 @@ if (!$storage) { throw new \Exception("User has no home storage"); } + // remove all wrappers, so we do the delete directly on the home storage bypassing any wrapper + while ($storage->instanceOfStorage(Wrapper::class)) { + /** @var Wrapper $storage */ + $storage = $storage->getWrapperStorage(); + } $this->homeStorageCache[$event->getUser()->getUID()] = $storage; } if ($event instanceof UserDeletedEvent) { patches/019-occ-user-setting.patch→patches/018-occ-user-setting.patch +0 −0 File moved. View file Loading
Dockerfile +8 −9 Original line number Diff line number Diff line FROM nextcloud:22.2.8-fpm AS nextcloud FROM nextcloud:22.2.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="22.1.2" ARG THEME_HELPER_VERSION="1.3.1" ARG NEWS_VERSION="18.0.1" ARG THEME_VERSION="22.1.3" ARG THEME_HELPER_VERSION="1.3.2" ARG NEWS_VERSION="18.1.0" ARG QUOTA_WARN_VERSION="1.14.0" ARG NOTES_VERSION="4.3.1" ARG CONTACTS_JOB_ID="329486" ARG CALENDAR_JOB_ID="329481" ARG CALENDAR_JOB_ID="344794" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" ARG EMAIL_RECOVERY_JOB_ID="313915" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_TAG="2.0.2" ARG ECLOUD_LAUNCHER_JOB_ID="318040" ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" RUN sed -i 's/22,2,8,1/22,2,8,27/' ${BASE_DIR}/version.php RUN sed -i 's/22,2,9,1/22,2,9,1/' ${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 Loading Loading @@ -126,8 +126,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/014-add-mail-usage.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.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/Authentication/Listeners/UserDeletedFilesCleanupListener.php -i ${TMP_PATCH_DIR}/017-storage-wrapper.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/019-occ-user-setting.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion Loading
patches/017-storage-wrapper.patchdeleted 100644 → 0 +0 −22 Original line number Diff line number Diff line --- ./lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php 2022-05-27 12:40:13.680838300 +0530 +++ ./lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener-new.php 2022-05-27 12:41:07.530838300 +0530 @@ -26,6 +26,7 @@ namespace OC\Authentication\Listeners; use OC\Files\Cache\Cache; +use OC\Files\Storage\Wrapper\Wrapper; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; use OCP\Files\Config\IMountProviderCollection; @@ -56,6 +57,11 @@ if (!$storage) { throw new \Exception("User has no home storage"); } + // remove all wrappers, so we do the delete directly on the home storage bypassing any wrapper + while ($storage->instanceOfStorage(Wrapper::class)) { + /** @var Wrapper $storage */ + $storage = $storage->getWrapperStorage(); + } $this->homeStorageCache[$event->getUser()->getUID()] = $storage; } if ($event instanceof UserDeletedEvent) {