Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow base 64 url as images for static maps (#1007)

Browse source 
* allow base-64 url as images

* Add option to config

* Refactoring

* Update docs

* feat: added base64 url images lint

Signed-off-by: Boon Boonsiri <bboonsir@uwaterloo.ca>

---------

Signed-off-by: Boon Boonsiri <bboonsir@uwaterloo.ca>
This commit is contained in:
Boon Boonsiri 2023-10-12 01:22:51 -04:00 committed by GitHub
parent d4a5cc6074
commit 9348350ba3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/config.rst
View file

@ -157,6 +157,13 @@ Allows the rendering of marker icons fetched via http(s) hyperlinks.
For security reasons only allow this if you can control the origins from where the markers are fetched! For security reasons only allow this if you can control the origins from where the markers are fetched!
Default is to disallow fetching of icons from remote sources. Default is to disallow fetching of icons from remote sources.
``allowInlineMarkerImages``
--------------
Allows the rendering of inline marker icons or base64 urls.
For security reasons only allow this if you can control the origins from where the markers are fetched!
Not used by default.
``styles`` ``styles``
========== ==========

9
src/serve_rendered.js
View file

@ -279,7 +279,10 @@ const extractMarkersFromQuery = (query, options, transformer) => {
let iconURI = markerParts[1]; let iconURI = markerParts[1];
// Check if icon is served via http otherwise marker icons are expected to // Check if icon is served via http otherwise marker icons are expected to
// be provided as filepaths relative to configured icon path // be provided as filepaths relative to configured icon path
if (!(iconURI.startsWith('http://') || iconURI.startsWith('https://'))) { const isRemoteURL =
iconURI.startsWith('http://') || iconURI.startsWith('https://');
const isDataURL = iconURI.startsWith('data:');
if (!(isRemoteURL || isDataURL)) {
// Sanitize URI with sanitize-filename // Sanitize URI with sanitize-filename
// https://www.npmjs.com/package/sanitize-filename#details // https://www.npmjs.com/package/sanitize-filename#details
iconURI = sanitize(iconURI); iconURI = sanitize(iconURI);
@ -292,7 +295,9 @@ const extractMarkersFromQuery = (query, options, transformer) => {
iconURI = path.resolve(options.paths.icons, iconURI); iconURI = path.resolve(options.paths.icons, iconURI);
// When we encounter a remote icon check if the configuration explicitly allows them. // When we encounter a remote icon check if the configuration explicitly allows them.
} else if (options.allowRemoteMarkerIcons !== true) { } else if (isRemoteURL && options.allowRemoteMarkerIcons !== true) {
continue;
} else if (isDataURL && options.allowInlineMarkerImages !== true) {
continue; continue;
} }