From 2337b299692f87892a900c5766c7dd4a927ecac9 Mon Sep 17 00:00:00 2001 From: akhil Date: Fri, 15 Oct 2021 15:31:35 +0530 Subject: [PATCH 01/25] Rsync integration_google dir --- custom_entrypoint.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 36dfb301..6513df42 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -29,6 +29,8 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/ecloud_drop_account/" --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 "/ecloud-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 "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ else -- GitLab From 8f217c914ebf89dc42c607eff2820c89dba1043a Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 28 Oct 2021 14:18:57 +0530 Subject: [PATCH 02/25] added sed to remove OS dependent dark mode css --- Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a786563f..feed495b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:20.0.12-fpm ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="20.1.2" +ARG THEME_VERSION="20.1.3" ARG THEME_HELPER_VERSION="1.0.1" ARG NEWS_VERSION="16.0.1" ARG QUOTA_WARN_VERSION="1.9.1" @@ -20,7 +20,7 @@ RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ ${TMP_PATCH_DIR}/ COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh -RUN sed -i 's/20,0,12,1/20,0,12,14/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,15/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip @@ -129,6 +129,11 @@ RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE # Remove colored background from email template logo RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php +# Ignore OS dark mode for all users +# Don't use user-specific dark theme css for non-logged in users +RUN sed -i 's/OCA.Accessibility.theme="dark"/OCA.Accessibility.theme="light"/' ${BASE_DIR}/apps/accessibility/js/accessibilityoca.js +RUN sed -i "s/$userValues = ['dark']/$userValues = []/" ${BASE_DIR}/apps/accessibility/lib/Controller/AccessibilityController.php + # Custom theme RUN curl -fsSL -o eCloud-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ -- GitLab From 176c41823f0a0c554fe9053b27f61b55e6161226 Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 28 Oct 2021 17:19:58 +0530 Subject: [PATCH 03/25] Fixed sed for non-logged in css --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index feed495b..61c0301f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -132,7 +132,7 @@ RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this-> # Ignore OS dark mode for all users # Don't use user-specific dark theme css for non-logged in users RUN sed -i 's/OCA.Accessibility.theme="dark"/OCA.Accessibility.theme="light"/' ${BASE_DIR}/apps/accessibility/js/accessibilityoca.js -RUN sed -i "s/$userValues = ['dark']/$userValues = []/" ${BASE_DIR}/apps/accessibility/lib/Controller/AccessibilityController.php +RUN sed -i "s/$userValues = \['dark'\]/$userValues = \[\]/" ${BASE_DIR}/apps/accessibility/lib/Controller/AccessibilityController.php # Custom theme RUN curl -fsSL -o eCloud-theme.tar.gz \ -- GitLab From 42ec87113f11a972d18a7aefb3d59c9d8374bb87 Mon Sep 17 00:00:00 2001 From: akhil Date: Thu, 28 Oct 2021 17:41:14 +0530 Subject: [PATCH 04/25] Bumped version number to 16 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 61c0301f..1a9b332b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ ${TMP_PATCH_DIR}/ COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh -RUN sed -i 's/20,0,12,1/20,0,12,15/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,16/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 12f7ab6b01470fa8c291065fd078b380505cdec4 Mon Sep 17 00:00:00 2001 From: akhil Date: Mon, 8 Nov 2021 19:03:01 +0530 Subject: [PATCH 05/25] Lowercase admin username before checking against input --- patches/002-login-without-domain.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/002-login-without-domain.patch b/patches/002-login-without-domain.patch index 6e670628..477bd803 100644 --- a/patches/002-login-without-domain.patch +++ b/patches/002-login-without-domain.patch @@ -17,7 +17,7 @@ diff --git files/LoginController.php files/LoginController-new.php + $user = mb_strtolower($user, 'UTF-8'); + $domain = $this->config->getSystemValue("mail_domain"); + $domain_suffix = "@$domain"; -+ $admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"]; ++ $admin_username = mb_strtolower($_ENV["NEXTCLOUD_ADMIN_USER"], 'UTF-8'); + if (stristr($user, $domain_suffix) === FALSE && strcmp($user, $admin_username) != 0) { + $user = $user . $domain_suffix; + } -- GitLab From 929c83902e8f92c8d87ffcfe721a6c7ac49c64b3 Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Thu, 18 Nov 2021 09:25:53 +0000 Subject: [PATCH 06/25] create target based Dockerfile --- .gitlab-ci.yml | 49 ++++++++++++++++++++++++++++------ Dockerfile | 72 ++++++++++++++++++++++++++++++-------------------- README.md | 11 ++++++++ 3 files changed, 95 insertions(+), 37 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e9fa46e..3e0a8000 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,23 +10,56 @@ default: services: - docker:19.03.12-dind before_script: - - docker info - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY tags: - generic_privileged build-branch: - except: - - tags stage: build + variables: + TARGET: ecloud + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: never + - if: $CI_COMMIT_TAG != null + when: never + - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/ + variables: + TARGET: "selfhost" + - if: $CI_COMMIT_REF_SLUG != null + when: on_success + allow_failure: true script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . + - echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG" + - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" build-tag: - only: - - tags stage: build + variables: + TARGET: ecloud + allow_failure: true + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: never + - if: $CI_COMMIT_TAG == null + when: never + - if: $CI_COMMIT_REF_SLUG =~ /^selfhost/ + variables: + TARGET: "selfhost" + - if: $CI_COMMIT_TAG != null + when: on_success script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" . - - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" + - echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG" + - docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . + - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" + +docker-tag: + stage: .post + rules: + - when: manual + script: + - echo "SOURCE $SOURCE, TARGET $TARGET" + - docker pull $CI_REGISTRY_IMAGE:$SOURCE + - docker tag $CI_REGISTRY_IMAGE:$SOURCE $CI_REGISTRY_IMAGE:$TARGET + - docker push $CI_REGISTRY_IMAGE:$TARGET \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1a9b332b..81ffd5c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ -FROM nextcloud:20.0.12-fpm +FROM nextcloud:20.0.12-fpm as base ARG BASE_DIR="/usr/src/nextcloud" -ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="20.1.3" ARG THEME_HELPER_VERSION="1.0.1" ARG NEWS_VERSION="16.0.1" @@ -17,10 +16,9 @@ ARG ECLOUD_LAUNCHER_JOB_ID="204816" ARG GOOGLE_INTEGRATION_VERSION="1.0.5-1-nightly" RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -COPY patches/ ${TMP_PATCH_DIR}/ COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh -RUN sed -i 's/20,0,12,1/20,0,12,16/' ${BASE_DIR}/version.php +RUN sed -i 's/20,0,12,1/20,0,12,17/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip @@ -101,31 +99,6 @@ RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('t # fix min version of google data migration app RUN sed -i "s/min-version=\"22\"/min-version=\"20\"/" ${BASE_DIR}/custom_apps/integration_google/appinfo/info.xml -# Patches -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 -RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch -RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch -RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.patch -RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/007-remove-dev-notice.patch -RUN patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR}/008-icons-cacher-theme-svgs.patch -RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/008-svg-controller-theme-svgs.patch -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 cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch -RUN rm -rf ${TMP_PATCH_DIR} - -# 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/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar.js -RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/anyof/allof/g' js/calendar.js - -# Set default widgets to calendar, tasks and notes -RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php - # Remove colored background from email template logo RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php @@ -147,3 +120,44 @@ RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/ Date: Tue, 8 Mar 2022 00:54:40 +0530 Subject: [PATCH 07/25] update to 21.0.9 --- Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d8482d8..dca5fdb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -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 QUOTA_WARN_VERSION="1.13.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,0/21,0,9,0/' ${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"] -- GitLab From ac8389e369037e246909362a539946473ec797bc Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 8 Mar 2022 00:54:57 +0530 Subject: [PATCH 08/25] Edit patches to be compatible with 21.0.9 versions --- patches/005-autocomplete-user-leak-core.patch | 113 +++++++++--------- patches/009-help-links.patch | 46 +++---- patches/011-privacy-settings.patch | 26 ++-- 3 files changed, 94 insertions(+), 91 deletions(-) diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch index 51c01edd..0a5b90f6 100644 --- a/patches/005-autocomplete-user-leak-core.patch +++ b/patches/005-autocomplete-user-leak-core.patch @@ -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; @@ -47,11 +47,11 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co $this->groupManager = $groupManager; $this->knownUserService = $knownUserService; $this->userSession = $userSession; -+ $this->userManager = $userManager; ++ $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,61 @@ if ($exactEmailMatch) { $searchResult->markExactIdMatch($emailType); } @@ -67,31 +67,31 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co - ]; + $isUserinInstance = $this->userManager->get($emailAddress); + if ($isUserinInstance === null) { -+ // /e/ user is not in ecloud ++ // /e/ user is not in ecloud + + $result['exact'][] = [ -+ 'label' => $displayName, -+ 'uuid' => $contact['UID'], -+ 'name' => $contact['FN'], -+ 'type' => $emailAddressType ?? '', -+ 'value' => [ -+ 'shareType' => IShare::TYPE_EMAIL, -+ 'shareWith' => $emailAddress, -+ ], -+ ]; ++ 'label' => $displayName, ++ 'uuid' => $contact['UID'], ++ 'name' => $contact['FN'], ++ 'type' => $emailAddressType ?? '', ++ 'value' => [ ++ 'shareType' => IShare::TYPE_EMAIL, ++ 'shareWith' => $emailAddress, ++ ], ++ ]; + } else { -+ // /e/ user IS an ecloud user, convert to user share type -+ if (!$isUserinInstance->isEnabled()) { -+ // Ignore disabled users -+ continue; -+ } -+ $result['exact'][] = [ -+ 'label' => $displayName, -+ 'value' => [ -+ 'shareType' => IShare::TYPE_USER, -+ 'shareWith' => $emailAddress, -+ ], -+ ]; ++ // /e/ user IS an ecloud user, convert to user share type ++ if (!$isUserinInstance->isEnabled()) { ++ // Ignore disabled users ++ continue; ++ } ++ $result['exact'][] = [ ++ 'label' => $displayName, ++ 'value' => [ ++ 'shareType' => IShare::TYPE_USER, ++ 'shareWith' => $emailAddress, ++ ], ++ ]; + } } else { - $result['wide'][] = [ @@ -104,33 +104,32 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co - 'shareWith' => $emailAddress, - ], - ]; -+ $isUserinInstance = $this->userManager->get($emailAddress); -+ if ($isUserinInstance === null) { -+ // /e/ user is not in ecloud -+ $result['wide'][] = [ -+ 'label' => $displayName, -+ 'uuid' => $contact['UID'], -+ 'name' => $contact['FN'], -+ 'type' => $emailAddressType ?? '', -+ 'value' => [ -+ 'shareType' => IShare::TYPE_EMAIL, -+ 'shareWith' => $emailAddress, -+ ], -+ ]; -+ } else { -+ // /e/ user IS an ecloud user, convert to user share type -+ if (!$isUserinInstance->isEnabled()) { -+ // Ignore disabled users -+ continue; -+ } -+ $result['wide'][] = [ -+ 'label' => $displayName, -+ 'value' => [ -+ 'shareType' => IShare::TYPE_USER, -+ 'shareWith' => $emailAddress, -+ ], -+ ]; -+ } ++ if ($isUserinInstance === null) { ++ // /e/ user is not in ecloud ++ $result['wide'][] = [ ++ 'label' => $displayName, ++ 'uuid' => $contact['UID'], ++ 'name' => $contact['FN'], ++ 'type' => $emailAddressType ?? '', ++ 'value' => [ ++ 'shareType' => IShare::TYPE_EMAIL, ++ 'shareWith' => $emailAddress, ++ ], ++ ]; ++ } else { ++ // /e/ user IS an ecloud user, convert to user share type ++ if (!$isUserinInstance->isEnabled()) { ++ // Ignore disabled users ++ continue; ++ } ++ $result['wide'][] = [ ++ 'label' => $displayName, ++ 'value' => [ ++ 'shareType' => IShare::TYPE_USER, ++ 'shareWith' => $emailAddress, ++ ], ++ ]; ++ } } } } diff --git a/patches/009-help-links.patch b/patches/009-help-links.patch index baae85b8..3c90df7c 100644 --- a/patches/009-help-links.patch +++ b/patches/009-help-links.patch @@ -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 @@ - +- -
- diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index 17300809..0e3b201c 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -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 @@ -- GitLab From 48c065a535991a242beaeb54622eedf324311eb1 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 8 Mar 2022 01:09:09 +0530 Subject: [PATCH 09/25] Fixed patch 005 --- patches/005-autocomplete-user-leak-core.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch index 0a5b90f6..26cbf334 100644 --- a/patches/005-autocomplete-user-leak-core.patch +++ b/patches/005-autocomplete-user-leak-core.patch @@ -51,7 +51,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co $this->mailer = $mailer; $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes'; -@@ -218,27 +221,61 @@ +@@ -218,27 +221,62 @@ if ($exactEmailMatch) { $searchResult->markExactIdMatch($emailType); } @@ -104,6 +104,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co - 'shareWith' => $emailAddress, - ], - ]; ++ $isUserinInstance = $this->userManager->get($emailAddress); + if ($isUserinInstance === null) { + // /e/ user is not in ecloud + $result['wide'][] = [ -- GitLab From 26fed642350651f756f0ecd1a22a4c4fdad22783 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 8 Mar 2022 01:20:24 +0530 Subject: [PATCH 10/25] Fixed version in version.php --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dca5fdb0..47533d72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG EA_TAG="1.0.0" ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" -RUN sed -i 's/21,0,9,0/21,0,9,0/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,9,1/21,0,9,1/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 26154074b39506b5d59fbdd0def94b4dd23cb453 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 8 Mar 2022 12:12:25 +0530 Subject: [PATCH 11/25] Set quota warning to correct version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47533d72..e8329d48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ 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.1" +ARG QUOTA_WARN_VERSION="1.13.0" ARG NOTES_VERSION="4.3.1" ARG CONTACTS_VERSION="4.0.8" ARG CALENDAR_VERSION="3.1.0" @@ -16,7 +16,7 @@ ARG EA_TAG="1.0.0" ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" -RUN sed -i 's/21,0,9,1/21,0,9,1/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,9,1/21,0,9,2/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From dc7310780fe0fcb4e0049c580921fa15f7caffdd Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 9 Mar 2022 10:10:39 +0530 Subject: [PATCH 12/25] who-has-access section of privacy policy edits --- patches/014-patch_privacy.patch | 42 +++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 patches/014-patch_privacy.patch diff --git a/patches/014-patch_privacy.patch b/patches/014-patch_privacy.patch new file mode 100644 index 00000000..e4a001c8 --- /dev/null +++ b/patches/014-patch_privacy.patch @@ -0,0 +1,42 @@ +From: Avinash +Date: Tue, 08 March 2023 18:39 +0530 +Subject: [PATCH] Removes and transalate new text in WHo Can access my data + +--- ./apps/privacy/templates/who-has-access.php 2022-03-08 17:21:53.720124900 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-08 16:37:08.870124900 +0530 +@@ -6,7 +6,7 @@ +
+

