Merge branch 'master' into fix/42480/user-admin-not-admin

Signed-off-by: John Molakvoæ <[email protected]>
nextcloud · Feb 24, 2024 · b080113 · b080113
2 parents c98b046 + 1d09dec
commit b080113
Show file tree

Hide file tree

Showing 518 changed files with 9,266 additions and 6,420 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -176,7 +176,15 @@ updates:
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
+    interval: monthly
     timezone: Europe/Paris
+  groups:
+    github-actions:
+      patterns:
+        - "*"
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  reviewers:
+    - "nextcloud/server-dependabot"
+
diff --git a/.github/workflows/command-compile.yml b/.github/workflows/command-compile.yml
@@ -32,7 +32,7 @@ jobs:
           reactions: "+1"
 
       - name: Parse command
-        uses: skjnldsv/parse-command-comment@d8c0034c481b791dd6348fcacd9c510dc3a4cb4f # v2
+        uses: skjnldsv/parse-command-comment@5c955203c52424151e6d0e58fb9de8a9f6a605a1 # v2
         id: command
 
       # Init path depending on which command is run

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -45,8 +45,9 @@ jobs:
         with:
           blueprint: tests/blueprints/basic.toml
           ref: ${{ github.event.pull_request.head.ref }}
+
       - name: Run before measurements
-        uses: nextcloud/profiler@1e66a9de5f76a01e9d1db4f0153bcc1cbf989b3d
+        uses: nextcloud/profiler@6801ee10fc80f10b444388fb6ca9b36ad8a2ea83
         with:
           run: |
             curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -68,7 +69,7 @@ jobs:
 
       - name: Run after measurements
         id: compare
-        uses: nextcloud/profiler@1e66a9de5f76a01e9d1db4f0153bcc1cbf989b3d
+        uses: nextcloud/profiler@6801ee10fc80f10b444388fb6ca9b36ad8a2ea83
         with:
           run: |
             curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test

diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
@@ -42,6 +42,7 @@ jobs:
   phpunit-oci:
     runs-on: ubuntu-latest
 
+    needs: changes
     if: needs.changes.outputs.src != 'false' && ${{ github.repository_owner != 'nextcloud-gmbh' }}
 
     strategy:

