feat: Allow access to E2EE folder when x-e2ee-supported header is set

Signed-off-by: Louis Chemineau <[email protected]>

Author: artonge

lib/Middleware/UserAgentCheckMiddleware.php

@@ -49,10 +49,6 @@ public function beforeController($controller, $methodName): void {
 			return;
 		}
 
-		if ($this->request->getHeader('x-e2ee-supported') === 'true') {
-			return;
-		}
-
 		throw new OCSForbiddenException('Client "' . $userAgent . '" is not allowed to access end-to-end encrypted content.');
 	}
 }

lib/UserAgentManager.php

@@ -10,6 +10,7 @@
 namespace OCA\EndToEndEncryption;
 
 use OCP\IConfig;
+use OCP\IRequest;
 
 class UserAgentManager {
 
@@ -21,7 +22,10 @@ class UserAgentManager {
 	 */
 	private array $supportedUserAgents;
 
-	public function __construct(IConfig $config) {
+	public function __construct(
+		IConfig $config,
+		private IRequest $request,
+	) {
 		$this->supportedUserAgents = $config->getSystemValue('end_to_end_encryption.supported-user-agents', [
 			'/^Mozilla\/5\.0 \(Android\) Nextcloud\-android\/(?<version>(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)).*$/' => '3.13.0',
 			'/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/(?<version>(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)).*$/' => '3.0.0',
@@ -51,6 +55,10 @@ public function supportsEndToEndEncryption(string $client): bool {
 			return (version_compare($matches['version'], $minVersion) > -1);
 		}
 
+		if ($this->request->getHeader('x-e2ee-supported') === 'true') {
+			return true;
+		}
+
 		return false;
 	}