[stable23] Set MySQL ONLY_FULL_GROUP_BY config and run on MySQL for PRs

.drone.yml

@@ -29,7 +29,7 @@ trigger:
     - master
     - stable*
   event:
-    - pull_request
+#    - pull_request
     - push
 
 ---
@@ -64,7 +64,7 @@ trigger:
     - master
     - stable*
   event:
-    - pull_request
+#    - pull_request
     - push
 
 ---
@@ -99,7 +99,7 @@ trigger:
     - master
     - stable*
   event:
-    - pull_request
+#    - pull_request
     - push
 
 ---
@@ -136,7 +136,7 @@ trigger:
     - master
     - stable*
   event:
-    - pull_request
+#    - pull_request
     - push
 
 ---
@@ -173,7 +173,7 @@ trigger:
     - master
     - stable*
   event:
-    - pull_request
+#    - pull_request
     - push
 
 ---
@@ -208,7 +208,7 @@ trigger:
     - master
     - stable*
   event:
-    - pull_request
+#    - pull_request
     - push
 
 ---
@@ -243,7 +243,7 @@ trigger:
     - master
     - stable*
   event:
-    - pull_request
+#    - pull_request
     - push
 
 ---
@@ -279,7 +279,11 @@ services:
       MYSQL_USER: oc_autotest
       MYSQL_PASSWORD: owncloud
       MYSQL_DATABASE: oc_autotest
-    command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
+    command:
+      - --innodb_large_prefix=true
+      - --innodb_file_format=barracuda
+      - --innodb_file_per_table=true
+      - --sql-mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
     tmpfs:
       - /var/lib/mysql
 
@@ -288,7 +292,7 @@ trigger:
     - master
     - stable*
   event:
-#    - pull_request
+    - pull_request
     - push
 
 ---
@@ -324,7 +328,11 @@ services:
       MYSQL_USER: oc_autotest
       MYSQL_PASSWORD: owncloud
       MYSQL_DATABASE: oc_autotest
-    command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
+    command:
+      - --innodb_large_prefix=true
+      - --innodb_file_format=barracuda
+      - --innodb_file_per_table=true
+      - --sql-mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
     tmpfs:
       - /var/lib/mysql
 
@@ -333,7 +341,7 @@ trigger:
     - master
     - stable*
   event:
-#    - pull_request
+    - pull_request
     - push
 
 ---
@@ -369,7 +377,11 @@ services:
       MYSQL_USER: oc_autotest
       MYSQL_PASSWORD: owncloud
       MYSQL_DATABASE: oc_autotest
-    command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
+    command:
+      - --innodb_large_prefix=true
+      - --innodb_file_format=barracuda
+      - --innodb_file_per_table=true
+      - --sql-mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
     tmpfs:
       - /var/lib/mysql
 
@@ -378,7 +390,7 @@ trigger:
     - master
     - stable*
   event:
-#    - pull_request
+    - pull_request
     - push
 
 ---
@@ -416,7 +428,11 @@ services:
       MYSQL_USER: oc_autotest
       MYSQL_PASSWORD: owncloud
       MYSQL_DATABASE: oc_autotest
-    command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
+    command:
+      - --innodb_large_prefix=true
+      - --innodb_file_format=barracuda
+      - --innodb_file_per_table=true
+      - --sql-mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
     tmpfs:
       - /var/lib/mysql
 
@@ -425,7 +441,7 @@ trigger:
     - master
     - stable*
   event:
-#    - pull_request
+    - pull_request
     - push
 
 ---
@@ -463,7 +479,11 @@ services:
       MYSQL_USER: oc_autotest
       MYSQL_PASSWORD: owncloud
       MYSQL_DATABASE: oc_autotest
-    command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
+    command:
+      - --innodb_large_prefix=true
+      - --innodb_file_format=barracuda
+      - --innodb_file_per_table=true
+      - --sql-mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
     tmpfs:
       - /var/lib/mysql
 
@@ -472,7 +492,7 @@ trigger:
     - master
     - stable*
   event:
-#    - pull_request
+    - pull_request
     - push
 
 ---
@@ -508,7 +528,11 @@ services:
       MYSQL_USER: oc_autotest
       MYSQL_PASSWORD: owncloud
       MYSQL_DATABASE: oc_autotest
-    command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
+    command:
+      - --innodb_large_prefix=true
+      - --innodb_file_format=barracuda
+      - --innodb_file_per_table=true
+      - --sql-mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
     tmpfs:
       - /var/lib/mysql
 
