Prevent bad input for sort: and limit:

danny0838 · Apr 10, 2023 · e611886 · e611886
1 parent ef587c6
commit e611886
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/webscrapbook/themes/default/templates/static_search.html b/webscrapbook/themes/default/templates/static_search.html
@@ -494,7 +494,7 @@
       error: [],
       rules: {},
       sorts: [],
-      limit: null,
+      limit: 0,
       books: {
         include: [],
         exclude: [],
@@ -523,21 +523,27 @@
         case "content":
           query.sorts.push({key: "fulltext", subkey: key, order});
           break;
-        default:
+        case "title": case "comment": case "file": case "source":
+        case "type": case "create": case "modify":
           query.sorts.push({key: "meta", subkey: key, order});
           break;
+        default:
+          addError("Invalid sort: " + key);
+          break;
       }
     };
 
     const setLimit = (value, positive) => {
       if (!positive) {
-        query.limit = null;
+        query.limit = 0;
         return; 
       }
 
-      const newValue = parseInt(value);
-      if (!Number.isNaN(newValue)) {
+      const newValue = parseInt(value, 10);
+      if (Number.isInteger(newValue)) {
         query.limit = newValue;
+      } else {
+        addError("Invalid limit: " + value);
       }
     };