Merge remote-tracking branch 'origin/master' into enh/add-x-nc-scope-…

…property

apps/admin_audit/l10n/ast.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditoría / Rexistru",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Forne la capacidá de rexistrar, por exemplu, l'accesu a los ficheros o a otres aiciones sensibles de Nextcloud"
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/ast.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditoría / Rexistru",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Forne la capacidá de rexistrar, por exemplu, l'accesu a los ficheros o a otres aiciones sensibles de Nextcloud"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/eo.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Ekzamenado / Protokolado",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Provizi protokolado-kapablojn por Nextcloud, kiel ekzemple protokolado de aliroj al dosieroj aŭ aliaj delikataj agoj."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/eo.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Ekzamenado / Protokolado",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Provizi protokolado-kapablojn por Nextcloud, kiel ekzemple protokolado de aliroj al dosieroj aŭ aliaj delikataj agoj."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/cloud_federation_api/l10n/eo.js

@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "cloud_federation_api",
+    {
+    "Cloud Federation API" : "API de Nuba Federacio",
+    "Enable clouds to communicate with each other and exchange data" : "Ebligi interkomunikadon inter diversaj nuboj kaj la interŝanĝon de datumoj",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "La API de Nuba Federacio ebligas diversajn instancojn de Nextcloud interkomuniki kaj interŝanĝi datumojn inter si."
+},
+"nplurals=2; plural=(n != 1);");

apps/cloud_federation_api/l10n/eo.json

@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cloud Federation API" : "API de Nuba Federacio",
+    "Enable clouds to communicate with each other and exchange data" : "Ebligi interkomunikadon inter diversaj nuboj kaj la interŝanĝon de datumoj",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "La API de Nuba Federacio ebligas diversajn instancojn de Nextcloud interkomuniki kaj interŝanĝi datumojn inter si."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/dav/composer/composer/autoload_classmap.php

@@ -165,6 +165,7 @@
     'OCA\\DAV\\Connector\\Sabre\\Exception\\Forbidden' => $baseDir . '/../lib/Connector/Sabre/Exception/Forbidden.php',
     'OCA\\DAV\\Connector\\Sabre\\Exception\\InvalidPath' => $baseDir . '/../lib/Connector/Sabre/Exception/InvalidPath.php',
     'OCA\\DAV\\Connector\\Sabre\\Exception\\PasswordLoginForbidden' => $baseDir . '/../lib/Connector/Sabre/Exception/PasswordLoginForbidden.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\TooManyRequests' => $baseDir . '/../lib/Connector/Sabre/Exception/TooManyRequests.php',
     'OCA\\DAV\\Connector\\Sabre\\Exception\\UnsupportedMediaType' => $baseDir . '/../lib/Connector/Sabre/Exception/UnsupportedMediaType.php',
     'OCA\\DAV\\Connector\\Sabre\\FakeLockerPlugin' => $baseDir . '/../lib/Connector/Sabre/FakeLockerPlugin.php',
     'OCA\\DAV\\Connector\\Sabre\\File' => $baseDir . '/../lib/Connector/Sabre/File.php',

apps/dav/composer/composer/autoload_static.php

@@ -180,6 +180,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Connector\\Sabre\\Exception\\Forbidden' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/Forbidden.php',
         'OCA\\DAV\\Connector\\Sabre\\Exception\\InvalidPath' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/InvalidPath.php',
         'OCA\\DAV\\Connector\\Sabre\\Exception\\PasswordLoginForbidden' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/PasswordLoginForbidden.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\TooManyRequests' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/TooManyRequests.php',
         'OCA\\DAV\\Connector\\Sabre\\Exception\\UnsupportedMediaType' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/UnsupportedMediaType.php',
         'OCA\\DAV\\Connector\\Sabre\\FakeLockerPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/FakeLockerPlugin.php',
         'OCA\\DAV\\Connector\\Sabre\\File' => __DIR__ . '/..' . '/../lib/Connector/Sabre/File.php',

apps/dav/l10n/it.js

