Merge pull request #4360 from nextcloud/fix/template-errors

Skip errors that may interrupt file creation

lib/Listener/FileCreatedFromTemplateListener.php

@@ -16,6 +16,7 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\Template\FileCreatedFromTemplateEvent;
+use Psr\Log\LoggerInterface;
 
 /** @template-implements IEventListener<Event|FileCreatedFromTemplateEvent> */
 class FileCreatedFromTemplateListener implements IEventListener {
@@ -24,6 +25,7 @@ public function __construct(
 		private TemplateManager $templateManager,
 		private TemplateFieldService $templateFieldService,
 		private CapabilitiesService $capabilitiesService,
+		private LoggerInterface $logger,
 	) {
 	}
 
@@ -58,8 +60,12 @@ public function handle(Event $event): void {
 		}
 
 		if ($this->capabilitiesService->hasFormFilling()) {
-			$filledTemplate = $this->templateFieldService->fillFields($templateFile, $event->getTemplateFields());
-			$event->getTarget()->putContent($filledTemplate);
+			try {
+				$filledTemplate = $this->templateFieldService->fillFields($templateFile, $event->getTemplateFields());
+				$event->getTarget()->putContent($filledTemplate);
+			} catch (\Exception $e) {
+				$this->logger->error($e->getMessage(), ['exception' => $e]);
+			}
 		}
 
 		// Avoid having the mimetype of the source file set

lib/Service/RemoteOptionsService.php

@@ -8,16 +8,23 @@
 
 namespace OCA\Richdocuments\Service;
 
+use OCP\IAppConfig;
+
 class RemoteOptionsService {
 	public const REMOTE_TIMEOUT_DEFAULT = 5;
 
 	public static function getDefaultOptions(int $timeout = self::REMOTE_TIMEOUT_DEFAULT): array {
-		return [
+		$options = [
 			'timeout' => $timeout,
 			'nextcloud' => [
 				'allow_local_address' => true,
 			]
 		];
-	}
 
+		if (\OCP\Server::get(IAppConfig::class)->getValueString('richdocuments', 'disable_certificate_verification') === 'yes') {
+			$options['verify'] = false;
+		}
+
+		return $options;
+	}
 }