Merge branch 'master' into master

Author: enriquepablo

3rdparty

@@ -108,14 +108,16 @@ public function __construct(
 	#[NoCSRFRequired]
 	#[BruteForceProtection(action: 'receiveFederatedShare')]
 	public function addShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $protocol, $shareType, $resourceType) {
-		try {
-			// if request is signed and well signed, no exception are thrown
-			// if request is not signed and host is known for not supporting signed request, no exception are thrown
-			$signedRequest = $this->getSignedRequest();
-			$this->confirmSignedOrigin($signedRequest, 'owner', $owner);
-		} catch (IncomingRequestException $e) {
-			$this->logger->warning('incoming request exception', ['exception' => $e]);
-			return new JSONResponse(['message' => $e->getMessage(), 'validationErrors' => []], Http::STATUS_BAD_REQUEST);
+		if (!$this->appConfig->getValueBool('core', OCMSignatoryManager::APPCONFIG_SIGN_DISABLED, lazy: true)) {
+			try {
+				// if request is signed and well signed, no exception are thrown
+				// if request is not signed and host is known for not supporting signed request, no exception are thrown
+				$signedRequest = $this->getSignedRequest();
+				$this->confirmSignedOrigin($signedRequest, 'owner', $owner);
+			} catch (IncomingRequestException $e) {
+				$this->logger->warning('incoming request exception', ['exception' => $e]);
+				return new JSONResponse(['message' => $e->getMessage(), 'validationErrors' => []], Http::STATUS_BAD_REQUEST);
+			}
 		}
 
 		// check if all required parameters are set
@@ -356,14 +358,16 @@ public function receiveNotification($notificationType, $resourceType, $providerI
 			);
 		}
 
-		try {
-			// if request is signed and well signed, no exception are thrown
-			// if request is not signed and host is known for not supporting signed request, no exception are thrown
-			$signedRequest = $this->getSignedRequest();
-			$this->confirmNotificationIdentity($signedRequest, $resourceType, $notification);
-		} catch (IncomingRequestException $e) {
-			$this->logger->warning('incoming request exception', ['exception' => $e]);
-			return new JSONResponse(['message' => $e->getMessage(), 'validationErrors' => []], Http::STATUS_BAD_REQUEST);
+		if (!$this->appConfig->getValueBool('core', OCMSignatoryManager::APPCONFIG_SIGN_DISABLED, lazy: true)) {
+			try {
+				// if request is signed and well signed, no exception are thrown
+				// if request is not signed and host is known for not supporting signed request, no exception are thrown
+				$signedRequest = $this->getSignedRequest();
+				$this->confirmNotificationIdentity($signedRequest, $resourceType, $notification);
+			} catch (IncomingRequestException $e) {
+				$this->logger->warning('incoming request exception', ['exception' => $e]);
+				return new JSONResponse(['message' => $e->getMessage(), 'validationErrors' => []], Http::STATUS_BAD_REQUEST);
+			}
 		}
 
 		try {

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

@@ -309,7 +309,7 @@ OC.L10N.register(
     "Move" : "Flyt",
     "Move or copy operation failed" : "Flytte- eller kopioperationen fejlede",
     "Move or copy" : "Flyt eller kopiér",
-    "Open folder" : "Åben mappe",
+    "Open folder" : "Åbn mappe",
     "Open folder {displayName}" : "Åben mappe {displayName}",
     "Open in Files" : "Åben i Filer",
     "Open locally" : "Åben lokalt",

apps/files/l10n/da.js

@@ -307,7 +307,7 @@
     "Move" : "Flyt",
     "Move or copy operation failed" : "Flytte- eller kopioperationen fejlede",
     "Move or copy" : "Flyt eller kopiér",
-    "Open folder" : "Åben mappe",
+    "Open folder" : "Åbn mappe",
     "Open folder {displayName}" : "Åben mappe {displayName}",
     "Open in Files" : "Åben i Filer",
     "Open locally" : "Åben lokalt",

apps/files/l10n/da.json

@@ -13,6 +13,7 @@ OC.L10N.register(
     "OAuth 2.0 allows external services to request access to {instanceName}." : "Ligeann OAuth 2.0 do sheirbhísí seachtracha rochtain a iarraidh ar {instanceName}.",
     "Name" : "Ainm",
     "Redirection URI" : "Atreo URI",
+    "Client identifier" : "Aitheantóir cliant",
     "Delete client" : "Scrios cliant",
     "Make sure you store the secret key, it cannot be recovered." : "Déan cinnte go stórálann tú an eochair rúnda, ní féidir í a aisghabháil.",
     "Add client" : "Cuir cliant leis",

apps/oauth2/l10n/ga.js

@@ -11,6 +11,7 @@
     "OAuth 2.0 allows external services to request access to {instanceName}." : "Ligeann OAuth 2.0 do sheirbhísí seachtracha rochtain a iarraidh ar {instanceName}.",
     "Name" : "Ainm",
     "Redirection URI" : "Atreo URI",
+    "Client identifier" : "Aitheantóir cliant",
     "Delete client" : "Scrios cliant",
     "Make sure you store the secret key, it cannot be recovered." : "Déan cinnte go stórálann tú an eochair rúnda, ní féidir í a aisghabháil.",
     "Add client" : "Cuir cliant leis",

apps/oauth2/l10n/ga.json

@@ -13,6 +13,7 @@ OC.L10N.register(
     "OAuth 2.0 allows external services to request access to {instanceName}." : "OAuth 2.0 讓外部服務請求能存取 {instanceName}。",
     "Name" : "名稱",
     "Redirection URI" : "重新導向 URI",
+    "Client identifier" : "客戶端辨識字串",
     "Delete client" : "刪除客戶端",
     "Make sure you store the secret key, it cannot be recovered." : "請確定您儲存了私鑰，其無法還原。",
     "Add client" : "新增客戶端",

apps/oauth2/l10n/zh_TW.js

@@ -11,6 +11,7 @@
     "OAuth 2.0 allows external services to request access to {instanceName}." : "OAuth 2.0 讓外部服務請求能存取 {instanceName}。",
     "Name" : "名稱",
     "Redirection URI" : "重新導向 URI",
+    "Client identifier" : "客戶端辨識字串",
     "Delete client" : "刪除客戶端",
     "Make sure you store the secret key, it cannot be recovered." : "請確定您儲存了私鑰，其無法還原。",
     "Add client" : "新增客戶端",

apps/oauth2/l10n/zh_TW.json

@@ -55,6 +55,7 @@ public function getForm() {
 			'restrictUserEnumerationToPhone' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_to_phone'),
 			'restrictUserEnumerationFullMatch' => $this->shareManager->allowEnumerationFullMatch(),
 			'restrictUserEnumerationFullMatchUserId' => $this->shareManager->matchUserId(),
+			'restrictUserEnumerationFullMatchDisplayname' => $this->shareManager->matchDisplayName(),
 			'restrictUserEnumerationFullMatchEmail' => $this->shareManager->matchEmail(),
 			'restrictUserEnumerationFullMatchIgnoreSecondDN' => $this->shareManager->ignoreSecondDisplayName(),
 			'enforceLinksPassword' => Util::isPublicLinkPasswordRequired(false),

apps/settings/lib/Settings/Admin/Sharing.php

@@ -230,6 +230,9 @@
 				<NcCheckboxRadioSwitch v-model="settings.restrictUserEnumerationFullMatchUserId">
 					{{ t('settings', 'Also allow autocompletion on full match of the user ID') }}
 				</NcCheckboxRadioSwitch>
+				<NcCheckboxRadioSwitch v-model="settings.restrictUserEnumerationFullMatchDisplayname">
+					{{ t('settings', 'Also allow autocompletion on full match of the display name') }}
+				</NcCheckboxRadioSwitch>
 				<NcCheckboxRadioSwitch v-model="settings.restrictUserEnumerationFullMatchEmail">
 					{{ t('settings', 'Also allow autocompletion on full match of the user email') }}
 				</NcCheckboxRadioSwitch>
@@ -291,6 +294,7 @@ interface IShareSettings {
 	restrictUserEnumerationToPhone: boolean
 	restrictUserEnumerationFullMatch: boolean
 	restrictUserEnumerationFullMatchUserId: boolean
+	restrictUserEnumerationFullMatchDisplayname: boolean
 	restrictUserEnumerationFullMatchEmail: boolean
 	restrictUserEnumerationFullMatchIgnoreSecondDN: boolean
 	enforceLinksPassword: boolean