diff --git a/3rdparty b/3rdparty
diff --git a/apps/admin_audit/lib/Actions/Console.php b/apps/admin_audit/lib/Actions/Console.php
@@ -29,7 +29,7 @@
 
 class Console extends Action {
 	/**
-	 * @param $arguments
+	 * @param array $arguments
 	 */
 	public function runCommand(array $arguments): void {
 		if (!isset($arguments[1]) || $arguments[1] === '_completion') {

diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php
@@ -70,7 +70,6 @@
 use Psr\Log\LoggerInterface;
 
 class Application extends App implements IBootstrap {
-
 	/** @var LoggerInterface */
 	protected $logger;
 

diff --git a/apps/admin_audit/lib/AuditLogger.php b/apps/admin_audit/lib/AuditLogger.php
@@ -32,8 +32,7 @@
  */
 class AuditLogger implements IAuditLogger {
 
-	/** @var LoggerInterface */
-	private $parentLogger;
+	private LoggerInterface $parentLogger;
 
 	public function __construct(ILogFactory $logFactory, IConfig $config) {
 		$auditType = $config->getSystemValueString('log_type_audit', 'file');
@@ -50,39 +49,39 @@ public function __construct(ILogFactory $logFactory, IConfig $config) {
 		$this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
 	}
 
-	public function emergency($message, array $context = array()) {
+	public function emergency($message, array $context = array()): void {
 		$this->parentLogger->emergency($message, $context);
 	}
 
-	public function alert($message, array $context = array()) {
+	public function alert($message, array $context = array()): void {
 		$this->parentLogger->alert($message, $context);
 	}
 
-	public function critical($message, array $context = array()) {
+	public function critical($message, array $context = array()): void {
 		$this->parentLogger->critical($message, $context);
 	}
 
-	public function error($message, array $context = array()) {
+	public function error($message, array $context = array()): void {
 		$this->parentLogger->error($message, $context);
 	}
 
-	public function warning($message, array $context = array()) {
+	public function warning($message, array $context = array()): void {
 		$this->parentLogger->warning($message, $context);
 	}
 
-	public function notice($message, array $context = array()) {
+	public function notice($message, array $context = array()): void {
 		$this->parentLogger->notice($message, $context);
 	}
 
-	public function info($message, array $context = array()) {
+	public function info($message, array $context = array()): void {
 		$this->parentLogger->info($message, $context);
 	}
 
-	public function debug($message, array $context = array()) {
+	public function debug($message, array $context = array()): void {
 		$this->parentLogger->debug($message, $context);
 	}
 
-	public function log($level, $message, array $context = array()) {
+	public function log($level, $message, array $context = array()): void {
 		$this->parentLogger->log($level, $message, $context);
 	}
 }
diff --git a/apps/admin_audit/tests/Actions/SecurityTest.php b/apps/admin_audit/tests/Actions/SecurityTest.php
@@ -30,17 +30,15 @@
 use OCA\AdminAudit\AuditLogger;
 use OCP\Authentication\TwoFactorAuth\IProvider;
 use OCP\IUser;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class SecurityTest extends TestCase {
-	/** @var AuditLogger|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
+	private AuditLogger|MockObject $logger;
 
-	/** @var Security */
-	private $security;
+	private Security $security;
 
-	/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
-	private $user;
+	private MockObject|IUser $user;
 
 	protected function setUp(): void {
 		parent::setUp();

diff --git a/apps/dashboard/src/DashboardApp.vue b/apps/dashboard/src/DashboardApp.vue
@@ -554,6 +554,7 @@ export default {
 				background-position: center;
 				float: left;
 				margin-top: -6px;
+				margin-left: 6px;
 			}
 		}
 	}

diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php
@@ -29,6 +29,7 @@
 use OC\KnownUser\KnownUserService;
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCA\DAV\CalDAV\CalendarRoot;
+use OCA\DAV\CalDAV\Security\RateLimitingPlugin;
 use OCA\DAV\Connector\LegacyDAVACL;
 use OCA\DAV\Connector\Sabre\Auth;
 use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
@@ -116,6 +117,7 @@
 	$server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
 }
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', $logger));
+$server->addPlugin(\OCP\Server::get(RateLimitingPlugin::class));
 
 // And off we go!
 $server->exec();
diff --git a/apps/dav/composer/composer/autoload_classmap.php b/apps/dav/composer/composer/autoload_classmap.php
@@ -99,6 +99,7 @@
     'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
     'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
     'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => $baseDir . '/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
+    'OCA\\DAV\\CalDAV\\Security\\RateLimitingPlugin' => $baseDir . '/../lib/CalDAV/Security/RateLimitingPlugin.php',
     'OCA\\DAV\\CalDAV\\Sharing\\Backend' => $baseDir . '/../lib/CalDAV/Sharing/Backend.php',
     'OCA\\DAV\\CalDAV\\Sharing\\Service' => $baseDir . '/../lib/CalDAV/Sharing/Service.php',
     'OCA\\DAV\\CalDAV\\Status\\StatusService' => $baseDir . '/../lib/CalDAV/Status/StatusService.php',
@@ -316,6 +317,7 @@
     'OCA\\DAV\\Migration\\Version1027Date20230504122946' => $baseDir . '/../lib/Migration/Version1027Date20230504122946.php',
     'OCA\\DAV\\Migration\\Version1029Date20221114151721' => $baseDir . '/../lib/Migration/Version1029Date20221114151721.php',
     'OCA\\DAV\\Migration\\Version1029Date20231004091403' => $baseDir . '/../lib/Migration/Version1029Date20231004091403.php',
+    'OCA\\DAV\\Migration\\Version1030Date20240205103243' => $baseDir . '/../lib/Migration/Version1030Date20240205103243.php',
     'OCA\\DAV\\Profiler\\ProfilerPlugin' => $baseDir . '/../lib/Profiler/ProfilerPlugin.php',
     'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningNode' => $baseDir . '/../lib/Provisioning/Apple/AppleProvisioningNode.php',
     'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningPlugin' => $baseDir . '/../lib/Provisioning/Apple/AppleProvisioningPlugin.php',

diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php
@@ -114,6 +114,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
         'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
         'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
+        'OCA\\DAV\\CalDAV\\Security\\RateLimitingPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/Security/RateLimitingPlugin.php',
         'OCA\\DAV\\CalDAV\\Sharing\\Backend' => __DIR__ . '/..' . '/../lib/CalDAV/Sharing/Backend.php',
         'OCA\\DAV\\CalDAV\\Sharing\\Service' => __DIR__ . '/..' . '/../lib/CalDAV/Sharing/Service.php',
         'OCA\\DAV\\CalDAV\\Status\\StatusService' => __DIR__ . '/..' . '/../lib/CalDAV/Status/StatusService.php',
@@ -331,6 +332,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Migration\\Version1027Date20230504122946' => __DIR__ . '/..' . '/../lib/Migration/Version1027Date20230504122946.php',
         'OCA\\DAV\\Migration\\Version1029Date20221114151721' => __DIR__ . '/..' . '/../lib/Migration/Version1029Date20221114151721.php',
         'OCA\\DAV\\Migration\\Version1029Date20231004091403' => __DIR__ . '/..' . '/../lib/Migration/Version1029Date20231004091403.php',
+        'OCA\\DAV\\Migration\\Version1030Date20240205103243' => __DIR__ . '/..' . '/../lib/Migration/Version1030Date20240205103243.php',
         'OCA\\DAV\\Profiler\\ProfilerPlugin' => __DIR__ . '/..' . '/../lib/Profiler/ProfilerPlugin.php',
         'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningNode' => __DIR__ . '/..' . '/../lib/Provisioning/Apple/AppleProvisioningNode.php',
         'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningPlugin' => __DIR__ . '/..' . '/../lib/Provisioning/Apple/AppleProvisioningPlugin.php',

diff --git a/apps/dav/l10n/ar.js b/apps/dav/l10n/ar.js
@@ -2,7 +2,7 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "التقويم",
-    "To-dos" : "قائمة المهام",
+    "Tasks" : "المهام",
     "Personal" : "شخصي",
     "{actor} created calendar {calendar}" : "{actor} قام بإنشاء تقويم {calendar}",
     "You created calendar {calendar}" : "قمت بإنشاء التقويم {calendar}",
@@ -143,7 +143,6 @@ OC.L10N.register(
     "Configures a CalDAV account" : "تكوين حساب CalDAV",
     "Configures a CardDAV account" : "تكوين حساب CardDAV",
     "Events" : "أحداث",
-    "Tasks" : "المهام",
     "Untitled task" : "مهمة بدون اسم",
     "Completed on %s" : "تمّ الانتهاء منه في %s",
     "Due on %s by %s" : "مطلوبٌ في %s من قِبَل%s",
@@ -171,6 +170,7 @@ OC.L10N.register(
     "Delete slot" : "حذف فُرَضَةٍ slot زمنيّةٍ",
     "No working hours set" : "لم يتم تحديد ساعات العمل",
     "Add slot" : "أضِف فُرَضَةً slot زمنيّةً",
+    "Weekdays" : "أيام الأسبوع",
     "Monday" : "الإثنين",
     "Tuesday" : "الثلاثاء",
     "Wednesday" : "الأربعاء",
@@ -205,6 +205,7 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "هل تقبل الدعوة؟",
     "Tentative" : "مبدئي",
     "Your attendance was updated successfully." : "حضورك تم تحديثه بنجاحٍ",
+    "To-dos" : "قائمة المهام",
     "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "إذا قمت بتهيئة ساعات العمل الخاصة بك، فسيظهر للمستخدمين الآخرين عندما يحجزون معك موعداً إذا ما كنت في المكتب أو خارجه."
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/dav/l10n/ar.json b/apps/dav/l10n/ar.json
@@ -1,6 +1,6 @@
 { "translations": {
     "Calendar" : "التقويم",
-    "To-dos" : "قائمة المهام",
+    "Tasks" : "المهام",
     "Personal" : "شخصي",
     "{actor} created calendar {calendar}" : "{actor} قام بإنشاء تقويم {calendar}",
     "You created calendar {calendar}" : "قمت بإنشاء التقويم {calendar}",
@@ -141,7 +141,6 @@
     "Configures a CalDAV account" : "تكوين حساب CalDAV",
     "Configures a CardDAV account" : "تكوين حساب CardDAV",
     "Events" : "أحداث",
-    "Tasks" : "المهام",
     "Untitled task" : "مهمة بدون اسم",
     "Completed on %s" : "تمّ الانتهاء منه في %s",
     "Due on %s by %s" : "مطلوبٌ في %s من قِبَل%s",
@@ -169,6 +168,7 @@
     "Delete slot" : "حذف فُرَضَةٍ slot زمنيّةٍ",
     "No working hours set" : "لم يتم تحديد ساعات العمل",
     "Add slot" : "أضِف فُرَضَةً slot زمنيّةً",
+    "Weekdays" : "أيام الأسبوع",
     "Monday" : "الإثنين",
     "Tuesday" : "الثلاثاء",
     "Wednesday" : "الأربعاء",
@@ -203,6 +203,7 @@
     "Are you accepting the invitation?" : "هل تقبل الدعوة؟",
     "Tentative" : "مبدئي",
     "Your attendance was updated successfully." : "حضورك تم تحديثه بنجاحٍ",
+    "To-dos" : "قائمة المهام",
     "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "إذا قمت بتهيئة ساعات العمل الخاصة بك، فسيظهر للمستخدمين الآخرين عندما يحجزون معك موعداً إذا ما كنت في المكتب أو خارجه."
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
diff --git a/apps/dav/l10n/bg.js b/apps/dav/l10n/bg.js
@@ -2,7 +2,7 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Календар",
-    "To-dos" : "Задачи за изпълнение",
+    "Tasks" : "Задачи",
     "Personal" : "Личен",
     "{actor} created calendar {calendar}" : "{actor} направи календар {calendar}",
     "You created calendar {calendar}" : "Създадохте календара {calendar}",
@@ -141,7 +141,6 @@ OC.L10N.register(
     "Configures a CalDAV account" : "Конфигурира профил в CalDAV",
     "Configures a CardDAV account" : "Конфигурира профил в CalDAV",
     "Events" : "Събития",
-    "Tasks" : "Задачи",
     "Untitled task" : "Задача без заглавие",
     "Completed on %s" : "Завършен на %s",
     "Due on %s by %s" : "Краен срок на %s от %s",
@@ -187,6 +186,7 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Приемате ли поканата?",
     "Tentative" : "Несигурно",
     "Your attendance was updated successfully." : "Вашето присъствие е актуализирано успешно.",
+    "To-dos" : "Задачи за изпълнение",
     "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ако конфигурирате работното си време, другите потребители ще виждат кога сте извън офиса, при резервиране на среща."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/bg.json b/apps/dav/l10n/bg.json
@@ -1,6 +1,6 @@
 { "translations": {
     "Calendar" : "Календар",
-    "To-dos" : "Задачи за изпълнение",
+    "Tasks" : "Задачи",
     "Personal" : "Личен",
     "{actor} created calendar {calendar}" : "{actor} направи календар {calendar}",
     "You created calendar {calendar}" : "Създадохте календара {calendar}",
@@ -139,7 +139,6 @@
     "Configures a CalDAV account" : "Конфигурира профил в CalDAV",
     "Configures a CardDAV account" : "Конфигурира профил в CalDAV",
     "Events" : "Събития",
-    "Tasks" : "Задачи",
     "Untitled task" : "Задача без заглавие",
     "Completed on %s" : "Завършен на %s",
     "Due on %s by %s" : "Краен срок на %s от %s",
@@ -185,6 +184,7 @@
     "Are you accepting the invitation?" : "Приемате ли поканата?",
     "Tentative" : "Несигурно",
     "Your attendance was updated successfully." : "Вашето присъствие е актуализирано успешно.",
+    "To-dos" : "Задачи за изпълнение",
     "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Ако конфигурирате работното си време, другите потребители ще виждат кога сте извън офиса, при резервиране на среща."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
diff --git a/apps/dav/l10n/ca.js b/apps/dav/l10n/ca.js
@@ -2,7 +2,7 @@ OC.L10N.register(
     "dav",
     {
     "Calendar" : "Calendari",
-    "To-dos" : "Tasques pendents",
+    "Tasks" : "Tasques",
     "Personal" : "Personal",
     "{actor} created calendar {calendar}" : "{actor} ha creat el calendari {calendar}",
     "You created calendar {calendar}" : "Heu creat el calendari {calendar}",
@@ -143,7 +143,6 @@ OC.L10N.register(
     "Configures a CalDAV account" : "Configura un compte CalDAV",
     "Configures a CardDAV account" : "Configura un compte CardDAV",
     "Events" : "Esdeveniments",
-    "Tasks" : "Tasques",
     "Untitled task" : "Tasca sense títol",
     "Completed on %s" : "Completada el %s",
     "Due on %s by %s" : "Venç el %s a les %s",
@@ -171,6 +170,7 @@ OC.L10N.register(
     "Delete slot" : "Suprimeix la franja",
     "No working hours set" : "No s'ha definit cap horari laboral",
     "Add slot" : "Afegeix una franja",
+    "Weekdays" : "Dies de la setmana",
     "Monday" : "Dilluns",
     "Tuesday" : "Dimarts",
     "Wednesday" : "Dimecres",
@@ -205,6 +205,7 @@ OC.L10N.register(
     "Are you accepting the invitation?" : "Accepteu la invitació?",
     "Tentative" : "Provisional",
     "Your attendance was updated successfully." : "S'ha actualitzat correctament l'assistència.",
+    "To-dos" : "Tasques pendents",
     "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si configureu el vostre horari laboral, la resta d'usuaris veuran quan sou fora de l'oficina quan planifiquin una reunió."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/ca.json b/apps/dav/l10n/ca.json
@@ -1,6 +1,6 @@
 { "translations": {
     "Calendar" : "Calendari",
-    "To-dos" : "Tasques pendents",
+    "Tasks" : "Tasques",
     "Personal" : "Personal",
     "{actor} created calendar {calendar}" : "{actor} ha creat el calendari {calendar}",
     "You created calendar {calendar}" : "Heu creat el calendari {calendar}",
@@ -141,7 +141,6 @@
     "Configures a CalDAV account" : "Configura un compte CalDAV",
     "Configures a CardDAV account" : "Configura un compte CardDAV",
     "Events" : "Esdeveniments",
-    "Tasks" : "Tasques",
     "Untitled task" : "Tasca sense títol",
     "Completed on %s" : "Completada el %s",
     "Due on %s by %s" : "Venç el %s a les %s",
@@ -169,6 +168,7 @@
     "Delete slot" : "Suprimeix la franja",
     "No working hours set" : "No s'ha definit cap horari laboral",
     "Add slot" : "Afegeix una franja",
+    "Weekdays" : "Dies de la setmana",
     "Monday" : "Dilluns",
     "Tuesday" : "Dimarts",
     "Wednesday" : "Dimecres",
@@ -203,6 +203,7 @@
     "Are you accepting the invitation?" : "Accepteu la invitació?",
     "Tentative" : "Provisional",
     "Your attendance was updated successfully." : "S'ha actualitzat correctament l'assistència.",
+    "To-dos" : "Tasques pendents",
     "If you configure your working hours, other users will see when you are out of office when they book a meeting." : "Si configureu el vostre horari laboral, la resta d'usuaris veuran quan sou fora de l'oficina quan planifiquin una reunió."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
+27 −0		.patches/fix-cache-for-node.diff
+4 −0		composer.patches.json
+5 −0		composer/installed.json
+2 −2		composer/installed.php
+7 −0		sabre/dav/PATCHES.txt
+13 −1		sabre/dav/lib/DAV/Tree.php