t('Who has access to your data?')) ?>

+

t('Administrators')); ?>

+-
++

t('Only Ecloud Administrators can access your data.')); ?>

+ +

t('People you shared with')) ?>

+
+ +--- ./apps/privacy/l10n/es.json 2022-03-08 17:31:37.200124900 +0530 ++++ ./apps/privacy/l10n/es-new.json 2022-03-08 16:45:16.400124900 +0530 +@@ -288,6 +288,7 @@ + "Encryption" : "Cifrado", + "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", + "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", +- "Your data is located in: " : "Tus datos se encuentran en: " ++ "Your data is located in: " : "Tus datos se encuentran en: ", ++ "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." + },"pluralForm" :"nplurals=2; plural=(n != 1);" + } +\ No newline at end of file + + +--- ./apps/privacy/l10n/es.js 2022-03-08 17:33:13.750124900 +0530 ++++ ./apps/privacy/l10n/es-new.js 2022-03-08 17:33:24.700124900 +0530 +@@ -290,6 +290,7 @@ + "Encryption" : "Cifrado", + "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", + "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", +- "Your data is located in: " : "Tus datos se encuentran en: " ++ "Your data is located in: " : "Tus datos se encuentran en: ", ++ "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." + }, + "nplurals=2; plural=(n != 1);"); + -- GitLab From ac9afa17cde978b0852848d2c6580d25822ca4fb Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 9 Mar 2022 14:45:22 +0530 Subject: [PATCH 13/25] privacy policy docker file change --- Dockerfile | 1 + patches/014-patch_privacy.patch | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index e8329d48..a47f199d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -111,6 +111,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.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-patch_privacy.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/014-patch_privacy.patch b/patches/014-patch_privacy.patch index e4a001c8..2b03e3a6 100644 --- a/patches/014-patch_privacy.patch +++ b/patches/014-patch_privacy.patch @@ -2,9 +2,9 @@ From: Avinash Date: Tue, 08 March 2023 18:39 +0530 Subject: [PATCH] Removes and transalate new text in WHo Can access my data ---- ./apps/privacy/templates/who-has-access.php 2022-03-08 17:21:53.720124900 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-08 16:37:08.870124900 +0530 -@@ -6,7 +6,7 @@ +--- ./apps/privacy/templates/who-has-access.php 2022-01-28 14:49:15.000000000 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-09 14:30:07.253285800 +0530 +@@ -1,7 +1,7 @@

