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

use readFile, add path.normalize

Browse source
This commit is contained in:
acalcutt 2025-01-05 01:44:32 -05:00
parent 1f693003ed
commit 340e5db60a
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/serve_rendered.js
View file

@ -13,7 +13,6 @@ import '@maplibre/maplibre-gl-native';
// SECTION END
import advancedPool from 'advanced-pool';
import fs from 'node:fs';
import path from 'path';
import url from 'url';
import util from 'util';
@ -35,6 +34,7 @@ import {
fixTileJSONCenter,
fetchTileData,
allowedOptions,
readFile,
} from './utils.js';
import { openPMtiles, getPMtilesInfo } from './pmtiles_adapter.js';
import { renderOverlay, renderWatermark, renderAttribution } from './render.js';
@ -1092,9 +1092,13 @@ export const serve_rendered = {
const file = decodeURIComponent(req.url).substring(
protocol.length + 3,
);
fs.readFile(path.join(dir, file), (err, data) => {
callback(err, { data: data });
});
readFile(path.join(dir, file))
.then((data) => {
callback(null, { data: data });
})
.catch((err) => {
callback(err, null);
});
} else if (protocol === 'fonts') {
const parts = req.url.split('/');
const fontstack = decodeURIComponent(parts[2]);
@ -1217,9 +1221,13 @@ export const serve_rendered = {
);
}
fs.readFile(file, (err, data) => {
callback(err, { data: data });
});
readFile(file)
.then((data) => {
callback(null, { data: data });
})
.catch((err) => {
callback(err, null);
});
} else {
throw Error(
`File does not exist: "${req.url}" - resolved to "${file}"`,

3
src/utils.js
View file

@ -192,8 +192,9 @@ export function fixTileJSONCenter(tileJSON) {
*/
export function readFile(filename) {
return new Promise((resolve, reject) => {
const sanitizedFilename = path.normalize(filename); // Normalize path, remove ..
// eslint-disable-next-line security/detect-non-literal-fs-filename
fs.readFile(filename, (err, data) => {
fs.readFile(String(sanitizedFilename), (err, data) => {
if (err) {
reject(err);
} else {