Merge pull request #5915 from nextcloud/backport/5903/stable22

[stable22] Use extended mediarecorder
nextcloud · Jul 1, 2021 · 06f1cdc · 06f1cdc
2 parents 0656993 + 6a17914
commit 06f1cdc
Show file tree

Hide file tree

Showing 9 changed files with 1,904 additions and 332 deletions.
diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
@@ -321,7 +321,8 @@ public static function register(IEventDispatcher $dispatcher): void {
 			$metaData = is_array($metaData) ? $metaData : [];
 
 			if (isset($metaData['messageType']) && $metaData['messageType'] === 'voice-message') {
-				if ($share->getNode()->getMimeType() !== 'audio/mpeg') {
+				if ($share->getNode()->getMimeType() !== 'audio/mpeg'
+					&& $share->getNode()->getMimeType() !== 'audio/wav') {
 					unset($metaData['messageType']);
 				}
 			}

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -262,6 +262,14 @@ public function index(string $token = '', string $callUser = '', string $passwor
 		$csp = new ContentSecurityPolicy();
 		$csp->addAllowedConnectDomain('*');
 		$csp->addAllowedMediaDomain('blob:');
+		$csp->addAllowedWorkerSrcDomain('blob:');
+		$csp->addAllowedWorkerSrcDomain("'self'");
+		$csp->addAllowedChildSrcDomain('blob:');
+		$csp->addAllowedChildSrcDomain("'self'");
+		$csp->addAllowedScriptDomain('blob:');
+		$csp->addAllowedScriptDomain("'self'");
+		$csp->addAllowedConnectDomain('blob:');
+		$csp->addAllowedConnectDomain("'self'");
 		$csp->addAllowedImageDomain('https://*.tile.openstreetmap.org');
 		$response->setContentSecurityPolicy($csp);
 		return $response;
@@ -315,6 +323,14 @@ protected function guestEnterRoom(string $token, string $password): Response {
 		$csp = new ContentSecurityPolicy();
 		$csp->addAllowedConnectDomain('*');
 		$csp->addAllowedMediaDomain('blob:');
+		$csp->addAllowedWorkerSrcDomain('blob:');
+		$csp->addAllowedWorkerSrcDomain("'self'");
+		$csp->addAllowedChildSrcDomain('blob:');
+		$csp->addAllowedChildSrcDomain("'self'");
+		$csp->addAllowedScriptDomain('blob:');
+		$csp->addAllowedScriptDomain("'self'");
+		$csp->addAllowedConnectDomain('blob:');
+		$csp->addAllowedConnectDomain("'self'");
 		$csp->addAllowedImageDomain('https://*.tile.openstreetmap.org');
 		$response->setContentSecurityPolicy($csp);
 		return $response;

diff --git a/lib/Listener/CSPListener.php b/lib/Listener/CSPListener.php
@@ -47,6 +47,14 @@ public function handle(Event $event): void {
 
 		$csp = new ContentSecurityPolicy();
 		$csp->addAllowedImageDomain('https://*.tile.openstreetmap.org');
+		$csp->addAllowedWorkerSrcDomain('blob:');
+		$csp->addAllowedWorkerSrcDomain("'self'");
+		$csp->addAllowedChildSrcDomain('blob:');
+		$csp->addAllowedChildSrcDomain("'self'");
+		$csp->addAllowedScriptDomain('blob:');
+		$csp->addAllowedScriptDomain("'self'");
+		$csp->addAllowedConnectDomain('blob:');
+		$csp->addAllowedConnectDomain("'self'");
 		foreach ($this->config->getAllServerUrlsForCSP() as $server) {
 			$csp->addAllowedConnectDomain($server);
 		}