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

fix: try to fix some codeql errors

Browse source 
Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2024-04-21 00:36:00 -04:00 committed by acalcutt
parent 24a70276c5
commit b461396bbd
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/serve_style.js
View file

@ -85,24 +85,34 @@ export const serve_style = {
spriteScale = as;
}
}
const filename = `${spritePath + spriteScale}.${format}`;
if (format !== 'png' && format !== 'json') {
if (!spriteScale) {
return res.sendStatus(400);
} else {
// eslint-disable-next-line security/detect-non-literal-fs-filename
return fs.readFile(filename, (err, data) => {
if (err) {
console.log('Sprite load error:', filename);
return res.sendStatus(404);
} else {
if (format === 'json')
res.header('Content-type', 'application/json');
if (format === 'png') res.header('Content-type', 'image/png');
return res.send(data);
}
});
}
let spriteFormat;
const allowedFormats = ['png', 'json']
for (const af of allowedFormats) {
if (af === format) {
spriteFormat = af;
}
}
if (!spriteFormat) {
return res.sendStatus(400);
}
const filename = `${spritePath + spriteScale}.${spriteFormat}`;
// eslint-disable-next-line security/detect-non-literal-fs-filename
return fs.readFile(filename, (err, data) => {
if (err) {
console.log('Sprite load error:', filename);
return res.sendStatus(404);
} else {
if (format === 'json')
res.header('Content-type', 'application/json');
if (format === 'png') res.header('Content-type', 'image/png');
return res.send(data);
}
});
},
);