Loading Dockerfile +1 −6 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="991454" ARG MEMORIES_VERSION="7.3.1" ARG DROP_ACCOUNT_VERSION="2.5.0" RUN sed -i 's/28,0,8,1/28,0,8,9/' ${BASE_DIR}/version.php RUN sed -i 's/28,0,8,1/28,0,8,10/' ${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 @@ -141,7 +141,6 @@ RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch RUN cd ${BASE_DIR} && patch -p0 < ${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/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch Loading @@ -152,7 +151,6 @@ RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PAT RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch # UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039 RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch RUN patch -u ${BASE_DIR}/lib/private/TemplateLayout.php -i ${TMP_PATCH_DIR}/037-do-not-setup-signUpLink-for-public-pages-dynamatically.patch RUN rm -rf ${TMP_PATCH_DIR} # Custom theme Loading Loading @@ -242,9 +240,6 @@ 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 # Replace "Get your own free account" NC link with /e/ Account link in public pages RUN sed -i 's/<?php p(\$_\[\x27signUpLink\x27\]); ?>/https:\/\/e\.foundation\/<?php p(\$_\[\x27language\x27\]); ?>\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php # 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 Loading patches/013-revert-token-password-update.patchdeleted 100644 → 0 +0 −21 Original line number Diff line number Diff line From: Akhil <akhil@e.email> Date: Fri, 16 Dec 2021 17:30 +0530 Subject: [PATCH] Reverts token password update on each login NC 21 started updating password of each and every token on each login. This introduces a huge load on database. This patch reverts to only update when there are expired tokens. --- ./lib/private/Authentication/Token/PublicKeyTokenProvider.php 2024-07-25 17:51:37 +0530 +++ ./lib/private/Authentication/Token/PublicKeyTokenProvider-new.php 2024-07-25 17:53:16 +0530 @@ -509,6 +509,11 @@ } public function updatePasswords(string $uid, string $password) { + + if (!$this->mapper->hasExpiredTokens($uid)) { + // Nothing to do here + return; + } // prevent setting an empty pw as result of pw-less-login if ($password === '' || !$this->config->getSystemValueBool('auth.storeCryptedPassword', true)) { return; patches/037-do-not-setup-signUpLink-for-public-pages-dynamatically.patchdeleted 100644 → 0 +0 −22 Original line number Diff line number Diff line --- ./lib/private/TemplateLayout.php 2024-07-30 13:48:46.750311002 +0600 +++ ./lib/private/TemplateLayout-new.php 2024-07-30 13:47:54.074094480 +0600 @@ -207,6 +207,7 @@ $showSimpleSignup = false; } +/* $defaultSignUpLink = 'https://nextcloud.com/signup/'; $signUpLink = $this->config->getSystemValueString('registration_link', $defaultSignUpLink); if ($signUpLink !== $defaultSignUpLink) { @@ -218,9 +219,10 @@ $urlGenerator = \OCP\Server::get(IURLGenerator::class); $signUpLink = $urlGenerator->getAbsoluteURL('/index.php/apps/registration/'); } +*/ $this->assign('showSimpleSignUpLink', $showSimpleSignup); - $this->assign('signUpLink', $signUpLink); +// $this->assign('signUpLink', $signUpLink); } else { parent::__construct('core', 'layout.base'); } Loading
Dockerfile +1 −6 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="991454" ARG MEMORIES_VERSION="7.3.1" ARG DROP_ACCOUNT_VERSION="2.5.0" RUN sed -i 's/28,0,8,1/28,0,8,9/' ${BASE_DIR}/version.php RUN sed -i 's/28,0,8,1/28,0,8,10/' ${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 @@ -141,7 +141,6 @@ RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch RUN cd ${BASE_DIR} && patch -p0 < ${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/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch Loading @@ -152,7 +151,6 @@ RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PAT RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch # UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039 RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch RUN patch -u ${BASE_DIR}/lib/private/TemplateLayout.php -i ${TMP_PATCH_DIR}/037-do-not-setup-signUpLink-for-public-pages-dynamatically.patch RUN rm -rf ${TMP_PATCH_DIR} # Custom theme Loading Loading @@ -242,9 +240,6 @@ 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 # Replace "Get your own free account" NC link with /e/ Account link in public pages RUN sed -i 's/<?php p(\$_\[\x27signUpLink\x27\]); ?>/https:\/\/e\.foundation\/<?php p(\$_\[\x27language\x27\]); ?>\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php # 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 Loading
patches/013-revert-token-password-update.patchdeleted 100644 → 0 +0 −21 Original line number Diff line number Diff line From: Akhil <akhil@e.email> Date: Fri, 16 Dec 2021 17:30 +0530 Subject: [PATCH] Reverts token password update on each login NC 21 started updating password of each and every token on each login. This introduces a huge load on database. This patch reverts to only update when there are expired tokens. --- ./lib/private/Authentication/Token/PublicKeyTokenProvider.php 2024-07-25 17:51:37 +0530 +++ ./lib/private/Authentication/Token/PublicKeyTokenProvider-new.php 2024-07-25 17:53:16 +0530 @@ -509,6 +509,11 @@ } public function updatePasswords(string $uid, string $password) { + + if (!$this->mapper->hasExpiredTokens($uid)) { + // Nothing to do here + return; + } // prevent setting an empty pw as result of pw-less-login if ($password === '' || !$this->config->getSystemValueBool('auth.storeCryptedPassword', true)) { return;
patches/037-do-not-setup-signUpLink-for-public-pages-dynamatically.patchdeleted 100644 → 0 +0 −22 Original line number Diff line number Diff line --- ./lib/private/TemplateLayout.php 2024-07-30 13:48:46.750311002 +0600 +++ ./lib/private/TemplateLayout-new.php 2024-07-30 13:47:54.074094480 +0600 @@ -207,6 +207,7 @@ $showSimpleSignup = false; } +/* $defaultSignUpLink = 'https://nextcloud.com/signup/'; $signUpLink = $this->config->getSystemValueString('registration_link', $defaultSignUpLink); if ($signUpLink !== $defaultSignUpLink) { @@ -218,9 +219,10 @@ $urlGenerator = \OCP\Server::get(IURLGenerator::class); $signUpLink = $urlGenerator->getAbsoluteURL('/index.php/apps/registration/'); } +*/ $this->assign('showSimpleSignUpLink', $showSimpleSignup); - $this->assign('signUpLink', $signUpLink); +// $this->assign('signUpLink', $signUpLink); } else { parent::__construct('core', 'layout.base'); }