t('Who has access to your data?')) ?>

t('Administrators')); ?>

@@ -14,29 +14,27 @@ Subject: [PATCH] Removes and transalate new text in WHo Can access my data

t('People you shared with')) ?>

---- ./apps/privacy/l10n/es.json 2022-03-08 17:31:37.200124900 +0530 -+++ ./apps/privacy/l10n/es-new.json 2022-03-08 16:45:16.400124900 +0530 -@@ -288,6 +288,7 @@ - "Encryption" : "Cifrado", +--- ./apps/privacy/l10n/es.json 2022-01-28 14:49:15.000000000 +0530 ++++ ./apps/privacy/l10n/es-new.json 2022-03-09 14:18:50.733285800 +0530 +@@ -287,6 +287,7 @@ "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", -- "Your data is located in: " : "Tus datos se encuentran en: " -+ "Your data is located in: " : "Tus datos se encuentran en: ", + "Your data is located in: " : "Tus datos se encuentran en: ", +- "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor." ++ "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor.", + "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file - ---- ./apps/privacy/l10n/es.js 2022-03-08 17:33:13.750124900 +0530 -+++ ./apps/privacy/l10n/es-new.js 2022-03-08 17:33:24.700124900 +0530 -@@ -290,6 +290,7 @@ - "Encryption" : "Cifrado", +--- ./apps/privacy/l10n/es.js 2022-01-28 14:49:15.000000000 +0530 ++++ ./apps/privacy/l10n/es-new.js 2022-03-09 14:17:24.883285800 +0530 +@@ -289,6 +289,7 @@ "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", -- "Your data is located in: " : "Tus datos se encuentran en: " -+ "Your data is located in: " : "Tus datos se encuentran en: ", + "Your data is located in: " : "Tus datos se encuentran en: ", +- "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor." ++ "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor.", + "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." }, "nplurals=2; plural=(n != 1);"); - -- GitLab From f6e5cadde664c9e8f513a683b006daf8b71c971e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 10 Mar 2022 11:21:35 +0530 Subject: [PATCH 14/25] changes in patch based in theme translation files --- patches/014-patch_privacy.patch | 43 +++++++++------------------------ 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/patches/014-patch_privacy.patch b/patches/014-patch_privacy.patch index 2b03e3a6..4d224888 100644 --- a/patches/014-patch_privacy.patch +++ b/patches/014-patch_privacy.patch @@ -1,40 +1,21 @@ From: Avinash Date: Tue, 08 March 2023 18:39 +0530 Subject: [PATCH] Removes and transalate new text in WHo Can access my data - ---- ./apps/privacy/templates/who-has-access.php 2022-01-28 14:49:15.000000000 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-09 14:30:07.253285800 +0530 -@@ -1,7 +1,7 @@ +--- ./apps/privacy/templates/who-has-access.php 2022-03-10 11:10:58.448511800 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-09 21:02:36.503285800 +0530 +@@ -5,11 +5,13 @@ +

