RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

map: fix for sw

pull/400/head
Varun Patil 2023-02-09 12:02:11 -08:00
parent 8d4d2d6240
commit 479665ca62
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Controller/OtherController.php
View File

@ -73,11 +73,7 @@ class OtherController extends ApiBase
'Content-Type' => 'application/javascript', 'Content-Type' => 'application/javascript',
'Service-Worker-Allowed' => '/', 'Service-Worker-Allowed' => '/',
]); ]);
$policy = new ContentSecurityPolicy(); $response->setContentSecurityPolicy(PageController::getCSP());
$policy->addAllowedWorkerSrcDomain("'self'");
$policy->addAllowedScriptDomain("'self'");
$policy->addAllowedConnectDomain("'self'");
$response->setContentSecurityPolicy($policy);
return $response; return $response;
} }

16
lib/Controller/PageController.php
View File

@ -102,9 +102,21 @@ class PageController extends Controller
/** Get the common content security policy */ /** Get the common content security policy */
public static function getCSP() public static function getCSP()
{ {
// Image domains MUST be added to the connect domain list
// because of the service worker fetch() call
$addImageDomain = function ($url) use (&$policy) {
$policy->addAllowedImageDomain($url);
$policy->addAllowedConnectDomain($url);
};
// Create base policy
$policy = new ContentSecurityPolicy(); $policy = new ContentSecurityPolicy();
$policy->addAllowedWorkerSrcDomain("'self'"); $policy->addAllowedWorkerSrcDomain("'self'");
$policy->addAllowedScriptDomain("'self'"); $policy->addAllowedScriptDomain("'self'");
$policy->addAllowedFrameDomain("'self'");
$policy->addAllowedImageDomain("'self'");
$policy->addAllowedMediaDomain("'self'");
$policy->addAllowedConnectDomain("'self'");
// Video player // Video player
$policy->addAllowedWorkerSrcDomain('blob:'); $policy->addAllowedWorkerSrcDomain('blob:');
@ -116,8 +128,8 @@ class PageController extends Controller
// Allow OSM // Allow OSM
$policy->addAllowedFrameDomain('www.openstreetmap.org'); $policy->addAllowedFrameDomain('www.openstreetmap.org');
$policy->addAllowedImageDomain('https://*.tile.openstreetmap.org'); $addImageDomain('https://*.tile.openstreetmap.org');
$policy->addAllowedImageDomain('https://*.a.ssl.fastly.net'); $addImageDomain('https://*.a.ssl.fastly.net');
return $policy; return $policy;
} }

1
src/components/top-matter/MapSplitMatter.vue
View File

@ -3,6 +3,7 @@
<LMap <LMap
class="map" class="map"
ref="map" ref="map"
:crossOrigin="true"
:zoom="zoom" :zoom="zoom"
:minZoom="2" :minZoom="2"
@moveend="refresh" @moveend="refresh"