Revert "perf(base): Stop setting up the FS for every basic auth request"

apps/files_sharing/tests/TestCase.php

@@ -196,7 +196,6 @@ protected function loginHelper($user, $create = false, $password = false) {
 		Server::get(IUserSession::class)->setUser(null);
 		Filesystem::tearDown();
 		Server::get(IUserSession::class)->login($user, $password);
-		Filesystem::initMountPoints($user);
 		\OC::$server->getUserFolder($user);
 
 		\OC_Util::setupFS($user);

apps/settings/src/components/PersonalInfo/AvatarSection.vue

@@ -182,7 +182,8 @@ export default {
 				if (data.status === 'success') {
 					this.handleAvatarUpdate(false)
 				} else if (data.data === 'notsquare') {
-					this.$refs.cropper.replace(data.image)
+					const tempAvatar = generateUrl('/avatar/tmp') + '?requesttoken=' + encodeURIComponent(OC.requestToken) + '#' + Math.floor(Math.random() * 1000)
+					this.$refs.cropper.replace(tempAvatar)
 					this.showCropper = true
 				} else {
 					showError(data.data.message)

build/integration/features/avatar.feature

@@ -21,9 +21,32 @@ Feature: avatar
     And last avatar is a square of size 512
     And last avatar is not a single color
 
+
+
+  Scenario: get temporary non-square user avatar before cropping it
+    Given Logging in using web as "user0"
+    And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
+    When logged in user gets temporary avatar
+    Then The following headers should be set
+      | Content-Type | image/png |
+    # "last avatar" also includes the last temporary avatar
+    And last avatar is not a square
+    And last avatar is not a single color
+
+  Scenario: get non-square user avatar before cropping it
+    Given Logging in using web as "user0"
+    And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
+    # Avatar needs to be cropped to finish setting it
+    When user "user0" gets avatar for user "user0"
+    Then The following headers should be set
+      | Content-Type | image/png |
+      | X-NC-IsCustomAvatar | 0 |
+    And last avatar is a square of size 512
+    And last avatar is not a single color
+
   Scenario: set square user avatar from file
     Given Logging in using web as "user0"
-    When logged in user posts avatar from file "data/green-square-256.png"
+    When logged in user posts temporary avatar from file "data/green-square-256.png"
     And user "user0" gets avatar for user "user0"
     And The following headers should be set
       | Content-Type | image/png |
@@ -41,7 +64,7 @@ Feature: avatar
   Scenario: set square user avatar from internal path
     Given user "user0" uploads file "data/green-square-256.png" to "/internal-green-square-256.png"
     And Logging in using web as "user0"
-    When logged in user posts avatar from internal path "internal-green-square-256.png"
+    When logged in user posts temporary avatar from internal path "internal-green-square-256.png"
     And user "user0" gets avatar for user "user0" with size "64"
     And The following headers should be set
       | Content-Type | image/png |
@@ -55,21 +78,82 @@ Feature: avatar
     And last avatar is a square of size 64
     And last avatar is a single "#00FF00" color
 
-  Scenario: delete user avatar
+  Scenario: set non-square user avatar from file
     Given Logging in using web as "user0"
-    And logged in user posts avatar from file "data/green-square-256.png"
+    When logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
+    And logged in user crops temporary avatar
+      | x | 384 |
+      | y | 256 |
+      | w | 128 |
+      | h | 128 |
+    Then logged in user gets temporary avatar with 404
     And user "user0" gets avatar for user "user0"
     And The following headers should be set
       | Content-Type | image/png |
       | X-NC-IsCustomAvatar | 1 |
     And last avatar is a square of size 512
-    And last avatar is a single "#00FF00" color
+    And last avatar is a single "#FF0000" color
     And user "anonymous" gets avatar for user "user0"
     And The following headers should be set
       | Content-Type | image/png |
       | X-NC-IsCustomAvatar | 1 |
     And last avatar is a square of size 512
+    And last avatar is a single "#FF0000" color
+
+  Scenario: set non-square user avatar from internal path
+    Given user "user0" uploads file "data/coloured-pattern-non-square.png" to "/internal-coloured-pattern-non-square.png"
+    And Logging in using web as "user0"
+    When logged in user posts temporary avatar from internal path "internal-coloured-pattern-non-square.png"
+    And logged in user crops temporary avatar
+      | x | 704 |
+      | y | 320 |
+      | w | 64 |
+      | h | 64 |
+    Then logged in user gets temporary avatar with 404
+    And user "user0" gets avatar for user "user0" with size "64"
+    And The following headers should be set
+      | Content-Type | image/png |
+      | X-NC-IsCustomAvatar | 1 |
+    And last avatar is a square of size 64
     And last avatar is a single "#00FF00" color
+    And user "anonymous" gets avatar for user "user0" with size "64"
+    And The following headers should be set
+      | Content-Type | image/png |
+      | X-NC-IsCustomAvatar | 1 |
+    And last avatar is a square of size 64
+    And last avatar is a single "#00FF00" color
+
+  Scenario: cropped user avatar needs to be squared
+    Given Logging in using web as "user0"
+    And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
+    When logged in user crops temporary avatar with 400
+      | x | 384 |
+      | y | 256 |
+      | w | 192 |
+      | h | 128 |
+
+
+
+  Scenario: delete user avatar
+    Given Logging in using web as "user0"
+    And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
+    And logged in user crops temporary avatar
+      | x | 384 |
+      | y | 256 |
+      | w | 128 |
+      | h | 128 |
+    And user "user0" gets avatar for user "user0"
+    And The following headers should be set
+      | Content-Type | image/png |
+      | X-NC-IsCustomAvatar | 1 |
+    And last avatar is a square of size 512
+    And last avatar is a single "#FF0000" color
+    And user "anonymous" gets avatar for user "user0"
+    And The following headers should be set
+      | Content-Type | image/png |
+      | X-NC-IsCustomAvatar | 1 |
+    And last avatar is a square of size 512
+    And last avatar is a single "#FF0000" color
     When logged in user deletes the user avatar
     Then user "user0" gets avatar for user "user0"
     And The following headers should be set
@@ -84,6 +168,40 @@ Feature: avatar
     And last avatar is a square of size 512
     And last avatar is not a single color
 
+
+
+  Scenario: get user avatar with a larger size than the original one
+    Given Logging in using web as "user0"
+    And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
+    And logged in user crops temporary avatar
+      | x | 384 |
+      | y | 256 |
+      | w | 128 |
+      | h | 128 |
+    When user "user0" gets avatar for user "user0" with size "192"
+    Then The following headers should be set
+      | Content-Type | image/png |
+      | X-NC-IsCustomAvatar | 1 |
+    And last avatar is a square of size 512
+    And last avatar is a single "#FF0000" color
+
+  Scenario: get user avatar with a smaller size than the original one
+    Given Logging in using web as "user0"
+    And logged in user posts temporary avatar from file "data/coloured-pattern-non-square.png"
+    And logged in user crops temporary avatar
+      | x | 384 |
+      | y | 256 |
+      | w | 128 |
+      | h | 128 |
+    When user "user0" gets avatar for user "user0" with size "96"
+    Then The following headers should be set
+      | Content-Type | image/png |
+      | X-NC-IsCustomAvatar | 1 |
+    And last avatar is a square of size 512
+    And last avatar is a single "#FF0000" color
+
+
+
   Scenario: get default guest avatar
     When user "user0" gets avatar for guest "guest0"
     Then The following headers should be set

build/integration/features/bootstrap/Avatar.php

@@ -4,6 +4,7 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
 
 require __DIR__ . '/../../vendor/autoload.php';
@@ -67,11 +68,30 @@ public function userGetsAvatarForGuest(string $user, string $guestAvatar) {
 	}
 
 	/**
-	 * @When logged in user posts avatar from file :source
+	 * @When logged in user gets temporary avatar
+	 */
+	public function loggedInUserGetsTemporaryAvatar() {
+		$this->loggedInUserGetsTemporaryAvatarWith('200');
+	}
+
+	/**
+	 * @When logged in user gets temporary avatar with :statusCode
+	 *
+	 * @param string $statusCode
+	 */
+	public function loggedInUserGetsTemporaryAvatarWith(string $statusCode) {
+		$this->sendingAToWithRequesttoken('GET', '/index.php/avatar/tmp');
+		$this->theHTTPStatusCodeShouldBe($statusCode);
+
+		$this->getLastAvatar();
+	}
+
+	/**
+	 * @When logged in user posts temporary avatar from file :source
 	 *
 	 * @param string $source
 	 */
-	public function loggedInUserPostsAvatarFromFile(string $source) {
+	public function loggedInUserPostsTemporaryAvatarFromFile(string $source) {
 		$file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r'));
 
 		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar',
@@ -87,15 +107,40 @@ public function loggedInUserPostsAvatarFromFile(string $source) {
 	}
 
 	/**
-	 * @When logged in user posts avatar from internal path :path
+	 * @When logged in user posts temporary avatar from internal path :path
 	 *
 	 * @param string $path
 	 */
-	public function loggedInUserPostsAvatarFromInternalPath(string $path) {
+	public function loggedInUserPostsTemporaryAvatarFromInternalPath(string $path) {
 		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar?path=' . $path);
 		$this->theHTTPStatusCodeShouldBe('200');
 	}
 
+	/**
+	 * @When logged in user crops temporary avatar
+	 *
+	 * @param TableNode $crop
+	 */
+	public function loggedInUserCropsTemporaryAvatar(TableNode $crop) {
+		$this->loggedInUserCropsTemporaryAvatarWith('200', $crop);
+	}
+
+	/**
+	 * @When logged in user crops temporary avatar with :statusCode
+	 *
+	 * @param string $statusCode
+	 * @param TableNode $crop
+	 */
+	public function loggedInUserCropsTemporaryAvatarWith(string $statusCode, TableNode $crop) {
+		$parameters = [];
+		foreach ($crop->getRowsHash() as $key => $value) {
+			$parameters[] = 'crop[' . $key . ']=' . $value;
+		}
+
+		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar/cropped?' . implode('&', $parameters));
+		$this->theHTTPStatusCodeShouldBe($statusCode);
+	}
+
 	/**
 	 * @When logged in user deletes the user avatar
 	 */

build/integration/sharing_features/sharing-v1-part3.feature

@@ -46,7 +46,7 @@ Feature: sharing
   Scenario: Correct webdav share-permissions for owned folder
     Given user "user0" exists
     And user "user0" created a folder "/tmp"
-    When as "user0" gets properties of folder "/tmp" with
+    When as "user0" gets properties of folder "/" with
       |{http://open-collaboration-services.org/ns}share-permissions |
     Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "31"
 

build/psalm-baseline.xml

@@ -3440,6 +3440,17 @@
       <code><![CDATA[$this->providers]]></code>
     </UndefinedInterfaceMethod>
   </file>
+  <file src="lib/private/Cache/CappedMemoryCache.php">
+    <MissingTemplateParam>
+      <code><![CDATA[\ArrayAccess]]></code>
+    </MissingTemplateParam>
+  </file>
+  <file src="lib/private/Cache/File.php">
+    <LessSpecificImplementedReturnType>
+      <code><![CDATA[bool|mixed]]></code>
+      <code><![CDATA[bool|mixed]]></code>
+    </LessSpecificImplementedReturnType>
+  </file>
   <file src="lib/private/Calendar/Manager.php">
     <LessSpecificReturnStatement>
       <code><![CDATA[array_merge(