From fa206f13c486cc8c768201f25b6e59a20605f4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Sun, 13 Aug 2023 18:07:59 +0200 Subject: [PATCH] Update OpenLayers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Krög --- libraries/classes/Header.php | 8 +++---- package.json | 2 +- test/classes/HeaderTest.php | 18 ++++++++-------- yarn.lock | 42 +++++++++++++++++++++++------------- 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index e8ae5363d0..98b4486313 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -526,7 +526,7 @@ class Header */ private function getCspHeaders(): array { - $mapTileUrls = ' *.tile.openstreetmap.org'; + $mapTileUrl = ' tile.openstreetmap.org'; $captchaUrl = ''; $cspAllow = $GLOBALS['cfg']['CSPAllow']; @@ -552,7 +552,7 @@ class Header $captchaUrl, $cspAllow, $cspAllow, - $mapTileUrls, + $mapTileUrl, $captchaUrl, ); @@ -562,7 +562,7 @@ class Header $captchaUrl, $cspAllow, $cspAllow, - $mapTileUrls, + $mapTileUrl, $captchaUrl, ); @@ -576,7 +576,7 @@ class Header $cspAllow, $captchaUrl, $cspAllow, - $mapTileUrls, + $mapTileUrl, $captchaUrl, ); diff --git a/package.json b/package.json index b9cc112c90..519caddb1e 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "js-cookie": "3.0.1", "locutus.sprintf": "^2.0.14-code-lts.2", "mini-css-extract-plugin": "^2.5.3", - "ol": "6.15.1", + "ol": "^7.1.0", "postcss": "^8.4.21", "postcss-cli": "^10.1.0", "postcss-loader": "^7.1.0", diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php index b681a0857b..cd3e851d37 100644 --- a/test/classes/HeaderTest.php +++ b/test/classes/HeaderTest.php @@ -195,13 +195,13 @@ class HeaderTest extends AbstractTestCase '', 'DENY', 'default-src \'self\' ;script-src \'self\' \'unsafe-inline\' \'unsafe-eval\' ;' - . 'style-src \'self\' \'unsafe-inline\' ;img-src \'self\' data: *.tile.openstreetmap.org;' + . 'style-src \'self\' \'unsafe-inline\' ;img-src \'self\' data: tile.openstreetmap.org;' . 'object-src \'none\';', 'default-src \'self\' ;options inline-script eval-script;referrer no-referrer;' - . 'img-src \'self\' data: *.tile.openstreetmap.org;object-src \'none\';', + . 'img-src \'self\' data: tile.openstreetmap.org;object-src \'none\';', 'default-src \'self\' ;script-src \'self\' \'unsafe-inline\' \'unsafe-eval\';' . 'referrer no-referrer;style-src \'self\' \'unsafe-inline\' ;' - . 'img-src \'self\' data: *.tile.openstreetmap.org;object-src \'none\';', + . 'img-src \'self\' data: tile.openstreetmap.org;object-src \'none\';', ], [ 'SameOrigin', @@ -214,15 +214,15 @@ class HeaderTest extends AbstractTestCase . 'script-src \'self\' \'unsafe-inline\' \'unsafe-eval\' ' . 'captcha.tld csp.tld example.com example.net;' . 'style-src \'self\' \'unsafe-inline\' captcha.tld csp.tld example.com example.net;' - . 'img-src \'self\' data: example.com example.net *.tile.openstreetmap.org captcha.tld csp.tld ;' + . 'img-src \'self\' data: example.com example.net tile.openstreetmap.org captcha.tld csp.tld ;' . 'object-src \'none\';', 'default-src \'self\' captcha.tld csp.tld example.com example.net;' . 'options inline-script eval-script;referrer no-referrer;img-src \'self\' data: example.com ' - . 'example.net *.tile.openstreetmap.org captcha.tld csp.tld ;object-src \'none\';', + . 'example.net tile.openstreetmap.org captcha.tld csp.tld ;object-src \'none\';', 'default-src \'self\' captcha.tld csp.tld example.com example.net;script-src \'self\' ' . 'captcha.tld csp.tld example.com example.net \'unsafe-inline\' \'unsafe-eval\';' . 'referrer no-referrer;style-src \'self\' \'unsafe-inline\' captcha.tld csp.tld ;' - . 'img-src \'self\' data: example.com example.net *.tile.openstreetmap.org captcha.tld csp.tld ;' + . 'img-src \'self\' data: example.com example.net tile.openstreetmap.org captcha.tld csp.tld ;' . 'object-src \'none\';', ], [ @@ -235,14 +235,14 @@ class HeaderTest extends AbstractTestCase 'default-src \'self\' captcha.tld csp.tld ;' . 'script-src \'self\' \'unsafe-inline\' \'unsafe-eval\' captcha.tld csp.tld ;' . 'style-src \'self\' \'unsafe-inline\' captcha.tld csp.tld ;' - . 'img-src \'self\' data: *.tile.openstreetmap.org captcha.tld csp.tld ;object-src \'none\';', + . 'img-src \'self\' data: tile.openstreetmap.org captcha.tld csp.tld ;object-src \'none\';', 'default-src \'self\' captcha.tld csp.tld ;' . 'options inline-script eval-script;referrer no-referrer;' - . 'img-src \'self\' data: *.tile.openstreetmap.org captcha.tld csp.tld ;object-src \'none\';', + . 'img-src \'self\' data: tile.openstreetmap.org captcha.tld csp.tld ;object-src \'none\';', 'default-src \'self\' captcha.tld csp.tld ;' . 'script-src \'self\' captcha.tld csp.tld \'unsafe-inline\' \'unsafe-eval\';' . 'referrer no-referrer;style-src \'self\' \'unsafe-inline\' captcha.tld csp.tld ;' - . 'img-src \'self\' data: *.tile.openstreetmap.org captcha.tld csp.tld ;object-src \'none\';', + . 'img-src \'self\' data: tile.openstreetmap.org captcha.tld csp.tld ;object-src \'none\';', ], ]; } diff --git a/yarn.lock b/yarn.lock index 361d53d996..9741869d21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2607,6 +2607,11 @@ domexception@^4.0.0: dependencies: webidl-conversions "^7.0.0" +earcut@^2.2.3: + version "2.2.4" + resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" + integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== + electron-to-chromium@^1.4.477: version "1.4.502" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.502.tgz#531cda8774813d97d6cfa2fb9d8ee3e2c75851fa" @@ -2997,16 +3002,16 @@ gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -geotiff@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/geotiff/-/geotiff-2.0.4.tgz#d6f231fdd76186aba21c61823ed759fcbf5d4f86" - integrity sha512-aG8h9bJccGusioPsEWsEqx8qdXpZN71A20WCvRKGxcnHSOWLKmC5ZmsAmodfxb9TRQvs+89KikGuPzxchhA+Uw== +geotiff@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/geotiff/-/geotiff-2.0.7.tgz#358e578233af70bfb0b4dee62d599ad78fc5cfca" + integrity sha512-FKvFTNowMU5K6lHYY2f83d4lS2rsCNdpUC28AX61x9ZzzqPNaWFElWv93xj0eJFaNyOYA63ic5OzJ88dHpoA5Q== dependencies: "@petamoriken/float16" "^3.4.7" lerc "^3.0.0" - lru-cache "^6.0.0" pako "^2.0.4" parse-headers "^2.0.2" + quick-lru "^6.1.1" web-worker "^1.2.0" xml-utils "^1.0.2" @@ -4269,21 +4274,23 @@ nwsapi@^2.2.2: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== -ol-mapbox-style@^8.0.5: - version "8.2.1" - resolved "https://registry.yarnpkg.com/ol-mapbox-style/-/ol-mapbox-style-8.2.1.tgz#0f0c252b6495853a137d7e4dd3f915fab664b356" - integrity sha512-3kBBuZC627vDL8vnUdfVbCbfkhkcZj2kXPHQcuLhC4JJEA+XkEVEtEde8x8+AZctRbHwBkSiubTPaRukgLxIRw== +ol-mapbox-style@^10.1.0: + version "10.7.0" + resolved "https://registry.yarnpkg.com/ol-mapbox-style/-/ol-mapbox-style-10.7.0.tgz#8837912da2a16fbd22992d76cbc4f491c838b973" + integrity sha512-S/UdYBuOjrotcR95Iq9AejGYbifKeZE85D9VtH11ryJLQPTZXZSW1J5bIXcr4AlAH6tyjPPHTK34AdkwB32Myw== dependencies: "@mapbox/mapbox-gl-style-spec" "^13.23.1" mapbox-to-css-font "^2.4.1" + ol "^7.3.0" -ol@6.15.1: - version "6.15.1" - resolved "https://registry.yarnpkg.com/ol/-/ol-6.15.1.tgz#364f459939ef71f970b2376a821a896529f65e3a" - integrity sha512-ZG2CKTpJ8Q+tPywYysVwPk+yevwJzlbwjRKhoCvd7kLVWMbfBl1O/+Kg/yrZZrhG9FNXbFH4GeOZ5yVRqo3P4w== +ol@^7.1.0, ol@^7.3.0: + version "7.5.1" + resolved "https://registry.yarnpkg.com/ol/-/ol-7.5.1.tgz#76e7a8b2cabf36124ce3123d22af08e7c4e86087" + integrity sha512-CFXDhO8YdQt7I+zwrGYSONo/ZM2oLr7vUvxqpLEUyy+USaQjUeE8L6FBOWIPboopGVhnSVYd5hdEirn9ifKBZQ== dependencies: - geotiff "2.0.4" - ol-mapbox-style "^8.0.5" + earcut "^2.2.3" + geotiff "^2.0.7" + ol-mapbox-style "^10.1.0" pbf "3.2.1" rbush "^3.0.1" @@ -4646,6 +4653,11 @@ quick-lru@^5.1.1: resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== +quick-lru@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-6.1.1.tgz#f8e5bf9010376c126c80c1a62827a526c0e60adf" + integrity sha512-S27GBT+F0NTRiehtbrgaSE1idUAJ5bX8dPAQTdylEyNlrdcH5X4Lz7Edz3DYzecbsCluD5zO8ZNEe04z3D3u6Q== + quickselect@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-2.0.0.tgz#f19680a486a5eefb581303e023e98faaf25dd018"