From 06f4488f19318fdf806d1640dd3413e916a7ed89 Mon Sep 17 00:00:00 2001 From: Vincent Boutour Date: Sat, 19 Nov 2022 09:54:23 +0100 Subject: [PATCH] chore(deps): Bumping leaflet to 1.9.3 Signed-off-by: Vincent Boutour --- README.md | 2 +- cmd/fibr/config.go | 2 +- cmd/fibr/static/scripts/map.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cb9ea7c7..5f7c5b2e 100644 --- a/README.md +++ b/README.md @@ -285,7 +285,7 @@ Usage of fibr: -chunkUpload [crud] Use chunk upload in browser {FIBR_CHUNK_UPLOAD} -csp string - [owasp] Content-Security-Policy {FIBR_CSP} (default "default-src 'self'; base-uri 'self'; script-src 'self' 'httputils-nonce' unpkg.com/webp-hero@0.0.2/dist-cjs/ unpkg.com/leaflet@1.9.2/dist/ unpkg.com/leaflet.markercluster@1.5.1/; style-src 'httputils-nonce' unpkg.com/leaflet@1.9.2/dist/ unpkg.com/leaflet.markercluster@1.5.1/; img-src 'self' data: a.tile.openstreetmap.org b.tile.openstreetmap.org c.tile.openstreetmap.org") + [owasp] Content-Security-Policy {FIBR_CSP} (default "default-src 'self'; base-uri 'self'; script-src 'self' 'httputils-nonce' unpkg.com/webp-hero@0.0.2/dist-cjs/ unpkg.com/leaflet@1.9.3/dist/ unpkg.com/leaflet.markercluster@1.5.1/; style-src 'httputils-nonce' unpkg.com/leaflet@1.9.3/dist/ unpkg.com/leaflet.markercluster@1.5.1/; img-src 'self' data: a.tile.openstreetmap.org b.tile.openstreetmap.org c.tile.openstreetmap.org") -exifAmqpExchange string [exif] AMQP Exchange Name {FIBR_EXIF_AMQP_EXCHANGE} (default "fibr") -exifAmqpRoutingKey string diff --git a/cmd/fibr/config.go b/cmd/fibr/config.go index 6a2d90b6..e444c23b 100644 --- a/cmd/fibr/config.go +++ b/cmd/fibr/config.go @@ -64,7 +64,7 @@ func newConfig() (configuration, error) { logger: logger.Flags(fs, "logger"), tracer: tracer.Flags(fs, "tracer"), prometheus: prometheus.Flags(fs, "prometheus", flags.NewOverride("Gzip", false)), - owasp: owasp.Flags(fs, "", flags.NewOverride("FrameOptions", "SAMEORIGIN"), flags.NewOverride("Csp", "default-src 'self'; base-uri 'self'; script-src 'self' 'httputils-nonce' unpkg.com/webp-hero@0.0.2/dist-cjs/ unpkg.com/leaflet@1.9.2/dist/ unpkg.com/leaflet.markercluster@1.5.1/; style-src 'self' 'httputils-nonce' unpkg.com/leaflet@1.9.2/dist/ unpkg.com/leaflet.markercluster@1.5.1/; img-src 'self' data: a.tile.openstreetmap.org b.tile.openstreetmap.org c.tile.openstreetmap.org")), + owasp: owasp.Flags(fs, "", flags.NewOverride("FrameOptions", "SAMEORIGIN"), flags.NewOverride("Csp", "default-src 'self'; base-uri 'self'; script-src 'self' 'httputils-nonce' unpkg.com/webp-hero@0.0.2/dist-cjs/ unpkg.com/leaflet@1.9.3/dist/ unpkg.com/leaflet.markercluster@1.5.1/; style-src 'self' 'httputils-nonce' unpkg.com/leaflet@1.9.3/dist/ unpkg.com/leaflet.markercluster@1.5.1/; img-src 'self' data: a.tile.openstreetmap.org b.tile.openstreetmap.org c.tile.openstreetmap.org")), basic: basicMemory.Flags(fs, "auth", flags.NewOverride("Profiles", "1:admin")), crud: crud.Flags(fs, ""), share: share.Flags(fs, "share"), diff --git a/cmd/fibr/static/scripts/map.js b/cmd/fibr/static/scripts/map.js index 620cf54b..67b4ea14 100644 --- a/cmd/fibr/static/scripts/map.js +++ b/cmd/fibr/static/scripts/map.js @@ -29,11 +29,11 @@ async function addStyle(src, integrity, crossorigin) { } async function loadLeaflet() { - const leafletVersion = '1.9.2'; + const leafletVersion = '1.9.3'; await addStyle( `https://unpkg.com/leaflet@${leafletVersion}/dist/leaflet.css`, - 'sha512-UkezATkM8unVC0R/Z9Kmq4gorjNoFwLMAWR/1yZpINW08I79jEKx/c8NlLSvvimcu7SL8pgeOnynxfRpe+5QpA==', + 'sha512-mD70nAW2ThLsWH0zif8JPbfraZ8hbCtjQ+5RU1m4+ztZq6/MymyZeB55pWsi4YAX+73yvcaJyk61mzfYMvtm9w==', 'anonymous', ); await addStyle( @@ -43,7 +43,7 @@ async function loadLeaflet() { ); await resolveScript( `https://unpkg.com/leaflet@${leafletVersion}/dist/leaflet.js`, - 'sha512-KMraOVM0qMVE0U1OULTpYO4gg5MZgazwPAPyMQWfOkEshpwlLQFCHZ/0lBXyviDNVL+pBGwmeXQnuvGK8Fscvg==', + 'sha512-Dqm3h1Y4qiHUjbhxTuBGQsza0Tfppn53SHlu/uj1f+RT+xfShfe7r6czRf5r2NmllO2aKx+tYJgoxboOkn1Scg==', 'anonymous', ); await resolveScript(