@@ -517,7 +541,7 @@ trigger:
     - master
     - stable*
   event:
-#    - pull_request
+    - pull_request
     - push
 
 ---
@@ -553,7 +577,11 @@ services:
       MYSQL_USER: oc_autotest
       MYSQL_PASSWORD: owncloud
       MYSQL_DATABASE: oc_autotest
-    command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
+    command:
+      - --innodb_large_prefix=true
+      - --innodb_file_format=barracuda
+      - --innodb_file_per_table=true
+      - --sql-mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
     tmpfs:
       - /var/lib/mysql
 
@@ -562,7 +590,7 @@ trigger:
     - master
     - stable*
   event:
-#    - pull_request
+    - pull_request
     - push
 
 ---

.github/workflows/phpunit.yml

@@ -103,6 +103,11 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
 
     steps:
+      - name: Enable ONLY_FULL_GROUP_BY MySQL option
+        run: |
+          echo "SET GLOBAL sql_mode=(SELECT CONCAT(@@sql_mode,',ONLY_FULL_GROUP_BY'));" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
+          echo "SELECT @@sql_mode;" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
+
       - name: Checkout server
         uses: actions/checkout@v2
         with:

lib/Chat/MessageParser.php

@@ -92,7 +92,7 @@ protected function setActor(Message $message): void {
 				$displayName = $this->guestNames[$comment->getActorId()];
 			} else {
 				try {
-					$participant = $message->getRoom()->getParticipantByActor(Attendee::ACTOR_GUESTS, $comment->getActorId(), false);
+					$participant = $message->getRoom()->getParticipantByActor(Attendee::ACTOR_GUESTS, $comment->getActorId());
 					$displayName = $participant->getAttendee()->getDisplayName();
 				} catch (ParticipantNotFoundException $e) {
 				}

lib/Chat/Parser/SystemMessage.php

@@ -695,7 +695,7 @@ protected function getGuest(Room $room, string $actorId): array {
 
 	protected function getGuestName(Room $room, string $actorId): string {
 		try {
-			$participant = $room->getParticipantByActor(Attendee::ACTOR_GUESTS, $actorId, false);
+			$participant = $room->getParticipantByActor(Attendee::ACTOR_GUESTS, $actorId);
 			$name = $participant->getAttendee()->getDisplayName();
 			if ($name === '') {
 				return $this->l->t('Guest');

lib/Chat/Parser/UserMention.php

@@ -132,7 +132,7 @@ public function parseMessage(Message $chatMessage): void {
 				];
 			} elseif ($mention['type'] === 'guest') {
 				try {
-					$participant = $chatMessage->getRoom()->getParticipantByActor(Attendee::ACTOR_GUESTS, substr($mention['id'], strlen('guest/')), false);
+					$participant = $chatMessage->getRoom()->getParticipantByActor(Attendee::ACTOR_GUESTS, substr($mention['id'], strlen('guest/')));
 					$displayName = $participant->getAttendee()->getDisplayName() ?: $this->l->t('Guest');
 				} catch (ParticipantNotFoundException $e) {
 					$displayName = $this->l->t('Guest');

lib/Controller/RoomController.php

@@ -1508,15 +1508,8 @@ protected function changeParticipantType(int $attendeeId,  bool $promote): DataR
 		}
 
 		// Prevent users/moderators modifying themselves
-		if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
-			if ($attendee->getActorId() === $this->userId) {
-				return new DataResponse([], Http::STATUS_FORBIDDEN);
-			}
-		} elseif ($attendee->getActorType() === Attendee::ACTOR_GUESTS) {
-			$session = $targetParticipant->getSession();
-			$currentSessionId = $this->session->getSessionForRoom($this->room->getToken());
-
-			if ($session instanceof Session && $currentSessionId === $session->getSessionId()) {
+		if ($attendee->getActorType() === $this->participant->getAttendee()->getActorType()) {
+			if ($attendee->getActorId() === $this->participant->getAttendee()->getActorId()) {
 				return new DataResponse([], Http::STATUS_FORBIDDEN);
 			}
 		} elseif ($attendee->getActorType() === Attendee::ACTOR_GROUPS) {

lib/Controller/SignalingController.php

@@ -601,14 +601,14 @@ private function backendRoom(array $roomRequest): DataResponse {
 						// If the user joins the session might not be known to the server yet.
 						// In this case we load by actor information and use the session id as new session.
 						try {
-							$participant = $room->getParticipantByActor($actorType, $actorId, false);
+							$participant = $room->getParticipantByActor($actorType, $actorId);
 						} catch (ParticipantNotFoundException $e) {
 						}
 					}
 				}
 			} else {
 				try {
-					$participant = $room->getParticipantByActor($actorType, $actorId, false);
+					$participant = $room->getParticipantByActor($actorType, $actorId);
 				} catch (ParticipantNotFoundException $e) {
 				}
 			}

lib/Notification/Notifier.php

@@ -492,7 +492,7 @@ protected function parseChatMessage(INotification $notification, Room $room, Par
 	 * @throws ParticipantNotFoundException
 	 */
 	protected function getGuestParameter(Room $room, string $actorId): array {
-		$participant = $room->getParticipantByActor(Attendee::ACTOR_GUESTS, $actorId, false);
+		$participant = $room->getParticipantByActor(Attendee::ACTOR_GUESTS, $actorId);
 		$name = $participant->getAttendee()->getDisplayName();
 		if (trim($name) === '') {
 			throw new ParticipantNotFoundException('Empty name');

lib/Room.php

@@ -559,13 +559,10 @@ public function getParticipantByPin(string $pin): Participant {
 
 	/**
 	 * @param int $attendeeId
-	 * @param string|null|false $sessionId Set to false if you don't want to load a session (and save resources),
-	 *                                     string to try loading a specific session
-	 *                                     null to try loading "any"
 	 * @return Participant
 	 * @throws ParticipantNotFoundException When the pin is not valid (has no participant assigned)
 	 */
-	public function getParticipantByAttendeeId(int $attendeeId, $sessionId = null): Participant {
+	public function getParticipantByAttendeeId(int $attendeeId): Participant {
 		$query = $this->db->getQueryBuilder();
 		$helper = new SelectHelper();
 		$helper->selectAttendeesTable($query);
@@ -574,20 +571,6 @@ public function getParticipantByAttendeeId(int $attendeeId, $sessionId = null):
 			->andWhere($query->expr()->eq('a.room_id', $query->createNamedParameter($this->getId())))
 			->setMaxResults(1);
 
-		if ($sessionId !== false) {
-			if ($sessionId !== null) {
-				$helper->selectSessionsTable($query);
-				$query->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
-					$query->expr()->eq('s.session_id', $query->createNamedParameter($sessionId)),
-					$query->expr()->eq('a.id', 's.attendee_id')
-				));
-			} else {
-				$helper->selectSessionsTableMax($query);
-				$query->groupBy('a.id');
-				$query->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq('a.id', 's.attendee_id'));
-			}
-		}
-
 		$result = $query->executeQuery();
 		$row = $result->fetch();
 		$result->closeCursor();
@@ -602,15 +585,12 @@ public function getParticipantByAttendeeId(int $attendeeId, $sessionId = null):
 	/**
 	 * @param string $actorType
 	 * @param string $actorId
-	 * @param string|null|false $sessionId Set to false if you don't want to load a session (and save resources),
-	 *                                     string to try loading a specific session
-	 *                                     null to try loading "any"
 	 * @return Participant
 	 * @throws ParticipantNotFoundException When the pin is not valid (has no participant assigned)
 	 */
-	public function getParticipantByActor(string $actorType, string $actorId, $sessionId = null): Participant {
+	public function getParticipantByActor(string $actorType, string $actorId): Participant {
 		if ($actorType === Attendee::ACTOR_USERS) {
-			return $this->getParticipant($actorId, $sessionId);
+			return $this->getParticipant($actorId, false);
 		}
 
 		$query = $this->db->getQueryBuilder();
@@ -622,20 +602,6 @@ public function getParticipantByActor(string $actorType, string $actorId, $sessi
 			->andWhere($query->expr()->eq('a.room_id', $query->createNamedParameter($this->getId())))
 			->setMaxResults(1);
 
-		if ($sessionId !== false) {
-			if ($sessionId !== null) {
-				$helper->selectSessionsTable($query);
-				$query->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
-					$query->expr()->eq('s.session_id', $query->createNamedParameter($sessionId)),
-					$query->expr()->eq('a.id', 's.attendee_id')
-				));
-			} else {
-				$helper->selectSessionsTableMax($query);
-				$query->groupBy('a.id');
-				$query->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq('a.id', 's.attendee_id'));
-			}
-		}
-
 		$result = $query->executeQuery();
 		$row = $result->fetch();
 		$result->closeCursor();