t('Who has access to your data?')) ?>

-

t('Administrators')); ?>

+-

t('Administrators')); ?>

-
-+

t('Only Ecloud Administrators can access your data.')); ?>

++

t('People you shared with')) ?>

- ---- ./apps/privacy/l10n/es.json 2022-01-28 14:49:15.000000000 +0530 -+++ ./apps/privacy/l10n/es-new.json 2022-03-09 14:18:50.733285800 +0530 -@@ -287,6 +287,7 @@ - "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", - "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", - "Your data is located in: " : "Tus datos se encuentran en: ", -- "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor." -+ "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor.", -+ "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." - },"pluralForm" :"nplurals=2; plural=(n != 1);" - } -\ No newline at end of file - ---- ./apps/privacy/l10n/es.js 2022-01-28 14:49:15.000000000 +0530 -+++ ./apps/privacy/l10n/es-new.js 2022-03-09 14:17:24.883285800 +0530 -@@ -289,6 +289,7 @@ - "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", - "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", - "Your data is located in: " : "Tus datos se encuentran en: ", -- "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor." -+ "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor.", -+ "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." - }, - "nplurals=2; plural=(n != 1);"); ++

t('Administrators')); ?>

++

t('Who can access main text')); ?>

++

t('Who can access main text link')); ?> ↗

