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

Update utils.js

Browse source
This commit is contained in:
acalcutt 2025-01-04 02:10:30 -05:00
parent afa59521fa
commit 2be472b941
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/utils.js
View file

@ -198,27 +198,22 @@ function getFontPbf(allowedFonts, fontPath, name, range, fallbacks) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!allowedFonts || (allowedFonts[name] && fallbacks)) { if (!allowedFonts || (allowedFonts[name] && fallbacks)) {
const fontMatch = name?.match(/^[\w\s-]+$/); const fontMatch = name?.match(/^[\w\s-]+$/);
const sanitizedName = fontMatch?.[0] || 'invalid';
if ( if (
!name || !name ||
typeof name !== 'string' || typeof name !== 'string' ||
name.trim() === '' || name.trim() === '' ||
!fontMatch !fontMatch
) { ) {
console.error('ERROR: Invalid font name: %s', 'invalid'); console.error('ERROR: Invalid font name: %s', sanitizedName);
return reject('Invalid font name'); return reject('Invalid font name');
} }
const sanitizedName = fontMatch[0];
console.error('ERROR: Invalid font name: %s', sanitizedName);
if (!/^\d+-\d+$/.test(range)) { if (!/^\d+-\d+$/.test(range)) {
console.error('ERROR: Invalid range: %s', range); console.error('ERROR: Invalid range: %s', range);
return reject('Invalid range'); return reject('Invalid range');
} }
const sanitizedFontPath = fontPath.replace(/^(\.\.\/)+/, ''); const filename = path.join(fontPath, sanitizedName, `${range}.pbf`);
const filename = path.join(
sanitizedFontPath,
sanitizedName,
`${range}.pbf`,
);
if (!fallbacks) { if (!fallbacks) {
fallbacks = clone(allowedFonts || {}); fallbacks = clone(allowedFonts || {});
} }
@ -245,7 +240,6 @@ function getFontPbf(allowedFonts, fontPath, name, range, fallbacks) {
fallbackName = Object.keys(fallbacks)[0]; fallbackName = Object.keys(fallbacks)[0];
} }
} }
console.error( console.error(
`ERROR: Trying to use %s as a fallback for: %s`, `ERROR: Trying to use %s as a fallback for: %s`,
fallbackName, fallbackName,
@ -268,7 +262,6 @@ function getFontPbf(allowedFonts, fontPath, name, range, fallbacks) {
} }
}); });
} }
/** /**
* Combines multiple font pbf buffers into one. * Combines multiple font pbf buffers into one.
* @param {object} allowedFonts - An object of allowed fonts. * @param {object} allowedFonts - An object of allowed fonts.