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

fix: Ensure font serving does not reflect userdata-derived errors as HTML (#647)

Browse source 
* fix: ensure font serving does not reflect userdata-derived errors as HTML

Signed-off-by: Michael Nutt <michael@nuttnet.net>
This commit is contained in:
Michael Nutt 2022-11-24 11:07:11 -05:00 committed by GitHub
parent c134795b81
commit a7af45ee3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "tileserver-gl", "name": "tileserver-gl",
"version": "4.2.0", "version": "4.2.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "tileserver-gl", "name": "tileserver-gl",
"version": "4.2.0", "version": "4.2.1",
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"dependencies": { "dependencies": {
"@mapbox/glyph-pbf-composite": "0.0.3", "@mapbox/glyph-pbf-composite": "0.0.3",

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "tileserver-gl", "name": "tileserver-gl",
"version": "4.2.0", "version": "4.2.1",
"description": "Map tile server for JSON GL styles - vector and server side generated raster tiles", "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
"main": "src/main.js", "main": "src/main.js",
"bin": "src/main.js", "bin": "src/main.js",

5
src/serve_data.js
View file

@ -54,7 +54,10 @@ export const serve_data = {
if (/does not exist/.test(err.message)) { if (/does not exist/.test(err.message)) {
return res.status(204).send(); return res.status(204).send();
} else { } else {
return res.status(500).send(err.message); return res
.status(500)
.header('Content-Type', 'text/plain')
.send(err.message);
} }
} else { } else {
if (data == null) { if (data == null) {

2
src/serve_font.js
View file

@ -54,7 +54,7 @@ export const serve_font = (options, allowedFonts) => {
res.header('Last-Modified', lastModified); res.header('Last-Modified', lastModified);
return res.send(concated); return res.send(concated);
}, },
(err) => res.status(400).send(err), (err) => res.status(400).header('Content-Type', 'text/plain').send(err),
); );
}); });

5
src/serve_rendered.js
View file

@ -661,7 +661,10 @@ export const serve_rendered = {
pool.release(renderer); pool.release(renderer);
if (err) { if (err) {
console.error(err); console.error(err);
return res.status(500).send(err); return res
.status(500)
.header('Content-Type', 'text/plain')
.send(err);
} }
// Fix semi-transparent outlines on raw, premultiplied input // Fix semi-transparent outlines on raw, premultiplied input