+ + +

t('Privacy policy')) ?>

-- GitLab From bbb84895c51b182cdba2bf03ec0681a540ef889d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 10 Mar 2022 18:35:08 +0530 Subject: [PATCH 15/25] key changes as per nextcloud keys convensions --- patches/014-patch_privacy.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/patches/014-patch_privacy.patch b/patches/014-patch_privacy.patch index 4d224888..387ea336 100644 --- a/patches/014-patch_privacy.patch +++ b/patches/014-patch_privacy.patch @@ -1,8 +1,8 @@ From: Avinash Date: Tue, 08 March 2023 18:39 +0530 Subject: [PATCH] Removes and transalate new text in WHo Can access my data ---- ./apps/privacy/templates/who-has-access.php 2022-03-10 11:10:58.448511800 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-09 21:02:36.503285800 +0530 +--- ./apps/privacy/templates/who-has-access.php 2022-03-10 18:22:26.498511800 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-10 18:16:10.028511800 +0530 @@ -5,11 +5,13 @@
@@ -14,8 +14,9 @@ Subject: [PATCH] Removes and transalate new text in WHo Can access my data

t('People you shared with')) ?>

+

t('Administrators')); ?>

-+

t('Who can access main text')); ?>

-+

t('Who can access main text link')); ?> ↗

