Fix router order bugs

uNetworking · Nov 29, 2021 · e7d8355 · e7d8355
1 parent 2017892
commit e7d8355
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/HttpRouter.h b/src/HttpRouter.h
@@ -65,6 +65,20 @@ struct HttpRouter {
         Node(std::string name) : name(name) {}
     } root = {"rootNode"};
 
+    /* Sort wildcards after alphanum */
+    int lexicalOrder(std::string &name) {
+        if (!name.length()) {
+            return 2;
+        }
+        if (name[0] == ':') {
+            return 1;
+        }
+        if (name[0] == '*') {
+            return 0;
+        }
+        return 2;
+    }
+
     /* Advance from parent to child, adding child if necessary */
     Node *getNode(Node *parent, std::string child, bool isHighPriority) {
         for (std::unique_ptr<Node> &node : parent->children) {
@@ -82,7 +96,7 @@ struct HttpRouter {
                 return a->isHighPriority;
             }
 
-            return b->name.length() && (parent != &root) && (b->name < a->name);
+            return b->name.length() && (parent != &root) && (lexicalOrder(b->name) < lexicalOrder(a->name));
         }), std::move(newNode))->get();
     }
 

diff --git a/tests/HttpRouter.cpp b/tests/HttpRouter.cpp
@@ -287,7 +287,7 @@ void testBugReports() {
         r.route("get", "/1ab");
         // this one fails with IDONEAB
         std::cout << result << std::endl;
-        assert(result == "ONEAB");
+        assert(result == "ONEABID");
     }
 
     {