From 9c1e9f2ce6ffd490732c43e1853b3b5e13039e4b Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Mon, 22 May 2017 17:55:29 +0200 Subject: [PATCH 01/11] Update nextcloud 12 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 66c7f9f..557972b 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "url": "https://nextcloud.com", "license": "AGPL-3", - "version": "11.0.2", + "version": "12", "maintainer": { "name": "-", "email": "-" From 48214068e3929347a5486ba3796820b88b89811a Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Mon, 22 May 2017 17:56:53 +0200 Subject: [PATCH 02/11] Update nextcloud 12 --- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index ef5ed99..7a4a818 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,10 +1,10 @@ #!/bin/bash # Version cible de la mise à jour de Nextcloud -VERSION=11.0.2 +VERSION=12 # Nextcloud tarball checksum sha256 -NEXTCLOUD_SOURCE_SHA256=5d1ef19d8f1f340b46c05ba3741dcb043dfc84fc3b9e2cfce1409c71a89b8700 +NEXTCLOUD_SOURCE_SHA256=1b9d9cf05e657cd564a552b418fbf42d669ca51e0fd1f1f118fe44cbf93a243f # Load common variables and helpers source ./_common.sh From dafb6364272ba71de2f553906a6d341779315b26 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Mon, 22 May 2017 17:58:34 +0200 Subject: [PATCH 03/11] Update to nextcloud 12 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 126e09d..4eb29d6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Nextcloud for YunoHost own data. A personal cloud which run on your own server. With Nextcloud you can synchronize your files over your devices. -**Shipped version:** 11.0.2 +**Shipped version:** 12 ![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png) From 29ea6b258a775c6287f72993cb4fa9906082d984 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Mon, 22 May 2017 18:06:21 +0200 Subject: [PATCH 04/11] Update nextcloud to version 12.0.0 --- scripts/upgrade.d/upgrade.12.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 scripts/upgrade.d/upgrade.12.sh diff --git a/scripts/upgrade.d/upgrade.12.sh b/scripts/upgrade.d/upgrade.12.sh new file mode 100644 index 0000000..33419d6 --- /dev/null +++ b/scripts/upgrade.d/upgrade.12.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# Version cible de la mise à jour de Nextcloud +VERSION="12.0.0" + +# Nextcloud tarball checksum +NEXTCLOUD_SOURCE_SHA256="1b9d9cf05e657cd564a552b418fbf42d669ca51e0fd1f1f118fe44cbf93a243f" + +# Load common variables and helpers +source ./_common.sh + +# Source app helpers +source /usr/share/yunohost/helpers + +# Load common upgrade function +source ./upgrade.d/upgrade.generic.sh + +COMMON_UPGRADE # Met à jour Nextcloud vers la version suivante From b611f4e9858cd771ab277aa42b8a6ed88f2f4fa6 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Mon, 22 May 2017 18:12:14 +0200 Subject: [PATCH 05/11] Update to nextcloud 12.0.0 --- scripts/upgrade.d/upgrade.last.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 7a4a818..d8874f5 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Version cible de la mise à jour de Nextcloud -VERSION=12 +VERSION=12.0.0 # Nextcloud tarball checksum sha256 NEXTCLOUD_SOURCE_SHA256=1b9d9cf05e657cd564a552b418fbf42d669ca51e0fd1f1f118fe44cbf93a243f From 109803f7de9190c12854785c414002a6010b0ff5 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Mon, 22 May 2017 18:12:46 +0200 Subject: [PATCH 06/11] Update nextcloud 12.0.0 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 557972b..324f3a3 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "url": "https://nextcloud.com", "license": "AGPL-3", - "version": "12", + "version": "12.0.0", "maintainer": { "name": "-", "email": "-" From efa9ce1d3eacef52beb2aef745f907469baf4847 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Mon, 22 May 2017 18:13:11 +0200 Subject: [PATCH 07/11] Update nextcloud 12.0.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4eb29d6..0fcd744 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Nextcloud for YunoHost own data. A personal cloud which run on your own server. With Nextcloud you can synchronize your files over your devices. -**Shipped version:** 12 +**Shipped version:** 12.0.0 ![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png) From ab01f0f547fdb77b6f50171e59cd31b0949ba86c Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Mon, 22 May 2017 19:54:41 +0200 Subject: [PATCH 08/11] Erreur de modification --- scripts/upgrade.d/{upgrade.12.sh => upgrade.11.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/upgrade.d/{upgrade.12.sh => upgrade.11.sh} (100%) diff --git a/scripts/upgrade.d/upgrade.12.sh b/scripts/upgrade.d/upgrade.11.sh similarity index 100% rename from scripts/upgrade.d/upgrade.12.sh rename to scripts/upgrade.d/upgrade.11.sh From 38462a53dc03a1c7b1a01477e954436fc0cdbb2f Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 4 Jun 2017 11:15:15 +0200 Subject: [PATCH 09/11] Add correct rights --- scripts/upgrade.d/upgrade.11.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/upgrade.d/upgrade.11.sh diff --git a/scripts/upgrade.d/upgrade.11.sh b/scripts/upgrade.d/upgrade.11.sh old mode 100644 new mode 100755 From 041a0ee18d1d8bd8515e7f1a0b8f8e389b7794c9 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Mon, 7 Aug 2017 22:00:27 +0200 Subject: [PATCH 10/11] Disable CSPv3 nonces and allow YunoHost fonts data Problems: - Due to some unknown problem in the interaction between SSOwat and Nextcloud server authentication, CSP nonces are wrong when you log into Nextcloud from YunoHost portal for the first time (systematically reproduced in a browser private session). The Nextcloud page is hence almost totally blank and you have to refresh the page or click on the Nextcloud logo. - Due to CSP protection, the YunoHost tile (inline Javascript) is blocked Solution: While it's not a totally satisfying solution, a somewhat acceptable workaround to these two problems is to: - block CSP v3 features (hence nonces), but still allowing CSP v2 features - allow for "data:" font sources (needed to load YunoHost tile fonts) This is done via patching Nextcloud sources: - `ContentSecurityPolicyNonceManager`: disable the CSPv3 browser compatibility detection (return false in every case) - `EmptyContentSecurityPolicy`: add the "data:" argument in `font-src` default CSP rule. --- ...able-CSPv3-nonce_and_allow-YNH-fonts.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 patches/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch diff --git a/patches/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch b/patches/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch new file mode 100644 index 0000000..eba7c0c --- /dev/null +++ b/patches/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch @@ -0,0 +1,33 @@ + lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php | 4 ++++ + lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php | 3 ++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php +index 85ae127f5f..91618a09fc 100644 +--- a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php ++++ b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php +@@ -65,6 +65,10 @@ class ContentSecurityPolicyNonceManager { + * @return bool + */ + public function browserSupportsCspV3() { ++ // YunoHost patch: disable CSPv3 nonces to: ++ // - avoid white page on first login from YunoHost portal ++ // - allow YunoHost tile display ++ return false; + $browserWhitelist = [ + Request::USER_AGENT_CHROME, + // Firefox 45+ +diff --git a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php +index 64d4eb6e5d..59d5885620 100644 +--- a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php ++++ b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php +@@ -377,7 +377,8 @@ class EmptyContentSecurityPolicy { + + if(!empty($this->allowedFontDomains)) { + $policy .= 'font-src ' . implode(' ', $this->allowedFontDomains); +- $policy .= ';'; ++ // YunoHost patch: extend font-src to load data fonts embedded in YunoHost tile script ++ $policy .= ' data:;'; + } + + if(!empty($this->allowedConnectDomains)) { From 1be973cc7068132fcd8d03c8b8c82698b9b32369 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Wed, 9 Aug 2017 12:31:10 +0200 Subject: [PATCH 11/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a9d000c..cba0a8e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ you can synchronize your files over your devices. **Shipped version:** 12.0.0 - +[![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud) ![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png) ## Features