++

t('Like in most cloud services, administrators can see your files and all the information in the database as they need to make backups, perform upgrades, reset passwords, etc.')); ?>

++

t('Learn more about this topic here.')); ?> ↗

t('Privacy policy')) ?>

+ -- GitLab From 1d99e7bc022cb40eb66f8f84be3693f364f158b3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 14 Mar 2022 22:19:27 +0530 Subject: [PATCH 16/25] privacy patch merge to patch 011 --- Dockerfile | 1 - patches/014-patch_privacy.patch | 22 ---------------------- 2 files changed, 23 deletions(-) delete mode 100644 patches/014-patch_privacy.patch diff --git a/Dockerfile b/Dockerfile index a47f199d..e8329d48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -111,7 +111,6 @@ RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.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-patch_privacy.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/014-patch_privacy.patch b/patches/014-patch_privacy.patch deleted file mode 100644 index 387ea336..00000000 --- a/patches/014-patch_privacy.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Avinash -Date: Tue, 08 March 2023 18:39 +0530 -Subject: [PATCH] Removes and transalate new text in WHo Can access my data ---- ./apps/privacy/templates/who-has-access.php 2022-03-10 18:22:26.498511800 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-10 18:16:10.028511800 +0530 -@@ -5,11 +5,13 @@ - -
-

t('Who has access to your data?')) ?>

--

t('Administrators')); ?>

--
-+ - -

t('People you shared with')) ?>

-
-+

t('Administrators')); ?>

-+

t('Like in most cloud services, administrators can see your files and all the information in the database as they need to make backups, perform upgrades, reset passwords, etc.')); ?>

-+

t('Learn more about this topic here.')); ?> ↗

- - -

t('Privacy policy')) ?>

- -- GitLab From 12f346f6b8f285aedff4ceb9d9573e9d043896e8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 14 Mar 2022 22:31:31 +0530 Subject: [PATCH 17/25] patch added to patch 11 --- patches/011-privacy-settings.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index 0e3b201c..dfb46a59 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -39,3 +39,22 @@ This patch removes certain unnecessary sections from the "privacy" section in pe

t('Who has access to your data?')) ?>

t('Administrators')); ?>

+ +--- ./apps/privacy/templates/who-has-access.php 2022-03-10 18:22:26.498511800 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-10 18:16:10.028511800 +0530 +@@ -5,11 +5,13 @@ + +
+

t('Who has access to your data?')) ?>

+-

t('Administrators')); ?>

+-
++ + +

t('People you shared with')) ?>

+
++

t('Administrators')); ?>

++

t('Like in most cloud services, administrators can see your files and all the information in the database as they need to make backups, perform upgrades, reset passwords, etc.')); ?>

++

t('Learn more about this topic here.')); ?> ↗

+ + +

t('Privacy policy')) ?>

-- GitLab From e1572ef438fdaa2ddba704c8ddfa901c475fb5e5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 15 Mar 2022 20:25:45 +0530 Subject: [PATCH 18/25] modifed the who has access data --- patches/011-privacy-settings.patch | 62 +++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 13 deletions(-) diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index dfb46a59..571cf2e4 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -40,21 +40,57 @@ This patch removes certain unnecessary sections from the "privacy" section in pe

t('Who has access to your data?')) ?>

t('Administrators')); ?>

---- ./apps/privacy/templates/who-has-access.php 2022-03-10 18:22:26.498511800 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-10 18:16:10.028511800 +0530 -@@ -5,11 +5,13 @@ - +--- ./apps/privacy/templates/who-has-access.php 2022-03-15 20:14:55.051488400 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-15 20:15:42.251488400 +0530 +@@ -1,18 +1,24 @@
-

t('Who has access to your data?')) ?>

+-

t('Who has access to your data?')) ?>

-

t('Administrators')); ?>

-
-+ ++

t('Who has access to my data?')) ?>

++

t('People you shared with')) ?>

++
++

 

++

t('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.')); ?> ++

++

t('Learn more about this topic')); ?> t('here')); ?>. ++

-

t('People you shared with')) ?>

-
-+

t('Administrators')); ?>

-+

t('Like in most cloud services, administrators can see your files and all the information in the database as they need to make backups, perform upgrades, reset passwords, etc.')); ?>

-+

t('Learn more about this topic here.')); ?> ↗

+-

t('People you shared with')) ?>

+-
++ ++

t('Privacy policy')) ?>

