Add more validation and handle null userid

Signed-off-by: Lukas Schaefer <lukas@lschaefer.xyz>

Author: lukasdotcom

lib/Service/OpenAiAPIService.php

@@ -733,7 +733,23 @@ private function buildChatCompletionRequestParams(
 				if (isset($message['content']) && is_array($message['content'])) {
 					$content = [];
 					foreach ($message['content'] as $item) {
+						if (!isset($item['type'])) {
+							throw new UserFacingProcessingException(
+								'Invalid message history content',
+								0,
+								null,
+								$this->l10n->t('Invalid message history content'),
+							);
+						}
 						if ($item['type'] === 'file') {
+							if (!isset($item['file_id'])) {
+								throw new UserFacingProcessingException(
+									'Invalid message history content',
+									0,
+									null,
+									$this->l10n->t('Invalid message history content'),
+								);
+							}
 							$content = array_merge($content, $this->openAiFileService->buildFileContentFromId($item['file_id'], $userId, $item['ocp_task_id'] ?? null));
 						} else {
 							$content[] = $item;

lib/Service/OpenAiFileService.php

@@ -82,13 +82,13 @@ public function __construct(
 	 * Builds file content from a file ID within a given user folder.
 	 *
 	 * @param int $fileId The ID of the file to build content from.
-	 * @param string $userId The user ID.
+	 * @param ?string $userId The user ID.
 	 * @param ?int $taskId The ID of the task
 	 * @return list<array<string, mixed>> Content parts suitable for OpenAI chat message content.
 	 * @throws ProcessingException
 	 * @throws UserFacingProcessingException
 	 */
-	public function buildFileContentFromId(int $fileId, string $userId, ?int $taskId): array {
+	public function buildFileContentFromId(int $fileId, ?string $userId, ?int $taskId): array {
 		$file = null;
 		if ($taskId !== null) {
 			$task = $this->taskProcessingManager->getUserTask($taskId, $userId);
@@ -102,7 +102,8 @@ public function buildFileContentFromId(int $fileId, string $userId, ?int $taskId
 			if ($file === null) {
 				$file = $this->rootFolder->getFirstNodeByIdInPath($fileId, '/' . $this->rootFolder->getAppDataDirectoryName() . '/');
 			}
-		} else {
+			// If the userId is not specified they don't have a user folder
+		} elseif ($userId !== null) {
 			$userFolder = $this->rootFolder->getUserFolder($userId);
 			$file = $userFolder->getFirstNodeById($fileId);
 		}

lib/TaskProcessing/MultimodalChatWithToolsProvider.php

@@ -214,12 +214,12 @@ public function process(
 			foreach ($returnValue['images'] as $image) {
 				if ($image['type'] === 'image_url') {
 					$url = $image['image_url']['url'];
-					$base64Str = explode(',', $url)[1] ?? '';
+					$base64Str = explode(',', $url)[1] ?? throw new ProcessingException('Invalid image URL in multimodal chat: ' . $url);
 					$image = base64_decode($base64Str);
 					$image = $this->watermarkingService->markImage($image);
 					$attachments[] = $image;
 				} else {
-					$this->logger->warning('Encountered an unknown image type in multimodal chat: ' . $image['type']);
+					throw new ProcessingException('Unknown image type in multimodal chat: ' . $image['type']);
 				}
 			}