simplify input checking

maptiler · Jan 5, 2025 · 62a3212 · 62a3212
1 parent 7dddbf7
commit 62a3212
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -215,31 +215,22 @@ export function readFile(filename) {
  */
 async function getFontPbf(allowedFonts, fontPath, name, range, fallbacks) {
   if (!allowedFonts || (allowedFonts[name] && fallbacks)) {
-    const fontMatch = name?.match(/^[\w\s-]+$/);
-    const sanitizedName = fontMatch?.[0] || 'invalid';
-    if (!name || typeof name !== 'string' || name.trim() === '' || !fontMatch) {
-      console.error(
-        'ERROR: Invalid font name: %s',
-        sanitizedName.replace(/\n|\r/g, ''),
-      );
+    const sRange = String(range).replace(/\n|\r/g, '');
+    const sFontStack = String(name).replace(/\n|\r/g, '');
+    if (!sFontStack || name.trim() === '') {
+      console.error('ERROR: Invalid font name');
       throw new Error('Invalid font name');
     }
 
-    const rangeMatch = range?.match(/^[\d-]+$/);
-    const sanitizedRange = rangeMatch?.[0] || 'invalid';
-    if (!/^\d+-\d+$/.test(range)) {
+    if (!/^\d+-\d+$/.test(sRange)) {
       console.error(
         'ERROR: Invalid range: %s',
         sanitizedRange.replace(/\n|\r/g, ''),
       );
       throw new Error('Invalid range');
     }
-    const filename = path.join(
-      fontPath,
-      sanitizedName,
-      `${sanitizedRange}.pbf`,
-    );
 
+    const filename = path.join(fontPath, sFontStack, `${sRange}.pbf`);
     if (!fallbacks) {
       fallbacks = clone(allowedFonts || {});
     }