++

++ t('Read the privacy policy.')) ?> ++

++ - -

t('Privacy policy')) ?>

+- +-

t('Privacy policy')) ?>

+-

+- t('Read the privacy policy.')) ?> +-

+- +- +-

t('Encryption')) ?>

+-
+-
++

t('Encryption')) ?>

++

t('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.')); ?> ↗

++
+\ No newline at end of file +--- ./apps/privacy/templates/where-is-your-data.php 2022-03-15 20:16:03.381488400 +0530 ++++ ./apps/privacy/templates/where-is-your-data-new.php 2022-03-15 19:44:15.371488400 +0530 +@@ -1,4 +1,4 @@ +
+-

t('Where is your data?')) ?>

++

t('Where is my data?')) ?>

+
+
+\ No newline at end of file + + -- GitLab From 54fab45d33438957bc02e628f7ca541ef1688611 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 16 Mar 2022 11:53:46 +0530 Subject: [PATCH 19/25] privacy who has access changes --- patches/011-privacy-settings.patch | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index 571cf2e4..54755401 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -40,15 +40,17 @@ This patch removes certain unnecessary sections from the "privacy" section in pe

t('Who has access to your data?')) ?>

t('Administrators')); ?>

---- ./apps/privacy/templates/who-has-access.php 2022-03-15 20:14:55.051488400 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-15 20:15:42.251488400 +0530 -@@ -1,18 +1,24 @@ +--- ./apps/privacy/templates/who-has-access.php 2022-03-16 11:42:02.190809500 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-16 11:29:00.260809500 +0530 +@@ -4,20 +4,26 @@ + ?> +
-

t('Who has access to your data?')) ?>

-

t('Administrators')); ?>

-
+

t('Who has access to my data?')) ?>

-+

t('People you shared with')) ?>

++

t('People you shared documents or folders with:')) ?>

+
+

 

+

t('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.')); ?> @@ -83,7 +85,7 @@ This patch removes certain unnecessary sections from the "privacy" section in pe + rel="noreferrer noopener"> ↗

+
\ No newline at end of file ---- ./apps/privacy/templates/where-is-your-data.php 2022-03-15 20:16:03.381488400 +0530 +--- ./apps/privacy/templates/where-is-your-data.php 2022-03-16 11:41:51.970809500 +0530 +++ ./apps/privacy/templates/where-is-your-data-new.php 2022-03-15 19:44:15.371488400 +0530 @@ -1,4 +1,4 @@
@@ -94,3 +96,4 @@ This patch removes certain unnecessary sections from the "privacy" section in pe \ No newline at end of file + -- GitLab From ed31515c183541ffa047f5a60c954ba17a53413d Mon Sep 17 00:00:00 2001 From: akhil Date: Wed, 16 Mar 2022 17:37:53 +0530 Subject: [PATCH 20/25] Bump version number --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d06aae4e..82069a05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG EA_TAG="1.0.0" ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" -RUN sed -i 's/21,0,9,1/21,0,9,4/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,9,1/21,0,9,5/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From ee98a2a2ba1d161dceee881579d7646ad5e86989 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 16 Mar 2022 18:16:31 +0530 Subject: [PATCH 21/25] key changed to orignal --- patches/011-privacy-settings.patch | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index 54755401..21e58f05 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -40,8 +40,8 @@ This patch removes certain unnecessary sections from the "privacy" section in pe

t('Who has access to your data?')) ?>

t('Administrators')); ?>

---- ./apps/privacy/templates/who-has-access.php 2022-03-16 11:42:02.190809500 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-16 11:29:00.260809500 +0530 +--- ./apps/privacy/templates/who-has-access.php 2022-03-16 15:34:01.420809500 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-16 17:29:25.160809500 +0530 @@ -4,20 +4,26 @@ ?> @@ -49,7 +49,7 @@ This patch removes certain unnecessary sections from the "privacy" section in pe -

t('Who has access to your data?')) ?>

-

t('Administrators')); ?>

-
-+

t('Who has access to my data?')) ?>

++

t('Who has access to your data?')) ?>

+

t('People you shared documents or folders with:')) ?>

+
+

 

@@ -85,15 +85,7 @@ This patch removes certain unnecessary sections from the "privacy" section in pe + rel="noreferrer noopener"> ↗

+
\ No newline at end of file ---- ./apps/privacy/templates/where-is-your-data.php 2022-03-16 11:41:51.970809500 +0530 -+++ ./apps/privacy/templates/where-is-your-data-new.php 2022-03-15 19:44:15.371488400 +0530 -@@ -1,4 +1,4 @@ -
--

t('Where is your data?')) ?>

-+