@@ -125,6 +125,7 @@ OC.L10N.register(
     "Due on %s by %s" : "Scade il %s per %s",
     "Due on %s" : "Scade il %s",
     "Migrated calendar (%1$s)" : "Calendario migrato (%1$s)",
+    "Calendars including events, details and attendees" : "Calendari inclusi eventi, dettagli e partecipanti",
     "Contacts and groups" : "Contatti e gruppi",
     "WebDAV" : "WebDAV",
     "WebDAV endpoint" : "Terminatore WebDAV",

apps/dav/l10n/it.json

@@ -123,6 +123,7 @@
     "Due on %s by %s" : "Scade il %s per %s",
     "Due on %s" : "Scade il %s",
     "Migrated calendar (%1$s)" : "Calendario migrato (%1$s)",
+    "Calendars including events, details and attendees" : "Calendari inclusi eventi, dettagli e partecipanti",
     "Contacts and groups" : "Contatti e gruppi",
     "WebDAV" : "WebDAV",
     "WebDAV endpoint" : "Terminatore WebDAV",

apps/dav/l10n/pl.js

@@ -75,6 +75,9 @@ OC.L10N.register(
     "Cancelled: %1$s" : "Anulowane: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" zostało anulowane",
     "Re: %1$s" : "Odp: %1$s",
+    "%1$s has accepted your invitation" : "Twoje zaproszenie zostało zaakceptowane przez %1$s",
+    "%1$s has tentatively accepted your invitation" : "Twoje zaproszenie zostało wstępnie zaakceptowane przez %1$s",
+    "%1$s has declined your invitation" : "Twoje zaproszenie zostało odrzucone przez %1$s",
     "%1$s has responded to your invitation" : "%1$s odpowiedział/a na Twoje zaproszenie",
     "Invitation updated: %1$s" : "Zaktualizowano zaproszenie: %1$s",
     "%1$s updated the event \"%2$s\"" : "%1$s zaktualizował/a wydarzenie \"%2$s\"",

apps/dav/l10n/pl.json

@@ -73,6 +73,9 @@
     "Cancelled: %1$s" : "Anulowane: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" zostało anulowane",
     "Re: %1$s" : "Odp: %1$s",
+    "%1$s has accepted your invitation" : "Twoje zaproszenie zostało zaakceptowane przez %1$s",
+    "%1$s has tentatively accepted your invitation" : "Twoje zaproszenie zostało wstępnie zaakceptowane przez %1$s",
+    "%1$s has declined your invitation" : "Twoje zaproszenie zostało odrzucone przez %1$s",
     "%1$s has responded to your invitation" : "%1$s odpowiedział/a na Twoje zaproszenie",
     "Invitation updated: %1$s" : "Zaktualizowano zaproszenie: %1$s",
     "%1$s updated the event \"%2$s\"" : "%1$s zaktualizował/a wydarzenie \"%2$s\"",

apps/dav/lib/CalDAV/Reminder/ReminderService.php

@@ -179,7 +179,7 @@ public function processReminders() :void {
 				continue;
 			}
 
-			if ($this->config->getAppValue('dav', 'sendEventRemindersToSharedGroupMembers', 'yes') === 'no') {
+			if ($this->config->getAppValue('dav', 'sendEventRemindersToSharedUsers', 'yes') === 'no') {
 				$users = $this->getAllUsersWithWriteAccessToCalendar($reminder['calendar_id']);
 			} else {
 				$users = [];

apps/dav/lib/CardDAV/Converter.php

@@ -29,10 +29,12 @@
 
 use Exception;
 use OCP\Accounts\IAccountManager;
+use OCP\Accounts\PropertyDoesNotExistException;
 use OCP\IImage;
 use OCP\IUser;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Property\Text;
+use function array_merge;
 
 class Converter {
 	/** @var IAccountManager */
@@ -43,7 +45,17 @@ public function __construct(IAccountManager $accountManager) {
 	}
 
 	public function createCardFromUser(IUser $user): ?VCard {
+<<<<<<< HEAD
 		$userProperties = $this->accountManager->getAccount($user)->getAllProperties();
+=======
+		$account = $this->accountManager->getAccount($user);
+		$userProperties = $account->getProperties();
+		try {
+			$additionalEmailsCollection = $account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+			$userProperties = array_merge($userProperties, $additionalEmailsCollection->getProperties());
+		} catch (PropertyDoesNotExistException $e) {
+		}
+>>>>>>> origin/master
 
 		$uid = $user->getUID();
 		$cloudId = $user->getCloudId();
@@ -66,6 +78,7 @@ public function createCardFromUser(IUser $user): ?VCard {
 				continue;
 			}
 
+<<<<<<< HEAD
 			$publish = true;
 			switch ($property->getName()) {
 				case IAccountManager::PROPERTY_DISPLAYNAME:
@@ -98,6 +111,43 @@ public function createCardFromUser(IUser $user): ?VCard {
 				case IAccountManager::PROPERTY_ROLE:
 					$vCard->add(new Text($vCard, 'TITLE', $property->getValue(), ['X-NC-SCOPE' => $scope]));
 					break;
+=======
+			if ($shareWithTrustedServers && !$emptyValue) {
+				$publish = true;
+				switch ($property->getName()) {
+					case IAccountManager::PROPERTY_DISPLAYNAME:
+						$vCard->add(new Text($vCard, 'FN', $property->getValue()));
+						$vCard->add(new Text($vCard, 'N', $this->splitFullName($property->getValue())));
+						break;
+					case IAccountManager::PROPERTY_AVATAR:
+						if ($image !== null) {
+							$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
+						}
+						break;
+					case IAccountManager::COLLECTION_EMAIL:
+					case IAccountManager::PROPERTY_EMAIL:
+						$vCard->add(new Text($vCard, 'EMAIL', $property->getValue(), ['TYPE' => 'OTHER']));
+						break;
+					case IAccountManager::PROPERTY_WEBSITE:
+						$vCard->add(new Text($vCard, 'URL', $property->getValue()));
+						break;
+					case IAccountManager::PROPERTY_PHONE:
+						$vCard->add(new Text($vCard, 'TEL', $property->getValue(), ['TYPE' => 'OTHER']));
+						break;
+					case IAccountManager::PROPERTY_ADDRESS:
+						$vCard->add(new Text($vCard, 'ADR', $property->getValue(), ['TYPE' => 'OTHER']));
+						break;
+					case IAccountManager::PROPERTY_TWITTER:
+						$vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $property->getValue(), ['TYPE' => 'TWITTER']));
+						break;
+					case IAccountManager::PROPERTY_ORGANISATION:
+						$vCard->add(new Text($vCard, 'ORG', $property->getValue()));
+						break;
+					case IAccountManager::PROPERTY_ROLE:
+						$vCard->add(new Text($vCard, 'TITLE', $property->getValue()));
+						break;
+				}
+>>>>>>> origin/master
 			}
 		}
 

apps/dav/lib/Connector/Sabre/Auth.php

@@ -37,10 +37,13 @@
 use OC\Authentication\Exceptions\PasswordLoginForbiddenException;
 use OC\Authentication\TwoFactorAuth\Manager;
 use OC\Security\Bruteforce\Throttler;
+use OC\User\LoginException;
 use OC\User\Session;
 use OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden;
+use OCA\DAV\Connector\Sabre\Exception\TooManyRequests;
 use OCP\IRequest;
 use OCP\ISession;
+use OCP\Security\Bruteforce\MaxDelayReached;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\Auth\Backend\AbstractBasic;
 use Sabre\DAV\Exception\NotAuthenticated;
@@ -119,6 +122,9 @@ protected function validateUserPass($username, $password) {
 			} catch (PasswordLoginForbiddenException $ex) {
 				$this->session->close();
 				throw new PasswordLoginForbidden();
+			} catch (MaxDelayReached $ex) {
+				$this->session->close();
+				throw new TooManyRequests();
 			}
 		}
 	}

apps/dav/lib/Connector/Sabre/Exception/TooManyRequests.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2023 Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\DAV\Connector\Sabre\Exception;
+
+use DOMElement;
+use Sabre\DAV\Exception\NotAuthenticated;
+use Sabre\DAV\Server;
+
+class TooManyRequests extends NotAuthenticated {
+	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+	public function getHTTPCode() {
+		return 429;
+	}
+
+	/**
+	 * This method allows the exception to include additional information
+	 * into the WebDAV error response
+	 *
+	 * @param Server $server
+	 * @param DOMElement $errorNode
+	 * @return void
+	 */
+	public function serialize(Server $server, DOMElement $errorNode) {
+
+		// set ownCloud namespace
+		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
+
+		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:hint', 'too many requests');
+		$errorNode->appendChild($error);
+	}
+}

apps/dav/lib/Settings/CalDAVSettings.php

@@ -46,7 +46,7 @@ class CalDAVSettings implements IDelegatedSettings {
 		'sendInvitations' => 'yes',
 		'generateBirthdayCalendar' => 'yes',
 		'sendEventReminders' => 'yes',
-		'sendEventRemindersToSharedGroupMembers' => 'yes',
+		'sendEventRemindersToSharedUsers' => 'yes',
 		'sendEventRemindersPush' => 'no',
 	];
 

apps/dav/src/settings.js

@@ -16,9 +16,9 @@ const CalDavSettingsView = new View({
 				'generateBirthdayCalendar'
 			),
 			sendEventReminders: loadState('dav', 'sendEventReminders'),
-			sendEventRemindersToSharedGroupMembers: loadState(
+			sendEventRemindersToSharedUsers: loadState(
 				'dav',
-				'sendEventRemindersToSharedGroupMembers'
+				'sendEventRemindersToSharedUsers'
 			),
 			sendEventRemindersPush: loadState('dav', 'sendEventRemindersPush'),
 		}

apps/dav/src/views/CalDavSettings.spec.js

@@ -43,7 +43,7 @@ describe('CalDavSettings', () => {
 						sendInvitations: true,
 						generateBirthdayCalendar: true,
 						sendEventReminders: true,
-						sendEventRemindersToSharedGroupMembers: true,
+						sendEventRemindersToSharedUsers: true,
 						sendEventRemindersPush: true,
 					}
 				},
@@ -65,10 +65,10 @@ describe('CalDavSettings', () => {
 			'Send notifications for events'
 		)
 		expect(sendEventReminders).toBeChecked()
-		const sendEventRemindersToSharedGroupMembers = TLUtils.getByLabelText(
+		const sendEventRemindersToSharedUsers = TLUtils.getByLabelText(
 			'Send reminder notifications to calendar sharees as well'
 		)
-		expect(sendEventRemindersToSharedGroupMembers).toBeChecked()
+		expect(sendEventRemindersToSharedUsers).toBeChecked()
 		const sendEventRemindersPush = TLUtils.getByLabelText(
 			'Enable notifications for events via push'
 		)
@@ -114,7 +114,7 @@ describe('CalDavSettings', () => {
 			'no'
 		)
 
-		expect(sendEventRemindersToSharedGroupMembers).toBeDisabled()
+		expect(sendEventRemindersToSharedUsers).toBeDisabled()
 		expect(sendEventRemindersPush).toBeDisabled()
 
 		OCP.AppConfig.setValue.mockClear()
@@ -126,7 +126,7 @@ describe('CalDavSettings', () => {
 			'yes'
 		)
 
-		expect(sendEventRemindersToSharedGroupMembers).toBeEnabled()
+		expect(sendEventRemindersToSharedUsers).toBeEnabled()
 		expect(sendEventRemindersPush).toBeEnabled()
 		*/
 	})

apps/dav/src/views/CalDavSettings.vue

@@ -51,7 +51,7 @@
 		</p>
 		<p class="indented">
 			<NcCheckboxRadioSwitch id="caldavSendEventRemindersToSharedGroupMembers"
-				:checked.sync="sendEventRemindersToSharedGroupMembers"
+				:checked.sync="sendEventRemindersToSharedUsers"
 				type="switch"
 				:disabled="!sendEventReminders">
 				{{ $t('dav', 'Send reminder notifications to calendar sharees as well' ) }}
@@ -130,10 +130,10 @@ export default {
 		sendEventReminders(value) {
 			OCP.AppConfig.setValue('dav', 'sendEventReminders', value ? 'yes' : 'no')
 		},
-		sendEventRemindersToSharedGroupMembers(value) {
+		sendEventRemindersToSharedUsers(value) {
 			OCP.AppConfig.setValue(
 				'dav',
-				'sendEventRemindersToSharedGroupMembers',
+				'sendEventRemindersToSharedUsers',
 				value ? 'yes' : 'no'
 			)
 		},

apps/dav/tests/unit/Settings/CalDAVSettingsTest.php

@@ -61,7 +61,7 @@ public function testGetForm(): void {
 			   ['dav', 'sendInvitations', 'yes'],
 			   ['dav', 'generateBirthdayCalendar', 'yes'],
 			   ['dav', 'sendEventReminders', 'yes'],
-			   ['dav', 'sendEventRemindersToSharedGroupMembers', 'yes'],
+			   ['dav', 'sendEventRemindersToSharedUsers', 'yes'],
 			   ['dav', 'sendEventRemindersPush', 'no'],
 		   )
 		   ->will($this->onConsecutiveCalls('yes', 'no', 'yes', 'yes', 'yes'));
@@ -76,7 +76,7 @@ public function testGetForm(): void {
 				['sendInvitations', true],
 				['generateBirthdayCalendar', false],
 				['sendEventReminders', true],
-				['sendEventRemindersToSharedGroupMembers', true],
+				['sendEventRemindersToSharedUsers', true],
 				['sendEventRemindersPush', true],
 			);
 		$result = $this->settings->getForm();

apps/federation/lib/SyncFederationAddressBooks.php

@@ -82,10 +82,14 @@ public function syncThemAll(\Closure $callback) {
 			} catch (\Exception $ex) {
 				if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
 					$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_ACCESS_REVOKED);
-					$this->logger->error("Server sync for $url failed because of revoked access.");
+					$this->logger->error("Server sync for $url failed because of revoked access.", [
+						'exception' => $ex,
+					]);
 				} else {
 					$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_FAILURE);
-					$this->logger->error("Server sync for $url failed.");
+					$this->logger->error("Server sync for $url failed.", [
+						'exception' => $ex,
+					]);
 				}
 				$callback($url, $ex);
 			}