From 5c538f05440e07977f0cfab49bec7733450e4888 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Mon, 22 Jul 2019 00:59:56 +0200
Subject: [PATCH] Exclude .rnd files

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
 index.php                                     |   3 ++
 lib/RecursiveDirectoryIteratorWithoutData.php |   1 +
 lib/Updater.php                               |   2 ++
 tests/features/bootstrap/FeatureContext.php   |   8 +++--
 tests/features/stable15.feature               |  33 +++++++++++++++++-
 tests/features/stable16.feature               |   2 +-
 updater.phar                                  | Bin 599747 -> 599781 bytes
 7 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index 99a52f9..2c4ac37 100644
--- a/index.php
+++ b/index.php
@@ -40,6 +40,7 @@ class RecursiveDirectoryIteratorWithoutData extends \RecursiveFilterIterator {
 	public function accept() {
 		/** @var \DirectoryIterator $this */
 		$excludes = [
+			'.rnd',
 			'.well-known',
 			'data',
 			'..',
@@ -318,6 +319,7 @@ class Updater {
 			'themes',
 			'updater',
 			// Files
+			'.rnd',
 			'index.html',
 			'indie.json',
 			'.user.ini',
@@ -461,6 +463,7 @@ class Updater {
 		$this->silentLog('[info] createBackup()');
 
 		$excludedElements = [
+			'.rnd',
 			'.well-known',
 			'data',
 		];
diff --git a/lib/RecursiveDirectoryIteratorWithoutData.php b/lib/RecursiveDirectoryIteratorWithoutData.php
index 3b9ae76..13f0a40 100644
--- a/lib/RecursiveDirectoryIteratorWithoutData.php
+++ b/lib/RecursiveDirectoryIteratorWithoutData.php
@@ -26,6 +26,7 @@ class RecursiveDirectoryIteratorWithoutData extends \RecursiveFilterIterator {
 	public function accept() {
 		/** @var \DirectoryIterator $this */
 		$excludes = [
+			'.rnd',
 			'.well-known',
 			'data',
 			'..',
diff --git a/lib/Updater.php b/lib/Updater.php
index d730e16..0434d87 100644
--- a/lib/Updater.php
+++ b/lib/Updater.php
@@ -202,6 +202,7 @@ class Updater {
 			'themes',
 			'updater',
 			// Files
+			'.rnd',
 			'index.html',
 			'indie.json',
 			'.user.ini',
@@ -345,6 +346,7 @@ class Updater {
 		$this->silentLog('[info] createBackup()');
 
 		$excludedElements = [
+			'.rnd',
 			'.well-known',
 			'data',
 		];
diff --git a/tests/features/bootstrap/FeatureContext.php b/tests/features/bootstrap/FeatureContext.php
index 31bfac4..722e3b6 100644
--- a/tests/features/bootstrap/FeatureContext.php
+++ b/tests/features/bootstrap/FeatureContext.php
@@ -249,6 +249,12 @@ WbRmf4trGwDdCA/kQ59LInfLR8KFfEiiOH2p2NijgXuWm49tdr7N1062diP4Dzwd
 WlWfRoT8G5DDQPGdj5a72+sQLjf3ZhjqgeQbGLwht/NonWLZhmmW/NgmylbCb9Ob
 a7NE4Vf792DrmBvq4HCHUexg+upaJ0s4sJLGqg3sWF8iUEnLyGePyL/Bw6MeLvjD
 sSD0Xb5oawIjTVHVAuL+3Q==',
+			'15.0.10' => '1FcyXT8cgPMctfn+S5QLGbPrkeXEWyaIGh1T9mP7BHaF5AHamuAGDzk04FKHYB/e
+OylmXzDBE2w1LG5AOABAw3idwIJpfvH2dyi8tsBNdcGKY01DmMYEzn4y5i2r5Duv
+lRjhRfuk/MrjUOH1XkGO1xPI8zXp8eI7Y53jHswbUayJGszzgCKcuC6z+QEUkf7v
+p15duG8nbbF1c3CAh/dVsJ2AKKpcnLYJPC8UgGDXMtalSoPUv9QTWPrS7AqQRsVD
+7xJThvWdx3aSV3aKREBzw5ddHUAIEENQ0aBdabgAXbBZEfLrMMG2XaHtdXGLpQs8
+ypwcWVvLfYk9e+YEMdhMNg==',
 			'16.0.3' => 'TYiUB/+l2uXNpiHGuMhchHzzyMn8eiL2mzBD+fmwqUXU29UYK4FFvTbDEWWXxXF9
 XeOXXBTkWltQ6A5K+nwFx4Phf4VPznaGn3U/1hsLSLBy9p9qqBMQdmDvCxl4dJmP
 R0Ttz6sGcC1AsYwW2Q5Z1lywpmk1Ax5YcJesbjOFTU9HXIOI2s9YyPX4bP3L1rkH
@@ -382,8 +388,6 @@ b813iKq4+cn3CjTunREm6A==',
         require $this->serverDir . 'nextcloud/version.php';
 
         $installedVersion = join('.', $OC_Version);
-        // Hack for version number mapping
-        $installedVersion = str_replace(['9.1', '9.2'], ['10.0', '11.0'], $installedVersion);
 
         if (strpos($installedVersion, $version) !== 0) {
             throw new Exception('Version mismatch - Installed: ' . $installedVersion . ' Wanted: ' . $version);
diff --git a/tests/features/stable15.feature b/tests/features/stable15.feature
index 202d6ed..1b4ba20 100644
--- a/tests/features/stable15.feature
+++ b/tests/features/stable15.feature
@@ -1,4 +1,4 @@
-Feature: CLI updater - stable14 base
+Feature: CLI updater - stable15 base
 
   Scenario: Update is available - 15.0.0 beta 1 to 15.0.0 RC 1
     Given the current installed version is 15.0.0beta1
@@ -10,6 +10,37 @@ Feature: CLI updater - stable14 base
     And maintenance mode should be off
     And upgrade is not required
 
+  Scenario: Update is available but unexpected folder found - 15.0.9 to 15.0.10
+    Given the current installed version is 15.0.9
+    And there is an update to version 15.0.10 available
+    And there is a folder called "test123"
+    When the CLI updater is run
+    Then the return code should not be 0
+    And the output should contain "The following extra files have been found"
+    Then the installed version should be 15.0.9
+    And maintenance mode should be off
+    And upgrade is not required
+
+  Scenario: Update is available and .well-known folder exist - 15.0.9 to 15.0.10
+    Given the current installed version is 15.0.9
+    And there is an update to version 15.0.10 available
+    And there is a folder called ".well-known"
+    When the CLI updater is run successfully
+    And the output should contain "Update successful"
+    Then the installed version should be 15.0.10
+    And maintenance mode should be off
+    And upgrade is not required
+
+  Scenario: Update is available and .rnd file exist - 15.0.9 to 15.0.10
+    Given the current installed version is 15.0.9
+    And there is an update to version 15.0.10 available
+    And there is a folder called ".rnd"
+    When the CLI updater is run successfully
+    And the output should contain "Update successful"
+    Then the installed version should be 15.0.10
+    And maintenance mode should be off
+    And upgrade is not required
+
   Scenario: Update is available - 15.0.0 to master daily
     Given the current installed version is 15.0.0RC1
     And PHP is at least in version 7.0
diff --git a/tests/features/stable16.feature b/tests/features/stable16.feature
index f153da6..5ed5e8e 100644
--- a/tests/features/stable16.feature
+++ b/tests/features/stable16.feature
@@ -1,4 +1,4 @@
-Feature: CLI updater - stable14 base
+Feature: CLI updater - stable16 base
 
   Scenario: Update is available - 16.0.1 to 16.0.3
     Given the current installed version is 16.0.0
diff --git a/updater.phar b/updater.phar
index 42f9cf8bdd89825b51a374ca2a2f7b0007dd53c0..d89ee4bf1d46da89e8e5c7c0eb5ffe239b77daaa 100755
GIT binary patch
delta 1506
zcmXw3YfKbZ6uz_1S$1}3pX|acyR$n`49KIPBBegS2TK=S4QfydDV4QiEh44XHndd?
z=_AErPt!+?v8ajuF<OmoZDXoZ)3kswO`5g|O-y4`QcNl)^hZNu@60)noZOFdzVrI-
z+#Q=N{A054Vu4^89a`EBabXpLE}<5|sIUUT??N4MOcd%c)u87y(^Ck3Hl+|eVQxUM
z*W8F8YpzEyZ>BnR7OFg8p{#Ms8szw_D<yrNn2WLFW7p?kSXSVo-3D)1L&*5lx)H%&
zR!Xk5ZAQ;g+a@FVMKfcKf-4M)S5Njp(|b{|lsk=0>+Dou*q+9`d-fItH6jgmP+W$d
zOJW9r;@F8`(9wzDPe(g~WDYGjya0a8Au)qa+Ur>-sd3i%j4|VLIgFLol-!1!ehpNq
z087<NX(RfTo3T5a9SNB9YOvaAheNO0U_z3RH6<kxEOIp&^b35qzsINlfeX$O_~z+=
zXU2rf>gNNP8Hdi80(adqjJQSk&*j8)$xTXhxJk<M?$sEYb<^O><tFqD$rSotCbd-0
z1`O@@Q2GrIDeCub#n9dbaND~UJucr$1Zm$IWB64;#$KtdejQ?p1`oY9_|E4=#*~jl
zEB3EP&wf8ux#mwA$yH^HZ9o3?Vi<{NP#K6LZEJvNCjyNI?TW-$^|`qnh7LCZGUNyS
zNPRL$JqCib#CVWCCpEVjIlZ~t5d4r!YiXe!=s6rBdG3U$Wo~#AhW3PU#NGUI`UhH<
zKn1_)yKmZIIvg+<ALdc(R31tDLEbvd{UwiXrX-)hKt2sKkxyA6g<e{_Lh77d0J93d
zq6jc{HT7^k)Z6sy7ooS(3F%A-4n-{3=$%NjA<)Ogj16AB|H$|pk(CoD@7>+&;$Ncv
zZ1i*P{+Exr(B<%3#wWh(r}xxfkTOcN6ft({-o_D#hBe+OE?!??grZxp+rB7?l#Svm
zxWy?wrh<b;PGzhJY1?D#jEeKkjJ-cIJI$3-KvsP)HR%$6m8tK8SS!+#DuFX<8G3$F
zHBZYC<mqSMiupni<0Tkf7S}v`7)JH8HT`H5y5ofyJr=J(@NK-l;*tev`q^LlMbjC9
z^ZB2X+ks5q%ia5Wbdh%Pe~sUkB?-+)KGK$WyDcGbGjTI>vv9L=vvIR$+Y;hShi&D3
zJzd3%vty^l4%v!Wxh#I3@l}^qm%Y$gxwGo|s-<dIcVGW&*@>_tAtC7#PExaCk>jKg
hdF$rU<gVqZ&d2|b4qp4{fVE?&w2r@d*4VJ2;eXWy`P~2j

delta 1497
zcmXw3Yitx%6uz_1+1=TleRj7y+kH)I&0^_l7uH$}v<Pi&X=xBcTOd|kp%$TN6=JF>
zB`O*V)sx_Z7^9NZKLjF?^^r!j;;WRP#weyHXh0i_N=@nygV8(poHjYRU(fl@>$`LJ
z%5?eUbot3L$@0^c<C`HRtweC2REywssUE@4QXO$j6xwRaqvvJQZ3w<IwIaB|+=yVO
zxd}nh+<@S^nd;P8sPd47vZgGnk>j_nP>gvJZpMyIPAtHvs=-OS4Ia0Kk@1qX9l>u_
zO0KnaqUVrpy-4miGu9-zBcS<=WG}Ql8<&@Gr`WX4P6bBo9hi5?z5zjAror~f%hB_;
zTtJ{XwjmgC^dk7xu?0c1lNKCZ1YbKz%#e%r+Uz1V#$9)c8Sim2wj`f93m*k^NGfGm
zszK=x(f2)!o$qv{VcMs|DwiFG_uAl`q9AKVX-06PyG77X@ZJ8Ln*AG2xH9nJ?LqIH
z370j_t1veOy$KC2cvKkk$ndY*h3Sfil-TMaDUW+rVQAh%gWsyQpyx@ILSLw)R?@o;
zLwmfGe#T3R27DVav~v-h_1%FUw|@nK4*zN~{K^nxkJQ#Y1_@1vYd#x%=Jz3E#!sSE
z2G*iyPk^et7ibpAw^T9Kb@YRqU@WFXHkd-%#vsvN4K@kdI|^epZ!L5S9nJ(*h=u}4
zy*WfZhC;N&RER#OWJw!x21@Qm@MQ_DrH8xGvp-DooDWmWlE``tJrKbWcks&@9NLtF
zYJSrfp0LAgBq$g!lv3-~Qj+#?=^D)azLahz6D2SdrD4uRDJ!heOWUH6I^&CAUc*-u
z1IA9bURw(dHsktb7|6PyqY#GSm<1ahjI{}Yj#M%>a{BUL;&VinGq`kM$AFuEiN>=r
z&V|eG{>O!03O^S7@-qQ?PlIKxqQr&@#@@KpJ_hlK&KsrViA6>@eiwGz9Vd~BaeM_I
zbILAL**=kzO;jMQE3rmYyxzvxb93{vTsaNYq#tIc-SS11`d&?JLV9zOz_DZ%dcIBS
z-ueT`GtQ@!$sa&YWiYxtrF;7rMvb$+KU0LhR5?bUPgNuMB-KzoZb6!H)@=X0a7^NS
z{^#QMXyKuU`*!a#M7p2<D}GyYX<Z~A=t)1_la{!dxS6?GxLLW`xY>(6Y5BqZ#c$q}
zyVN7U%h6)zDS5cy&)!=Y?5(NFRc+sv@6BcNxys^KNe7sVdt;76@{9RXoSCU`ye7pa
g{`f`f|EGPVdztf<Wfu<yKefq+`BP_2jq4i!2S!qLN&o-=