t('Where is my data?')) ?>

-
-
-\ No newline at end of file + -- GitLab From 667eb12e0b92c89d26ab8328f20539b791fe255e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 17 Mar 2022 09:56:13 +0530 Subject: [PATCH 22/25] link changed to old style arrow --- patches/011-privacy-settings.patch | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index 21e58f05..592d47ca 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -40,9 +40,9 @@ This patch removes certain unnecessary sections from the "privacy" section in pe

t('Who has access to your data?')) ?>

t('Administrators')); ?>

---- ./apps/privacy/templates/who-has-access.php 2022-03-16 15:34:01.420809500 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-16 17:29:25.160809500 +0530 -@@ -4,20 +4,26 @@ +--- ./apps/privacy/templates/who-has-access.php 2022-03-17 09:44:34.181021900 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-17 09:40:33.601021900 +0530 +@@ -4,20 +4,28 @@ ?>
@@ -55,9 +55,8 @@ This patch removes certain unnecessary sections from the "privacy" section in pe +

 

+

t('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.')); ?> +

-+

t('Learn more about this topic')); ?> t('here')); ?>. ++

t('Learn more about this topic here.')); ?> ↗ +

-

t('People you shared with')) ?>

@@ -80,9 +79,12 @@ This patch removes certain unnecessary sections from the "privacy" section in pe -
-
+

t('Encryption')) ?>

-+

t('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.')); ?> ↗

++

++ t('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.')); ?> ++ ↗ ++

+
\ No newline at end of file -- GitLab From ff3f73fee3643a05720e7c77a650da44f7d7f63b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 17 Mar 2022 17:29:17 +0530 Subject: [PATCH 23/25] translation error fixed --- patches/011-privacy-settings.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index 592d47ca..7fb8225c 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -40,9 +40,9 @@ This patch removes certain unnecessary sections from the "privacy" section in pe

t('Who has access to your data?')) ?>

t('Administrators')); ?>

---- ./apps/privacy/templates/who-has-access.php 2022-03-17 09:44:34.181021900 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-17 09:40:33.601021900 +0530 -@@ -4,20 +4,28 @@ +--- ./apps/privacy/templates/who-has-access.php 2022-03-17 16:48:46.124670200 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-17 16:41:15.624670200 +0530 +@@ -4,20 +4,27 @@ ?>
@@ -50,7 +50,7 @@ This patch removes certain unnecessary sections from the "privacy" section in pe -

t('Administrators')); ?>

-
+

t('Who has access to your data?')) ?>

-+

t('People you shared documents or folders with:')) ?>

++

t('People you shared documents or folders with')) ?>:

+
+

 

+

t('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.')); ?> @@ -81,8 +81,7 @@ This patch removes certain unnecessary sections from the "privacy" section in pe +

t('Encryption')) ?>

+

+ t('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.')); ?> ++ rel="noreferrer noopener">t('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.')); ?> + ↗ +

+
@@ -91,3 +90,4 @@ This patch removes certain unnecessary sections from the "privacy" section in pe + -- GitLab From f16443799db5cebe932af7c6eb89a5ec11be5c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= Date: Thu, 17 Mar 2022 15:24:09 +0000 Subject: [PATCH 24/25] Version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 82069a05..75899b25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG EA_TAG="1.0.0" ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" -RUN sed -i 's/21,0,9,1/21,0,9,5/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,9,1/21,0,9,6/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From b888b291422f66cb7752b620c45d51c6109cdd99 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 18 Mar 2022 10:42:39 +0530 Subject: [PATCH 25/25] conflict resolved 1 --- Dockerfile | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd77c9d8..941b735d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,3 @@ -<<<<<<< HEAD -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.3.1" -ARG CONTACTS_VERSION="4.0.8" -ARG CALENDAR_VERSION="3.1.0" -ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" -======= FROM nextcloud:20.0.12-fpm as base ARG BASE_DIR="/usr/src/nextcloud" ARG THEME_VERSION="20.1.3" @@ -21,7 +8,6 @@ ARG NOTES_VERSION="4.1.1" ARG CONTACTS_VERSION="4.0.1" ARG CALENDAR_VERSION="2.3.3" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.0" ->>>>>>> origin/master ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="7.1.2" ARG RAINLOOP_COMMIT_SHA="e9da581c" @@ -29,14 +15,10 @@ ARG EA_TAG="1.0.0" ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" -<<<<<<< HEAD -RUN sed -i 's/21,0,9,1/21,0,9,6/' ${BASE_DIR}/version.php -======= RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN sed -i 's/20,0,12,1/20,0,12,17/' ${BASE_DIR}/version.php ->>>>>>> origin/master # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab