From 469a15d9e74569b6577f71c10e863644eaeb8d39 Mon Sep 17 00:00:00 2001 From: Vincent Boutour Date: Fri, 7 Oct 2022 20:46:42 +0200 Subject: [PATCH] chore(deps): Bumping leaflet to 1.9.2 Signed-off-by: Vincent Boutour --- README.md | 2 +- cmd/fibr/config.go | 2 +- cmd/fibr/templates/map-modal.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 05808aac..cb9ea7c7 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.1/dist/ unpkg.com/leaflet.markercluster@1.5.1/; style-src 'httputils-nonce' unpkg.com/leaflet@1.9.1/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.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") -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 fabcf823..cc699ada 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.1/dist/ unpkg.com/leaflet.markercluster@1.5.1/; style-src 'httputils-nonce' unpkg.com/leaflet@1.9.1/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.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")), basic: basicMemory.Flags(fs, "auth", flags.NewOverride("Profiles", "1:admin")), crud: crud.Flags(fs, ""), share: share.Flags(fs, "share"), diff --git a/cmd/fibr/templates/map-modal.html b/cmd/fibr/templates/map-modal.html index 079c8673..2b295643 100644 --- a/cmd/fibr/templates/map-modal.html +++ b/cmd/fibr/templates/map-modal.html @@ -92,11 +92,11 @@

You must enable Javascript to have interactive map with pictures.

} async function loadLeaflet() { - const leafletVersion = "1.9.1"; + const leafletVersion = "1.9.2"; await addStyle({{ js "`https://unpkg.com/leaflet@${leafletVersion}/dist/leaflet.css`" }}, 'sha512-UkezATkM8unVC0R/Z9Kmq4gorjNoFwLMAWR/1yZpINW08I79jEKx/c8NlLSvvimcu7SL8pgeOnynxfRpe+5QpA==', 'anonymous'); await addStyle('https://unpkg.com/leaflet.markercluster@1.5.1/dist/MarkerCluster.Default.css', 'sha512-6ZCLMiYwTeli2rVh3XAPxy3YoR5fVxGdH/pz+KMCzRY2M65Emgkw00Yqmhh8qLGeYQ3LbVZGdmOX9KUjSKr0TA==', 'anonymous'); - await resolveScript({{ js "`https://unpkg.com/leaflet@${leafletVersion}/dist/leaflet.js`" }}, 'sha512-y6IQOhEalDvx6StYG9hG/64K2vuX3bVJ2Q3sBd0uP2UlhIAwOc9DEFgQ/oz1dQmsc2XbWwhn5MfpT76+1bx2Gg==', 'anonymous'); + await resolveScript({{ js "`https://unpkg.com/leaflet@${leafletVersion}/dist/leaflet.js`" }}, 'sha512-KMraOVM0qMVE0U1OULTpYO4gg5MZgazwPAPyMQWfOkEshpwlLQFCHZ/0lBXyviDNVL+pBGwmeXQnuvGK8Fscvg==', 'anonymous'); await resolveScript('https://unpkg.com/leaflet.markercluster@1.5.1/dist/leaflet.markercluster.js', 'sha512-+Zr0llcuE/Ho6wXRYtlWypMyWSEMxrWJxrYgeAMDRSf1FF46gQ3PAVOVp5RHdxdzikZXuHZ0soHpqRkkPkI3KA==', 'anonymous'); }