Merge pull request #50749 from nextcloud/backport/49493/stable29

[stable29] feat: Use inline password confirmation in external storage settings

apps/files_external/lib/Controller/AjaxController.php

@@ -105,7 +105,7 @@ class AjaxController extends Controller {
 	 * @return bool
 	 */
 	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
+	#[PasswordConfirmationRequired(strict: true)]
 	public function saveGlobalCredentials($uid, $user, $password) {
 		$currentUser = $this->userSession->getUser();
 		if ($currentUser === null) {

apps/files_external/lib/Controller/GlobalStoragesController.php

@@ -91,7 +91,7 @@ class GlobalStoragesController extends StoragesController {
 	 *
 	 * @return DataResponse
 	 */
-	#[PasswordConfirmationRequired]
+	#[PasswordConfirmationRequired(strict: true)]
 	public function create(
 		$mountPoint,
 		$backend,
@@ -157,7 +157,7 @@ class GlobalStoragesController extends StoragesController {
 	 *
 	 * @return DataResponse
 	 */
-	#[PasswordConfirmationRequired]
+	#[PasswordConfirmationRequired(strict: true)]
 	public function update(
 		$id,
 		$mountPoint,

apps/files_external/lib/Controller/StoragesController.php

@@ -323,7 +323,7 @@ abstract class StoragesController extends Controller {
 	 *
 	 * @return DataResponse
 	 */
-	#[PasswordConfirmationRequired]
+	#[PasswordConfirmationRequired(strict: true)]
 	public function destroy(int $id) {
 		try {
 			$this->service->removeStorage($id);

apps/files_external/lib/Controller/UserGlobalStoragesController.php

@@ -159,7 +159,7 @@ class UserGlobalStoragesController extends StoragesController {
 	 * @return DataResponse
 	 */
 	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
+	#[PasswordConfirmationRequired(strict: true)]
 	public function update(
 		$id,
 		$backendOptions,

apps/files_external/lib/Controller/UserStoragesController.php

@@ -124,7 +124,7 @@ class UserStoragesController extends StoragesController {
 	 * @return DataResponse
 	 */
 	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
+	#[PasswordConfirmationRequired(strict: true)]
 	public function create(
 		$mountPoint,
 		$backend,
@@ -180,7 +180,7 @@ class UserStoragesController extends StoragesController {
 	 * @return DataResponse
 	 */
 	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
+	#[PasswordConfirmationRequired(strict: true)]
 	public function update(
 		$id,
 		$mountPoint,
@@ -232,7 +232,7 @@ class UserStoragesController extends StoragesController {
 	 * {@inheritdoc}
 	 */
 	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
+	#[PasswordConfirmationRequired(strict: true)]
 	public function destroy(int $id) {
 		return parent::destroy($id);
 	}

apps/files_external/templates/settings.php

@@ -16,10 +16,8 @@ $l->t("Never");
 $l->t("Once every direct access");
 $l->t('Read only');
 
-script('files_external', [
-	'settings',
-	'templates'
-]);
+\OCP\Util::addScript('files_external', 'settings');
+\OCP\Util::addScript('files_external', 'templates');
 style('files_external', 'settings');
 
 // load custom JS

build/integration/features/bootstrap/ExternalStorage.php

@@ -48,7 +48,7 @@ trait ExternalStorage {
 	 * @param TableNode $fields
 	 */
 	public function loggedInUserCreatesExternalGlobalStorage(TableNode $fields): void {
-		$this->sendJsonWithRequestToken('POST', '/index.php/apps/files_external/globalstorages', $fields);
+		$this->sendJsonWithRequestTokenAndBasicAuth('POST', '/index.php/apps/files_external/globalstorages', $fields);
 		$this->theHTTPStatusCodeShouldBe('201');
 
 		$this->lastExternalStorageData = json_decode($this->response->getBody(), $asAssociativeArray = true);
@@ -62,7 +62,7 @@ trait ExternalStorage {
 	 * @param TableNode $fields
 	 */
 	public function loggedInUserUpdatesLastExternalUserglobalStorage(TableNode $fields): void {
-		$this->sendJsonWithRequestToken('PUT', '/index.php/apps/files_external/userglobalstorages/' . $this->lastExternalStorageData['id'], $fields);
+		$this->sendJsonWithRequestTokenAndBasicAuth('PUT', '/index.php/apps/files_external/userglobalstorages/' . $this->lastExternalStorageData['id'], $fields);
 		$this->theHTTPStatusCodeShouldBe('200');
 
 		$this->lastExternalStorageData = json_decode($this->response->getBody(), $asAssociativeArray = true);
@@ -100,4 +100,23 @@ trait ExternalStorage {
 		];
 		$this->sendingAToWithRequesttoken($method, $url, $body);
 	}
+
+	private function sendJsonWithRequestTokenAndBasicAuth(string $method, string $url, TableNode $fields): void {
+		$isFirstField = true;
+		$fieldsAsJsonString = '{';
+		foreach ($fields->getRowsHash() as $key => $value) {
+			$fieldsAsJsonString .= ($isFirstField ? '' : ',') . '"' . $key . '":' . $value;
+			$isFirstField = false;
+		}
+		$fieldsAsJsonString .= '}';
+
+		$body = [
+			'headers' => [
+				'Content-Type' => 'application/json',
+				'Authorization' => 'Basic ' . base64_encode('admin:admin'),
+			],
+			'body' => $fieldsAsJsonString,
+		];
+		$this->sendingAToWithRequesttoken($method, $url, $body);
+	}
 }

build/integration/files_features/external-storage.feature

@@ -14,14 +14,14 @@ Feature: external-storage
     And As an "user1"
     And accepting last share
     When creating a share with
-      | path | foo |
-      | shareType | 3 |
+      | path      | foo |
+      | shareType | 3   |
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
     And Share fields of last share match with
-      | id | A_NUMBER |
-      | url | AN_URL |
-      | token | A_TOKEN |
+      | id       | A_NUMBER             |
+      | url      | AN_URL               |
+      | token    | A_TOKEN              |
       | mimetype | httpd/unix-directory |
 
   Scenario: Shares don't overwrite external storage
@@ -66,9 +66,9 @@ Feature: external-storage
   Scenario: Save an external storage with password provided by user
     Given Logging in using web as "admin"
     And logged in user creates external global storage
-      | mountPoint     | "ExternalStorageTest" |
-      | backend        | "owncloud" |
-      | authMechanism  | "password::userprovided" |
+      | mountPoint     | "ExternalStorageTest"                           |
+      | backend        | "owncloud"                                      |
+      | authMechanism  | "password::userprovided"                        |
       | backendOptions | {"host":"http://localhost:8080","secure":false} |
     And fields of last external storage match with
       | status | 2 |
@@ -80,9 +80,9 @@ Feature: external-storage
   Scenario: Save an external storage again with an unmodified password provided by user
     Given Logging in using web as "admin"
     And logged in user creates external global storage
-      | mountPoint     | "ExternalStorageTest" |
-      | backend        | "owncloud" |
-      | authMechanism  | "password::userprovided" |
+      | mountPoint     | "ExternalStorageTest"                           |
+      | backend        | "owncloud"                                      |
+      | authMechanism  | "password::userprovided"                        |
       | backendOptions | {"host":"http://localhost:8080","secure":false} |
     And fields of last external storage match with
       | status | 2 |
@@ -96,9 +96,9 @@ Feature: external-storage
   Scenario: Save an external storage with global credentials provided by user
     Given Logging in using web as "admin"
     And logged in user creates external global storage
-      | mountPoint     | "ExternalStorageTest" |
-      | backend        | "owncloud" |
-      | authMechanism  | "password::global::user" |
+      | mountPoint     | "ExternalStorageTest"                           |
+      | backend        | "owncloud"                                      |
+      | authMechanism  | "password::global::user"                        |
       | backendOptions | {"host":"http://localhost:8080","secure":false} |
     And fields of last external storage match with
       | status | 2 |
@@ -110,9 +110,9 @@ Feature: external-storage
   Scenario: Save an external storage again with unmodified global credentials provided by user
     Given Logging in using web as "admin"
     And logged in user creates external global storage
-      | mountPoint     | "ExternalStorageTest" |
-      | backend        | "owncloud" |
-      | authMechanism  | "password::global::user" |
+      | mountPoint     | "ExternalStorageTest"                           |
+      | backend        | "owncloud"                                      |
+      | authMechanism  | "password::global::user"                        |
       | backendOptions | {"host":"http://localhost:8080","secure":false} |
     And fields of last external storage match with
       | status | 2 |

dist/8066-8066.js

@@ -1,2 +1,2 @@
-"use strict";(self.webpackChunknextcloud=self.webpackChunknextcloud||[]).push([[8066],{48066:(e,c,l)=>{l.d(c,{FilePickerVue:()=>n});const n=(0,l(85471).$V)((()=>Promise.all([l.e(4208),l.e(1902)]).then(l.bind(l,64267))))}}]);
-//# sourceMappingURL=8066-8066.js.map?v=f1f0a3884f0b92377e6a
+"use strict";(self.webpackChunknextcloud=self.webpackChunknextcloud||[]).push([[8066],{48066:(e,c,l)=>{l.d(c,{FilePickerVue:()=>n});const n=(0,l(85471).$V)((()=>Promise.all([l.e(4208),l.e(267),l.e(3916)]).then(l.bind(l,64267))))}}]);
+//# sourceMappingURL=8066-8066.js.map?v=9369cd9b99b2eb542565

dist/8066-8066.js.map

@@ -1 +1 @@
-{"version":3,"file":"8066-8066.js?v=f1f0a3884f0b92377e6a","mappings":"oIACA,MAAMA,GAAgB,E,SAAA,KAAqB,IAAM,0D","sources":["webpack:///nextcloud/node_modules/@nextcloud/dialogs/dist/chunks/index-Kg2hZgGF.mjs"],"sourcesContent":["import { defineAsyncComponent } from \"vue\";\nconst FilePickerVue = defineAsyncComponent(() => import(\"./FilePicker-ajWx2Snh.mjs\"));\nexport {\n  FilePickerVue\n};\n"],"names":["FilePickerVue"],"sourceRoot":""}
+{"version":3,"file":"8066-8066.js?v=9369cd9b99b2eb542565","mappings":"oIACA,MAAMA,GAAgB,E,SAAA,KAAqB,IAAM,mE","sources":["webpack:///nextcloud/node_modules/@nextcloud/dialogs/dist/chunks/index-Kg2hZgGF.mjs"],"sourcesContent":["import { defineAsyncComponent } from \"vue\";\nconst FilePickerVue = defineAsyncComponent(() => import(\"./FilePicker-ajWx2Snh.mjs\"));\nexport {\n  FilePickerVue\n};\n"],"names":["FilePickerVue"],"sourceRoot":""}

dist/8645-8645.js

@@ -0,0 +1,2 @@
+"use strict";(self.webpackChunknextcloud=self.webpackChunknextcloud||[]).push([[8645],{8645:(e,c,l)=>{l.d(c,{FilePickerVue:()=>n});const n=(0,l(85471).$V)((()=>Promise.all([l.e(4208),l.e(267),l.e(717)]).then(l.bind(l,80717))))}}]);
+//# sourceMappingURL=8645-8645.js.map?v=c63ca687371a1a78dda9

dist/8645-8645.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"8645-8645.js?v=c63ca687371a1a78dda9","mappings":"mIACA,MAAMA,GAAgB,E,SAAA,KAAqB,IAAM,kE","sources":["webpack:///nextcloud/node_modules/@nextcloud/password-confirmation/node_modules/@nextcloud/dialogs/dist/chunks/index-Ly0obkwS.mjs"],"sourcesContent":["import { defineAsyncComponent } from \"vue\";\nconst FilePickerVue = defineAsyncComponent(() => import(\"./FilePicker-CSmrMOEO.mjs\"));\nexport {\n  FilePickerVue\n};\n"],"names":["FilePickerVue"],"sourceRoot":""}

dist/core-common.js.LICENSE.txt

@@ -11,6 +11,16 @@
  * @license  MIT
  */
 
+/*!
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+/*!
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: MIT
+ */
+
 /*!
  * The buffer module from node.js, for the browser.
  *