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

try to improve scale + codeql

Browse source
This commit is contained in:
acalcutt 2025-01-03 23:09:05 -05:00
parent a8053028a8
commit 5f85802aed
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/serve_style.js
View file

@ -13,17 +13,25 @@ const httpTester = /^https?:\/\//i;
const allowedSpriteFormats = allowedOptions(['png', 'json']); const allowedSpriteFormats = allowedOptions(['png', 'json']);
/** /**
* Checks and formats sprite scale * Checks if a string is a valid sprite scale and returns it if it is within the allowed range, and null if it does not conform.
* @param {string} scale string containing the scale * @param {string} scale - The scale string to validate (e.g., '2x', '3x').
* @returns {string} formated string for the scale or empty string if scale is invalid * @param {number} [maxScale] - The maximum scale value. If no value is passed in, it defaults to a value of 3.
* @returns {string|null} - The valid scale string or null if invalid.
*/ */
function allowedSpriteScales(scale) { function allowedSpriteScales(scale, maxScale = 3) {
if (!scale) return ''; if (!scale) {
const match = scale.match(/(\d+)x/); return '';
const parsedScale = match ? parseInt(match[1], 10) : 1; }
return '@' + Math.min(parsedScale, 3) + 'x'; const match = scale?.match(/^([2-9]\d*)x$/);
if (!match) {
return null;
}
const parsedScale = parseInt(match[1], 10);
if (parsedScale <= maxScale) {
return `@${parsedScale}x`;
}
return null;
} }
export const serve_style = { export const serve_style = {
/** /**
* Initializes the serve_style module. * Initializes the serve_style module.
@ -92,26 +100,27 @@ export const serve_style = {
*/ */
app.get(`/:id/sprite{/:spriteID}{@:scale}{.:format}`, (req, res, next) => { app.get(`/:id/sprite{/:spriteID}{@:scale}{.:format}`, (req, res, next) => {
const { spriteID = 'default', id, format, scale } = req.params; const { spriteID = 'default', id, format, scale } = req.params;
const spriteScale = allowedSpriteScales(scale);
if (verbose) { if (verbose) {
console.log( console.log(
`Handling sprite request for: /${id}/sprite/${spriteID}${scale}.${format}`, `Handling sprite request for: /styles/${id}/sprite/${spriteID}${scale ? scale : ''}${format ? '.' + format : ''}`,
); );
} }
const item = repo[id]; const item = repo[id];
if (!item || !allowedSpriteFormats(format)) { const spriteScale = allowedSpriteScales(scale);
if (!item || !allowedSpriteFormats(format) || spriteScale === null) {
if (verbose) if (verbose)
console.error( console.error(
`Sprite item or format not found for: /${id}/sprite/${spriteID}${scale}.${format}`, `Sprite item, format, or scale not found for: /styles/${id}/sprite/${spriteID}${scale ? scale : ''}${format ? '.' + format : ''}`,
); );
return res.sendStatus(404); return res.sendStatus(404);
} }
const sprite = item.spritePaths.find((sprite) => sprite.id === spriteID); const sprite = item.spritePaths.find((sprite) => sprite.id === spriteID);
if (!sprite) { if (!sprite) {
if (verbose) if (verbose)
console.error( console.error(
`Sprite not found for: /${id}/sprite/${spriteID}${scale}.${format}`, `Sprite not found for: /styles/${id}/sprite/${spriteID}${scale ? scale : ''}${format ? '.' + format : ''}`,
); );
return res.status(400).send('Bad Sprite ID or Scale'); return res.status(400).send('Bad Sprite ID or Scale');
} }
@ -134,7 +143,7 @@ export const serve_style = {
} }
if (verbose) if (verbose)
console.log( console.log(
`Responding with sprite data for /${id}/sprite/${spriteID}${scale}.${format}`, `Responding with sprite data for /styles/${id}/sprite/${spriteID}${scale ? scale : ''}${format ? '.' + format : ''}`,
); );
return res.send(data); return res.send(data);
}); });