init

Signed-off-by: Hoang Pham <hoangmaths96@gmail.com>

Author: hweihwang

.env.example

@@ -18,9 +18,6 @@ TLS=false
 TLS_KEY=
 TLS_CERT=
 
-# Turn off SSL certificate validation in development mode for easier testing
-IS_DEV=false
-
 # Storage strategy for whiteboard data and socket-related temporary data
 # Valid values are: 'redis' or 'lru' (Least Recently Used cache)
 # This strategy is used for:
@@ -38,7 +35,23 @@ STORAGE_STRATEGY=lru
 # Example: redis://user:password@redis.example.com:6379/0
 REDIS_URL=redis://localhost:6379
 
+# Timeout in milliseconds for the whiteboard server's graceful shutdown process
+# If the server cannot close all connections within this time, it will force shutdown
+# Default: 3600000 (1 hour)
+FORCE_CLOSE_TIMEOUT=3600000
+
+# Maximum file upload size in megabytes
+# This limits the size of files that can be uploaded to the whiteboard
+# Default: 2 (MB)
+MAX_UPLOAD_FILE_SIZE=2
+
+# Time-to-live in milliseconds for cached authentication tokens
+# Higher values reduce authentication overhead but increase memory usage
+# Must be smaller than 15 minutes (900000ms) since that's the JWT default expiration time
+# Default: 600000 (10 minutes)
+CACHED_TOKEN_TTL=600000
+
 # Prometheus metrics endpoint
 # Set this to access the monitoring endpoint at /metrics
 # either providing it as Bearer token or as ?token= query parameter
-# METRICS_TOKEN=
+METRICS_TOKEN=

composer.json

@@ -4,7 +4,7 @@
 		"autoloader-suffix": "Whiteboard",
 		"optimize-autoloader": true,
 		"platform": {
-			"php": "8.1"
+			"php": "8.4"
 		},
 		"sort-packages": true
 	},
@@ -14,18 +14,18 @@
 		"firebase/php-jwt": "^6.10"
 	},
 	"require-dev": {
-		"nextcloud/coding-standard": "^1.0",
+		"nextcloud/coding-standard": "^1.3.2",
 		"nextcloud/ocp": "dev-master",
 		"phpunit/phpunit": "^9",
-		"psalm/phar": "^5.2",
+		"psalm/phar": "^6.0",
 		"psr/log": "^3.0.2",
 		"roave/security-advisories": "dev-latest",
 		"sabre/dav": "^4.3"
 	},
 	"scripts": {
 		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
-		"cs:check": "php-cs-fixer fix --dry-run --diff",
-		"cs:fix": "php-cs-fixer fix",
+		"cs:check": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --dry-run",
+		"cs:fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix",
 		"psalm": "psalm.phar",
 		"test:unit": "phpunit -c tests/phpunit.xml"
 	}

composer.lock

@@ -38,6 +38,7 @@ public function __construct(array $params = []) {
 		parent::__construct(self::APP_ID, $params);
 	}
 
+	#[\Override]
 	public function register(IRegistrationContext $context): void {
 		include_once __DIR__ . '/../../vendor/autoload.php';
 
@@ -48,10 +49,11 @@ public function register(IRegistrationContext $context): void {
 		$context->registerSetupCheck(SetupCheck::class);
 	}
 
+	#[\Override]
 	public function boot(IBootContext $context): void {
 		[$major] = Util::getVersion();
 		if ($major < 30) {
-			$context->injectFn(function (ITemplateManager $templateManager, IL10N $l10n) use ($major) {
+			$context->injectFn(function (ITemplateManager $templateManager, IL10N $l10n) {
 				$templateManager->registerTemplateFileCreator(function () use ($l10n) {
 					return RegisterTemplateCreatorListener::getTemplateFileCreator($l10n);
 				});

lib/AppInfo/Application.php

@@ -24,6 +24,7 @@
 use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
+use Psr\Log\LoggerInterface;
 
 /**
  * @psalm-suppress UndefinedClass
@@ -39,6 +40,7 @@ public function __construct(
 		private WhiteboardContentService $contentService,
 		private ExceptionService $exceptionService,
 		private ConfigService $configService,
+		private LoggerInterface $logger,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -69,9 +71,9 @@ public function show(int $fileId): DataResponse {
 	#[PublicPage]
 	public function update(int $fileId, array $data): DataResponse {
 		try {
-			$this->validateBackendSharedToken($fileId);
+			$jwt = $this->getJwtFromRequest();
 
-			$userId = $this->getUserIdFromRequest();
+			$userId = $this->jwtService->getUserIdFromJWT($jwt);
 
 			$user = $this->getUserFromIdServiceFactory->create($userId)->getUser();
 
@@ -81,6 +83,8 @@ public function update(int $fileId, array $data): DataResponse {
 
 			return new DataResponse(['status' => 'success']);
 		} catch (Exception $e) {
+			$this->logger->error('Error syncing whiteboard data: ' . $e->getMessage());
+
 			return $this->exceptionService->handleException($e);
 		}
 	}

lib/Controller/WhiteboardController.php

@@ -20,6 +20,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!$event instanceof AddContentSecurityPolicyEvent) {
 			return;
@@ -28,6 +29,8 @@ public function handle(Event $event): void {
 		$policy = new EmptyContentSecurityPolicy();
 
 		$policy->addAllowedConnectDomain('*');
+		$policy->addAllowedWorkerSrcDomain('*');
+
 		$event->addPolicy($policy);
 	}
 }

lib/Listener/AddContentSecurityPolicyListener.php

@@ -30,6 +30,7 @@ public function __construct(
 	/**
 	 * @throws NotFoundException
 	 */
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!($event instanceof BeforeTemplateRenderedEvent)) {
 			return;

lib/Listener/BeforeTemplateRenderedListener.php

@@ -25,6 +25,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!($event instanceof LoadViewer)) {
 			return;

lib/Listener/LoadViewerListener.php

@@ -25,6 +25,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!($event instanceof RegisterTemplateCreatorEvent)) {
 			return;
@@ -39,7 +40,10 @@ public function handle(Event $event): void {
 	public static function getTemplateFileCreator(IL10N $l10n): TemplateFileCreator {
 		$whiteboard = new TemplateFileCreator(Application::APP_ID, $l10n->t('New whiteboard'), '.whiteboard');
 		$whiteboard->addMimetype('application/vnd.excalidraw+json');
-		$whiteboard->setIconSvgInline(file_get_contents(__DIR__ . '/../../img/app-filetype.svg'));
+		$iconContent = file_get_contents(__DIR__ . '/../../img/app-filetype.svg');
+		if ($iconContent !== false) {
+			$whiteboard->setIconSvgInline($iconContent);
+		}
 		$whiteboard->setActionLabel($l10n->t('Create new whiteboard'));
 		return $whiteboard;
 	}

lib/Listener/RegisterTemplateCreatorListener.php

@@ -17,10 +17,12 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function getUID(): string {
 		return $this->user->getUID();
 	}
 
+	#[\Override]
 	public function getDisplayName(): string {
 		return $this->user->getDisplayName();
 	}