From 2242f21e3b4276a7240a713964a9726a6a661fd4 Mon Sep 17 00:00:00 2001 From: theronakpatel Date: Thu, 27 Mar 2025 14:06:08 +0530 Subject: [PATCH] Removing patch which are used to disable files --- Dockerfile | 5 --- patches/039-reenable-ac-comment-setupfs.patch | 33 ------------------- .../040-reenable-ac-comment-exception.patch | 21 ------------ patches/041-return-false-canfilesystem.patch | 15 --------- 4 files changed, 74 deletions(-) delete mode 100644 patches/039-reenable-ac-comment-setupfs.patch delete mode 100644 patches/040-reenable-ac-comment-exception.patch delete mode 100644 patches/041-return-false-canfilesystem.patch diff --git a/Dockerfile b/Dockerfile index 8f9fa30..aafc59b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -233,11 +233,6 @@ RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.ph RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php -i ${TMP_PATCH_DIR}/034-oidc-bearer-token-auth.patch -#commenting code to re-enable account creation -RUN patch -u ${BASE_DIR}/lib/private/User/Session.php -i ${TMP_PATCH_DIR}/039-reenable-ac-comment-setupfs.patch -RUN patch -u ${BASE_DIR}/lib/base.php -i ${TMP_PATCH_DIR}/040-reenable-ac-comment-exception.patch -RUN patch -u ${BASE_DIR}/lib/private/Lockdown/LockdownManager.php -i ${TMP_PATCH_DIR}/041-return-false-canfilesystem.patch - RUN rm -rf ${TMP_PATCH_DIR} diff --git a/patches/039-reenable-ac-comment-setupfs.patch b/patches/039-reenable-ac-comment-setupfs.patch deleted file mode 100644 index 8f74643..0000000 --- a/patches/039-reenable-ac-comment-setupfs.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Ronak Patel -Date: Mon, 09 Dec 2024 18:50:00 +0530 -Subject: [PATCH] Enabling account creation (by commenting) which does not check FS for first-time login - ---- ./lib/private/User/Session.php 2024-12-09 16:26:24.610444326 +0000 -+++ ./lib/private/User/Session-new.php 2024-09-09 11:44:00.399364921 +0000 -@@ -542,19 +542,19 @@ - - if ($firstTimeLogin) { - //we need to pass the user name, which may differ from login name -- $user = $this->getUser()->getUID(); -- OC_Util::setupFS($user); -+ //$user = $this->getUser()->getUID(); -+ //OC_Util::setupFS($user); - - // TODO: lock necessary? - //trigger creation of user home and /files folder -- $userFolder = \OC::$server->getUserFolder($user); -+ //$userFolder = \OC::$server->getUserFolder($user); - -- try { -+ //try { - // copy skeleton -- \OC_Util::copySkeleton($user, $userFolder); -- } catch (NotPermittedException $ex) { -+ // \OC_Util::copySkeleton($user, $userFolder); -+ //} catch (NotPermittedException $ex) { - // read only uses -- } -+ //} - - // trigger any other initialization - \OC::$server->get(IEventDispatcher::class)->dispatch(IUser::class . '::firstLogin', new GenericEvent($this->getUser())); \ No newline at end of file diff --git a/patches/040-reenable-ac-comment-exception.patch b/patches/040-reenable-ac-comment-exception.patch deleted file mode 100644 index a8ef001..0000000 --- a/patches/040-reenable-ac-comment-exception.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Ronak Patel -Date: Mon, 09 Dec 2024 18:50:00 +0530 -Subject: [PATCH] Enabling account creation: Comment exception for cache gc - ---- ./lib/base.php 2024-12-09 16:25:48.446616914 +0000 -+++ ./lib/base-new.php 2024-12-09 11:51:21.916843879 +0000 -@@ -884,10 +884,10 @@ - } catch (\Exception $e) { - // a GC exception should not prevent users from using OC, - // so log the exception -- Server::get(LoggerInterface::class)->warning('Exception when running cache gc.', [ -- 'app' => 'core', -- 'exception' => $e, -- ]); -+ //Server::get(LoggerInterface::class)->warning('Exception when running cache gc.', [ -+ // 'app' => 'core', -+ // 'exception' => $e, -+ //]); - } - }); - } \ No newline at end of file diff --git a/patches/041-return-false-canfilesystem.patch b/patches/041-return-false-canfilesystem.patch deleted file mode 100644 index 95d9803..0000000 --- a/patches/041-return-false-canfilesystem.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Ronak Patel -Date: Mon, 16 Dec 2024 18:50:00 +0530 -Subject: [PATCH] Disabling access file system - - ---- ./lib/private/Lockdown/LockdownManager.php 2023-12-16 15:01:25 -+++ ./lib/private/Lockdown/LockdownManager-new.php 2024-12-16 13:31:40 -@@ -77,6 +77,7 @@ - } - - public function canAccessFilesystem() { -+ return false; - $scope = $this->getScopeAsArray(); - return !$scope || $scope['filesystem']; - } -- GitLab