chore(deps): Bumping leaflet to 1.9.1

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Sep 24, 2022 · 8099f76 · 8099f76
1 parent 9048274
commit 8099f76
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -248,6 +248,18 @@ Usage of fibr:
         [amqpShare] Interval duration when send fails {FIBR_AMQP_SHARE_RETRY_INTERVAL}
   -amqpShareRoutingKey string
         [amqpShare] RoutingKey name {FIBR_AMQP_SHARE_ROUTING_KEY} (default "share")
+  -amqpThumbnailExchange string
+        [amqpThumbnail] Exchange name {FIBR_AMQP_THUMBNAIL_EXCHANGE} (default "fibr")
+  -amqpThumbnailExclusive
+        [amqpThumbnail] Queue exclusive mode (for fanout exchange) {FIBR_AMQP_THUMBNAIL_EXCLUSIVE}
+  -amqpThumbnailMaxRetry uint
+        [amqpThumbnail] Max send retries {FIBR_AMQP_THUMBNAIL_MAX_RETRY} (default 3)
+  -amqpThumbnailQueue string
+        [amqpThumbnail] Queue name {FIBR_AMQP_THUMBNAIL_QUEUE} (default "fibr.thumbnail")
+  -amqpThumbnailRetryInterval duration
+        [amqpThumbnail] Interval duration when send fails {FIBR_AMQP_THUMBNAIL_RETRY_INTERVAL} (default 1h0m0s)
+  -amqpThumbnailRoutingKey string
+        [amqpThumbnail] RoutingKey name {FIBR_AMQP_THUMBNAIL_ROUTING_KEY} (default "thumbnail_output")
   -amqpURI string
         [amqp] Address in the form amqps?://<user>:<password>@<address>:<port>/<vhost> {FIBR_AMQP_URI}
   -amqpWebhookExchange string
@@ -273,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 'httputils-nonce' unpkg.com/leaflet@1.8.0/dist/ unpkg.com/[email protected]/; style-src 'httputils-nonce' unpkg.com/leaflet@1.8.0/dist/ unpkg.com/[email protected]/; 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/[email protected]/dist-cjs/ unpkg.com/leaflet@1.9.1/dist/ unpkg.com/[email protected]/; style-src 'httputils-nonce' unpkg.com/leaflet@1.9.1/dist/ unpkg.com/[email protected]/; 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
@@ -345,7 +357,7 @@ Usage of fibr:
   -readTimeout duration
         [server] Read Timeout {FIBR_READ_TIMEOUT} (default 2m0s)
   -redisAddress string
-        [redis] Redis Address (blank to disable) {FIBR_REDIS_ADDRESS}
+        [redis] Redis Address fqdn:port (blank to disable) {FIBR_REDIS_ADDRESS}
   -redisAlias string
         [redis] Connection alias, for metric {FIBR_REDIS_ALIAS}
   -redisDatabase int

diff --git 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/[email protected]/dist-cjs/ unpkg.com/leaflet@1.8.0/dist/ unpkg.com/[email protected]/; style-src 'httputils-nonce' unpkg.com/leaflet@1.8.0/dist/ unpkg.com/[email protected]/; 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/[email protected]/dist-cjs/ unpkg.com/leaflet@1.9.1/dist/ unpkg.com/[email protected]/; style-src 'httputils-nonce' unpkg.com/leaflet@1.9.1/dist/ unpkg.com/[email protected]/; 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
@@ -92,9 +92,11 @@ <h2>You must enable Javascript to have interactive map with pictures.</h2>
         }
 
         async function loadLeaflet() {
-          await addStyle('https://unpkg.com/[email protected]/dist/leaflet.css', 'sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ==', 'anonymous');
+          const leafletVersion = "1.9.1";
+
+          await addStyle(`https://unpkg.com/leaflet@${leafletVersion}/dist/leaflet.css`, 'sha512-UkezATkM8unVC0R/Z9Kmq4gorjNoFwLMAWR/1yZpINW08I79jEKx/c8NlLSvvimcu7SL8pgeOnynxfRpe+5QpA==', 'anonymous');
           await addStyle('https://unpkg.com/[email protected]/dist/MarkerCluster.Default.css', 'sha512-6ZCLMiYwTeli2rVh3XAPxy3YoR5fVxGdH/pz+KMCzRY2M65Emgkw00Yqmhh8qLGeYQ3LbVZGdmOX9KUjSKr0TA==', 'anonymous');
-          await resolveScript('https://unpkg.com/leaflet@1.8.0/dist/leaflet.js', 'sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ==', 'anonymous');
+          await resolveScript(`https://unpkg.com/leaflet@${leafletVersion}/dist/leaflet.js`, 'sha512-y6IQOhEalDvx6StYG9hG/64K2vuX3bVJ2Q3sBd0uP2UlhIAwOc9DEFgQ/oz1dQmsc2XbWwhn5MfpT76+1bx2Gg==', 'anonymous');
           await resolveScript('https://unpkg.com/[email protected]/dist/leaflet.markercluster.js', 'sha512-+Zr0llcuE/Ho6wXRYtlWypMyWSEMxrWJxrYgeAMDRSf1FF46gQ3PAVOVp5RHdxdzikZXuHZ0soHpqRkkPkI3KA==', 'anonymous');
         }